Show More
@@ -440,7 +440,6 b' def push(repo, remote, force=False, revs' | |||
|
440 | 440 | |
|
441 | 441 | # get lock as we might write phase data |
|
442 | 442 | wlock = lock = None |
|
443 | locked = False | |
|
444 | 443 | try: |
|
445 | 444 | # bundle2 push may receive a reply bundle touching bookmarks or other |
|
446 | 445 | # things requiring the wlock. Take it now to ensure proper ordering. |
@@ -448,7 +447,9 b' def push(repo, remote, force=False, revs' | |||
|
448 | 447 | if (not _forcebundle1(pushop)) and maypushback: |
|
449 | 448 | wlock = pushop.repo.wlock() |
|
450 | 449 | lock = pushop.repo.lock() |
|
451 | locked = True | |
|
450 | pushop.trmanager = transactionmanager(pushop.repo, | |
|
451 | 'push-response', | |
|
452 | pushop.remote.url()) | |
|
452 | 453 | except IOError as err: |
|
453 | 454 | if err.errno != errno.EACCES: |
|
454 | 455 | raise |
@@ -457,11 +458,8 b' def push(repo, remote, force=False, revs' | |||
|
457 | 458 | # synchronisation. |
|
458 | 459 | msg = 'cannot lock source repository: %s\n' % err |
|
459 | 460 | pushop.ui.debug(msg) |
|
461 | ||
|
460 | 462 | try: |
|
461 | if locked: | |
|
462 | pushop.trmanager = transactionmanager(pushop.repo, | |
|
463 | 'push-response', | |
|
464 | pushop.remote.url()) | |
|
465 | 463 | pushop.repo.checkpush(pushop) |
|
466 | 464 | _pushdiscovery(pushop) |
|
467 | 465 | if not _forcebundle1(pushop): |
General Comments 0
You need to be logged in to leave comments.
Login now