enhance: reset commit message after a merge request has been aborted

love-linger · love-linger · commit df66bacbd29f · 2024-04-29T09:31:04.000+08:00
diff --git a/src/ViewModels/InProgressContexts.cs b/src/ViewModels/InProgressContexts.cs
@@ -22,9 +22,9 @@ public InProgressContext(string repo, string cmd)
             Cmd = cmd;
         }
 
-        public void Abort()
+        public bool Abort()
         {
-            new Commands.Command()
+            return new Commands.Command()
             {
                 WorkingDirectory = Repository,
                 Context = Repository,
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -511,7 +511,11 @@ public async void AbortMerge()
             if (_inProgressContext != null)
             {
                 SetWatcherEnabled(false);
-                await Task.Run(_inProgressContext.Abort);
+                var succ = await Task.Run(_inProgressContext.Abort);
+                if (succ && _workingCopy != null)
+                {
+                    _workingCopy.CommitMessage = string.Empty;
+                }
                 SetWatcherEnabled(true);
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ public InProgressContext(string repo, string cmd)`
`22`	`22`	`Cmd = cmd;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public void Abort()`
	`25`	`+ public bool Abort()`
`26`	`26`	`{`
`27`		`- new Commands.Command()`
	`27`	`+ return new Commands.Command()`
`28`	`28`	`{`
`29`	`29`	`WorkingDirectory = Repository,`
`30`	`30`	`Context = Repository,`
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,11 @@ public async void AbortMerge()`
`511`	`511`	`if (_inProgressContext != null)`
`512`	`512`	`{`
`513`	`513`	`SetWatcherEnabled(false);`
`514`		`- await Task.Run(_inProgressContext.Abort);`
	`514`	`+ var succ = await Task.Run(_inProgressContext.Abort);`
	`515`	`+ if (succ && _workingCopy != null)`
	`516`	`+ {`
	`517`	`+ _workingCopy.CommitMessage = string.Empty;`
	`518`	`+ }`
`515`	`519`	`SetWatcherEnabled(true);`
`516`	`520`	`}`
`517`	`521`	`else`