equal
deleted
inserted
replaced
93 # We do not abort the push, but just disable the local phase |
93 # We do not abort the push, but just disable the local phase |
94 # synchronisation. |
94 # synchronisation. |
95 msg = 'cannot lock source repository: %s\n' % err |
95 msg = 'cannot lock source repository: %s\n' % err |
96 pushop.ui.debug(msg) |
96 pushop.ui.debug(msg) |
97 try: |
97 try: |
98 pushop.repo.checkpush(pushop.force, pushop.revs) |
98 pushop.repo.checkpush(pushop) |
99 lock = None |
99 lock = None |
100 unbundle = pushop.remote.capable('unbundle') |
100 unbundle = pushop.remote.capable('unbundle') |
101 if not unbundle: |
101 if not unbundle: |
102 lock = pushop.remote.lock() |
102 lock = pushop.remote.lock() |
103 try: |
103 try: |