From b4fbc2372ba5c097ec611a33a4136ede8b438a79 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 10 Mar 2025 20:02:09 +0800
Subject: [PATCH] enhance: show commit info tip when hover SHA in conflict view

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Conflict.cs     |  35 ++++++++--
 src/Views/Conflict.axaml       | 122 +++++++++++++++++++++++++++++++++
 src/Views/Conflict.axaml.cs    |  23 +++++++
 src/Views/WorkingCopy.axaml    |  79 +--------------------
 src/Views/WorkingCopy.axaml.cs |   9 ---
 5 files changed, 176 insertions(+), 92 deletions(-)
 create mode 100644 src/Views/Conflict.axaml
 create mode 100644 src/Views/Conflict.axaml.cs

diff --git a/src/ViewModels/Conflict.cs b/src/ViewModels/Conflict.cs
index 03c09e8a..1ccf4a33 100644
--- a/src/ViewModels/Conflict.cs
+++ b/src/ViewModels/Conflict.cs
@@ -1,5 +1,26 @@
 namespace SourceGit.ViewModels
 {
+    public class ConflictSourceBranch
+    {
+        public string Name { get; private set; }
+        public string Head { get; private set; }
+        public Models.Commit Revision { get; private set; }
+
+        public ConflictSourceBranch(string name, string head, Models.Commit revision)
+        {
+            Name = name;
+            Head = head;
+            Revision = revision;
+        }
+
+        public ConflictSourceBranch(Repository repo, Models.Branch branch)
+        {
+            Name = branch.Name;
+            Head = branch.Head;
+            Revision = new Commands.QuerySingleCommit(repo.FullPath, branch.Head).Result() ?? new Models.Commit() { SHA = branch.Head };
+        }
+    }
+
     public class Conflict
     {
         public object Theirs
@@ -31,28 +52,32 @@
             if (context is CherryPickInProgress cherryPick)
             {
                 Theirs = cherryPick.Head;
-                Mine = repo.CurrentBranch;
+                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
             }
             else if (context is RebaseInProgress rebase)
             {
                 var b = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName);
-                Theirs = (object)b ?? rebase.StoppedAt;
+                if (b != null)
+                    Theirs = new ConflictSourceBranch(b.Name, b.Head, rebase.StoppedAt);
+                else
+                    Theirs = new ConflictSourceBranch(rebase.HeadName, rebase.StoppedAt?.SHA ?? "----------", rebase.StoppedAt);
+
                 Mine = rebase.Onto;
             }
             else if (context is RevertInProgress revert)
             {
                 Theirs = revert.Head;
-                Mine = repo.CurrentBranch;
+                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
             }
             else if (context is MergeInProgress merge)
             {
                 Theirs = merge.Source;
-                Mine = repo.CurrentBranch;
+                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
             }
             else
             {
                 Theirs = "Stash or Patch";
-                Mine = repo.CurrentBranch;
+                Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
             }
         }
 
diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
new file mode 100644
index 00000000..9a056f9e
--- /dev/null
+++ b/src/Views/Conflict.axaml
@@ -0,0 +1,122 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:m="using:SourceGit.Models"
+             xmlns:v="using:SourceGit.Views"
+             xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:c="using:SourceGit.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.Conflict"
+             x:DataType="vm:Conflict">
+  <Border Background="{DynamicResource Brush.Window}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
+    <Grid VerticalAlignment="Center">
+      <StackPanel Orientation="Vertical" IsVisible="{Binding !IsResolved}">
+        <StackPanel.DataTemplates>
+          <DataTemplate DataType="vm:ConflictSourceBranch">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
+              <TextBlock Margin="4,0,0,0" Text="{Binding Name}"/>
+              <TextBlock Margin="4,0,0,0"
+                         Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                         Foreground="DarkOrange"
+                         TextDecorations="Underline"
+                         Cursor="Hand"
+                         PointerPressed="OnPressedSHA"
+                         ToolTip.Tip="{Binding Revision}"
+                         ToolTip.ShowDelay="0">
+                <TextBlock.DataTemplates>
+                  <DataTemplate DataType="m:Commit">
+                    <StackPanel MinWidth="400" Orientation="Vertical">
+                      <Grid ColumnDefinitions="Auto,*,Auto">
+                        <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
+                        <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                        <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                      </Grid>
+
+                      <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                    </StackPanel>
+                  </DataTemplate>
+                </TextBlock.DataTemplates>
+              </TextBlock>
+            </StackPanel>
+          </DataTemplate>
+
+          <DataTemplate DataType="m:Commit">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Commit}"/>
+              <v:CommitRefsPresenter Margin="8,0,0,0"
+                                     TagBackground="{DynamicResource Brush.DecoratorTag}"
+                                     Foreground="{DynamicResource Brush.FG1}"
+                                     FontFamily="{DynamicResource Fonts.Primary}"
+                                     FontSize="11"
+                                     VerticalAlignment="Center"
+                                     UseGraphColor="False"/>
+              <TextBlock Margin="4,0,0,0"
+                         Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                         Foreground="DarkOrange"
+                         TextDecorations="Underline"
+                         Cursor="Hand"
+                         PointerPressed="OnPressedSHA"
+                         ToolTip.Tip="{Binding}"
+                         ToolTip.ShowDelay="0">
+                <TextBlock.DataTemplates>
+                  <DataTemplate DataType="m:Commit">
+                    <StackPanel MinWidth="400" Orientation="Vertical">
+                      <Grid ColumnDefinitions="Auto,*,Auto">
+                        <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
+                        <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                        <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                      </Grid>
+
+                      <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                    </StackPanel>
+                  </DataTemplate>
+                </TextBlock.DataTemplates>
+              </TextBlock>
+              <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
+            </StackPanel>
+          </DataTemplate>
+
+          <DataTemplate DataType="x:String">
+            <StackPanel Orientation="Horizontal">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
+              <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
+            </StackPanel>
+          </DataTemplate>
+        </StackPanel.DataTemplates>
+
+        <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
+        <TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
+
+        <Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
+          <Border.IsVisible>
+            <MultiBinding Converter="{x:Static BoolConverters.And}">
+              <Binding Path="Theirs" Converter="{x:Static ObjectConverters.IsNotNull}"/>
+              <Binding Path="Mine" Converter="{x:Static ObjectConverters.IsNotNull}"/>
+            </MultiBinding>
+          </Border.IsVisible>
+
+          <Grid Margin="8,0,0,0" RowDefinitions="32,32" ColumnDefinitions="Auto,*">
+            <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="THEIRS"/>
+            <ContentControl Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Theirs}"/>
+            <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="MINE"/>
+            <ContentControl Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Mine}"/>
+          </Grid>
+        </Border>
+
+        <StackPanel Margin="0,8,0,0"  Orientation="Horizontal" HorizontalAlignment="Center">
+          <Button Classes="flat" Content="USE THEIRS" Command="{Binding UseTheirs}"/>
+          <Button Classes="flat" Margin="8,0,0,0" Content="USE MINE" Command="{Binding UseMine}"/>
+          <Button Classes="flat" Margin="8,0,0,0" Content="OPEN EXTERNAL MERGETOOL" Command="{Binding OpenExternalMergeTool}"/>
+        </StackPanel>
+      </StackPanel>
+
+      <StackPanel Orientation="Vertical" IsVisible="{Binding IsResolved}">
+        <Path Width="64" Height="64" Data="{StaticResource Icons.Check}" Fill="Green"/>
+        <TextBlock Margin="0,16,0,8" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts.Resolved}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
+        <TextBlock Text="{DynamicResource Text.WorkingCopy.CanStageTip}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
+      </StackPanel>
+    </Grid>
+  </Border>
+</UserControl>
diff --git a/src/Views/Conflict.axaml.cs b/src/Views/Conflict.axaml.cs
new file mode 100644
index 00000000..6121b5c8
--- /dev/null
+++ b/src/Views/Conflict.axaml.cs
@@ -0,0 +1,23 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+
+namespace SourceGit.Views
+{
+    public partial class Conflict : UserControl
+    {
+        public Conflict()
+        {
+            InitializeComponent();
+        }
+
+        private void OnPressedSHA(object sender, PointerPressedEventArgs e)
+        {
+            var repoView = this.FindAncestorOfType<Repository>();
+            if (repoView is { DataContext: ViewModels.Repository repo } && sender is TextBlock text)
+                repo.NavigateToCommit(text.Text);
+
+            e.Handled = true;
+        }
+    }
+}
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 926bce6e..c9b94d59 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -203,84 +203,7 @@
         <ContentControl Content="{Binding DetailContext}">
           <ContentControl.DataTemplates>
             <DataTemplate DataType="vm:Conflict">
-              <Border Background="{DynamicResource Brush.Window}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
-                <Grid VerticalAlignment="Center">
-                  <StackPanel Orientation="Vertical" IsVisible="{Binding !IsResolved}">
-                    <StackPanel.DataTemplates>
-                      <DataTemplate DataType="m:Branch">
-                        <StackPanel Orientation="Horizontal">
-                          <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding FriendlyName}"/>
-                          <TextBlock Margin="4,0,0,0"
-                                     Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                                     Foreground="DarkOrange"
-                                     TextDecorations="Underline"
-                                     Cursor="Hand"
-                                     PointerPressed="OnPressedSHA"/>
-                        </StackPanel>
-                      </DataTemplate>
-
-                      <DataTemplate DataType="m:Commit">
-                        <StackPanel Orientation="Horizontal">
-                          <Path Width="12" Height="12" Data="{StaticResource Icons.Commit}"/>
-                          <v:CommitRefsPresenter Margin="8,0,0,0"
-                                                 TagBackground="{DynamicResource Brush.DecoratorTag}"
-                                                 Foreground="{DynamicResource Brush.FG1}"
-                                                 FontFamily="{DynamicResource Fonts.Primary}"
-                                                 FontSize="11"
-                                                 VerticalAlignment="Center"
-                                                 UseGraphColor="False"/>
-                          <TextBlock Margin="4,0,0,0"
-                                     Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                                     Foreground="DarkOrange"
-                                     TextDecorations="Underline"
-                                     Cursor="Hand"
-                                     PointerPressed="OnPressedSHA"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding Subject}"/>
-                        </StackPanel>
-                      </DataTemplate>
-
-                      <DataTemplate DataType="x:String">
-                        <StackPanel Orientation="Horizontal">
-                          <Path Width="12" Height="12" Data="{StaticResource Icons.Changes}"/>
-                          <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
-                        </StackPanel>
-                      </DataTemplate>
-                    </StackPanel.DataTemplates>
-                    
-                    <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
-                    <TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
-
-                    <Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
-                      <Border.IsVisible>
-                        <MultiBinding Converter="{x:Static BoolConverters.And}">
-                          <Binding Path="Theirs" Converter="{x:Static ObjectConverters.IsNotNull}"/>
-                          <Binding Path="Mine" Converter="{x:Static ObjectConverters.IsNotNull}"/>
-                        </MultiBinding>
-                      </Border.IsVisible>
-
-                      <Grid Margin="8,0,0,0" RowDefinitions="32,32" ColumnDefinitions="Auto,*">
-                        <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="THEIRS"/>
-                        <ContentControl Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Theirs}"/>
-                        <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="MINE"/>
-                        <ContentControl Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Content="{Binding Mine}"/>
-                      </Grid>
-                    </Border>
-
-                    <StackPanel Margin="0,8,0,0"  Orientation="Horizontal" HorizontalAlignment="Center">
-                      <Button Classes="flat" Content="USE THEIRS" Command="{Binding UseTheirs}"/>
-                      <Button Classes="flat" Margin="8,0,0,0" Content="USE MINE" Command="{Binding UseMine}"/>
-                      <Button Classes="flat" Margin="8,0,0,0" Content="OPEN EXTERNAL MERGETOOL" Command="{Binding OpenExternalMergeTool}"/>
-                    </StackPanel>
-                  </StackPanel>
-
-                  <StackPanel Orientation="Vertical" IsVisible="{Binding IsResolved}">
-                    <Path Width="64" Height="64" Data="{StaticResource Icons.Check}" Fill="Green"/>
-                    <TextBlock Margin="0,16,0,8" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts.Resolved}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
-                    <TextBlock Text="{DynamicResource Text.WorkingCopy.CanStageTip}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
-                  </StackPanel>
-                </Grid>                
-              </Border>
+              <v:Conflict/>
             </DataTemplate>
 
             <DataTemplate DataType="vm:DiffContext">
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
index 04674f86..dfaad858 100644
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@@ -160,14 +160,5 @@ namespace SourceGit.Views
 
             e.Handled = true;
         }
-
-        private void OnPressedSHA(object sender, PointerPressedEventArgs e)
-        {
-            var repoView = this.FindAncestorOfType<Repository>();
-            if (repoView is { DataContext: ViewModels.Repository repo } && sender is TextBlock text)
-                repo.NavigateToCommit(text.Text);
-
-            e.Handled = true;
-        }
     }
 }