Show More
@@ -8,7 +8,6 b'' | |||
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | import collections |
|
11 | import errno | |
|
12 | 11 | import hashlib |
|
13 | 12 | |
|
14 | 13 | from .i18n import _ |
@@ -513,9 +512,7 b' def push(repo, remote, force=False, revs' | |||
|
513 | 512 | pushop.trmanager = transactionmanager(pushop.repo, |
|
514 | 513 | 'push-response', |
|
515 | 514 | pushop.remote.url()) |
|
516 |
except |
|
|
517 | if err.errno != errno.EACCES: | |
|
518 | raise | |
|
515 | except error.LockUnavailable as err: | |
|
519 | 516 | # source repo cannot be locked. |
|
520 | 517 | # We do not abort the push, but just disable the local phase |
|
521 | 518 | # synchronisation. |
@@ -1307,6 +1307,18 b' 2. Test that failed phases movement are ' | |||
|
1307 | 1307 | [1] |
|
1308 | 1308 | $ chmod -R +w .hg |
|
1309 | 1309 | |
|
1310 | 3. Test that push is prevented if lock was already acquired (not a permission | |
|
1311 | error, but EEXIST) | |
|
1312 | ||
|
1313 | $ touch .hg/store/lock | |
|
1314 | $ hg push ../Phi --config ui.timeout=1 | |
|
1315 | pushing to ../Phi | |
|
1316 | waiting for lock on repository $TESTTMP/Upsilon held by '' | |
|
1317 | abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' | |
|
1318 | (lock might be very busy) | |
|
1319 | [255] | |
|
1320 | $ rm .hg/store/lock | |
|
1321 | ||
|
1310 | 1322 | $ cd .. |
|
1311 | 1323 | |
|
1312 | 1324 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now