D1839: bookmarks: use context managers for lock and transaction in update()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Jan 10 18:02:54 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb9a0de08110e: bookmarks: use context managers for lock and transaction in update() (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1839?vs=4759&id=4769
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, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list