This is an archive of the discontinued Mercurial Phabricator instance.

Differential D391

exchange: remove need for "locked" variable
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5904511fc9f8: exchange: remove need for "locked" variable
Summary

The transactionmanager() constructor just assigned a few variables and
cannot fail, so it's safe to move it inside the earlier try/except.

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.Aug 14 2017, 7:46 PM
indygreg accepted this revision.Aug 14 2017, 9:29 PM
This revision is now accepted and ready to land.Aug 14 2017, 9:29 PM
Closed by commit rHG5904511fc9f8: exchange: remove need for "locked" variable (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 (10 lines)

Diff 917

mercurial/exchange.py

raise error.Abort(_("destination does not support push")) raise error.Abort(_("destination does not support push"))
if not pushop.remote.capable('unbundle'): if not pushop.remote.capable('unbundle'):
raise error.Abort(_('cannot push: destination does not support the ' raise error.Abort(_('cannot push: destination does not support the '
'unbundle wire protocol command')) 'unbundle wire protocol command'))
# get lock as we might write phase data # get lock as we might write phase data
wlock = lock = None wlock = lock = None
locked = False
try: try:
# bundle2 push may receive a reply bundle touching bookmarks or other # bundle2 push may receive a reply bundle touching bookmarks or other
# things requiring the wlock. Take it now to ensure proper ordering. # things requiring the wlock. Take it now to ensure proper ordering.
maypushback = pushop.ui.configbool('experimental', 'bundle2.pushback') maypushback = pushop.ui.configbool('experimental', 'bundle2.pushback')
if (not _forcebundle1(pushop)) and maypushback: if (not _forcebundle1(pushop)) and maypushback:
wlock = pushop.repo.wlock() wlock = pushop.repo.wlock()
lock = pushop.repo.lock() lock = pushop.repo.lock()
locked = True pushop.trmanager = transactionmanager(pushop.repo,
'push-response',
pushop.remote.url())
except IOError as err: except IOError as err:
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: try:
if locked:
pushop.trmanager = transactionmanager(pushop.repo,
'push-response',
pushop.remote.url())
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)