This is an archive of the discontinued Mercurial Phabricator instance.

Differential D393

exchange: simplify unbundle locking using context managers
ClosedPublic

Authored by martinvonz on Aug 14 2017, 7:46 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG389f7b17ffb3: exchange: simplify unbundle locking using context managers
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 14 2017, 7:46 PM
indygreg accepted this revision.Aug 14 2017, 9:33 PM
This revision is now accepted and ready to land.Aug 14 2017, 9:33 PM
Closed by commit rHG389f7b17ffb3: exchange: simplify unbundle locking using context managers (authored by martinvonz). · Explain WhyAug 15 2017, 2:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (14 lines)

Diff 891

mercurial/exchange.py

if err.errno != errno.EACCES: if err.errno != errno.EACCES:
raise raise
# source repo cannot be locked. # source repo cannot be locked.
# We do not abort the push, but just disable the local phase # We do not abort the push, but just disable the local phase
# synchronisation. # synchronisation.
msg = 'cannot lock source repository: %s\n' % err msg = 'cannot lock source repository: %s\n' % err
pushop.ui.debug(msg) pushop.ui.debug(msg)
try: with wlock or util.nullcontextmanager(), \
lock or util.nullcontextmanager(), \
pushop.trmanager or util.nullcontextmanager():
pushop.repo.checkpush(pushop) pushop.repo.checkpush(pushop)
_pushdiscovery(pushop) _pushdiscovery(pushop)
if not _forcebundle1(pushop): if not _forcebundle1(pushop):
_pushbundle2(pushop) _pushbundle2(pushop)
_pushchangeset(pushop) _pushchangeset(pushop)
_pushsyncphase(pushop) _pushsyncphase(pushop)
_pushobsolete(pushop) _pushobsolete(pushop)
_pushbookmark(pushop) _pushbookmark(pushop)
if pushop.trmanager:
pushop.trmanager.close()
finally:
if pushop.trmanager:
pushop.trmanager.release()
if lock is not None:
lock.release()
if wlock is not None:
wlock.release()
return pushop return pushop
# list of steps to perform discovery before push # list of steps to perform discovery before push
pushdiscoveryorder = [] pushdiscoveryorder = []
# Mapping between step name and function # Mapping between step name and function
# #
# This exists to help extensions wrap steps if necessary # This exists to help extensions wrap steps if necessary