This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7487

changectx: use unfiltered changelog to access parents of unfiltered revs
ClosedPublic

Authored by marmoute on Nov 22 2019, 4:20 AM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGf9068413bd0c: changectx: use unfiltered changelog to access parents of unfiltered revs
rHG5ef259b09475: changectx: use unfiltered changelog to access parents of unfiltered revs

Summary

If a revision is not filtered, we know that its parents are not either. So we
can take a shortcut. This shortcut avoid the computation of all filtered revs in
some cases.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Nov 22 2019, 4:20 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 22 2019, 4:20 AM

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

marmoute added a child revision: D7488: localrepo: introduce a `_quick_access_changeid` property.Nov 22 2019, 4:20 AM

marmoute updated this revision to Diff 18350.Nov 23 2019, 6:53 AM

marmoute updated this revision to Diff 18363.Nov 23 2019, 7:21 PM

indygreg accepted this revision.Nov 23 2019, 7:50 PM

This revision is now accepted and ready to land.Nov 23 2019, 7:50 PM

marmoute added a commit: rHG5ef259b09475: changectx: use unfiltered changelog to access parents of unfiltered revs.Nov 23 2019, 7:59 PM

Closed by commit rHG5ef259b09475: changectx: use unfiltered changelog to access parents of unfiltered revs (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

marmoute added a commit: rHGf9068413bd0c: changectx: use unfiltered changelog to access parents of unfiltered revs.Dec 3 2019, 10:59 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/context.py (7 lines)
M			tests/test-repo-filters-tiptoe.t (1 line)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18294		Nov 22 2019, 4:20 AM	★	★
Diff 2	18350		Nov 23 2019, 6:53 AM	★	★
Diff 3	18363		Nov 23 2019, 7:21 PM	★	★
Diff 4	18373	rHG5ef259b094758b2d0d610bccbd276272933ea148	Nov 17 2019, 2:50 AM	★	★

Status	Author	Revision
Abandoned	marmoute	D7500 repoview: add a test for changelog filtering trigger for `hg annotate`
Abandoned	marmoute	D7499 repoview: test triggering of filter computation for `hg export`
Closed	marmoute	D7502 changectx: mark parent of changesets as non filtered
Closed	marmoute	D7501 changectx: use unfiltered changelog to walk ancestors in annotate
Closed	marmoute	D7498 localrepo: also fast past the parents of working copies parents
Abandoned	marmoute	D7497 repoview: add a test for filtering computation for `hg diff --change`
Abandoned	marmoute	D7496 repoview: add a test for filtering computation for `hg diff`
Closed	marmoute	D7495 localrepo: recognize trivial request for '.'
Closed	marmoute	D7494 localrepo: fastpath access to "."
Abandoned	marmoute	D7493 repoview: test changelog filtering triggered by a lookup to '.'
Closed	marmoute	D7492 localrepo: also fastpath access to working copy parents when possible
Closed	marmoute	D7491 changectx: mark the parents of the working copy as non filtered
Closed	marmoute	D7490 repoview: add an explicit set of all filter that show the wc parents
Abandoned	marmoute	D7485 repoview: test filtered computation on `hg status --change` call
Abandoned	marmoute	D7489 repoview: add test for filtering computation when running `hg status`
Closed	marmoute	D7488 localrepo: introduce a `_quick_access_changeid` property
Closed	marmoute	D7487 changectx: use unfiltered changelog to access parents of unfiltered revs
Closed	marmoute	D7486 locarepo: also fastpath `nullid` lookup in __getitem__
Closed	marmoute	D7484 localrepo: mark nullrev has never filtered
Closed	marmoute	D7483 changectx: add a "maybe filtered" filtered attribute
Closed	marmoute	D7514 repoview: add more tests to track operation not supposed to trigger filtering

Diff 18373

mercurial/context.py


	@propertycache			@propertycache
	def _manifestdelta(self):			def _manifestdelta(self):
	return self._manifestctx.readdelta()			return self._manifestctx.readdelta()

	@propertycache			@propertycache
	def _parents(self):			def _parents(self):
	repo = self._repo			repo = self._repo
	p1, p2 = repo.changelog.parentrevs(self._rev)			if self._maybe_filtered:
				cl = repo.changelog
				else:
				cl = repo.unfiltered().changelog

				p1, p2 = cl.parentrevs(self._rev)
	if p2 == nullrev:			if p2 == nullrev:
	return [repo[p1]]			return [repo[p1]]
	return [repo[p1], repo[p2]]			return [repo[p1], repo[p2]]

	def changeset(self):			def changeset(self):
	c = self._changeset			c = self._changeset
	return (			return (
	c.manifest,			c.manifest,

tests/test-repo-filters-tiptoe.t


	$ hg log -r null -T "{node}\n{date}\n"			$ hg log -r null -T "{node}\n{date}\n"
	0000000000000000000000000000000000000000			0000000000000000000000000000000000000000
	0.00			0.00

	Getting status of null			Getting status of null

	$ hg status --change null			$ hg status --change null
	debug.filters: computing revision filter for "visible"

	Getting status of working copy			Getting status of working copy

	$ hg status			$ hg status
	debug.filters: computing revision filter for "visible"			debug.filters: computing revision filter for "visible"
	M c			M c
	A d			A d
	R a			R a