This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2433

context: remove basectx.int (API)
ClosedPublic

Authored by indygreg on Feb 24 2018, 2:30 PM.

Download Raw Diff

Details

Reviewers

yuja

Group Reviewers

hg-reviewers

Commits

rHG38f480502043: context: remove basectx.__int__ (API)

Summary

basectx is the only type in the repo having int implemented.

This magic method can result in unexpected coercion. Furthermore,
having it implemented is wrong for some contexts, since rev() may
return None in some cases.

Previous commits removed known cases in core where contexts are
coerced to integers. So let's delete basectx.int.

This commit is a bit dangerous. While the test suite passes, there
are likely still some callers in core that rely on int that
don't have test coverage. An alternative would be to issue a
deprecation warning and let this bake for a few releases.

.. api::

context.basectx no longer implements __int__. Context instances
will no longer cast to ints. Consumers should call ``ctx.rev()``
instead.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 24 2018, 2:30 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 24 2018, 2:30 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

yuja accepted this revision.Feb 24 2018, 8:36 PM

This revision is now accepted and ready to land.Feb 24 2018, 8:36 PM

"While the test suite passes, there are likely still some callers in core
that rely on int that don't have test coverage."

I think we can fix them in next 2 months. Queued with delight, thanks.

Closed by commit rHG38f480502043: context: remove basectx.__int__ (API) (authored by indygreg). · Explain WhyFeb 24 2018, 8:54 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/context.py (3 lines)

Status	Author	Revision
Closed	indygreg	D2433 context: remove basectx.__int__ (API)
Closed	indygreg	D2432 patchbomb: resolve revs before evaluating %ld revset
Closed	indygreg	D2431 histedit: resolve revs before evaluating %ld revset
Closed	indygreg	D2430 split: use ctx.rev() instead of %d % ctx
Closed	indygreg	D2429 commands: use ctx.rev() instead of %d % ctx
Closed	indygreg	D2428 cmdutil: use ctx.rev() instead of %d % ctx
Closed	indygreg	D2427 rebase: use ctx.rev() instead of %d % ctx
Closed	indygreg	D2426 histedit: use ctx.rev() instead of %d % ctx
Closed	indygreg	D2425 histedit: rename variables so they have "ctx" in them
Closed	indygreg	D2424 cmdutil: use ctx.rev() instead of int(ctx)
Closed	indygreg	D2423 templatekw: use ctx.rev() instead of casting context to int

Diff 6065

mercurial/context.py


	return o			return o

	def __bytes__(self):			def __bytes__(self):
	return short(self.node())			return short(self.node())

	__str__ = encoding.strmethod(__bytes__)			__str__ = encoding.strmethod(__bytes__)

	def __int__(self):
	return self.rev()

	def __repr__(self):			def __repr__(self):
	return r"<%s %s>" % (type(self).__name__, str(self))			return r"<%s %s>" % (type(self).__name__, str(self))

	def __eq__(self, other):			def __eq__(self, other):
	try:			try:
	return type(self) == type(other) and self._rev == other._rev			return type(self) == type(other) and self._rev == other._rev
	except AttributeError:			except AttributeError:
	return False			return False

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6065		Feb 24 2018, 2:30 PM	★	★
Diff 2	6078	rHG38f4805020437f126f5c1c8f41d78445f9ab6547	Feb 24 2018, 2:21 PM	★	★