This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3935

copies: delete now-unnecessary check for "a == b" before "a.descendant(b)"
ClosedPublic

Authored by martinvonz on Jul 12 2018, 12:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb5891bf8ab13: copies: delete now-unnecessary check for "a == b" before "a.descendant(b)"
Summary

Unnecessary since 879cbdde63df (revlog: do inclusive descendant
testing (API), 2018-06-21).

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.

Revision Contents
Changeset List

Diff 9581

mercurial/copies.py

# In certain scenarios (e.g. graft, update or rebase), base can be # In certain scenarios (e.g. graft, update or rebase), base can be
# overridden We still need to know a real common ancestor in this case We # overridden We still need to know a real common ancestor in this case We
# can't just compute _c1.ancestor(_c2) and compare it to ca, because there # can't just compute _c1.ancestor(_c2) and compare it to ca, because there
# can be multiple common ancestors, e.g. in case of bidmerge. Because our # can be multiple common ancestors, e.g. in case of bidmerge. Because our
# caller may not know if the revision passed in lieu of the CA is a genuine # caller may not know if the revision passed in lieu of the CA is a genuine
# common ancestor or not without explicitly checking it, it's better to # common ancestor or not without explicitly checking it, it's better to
# determine that here. # determine that here.
# #
# base.descendant(wc) and base.descendant(base) are False, work around that # base.descendant(wc) is False, work around that
_c1 = c1.p1() if c1.rev() is None else c1 _c1 = c1.p1() if c1.rev() is None else c1
_c2 = c2.p1() if c2.rev() is None else c2 _c2 = c2.p1() if c2.rev() is None else c2
# an endpoint is "dirty" if it isn't a descendant of the merge base # an endpoint is "dirty" if it isn't a descendant of the merge base
# if we have a dirty endpoint, we need to trigger graft logic, and also # if we have a dirty endpoint, we need to trigger graft logic, and also
# keep track of which endpoint is dirty # keep track of which endpoint is dirty
dirtyc1 = not (base == _c1 or base.descendant(_c1)) dirtyc1 = not base.descendant(_c1)
dirtyc2 = not (base == _c2 or base.descendant(_c2)) dirtyc2 = not base.descendant(_c2)
graft = dirtyc1 or dirtyc2 graft = dirtyc1 or dirtyc2
tca = base tca = base
if graft: if graft:
tca = _c1.ancestor(_c2) tca = _c1.ancestor(_c2)
limit = _findlimit(repo, c1.rev(), c2.rev()) limit = _findlimit(repo, c1.rev(), c2.rev())
if limit is None: if limit is None:
# no common ancestor, no copies # no common ancestor, no copies