This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7123

copies: use an unfiltered repository for the changeset centric algorithm
ClosedPublic

Authored by marmoute on Oct 16 2019, 12:54 PM.

Download Raw Diff

Details

Reviewers

martinvonz

Group Reviewers

hg-reviewers

Commits

rHG00de32aa834e: copies: use an unfiltered repository for the changeset centric algorithm
rHG3d0b9f7563ea: copies: use an unfiltered repository for the changeset centric algorithm

Summary

Since the algorithm work form heads to ancestors, we don't need to check
filtering for anything but the two entries.

Using an unfiltered version is noticeably more efficient.

Some timing on the pypy repo:
revision: large amount; added files: large amount; rename small amount; c3b14617fbd7 9ba6ab77fd29
before: ! wall 2.717861 comb 2.720000 user 2.700000 sys 0.020000 (median of 10)
after: ! wall 2.582204 comb 2.580000 user 2.560000 sys 0.020000 (median of 10)
revision: large amount; added files: small amount; rename small amount; c3b14617fbd7 f650a9b140d2
before: ! wall 4.003146 comb 4.010000 user 3.970000 sys 0.040000 (median of 10)
after: ! wall 3.814613 comb 3.810000 user 3.760000 sys 0.050000 (median of 10)
revision: large amount; added files: large amount; rename large amount; 08ea3258278e d9fa043f30c0
before: ! wall 0.704204 comb 0.700000 user 0.700000 sys 0.000000 (median of 13)
after: ! wall 0.657387 comb 0.650000 user 0.640000 sys 0.010000 (best of 14)
revision: small amount; added files: large amount; rename large amount; df6f7a526b60 a83dc6a2d56f
before: ! wall 0.013493 comb 0.020000 user 0.020000 sys 0.000000 (median of 219)
after: ! wall 0.013523 comb 0.020000 user 0.020000 sys 0.000000 (median of 218)
revision: small amount; added files: large amount; rename small amount; 4aa4e1f8e19a 169138063d63
before: ! wall 0.003017 comb 0.000000 user 0.000000 sys 0.000000 (median of 985)
after: ! wall 0.002876 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000)
revision: small amount; added files: small amount; rename small amount; 4bc173b045a6 964879152e2e
before: ! wall 0.000073 comb 0.000000 user 0.000000 sys 0.000000 (median of 12672)
after: ! wall 0.000082 comb 0.000000 user 0.000000 sys 0.000000 (median of 11456)
revision: medium amount; added files: large amount; rename medium amount; c95f1ced15f2 2c68e87c3efe
before: ! wall 0.478061 comb 0.470000 user 0.470000 sys 0.000000 (median of 19)
after: ! wall 0.452420 comb 0.450000 user 0.450000 sys 0.000000 (median of 21)
revision: medium amount; added files: medium amount; rename small amount; d343da0c55a8 d7746d32bf9d
before: ! wall 0.116015 comb 0.110000 user 0.110000 sys 0.000000 (median of 84)
after: ! wall 0.109153 comb 0.100000 user 0.100000 sys 0.000000 (median of 90)

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.Oct 16 2019, 12:54 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 16 2019, 12:54 PM

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

marmoute added a child revision: D7072: sidedatacopies: directly fetch copies information from sidedata.Oct 16 2019, 1:02 PM

marmoute updated this revision to Diff 17245.

In my copies-in-changesets version of mozilla-unified, this makes a very significant difference:

before:
! wall 3.715800 comb 3.720000 user 3.690000 sys 0.030000 (best of 10)
after:
! wall 2.950721 comb 2.960000 user 2.880000 sys 0.080000 (best of 10)

martinvonz accepted this revision.Oct 16 2019, 1:27 PM

This revision is now accepted and ready to land.Oct 16 2019, 1:27 PM

martinvonz mentioned this in D7073: revlog: introduce a `_uncheckedflags` shortcut.Oct 16 2019, 1:30 PM

marmoute added a commit: rHG3d0b9f7563ea: copies: use an unfiltered repository for the changeset centric algorithm.Oct 16 2019, 1:34 PM

Closed by commit rHG3d0b9f7563ea: copies: use an unfiltered repository for the changeset centric algorithm (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

marmoute updated this revision to Diff 17274.Oct 16 2019, 5:50 PM

marmoute added a commit: rHG00de32aa834e: copies: use an unfiltered repository for the changeset centric algorithm.Oct 16 2019, 10:37 PM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/copies.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17243		Oct 16 2019, 12:54 PM	★	★
Diff 2	17245		Oct 16 2019, 1:02 PM	★	★
Diff 3	17250	rHG3d0b9f7563eab097da53f6335a21df0523bb17fe	Oct 15 2019, 12:42 PM	★	★
Diff 4	17274		Oct 16 2019, 5:49 PM	★	★

Status	Author	Revision
Closed	marmoute	D7131 copies: simplify chain loop
Closed	marmoute	D7127 sidedatacopies: only fetch information once for merge
Closed	marmoute	D7124 copies: move from a copy on branchpoint to a copy on write approach
Closed	marmoute	D7076 copies: compute the exact set of revision to walk
Closed	marmoute	D7075 copies: add an explicit test using multiple roots
Closed	marmoute	D7074 sidedatacopies: fast path data fetching if revision has no sidedata
Abandoned	marmoute	D7073 revlog: introduce a `_uncheckedflags` shortcut
Closed	marmoute	D7072 sidedatacopies: directly fetch copies information from sidedata
Closed	marmoute	D7123 copies: use an unfiltered repository for the changeset centric algorithm
Abandoned	marmoute	D7071 copies: use unchecked parentrevs function to access parent
Closed	marmoute	D7070 copies: extract data extraction into a `revinfo` function
Closed	marmoute	D7122 copies: avoid instancing more changectx to access parent revisions
Closed	marmoute	D7121 copies: get copies information directly from _copies

Diff 17250

mercurial/copies.py


	return revinfo			return revinfo


	def _changesetforwardcopies(a, b, match):			def _changesetforwardcopies(a, b, match):
	if a.rev() in (node.nullrev, b.rev()):			if a.rev() in (node.nullrev, b.rev()):
	return {}			return {}

	repo = a.repo()			repo = a.repo().unfiltered()
	children = {}			children = {}
	revinfo = _revinfogetter(repo)			revinfo = _revinfogetter(repo)

	cl = repo.changelog			cl = repo.changelog
	missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()])			missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()])
	for r in missingrevs:			for r in missingrevs:
	for p in cl.parentrevs(r):			for p in cl.parentrevs(r):
	if p == node.nullrev:			if p == node.nullrev: