--- a/hgext/strip.py Mon Jun 19 11:17:31 2017 -0700
+++ b/hgext/strip.py Mon Jun 19 11:20:29 2017 -0700
@@ -156,18 +156,12 @@
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'))