Show More
@@ -459,7 +459,9 b' def push(repo, remote, force=False, revs' | |||||
459 | msg = 'cannot lock source repository: %s\n' % err |
|
459 | msg = 'cannot lock source repository: %s\n' % err | |
460 | pushop.ui.debug(msg) |
|
460 | pushop.ui.debug(msg) | |
461 |
|
461 | |||
462 | try: |
|
462 | with wlock or util.nullcontextmanager(), \ | |
|
463 | lock or util.nullcontextmanager(), \ | |||
|
464 | pushop.trmanager or util.nullcontextmanager(): | |||
463 | pushop.repo.checkpush(pushop) |
|
465 | pushop.repo.checkpush(pushop) | |
464 | _pushdiscovery(pushop) |
|
466 | _pushdiscovery(pushop) | |
465 | if not _forcebundle1(pushop): |
|
467 | if not _forcebundle1(pushop): | |
@@ -469,16 +471,6 b' def push(repo, remote, force=False, revs' | |||||
469 | _pushobsolete(pushop) |
|
471 | _pushobsolete(pushop) | |
470 | _pushbookmark(pushop) |
|
472 | _pushbookmark(pushop) | |
471 |
|
473 | |||
472 | if pushop.trmanager: |
|
|||
473 | pushop.trmanager.close() |
|
|||
474 | finally: |
|
|||
475 | if pushop.trmanager: |
|
|||
476 | pushop.trmanager.release() |
|
|||
477 | if lock is not None: |
|
|||
478 | lock.release() |
|
|||
479 | if wlock is not None: |
|
|||
480 | wlock.release() |
|
|||
481 |
|
||||
482 | return pushop |
|
474 | return pushop | |
483 |
|
475 | |||
484 | # list of steps to perform discovery before push |
|
476 | # list of steps to perform discovery before push |
General Comments 0
You need to be logged in to leave comments.
Login now