Mercurial > hg-stable
changeset 33811:f2befc1f4cf4
exchange: remove 'locallocked' member from pushop object
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.
Differential Revision: https://phab.mercurial-scm.org/D389
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 28 Jul 2017 21:49:44 -0700 |
| parents | 19f495fef0a3 |
| children | 20d663a104fb |
| files | mercurial/exchange.py |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/exchange.py Sat Aug 12 21:01:06 2017 -0700 +++ b/mercurial/exchange.py Fri Jul 28 21:49:44 2017 -0700 @@ -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,6 +440,7 @@ # 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. @@ -449,9 +448,8 @@ 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. @@ -460,7 +458,7 @@ 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())