D389: exchange: remove 'locallocked' member from pushop object
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Aug 15 02:14:22 EDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf2befc1f4cf4: exchange: remove 'locallocked' member from pushop object (authored by martinvonz).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D389?vs=887&id=915
REVISION DETAIL
https://phab.mercurial-scm.org/D389
AFFECTED FILES
mercurial/exchange.py
CHANGE DETAILS
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -308,8 +308,6 @@
self.bookmarks = bookmarks
# allow push of new branch
self.newbranch = newbranch
- # did a local lock get acquired?
- self.locallocked = None
# step already performed
# (used to check what steps have been already performed through bundle2)
self.stepsdone = set()
@@ -442,25 +440,25 @@
# get local lock as we might write phase data
localwlock = locallock = None
+ locallocked = False
try:
# bundle2 push may receive a reply bundle touching bookmarks or other
# things requiring the wlock. Take it now to ensure proper ordering.
maypushback = pushop.ui.configbool('experimental', 'bundle2.pushback')
if (not _forcebundle1(pushop)) and maypushback:
localwlock = pushop.repo.wlock()
locallock = pushop.repo.lock()
- pushop.locallocked = True
+ locallocked = True
except IOError as err:
- pushop.locallocked = False
if err.errno != errno.EACCES:
raise
# source repo cannot be locked.
# We do not abort the push, but just disable the local phase
# synchronisation.
msg = 'cannot lock source repository: %s\n' % err
pushop.ui.debug(msg)
try:
- if pushop.locallocked:
+ if locallocked:
pushop.trmanager = transactionmanager(pushop.repo,
'push-response',
pushop.remote.url())
To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list