equal
deleted
inserted
replaced
6 # GNU General Public License version 2 or any later version. |
6 # GNU General Public License version 2 or any later version. |
7 |
7 |
8 from __future__ import absolute_import |
8 from __future__ import absolute_import |
9 |
9 |
10 import collections |
10 import collections |
11 import errno |
|
12 import hashlib |
11 import hashlib |
13 |
12 |
14 from .i18n import _ |
13 from .i18n import _ |
15 from .node import ( |
14 from .node import ( |
16 bin, |
15 bin, |
511 wlock = pushop.repo.wlock() |
510 wlock = pushop.repo.wlock() |
512 lock = pushop.repo.lock() |
511 lock = pushop.repo.lock() |
513 pushop.trmanager = transactionmanager(pushop.repo, |
512 pushop.trmanager = transactionmanager(pushop.repo, |
514 'push-response', |
513 'push-response', |
515 pushop.remote.url()) |
514 pushop.remote.url()) |
516 except IOError as err: |
515 except error.LockUnavailable as err: |
517 if err.errno != errno.EACCES: |
|
518 raise |
|
519 # source repo cannot be locked. |
516 # source repo cannot be locked. |
520 # We do not abort the push, but just disable the local phase |
517 # We do not abort the push, but just disable the local phase |
521 # synchronisation. |
518 # synchronisation. |
522 msg = 'cannot lock source repository: %s\n' % err |
519 msg = 'cannot lock source repository: %s\n' % err |
523 pushop.ui.debug(msg) |
520 pushop.ui.debug(msg) |