Merge pull request #69 from gadfly3173/feat/diff-file-mode

feat: show git file mode change if exist

Author: love-linger

src/Commands/Diff.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using SourceGit.Models;
 
 namespace SourceGit.Commands
 {
@@ -46,6 +47,22 @@ public Models.DiffResult Result()
 
         protected override void OnReadline(string line)
         {
+            if (line.StartsWith("old mode ", StringComparison.Ordinal))
+            {
+                _result.FileModeDiff ??= new FileModeDiff();
+
+                _result.FileModeDiff.Old = line.Substring(9);
+                return;
+            }
+
+            if (line.StartsWith("new mode ", StringComparison.Ordinal))
+            {
+                _result.FileModeDiff ??= new FileModeDiff();
+
+                _result.FileModeDiff.New = line.Substring(9);
+                return;
+            }
+
             if (_result.IsBinary)
                 return;
 

src/Models/DiffResult.cs

@@ -576,11 +576,18 @@ public class NoOrEOLChange
     {
     }
 
+    public class FileModeDiff
+    {
+        public string Old { get; set; } = string.Empty;
+        public string New { get; set; } = string.Empty;
+    }
+
     public class DiffResult
     {
         public bool IsBinary { get; set; } = false;
         public bool IsLFS { get; set; } = false;
         public TextDiff TextDiff { get; set; } = null;
         public LFSDiff LFSDiff { get; set; } = null;
+        public FileModeDiff FileModeDiff { get; set; } = null;
     }
 }

src/Resources/Locales/en_US.axaml

@@ -131,6 +131,7 @@
   <x:String x:Key="Text.Diff.Binary.New" xml:space="preserve">NEW</x:String>
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">OLD</x:String>
   <x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copy</x:String>
+  <x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed :</x:String>
   <x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Next Difference</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">NO CHANGES OR ONLY EOL CHANGES</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -131,6 +131,7 @@
   <x:String x:Key="Text.Diff.Binary.New" xml:space="preserve">当前大小</x:String>
   <x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">原始大小</x:String>
   <x:String x:Key="Text.Diff.Copy" xml:space="preserve">复制</x:String>
+  <x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">文件权限已变化 ：</x:String>
   <x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS对象变更</x:String>
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">下一个差异</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">没有变更或仅有换行符差异</x:String>

src/ViewModels/DiffContext.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 
 using Avalonia;
+using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 
@@ -66,6 +67,14 @@ public Vector SyncScrollOffset
             set => SetProperty(ref _syncScrollOffset, value);
         }
 
+        public Models.FileModeDiff FileModeDiff
+        {
+            get => _fileModeDiff;
+            set => SetProperty(ref _fileModeDiff, value);
+        }
+
+        public TextTrimming PathTrimming { get; } = new TextLeadingPrefixTrimming("...", 20);
+
         public DiffContext(string repo, Models.DiffOption option, DiffContext previous = null)
         {
             _repo = repo;
@@ -86,6 +95,11 @@ public DiffContext(string repo, Models.DiffOption option, DiffContext previous =
                 var latest = new Commands.Diff(repo, option).Result();
                 var rs = null as object;
 
+                if (latest.FileModeDiff != null)
+                {
+                    FileModeDiff = latest.FileModeDiff;
+                }
+
                 if (latest.TextDiff != null)
                 {
                     latest.TextDiff.File = _option.Path;
@@ -180,5 +194,6 @@ private Bitmap BitmapFromRevisionFile(string repo, string revision, string file)
         private bool _isTextDiff = false;
         private object _content = null;
         private Vector _syncScrollOffset = Vector.Zero;
+        private Models.FileModeDiff _fileModeDiff = null;
     }
 }

src/Views/DiffView.axaml

@@ -13,20 +13,28 @@
     <Grid RowDefinitions="26,*">
       <!-- Toolbar -->
       <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}">
-        <Grid ColumnDefinitions="Auto,*,Auto">
+        <Grid ColumnDefinitions="Auto,*,Auto,Auto">
           <StackPanel Grid.Column="0" Orientation="Horizontal" IsVisible="{Binding IsOrgFilePathVisible}" VerticalAlignment="Center">
             <Path Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
             <TextBlock Classes="monospace" Margin="4,0,0,0" Text="{Binding OrgFilePath, Converter={x:Static c:PathConverters.TruncateIfTooLong}}" FontSize="11"/>
             <TextBlock Margin="8,0,0,0" Text="→"/>
           </StackPanel>
 
-          <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-            <Path Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
-            <TextBlock Classes="monospace" Margin="4,0,0,0" Text="{Binding FilePath, Converter={x:Static c:PathConverters.TruncateIfTooLong}}" FontSize="11"/>
-            <Path Classes="rotating" Width="10" Height="10" Margin="8,0" Data="{DynamicResource Icons.Loading}" IsVisible="{Binding IsLoading}"/>
+          <DockPanel Grid.Column="1" VerticalAlignment="Center">
+            <Path DockPanel.Dock="Left" Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
+            <TextBlock Classes="monospace" Margin="4,0,0,0" Text="{Binding FilePath}"
+                       TextTrimming="{Binding PathTrimming}" TextWrapping="NoWrap" HorizontalAlignment="Stretch" ToolTip.Tip="{Binding FilePath}" FontSize="11"/>
+            <Path DockPanel.Dock="Right" Classes="rotating" Width="10" Height="10" Margin="8,0" Data="{StaticResource Icons.Loading}" IsVisible="{Binding IsLoading}"/>
+          </DockPanel>
+
+          <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center" IsVisible="{Binding FileModeDiff, Converter={x:Static ObjectConverters.IsNotNull}}">
+            <TextBlock Classes="monospace" Margin="8,0,0,0" Text="{DynamicResource Text.Diff.FileModeChanged}" FontSize="11"/>
+            <TextBlock Classes="monospace" Text="{Binding FileModeDiff.Old}" FontSize="11"/>
+            <TextBlock Margin="4,0" Text="→"/>
+            <TextBlock Classes="monospace" Text="{Binding FileModeDiff.New}" FontSize="11"/>
           </StackPanel>
 
-          <StackPanel Grid.Column="2" Margin="32,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
+          <StackPanel Grid.Column="3" Margin="32,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
             <ToggleButton Classes="line_path"
                           Width="32" Height="18"
                           Background="Transparent"