Patchwork D7378: debugcommands: don't shadow the error module

login
register
mail settings
Submitter phabricator
Date Nov. 15, 2019, 3:37 a.m.
Message ID <21e3c851d904392ab97837c625558862@localhost.localdomain>
Download mbox | patch
Permalink /patch/43233/
State Not Applicable
Headers show

Comments

phabricator - Nov. 15, 2019, 3:37 a.m.
Closed by commit rHG72b454fae92e: debugcommands: don&#039;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




To: durin42, #hg-reviewers, dlax, pulkit
Cc: mercurial-devel

Patch

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(