code_review: PR (#288)

* add missing translations and it's no need to add `OnPull` suffix since it already has a prefix `Text.Pull.`
* when enable fetching all branches of selected remote, use merge/rebase command instead of pull
* re-arrange orders of options in pull popup panel
* default enable `Fetch all branches`

Author: love-linger

src/Models/RepositorySettings.cs

@@ -38,7 +38,7 @@ public bool FetchAllBranchesOnPull
         {
             get;
             set;
-        } = false;
+        } = true;
 
         public bool PushAllTags
         {

src/Resources/Locales/en_US.axaml

@@ -403,7 +403,7 @@
   <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Prune worktree information in `$GIT_DIR/worktrees`</x:String>
   <x:String x:Key="Text.Pull" xml:space="preserve">Pull</x:String>
   <x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branch:</x:String>
-  <x:String x:Key="Text.Pull.FetchAllBranchesOnPull" xml:space="preserve">Fetch all branches on pull</x:String>
+  <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Fetch all branches</x:String>
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">Into:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Local Changes:</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Discard</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -406,6 +406,7 @@
   <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">清理在`$GIT_DIR/worktrees`中的无效工作树信息</x:String>
   <x:String x:Key="Text.Pull" xml:space="preserve">拉回(pull)</x:String>
   <x:String x:Key="Text.Pull.Branch" xml:space="preserve">拉取分支 ：</x:String>
+  <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">拉取远程中的所有分支变更</x:String>
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">本地分支 ：</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">丢弃更改</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -406,6 +406,7 @@
   <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">清理在`$GIT_DIR/worktrees`中的無效工作樹資訊</x:String>
   <x:String x:Key="Text.Pull" xml:space="preserve">拉回(pull)</x:String>
   <x:String x:Key="Text.Pull.Branch" xml:space="preserve">拉取分支 ：</x:String>
+  <x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">拉取遠端中的所有分支變更</x:String>
   <x:String x:Key="Text.Pull.Into" xml:space="preserve">本地分支 ：</x:String>
   <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
   <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">丟棄更改</x:String>

src/ViewModels/Pull.cs

@@ -59,7 +59,7 @@ public bool UseRebase
             set => _repo.Settings.PreferRebaseInsteadOfMerge = value;
         }
 
-        public bool FetchAllBranchesOnPull
+        public bool FetchAllBranches
         {
             get => _repo.Settings.FetchAllBranchesOnPull;
             set => _repo.Settings.FetchAllBranchesOnPull = value;
@@ -157,14 +157,32 @@ public override Task<bool> Sure()
                     }
                 }
 
-                if (FetchAllBranchesOnPull)
+                var rs = false;
+                if (FetchAllBranches)
                 {
                     SetProgressDescription($"Fetching remote: {_selectedRemote.Name}...");
-                    new Commands.Fetch(_repo.FullPath, _selectedRemote.Name, false, NoTags, SetProgressDescription).Exec();
+                    rs = new Commands.Fetch(_repo.FullPath, _selectedRemote.Name, false, NoTags, SetProgressDescription).Exec();
+                    if (!rs)
+                        return false;
+
+                    // Use merge/rebase instead of pull as fetch is done manually.
+                    if (UseRebase)
+                    {
+                        SetProgressDescription($"Rebase {_current.Name} on {_selectedBranch.FriendlyName} ...");
+                        rs = new Commands.Rebase(_repo.FullPath, _selectedBranch.FriendlyName, false).Exec();
+                    }
+                    else
+                    {
+                        SetProgressDescription($"Merge {_selectedBranch.FriendlyName} into {_current.Name} ...");
+                        rs = new Commands.Merge(_repo.FullPath, _selectedBranch.FriendlyName, "", SetProgressDescription).Exec();
+                    }
+                }
+                else
+                {
+                    SetProgressDescription($"Pull {_selectedRemote.Name}/{_selectedBranch.Name}...");
+                    rs = new Commands.Pull(_repo.FullPath, _selectedRemote.Name, _selectedBranch.Name, UseRebase, NoTags, SetProgressDescription).Exec();
                 }
 
-                SetProgressDescription($"Pull {_selectedRemote.Name}/{_selectedBranch.Name}...");
-                var rs = new Commands.Pull(_repo.FullPath, _selectedRemote.Name, _selectedBranch.Name, UseRebase, NoTags, SetProgressDescription).Exec();
                 if (rs && needPopStash)
                 {
                     SetProgressDescription("Re-apply local changes...");

src/Views/Pull.axaml

@@ -83,18 +83,18 @@
                      Margin="8,0,0,0"
                      IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.Discard}}"/>
       </StackPanel>
-
+      
       <CheckBox Grid.Row="4" Grid.Column="1"
-                Content="{DynamicResource Text.Pull.UseRebase}"
-                IsChecked="{Binding UseRebase, Mode=TwoWay}"/>
+                Content="{DynamicResource Text.Pull.FetchAllBranches}"
+                IsChecked="{Binding FetchAllBranches, Mode=TwoWay}"/>
 
       <CheckBox Grid.Row="5" Grid.Column="1"
                 Content="{DynamicResource Text.Pull.NoTags}"
                 IsChecked="{Binding NoTags, Mode=TwoWay}"/>
-      
+
       <CheckBox Grid.Row="6" Grid.Column="1"
-                Content="{DynamicResource Text.Pull.FetchAllBranchesOnPull}"
-                IsChecked="{Binding FetchAllBranchesOnPull, Mode=TwoWay}"/>
+                Content="{DynamicResource Text.Pull.UseRebase}"
+                IsChecked="{Binding UseRebase, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>