D1839: bookmarks: use context managers for lock and transaction in update()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Jan 10 19:22:57 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1839
AFFECTED FILES
mercurial/bookmarks.py
CHANGE DETAILS
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):
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list