This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1841

exchange: use context manager for locks and transaction in unbundle()
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG86f9aabed67b: exchange: use context manager for locks and transaction in unbundle()
Summary

Note that the transactionmanager doesn't actually create a transaction

  • that is done the first time .transaction() is called on it (if at

all). Consequently, .close() and .release() won't do anything if no
transaction has been created. This makes it a little unusual, but it
still works as a context manager.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 10 2018, 2:22 PM
durin42 accepted this revision.Jan 10 2018, 5:45 PM
This revision is now accepted and ready to land.Jan 10 2018, 5:45 PM
Closed by commit rHG86f9aabed67b: exchange: use context manager for locks and transaction in unbundle() (authored by martinvonz). · Explain WhyJan 10 2018, 6:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (10 lines)

Diff 4761

mercurial/exchange.py

if peerlocal: if peerlocal:
missing = set(peerlocal.requirements) - pullop.repo.supported missing = set(peerlocal.requirements) - pullop.repo.supported
if missing: if missing:
msg = _("required features are not" msg = _("required features are not"
" supported in the destination:" " supported in the destination:"
" %s") % (', '.join(sorted(missing))) " %s") % (', '.join(sorted(missing)))
raise error.Abort(msg) raise error.Abort(msg)
wlock = lock = None
try:
wlock = pullop.repo.wlock()
lock = pullop.repo.lock()
pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) pullop.trmanager = transactionmanager(repo, 'pull', remote.url())
with repo.wlock(), repo.lock(), pullop.trmanager:
# This should ideally be in _pullbundle2(). However, it needs to run # This should ideally be in _pullbundle2(). However, it needs to run
# before discovery to avoid extra work. # before discovery to avoid extra work.
_maybeapplyclonebundle(pullop) _maybeapplyclonebundle(pullop)
streamclone.maybeperformlegacystreamclone(pullop) streamclone.maybeperformlegacystreamclone(pullop)
_pulldiscovery(pullop) _pulldiscovery(pullop)
if pullop.canusebundle2: if pullop.canusebundle2:
_pullbundle2(pullop) _pullbundle2(pullop)
_pullchangeset(pullop) _pullchangeset(pullop)
_pullphase(pullop) _pullphase(pullop)
_pullbookmarks(pullop) _pullbookmarks(pullop)
_pullobsolete(pullop) _pullobsolete(pullop)
pullop.trmanager.close()
finally:
lockmod.release(pullop.trmanager, lock, wlock)
# storing remotenames # storing remotenames
if repo.ui.configbool('experimental', 'remotenames'): if repo.ui.configbool('experimental', 'remotenames'):
logexchange.pullremotenames(repo, remote) logexchange.pullremotenames(repo, remote)
return pullop return pullop
# list of steps to perform discovery before pull # list of steps to perform discovery before pull