Mercurial > public > mercurial-scm > hg
comparison mercurial/debugcommands.py @ 43635:72b454fae92e
debugcommands: don't shadow the error module
Caught by pytype.
Differential Revision: https://phab.mercurial-scm.org/D7378
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 13 Nov 2019 22:30:33 -0500 |
| parents | 0b7733719d21 |
| children | 1fb19665c166 |
comparison
equal
deleted
inserted
replaced
| 43634:43f57b9620d2 | 43635:72b454fae92e |
|---|---|
| 479 state = repo.dirstate[f] | 479 state = repo.dirstate[f] |
| 480 if state not in b"nrm": | 480 if state not in b"nrm": |
| 481 ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state)) | 481 ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state)) |
| 482 errors += 1 | 482 errors += 1 |
| 483 if errors: | 483 if errors: |
| 484 error = _(b".hg/dirstate inconsistent with current parent's manifest") | 484 errstr = _(b".hg/dirstate inconsistent with current parent's manifest") |
| 485 raise error.Abort(error) | 485 raise error.Abort(errstr) |
| 486 | 486 |
| 487 | 487 |
| 488 @command( | 488 @command( |
| 489 b'debugcolor', | 489 b'debugcolor', |
| 490 [(b'', b'style', None, _(b'show all configured styles'))], | 490 [(b'', b'style', None, _(b'show all configured styles'))], |