D3935: copies: delete now-unnecessary check for "a == b" before "a.descendant(b)"
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Jul 12 16:44:51 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Unnecessary since https://phab.mercurial-scm.org/rHG879cbdde63df58af8579f018cd9210f7c83c622f (revlog: do inclusive descendant
testing (API), 2018-06-21).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3935
AFFECTED FILES
mercurial/copies.py
CHANGE DETAILS
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -416,14 +416,14 @@
# common ancestor or not without explicitly checking it, it's better to
# 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
_c2 = c2.p1() if c2.rev() is None else c2
# 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
# keep track of which endpoint is dirty
- dirtyc1 = not (base == _c1 or base.descendant(_c1))
- dirtyc2 = not (base == _c2 or base.descendant(_c2))
+ dirtyc1 = not base.descendant(_c1)
+ dirtyc2 = not base.descendant(_c2)
graft = dirtyc1 or dirtyc2
tca = base
if graft:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list