boh

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/Diff.cs

@@ -111,12 +111,6 @@ protected override void OnReadline(string line)
 
                 _oldLine = int.Parse(match.Groups[1].Value);
                 _newLine = int.Parse(match.Groups[2].Value);
-
-                if (_result.TextDiff.Lines.Count > 0)
-                {
-                    _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, "", 0, 0));
-                    _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, "", 0, 0));
-                }
                 _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0));
             }
             else
@@ -163,11 +157,6 @@ protected override void OnReadline(string line)
                     {
                         _oldLine = int.Parse(match.Groups[1].Value);
                         _newLine = int.Parse(match.Groups[2].Value);
-                        if (_result.TextDiff.Lines.Count > 0)
-                        {
-                            _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, "", 0, 0));
-                            _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, "", 0, 0));
-                        }
                         _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0));
                     }
                     else

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/Resources/Locales/en_US.axaml

@@ -224,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

@@ -227,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

@@ -227,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 @@ public class Checkout : Popup
         public string Branch
         {
             get;
-            private set;
         }
 
         public Models.DealWithLocalChanges PreAction
@@ -49,7 +48,7 @@ public override Task<bool> Sure()
                     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 @@ public class CheckoutCommit : Popup
         public Models.Commit Commit
         {
             get;
-            private set;
         }
 
         public bool AutoStash
@@ -49,7 +48,7 @@ public override Task<bool> Sure()
                     else
                     {
                         SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath);
+                        Commands.Discard.All(_repo.FullPath, false);
                     }
                 }
 

src/ViewModels/CreateBranch.cs

@@ -17,7 +17,6 @@ public string Name
         public object BasedOn
         {
             get;
-            private set;
         }
 
         public Models.DealWithLocalChanges PreAction
@@ -105,7 +104,7 @@ public override Task<bool> Sure()
                         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 @@
 
 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 @@ public Discard(Repository repo, List<Models.Change> changes)
             _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 @@ public override Task<bool> Sure()
 
             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

@@ -139,7 +139,7 @@ public override Task<bool> Sure()
                     else if (PreAction == Models.DealWithLocalChanges.Discard)
                     {
                         SetProgressDescription("Discard local changes ...");
-                        Commands.Discard.All(_repo.FullPath);
+                        Commands.Discard.All(_repo.FullPath, false);
                     }
                 }
 

src/ViewModels/Repository.cs

@@ -1271,7 +1271,6 @@ public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
                 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/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"
@@ -12,35 +11,69 @@
     <TextBlock FontSize="18"
                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"/>
+
+    <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}"/>
+
+            <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>
-          </DataTemplate>
-
-          <DataTemplate DataType="x:String">
-            <StackPanel Orientation="Horizontal">
+          </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>