This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1836

obsolete: use context manager for lock in pushmarker()
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5574629d5d45: obsolete: use context manager for lock in pushmarker()
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 rHG5574629d5d45: obsolete: use context manager for lock in pushmarker() (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/obsolete.py (5 lines)

Diff 4766

mercurial/obsolete.py

"""Push markers over pushkey""" """Push markers over pushkey"""
if not key.startswith('dump'): if not key.startswith('dump'):
repo.ui.warn(_('unknown key: %r') % key) repo.ui.warn(_('unknown key: %r') % key)
return False return False
if old: if old:
repo.ui.warn(_('unexpected old value for %r') % key) repo.ui.warn(_('unexpected old value for %r') % key)
return False return False
data = util.b85decode(new) data = util.b85decode(new)
lock = repo.lock() with repo.lock():
try:
tr = repo.transaction('pushkey: obsolete markers') tr = repo.transaction('pushkey: obsolete markers')
try: try:
repo.obsstore.mergemarkers(tr, data) repo.obsstore.mergemarkers(tr, data)
repo.invalidatevolatilesets() repo.invalidatevolatilesets()
tr.close() tr.close()
return True return True
finally: finally:
tr.release() tr.release()
finally:
lock.release()
# keep compatibility for the 4.3 cycle # keep compatibility for the 4.3 cycle
def allprecursors(obsstore, nodes, ignoreflags=0): def allprecursors(obsstore, nodes, ignoreflags=0):
movemsg = 'obsolete.allprecursors moved to obsutil.allprecursors' movemsg = 'obsolete.allprecursors moved to obsutil.allprecursors'
util.nouideprecwarn(movemsg, '4.3') util.nouideprecwarn(movemsg, '4.3')
return obsutil.allprecursors(obsstore, nodes, ignoreflags) return obsutil.allprecursors(obsstore, nodes, ignoreflags)
def allsuccessors(obsstore, nodes, ignoreflags=0): def allsuccessors(obsstore, nodes, ignoreflags=0):