Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: fix unmodified message detection for the "--- >8 ----" magic
authorYuya Nishihara <yuya@tcha.org>
Fri, 06 Jan 2017 22:50:04 +0900
changeset 30724 ee47e951c6f9
parent 30723 6ef9f32d76c6
child 30725 c2bd2f77965b
commit: fix unmodified message detection for the "--- >8 ----" magic We need the raw editortext to be compared with the templatetext.
mercurial/cmdutil.py file | annotate | diff | comparison | revisions
tests/test-commit.t file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Fri Jan 06 22:44:39 2017 +0900
+++ b/mercurial/cmdutil.py	Fri Jan 06 22:50:04 2017 +0900
@@ -2772,14 +2772,15 @@
 
     editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(),
                         editform=editform, pending=pending)
+    text = editortext
 
     # strip away anything below this special string (used for editors that want
     # to display the diff)
-    stripbelow = re.search(_linebelow, editortext, flags=re.MULTILINE)
+    stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
     if stripbelow:
-        editortext = editortext[:stripbelow.start()]
-
-    text = re.sub("(?m)^HG:.*(\n|$)", "", editortext)
+        text = text[:stripbelow.start()]
+
+    text = re.sub("(?m)^HG:.*(\n|$)", "", text)
     os.chdir(olddir)
 
     if finishdesc:
--- a/tests/test-commit.t	Fri Jan 06 22:44:39 2017 +0900
+++ b/tests/test-commit.t	Fri Jan 06 22:50:04 2017 +0900
@@ -712,6 +712,9 @@
   > EOF
   $ echo foo2 > foo2
   $ hg add foo2
+  $ HGEDITOR="sh $TESTTMP/notouching.sh" hg ci
+  abort: commit message unchanged
+  [255]
   $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci
   first line
   HG: this is customized commit template
hg-stable