D5596: copies: get working copy parents from wctx, not dirstate, to make in-mem work
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Jan 26 07:10:37 UTC 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG75e753a26806: copies: get working copy parents from wctx, not dirstate, to make in-mem work (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5596?vs=13436&id=13488
REVISION DETAIL
https://phab.mercurial-scm.org/D5596
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
@@ -45,11 +45,15 @@
# - quit when interesting revs is zero
cl = repo.changelog
+ wdirparents = None
a = ctxa.rev()
b = ctxb.rev()
if a is None:
+ wdirparents = (ctxa.p1(), ctxa.p2())
a = node.wdirrev
if b is None:
+ assert not wdirparents
+ wdirparents = (ctxb.p1(), ctxb.p2())
b = node.wdirrev
side = {a: -1, b: 1}
@@ -61,7 +65,7 @@
while interesting:
r = -heapq.heappop(visit)
if r == node.wdirrev:
- parents = [cl.rev(p) for p in repo.dirstate.parents()]
+ parents = [pctx.rev() for pctx in wdirparents]
else:
parents = cl.parentrevs(r)
if parents[1] == node.nullrev:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list