Show More
@@ -308,8 +308,6 b' class pushoperation(object):' | |||
|
308 | 308 | self.bookmarks = bookmarks |
|
309 | 309 | # allow push of new branch |
|
310 | 310 | self.newbranch = newbranch |
|
311 | # did a local lock get acquired? | |
|
312 | self.locallocked = None | |
|
313 | 311 | # step already performed |
|
314 | 312 | # (used to check what steps have been already performed through bundle2) |
|
315 | 313 | self.stepsdone = set() |
@@ -442,6 +440,7 b' def push(repo, remote, force=False, revs' | |||
|
442 | 440 | |
|
443 | 441 | # get local lock as we might write phase data |
|
444 | 442 | localwlock = locallock = None |
|
443 | locallocked = False | |
|
445 | 444 | try: |
|
446 | 445 | # bundle2 push may receive a reply bundle touching bookmarks or other |
|
447 | 446 | # things requiring the wlock. Take it now to ensure proper ordering. |
@@ -449,9 +448,8 b' def push(repo, remote, force=False, revs' | |||
|
449 | 448 | if (not _forcebundle1(pushop)) and maypushback: |
|
450 | 449 | localwlock = pushop.repo.wlock() |
|
451 | 450 | locallock = pushop.repo.lock() |
|
452 |
|
|
|
451 | locallocked = True | |
|
453 | 452 | except IOError as err: |
|
454 | pushop.locallocked = False | |
|
455 | 453 | if err.errno != errno.EACCES: |
|
456 | 454 | raise |
|
457 | 455 | # source repo cannot be locked. |
@@ -460,7 +458,7 b' def push(repo, remote, force=False, revs' | |||
|
460 | 458 | msg = 'cannot lock source repository: %s\n' % err |
|
461 | 459 | pushop.ui.debug(msg) |
|
462 | 460 | try: |
|
463 |
if |
|
|
461 | if locallocked: | |
|
464 | 462 | pushop.trmanager = transactionmanager(pushop.repo, |
|
465 | 463 | 'push-response', |
|
466 | 464 | pushop.remote.url()) |
General Comments 0
You need to be logged in to leave comments.
Login now