From 7e1b1d7324c9a5c39738fae4ac14a78ced608d65 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 18 Aug 2023 14:13:32 +0800
Subject: [PATCH] feature<FileHistory>: add button to use selected revision of
 file

---
 src/Commands/Checkout.cs         |  5 +++++
 src/Resources/Locales/en_US.xaml |  1 +
 src/Resources/Locales/zh_CN.xaml |  1 +
 src/Views/FileHistories.xaml     | 19 ++++++++++++++++++-
 src/Views/FileHistories.xaml.cs  | 19 +++++++++++++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/Commands/Checkout.cs b/src/Commands/Checkout.cs
index dbab4947..1f169992 100644
--- a/src/Commands/Checkout.cs
+++ b/src/Commands/Checkout.cs
@@ -37,6 +37,11 @@ namespace SourceGit.Commands {
             return Exec();
         }
 
+        public bool FileWithRevision(string file, string revision) {
+            Args = $"checkout {revision} -- \"{file}\"";
+            return Exec();
+        }
+
         public bool Files(List<string> files) {
             StringBuilder builder = new StringBuilder();
             builder.Append("checkout -f -q --");
diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml
index 854913f1..da900303 100644
--- a/src/Resources/Locales/en_US.xaml
+++ b/src/Resources/Locales/en_US.xaml
@@ -259,6 +259,7 @@
     <sys:String x:Key="Text.Fetch.Prune">Prune remote dead branches</sys:String>
 
     <sys:String x:Key="Text.FileHistory">File History</sys:String>
+    <sys:String x:Key="Text.FileHistory.UseThisVersion">USE THIS VERSION</sys:String>
 
     <sys:String x:Key="Text.ChangeDisplayMode">CHANGE DISPLAY MODE</sys:String>
     <sys:String x:Key="Text.ChangeDisplayMode.Grid">Show as Grid</sys:String>
diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml
index 9adfbe56..9eafebf9 100644
--- a/src/Resources/Locales/zh_CN.xaml
+++ b/src/Resources/Locales/zh_CN.xaml
@@ -258,6 +258,7 @@
     <sys:String x:Key="Text.Fetch.Prune">自动清理远程已删除分支</sys:String>
 
     <sys:String x:Key="Text.FileHistory">文件历史</sys:String>
+    <sys:String x:Key="Text.FileHistory.UseThisVersion">使用该版本</sys:String>
 
     <sys:String x:Key="Text.ChangeDisplayMode">切换变更显示模式</sys:String>
     <sys:String x:Key="Text.ChangeDisplayMode.Grid">网格模式</sys:String>
diff --git a/src/Views/FileHistories.xaml b/src/Views/FileHistories.xaml
index ad2a461a..27aa7ac3 100644
--- a/src/Views/FileHistories.xaml
+++ b/src/Views/FileHistories.xaml
@@ -131,7 +131,24 @@
             <GridSplitter Grid.Column="1" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch" Background="Transparent"/>
 
             <!-- Diff Viewer -->
-            <widgets:DiffViewer Grid.Column="2" x:Name="diffViewer" Padding="4"/>
+            <Grid Grid.Column="2" Margin="4,4,4,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="36"/>
+                </Grid.RowDefinitions>
+                
+                <widgets:DiffViewer Grid.Row="0" x:Name="diffViewer" />
+
+                <Button 
+                    Grid.Row="1"
+                    Height="30" 
+                    Padding="8,0"
+                    FontWeight="Bold"
+                    HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Background="{DynamicResource Brush.Accent1}"
+                    Content="{DynamicResource Text.FileHistory.UseThisVersion}"
+                    Click="UseSelectedVersion"/>
+            </Grid>            
         </Grid>
     </Grid>
 </controls:Window>
diff --git a/src/Views/FileHistories.xaml.cs b/src/Views/FileHistories.xaml.cs
index 7d627421..944b4b83 100644
--- a/src/Views/FileHistories.xaml.cs
+++ b/src/Views/FileHistories.xaml.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -60,6 +61,24 @@ namespace SourceGit.Views {
             Models.Watcher.Get(repo).NavigateTo(e.Uri.OriginalString);
             e.Handled = true;
         }
+
+        private async void UseSelectedVersion(object sender, RoutedEventArgs e) {
+            var commit = commitList.SelectedItem as Models.Commit;
+            if (commit == null) return;
+
+            loading.IsAnimating = true;
+            loading.Visibility = Visibility.Visible;
+
+            await Task.Run(() => {
+                Models.Watcher.SetEnabled(repo, false);
+                new Commands.Checkout(repo).FileWithRevision(file, commit.SHA);
+                Models.Watcher.SetEnabled(repo, true);
+            });
+
+            loading.IsAnimating = false;
+            loading.Visibility = Visibility.Collapsed;
+            e.Handled = true;
+        }
         #endregion
     }
 }