FUJIWARA Katsunori a3e5d804ef largefiles: put whole "hgmerge" process into the same "wlock" scope ... Before this patch, there are two distinct "wlock" scopes below in "hgmerge": 1. "merge.update" via original "hg.merge" function 2. "updatelfiles" specific "wlock" scope (to synchronize largefile dirstate) But these should be executed in the same "wlock" scope for consistency, because users of "hg.merge" don't get "wlock" explicitly before invocation of it. - merge in commands This patch puts almost all of the original "hgmerge" implementation into "_hgmerge" to reduce changes.		2014-08-15 20:28:51 +09:00
..
convert	convert: fix argument mismatch at formatting the abort message	2014-08-01 02:14:24 +09:00
highlight	check-code: check for spaces around = for named parameters	2013-10-03 14:50:47 +02:00
largefiles	largefiles: put whole "hgmerge" process into the same "wlock" scope	2014-08-15 20:28:51 +09: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: correct config documentation error	2014-07-03 10:56:03 +01:00
children.py	children: define inferrepo in command decorator	2014-05-04 22:25:28 -07:00
churn.py	churn: define inferrepo in command decorator	2014-05-04 22:24:38 -07:00
color.py	color: pass on key error for win32 (issue4298)	2014-08-01 13:09:06 -05:00
eol.py	i18n: fix "% inside _()" problems	2014-04-01 02:46:03 +09:00
extdiff.py	extdiff: define inferrepo in command decorator	2014-05-04 22:29:27 -07:00
factotum.py	factotum: initialize global variables to suppress pyflakes warning	2014-05-02 18:24:10 +09:00
fetch.py	doc: unify help text for "--edit" option	2014-07-30 00:14:52 +09:00
gpg.py	doc: unify help text for "--message" option	2014-07-30 00:13:59 +09:00
graphlog.py	graphlog: define inferrepo in command decorator	2014-05-04 22:28:46 -07:00
hgcia.py	changeset_templater: remove use_template method	2014-03-08 16:14:08 -06:00
hgk.py	hgk: define inferrepo in command decorator	2014-05-04 22:33:22 -07:00
histedit.py	merge with stable	2014-08-14 15:21:48 -05:00
keyword.py	keyword: bump copyright year	2014-08-02 09:44:45 +01:00
mq.py	phase: add a transaction argument to advanceboundary	2014-08-06 01:54:19 -07:00
notify.py	changeset_templater: remove use_template method	2014-03-08 16:14:08 -06:00
pager.py	pager: add attend-<command> option	2014-05-09 13:32:56 -05:00
patchbomb.py	patchbomb: reorder header insertions to clarify code	2014-06-07 11:32:37 -04:00
progress.py	progress: use 'encoding.colwidth' to get column width of items correctly	2014-07-06 02:56:41 +09:00
purge.py	purge: drop stat import	2014-08-04 15:24:57 -05:00
rebase.py	rebase: do not retract phase boundary by hand	2014-08-05 13:22:44 -07:00
record.py	record: update comment to match code	2014-06-26 11:10:28 -04:00
relink.py	relink: declare command using decorator	2014-05-04 21:52:25 -07:00
schemes.py	scheme: don't crash on invalid URLs	2013-04-11 14:41:22 +02:00
share.py	share: define norepo in command decorator	2014-05-04 22:03:11 -07:00
shelve.py	unshelve: silence internal revert	2014-08-15 10:54:15 -05:00
strip.py	strip: remove -b/--backup codepaths	2014-07-24 15:06:08 -04:00
transplant.py	transplant: pass 'editform' argument to 'cmdutil.getcommiteditor'	2014-08-02 21:46:26 +09: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