feature: add an option to clean up ignored files when discard all changes in repo (#531)

src/Commands/Clean.cs

@@ -5,16 +5,16 @@ namespace SourceGit.Commands
 {
     public class Clean : Command
     {
-        public Clean(string repo)
+        public Clean(string repo, bool includeIgnored)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = "clean -qfd";
+            Args = includeIgnored ? "clean -qfdx" : "clean -qfd";
         }
 
         public Clean(string repo, List<string> files)
         {
-            StringBuilder builder = new StringBuilder();
+            var builder = new StringBuilder();
             builder.Append("clean -qfd --");
             foreach (var f in files)
             {

src/Commands/Discard.cs

@@ -5,10 +5,10 @@ namespace SourceGit.Commands
 {
     public static class Discard
     {
-        public static void All(string repo)
+        public static void All(string repo, bool includeIgnored)
         {
             new Restore(repo).Exec();
-            new Clean(repo).Exec();
+            new Clean(repo, includeIgnored).Exec();
         }
 
         public static void Changes(string repo, List<Models.Change> changes)

src/Models/RepositorySettings.cs

@@ -4,6 +4,12 @@ namespace SourceGit.Models
 {
     public class RepositorySettings
     {
+        public string DefaultRemote
+        {
+            get;
+            set;
+        } = string.Empty;
+        
         public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch
         {
             get;

src/Resources/Locales/en_US.axaml

@@ -138,6 +138,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Fetch remotes automatically</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minute(s)</x:String>
+  <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Default Remote</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE TRACKER</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Add Sample Github Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Add Sample Jira Rule</x:String>
@@ -223,6 +224,7 @@
   <x:String x:Key="Text.Discard" xml:space="preserve">Discard Changes</x:String>
   <x:String x:Key="Text.Discard.All" xml:space="preserve">All local changes in working copy.</x:String>
   <x:String x:Key="Text.Discard.Changes" xml:space="preserve">Changes:</x:String>
+  <x:String x:Key="Text.Discard.IncludeIgnored" xml:space="preserve">Include ignored files</x:String>
   <x:String x:Key="Text.Discard.Total" xml:space="preserve">Total {0} changes will be discard</x:String>
   <x:String x:Key="Text.Discard.Warning" xml:space="preserve">You can't undo this action!!!</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Bookmark" xml:space="preserve">Bookmark:</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -141,6 +141,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT配置</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">启用定时自动拉取远程更新</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">分钟</x:String>
+  <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">默认远程</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE追踪</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">新增匹配Github Issue规则</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">新增匹配Jira规则</x:String>
@@ -226,6 +227,7 @@
   <x:String x:Key="Text.Discard" xml:space="preserve">放弃更改确认</x:String>
   <x:String x:Key="Text.Discard.All" xml:space="preserve">所有本地址未提交的修改。</x:String>
   <x:String x:Key="Text.Discard.Changes" xml:space="preserve">变更 ：</x:String>
+  <x:String x:Key="Text.Discard.IncludeIgnored" xml:space="preserve">包括所有已忽略的文件</x:String>
   <x:String x:Key="Text.Discard.Total" xml:space="preserve">总计{0}项选中更改</x:String>
   <x:String x:Key="Text.Discard.Warning" xml:space="preserve">本操作不支持回退，请确认后继续！！！</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Bookmark" xml:space="preserve">书签 ：</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -141,6 +141,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">Git 設定</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">啟用定時自動提取 (fetch) 遠端更新</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">分鐘</x:String>
+  <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">預設遠端存放庫</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">Issue 追蹤</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">新增符合 GitHub Issue 規則</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">新增符合 Jira 規則</x:String>
@@ -226,6 +227,7 @@
   <x:String x:Key="Text.Discard" xml:space="preserve">捨棄變更</x:String>
   <x:String x:Key="Text.Discard.All" xml:space="preserve">所有本機未提交的變更。</x:String>
   <x:String x:Key="Text.Discard.Changes" xml:space="preserve">變更:</x:String>
+  <x:String x:Key="Text.Discard.IncludeIgnored" xml:space="preserve">包括所有已忽略的檔案</x:String>
   <x:String x:Key="Text.Discard.Total" xml:space="preserve">將捨棄總計 {0} 項已選取的變更</x:String>
   <x:String x:Key="Text.Discard.Warning" xml:space="preserve">您無法復原此操作，請確認後再繼續!</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Bookmark" xml:space="preserve">書籤:</x:String>

src/ViewModels/Checkout.cs

@@ -7,7 +7,6 @@ namespace SourceGit.ViewModels
         public string Branch
         {
             get;
-            private set;
         }
 
         public Models.DealWithLocalChanges PreAction
@@ -49,7 +48,7 @@ namespace SourceGit.ViewModels
                     else if (PreAction == Models.DealWithLocalChanges.Discard)
                     {
                         SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath);
+                        Commands.Discard.All(_repo.FullPath, false);
                     }
                 }
 

src/ViewModels/CheckoutCommit.cs

@@ -7,7 +7,6 @@ namespace SourceGit.ViewModels
         public Models.Commit Commit
         {
             get;
-            private set;
         }
 
         public bool AutoStash
@@ -49,7 +48,7 @@ namespace SourceGit.ViewModels
                     else
                     {
                         SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath);
+                        Commands.Discard.All(_repo.FullPath, false);
                     }
                 }
 

src/ViewModels/CreateBranch.cs

@@ -17,7 +17,6 @@ namespace SourceGit.ViewModels
         public object BasedOn
         {
             get;
-            private set;
         }
 
         public Models.DealWithLocalChanges PreAction
@@ -105,7 +104,7 @@ namespace SourceGit.ViewModels
                         else if (PreAction == Models.DealWithLocalChanges.Discard)
                         {
                             SetProgressDescription("Discard local changes...");
-                            Commands.Discard.All(_repo.FullPath);
+                            Commands.Discard.All(_repo.FullPath, false);
                         }
                     }
 

src/ViewModels/Discard.cs

@@ -3,19 +3,45 @@ using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
+    public class DiscardAllMode
+    {
+        public bool IncludeIgnored
+        {
+            get;
+            set;
+        } = false;
+    }
+
+    public class DiscardSingleFile
+    {
+        public string Path
+        {
+            get;
+            set;
+        } = string.Empty;
+    }
+
+    public class DiscardMultipleFiles
+    {
+        public int Count
+        {
+            get;
+            set;
+        } = 0;
+    }
+    
     public class Discard : Popup
     {
         public object Mode
         {
             get;
-            private set;
         }
 
         public Discard(Repository repo)
         {
             _repo = repo;
 
-            Mode = new Models.Null();
+            Mode = new DiscardAllMode();
             View = new Views.Discard { DataContext = this };
         }
 
@@ -25,11 +51,11 @@ namespace SourceGit.ViewModels
             _changes = changes;
 
             if (_changes == null)
-                Mode = new Models.Null();
+                Mode = new DiscardAllMode();
             else if (_changes.Count == 1)
-                Mode = _changes[0].Path;
+                Mode = new DiscardSingleFile() { Path = _changes[0].Path };
             else
-                Mode = _changes.Count;
+                Mode = new DiscardMultipleFiles() { Count = _changes.Count };
 
             View = new Views.Discard() { DataContext = this };
         }
@@ -41,8 +67,8 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                if (_changes == null)
-                    Commands.Discard.All(_repo.FullPath);
+                if (Mode is DiscardAllMode all)
+                    Commands.Discard.All(_repo.FullPath, all.IncludeIgnored);
                 else
                     Commands.Discard.Changes(_repo.FullPath, _changes);
 

src/ViewModels/Pull.cs

@@ -95,7 +95,18 @@ namespace SourceGit.ViewModels
                     }
                 }
 
-                _selectedRemote = autoSelectedRemote ?? repo.Remotes[0];
+                if (autoSelectedRemote == null)
+                {
+                    var remote = null as Models.Remote;
+                    if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote))
+                        remote = _repo.Remotes.Find(x => x.Name == _repo.Settings.DefaultRemote);
+                    _selectedRemote = remote ?? _repo.Remotes[0];
+                }
+                else
+                {
+                    _selectedRemote = autoSelectedRemote;
+                }
+
                 PostRemoteSelected();
                 HasSpecifiedRemoteBranch = false;
             }
@@ -128,11 +139,11 @@ namespace SourceGit.ViewModels
                     else if (PreAction == Models.DealWithLocalChanges.Discard)
                     {
                         SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath);
+                        Commands.Discard.All(_repo.FullPath, false);
                     }
                 }
 
-                var rs = false;
+                bool rs;
                 if (FetchAllBranches)
                 {
                     SetProgressDescription($"Fetching remote: {_selectedRemote.Name}...");

src/ViewModels/Push.cs

@@ -137,9 +137,15 @@ namespace SourceGit.ViewModels
                 }
             }
 
-            // Set default remote to the first if haven't been set.
+            // Set default remote to the first if it has not been set.
             if (_selectedRemote == null)
-                _selectedRemote = repo.Remotes[0];
+            {
+                var remote = null as Models.Remote;
+                if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote))
+                    remote = repo.Remotes.Find(x => x.Name == _repo.Settings.DefaultRemote);
+
+                _selectedRemote = remote ?? repo.Remotes[0];
+            }
 
             // Auto select preferred remote branch.
             AutoSelectBranchByRemote();

src/ViewModels/Repository.cs

@@ -1271,7 +1271,6 @@ namespace SourceGit.ViewModels
                 var discard = new MenuItem();
                 discard.Header = App.Text("BranchCM.DiscardAll");
                 discard.Icon = App.CreateMenuIcon("Icons.Undo");
-                discard.IsEnabled = _localChangesCount > 0;
                 discard.Click += (_, e) =>
                 {
                     if (PopupHost.CanCreatePopup())

src/ViewModels/RepositoryConfigure.cs

@@ -18,6 +18,24 @@ namespace SourceGit.ViewModels
             set;
         }
 
+        public List<string> Remotes
+        {
+            get;
+        }
+
+        public string DefaultRemote
+        {
+            get => _repo.Settings.DefaultRemote;
+            set
+            {
+                if (_repo.Settings.DefaultRemote != value)
+                {
+                    _repo.Settings.DefaultRemote = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public bool GPGCommitSigningEnabled
         {
             get;
@@ -88,6 +106,10 @@ namespace SourceGit.ViewModels
         {
             _repo = repo;
 
+            Remotes = new List<string>();
+            foreach (var remote in _repo.Remotes)
+                Remotes.Add(remote.Name);
+
             _cached = new Commands.Config(repo.FullPath).ListAll();
             if (_cached.TryGetValue("user.name", out var name))
                 UserName = name;

src/Views/Discard.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
@@ -13,34 +12,68 @@
                Classes="bold"
                Text="{DynamicResource Text.Discard}"/>
     
-    <Grid Margin="0,16,0,8" RowDefinitions="32,32" ColumnDefinitions="120,*">
-      <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,8,0" HorizontalAlignment="Right" Text="{DynamicResource Text.Discard.Changes}"/>
-      <ContentControl Grid.Row="0" Grid.Column="1" Content="{Binding Mode}">
-        <ContentControl.DataTemplates>
-          <DataTemplate DataType="m:Null">
-            <StackPanel Orientation="Horizontal">
-              <Path Width="12" Height="12" Margin="0,2,0,0" Data="{StaticResource Icons.Folder.Open}"/>
-              <TextBlock Text="{DynamicResource Text.Discard.All}" Margin="4,0,0,0"/>
-            </StackPanel>
-          </DataTemplate>
+    <ContentControl Margin="0,16,0,8" Content="{Binding Mode}">
+      <ContentControl.DataTemplates>
+        <DataTemplate DataType="vm:DiscardAllMode">
+          <Grid RowDefinitions="Auto,Auto,36" ColumnDefinitions="120,*">
+            <TextBlock Grid.Row="0" Grid.Column="0"
+                       Margin="0,0,8,0"
+                       HorizontalAlignment="Right"
+                       Text="{DynamicResource Text.Discard.Changes}"/>
+            <TextBlock Grid.Row="0" Grid.Column="1"
+                       Text="{DynamicResource Text.Discard.All}"/>
             
-          <DataTemplate DataType="x:String">
-            <StackPanel Orientation="Horizontal">
+            <CheckBox Grid.Row="1" Grid.Column="1"
+                      Content="{DynamicResource Text.Discard.IncludeIgnored}"
+                      IsChecked="{Binding IncludeIgnored, Mode=TwoWay}"/>
+            
+            <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
+              <Path Width="14" Height="14" 
+                    Data="{StaticResource Icons.Error}" 
+                    Fill="DarkOrange"/>
+              <TextBlock Margin="4,0,0,0"
+                         Text="{DynamicResource Text.Discard.Warning}"
+                         Foreground="{DynamicResource Brush.FG2}"/>
+            </StackPanel>
+          </Grid>
+        </DataTemplate>
+        
+        <DataTemplate DataType="vm:DiscardSingleFile">
+          <Grid RowDefinitions="32,32" ColumnDefinitions="120,*">
+            <TextBlock Grid.Row="0" Grid.Column="0"
+                       Margin="0,0,8,0"
+                       HorizontalAlignment="Right"
+                       Text="{DynamicResource Text.Discard.Changes}"/>
+            <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
-              <TextBlock Text="{Binding}" Margin="4,0,0,0"/>
+              <TextBlock Text="{Binding Path}" Margin="4,0,0,0"/>
             </StackPanel>
-          </DataTemplate>
             
-          <DataTemplate DataType="x:Int32">
-            <StackPanel Orientation="Horizontal">
+            <TextBlock Grid.Row="1" Grid.Column="1" 
+                       VerticalAlignment="Center"
+                       Text="{DynamicResource Text.Discard.Warning}"
+                       Foreground="{DynamicResource Brush.FG2}"/>
+          </Grid>
+        </DataTemplate>
+        
+        <DataTemplate DataType="vm:DiscardMultipleFiles">
+          <Grid RowDefinitions="32,32" ColumnDefinitions="120,*">
+            <TextBlock Grid.Row="0" Grid.Column="0"
+                       Margin="0,0,8,0"
+                       HorizontalAlignment="Right"
+                       Text="{DynamicResource Text.Discard.Changes}"/>
+            <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
-              <TextBlock Text="{Binding Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Discard.Total'}" Margin="4,0,0,0"/>
+              <TextBlock Text="{Binding Count, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Discard.Total'}" Margin="4,0,0,0"/>
             </StackPanel>
-          </DataTemplate>
-        </ContentControl.DataTemplates>
-      </ContentControl>
             
-      <TextBlock Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource Text.Discard.Warning}" Foreground="{DynamicResource Brush.FG2}"/>
-    </Grid>
+            <TextBlock Grid.Row="1" Grid.Column="1" 
+                       VerticalAlignment="Center"
+                       Text="{DynamicResource Text.Discard.Warning}"
+                       Foreground="{DynamicResource Brush.FG2}"/>
+          </Grid>
+        </DataTemplate>
+      </ContentControl.DataTemplates>
+    </ContentControl>
   </StackPanel>
 </UserControl>

src/Views/RepositoryConfigure.axaml

@@ -51,7 +51,7 @@
           <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.Git}"/>
         </TabItem.Header>
 
-        <Grid Margin="16,4,16,8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+        <Grid Margin="16,4,16,8" RowDefinitions="32,32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
           <TextBlock Grid.Row="0" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
@@ -74,10 +74,29 @@
                    Text="{Binding UserEmail, Mode=TwoWay}"/>
           
           <TextBlock Grid.Row="2" Grid.Column="0"
+                     HorizontalAlignment="Right" VerticalAlignment="Center"
+                     Margin="0,0,8,0"
+                     Text="{DynamicResource Text.Configure.Git.DefaultRemote}"/>
+          <ComboBox Grid.Row="2" Grid.Column="1"
+                    Height="28" Padding="8,0"
+                    VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                    ItemsSource="{Binding Remotes}"
+                    SelectedItem="{Binding DefaultRemote, Mode=TwoWay}">
+            <ComboBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
+                  <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+                  <TextBlock Text="{Binding}"/>
+                </StackPanel>
+              </DataTemplate>
+            </ComboBox.ItemTemplate>
+          </ComboBox>
+
+          <TextBlock Grid.Row="3" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
                      Text="{DynamicResource Text.Configure.Proxy}"/>
-          <TextBox Grid.Row="2" Grid.Column="1"
+          <TextBox Grid.Row="3" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
                    Watermark="{DynamicResource Text.Configure.Proxy.Placeholder}"
@@ -89,25 +108,25 @@
             </TextBox.InnerRightContent>
           </TextBox>
 
-          <TextBlock Grid.Row="3" Grid.Column="0"
+          <TextBlock Grid.Row="4" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
                      Text="{DynamicResource Text.Preference.GPG.UserKey}"/>
-          <TextBox Grid.Row="3" Grid.Column="1"
+          <TextBox Grid.Row="4" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
                    Watermark="{DynamicResource Text.Preference.GPG.UserKey.Placeholder}"
                    Text="{Binding GPGUserSigningKey, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="4" Grid.Column="1"
+          <CheckBox Grid.Row="5" Grid.Column="1"
                     Content="{DynamicResource Text.Preference.GPG.CommitEnabled}"
                     IsChecked="{Binding GPGCommitSigningEnabled, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="5" Grid.Column="1"
+          <CheckBox Grid.Row="6" Grid.Column="1"
                     Content="{DynamicResource Text.Preference.GPG.TagEnabled}"
                     IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
 
-          <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal">
+          <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal">
             <CheckBox x:Name="AutoFetchCheckBox"
                       Content="{DynamicResource Text.Configure.Git.AutoFetch}"
                       IsChecked="{Binding EnableAutoFetch, Mode=TwoWay}"/>