enhance: supports --skip while reverting commits

love-linger · love-linger · commit 0dd6692cd8a8 · 2024-12-11T15:12:25.000+08:00
diff --git a/src/ViewModels/InProgressContexts.cs b/src/ViewModels/InProgressContexts.cs
@@ -4,62 +4,40 @@ namespace SourceGit.ViewModels
 {
     public abstract class InProgressContext
     {
-        public string Repository
+        public InProgressContext(string repo, string cmd)
         {
-            get;
-            set;
-        }
-
-        public string Cmd
-        {
-            get;
-            set;
-        }
-
-        public bool CanSkip
-        {
-            get;
-            protected set;
-        }
-
-        public InProgressContext(string repo, string cmd, bool canSkip)
-        {
-            Repository = repo;
-            Cmd = cmd;
-            CanSkip = canSkip;
+            _repo = repo;
+            _cmd = cmd;
         }
 
         public bool Abort()
         {
             return new Commands.Command()
             {
-                WorkingDirectory = Repository,
-                Context = Repository,
-                Args = $"{Cmd} --abort",
+                WorkingDirectory = _repo,
+                Context = _repo,
+                Args = $"{_cmd} --abort",
             }.Exec();
         }
 
-        public bool Skip()
+        public virtual bool Skip()
         {
-            if (!CanSkip)
-                return true;
-
             return new Commands.Command()
             {
-                WorkingDirectory = Repository,
-                Context = Repository,
-                Args = $"{Cmd} --skip",
+                WorkingDirectory = _repo,
+                Context = _repo,
+                Args = $"{_cmd} --skip",
             }.Exec();
         }
 
         public virtual bool Continue()
         {
             return new Commands.Command()
             {
-                WorkingDirectory = Repository,
-                Context = Repository,
+                WorkingDirectory = _repo,
+                Context = _repo,
                 Editor = Commands.Command.EditorType.None,
-                Args = $"{Cmd} --continue",
+                Args = $"{_cmd} --continue",
             }.Exec();
         }
 
@@ -75,6 +53,9 @@ protected string GetFriendlyNameOfCommit(Models.Commit commit)
 
             return commit.SHA.Substring(0, 10);
         }
+
+        protected string _repo = string.Empty;
+        protected string _cmd = string.Empty;
     }
 
     public class CherryPickInProgress : InProgressContext
@@ -90,7 +71,7 @@ public string HeadName
             get => GetFriendlyNameOfCommit(Head);
         }
 
-        public CherryPickInProgress(Repository repo) : base(repo.FullPath, "cherry-pick", true) 
+        public CherryPickInProgress(Repository repo) : base(repo.FullPath, "cherry-pick") 
         {
             var headSHA = File.ReadAllText(Path.Combine(repo.GitDir, "CHERRY_PICK_HEAD")).Trim();
             Head = new Commands.QuerySingleCommit(repo.FullPath, headSHA).Result() ?? new Models.Commit() { SHA = headSHA };
@@ -122,7 +103,7 @@ public Models.Commit Onto
             private set;
         }
 
-        public RebaseInProgress(Repository repo) : base(repo.FullPath, "rebase", true)
+        public RebaseInProgress(Repository repo) : base(repo.FullPath, "rebase")
         {
             _gitDir = repo.GitDir;
 
@@ -141,8 +122,8 @@ public override bool Continue()
         {
             var succ = new Commands.Command()
             {
-                WorkingDirectory = Repository,
-                Context = Repository,
+                WorkingDirectory = _repo,
+                Context = _repo,
                 Editor = Commands.Command.EditorType.RebaseEditor,
                 Args = $"rebase --continue",
             }.Exec();
@@ -177,7 +158,7 @@ public Models.Commit Head
             private set;
         }
 
-        public RevertInProgress(Repository repo) : base(repo.FullPath, "revert", false)
+        public RevertInProgress(Repository repo) : base(repo.FullPath, "revert")
         {
             var headSHA = File.ReadAllText(Path.Combine(repo.GitDir, "REVERT_HEAD")).Trim();
             Head = new Commands.QuerySingleCommit(repo.FullPath, headSHA).Result() ?? new Models.Commit() { SHA = headSHA };
@@ -203,12 +184,17 @@ public string SourceName
             get => GetFriendlyNameOfCommit(Source);
         }
 
-        public MergeInProgress(Repository repo) : base(repo.FullPath, "merge", false)
+        public MergeInProgress(Repository repo) : base(repo.FullPath, "merge")
         {
             Current = Commands.Branch.ShowCurrent(repo.FullPath);
 
             var sourceSHA = File.ReadAllText(Path.Combine(repo.GitDir, "MERGE_HEAD")).Trim();
             Source = new Commands.QuerySingleCommit(repo.FullPath, sourceSHA).Result() ?? new Models.Commit() { SHA = sourceSHA };
         }
+
+        public override bool Skip()
+        {
+            return true;
+        }
     }
 }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -764,6 +764,11 @@ public void StashAll(bool autoStart)
             _workingCopy?.StashAll(autoStart);
         }
 
+        public void SkipMerge()
+        {
+            _workingCopy?.SkipMerge();
+        }
+
         public void AbortMerge()
         {
             _workingCopy?.AbortMerge();
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -491,6 +491,29 @@ public void ContinueMerge()
             }
         }
 
+        public void SkipMerge()
+        {
+            if (_inProgressContext != null)
+            {
+                _repo.SetWatcherEnabled(false);
+                Task.Run(() =>
+                {
+                    var succ = _inProgressContext.Skip();
+                    Dispatcher.UIThread.Invoke(() =>
+                    {
+                        if (succ)
+                            CommitMessage = string.Empty;
+
+                        _repo.SetWatcherEnabled(true);
+                    });
+                });
+            }
+            else
+            {
+                _repo.MarkWorkingCopyDirtyManually();
+            }
+        }
+
         public void AbortMerge()
         {
             if (_inProgressContext != null)
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
@@ -546,8 +546,8 @@
                   BorderBrush="{DynamicResource Brush.Border0}"/>
 
     <!-- Right -->
-    <Grid Grid.Column="2" RowDefinitions="Auto,Auto,*"> 
-      <Grid Grid.Row="0" Height="28" ColumnDefinitions="*,Auto,Auto" Background="{DynamicResource Brush.Conflict}" IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
+    <Grid Grid.Column="2" RowDefinitions="Auto,Auto,*">
+      <Grid Grid.Row="0" Height="28" ColumnDefinitions="*,Auto" Background="{DynamicResource Brush.Conflict}" IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
         <ContentControl Grid.Column="0" Margin="8,0" Content="{Binding InProgressContext}">
           <ContentControl.DataTemplates>
             <DataTemplate DataType="m:Commit">
@@ -563,27 +563,39 @@
             </DataTemplate>
             
             <DataTemplate DataType="vm:CherryPickInProgress">
-              <StackPanel Orientation="Horizontal">
-                <TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.CherryPick}"/>
-                <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.CherryPick.Head}"/>
-                <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="DarkOrange" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" ToolTip.Tip="{Binding Head}"/>
-              </StackPanel>
+              <Grid ColumnDefinitions="*,Auto">
+                <StackPanel Grid.Column="0" Orientation="Horizontal">
+                  <TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.CherryPick}"/>
+                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.CherryPick.Head}"/>
+                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="DarkOrange" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" ToolTip.Tip="{Binding Head}"/>
+                </StackPanel>
+
+                <Button Grid.Column="1" Classes="flat" FontWeight="Regular" BorderThickness="0" Content="{DynamicResource Text.Repository.Skip}" Padding="8,2" Click="OnSkipInProgress"/>
+              </Grid>
             </DataTemplate>
 
             <DataTemplate DataType="vm:RebaseInProgress">
-              <StackPanel Orientation="Horizontal">
-                <TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Rebase}"/>
-                <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Rebase.StoppedAt}"/>
-                <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="DarkOrange" Text="{Binding StoppedAt.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" ToolTip.Tip="{Binding StoppedAt}"/>
-              </StackPanel>
+              <Grid ColumnDefinitions="*,Auto">
+                <StackPanel Grid.Column="0" Orientation="Horizontal">
+                  <TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Rebase}"/>
+                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Rebase.StoppedAt}"/>
+                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="DarkOrange" Text="{Binding StoppedAt.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" ToolTip.Tip="{Binding StoppedAt}"/>
+                </StackPanel>
+
+                <Button Grid.Column="1" Classes="flat" FontWeight="Regular" BorderThickness="0" Content="{DynamicResource Text.Repository.Skip}" Padding="8,2" Click="OnSkipInProgress"/>
+              </Grid>
             </DataTemplate>
 
             <DataTemplate DataType="vm:RevertInProgress">
-              <StackPanel Orientation="Horizontal">
-                <TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Revert}"/>
-                <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Revert.Head}"/>
-                <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="DarkOrange" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" ToolTip.Tip="{Binding Head}"/>
-              </StackPanel>
+              <Grid ColumnDefinitions="*,Auto">
+                <StackPanel Grid.Column="0" Orientation="Horizontal">
+                  <TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Revert}"/>
+                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Revert.Head}"/>
+                  <TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="DarkOrange" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" ToolTip.Tip="{Binding Head}"/>
+                </StackPanel>
+
+                <Button Grid.Column="1" Classes="flat" FontWeight="Regular" BorderThickness="0" Content="{DynamicResource Text.Repository.Skip}" Padding="8,2" Click="OnSkipInProgress"/>
+              </Grid>
             </DataTemplate>
 
             <DataTemplate DataType="vm:MergeInProgress">
@@ -597,31 +609,13 @@
             </DataTemplate>
           </ContentControl.DataTemplates>
         </ContentControl>
-
-        <ContentControl Grid.Column="1" Margin="4,0" Content="{Binding InProgressContext}">
-          <ContentControl.DataTemplates>
-            <DataTemplate DataType="vm:CherryPickInProgress">
-              <Button Classes="flat" FontWeight="Regular" BorderThickness="0" Content="{DynamicResource Text.Repository.Skip}" Padding="8,2" Command="{Binding Skip}"/>
-            </DataTemplate>
-
-            <DataTemplate DataType="vm:RebaseInProgress">
-              <Button Classes="flat" FontWeight="Regular" BorderThickness="0" Content="{DynamicResource Text.Repository.Skip}" Padding="8,2" Command="{Binding Skip}"/>
-            </DataTemplate>
-
-            <DataTemplate DataType="vm:RevertInProgress">
-            </DataTemplate>
-
-            <DataTemplate DataType="vm:MergeInProgress">
-            </DataTemplate>
-          </ContentControl.DataTemplates>
-        </ContentControl>
         
-        <Button Grid.Column="2"
+        <Button Grid.Column="1"
                 Classes="flat"
                 FontWeight="Regular"
                 BorderThickness="0"
                 Content="{DynamicResource Text.Repository.Abort}"
-                Padding="8,2" Margin="4,0"
+                Padding="8,2" Margin="0,0,8,0"
                 Command="{Binding AbortMerge}"/>
       </Grid>
 
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
@@ -428,5 +428,13 @@ private void OnSwitchHistoriesOrderClicked(object sender, RoutedEventArgs e)
 
             e.Handled = true;
         }
+
+        private void OnSkipInProgress(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Repository repo)
+                repo.SkipMerge();
+
+            e.Handled = true;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,62 +4,40 @@ namespace SourceGit.ViewModels`
`4`	`4`	`{`
`5`	`5`	`public abstract class InProgressContext`
`6`	`6`	`{`
`7`		`- public string Repository`
	`7`	`+ public InProgressContext(string repo, string cmd)`
`8`	`8`	`{`
`9`		`- get;`
`10`		`- set;`
`11`		`- }`
`12`		`-`
`13`		`- public string Cmd`
`14`		`- {`
`15`		`- get;`
`16`		`- set;`
`17`		`- }`
`18`		`-`
`19`		`- public bool CanSkip`
`20`		`- {`
`21`		`- get;`
`22`		`- protected set;`
`23`		`- }`
`24`		`-`
`25`		`- public InProgressContext(string repo, string cmd, bool canSkip)`
`26`		`- {`
`27`		`- Repository = repo;`
`28`		`- Cmd = cmd;`
`29`		`- CanSkip = canSkip;`
	`9`	`+ _repo = repo;`
	`10`	`+ _cmd = cmd;`
`30`	`11`	`}`
`31`	`12`
`32`	`13`	`public bool Abort()`
`33`	`14`	`{`
`34`	`15`	`return new Commands.Command()`
`35`	`16`	`{`
`36`		`- WorkingDirectory = Repository,`
`37`		`- Context = Repository,`
`38`		`- Args = $"{Cmd} --abort",`
	`17`	`+ WorkingDirectory = _repo,`
	`18`	`+ Context = _repo,`
	`19`	`+ Args = $"{_cmd} --abort",`
`39`	`20`	`}.Exec();`
`40`	`21`	`}`
`41`	`22`
`42`		`- public bool Skip()`
	`23`	`+ public virtual bool Skip()`
`43`	`24`	`{`
`44`		`- if (!CanSkip)`
`45`		`- return true;`
`46`		`-`
`47`	`25`	`return new Commands.Command()`
`48`	`26`	`{`
`49`		`- WorkingDirectory = Repository,`
`50`		`- Context = Repository,`
`51`		`- Args = $"{Cmd} --skip",`
	`27`	`+ WorkingDirectory = _repo,`
	`28`	`+ Context = _repo,`
	`29`	`+ Args = $"{_cmd} --skip",`
`52`	`30`	`}.Exec();`
`53`	`31`	`}`
`54`	`32`
`55`	`33`	`public virtual bool Continue()`
`56`	`34`	`{`
`57`	`35`	`return new Commands.Command()`
`58`	`36`	`{`
`59`		`- WorkingDirectory = Repository,`
`60`		`- Context = Repository,`
	`37`	`+ WorkingDirectory = _repo,`
	`38`	`+ Context = _repo,`
`61`	`39`	`Editor = Commands.Command.EditorType.None,`
`62`		`- Args = $"{Cmd} --continue",`
	`40`	`+ Args = $"{_cmd} --continue",`
`63`	`41`	`}.Exec();`
`64`	`42`	`}`
`65`	`43`
`@@ -75,6 +53,9 @@ protected string GetFriendlyNameOfCommit(Models.Commit commit)`
`75`	`53`
`76`	`54`	`return commit.SHA.Substring(0, 10);`
`77`	`55`	`}`
	`56`	`+`
	`57`	`+ protected string _repo = string.Empty;`
	`58`	`+ protected string _cmd = string.Empty;`
`78`	`59`	`}`
`79`	`60`
`80`	`61`	`public class CherryPickInProgress : InProgressContext`
`@@ -90,7 +71,7 @@ public string HeadName`
`90`	`71`	`get => GetFriendlyNameOfCommit(Head);`
`91`	`72`	`}`
`92`	`73`
`93`		`- public CherryPickInProgress(Repository repo) : base(repo.FullPath, "cherry-pick", true)`
	`74`	`+ public CherryPickInProgress(Repository repo) : base(repo.FullPath, "cherry-pick")`
`94`	`75`	`{`
`95`	`76`	`var headSHA = File.ReadAllText(Path.Combine(repo.GitDir, "CHERRY_PICK_HEAD")).Trim();`
`96`	`77`	`Head = new Commands.QuerySingleCommit(repo.FullPath, headSHA).Result() ?? new Models.Commit() { SHA = headSHA };`
`@@ -122,7 +103,7 @@ public Models.Commit Onto`
`122`	`103`	`private set;`
`123`	`104`	`}`
`124`	`105`
`125`		`- public RebaseInProgress(Repository repo) : base(repo.FullPath, "rebase", true)`
	`106`	`+ public RebaseInProgress(Repository repo) : base(repo.FullPath, "rebase")`
`126`	`107`	`{`
`127`	`108`	`_gitDir = repo.GitDir;`
`128`	`109`
`@@ -141,8 +122,8 @@ public override bool Continue()`
`141`	`122`	`{`
`142`	`123`	`var succ = new Commands.Command()`
`143`	`124`	`{`
`144`		`- WorkingDirectory = Repository,`
`145`		`- Context = Repository,`
	`125`	`+ WorkingDirectory = _repo,`
	`126`	`+ Context = _repo,`
`146`	`127`	`Editor = Commands.Command.EditorType.RebaseEditor,`
`147`	`128`	`Args = $"rebase --continue",`
`148`	`129`	`}.Exec();`
`@@ -177,7 +158,7 @@ public Models.Commit Head`
`177`	`158`	`private set;`
`178`	`159`	`}`
`179`	`160`
`180`		`- public RevertInProgress(Repository repo) : base(repo.FullPath, "revert", false)`
	`161`	`+ public RevertInProgress(Repository repo) : base(repo.FullPath, "revert")`
`181`	`162`	`{`
`182`	`163`	`var headSHA = File.ReadAllText(Path.Combine(repo.GitDir, "REVERT_HEAD")).Trim();`
`183`	`164`	`Head = new Commands.QuerySingleCommit(repo.FullPath, headSHA).Result() ?? new Models.Commit() { SHA = headSHA };`
`@@ -203,12 +184,17 @@ public string SourceName`
`203`	`184`	`get => GetFriendlyNameOfCommit(Source);`
`204`	`185`	`}`
`205`	`186`
`206`		`- public MergeInProgress(Repository repo) : base(repo.FullPath, "merge", false)`
	`187`	`+ public MergeInProgress(Repository repo) : base(repo.FullPath, "merge")`
`207`	`188`	`{`
`208`	`189`	`Current = Commands.Branch.ShowCurrent(repo.FullPath);`
`209`	`190`
`210`	`191`	`var sourceSHA = File.ReadAllText(Path.Combine(repo.GitDir, "MERGE_HEAD")).Trim();`
`211`	`192`	`Source = new Commands.QuerySingleCommit(repo.FullPath, sourceSHA).Result() ?? new Models.Commit() { SHA = sourceSHA };`
`212`	`193`	`}`
	`194`	`+`
	`195`	`+ public override bool Skip()`
	`196`	`+ {`
	`197`	`+ return true;`
	`198`	`+ }`
`213`	`199`	`}`
`214`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -764,6 +764,11 @@ public void StashAll(bool autoStart)`
`764`	`764`	`_workingCopy?.StashAll(autoStart);`
`765`	`765`	`}`
`766`	`766`
	`767`	`+ public void SkipMerge()`
	`768`	`+ {`
	`769`	`+ _workingCopy?.SkipMerge();`
	`770`	`+ }`
	`771`	`+`
`767`	`772`	`public void AbortMerge()`
`768`	`773`	`{`
`769`	`774`	`_workingCopy?.AbortMerge();`
Original file line number	Diff line number	Diff line change
`@@ -428,5 +428,13 @@ private void OnSwitchHistoriesOrderClicked(object sender, RoutedEventArgs e)`
`428`	`428`
`429`	`429`	`e.Handled = true;`
`430`	`430`	`}`
	`431`	`+`
	`432`	`+ private void OnSkipInProgress(object sender, RoutedEventArgs e)`
	`433`	`+ {`
	`434`	`+ if (DataContext is ViewModels.Repository repo)`
	`435`	`+ repo.SkipMerge();`
	`436`	`+`
	`437`	`+ e.Handled = true;`
	`438`	`+ }`
`431`	`439`	`}`
`432`	`440`	`}`