Patchwork [4,of,6,STABLE] keyword: suppress keyword expansion while 'hg backout' for internal merge

login
register
mail settings
Submitter Katsunori FUJIWARA
Date June 5, 2014, 7:52 a.m.
Message ID <bd7d7ff223b97a722b17.1401954724@juju>
Download mbox | patch
Permalink /patch/4929/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - June 5, 2014, 7:52 a.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1401954434 -32400
#      Thu Jun 05 16:47:14 2014 +0900
# Branch stable
# Node ID bd7d7ff223b97a722b173fb76efa6dcd08b0bc94
# Parent  171d01a0342226410260100efd6ddf0705f0ea8e
keyword: suppress keyword expansion while 'hg backout' for internal merge

Before this patch, 'hg backout' may cause unexpected conflict, if 'hg
backout'-ed changes are located near lines in which keywords are
embedded, because keywords are substituted with other strings in the
working directory.

This patch suppresses keyword expansion while 'hg backout' for
internal merge by adding 'backout' to 'restricted' command list like
'merge'.

Patch

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -103,7 +103,7 @@  nokwcommands = ('add addremove annotate 
 # hg commands that trigger expansion only when writing to working dir,
 # not when reading filelog, and unexpand when reading from working dir
 restricted = ('merge kwexpand kwshrink record qrecord resolve transplant'
-              ' unshelve rebase graft')
+              ' unshelve rebase graft backout')
 
 # names of extensions using dorecord
 recordextensions = 'record'
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -1258,4 +1258,17 @@  Test restricted mode with graft
    $Xinfo$
   +xxxx
 
+Test restricted mode with backout
+
+  $ hg backout -q 11
+  $ hg diff a
+  diff -r 01a68de1003a a
+  --- a/a	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/a	* (glob)
+  @@ -3,4 +3,3 @@
+   do not process $Id:
+   xxx $
+   $Xinfo$
+  -xxxx
+
   $ cd ..