D7378: debugcommands: don't shadow the error module
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Thu Nov 14 22:37:53 EST 2019
Closed by commit rHG72b454fae92e: debugcommands: don't shadow the error module (authored by durin42).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7378?vs=18062&id=18115
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7378/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7378
AFFECTED FILES
mercurial/debugcommands.py
CHANGE DETAILS
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -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(
To: durin42, #hg-reviewers, dlax, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list