| mharbison72 |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/scmutil.py (2 lines) | |||
| M | tests/test-lock-badness.t (2 lines) | |||
| M | tests/test-phases-exchange.t (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| try: | try: | ||||
| return func() | return func() | ||||
| except: # re-raises | except: # re-raises | ||||
| ui.traceback() | ui.traceback() | ||||
| raise | raise | ||||
| # Global exception handling, alphabetically | # Global exception handling, alphabetically | ||||
| # Mercurial-specific first, followed by built-in and library exceptions | # Mercurial-specific first, followed by built-in and library exceptions | ||||
| except error.LockHeld as inst: | except error.LockHeld as inst: | ||||
| detailed_exit_code = 20 | |||||
| if inst.errno == errno.ETIMEDOUT: | if inst.errno == errno.ETIMEDOUT: | ||||
| reason = _(b'timed out waiting for lock held by %r') % ( | reason = _(b'timed out waiting for lock held by %r') % ( | ||||
| pycompat.bytestr(inst.locker) | pycompat.bytestr(inst.locker) | ||||
| ) | ) | ||||
| else: | else: | ||||
| reason = _(b'lock held by %r') % inst.locker | reason = _(b'lock held by %r') % inst.locker | ||||
| ui.error( | ui.error( | ||||
| _(b"abort: %s: %s\n") | _(b"abort: %s: %s\n") | ||||
| % (inst.desc or stringutil.forcebytestr(inst.filename), reason) | % (inst.desc or stringutil.forcebytestr(inst.filename), reason) | ||||
| ) | ) | ||||
| if not inst.locker: | if not inst.locker: | ||||
| ui.error(_(b"(lock might be very busy)\n")) | ui.error(_(b"(lock might be very busy)\n")) | ||||
| except error.LockUnavailable as inst: | except error.LockUnavailable as inst: | ||||
| detailed_exit_code = 20 | |||||
| ui.error( | ui.error( | ||||
| _(b"abort: could not lock %s: %s\n") | _(b"abort: could not lock %s: %s\n") | ||||
| % ( | % ( | ||||
| inst.desc or stringutil.forcebytestr(inst.filename), | inst.desc or stringutil.forcebytestr(inst.filename), | ||||
| encoding.strtolocal(inst.strerror), | encoding.strtolocal(inst.strerror), | ||||
| ) | ) | ||||
| ) | ) | ||||
| except error.OutOfBandError as inst: | except error.OutOfBandError as inst: | ||||
| Pushing to a local read-only repo that can't be locked | Pushing to a local read-only repo that can't be locked | ||||
| $ chmod 100 a/.hg/store | $ chmod 100 a/.hg/store | ||||
| $ hg -R b push a | $ hg -R b push a | ||||
| pushing to a | pushing to a | ||||
| searching for changes | searching for changes | ||||
| abort: could not lock repository a: Permission denied | abort: could not lock repository a: Permission denied | ||||
| [255] | [20] | ||||
| $ chmod 700 a/.hg/store | $ chmod 700 a/.hg/store | ||||
| error, but EEXIST) | error, but EEXIST) | ||||
| $ touch .hg/store/lock | $ touch .hg/store/lock | ||||
| $ hg push ../Phi --config ui.timeout=1 | $ hg push ../Phi --config ui.timeout=1 | ||||
| pushing to ../Phi | pushing to ../Phi | ||||
| waiting for lock on repository $TESTTMP/Upsilon held by '' | waiting for lock on repository $TESTTMP/Upsilon held by '' | ||||
| abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' | abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' | ||||
| (lock might be very busy) | (lock might be very busy) | ||||
| [255] | [20] | ||||
| $ rm .hg/store/lock | $ rm .hg/store/lock | ||||
| $ cd .. | $ cd .. | ||||
| #endif | #endif | ||||
| Test that clone behaves like pull and doesn't publish changesets as plain push | Test that clone behaves like pull and doesn't publish changesets as plain push | ||||
| does. The conditional output accounts for changes in the conditional block | does. The conditional output accounts for changes in the conditional block | ||||