This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5596

copies: get working copy parents from wctx, not dirstate, to make in-mem work
ClosedPublic

Authored by martinvonz on Jan 16 2019, 1:06 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG75e753a26806: copies: get working copy parents from wctx, not dirstate, to make in-mem work
Summary

Before this patch, `run-tests.py test-rebase-conflicts.t
--extra-config-opt rebase.experimental.inmemory=1` would have some
lines that say "searching for copies back to rev 3" changed to
"... rev 1". I don't know of a better way of testing this patch than
doing that manually. There are many other differences, so we're not
ready to use #testcases syntax on the entire test-rebase-conflicts.t
yet.

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

martinvonz created this revision.Jan 16 2019, 1:06 AM
martinvonz updated this revision to Diff 13436.Jan 24 2019, 6:57 PM
Closed by commit rHG75e753a26806: copies: get working copy parents from wctx, not dirstate, to make in-mem work (authored by martinvonz). · Explain WhyJan 26 2019, 2:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (6 lines)

Diff 13488

mercurial/copies.py

# - walk the graph in topological order with the help of a heap; # - walk the graph in topological order with the help of a heap;
# - add unseen parents to side map # - add unseen parents to side map
# - clear side of any parent that has children on different sides # - clear side of any parent that has children on different sides
# - track number of interesting revs that might still be on a side # - track number of interesting revs that might still be on a side
# - track the lowest interesting rev seen # - track the lowest interesting rev seen
# - quit when interesting revs is zero # - quit when interesting revs is zero
cl = repo.changelog cl = repo.changelog
wdirparents = None
a = ctxa.rev() a = ctxa.rev()
b = ctxb.rev() b = ctxb.rev()
if a is None: if a is None:
wdirparents = (ctxa.p1(), ctxa.p2())
a = node.wdirrev a = node.wdirrev
if b is None: if b is None:
assert not wdirparents
wdirparents = (ctxb.p1(), ctxb.p2())
b = node.wdirrev b = node.wdirrev
side = {a: -1, b: 1} side = {a: -1, b: 1}
visit = [-a, -b] visit = [-a, -b]
heapq.heapify(visit) heapq.heapify(visit)
interesting = len(visit) interesting = len(visit)
limit = node.wdirrev limit = node.wdirrev
while interesting: while interesting:
r = -heapq.heappop(visit) r = -heapq.heappop(visit)
if r == node.wdirrev: if r == node.wdirrev:
parents = [cl.rev(p) for p in repo.dirstate.parents()] parents = [pctx.rev() for pctx in wdirparents]
else: else:
parents = cl.parentrevs(r) parents = cl.parentrevs(r)
if parents[1] == node.nullrev: if parents[1] == node.nullrev:
parents = parents[:1] parents = parents[:1]
for p in parents: for p in parents:
if p not in side: if p not in side:
# first time we see p; add it to visit # first time we see p; add it to visit
side[p] = side[r] side[p] = side[r]