feature: stage/unstage hunk (#265)

Author: love-linger

src/Commands/Diff.cs

@@ -14,6 +14,11 @@ public partial class Diff : Command
 
         public Diff(string repo, Models.DiffOption opt, int unified)
         {
+            _result.TextDiff = new Models.TextDiff() {
+                Repo = repo,
+                Option = opt,
+            };
+
             WorkingDirectory = repo;
             Context = repo;
             Args = $"diff --ignore-cr-at-eol --unified={unified} {opt}";
@@ -214,7 +219,7 @@ private void ProcessInlineHighlights()
             }
         }
 
-        private readonly Models.DiffResult _result = new Models.DiffResult() { TextDiff = new Models.TextDiff() };
+        private readonly Models.DiffResult _result = new Models.DiffResult();
         private readonly List<Models.TextDiffLine> _deleted = new List<Models.TextDiffLine>();
         private readonly List<Models.TextDiffLine> _added = new List<Models.TextDiffLine>();
         private int _oldLine = 0;

src/Models/DiffResult.cs

@@ -66,6 +66,9 @@ public partial class TextDiff
         public Vector SyncScrollOffset { get; set; } = Vector.Zero;
         public int MaxLineNumber = 0;
 
+        public string Repo { get; set; } = null;
+        public DiffOption Option { get; set; } = null;
+
         public void GenerateNewPatchFromSelection(Change change, string fileBlobGuid, TextDiffSelection selection, bool revert, string output)
         {
             var isTracked = !string.IsNullOrEmpty(fileBlobGuid);

src/Resources/Locales/en_US.axaml

@@ -307,6 +307,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Find next match</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Find previous match</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Open search panel</x:String>
+  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Stage Hunk</x:String>
+  <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Unstage Hunk</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Discard Hunk</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Initialize Repository</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Path:</x:String>
   <x:String x:Key="Text.Init.Tip" xml:space="preserve">Invalid repository detected. Run `git init` under this path?</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -310,6 +310,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">定位到下一个匹配搜索的位置</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">定位到上一个匹配搜索的位置</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">打开搜索</x:String>
+  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暂存片断</x:String>
+  <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">移出暂存区</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">丢弃片断</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">初始化新仓库</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">路径 ：</x:String>
   <x:String x:Key="Text.Init.Tip" xml:space="preserve">选择目录不是有效的Git仓库。是否需要在此目录执行`git init`操作？</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -310,6 +310,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">定位到下一個匹配搜尋的位置</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">定位到上一個匹配搜尋的位置</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">開啟搜尋</x:String>
+  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暫存片斷</x:String>
+  <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">移出暫存區</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">丟棄片斷</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">初始化新倉庫</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">路徑 ：</x:String>
   <x:String x:Key="Text.Init.Tip" xml:space="preserve">選擇目錄不是有效的Git倉庫。是否需要在此目錄執行`git init`操作？</x:String>

src/ViewModels/DiffContext.cs

@@ -12,21 +12,6 @@ namespace SourceGit.ViewModels
 {
     public class DiffContext : ObservableObject
     {
-        public string RepositoryPath
-        {
-            get => _repo;
-        }
-
-        public Models.Change WorkingCopyChange
-        {
-            get => _option.WorkingCopyChange;
-        }
-
-        public bool IsUnstaged
-        {
-            get => _option.IsUnstaged;
-        }
-
         public string Title
         {
             get => _title;

src/ViewModels/TwoSideTextDiff.cs

@@ -17,10 +17,17 @@ public Vector SyncScrollOffset
             set => SetProperty(ref _syncScrollOffset, value);
         }
 
+        public Models.DiffOption Option
+        {
+            get;
+            set;
+        }
+
         public TwoSideTextDiff(Models.TextDiff diff, TwoSideTextDiff previous = null)
         {
             File = diff.File;
             MaxLineNumber = diff.MaxLineNumber;
+            Option = diff.Option;
 
             foreach (var line in diff.Lines)
             {

src/Views/BranchCompare.axaml

@@ -132,8 +132,7 @@
 
           <!-- Changes -->
           <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
-            <v:ChangeCollectionView IsWorkingCopyChange="False"
-                                    ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode}"
+            <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode}"
                                     Changes="{Binding VisibleChanges}"
                                     SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
                                     ContextRequested="OnChangeContextRequested"/>

src/Views/ChangeCollectionView.axaml

@@ -56,7 +56,7 @@
                             IsChecked="{Binding IsExpanded}"
                             IsVisible="{Binding IsFolder}"/>
 
-              <v:ChangeStatusIcon Grid.Column="1" Width="14" Height="14" IsWorkingCopyChange="{Binding #ThisControl.IsWorkingCopyChange}" Change="{Binding Change}" IsVisible="{Binding !IsFolder}"/>
+              <v:ChangeStatusIcon Grid.Column="1" Width="14" Height="14" IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}" Change="{Binding Change}" IsVisible="{Binding !IsFolder}"/>
               <TextBlock Grid.Column="2" Classes="monospace" Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}" Margin="6,0,0,0"/>
             </Grid>
           </DataTemplate>
@@ -75,7 +75,7 @@
               <v:ChangeStatusIcon Grid.Column="0"
                                   Width="14" Height="14"
                                   Margin="4,0,0,0"
-                                  IsWorkingCopyChange="{Binding #ThisControl.IsWorkingCopyChange}"
+                                  IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}"
                                   Change="{Binding}" />
 
               <TextBlock Grid.Column="1"
@@ -104,7 +104,7 @@
               <v:ChangeStatusIcon Grid.Column="0"
                                   Width="14" Height="14"
                                   Margin="4,0,0,0"
-                                  IsWorkingCopyChange="{Binding #ThisControl.IsWorkingCopyChange}"
+                                  IsUnstagedChange="{Binding #ThisControl.IsUnstagedChange}"
                                   Change="{Binding}" />
 
               <TextBlock Grid.Column="1"

src/Views/ChangeCollectionView.axaml.cs

@@ -40,13 +40,13 @@ protected override void OnKeyDown(KeyEventArgs e)
 
     public partial class ChangeCollectionView : UserControl
     {
-        public static readonly StyledProperty<bool> IsWorkingCopyChangeProperty =
-            AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(IsWorkingCopyChange));
+        public static readonly StyledProperty<bool> IsUnstagedChangeProperty =
+            AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(IsUnstagedChange));
 
-        public bool IsWorkingCopyChange
+        public bool IsUnstagedChange
         {
-            get => GetValue(IsWorkingCopyChangeProperty);
-            set => SetValue(IsWorkingCopyChangeProperty, value);
+            get => GetValue(IsUnstagedChangeProperty);
+            set => SetValue(IsUnstagedChangeProperty, value);
         }
 
         public static readonly StyledProperty<SelectionMode> SelectionModeProperty =