Use prepared commit message (MERGE_MSG) after merging

Strip conflict comments from MERGE_MSG as well.

Author: jorio

gitfourchette/porcelain.py

@@ -1848,6 +1848,15 @@ def wrap_conflict(self, path: str) -> DiffConflict:
         ancestor, ours, theirs = self.index.conflicts[path]
         return DiffConflict(ancestor, ours, theirs)
 
+    @property
+    def message_without_conflict_comments(self) -> str:
+        message = self.message
+        clean_message = ""
+        for line in message.splitlines(keepends=True):
+            if not line.startswith('#'):
+                clean_message += line
+        return clean_message.strip()
+
 
 class RepoContext:
     def __init__(self, repo_or_path: Repo | str | _Path, flags=RepositoryOpenFlag.DEFAULT, write_index=False):

gitfourchette/tasks/branchtasks.py

@@ -582,7 +582,10 @@ def flow(self, them: str):
             # Create merge commit
             self.effects |= TaskEffects.Workdir
             self.jumpTo = NavLocator.inWorkdir()
+
             self.repo.merge(target)
+            self.repoModel.prefs.draftCommitMessage = self.repo.message_without_conflict_comments
+
             self.postStatus = _("Merging {0} into {1}.", tquo(theirShorthand), tquo(myShorthand))
         else:
             # Fast-forward

gitfourchette/tasks/committasks.py

@@ -405,7 +405,7 @@ def flow(self, oid: Oid):
 
         yield from self.flowEnterUiThread()
 
-        repoModel.prefs.draftCommitMessage = self.repo.message
+        repoModel.prefs.draftCommitMessage = self.repo.message_without_conflict_comments
         repoModel.prefs.setDirty()
 
         self.jumpTo = NavLocator.inWorkdir()
@@ -446,7 +446,7 @@ def flow(self, oid: Oid):
                      "that the current branch doesn’t already have.", bquo(shortHash(oid)))
             raise AbortTask(info, "information")
 
-        self.repoModel.prefs.draftCommitMessage = self.repo.message
+        self.repoModel.prefs.draftCommitMessage = self.repo.message_without_conflict_comments
         self.repoModel.prefs.draftCommitSignature = commit.author
         self.repoModel.prefs.draftCommitSignatureOverride = SignatureOverride.Author
         self.repoModel.prefs.setDirty()

test/test_tasks_branch.py

@@ -912,6 +912,17 @@ def testMergeCausesConflicts(tempDir, mainWindow):
     assert not rw.conflictView.isVisible()
     assert re.search(r"all conflicts fixed", rw.mergeBanner.label.text(), re.I)
 
+    rw.diffArea.commitButton.click()
+    acceptQMessageBox(rw, "empty commit")
+    commitDialog: CommitDialog = findQDialog(rw, "commit")
+    preparedMessage = commitDialog.getFullMessage()
+    assert re.match(r"Merge commit.+1b2bae55", preparedMessage)
+    assert "Conflicts" not in preparedMessage
+    assert "#" not in preparedMessage
+
+    commitDialog.accept()
+    assert rw.repo.state() == RepositoryState.NONE
+
 
 @pytest.mark.parametrize("method", ["switchbranch", "newbranch", "checkout"])
 def testMightLoseDetachedHead(tempDir, mainWindow, method):