Mercurial > hg

diff hgext/keyword.py @ 21705:dd5ca1a32109 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: suppress keyword expansion while 'hg graft' for internal merge Before this patch, 'hg graft' may cause unexpected conflict, if 'hg graft'-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 graft' for internal merge by adding 'graft' to 'restricted' command list like 'merge'.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 05 Jun 2014 16:47:14 +0900
parents 65dd65c645ed
children 5c64c338fa9f
line wrap: on
line diff
--- a/hgext/keyword.py	Thu Jun 05 16:47:13 2014 +0900
+++ b/hgext/keyword.py	Thu Jun 05 16:47:14 2014 +0900
@@ -103,7 +103,7 @@
 # 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')
+              ' unshelve rebase graft')
 
 # names of extensions using dorecord
 recordextensions = 'record'