This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7378

debugcommands: don't shadow the error module
ClosedPublic

Authored by durin42 on Nov 13 2019, 10:50 PM.

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHG72b454fae92e: debugcommands: don't shadow the error module
Summary

Caught by pytype.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (4 lines)

Diff 18062

mercurial/debugcommands.py

) )
errors += 1 errors += 1
for f in m1: for f in m1:
state = repo.dirstate[f] state = repo.dirstate[f]
if state not in b"nrm": if state not in b"nrm":
ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state)) ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state))
errors += 1 errors += 1
if errors: if errors:
error = _(b".hg/dirstate inconsistent with current parent's manifest") errstr = _(b".hg/dirstate inconsistent with current parent's manifest")
raise error.Abort(error) raise error.Abort(errstr)
@command( @command(
b'debugcolor', b'debugcolor',
[(b'', b'style', None, _(b'show all configured styles'))], [(b'', b'style', None, _(b'show all configured styles'))],
b'hg debugcolor', b'hg debugcolor',
) )
def debugcolor(ui, repo, **opts): def debugcolor(ui, repo, **opts):