This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9141

copies: move `merged` testing sooner
ClosedPublic

Authored by marmoute on Oct 1 2020, 10:09 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7990e7d957b0: copies: move `merged` testing sooner
rHGb76e949dccb4: copies: move `merged` testing sooner
Summary

previously is_merged was an expensive callback. Now that all this data is
pre-computed, this is is a simple membership testing.

So it is probably cheaper than the membership testing.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Oct 1 2020, 10:09 AM
marmoute updated this revision to Diff 22999.Oct 2 2020, 5:10 AM
Alphare accepted this revision.Oct 2 2020, 9:16 AM
marmoute added a commit: rHGb76e949dccb4: copies: move `merged` testing sooner.Oct 8 2020, 12:17 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb76e949dccb4: copies: move `merged` testing sooner (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (4 lines)

Diff 22972

mercurial/copies.py

): ):
pass pass
elif ( elif (
changes is not None changes is not None
and other[1] is None and other[1] is None
and dest in changes.salvaged and dest in changes.salvaged
): ):
minor[dest] = value minor[dest] = value
elif not isancestor(new_tt, other_tt):
minor[dest] = value
elif changes is not None and dest in changes.merged: elif changes is not None and dest in changes.merged:
minor[dest] = value minor[dest] = value
elif not isancestor(new_tt, other_tt):
minor[dest] = value
def _revinfo_getter_extra(repo): def _revinfo_getter_extra(repo):
"""return a function that return multiple data given a <rev>"i """return a function that return multiple data given a <rev>"i
* p1: revision number of first parent * p1: revision number of first parent
* p2: revision number of first parent * p2: revision number of first parent
* p1copies: mapping of copies from p1 * p1copies: mapping of copies from p1