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
..
__init__.py	largefiles: define norepo in command decorator	2014-05-04 21:11:15 -07:00
basestore.py	largefiles: hide passwords in URLs in ui messages	2013-10-17 16:13:15 +08:00
CONTRIBUTORS	hgext: add largefiles extension	2011-09-24 17:35:45 +02:00
lfcommands.py	largefiles: factor out synchronization of lfdirstate for future use	2014-08-11 22:29:43 +09:00
lfutil.py	largefiles: factor out synchronization of lfdirstate for future use	2014-08-11 22:29:43 +09:00
localstore.py	largefiles: don't close the fd passed to store._getfile	2013-04-15 23:47:04 +02:00
overrides.py	largefiles: put whole "hgmerge" process into the same "wlock" scope	2014-08-15 20:28:51 +09:00
proto.py	largefiles: import whole modules instead of importing parts of them	2014-04-08 00:48:36 +02:00
remotestore.py	largefiles: import whole modules instead of importing parts of them	2014-04-08 00:48:36 +02:00
reposetup.py	largefiles: synchronize lfdirstate with dirstate after automated committing	2014-08-11 22:29:43 +09:00
uisetup.py	largefiles: import whole modules instead of importing parts of them	2014-04-08 00:48:36 +02:00
wirestore.py	largefiles: stat all largefiles in one batch before downloading	2013-04-15 23:37:43 +02:00