sapling/hgext
FUJIWARA Katsunori 7975a9241d 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'.
2014-06-05 16:47:14 +09:00
..
convert convert: backout 41e062383fc9 and 80f42131aca3 -closemap 2014-04-16 01:10:08 +02:00
highlight check-code: check for spaces around = for named parameters 2013-10-03 14:50:47 +02:00
largefiles largefiles: better handling of log from other working directory (issue4236) 2014-05-01 15:12:49 +02:00
zeroconf zeroconf: use port from server instead of picking port from config (issue3746) 2012-12-30 19:19:52 +01:00
__init__.py Re-add hgext/__init__.py 2005-09-29 12:49:01 -07:00
acl.py check-code: check for spaces around = for named parameters 2013-10-03 14:50:47 +02:00
blackbox.py blackbox: fix blackbox causing exceptions in tests 2013-05-22 17:38:24 -07:00
bugzilla.py bugzilla: support Bugzilla 4.4.3+ API login token authentication (issue4257) 2014-05-23 17:29:04 +01:00
children.py commands: don't infer repo for commands like update (issue2748) 2012-10-16 11:43:15 -07:00
churn.py churn: compute padding with unicode strings 2014-04-19 15:11:25 +02:00
color.py color: don't fail on error messages when no curses (issue4237) 2014-05-03 03:29:30 +02:00
eol.py i18n: fix "% inside _()" problems 2014-04-01 02:46:03 +09:00
extdiff.py extdiff: move from dict() construction to {} literals 2014-03-12 13:13:42 -04:00
factotum.py factotum: clean up keychain for multiple hg repository authentication 2013-08-12 17:44:31 -05:00
fetch.py fetch: lowercase abort message 2012-06-12 14:18:18 +02:00
gpg.py gpg: show "Unknown key ID xxxxxxxx" when the status is ERRSIG 2013-07-14 21:50:52 +08:00
graphlog.py graphlog: mark as deprecated 2013-11-23 18:34:32 +01:00
hgcia.py changeset_templater: remove use_template method 2014-03-08 16:14:08 -06:00
hgk.py hgk: fix a pyflakes error 2013-03-25 16:57:36 -07:00
histedit.py histedit, i18n: replace '+' with concatenation to make hggettext happy 2014-04-22 10:14:16 -03:00
keyword.py keyword: suppress keyword expansion while 'hg graft' for internal merge 2014-06-05 16:47:14 +09:00
mq.py qfold: save manually edited commit message into ".hg/last-message.txt" 2014-03-19 01:07:41 +09:00
notify.py changeset_templater: remove use_template method 2014-03-08 16:14:08 -06:00
pager.py config: set a 'source' in most cases where config don't come from file but code 2014-03-19 02:45:14 +01:00
patchbomb.py patchbomb: warn when emailing a dirty working directory parent 2014-04-07 23:10:20 +02:00
progress.py progress: stop getting stuck in a nested topic during a long inner step 2013-08-23 13:28:18 -04:00
purge.py purge: avoid duplicate output for --print (issue4092) 2014-02-25 06:30:21 +05:30
rebase.py rebase: empty revset should be a gentle no-op with exit code 1, not an error 2014-05-01 16:47:50 +02:00
record.py record: use absolute path instead of os.chdir 2014-01-31 14:52:53 -08:00
relink.py relink: abort earlier when on different devices (issue3916) 2013-11-09 14:50:58 +01:00
schemes.py scheme: don't crash on invalid URLs 2013-04-11 14:41:22 +02:00
share.py share: fix unshare calling wrong repo.__init__() method 2013-11-16 17:30:34 -05:00
shelve.py bundle2: add a ui argument to readbundle 2014-04-14 15:45:30 -04:00
strip.py merge with stable 2013-11-25 12:18:29 -06:00
transplant.py transplant: use context ancestor instead of changelog ancestor 2014-04-07 23:17:51 +02:00
win32mbcs.py win32mbcs: wrap util.split() 2013-07-04 23:05:59 +09:00
win32text.py extensions: mark win32text deprecated 2014-03-01 19:51:22 -06:00