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

strip: use context manager for locking and transaction in stripcmd()

Browse Source
This commit is contained in:
Martin von Zweigbergk 2017-06-19 11:20:29 -07:00
parent 72fa329bb6
commit a24c5e2f5e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hgext/strip.py
View File

@ -156,18 +156,12 @@ def stripcmd(ui, repo, *revs, **opts):
rsrevs = repair.stripbmrevset(repo, marks[0])
revs.update(set(rsrevs))
if not revs:
lock = tr = None
try:
lock = repo.lock()
tr = repo.transaction('bookmark')
with repo.lock(), repo.transaction('bookmark') as tr:
for bookmark in bookmarks:
del repomarks[bookmark]
repomarks.recordchange(tr)
tr.close()
for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
finally:
release(lock, tr)
for bookmark in sorted(bookmarks):
ui.write(_("bookmark '%s' deleted\n") % bookmark)
if not revs:
raise error.Abort(_('empty revision set'))