This is an archive of the discontinued Mercurial Phabricator instance.

Differential D389

exchange: remove 'locallocked' member from pushop object
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf2befc1f4cf4: exchange: remove 'locallocked' member from pushop object
Summary

The variable has been used only within a single function since
94e2862dbcfb (push: elevate phase transaction to cover entire
operation, 2014-11-21), so there's no need to keep it on the pushop
object.

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:27 PM
This revision is now accepted and ready to land.Aug 14 2017, 9:27 PM
Closed by commit rHGf2befc1f4cf4: exchange: remove 'locallocked' member from pushop object (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 (8 lines)

Diff 915

mercurial/exchange.py

# force option provided # force option provided
self.force = force self.force = force
# revs to be pushed (None is "all") # revs to be pushed (None is "all")
self.revs = revs self.revs = revs
# bookmark explicitly pushed # bookmark explicitly pushed
self.bookmarks = bookmarks self.bookmarks = bookmarks
# allow push of new branch # allow push of new branch
self.newbranch = newbranch self.newbranch = newbranch
# did a local lock get acquired?
self.locallocked = None
# step already performed # step already performed
# (used to check what steps have been already performed through bundle2) # (used to check what steps have been already performed through bundle2)
self.stepsdone = set() self.stepsdone = set()
# Integer version of the changegroup push result # Integer version of the changegroup push result
# - None means nothing to push # - None means nothing to push
# - 0 means HTTP error # - 0 means HTTP error
# - 1 means we pushed and remote head count is unchanged *or* # - 1 means we pushed and remote head count is unchanged *or*
# we have outgoing changesets but refused to push # we have outgoing changesets but refused to push
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 local lock as we might write phase data # get local lock as we might write phase data
localwlock = locallock = None localwlock = locallock = None
locallocked = 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:
localwlock = pushop.repo.wlock() localwlock = pushop.repo.wlock()
locallock = pushop.repo.lock() locallock = pushop.repo.lock()
pushop.locallocked = True locallocked = True
except IOError as err: except IOError as err:
pushop.locallocked = False
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 pushop.locallocked: if locallocked:
pushop.trmanager = transactionmanager(pushop.repo, pushop.trmanager = transactionmanager(pushop.repo,
'push-response', 'push-response',
pushop.remote.url()) 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)