Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Thu Nov 14 13:14:02 2019 -0500 +++ b/mercurial/debugcommands.py Wed Nov 13 22:30:33 2019 -0500 @@ -481,8 +481,8 @@ ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state)) errors += 1 if errors: - error = _(b".hg/dirstate inconsistent with current parent's manifest") - raise error.Abort(error) + errstr = _(b".hg/dirstate inconsistent with current parent's manifest") + raise error.Abort(errstr) @command(