Submitter | phabricator |
---|---|
Date | Jan. 10, 2018, 7:22 p.m. |
Message ID | <differential-rev-PHID-DREV-bxgc262pep3wqx2mqlwx-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/26643/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -392,14 +392,8 @@ bmchanges.append((bm, None)) if bmchanges: - lock = tr = None - try: - lock = repo.lock() - tr = repo.transaction('bookmark') + with repo.lock(), repo.transaction('bookmark') as tr: marks.applychanges(repo, tr, bmchanges) - tr.close() - finally: - lockmod.release(tr, lock) return bool(bmchanges) def listbinbookmarks(repo):