This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7800

movedirstate: get copies from dirstate before setting parents
ClosedPublic

Authored by martinvonz on Jan 6 2020, 7:58 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0750cbffdb3b: movedirstate: get copies from dirstate before setting parents
Summary

Setting dirstate parents can modify the copies recorded in the
dirstate when there are two dirstate parents. I don't think we ever
call movedirstate() when there is more than one parent, but it seems
clearer to get the copies from the dirstate first anyway.

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

PathPackages
Mmercurial/scmutil.py (2 lines)

Diff 19122

mercurial/scmutil.py

"""Move the dirstate to newctx and adjust it as necessary. """Move the dirstate to newctx and adjust it as necessary.
A matcher can be provided as an optimization. It is probably a bug to pass A matcher can be provided as an optimization. It is probably a bug to pass
a matcher that doesn't match all the differences between the parent of the a matcher that doesn't match all the differences between the parent of the
working copy and newctx. working copy and newctx.
""" """
oldctx = repo[b'.'] oldctx = repo[b'.']
ds = repo.dirstate ds = repo.dirstate
ds.setparents(newctx.node(), nullid)
copies = dict(ds.copies()) copies = dict(ds.copies())
ds.setparents(newctx.node(), nullid)
s = newctx.status(oldctx, match=match) s = newctx.status(oldctx, match=match)
for f in s.modified: for f in s.modified:
if ds[f] == b'r': if ds[f] == b'r':
# modified + removed -> removed # modified + removed -> removed
continue continue
ds.normallookup(f) ds.normallookup(f)
for f in s.added: for f in s.added: