Add button for running external mergetool on ALL conflicts (#1173)

goran-w · web-flow · commit 47824dc27a41 · 2025-04-11T09:33:07.000+08:00
* Make a few non-translated strings localizable (in Conflict view)

* Add button and wiring to run mergetool on all conflicts

* Corrected spelling and wording in related code and exception msg
diff --git a/src/Commands/MergeTool.cs b/src/Commands/MergeTool.cs
@@ -13,9 +13,12 @@ public static bool OpenForMerge(string repo, int toolType, string toolPath, stri
             cmd.Context = repo;
             cmd.RaiseError = true;
 
+            // NOTE: If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts.
+            var file_arg = string.IsNullOrEmpty(file) ? "" : $"\"{file}\"";
+
             if (toolType == 0)
             {
-                cmd.Args = $"mergetool \"{file}\"";
+                cmd.Args = $"mergetool {file_arg}";
                 return cmd.Exec();
             }
 
@@ -32,7 +35,7 @@ public static bool OpenForMerge(string repo, int toolType, string toolPath, stri
                 return false;
             }
 
-            cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit \"{file}\"";
+            cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {file_arg}";
             return cmd.Exec();
         }
 
diff --git a/src/Models/Change.cs b/src/Models/Change.cs
@@ -36,7 +36,7 @@ public class Change
         public string OriginalPath { get; set; } = "";
         public ChangeDataForAmend DataForAmend { get; set; } = null;
 
-        public bool IsConflit
+        public bool IsConflict
         {
             get
             {
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
@@ -726,7 +726,11 @@
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter">You have staged {0} file(s) but only {1} file(s) displayed ({2} files are filtered out). Do you want to continue?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.OpenExternalMergeTool" xml:space="preserve">OPEN EXTERNAL MERGETOOL</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts" xml:space="preserve">OPEN ALL CONFLICTS IN EXTERNAL MERGETOOL</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">FILE CONFLICTS ARE RESOLVED</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.UseMine" xml:space="preserve">USE MINE</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.UseTheirs" xml:space="preserve">USE THEIRS</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDE UNTRACKED FILES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO RECENT INPUT MESSAGES</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO COMMIT TEMPLATES</x:String>
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -243,7 +243,7 @@ public void SetData(List<Models.Change> changes)
                 // Just force refresh selected changes.
                 Dispatcher.UIThread.Invoke(() =>
                 {
-                    HasUnsolvedConflicts = _cached.Find(x => x.IsConflit) != null;
+                    HasUnsolvedConflicts = _cached.Find(x => x.IsConflict) != null;
 
                     UpdateDetail();
                     UpdateInProgressState();
@@ -275,7 +275,7 @@ public void SetData(List<Models.Change> changes)
                 if (c.WorkTree != Models.ChangeState.None)
                 {
                     unstaged.Add(c);
-                    hasConflict |= c.IsConflit;
+                    hasConflict |= c.IsConflict;
                 }
             }
 
@@ -314,6 +314,12 @@ public void SetData(List<Models.Change> changes)
             });
         }
 
+        public void OpenExternalMergeToolAllConflicts()
+        {
+            // No <file> arg, mergetool runs on all files with merge conflicts!
+            UseExternalMergeTool(null);
+        }
+
         public void OpenAssumeUnchanged()
         {
             App.OpenDialog(new Views.AssumeUnchangedManager()
@@ -373,7 +379,7 @@ public async void UseTheirs(List<Models.Change> changes)
 
             foreach (var change in changes)
             {
-                if (!change.IsConflit)
+                if (!change.IsConflict)
                     continue;
 
                 if (change.WorkTree == Models.ChangeState.Deleted)
@@ -413,7 +419,7 @@ public async void UseMine(List<Models.Change> changes)
 
             foreach (var change in changes)
             {
-                if (!change.IsConflit)
+                if (!change.IsConflict)
                     continue;
 
                 if (change.Index == Models.ChangeState.Deleted)
@@ -448,7 +454,8 @@ public async void UseExternalMergeTool(Models.Change change)
         {
             var toolType = Preferences.Instance.ExternalMergeToolType;
             var toolPath = Preferences.Instance.ExternalMergeToolPath;
-            await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));
+            var file = change?.Path; // NOTE: With no <file> arg, mergetool runs on on every file with merge conflicts!
+            await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, file));
         }
 
         public void ContinueMerge()
@@ -585,7 +592,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges()
                 menu.Items.Add(openWith);
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
-                if (change.IsConflit)
+                if (change.IsConflict)
                 {
                     var useTheirs = new MenuItem();
                     useTheirs.Icon = App.CreateMenuIcon("Icons.Incoming");
@@ -924,20 +931,20 @@ public ContextMenu CreateContextMenuForUnstagedChanges()
             else
             {
                 var hasConflicts = false;
-                var hasNoneConflicts = false;
+                var hasNonConflicts = false;
                 foreach (var change in _selectedUnstaged)
                 {
-                    if (change.IsConflit)
+                    if (change.IsConflict)
                         hasConflicts = true;
                     else
-                        hasNoneConflicts = true;
+                        hasNonConflicts = true;
                 }
 
                 if (hasConflicts)
                 {
-                    if (hasNoneConflicts)
+                    if (hasNonConflicts)
                     {
-                        App.RaiseException(_repo.FullPath, "You have selected both non-conflict changes with conflicts!");
+                        App.RaiseException(_repo.FullPath, "Selection contains both conflict and non-conflict changes!");
                         return null;
                     }
 
@@ -1644,7 +1651,7 @@ private void SetDetail(Models.Change change, bool isUnstaged)
 
             if (change == null)
                 DetailContext = null;
-            else if (change.IsConflit && isUnstaged)
+            else if (change.IsConflict && isUnstaged)
                 DetailContext = new Conflict(_repo, this, change);
             else
                 DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), _detailContext as DiffContext);
diff --git a/src/Views/ChangeStatusIcon.cs b/src/Views/ChangeStatusIcon.cs
@@ -93,7 +93,7 @@ public override void Render(DrawingContext context)
             string indicator;
             if (IsUnstagedChange)
             {
-                if (Change.IsConflit)
+                if (Change.IsConflict)
                 {
                     background = Brushes.OrangeRed;
                     indicator = "!";
@@ -139,7 +139,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 }
 
                 if (isUnstaged)
-                    ToolTip.SetTip(this, c.IsConflit ? "Conflict" : TIPS[(int)c.WorkTree]);
+                    ToolTip.SetTip(this, c.IsConflict ? "Conflict" : TIPS[(int)c.WorkTree]);
                 else
                     ToolTip.SetTip(this, TIPS[(int)c.Index]);
 
diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
@@ -105,9 +105,9 @@
         </Border>
 
         <StackPanel Margin="0,8,0,0"  Orientation="Horizontal" HorizontalAlignment="Center">
-          <Button Classes="flat" Content="USE THEIRS" Command="{Binding UseTheirs}"/>
-          <Button Classes="flat" Margin="8,0,0,0" Content="USE MINE" Command="{Binding UseMine}"/>
-          <Button Classes="flat" Margin="8,0,0,0" Content="OPEN EXTERNAL MERGETOOL" Command="{Binding OpenExternalMergeTool}"/>
+          <Button Classes="flat" Margin="0,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.UseTheirs}" Command="{Binding UseTheirs}"/>
+          <Button Classes="flat" Margin="8,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" Command="{Binding UseMine}"/>
+          <Button Classes="flat" Margin="8,0,0,0" Content="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeTool}" Command="{Binding OpenExternalMergeTool}"/>
         </StackPanel>
       </StackPanel>
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
@@ -61,26 +61,35 @@
       <Grid Grid.Row="1" RowDefinitions="28,*">
         <!-- Unstaged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
-          <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto">
+          <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto,Auto">
             <Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Changes}"/>
             <TextBlock Grid.Column="1" Text="{DynamicResource Text.WorkingCopy.Unstaged}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0"/>
             <TextBlock Grid.Column="2" FontWeight="Bold" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Unstaged, Converter={x:Static c:ListConverters.ToCount}}"/>
             <v:LoadingIcon Grid.Column="3" Width="14" Height="14" Margin="8,0,0,0" IsVisible="{Binding IsStaging}"/>
 
             <Button Grid.Column="5"
+                    Classes="icon_button"
+                    Width="26" Height="14"
+                    Padding="0"
+                    IsVisible="{Binding HasUnsolvedConflicts}"
+                    ToolTip.Tip="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts}"
+                    Command="{Binding OpenExternalMergeToolAllConflicts}">
+              <Path Width="14" Height="14" Data="{StaticResource Icons.Conflict}"/>
+            </Button>
+            <Button Grid.Column="6"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
                     ToolTip.Tip="{DynamicResource Text.WorkingCopy.Unstaged.ViewAssumeUnchaged}"
                     Command="{Binding OpenAssumeUnchanged}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.File.Ignore}"/>
             </Button>
-            <ToggleButton Grid.Column="6"
+            <ToggleButton Grid.Column="7"
                           Classes="toggle_untracked"
                           Width="26" Height="14"
                           ToolTip.Tip="{DynamicResource Text.WorkingCopy.IncludeUntracked}"
                           IsChecked="{Binding IncludeUntracked, Mode=TwoWay}"/>
-            <Button Grid.Column="7"
+            <Button Grid.Column="8"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -93,15 +102,15 @@
               </ToolTip.Tip>
               <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
             </Button>
-            <Button Grid.Column="8"
+            <Button Grid.Column="9"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
                     ToolTip.Tip="{DynamicResource Text.WorkingCopy.Unstaged.StageAll}"
                     Command="{Binding StageAll}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.DoubleDown}"/>
             </Button>
-            <v:ChangeViewModeSwitcher Grid.Column="9"
+            <v:ChangeViewModeSwitcher Grid.Column="10"
                                       Width="26" Height="14"
                                       Margin="0,1,0,0"
                                       ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode, Mode=TwoWay}"/>

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,12 @@ public static bool OpenForMerge(string repo, int toolType, string toolPath, stri`
`13`	`13`	`cmd.Context = repo;`
`14`	`14`	`cmd.RaiseError = true;`
`15`	`15`
	`16`	`+ // NOTE: If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts.`
	`17`	`+ var file_arg = string.IsNullOrEmpty(file) ? "" : $"\"{file}\"";`
	`18`	`+`
`16`	`19`	`if (toolType == 0)`
`17`	`20`	`{`
`18`		`- cmd.Args = $"mergetool \"{file}\"";`
	`21`	`+ cmd.Args = $"mergetool {file_arg}";`
`19`	`22`	`return cmd.Exec();`
`20`	`23`	`}`
`21`	`24`
`@@ -32,7 +35,7 @@ public static bool OpenForMerge(string repo, int toolType, string toolPath, stri`
`32`	`35`	`return false;`
`33`	`36`	`}`
`34`	`37`
`35`		`- cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit \"{file}\"";`
	`38`	`+ cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {file_arg}";`
`36`	`39`	`return cmd.Exec();`
`37`	`40`	`}`
`38`	`41`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public class Change`
`36`	`36`	`public string OriginalPath { get; set; } = "";`
`37`	`37`	`public ChangeDataForAmend DataForAmend { get; set; } = null;`
`38`	`38`
`39`		`- public bool IsConflit`
	`39`	`+ public bool IsConflict`
`40`	`40`	`{`
`41`	`41`	`get`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public void SetData(List<Models.Change> changes)`
`243`	`243`	`// Just force refresh selected changes.`
`244`	`244`	`Dispatcher.UIThread.Invoke(() =>`
`245`	`245`	`{`
`246`		`- HasUnsolvedConflicts = _cached.Find(x => x.IsConflit) != null;`
	`246`	`+ HasUnsolvedConflicts = _cached.Find(x => x.IsConflict) != null;`
`247`	`247`
`248`	`248`	`UpdateDetail();`
`249`	`249`	`UpdateInProgressState();`
`@@ -275,7 +275,7 @@ public void SetData(List<Models.Change> changes)`
`275`	`275`	`if (c.WorkTree != Models.ChangeState.None)`
`276`	`276`	`{`
`277`	`277`	`unstaged.Add(c);`
`278`		`- hasConflict \|= c.IsConflit;`
	`278`	`+ hasConflict \|= c.IsConflict;`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`@@ -314,6 +314,12 @@ public void SetData(List<Models.Change> changes)`
`314`	`314`	`});`
`315`	`315`	`}`
`316`	`316`
	`317`	`+ public void OpenExternalMergeToolAllConflicts()`
	`318`	`+ {`
	`319`	`+ // No <file> arg, mergetool runs on all files with merge conflicts!`
	`320`	`+ UseExternalMergeTool(null);`
	`321`	`+ }`
	`322`	`+`
`317`	`323`	`public void OpenAssumeUnchanged()`
`318`	`324`	`{`
`319`	`325`	`App.OpenDialog(new Views.AssumeUnchangedManager()`
`@@ -373,7 +379,7 @@ public async void UseTheirs(List<Models.Change> changes)`
`373`	`379`
`374`	`380`	`foreach (var change in changes)`
`375`	`381`	`{`
`376`		`- if (!change.IsConflit)`
	`382`	`+ if (!change.IsConflict)`
`377`	`383`	`continue;`
`378`	`384`
`379`	`385`	`if (change.WorkTree == Models.ChangeState.Deleted)`
`@@ -413,7 +419,7 @@ public async void UseMine(List<Models.Change> changes)`
`413`	`419`
`414`	`420`	`foreach (var change in changes)`
`415`	`421`	`{`
`416`		`- if (!change.IsConflit)`
	`422`	`+ if (!change.IsConflict)`
`417`	`423`	`continue;`
`418`	`424`
`419`	`425`	`if (change.Index == Models.ChangeState.Deleted)`
`@@ -448,7 +454,8 @@ public async void UseExternalMergeTool(Models.Change change)`
`448`	`454`	`{`
`449`	`455`	`var toolType = Preferences.Instance.ExternalMergeToolType;`
`450`	`456`	`var toolPath = Preferences.Instance.ExternalMergeToolPath;`
`451`		`- await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));`
	`457`	`+ var file = change?.Path; // NOTE: With no <file> arg, mergetool runs on on every file with merge conflicts!`
	`458`	`+ await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, file));`
`452`	`459`	`}`
`453`	`460`
`454`	`461`	`public void ContinueMerge()`
`@@ -585,7 +592,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges()`
`585`	`592`	`menu.Items.Add(openWith);`
`586`	`593`	`menu.Items.Add(new MenuItem() { Header = "-" });`
`587`	`594`
`588`		`- if (change.IsConflit)`
	`595`	`+ if (change.IsConflict)`
`589`	`596`	`{`
`590`	`597`	`var useTheirs = new MenuItem();`
`591`	`598`	`useTheirs.Icon = App.CreateMenuIcon("Icons.Incoming");`
`@@ -924,20 +931,20 @@ public ContextMenu CreateContextMenuForUnstagedChanges()`
`924`	`931`	`else`
`925`	`932`	`{`
`926`	`933`	`var hasConflicts = false;`
`927`		`- var hasNoneConflicts = false;`
	`934`	`+ var hasNonConflicts = false;`
`928`	`935`	`foreach (var change in _selectedUnstaged)`
`929`	`936`	`{`
`930`		`- if (change.IsConflit)`
	`937`	`+ if (change.IsConflict)`
`931`	`938`	`hasConflicts = true;`
`932`	`939`	`else`
`933`		`- hasNoneConflicts = true;`
	`940`	`+ hasNonConflicts = true;`
`934`	`941`	`}`
`935`	`942`
`936`	`943`	`if (hasConflicts)`
`937`	`944`	`{`
`938`		`- if (hasNoneConflicts)`
	`945`	`+ if (hasNonConflicts)`
`939`	`946`	`{`
`940`		`- App.RaiseException(_repo.FullPath, "You have selected both non-conflict changes with conflicts!");`
	`947`	`+ App.RaiseException(_repo.FullPath, "Selection contains both conflict and non-conflict changes!");`
`941`	`948`	`return null;`
`942`	`949`	`}`
`943`	`950`
`@@ -1644,7 +1651,7 @@ private void SetDetail(Models.Change change, bool isUnstaged)`
`1644`	`1651`
`1645`	`1652`	`if (change == null)`
`1646`	`1653`	`DetailContext = null;`
`1647`		`- else if (change.IsConflit && isUnstaged)`
	`1654`	`+ else if (change.IsConflict && isUnstaged)`
`1648`	`1655`	`DetailContext = new Conflict(_repo, this, change);`
`1649`	`1656`	`else`
`1650`	`1657`	`DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), _detailContext as DiffContext);`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public override void Render(DrawingContext context)`
`93`	`93`	`string indicator;`
`94`	`94`	`if (IsUnstagedChange)`
`95`	`95`	`{`
`96`		`- if (Change.IsConflit)`
	`96`	`+ if (Change.IsConflict)`
`97`	`97`	`{`
`98`	`98`	`background = Brushes.OrangeRed;`
`99`	`99`	`indicator = "!";`
`@@ -139,7 +139,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`if (isUnstaged)`
`142`		`- ToolTip.SetTip(this, c.IsConflit ? "Conflict" : TIPS[(int)c.WorkTree]);`
	`142`	`+ ToolTip.SetTip(this, c.IsConflict ? "Conflict" : TIPS[(int)c.WorkTree]);`
`143`	`143`	`else`
`144`	`144`	`ToolTip.SetTip(this, TIPS[(int)c.Index]);`
`145`	`145`