facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

histedit: move locks into state

Browse Source 
Allow action functions to control the locks. This is necessary for
an implementation of x/exec or similar.
This commit is contained in:
David Soria Parra 2014-10-15 08:38:36 -07:00
parent 682ab7e2b3
commit c65ab5256c
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hgext/histedit.py
View File

@ -190,12 +190,14 @@ editcomment = _("""# Edit history between %s and %s
class histeditstate(object):
def __init__(self, repo, parentctx=None, rules=None, keep=None,
topmost=None, replacements=None):
topmost=None, replacements=None, lock=None, wlock=None):
self.repo = repo
self.rules = rules
self.keep = keep
self.topmost = topmost
self.parentctx = parentctx
self.lock = lock
self.wlock = wlock
if replacements is None:
self.replacements = []
else:
@ -537,15 +539,15 @@ def histedit(ui, repo, *freeargs, **opts):
for intentional "edit" command, but also for resolving unexpected
conflicts).
"""
lock = wlock = None
state = histeditstate(repo)
try:
wlock = repo.wlock()
lock = repo.lock()
_histedit(ui, repo, *freeargs, **opts)
state.wlock = repo.wlock()
state.lock = repo.lock()
_histedit(ui, repo, state, *freeargs, **opts)
finally:
release(lock, wlock)
release(state.lock, state.wlock)
def _histedit(ui, repo, *freeargs, **opts):
def _histedit(ui, repo, state, *freeargs, **opts):
# TODO only abort if we try and histedit mq patches, not just
# blanket if mq patches are applied somewhere
mq = getattr(repo, 'mq', None)
@ -660,8 +662,11 @@ def _histedit(ui, repo, *freeargs, **opts):
parentctx = repo[root].parents()[0]
state = histeditstate(repo, parentctx, rules, keep, topmost,
replacements)
state.parentctx = parentctx
state.rules = rules
state.keep = keep
state.topmost = topmost
state.replacements = replacements
while state.rules:
state.write()