cmdutil: strip "%m" pattern (first line of commit message) from both ends
authorYuya Nishihara <yuya@tcha.org>
Sun, 18 Feb 2018 10:54:24 +0900
changeset 36507 165cf86365ff
parent 36506 74c033b9d579
child 36508 d7a23d6184a2
cmdutil: strip "%m" pattern (first line of commit message) from both ends This matches the behavior of the template keyword {desc}.
mercurial/cmdutil.py
tests/test-export.t
--- a/mercurial/cmdutil.py	Tue Feb 27 22:37:57 2018 +0900
+++ b/mercurial/cmdutil.py	Sun Feb 18 10:54:24 2018 +0900
@@ -898,7 +898,7 @@
         'R': lambda: '%d' % ctx.rev(),
         'h': lambda: short(ctx.node()),
         'm': lambda: re.sub('[^\w]', '_',
-                            ctx.description().rstrip().splitlines()[0]),
+                            ctx.description().strip().splitlines()[0]),
         'r': lambda: ('%d' % ctx.rev()).zfill(revwidth or 0),
         '%': lambda: '%',
         'b': lambda: os.path.basename(ctx.repo().root),
--- a/tests/test-export.t	Tue Feb 27 22:37:57 2018 +0900
+++ b/tests/test-export.t	Sun Feb 18 10:54:24 2018 +0900
@@ -184,7 +184,7 @@
   $ hg commit -m " !\"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]"'^'"_\`abcdefghijklmnopqrstuvwxyz{|}~"
   $ hg export -v -o %m.patch tip
   exporting patch:
-  ____________0123456789_______ABCDEFGHIJKLMNOPQRSTUVWXYZ______abcdefghijklmnopqrstuvwxyz____.patch
+  ___________0123456789_______ABCDEFGHIJKLMNOPQRSTUVWXYZ______abcdefghijklmnopqrstuvwxyz____.patch
 
 Invalid pattern in file name: