From 3ca4dc488c315c9d44b4fb663ef119d9791afca3 Mon Sep 17 00:00:00 2001
From: GadflyFang <gadfly@gadfly.vip>
Date: Thu, 6 Feb 2025 10:31:46 +0800
Subject: [PATCH] feat: Add stash auto-restore functionality (#947) (#948)

---
 src/Commands/Stash.cs             | 18 ++++++++++++------
 src/Models/RepositorySettings.cs  |  6 ++++++
 src/Resources/Locales/en_US.axaml |  2 ++
 src/Resources/Locales/zh_CN.axaml |  2 ++
 src/Resources/Locales/zh_TW.axaml |  2 ++
 src/ViewModels/StashChanges.cs    |  9 +++++++++
 src/Views/StashChanges.axaml      | 10 ++++++++--
 7 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs
index 223bfcd2..d2e12be8 100644
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@@ -73,21 +73,27 @@ namespace SourceGit.Commands
             return Exec();
         }
 
-        public bool Apply(string name)
+        public bool Apply(string name = null)
         {
-            Args = $"stash apply --index -q {name}";
+            Args = "stash apply -q";
+            if (!string.IsNullOrEmpty(name))
+                Args += $" \"{name}\"";
             return Exec();
         }
 
-        public bool Pop(string name)
+        public bool Pop(string name = null)
         {
-            Args = $"stash pop --index -q {name}";
+            Args = "stash pop -q";
+            if (!string.IsNullOrEmpty(name))
+                Args += $" \"{name}\"";
             return Exec();
         }
 
-        public bool Drop(string name)
+        public bool Drop(string name = null)
         {
-            Args = $"stash drop -q {name}";
+            Args = "stash drop -q";
+            if (!string.IsNullOrEmpty(name))
+                Args += $" \"{name}\"";
             return Exec();
         }
 
diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index d2d0c2f3..556c99ea 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -182,6 +182,12 @@ namespace SourceGit.Models
             set;
         } = false;
 
+        public bool AutoRestoreAfterStash
+        {
+            get;
+            set;
+        } = false;
+
         public string PreferedOpenAIService
         {
             get;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 5124eb05..631722ad 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -640,6 +640,8 @@
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Private SSH key store path</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">START</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">Auto-restore after stashing</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">Your working files remain unchanged, but a stash is saved.</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Include untracked files</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Keep staged files</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Message:</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 4d2dfedb..b220b9ae 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -644,6 +644,8 @@
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">SSH密钥文件</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">开    始</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">贮藏(stash)</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">贮藏后自动恢复工作区</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">工作区文件保持未修改状态，但贮藏内容已保存。</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">包含未跟踪的文件</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">保留暂存区文件</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">信息 ：</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 421dbd26..948cb2a8 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -643,6 +643,8 @@
   <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">SSH 金鑰檔案</x:String>
   <x:String x:Key="Text.Start" xml:space="preserve">開  始</x:String>
   <x:String x:Key="Text.Stash" xml:space="preserve">擱置變更 (stash)</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore" xml:space="preserve">暫存後自動復原工作區</x:String>
+  <x:String x:Key="Text.Stash.AutoRestore.Tip" xml:space="preserve">工作區檔案保持未修改，但暫存內容已儲存。</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">包含未追蹤的檔案</x:String>
   <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">保留已暫存的變更</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">擱置變更訊息:</x:String>
diff --git a/src/ViewModels/StashChanges.cs b/src/ViewModels/StashChanges.cs
index fd937bdd..3b5608f7 100644
--- a/src/ViewModels/StashChanges.cs
+++ b/src/ViewModels/StashChanges.cs
@@ -36,6 +36,12 @@ namespace SourceGit.ViewModels
             set => _repo.Settings.KeepIndexWhenStash = value;
         }
 
+        public bool AutoRestore
+        {
+            get => _repo.Settings.AutoRestoreAfterStash;
+            set => _repo.Settings.AutoRestoreAfterStash = value;
+        }
+
         public StashChanges(Repository repo, List<Models.Change> changes, bool hasSelectedFiles)
         {
             _repo = repo;
@@ -84,6 +90,9 @@ namespace SourceGit.ViewModels
                     succ = StashWithChanges(_changes);
                 }
 
+                if (AutoRestore && succ)
+                    succ = new Commands.Stash(_repo.FullPath).Apply();
+
                 CallUIThread(() =>
                 {
                     _repo.MarkWorkingCopyDirtyManually();
diff --git a/src/Views/StashChanges.axaml b/src/Views/StashChanges.axaml
index 772b09e6..2879c7e7 100644
--- a/src/Views/StashChanges.axaml
+++ b/src/Views/StashChanges.axaml
@@ -11,7 +11,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Stash.Title}"/>
-    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,Auto,32,Auto" ColumnDefinitions="120,*">
+    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,Auto,32,Auto,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0" 
                  HorizontalAlignment="Right" 
                  Margin="8,0" 
@@ -43,7 +43,13 @@
                 IsChecked="{Binding KeepIndex, Mode=TwoWay}"
                 ToolTip.Tip="--keep-index"/>
 
-      <TextBlock Grid.Row="4" Grid.Column="1"
+      <CheckBox Grid.Row="4" Grid.Column="1"
+                Height="32"
+                Content="{DynamicResource Text.Stash.AutoRestore}"
+                IsChecked="{Binding AutoRestore, Mode=TwoWay}"
+                ToolTip.Tip="{DynamicResource Text.Stash.AutoRestore.Tip}"/>
+
+      <TextBlock Grid.Row="5" Grid.Column="1"
                  Margin="0,4,0,0"
                  Text="{DynamicResource Text.Stash.TipForSelectedFiles}"
                  TextWrapping="Wrap"