with: use context manager for wlock in overridepurge

This commit is contained in:
Bryan O'Sullivan 2016-01-15 13:14:46 -08:00
parent 070b1b5491
commit ab04c813f9

View File

@ -1223,8 +1223,7 @@ def overridepurge(orig, ui, repo, *dirs, **opts):
orig(ui, repo, *dirs, **opts) orig(ui, repo, *dirs, **opts)
repo.status = oldstatus repo.status = oldstatus
def overriderollback(orig, ui, repo, **opts): def overriderollback(orig, ui, repo, **opts):
wlock = repo.wlock() with repo.wlock():
try:
before = repo.dirstate.parents() before = repo.dirstate.parents()
orphans = set(f for f in repo.dirstate orphans = set(f for f in repo.dirstate
if lfutil.isstandin(f) and repo.dirstate[f] != 'r') if lfutil.isstandin(f) and repo.dirstate[f] != 'r')
@ -1258,8 +1257,6 @@ def overriderollback(orig, ui, repo, **opts):
for lfile in orphans: for lfile in orphans:
lfdirstate.drop(lfile) lfdirstate.drop(lfile)
lfdirstate.write() lfdirstate.write()
finally:
wlock.release()
return result return result
def overridetransplant(orig, ui, repo, *revs, **opts): def overridetransplant(orig, ui, repo, *revs, **opts):