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

shelve: remove redundant acquisition of wlock for sub commands of unshelve

Browse Source 
Previous patch ensures that wlock is acquired before processing for
"hg unshelve". It makes acquisition of wlock in each functions below
redundant.

  - unshelveabort() for "unshelve --abort"
  - unshelvecontinue() for "unshelve --continue"
This commit is contained in:
FUJIWARA Katsunori 2015-12-09 08:28:53 +09:00
parent d4f8b1a01a
commit 3c4a554b71
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hgext/shelve.py
View File

@ -473,7 +473,6 @@ def pathtofiles(repo, files):
def unshelveabort(ui, repo, state, opts):
"""subcommand that abort an in-progress unshelve"""
wlock = repo.wlock()
lock = None
try:
checkparents(repo, state)
@ -497,7 +496,7 @@ def unshelveabort(ui, repo, state, opts):
finally:
shelvedstate.clear(repo)
ui.warn(_("unshelve of '%s' aborted\n") % state.name)
lockmod.release(lock, wlock)
lockmod.release(lock)
def mergefiles(ui, repo, wctx, shelvectx):
"""updates to wctx and merges the changes from shelvectx into the
@ -533,7 +532,6 @@ def unshelvecontinue(ui, repo, state, opts):
"""subcommand to continue an in-progress unshelve"""
# We're finishing off a merge. First parent is our original
# parent, second is the temporary "fake" commit we're unshelving.
wlock = repo.wlock()
lock = None
try:
checkparents(repo, state)
@ -571,7 +569,7 @@ def unshelvecontinue(ui, repo, state, opts):
unshelvecleanup(ui, repo, state.name, opts)
ui.status(_("unshelve of '%s' complete\n") % state.name)
finally:
lockmod.release(lock, wlock)
lockmod.release(lock)
@command('unshelve',
[('a', 'abort', None,