feature: add a checkbox in Preferences > GIT to use Stash & Reapply by default when checking-out or merging branches

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

Author: love-linger

src/Resources/Locales/en_US.axaml

@@ -680,6 +680,7 @@
   <x:String x:Key="Text.Preferences.Git.UseLibsecret" xml:space="preserve">Use git-credential-libsecret instead of git-credential-manager</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">User Name</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Global git user name</x:String>
+  <x:String x:Key="Text.Preferences.Git.UseStashAndReapplyByDefault" xml:space="preserve">Stash &amp; reapply changes by default when checking-out or merging branches</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git version</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG SIGNING</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Commit GPG signing</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -684,6 +684,7 @@
   <x:String x:Key="Text.Preferences.Git.UseLibsecret" xml:space="preserve">使用 git-credential-libsecret 替代 git-credential-manager</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">用户名</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">默认GIT用户名</x:String>
+  <x:String x:Key="Text.Preferences.Git.UseStashAndReapplyByDefault" xml:space="preserve">迁出或合并分支时，默认贮藏并自动恢复本地更改</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git 版本</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG签名</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">启用提交签名</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -684,6 +684,7 @@
   <x:String x:Key="Text.Preferences.Git.UseLibsecret" xml:space="preserve">使用 git-credential-libsecret 取代 git-credential-manager</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">使用者名稱</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">預設 Git 使用者名稱</x:String>
+  <x:String x:Key="Text.Preferences.Git.UseStashAndReapplyByDefault" xml:space="preserve">在檢出或合併分支時，預設擱置變更並自動復原</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git 版本</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG 簽章</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">啟用提交簽章</x:String>

src/ViewModels/Checkout.cs

@@ -24,7 +24,10 @@ public Checkout(Repository repo, Models.Branch branch)
         {
             _repo = repo;
             _branch = branch;
-            DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
+
+            DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
+                Models.DealWithLocalChanges.StashAndReapply :
+                Models.DealWithLocalChanges.DoNothing;
         }
 
         public override async Task<bool> Sure()

src/ViewModels/CheckoutAndFastForward.cs

@@ -30,7 +30,10 @@ public CheckoutAndFastForward(Repository repo, Models.Branch localBranch, Models
             _repo = repo;
             LocalBranch = localBranch;
             RemoteBranch = remoteBranch;
-            DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
+
+            DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
+                Models.DealWithLocalChanges.StashAndReapply :
+                Models.DealWithLocalChanges.DoNothing;
         }
 
         public override async Task<bool> Sure()

src/ViewModels/CheckoutCommit.cs

@@ -24,7 +24,10 @@ public CheckoutCommit(Repository repo, Models.Commit commit)
         {
             _repo = repo;
             Commit = commit;
-            DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
+
+            DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
+                Models.DealWithLocalChanges.StashAndReapply :
+                Models.DealWithLocalChanges.DoNothing;
         }
 
         public override async Task<bool> Sure()

src/ViewModels/Preferences.cs

@@ -254,6 +254,12 @@ public bool IgnoreCRAtEOLInDiff
             }
         }
 
+        public bool UseStashAndReapplyByDefault
+        {
+            get;
+            set;
+        } = false;
+
         public bool EnableAutoFetch
         {
             get;

src/ViewModels/Pull.cs

@@ -47,7 +47,7 @@ public Models.DealWithLocalChanges DealWithLocalChanges
         {
             get;
             set;
-        } = Models.DealWithLocalChanges.DoNothing;
+        }
 
         public bool UseRebase
         {
@@ -60,6 +60,10 @@ public Pull(Repository repo, Models.Branch specifiedRemoteBranch)
             _repo = repo;
             Current = repo.CurrentBranch;
 
+            DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
+                Models.DealWithLocalChanges.StashAndReapply :
+                Models.DealWithLocalChanges.DoNothing;
+
             if (specifiedRemoteBranch != null)
             {
                 _selectedRemote = repo.Remotes.Find(x => x.Name == specifiedRemoteBranch.Remote);

src/Views/DealWithLocalChangesMethod.axaml

@@ -10,16 +10,19 @@
     <RadioButton Content="{DynamicResource Text.DealWithLocalChanges.DoNothing}"
                  x:Name="RadioDoNothing"
                  Height="24"
+                 IsChecked="True"
                  Click="OnRadioButtonClicked"
                  Tag="{Binding Source={x:Static m:DealWithLocalChanges.DoNothing}}"/>
     <RadioButton Content="{DynamicResource Text.DealWithLocalChanges.StashAndReapply}"
                  x:Name="RadioStashAndReapply"
                  Height="24"
+                 IsChecked="False"
                  Click="OnRadioButtonClicked"
                  Tag="{Binding Source={x:Static m:DealWithLocalChanges.StashAndReapply}}"/>
     <RadioButton Content="{DynamicResource Text.DealWithLocalChanges.Discard}"
                  x:Name="RadioDiscard"
                  Height="24"
+                 IsChecked="False"
                  Click="OnRadioButtonClicked"
                  Tag="{Binding Source={x:Static m:DealWithLocalChanges.Discard}}"/>
   </StackPanel>

src/Views/DealWithLocalChangesMethod.axaml.cs

@@ -18,7 +18,14 @@ public Models.DealWithLocalChanges Method
         public DealWithLocalChangesMethod()
         {
             InitializeComponent();
-            UpdateRadioButtons();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == MethodProperty)
+                UpdateRadioButtons();
         }
 
         private void OnRadioButtonClicked(object sender, RoutedEventArgs e)