This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D7406 scmutil: convert status data object from a tuple to an attrs (API)
Closed	durin42	D7405 perf: bool() elements of dirstate.status return instead of len()
Closed	durin42	D7404 tags: use field names instead of field numbers on scmutil.status
Closed	durin42	D7403 subrepo: use field names instead of field numbers on scmutil.status
Closed	durin42	D7402 revset: use field names instead of field numbers on scmutil.status
Closed	durin42	D7401 patch: use field names instead of field numbers on scmutil.status
Closed	durin42	D7400 logcmdutil: use field names instead of field numbers on scmutil.status
Closed	durin42	D7399 context: use field names instead of field numbers on scmutil.status
Closed	durin42	D7398 commands: use field names instead of field numbers on scmutil.status
Closed	durin42	D7397 cmdutil: convert terse status result back to an scmutil.status
Closed	durin42	D7396 cmdutil: use field names instead of field numbers on scmutil.status
Closed	durin42	D7395 uncommit: use field names instead of field numbers on scmutil.status
Closed	durin42	D7394 transplant: use field names instead of field numbers on scmutil.status
Closed	durin42	D7393 split: use field names instead of field numbers on scmutil.status
Closed	durin42	D7392 mq: use field names instead of field numbers on scmutil.status
Closed	durin42	D7391 hgk: use field names instead of field numbers on scmutil.status
Closed	durin42	D7390 extdiff: use field names instead of field numbers on scmutil.status
Closed	durin42	D7410 extensions: suppress a pytype failure due to a typeshed bug
Closed	durin42	D7409 dispatch: add some assertions to give pytype a helping hand
Closed	durin42	D7408 extensions: hide two confusing import statements from pytype
Closed	durin42	D7407 debugcommands: add assertions to convince pytype peer is not None
Closed	durin42	D7385 debugcommands: suppress import errors for pytype
Closed	durin42	D7383 state: add a pytype annotation
Closed	durin42	D7382 logcmdutil: add a type annotation
Closed	durin42	D7381 cmdutil: add a pytype annotation to help out some callsites
Abandoned	durin42	D7297 cleanup: remove now-obsolete wrong-arg-type annotations
Closed	durin42	D7294 cmdutil: suppress bogus pytype errors
Closed	durin42	D7293 changegroup: suppress pytype error that's wrong
Closed	durin42	D7292 changegroup: avoid shadowing a set with an int
Closed	durin42	D7291 bundle2: more pytype suppressions around bytestring
Closed	durin42	D7290 branchmap: pytype is confused about bytestr
Changes Planned	mharbison72	D7515 pytype: [WIP] suppress various warnings inline to get a clean run
Needs Revision	durin42	D7295 pytype: add a (very slow) test that executes pytype
Needs Revision	durin42	D7384 commands: necessary annotations and suppresssions to pass pytype
Changes Planned	durin42	D7296 pycompat: kludge around pytype being confused by __new__
Abandoned	durin42	D7380 encoding: define per-use identity functions only in typechecking mode
Closed	durin42	D7379 encoding: fix bad type annotation
Closed	durin42	D7389 branchmap: annotate constructor type for branchcache
Closed	durin42	D7378 debugcommands: don't shadow the error module
Closed	durin42	D7289 branchmap: correctly set()-ify list argument

Diff 18115

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):

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18062		Nov 13 2019, 10:50 PM	★	★
Diff 2	18115	rHG72b454fae92e63258e4b947fe7f702cbf3683641	Nov 13 2019, 10:30 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

debugcommands: don't shadow the error moduleClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 18115

mercurial/debugcommands.py

debugcommands: don't shadow the error module
ClosedPublic

Revision Contents
Changeset List