Mercurial > hg
comparison hgext/keyword.py @ 21704:65dd65c645ed stable
keyword: suppress keyword expansion while 'hg rebase' for internal merge
Before this patch, 'hg rebase' may cause unexpected conflict, if 'hg
rebase'-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 rebase' for internal
merge by adding 'rebase' to 'restricted' command list like 'merge'.
This patch specifies '--keep' to 'hg rebase', because revision #10 is
useful also for tests in succeeding patches.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 05 Jun 2014 16:47:13 +0900 |
parents | 99f7e5fe35f2 |
children | dd5ca1a32109 |
comparison
equal
deleted
inserted
replaced
21703:99f7e5fe35f2 | 21704:65dd65c645ed |
---|---|
101 ' outgoing push tip verify convert email glog') | 101 ' outgoing push tip verify convert email glog') |
102 | 102 |
103 # hg commands that trigger expansion only when writing to working dir, | 103 # hg commands that trigger expansion only when writing to working dir, |
104 # not when reading filelog, and unexpand when reading from working dir | 104 # not when reading filelog, and unexpand when reading from working dir |
105 restricted = ('merge kwexpand kwshrink record qrecord resolve transplant' | 105 restricted = ('merge kwexpand kwshrink record qrecord resolve transplant' |
106 ' unshelve') | 106 ' unshelve rebase') |
107 | 107 |
108 # names of extensions using dorecord | 108 # names of extensions using dorecord |
109 recordextensions = 'record' | 109 recordextensions = 'record' |
110 | 110 |
111 colortable = { | 111 colortable = { |