code_review: PR #2200

- Use `string extra` parameter instead of adding a new `bool threeWayMerge` in `Commands.Apply`.
- Add missing translations for Chinese

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Commands/Apply.cs

@@ -4,7 +4,7 @@ namespace SourceGit.Commands
 {
     public class Apply : Command
     {
-        public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceMode, bool threeWayMerge, string extra)
+        public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceMode, string extra)
         {
             WorkingDirectory = repo;
             Context = repo;
@@ -17,9 +17,6 @@ public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceM
             else
                 builder.Append("--whitespace=").Append(whitespaceMode).Append(' ');
 
-            if (threeWayMerge)
-                builder.Append("--3way ");
-
             if (!string.IsNullOrEmpty(extra))
                 builder.Append(extra).Append(' ');
 

src/Resources/Locales/en_US.axaml

@@ -24,10 +24,10 @@
   <x:String x:Key="Text.App.Hide" xml:space="preserve">Hide SourceGit</x:String>
   <x:String x:Key="Text.App.ShowAll" xml:space="preserve">Show All</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">Patch</x:String>
+  <x:String x:Key="Text.Apply.3Way" xml:space="preserve">3-Way Merge</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">Patch File:</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Select .patch file to apply</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignore whitespace changes</x:String>
-  <x:String x:Key="Text.Apply.3Way" xml:space="preserve">3-Way Merge</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Apply Patch</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Whitespace:</x:String>
   <x:String x:Key="Text.ApplyStash" xml:space="preserve">Apply Stash</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -28,6 +28,7 @@
   <x:String x:Key="Text.App.Hide" xml:space="preserve">隐藏 SourceGit</x:String>
   <x:String x:Key="Text.App.ShowAll" xml:space="preserve">显示所有窗口</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">应用补丁(apply)</x:String>
+  <x:String x:Key="Text.Apply.3Way" xml:space="preserve">尝试三路合并</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">补丁文件 ：</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">选择补丁文件</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">忽略空白符号</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -28,6 +28,7 @@
   <x:String x:Key="Text.App.Hide" xml:space="preserve">隱藏 SourceGit</x:String>
   <x:String x:Key="Text.App.ShowAll" xml:space="preserve">顯示所有</x:String>
   <x:String x:Key="Text.Apply" xml:space="preserve">套用修補檔 (apply patch)</x:String>
+  <x:String x:Key="Text.Apply.3Way" xml:space="preserve">嘗試三路合併</x:String>
   <x:String x:Key="Text.Apply.File" xml:space="preserve">修補檔:</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">選擇修補檔</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">忽略空白符號</x:String>

src/ViewModels/Apply.cs

@@ -28,8 +28,8 @@ public Models.ApplyWhiteSpaceMode SelectedWhiteSpaceMode
 
         public bool ThreeWayMerge
         {
-            get => _threeWayMerge;
-            set => SetProperty(ref _threeWayMerge, value);
+            get;
+            set;
         }
 
         public Apply(Repository repo)
@@ -55,7 +55,8 @@ public override async Task<bool> Sure()
             var log = _repo.CreateLog("Apply Patch");
             Use(log);
 
-            var succ = await new Commands.Apply(_repo.FullPath, _patchFile, _ignoreWhiteSpace, SelectedWhiteSpaceMode.Arg, _threeWayMerge, null)
+            var extra = ThreeWayMerge ? "--3way" : string.Empty;
+            var succ = await new Commands.Apply(_repo.FullPath, _patchFile, _ignoreWhiteSpace, SelectedWhiteSpaceMode.Arg, extra)
                 .Use(log)
                 .ExecAsync();
 
@@ -66,6 +67,5 @@ public override async Task<bool> Sure()
         private readonly Repository _repo = null;
         private string _patchFile = string.Empty;
         private bool _ignoreWhiteSpace = true;
-        private bool _threeWayMerge = false;
     }
 }

src/ViewModels/StashesPage.cs

@@ -253,7 +253,7 @@ public async Task ApplySelectedChanges(List<Models.Change> changes)
                 return;
 
             var log = _repo.CreateLog($"Apply changes from '{_selectedStash.Name}'");
-            await new Commands.Apply(_repo.FullPath, saveTo, true, string.Empty, false, string.Empty)
+            await new Commands.Apply(_repo.FullPath, saveTo, true, string.Empty, string.Empty)
                 .Use(log)
                 .ExecAsync();
 

src/Views/TextDiffView.axaml.cs

@@ -1508,7 +1508,7 @@ private async void OnStageChunk(object _1, RoutedEventArgs _2)
                 diff.GeneratePatchFromSelectionSingleSide(change, treeGuid, selection, false, chunk.IsOldSide, tmpFile);
             }
 
-            await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", false, "--cache --index").ExecAsync();
+            await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", "--cache --index").ExecAsync();
             File.Delete(tmpFile);
 
             vm.BlockNavigation.UpdateByChunk(chunk);
@@ -1539,7 +1539,7 @@ private async void OnUnstageChunk(object _1, RoutedEventArgs _2)
             else
                 diff.GeneratePatchFromSelectionSingleSide(change, treeGuid, selection, true, chunk.IsOldSide, tmpFile);
 
-            await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", false, "--cache --index --reverse").ExecAsync();
+            await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", "--cache --index --reverse").ExecAsync();
             File.Delete(tmpFile);
 
             vm.BlockNavigation.UpdateByChunk(chunk);
@@ -1577,7 +1577,7 @@ private async void OnDiscardChunk(object _1, RoutedEventArgs _2)
                 diff.GeneratePatchFromSelectionSingleSide(change, treeGuid, selection, true, chunk.IsOldSide, tmpFile);
             }
 
-            await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", false, "--reverse").ExecAsync();
+            await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", "--reverse").ExecAsync();
             File.Delete(tmpFile);
 
             vm.BlockNavigation.UpdateByChunk(chunk);