Patchwork D389: exchange: remove 'locallocked' member from pushop object

login
register
mail settings
Submitter phabricator
Date Aug. 15, 2017, 6:14 a.m.
Message ID <a662a601f9d0e98043ef438474d8c991@localhost.localdomain>
Download mbox | patch
Permalink /patch/23008/
State Not Applicable
Headers show

Comments

phabricator - Aug. 15, 2017, 6:14 a.m.
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




To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

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())