enhance: clear commit message before merging/cherry-picking/rebasing/reverting to allow SourceGit read it from git (#1414)

love-linger · love-linger · commit 7e2f3bec8c29 · 2025-06-12T10:39:52.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/CherryPick.cs b/src/ViewModels/CherryPick.cs
@@ -66,6 +66,7 @@ public CherryPick(Repository repo, Models.Commit merge, List<Models.Commit> pare
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
+            _repo.ClearCommitMessage();
             ProgressDescription = $"Cherry-Pick commit(s) ...";
 
             var log = _repo.CreateLog("Cherry-Pick");
diff --git a/src/ViewModels/Fetch.cs b/src/ViewModels/Fetch.cs
@@ -88,7 +88,7 @@ public override Task<bool> Sure()
                 CallUIThread(() =>
                 {
                     if (!string.IsNullOrEmpty(upstreamHead))
-                        _repo.NavigateToCommitDelayed(upstreamHead);
+                        _repo.NavigateToCommit(upstreamHead, true);
 
                     _repo.MarkFetched();
                     _repo.SetWatcherEnabled(true);
diff --git a/src/ViewModels/FetchInto.cs b/src/ViewModels/FetchInto.cs
@@ -37,7 +37,7 @@ public override Task<bool> Sure()
                 var changedLocalBranchHead = new Commands.QueryRevisionByRefName(_repo.FullPath, Local.Name).Result();
                 CallUIThread(() =>
                 {
-                    _repo.NavigateToCommitDelayed(changedLocalBranchHead);
+                    _repo.NavigateToCommit(changedLocalBranchHead, true);
                     _repo.SetWatcherEnabled(true);
                 });
 
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
@@ -54,6 +54,7 @@ public Merge(Repository repo, Models.Tag source, string into)
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
+            _repo.ClearCommitMessage();
             ProgressDescription = $"Merging '{_sourceName}' into '{Into}' ...";
 
             var log = _repo.CreateLog($"Merging '{_sourceName}' into '{Into}'");
@@ -67,7 +68,7 @@ public override Task<bool> Sure()
                 var head = new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").Result();
                 CallUIThread(() =>
                 {
-                    _repo.NavigateToCommitDelayed(head);
+                    _repo.NavigateToCommit(head, true);
                     _repo.SetWatcherEnabled(true);
                 });
                 return true;
diff --git a/src/ViewModels/MergeMultiple.cs b/src/ViewModels/MergeMultiple.cs
@@ -41,22 +41,23 @@ public MergeMultiple(Repository repo, List<Models.Branch> branches)
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
+            _repo.ClearCommitMessage();
             ProgressDescription = "Merge head(s) ...";
 
             var log = _repo.CreateLog("Merge Multiple Heads");
             Use(log);
 
             return Task.Run(() =>
             {
-                var succ = new Commands.Merge(
+                new Commands.Merge(
                     _repo.FullPath,
                     ConvertTargetToMergeSources(),
                     AutoCommit,
                     Strategy.Arg).Use(log).Exec();
 
                 log.Complete();
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
-                return succ;
+                return true;
             });
         }
 
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
@@ -167,7 +167,7 @@ public override Task<bool> Sure()
                 var head = new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").Result();
                 CallUIThread(() =>
                 {
-                    _repo.NavigateToCommitDelayed(head);
+                    _repo.NavigateToCommit(head, true);
                     _repo.SetWatcherEnabled(true);
                 });
 
diff --git a/src/ViewModels/Rebase.cs b/src/ViewModels/Rebase.cs
@@ -43,6 +43,7 @@ public Rebase(Repository repo, Models.Branch current, Models.Commit on)
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
+            _repo.ClearCommitMessage();
             ProgressDescription = "Rebasing ...";
 
             var log = _repo.CreateLog("Rebase");
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -925,24 +925,23 @@ public void MarkFetched()
             _lastFetchTime = DateTime.Now;
         }
 
-        public void NavigateToCommit(string sha)
+        public void NavigateToCommit(string sha, bool isDelayMode = false)
         {
-            if (_histories != null)
+            if (isDelayMode)
+            {
+                _navigateToCommitDelayed = sha;
+            }
+            else if (_histories != null)
             {
                 SelectedViewIndex = 0;
                 _histories.NavigateTo(sha);
             }
         }
 
-        public void NavigateToCommitDelayed(string sha)
-        {
-            _navigateToCommitDelayed = sha;
-        }
-
-        public void NavigateToCurrentHead()
+        public void ClearCommitMessage()
         {
-            if (_currentBranch != null)
-                NavigateToCommit(_currentBranch.Head);
+            if (_workingCopy is not null)
+                _workingCopy.CommitMessage = string.Empty;
         }
 
         public void ClearHistoriesFilter()
diff --git a/src/ViewModels/Revert.cs b/src/ViewModels/Revert.cs
@@ -25,6 +25,7 @@ public Revert(Repository repo, Models.Commit target)
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
+            _repo.ClearCommitMessage();
             ProgressDescription = $"Revert commit '{Target.SHA}' ...";
 
             var log = _repo.CreateLog($"Revert '{Target.SHA}'");
diff --git a/src/Views/RepositoryToolbar.axaml b/src/Views/RepositoryToolbar.axaml
@@ -126,7 +126,7 @@
         </ContentControl.DataTemplates>
       </ContentControl>
 
-      <Button Classes="icon_button" Width="32" Command="{Binding NavigateToCurrentHead}" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}">
+      <Button Classes="icon_button" Width="32" Click="NavigateToHead" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}">
         <Path Width="13" Height="13" Margin="0,2,0,0" Data="{StaticResource Icons.Target}" Fill="{DynamicResource Brush.FG1}"/>
       </Button>
     </StackPanel>
diff --git a/src/Views/RepositoryToolbar.axaml.cs b/src/Views/RepositoryToolbar.axaml.cs
@@ -150,5 +150,14 @@ private void OpenGitLogs(object sender, RoutedEventArgs e)
                 e.Handled = true;
             }
         }
+
+        private void NavigateToHead(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Repository { CurrentBranch: { } } repo)
+            {
+                repo.NavigateToCommit(repo.CurrentBranch.Head);
+                e.Handled = true;
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public CherryPick(Repository repo, Models.Commit merge, List<Models.Commit> pare`
`66`	`66`	`public override Task<bool> Sure()`
`67`	`67`	`{`
`68`	`68`	`_repo.SetWatcherEnabled(false);`
	`69`	`+ _repo.ClearCommitMessage();`
`69`	`70`	`ProgressDescription = $"Cherry-Pick commit(s) ...";`
`70`	`71`
`71`	`72`	`var log = _repo.CreateLog("Cherry-Pick");`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public override Task<bool> Sure()`
`88`	`88`	`CallUIThread(() =>`
`89`	`89`	`{`
`90`	`90`	`if (!string.IsNullOrEmpty(upstreamHead))`
`91`		`- _repo.NavigateToCommitDelayed(upstreamHead);`
	`91`	`+ _repo.NavigateToCommit(upstreamHead, true);`
`92`	`92`
`93`	`93`	`_repo.MarkFetched();`
`94`	`94`	`_repo.SetWatcherEnabled(true);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public override Task<bool> Sure()`
`37`	`37`	`var changedLocalBranchHead = new Commands.QueryRevisionByRefName(_repo.FullPath, Local.Name).Result();`
`38`	`38`	`CallUIThread(() =>`
`39`	`39`	`{`
`40`		`- _repo.NavigateToCommitDelayed(changedLocalBranchHead);`
	`40`	`+ _repo.NavigateToCommit(changedLocalBranchHead, true);`
`41`	`41`	`_repo.SetWatcherEnabled(true);`
`42`	`42`	`});`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public override Task<bool> Sure()`
`167`	`167`	`var head = new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").Result();`
`168`	`168`	`CallUIThread(() =>`
`169`	`169`	`{`
`170`		`- _repo.NavigateToCommitDelayed(head);`
	`170`	`+ _repo.NavigateToCommit(head, true);`
`171`	`171`	`_repo.SetWatcherEnabled(true);`
`172`	`172`	`});`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ public Rebase(Repository repo, Models.Branch current, Models.Commit on)`
`43`	`43`	`public override Task<bool> Sure()`
`44`	`44`	`{`
`45`	`45`	`_repo.SetWatcherEnabled(false);`
	`46`	`+ _repo.ClearCommitMessage();`
`46`	`47`	`ProgressDescription = "Rebasing ...";`
`47`	`48`
`48`	`49`	`var log = _repo.CreateLog("Rebase");`
Original file line number	Diff line number	Diff line change
`@@ -925,24 +925,23 @@ public void MarkFetched()`
`925`	`925`	`_lastFetchTime = DateTime.Now;`
`926`	`926`	`}`
`927`	`927`
`928`		`- public void NavigateToCommit(string sha)`
	`928`	`+ public void NavigateToCommit(string sha, bool isDelayMode = false)`
`929`	`929`	`{`
`930`		`- if (_histories != null)`
	`930`	`+ if (isDelayMode)`
	`931`	`+ {`
	`932`	`+ _navigateToCommitDelayed = sha;`
	`933`	`+ }`
	`934`	`+ else if (_histories != null)`
`931`	`935`	`{`
`932`	`936`	`SelectedViewIndex = 0;`
`933`	`937`	`_histories.NavigateTo(sha);`
`934`	`938`	`}`
`935`	`939`	`}`
`936`	`940`
`937`		`- public void NavigateToCommitDelayed(string sha)`
`938`		`- {`
`939`		`- _navigateToCommitDelayed = sha;`
`940`		`- }`
`941`		`-`
`942`		`- public void NavigateToCurrentHead()`
	`941`	`+ public void ClearCommitMessage()`
`943`	`942`	`{`
`944`		`- if (_currentBranch != null)`
`945`		`- NavigateToCommit(_currentBranch.Head);`
	`943`	`+ if (_workingCopy is not null)`
	`944`	`+ _workingCopy.CommitMessage = string.Empty;`
`946`	`945`	`}`
`947`	`946`
`948`	`947`	`public void ClearHistoriesFilter()`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public Revert(Repository repo, Models.Commit target)`
`25`	`25`	`public override Task<bool> Sure()`
`26`	`26`	`{`
`27`	`27`	`_repo.SetWatcherEnabled(false);`
	`28`	`+ _repo.ClearCommitMessage();`
`28`	`29`	`ProgressDescription = $"Revert commit '{Target.SHA}' ...";`
`29`	`30`
`30`	`31`	`var log = _repo.CreateLog($"Revert '{Target.SHA}'");`