feat: add untracked opt in discard(fix #1586)

- Add support for including untracked files in discard operations by introducing a new parameter.
- Add localization string for including untracked files in discard operation.
- Add support for discarding untracked files in the discard functionality.
- Add force flag parameter to discard command for local changes.
- Add include untracked files checkbox to discard view.
- Fix missing parameter in discard changes command call for non-left changes case.

Author: heartacker

src/Commands/Discard.cs

@@ -12,15 +12,17 @@ public static class Discard
         /// </summary>
         /// <param name="repo"></param>
         /// <param name="includeIgnored"></param>
+        /// <param name="includeUntracked"></param>
         /// <param name="log"></param>
-        public static async Task AllAsync(string repo, bool includeIgnored, Models.ICommandLog log)
+        public static async Task AllAsync(string repo, bool includeIgnored, bool includeUntracked, Models.ICommandLog log)
         {
             var changes = await new QueryLocalChanges(repo).GetResultAsync().ConfigureAwait(false);
             try
             {
                 foreach (var c in changes)
                 {
-                    if (c.WorkTree == Models.ChangeState.Untracked ||
+
+                    if ((c.WorkTree == Models.ChangeState.Untracked && includeUntracked) ||
                         c.WorkTree == Models.ChangeState.Added ||
                         c.Index == Models.ChangeState.Added ||
                         c.Index == Models.ChangeState.Renamed)
@@ -49,16 +51,18 @@ public static async Task AllAsync(string repo, bool includeIgnored, Models.IComm
         /// </summary>
         /// <param name="repo"></param>
         /// <param name="changes"></param>
+        /// <param name="includeUntracked"></param>
         /// <param name="log"></param>
-        public static async Task ChangesAsync(string repo, List<Models.Change> changes, Models.ICommandLog log)
+        public static async Task ChangesAsync(string repo, List<Models.Change> changes, bool includeUntracked, Models.ICommandLog log)
         {
             var restores = new List<string>();
 
             try
             {
                 foreach (var c in changes)
                 {
-                    if (c.WorkTree == Models.ChangeState.Untracked || c.WorkTree == Models.ChangeState.Added)
+                    if ((c.WorkTree == Models.ChangeState.Untracked && includeUntracked) ||
+                         c.WorkTree == Models.ChangeState.Added)
                     {
                         var fullPath = Path.Combine(repo, c.Path);
                         if (Directory.Exists(fullPath))

src/Resources/Locales/en_US.axaml

@@ -325,6 +325,7 @@
   <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.IncludeUntracked" xml:space="preserve">Include untracked files</x:String>
   <x:String x:Key="Text.Discard.Total" xml:space="preserve">{0} changes will be discarded</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/ViewModels/Discard.cs

@@ -10,6 +10,12 @@ public bool IncludeIgnored
             get;
             set;
         } = false;
+
+        public bool IncludeUntracked
+        {
+            get;
+            set;
+        } = false;
     }
 
     public class DiscardSingleFile
@@ -65,9 +71,9 @@ public override async Task<bool> Sure()
             Use(log);
 
             if (Mode is DiscardAllMode all)
-                await Commands.Discard.AllAsync(_repo.FullPath, all.IncludeIgnored, log);
+                await Commands.Discard.AllAsync(_repo.FullPath, all.IncludeIgnored, all.IncludeUntracked, log);
             else
-                await Commands.Discard.ChangesAsync(_repo.FullPath, _changes, log);
+                await Commands.Discard.ChangesAsync(_repo.FullPath, _changes, false, log);
 
             log.Complete();
             _repo.MarkWorkingCopyDirtyManually();

src/ViewModels/Pull.cs

@@ -125,7 +125,7 @@ public override async Task<bool> Sure()
             {
                 if (DiscardLocalChanges)
                 {
-                    await Commands.Discard.AllAsync(_repo.FullPath, false, log);
+                    await Commands.Discard.AllAsync(_repo.FullPath, false, false, log);
                 }
                 else
                 {

src/Views/Discard.axaml

@@ -24,7 +24,7 @@
     <ContentControl Margin="0,16,0,8" Content="{Binding Mode}">
       <ContentControl.DataTemplates>
         <DataTemplate DataType="vm:DiscardAllMode">
-          <Grid RowDefinitions="32,32" ColumnDefinitions="120,*">
+          <Grid RowDefinitions="32,32,32" ColumnDefinitions="120,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Margin="0,0,8,0"
                        HorizontalAlignment="Right"
@@ -35,6 +35,10 @@
             <CheckBox Grid.Row="1" Grid.Column="1"
                       Content="{DynamicResource Text.Discard.IncludeIgnored}"
                       IsChecked="{Binding IncludeIgnored, Mode=TwoWay}"/>
+
+            <CheckBox Grid.Row="2" Grid.Column="1"
+                      Content="{DynamicResource Text.Discard.IncludeUntracked}"
+                      IsChecked="{Binding IncludeUntracked, Mode=TwoWay}"/>
           </Grid>
         </DataTemplate>
 

src/Views/TextDiffView.axaml.cs

@@ -1934,7 +1934,7 @@ private async void OnDiscardChunk(object _1, RoutedEventArgs _2)
 
             if (!selection.HasLeftChanges)
             {
-                await Commands.Discard.ChangesAsync(repo.FullPath, [change], null);
+                await Commands.Discard.ChangesAsync(repo.FullPath, [change], false, null);
             }
             else
             {