feature: add a context menu item to compare selected branch/revision with current worktree

src/Resources/Locales/en_US.axaml

@@ -34,6 +34,7 @@
   <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME ON THIS FILE IS NOT SUPPORTED!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Compare with HEAD</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copy Branch Name</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Delete${0}$</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Delete selected {0} branches</x:String>
@@ -79,6 +80,7 @@
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick This Commit</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Compare with HEAD</x:String>
+  <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">Copy SHA</x:String>
   <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase${0}$to Here</x:String>
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">Reset${0}$to Here</x:String>
@@ -478,4 +480,5 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">STAGE ALL</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">VIEW ASSUME UNCHANGED</x:String>
   <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Right-click the selected file(s), and make your choice to resolve conflicts.</x:String>
+  <x:String x:Key="Text.CurrentWorktree" xml:space="preserve">Current Worktree</x:String>
 </ResourceDictionary>

src/Resources/Locales/zh_CN.axaml

@@ -34,6 +34,7 @@
   <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">选中文件不支持该操作!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">检出(checkout)${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">复制分支名</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">删除${0}$</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">删除选中的 {0} 个分支</x:String>
@@ -79,6 +80,7 @@
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">挑选(cherry-pick)此提交</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">检出此提交</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</x:String>
+  <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">复制提交指纹</x:String>
   <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">变基(rebase)${0}$到此处</x:String>
   <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">重置(reset)${0}$到此处</x:String>
@@ -478,4 +480,5 @@
   <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">暂存所有</x:String>
   <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">查看忽略变更文件</x:String>
   <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">请选中冲突文件，打开右键菜单，选择合适的解决方式</x:String>
+  <x:String x:Key="Text.CurrentWorktree" xml:space="preserve">本地工作树</x:String>
 </ResourceDictionary>

src/ViewModels/Histories.cs

@@ -318,10 +318,10 @@ namespace SourceGit.ViewModels
 
             if (current.Head != commit.SHA)
             {
-                var compare = new MenuItem();
+                var compareWithHead = new MenuItem();
-                compare.Header = App.Text("CommitCM.CompareWithHead");
+                compareWithHead.Header = App.Text("CommitCM.CompareWithHead");
-                compare.Icon = App.CreateMenuIcon("Icons.Compare");
+                compareWithHead.Icon = App.CreateMenuIcon("Icons.Compare");
-                compare.Click += (o, e) =>
+                compareWithHead.Click += (o, e) =>
                 {
                     var head = _commits.Find(x => x.SHA == current.Head);
                     if (head == null)
@@ -338,8 +338,21 @@ namespace SourceGit.ViewModels
 
                     e.Handled = true;
                 };
+                menu.Items.Add(compareWithHead);
+
+                if (_repo.WorkingCopyChangesCount > 0)
+                {
+                    var compareWithWorktree = new MenuItem();
+                    compareWithWorktree.Header = App.Text("CommitCM.CompareWithWorktree");
+                    compareWithWorktree.Icon = App.CreateMenuIcon("Icons.Compare");
+                    compareWithWorktree.Click += (o, e) =>
+                    {
+                        DetailContext = new RevisionCompare(_repo.FullPath, commit, null);
+                        e.Handled = true;
+                    };
+                    menu.Items.Add(compareWithWorktree);
+                }
 
-                menu.Items.Add(compare);
                 menu.Items.Add(new MenuItem() { Header = "-" });
             }
 

src/ViewModels/Repository.cs

@@ -947,6 +947,25 @@ namespace SourceGit.ViewModels
                     e.Handled = true;
                 };
 
+                if (WorkingCopyChangesCount > 0)
+                {
+                    var compareWithWorktree = new MenuItem();
+                    compareWithWorktree.Header = App.Text("BranchCM.CompareWithWorktree");
+                    compareWithWorktree.Icon = App.CreateMenuIcon("Icons.Compare");
+                    compareWithWorktree.Click += (o, e) =>
+                    {
+                        SearchResultSelectedCommit = null;
+
+                        if (_histories != null)
+                        {
+                            var target = new Commands.QuerySingleCommit(FullPath, branch.Head).Result();
+                            _histories.AutoSelectedCommit = null;
+                            _histories.DetailContext = new RevisionCompare(FullPath, target, null);
+                        }
+                    };
+                    menu.Items.Add(compareWithWorktree);
+                }
+
                 menu.Items.Add(new MenuItem() { Header = "-" });
                 menu.Items.Add(compare);
             }
@@ -1238,8 +1257,27 @@ namespace SourceGit.ViewModels
 
                         e.Handled = true;
                     };
-
                     menu.Items.Add(compare);
+
+                    if (WorkingCopyChangesCount > 0)
+                    {
+                        var compareWithWorktree = new MenuItem();
+                        compareWithWorktree.Header = App.Text("BranchCM.CompareWithWorktree");
+                        compareWithWorktree.Icon = App.CreateMenuIcon("Icons.Compare");
+                        compareWithWorktree.Click += (o, e) =>
+                        {
+                            SearchResultSelectedCommit = null;
+
+                            if (_histories != null)
+                            {
+                                var target = new Commands.QuerySingleCommit(FullPath, branch.Head).Result();
+                                _histories.AutoSelectedCommit = null;
+                                _histories.DetailContext = new RevisionCompare(FullPath, target, null);
+                            }
+                        };
+                        menu.Items.Add(compareWithWorktree);
+                    }
+
                     menu.Items.Add(new MenuItem() { Header = "-" });
                 }
             }

src/ViewModels/RevisionCompare.cs

@@ -10,6 +10,11 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
+    public class CompareTargetWorktree
+    {
+        public string SHA => string.Empty;
+    }
+
     public class RevisionCompare : ObservableObject
     {
         public Models.Commit StartPoint
@@ -18,7 +23,7 @@ namespace SourceGit.ViewModels
             private set;
         }
 
-        public Models.Commit EndPoint
+        public object EndPoint
         {
             get;
             private set;
@@ -51,7 +56,7 @@ namespace SourceGit.ViewModels
                     else
                     {
                         SelectedNode = FileTreeNode.SelectByPath(_changeTree, value.Path);
-                        DiffContext = new DiffContext(_repo, new Models.DiffOption(StartPoint.SHA, EndPoint.SHA, value), _diffContext);
+                        DiffContext = new DiffContext(_repo, new Models.DiffOption(StartPoint.SHA, _endPoint, value), _diffContext);
                     }
                 }
             }
@@ -98,11 +103,21 @@ namespace SourceGit.ViewModels
         {
             _repo = repo;
             StartPoint = startPoint;
-            EndPoint = endPoint;
+
+            if (endPoint == null)
+            {
+                EndPoint = new CompareTargetWorktree();
+                _endPoint = string.Empty;
+            }
+            else
+            {
+                EndPoint = endPoint;
+                _endPoint = endPoint.SHA;
+            }
 
             Task.Run(() =>
             {
-                _changes = new Commands.CompareRevisions(_repo, startPoint.SHA, endPoint.SHA).Result();
+                _changes = new Commands.CompareRevisions(_repo, startPoint.SHA, _endPoint).Result();
 
                 var visible = _changes;
                 if (!string.IsNullOrWhiteSpace(_searchFilter))
@@ -162,7 +177,7 @@ namespace SourceGit.ViewModels
             diffWithMerger.Icon = App.CreateMenuIcon("Icons.Diff");
             diffWithMerger.Click += (_, ev) =>
             {
-                var opt = new Models.DiffOption(StartPoint.SHA, EndPoint.SHA, change);
+                var opt = new Models.DiffOption(StartPoint.SHA, _endPoint, change);
                 var type = Preference.Instance.ExternalMergeToolType;
                 var exec = Preference.Instance.ExternalMergeToolPath;
 
@@ -234,6 +249,7 @@ namespace SourceGit.ViewModels
         }
 
         private string _repo = string.Empty;
+        private string _endPoint = string.Empty;
         private List<Models.Change> _changes = null;
         private List<Models.Change> _visibleChanges = null;
         private List<FileTreeNode> _changeTree = null;

src/Views/RevisionCompare.axaml

@@ -11,39 +11,55 @@
              x:DataType="vm:RevisionCompare"
              Background="{DynamicResource Brush.Window}">
   <Grid RowDefinitions="50,*" Margin="4">
-    <Grid Grid.Row="0" ColumnDefinitions="48,*,48,*,48" Margin="0,0,0,4">
+    <Grid Grid.Row="0" Margin="48,0,48,4" ColumnDefinitions="*,48,*">
-      <Border Grid.Column="1" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
+      <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
         <Grid RowDefinitions="Auto,*">
-          <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto">
+          <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
             <v:Avatar Width="16" Height="16"
                       VerticalAlignment="Center"
                       IsHitTestVisible="False"
                       User="{Binding StartPoint.Author}"/>
             <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding StartPoint.Author.Name}" Margin="8,0,0,0"/>
-            <TextBlock Grid.Column="2" Classes="monospace" Text="{Binding StartPoint.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA"/>
+            <Border Grid.Column="2" Background="DarkGreen" CornerRadius="4" IsVisible="{Binding StartPoint.IsCurrentHead}">
-            <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding StartPoint.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+              <TextBlock Text="HEAD" Classes="monospace" Margin="4,0"/>
+            </Border> 
+            <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding StartPoint.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA"/>
+            <TextBlock Grid.Column="4" Classes="monospace" Text="{Binding StartPoint.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
           </Grid>
 
           <TextBlock Grid.Row="1" Classes="monospace" Text="{Binding StartPoint.Subject}" VerticalAlignment="Bottom"/>
         </Grid>
       </Border>
 
-      <Path Grid.Column="2" Width="16" Height="16" Fill="{DynamicResource Brush.FG2}" Data="{DynamicResource Icons.Down}" RenderTransformOrigin="50%,50%" RenderTransform="rotate(270deg)"/>
+      <Path Grid.Column="1" Width="16" Height="16" Fill="{DynamicResource Brush.FG2}" Data="{DynamicResource Icons.Down}" RenderTransformOrigin="50%,50%" RenderTransform="rotate(270deg)"/>
 
-      <Border Grid.Column="3" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
+      <Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
-        <Grid RowDefinitions="Auto,*">
+        <ContentControl Grid.Column="2" Content="{Binding EndPoint}">
-          <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto">
+          <ContentControl.DataTemplates>
-            <v:Avatar Width="16" Height="16"
+            <DataTemplate DataType="m:Commit">
-                      VerticalAlignment="Center"
+              <Grid RowDefinitions="Auto,*">
-                      IsHitTestVisible="False"
+                <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
-                      User="{Binding EndPoint.Author}"/>
+                  <v:Avatar Width="16" Height="16"
-            <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding EndPoint.Author.Name}" Margin="8,0,0,0"/>
+                            VerticalAlignment="Center"
-            <TextBlock Grid.Column="2" Classes="monospace" Text="{Binding EndPoint.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA" />
+                            IsHitTestVisible="False"
-            <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding EndPoint.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                            User="{Binding Author}"/>
-          </Grid>
+                  <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                  <Border Grid.Column="2" Background="DarkGreen" CornerRadius="4" IsVisible="{Binding IsCurrentHead}">
+                    <TextBlock Text="HEAD" Classes="monospace" Margin="4,0"/>
+                  </Border>
+                  <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA" />
+                  <TextBlock Grid.Column="4" Classes="monospace" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                </Grid>
 
-          <TextBlock Grid.Row="1" Classes="monospace" Text="{Binding EndPoint.Subject}" VerticalAlignment="Bottom"/>
+                <TextBlock Grid.Row="1" Classes="monospace" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
-        </Grid>
+              </Grid>
+            </DataTemplate>
+
+            <DataTemplate DataType="vm:CompareTargetWorktree">
+              <TextBlock Text="{DynamicResource Text.CurrentWorktree}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            </DataTemplate>
+          </ContentControl.DataTemplates>
+        </ContentControl>
       </Border>
     </Grid>