# HG changeset patch # User Augie Fackler # Date 1573702233 18000 # Node ID 72b454fae92e63258e4b947fe7f702cbf3683641 # Parent 43f57b9620d21257bb492c42dedb8c1c1348a7e7 debugcommands: don't shadow the error module Caught by pytype. Differential Revision: https://phab.mercurial-scm.org/D7378 diff -r 43f57b9620d2 -r 72b454fae92e mercurial/debugcommands.py --- 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(