This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1840

bookmarks: use context managers for locks and transaction in pushbookmark()
ClosedPublic

Authored by martinvonz on Jan 10 2018, 2:22 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGac7ee75ee664: bookmarks: use context managers for locks and transaction in pushbookmark()
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 10 2018, 2:22 PM
durin42 accepted this revision.Jan 10 2018, 5:44 PM
This revision is now accepted and ready to land.Jan 10 2018, 5:44 PM
Closed by commit rHGac7ee75ee664: bookmarks: use context managers for locks and transaction in pushbookmark() (authored by martinvonz). · Explain WhyJan 10 2018, 6:02 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (10 lines)

Diff 4770

mercurial/bookmarks.py

bin, bin,
hex, hex,
short, short,
wdirid, wdirid,
) )
from . import ( from . import (
encoding, encoding,
error, error,
lock as lockmod,
obsutil, obsutil,
pycompat, pycompat,
scmutil, scmutil,
txnutil, txnutil,
util, util,
) )
# label constants # label constants
def listbookmarks(repo): def listbookmarks(repo):
d = {} d = {}
for book, node in listbinbookmarks(repo): for book, node in listbinbookmarks(repo):
d[book] = hex(node) d[book] = hex(node)
return d return d
def pushbookmark(repo, key, old, new): def pushbookmark(repo, key, old, new):
w = l = tr = None with repo.wlock(), repo.lock(), repo.transaction('bookmarks') as tr:
try:
w = repo.wlock()
l = repo.lock()
tr = repo.transaction('bookmarks')
marks = repo._bookmarks marks = repo._bookmarks
existing = hex(marks.get(key, '')) existing = hex(marks.get(key, ''))
if existing != old and existing != new: if existing != old and existing != new:
return False return False
if new == '': if new == '':
changes = [(key, None)] changes = [(key, None)]
else: else:
if new not in repo: if new not in repo:
return False return False
changes = [(key, repo[new].node())] changes = [(key, repo[new].node())]
marks.applychanges(repo, tr, changes) marks.applychanges(repo, tr, changes)
tr.close()
return True return True
finally:
lockmod.release(tr, l, w)
def comparebookmarks(repo, srcmarks, dstmarks, targets=None): def comparebookmarks(repo, srcmarks, dstmarks, targets=None):
'''Compare bookmarks between srcmarks and dstmarks '''Compare bookmarks between srcmarks and dstmarks
This returns tuple "(addsrc, adddst, advsrc, advdst, diverge, This returns tuple "(addsrc, adddst, advsrc, advdst, diverge,
differ, invalid)", each are list of bookmarks below: differ, invalid)", each are list of bookmarks below:
:addsrc: added on src side (removed on dst side, perhaps) :addsrc: added on src side (removed on dst side, perhaps)