Show More
@@ -159,6 +159,7 b' def callcatch(ui, func):' | |||||
159 | # Global exception handling, alphabetically |
|
159 | # Global exception handling, alphabetically | |
160 | # Mercurial-specific first, followed by built-in and library exceptions |
|
160 | # Mercurial-specific first, followed by built-in and library exceptions | |
161 | except error.LockHeld as inst: |
|
161 | except error.LockHeld as inst: | |
|
162 | detailed_exit_code = 20 | |||
162 | if inst.errno == errno.ETIMEDOUT: |
|
163 | if inst.errno == errno.ETIMEDOUT: | |
163 | reason = _(b'timed out waiting for lock held by %r') % ( |
|
164 | reason = _(b'timed out waiting for lock held by %r') % ( | |
164 | pycompat.bytestr(inst.locker) |
|
165 | pycompat.bytestr(inst.locker) | |
@@ -172,6 +173,7 b' def callcatch(ui, func):' | |||||
172 | if not inst.locker: |
|
173 | if not inst.locker: | |
173 | ui.error(_(b"(lock might be very busy)\n")) |
|
174 | ui.error(_(b"(lock might be very busy)\n")) | |
174 | except error.LockUnavailable as inst: |
|
175 | except error.LockUnavailable as inst: | |
|
176 | detailed_exit_code = 20 | |||
175 | ui.error( |
|
177 | ui.error( | |
176 | _(b"abort: could not lock %s: %s\n") |
|
178 | _(b"abort: could not lock %s: %s\n") | |
177 | % ( |
|
179 | % ( |
@@ -136,6 +136,6 b' Pushing to a local read-only repo that c' | |||||
136 | pushing to a |
|
136 | pushing to a | |
137 | searching for changes |
|
137 | searching for changes | |
138 | abort: could not lock repository a: Permission denied |
|
138 | abort: could not lock repository a: Permission denied | |
139 |
[2 |
|
139 | [20] | |
140 |
|
140 | |||
141 | $ chmod 700 a/.hg/store |
|
141 | $ chmod 700 a/.hg/store |
@@ -1327,7 +1327,7 b' error, but EEXIST)' | |||||
1327 | waiting for lock on repository $TESTTMP/Upsilon held by '' |
|
1327 | waiting for lock on repository $TESTTMP/Upsilon held by '' | |
1328 | abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' |
|
1328 | abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' | |
1329 | (lock might be very busy) |
|
1329 | (lock might be very busy) | |
1330 |
[2 |
|
1330 | [20] | |
1331 | $ rm .hg/store/lock |
|
1331 | $ rm .hg/store/lock | |
1332 |
|
1332 | |||
1333 | $ cd .. |
|
1333 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now