This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6675

copies: fix crash on in changeset-centric tracing from commit to itself
ClosedPublic

Authored by martinvonz on Jul 23 2019, 12:15 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8c5a36805d5d: copies: fix crash on in changeset-centric tracing from commit to itself
Summary

When we trace copies from a changeset to itself, the "work" queue ends
up empty and we hit the "assert False" after it.

It was only the last of the three added tests that failed before this
patch. That is because the other two cases have fast paths, so
_committedforwardcopies() is never reached.

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.Jul 23 2019, 12:15 AM
martinvonz added a comment.Jul 23 2019, 12:16 AM

Intended for stable.

pulkit accepted this revision.Jul 24 2019, 5:11 AM
This revision is now accepted and ready to land.Jul 24 2019, 5:11 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (2 lines)
Mtests/test-copies.t (11 lines)

Diff 16027

mercurial/copies.py

dbg('debug.copies: rename of: %s\n' % opath) dbg('debug.copies: rename of: %s\n' % opath)
cm[f] = opath cm[f] = opath
if debug: if debug:
dbg('debug.copies: time: %f seconds\n' dbg('debug.copies: time: %f seconds\n'
% (util.timer() - start)) % (util.timer() - start))
return cm return cm
def _changesetforwardcopies(a, b, match): def _changesetforwardcopies(a, b, match):
if a.rev() == node.nullrev: if a.rev() in (node.nullrev, b.rev()):
return {} return {}
repo = a.repo() repo = a.repo()
children = {} children = {}
cl = repo.changelog cl = repo.changelog
missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()]) missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()])
for r in missingrevs: for r in missingrevs:
for p in cl.parentrevs(r): for p in cl.parentrevs(r):

tests/test-copies.t

Test filtering copies by path. We do filtering by destination. Test filtering copies by path. We do filtering by destination.
$ hg debugpathcopies 0 1 x $ hg debugpathcopies 0 1 x
$ hg debugpathcopies 1 0 x $ hg debugpathcopies 1 0 x
y -> x y -> x
$ hg debugpathcopies 0 1 y $ hg debugpathcopies 0 1 y
x -> y x -> y
$ hg debugpathcopies 1 0 y $ hg debugpathcopies 1 0 y
Copies not including commit changes
$ newrepo
$ echo x > x
$ hg ci -Aqm 'add x'
$ hg mv x y
$ hg debugpathcopies . .
$ hg debugpathcopies . 'wdir()'
x -> y
$ hg debugpathcopies 'wdir()' .
y -> x
Copy a file onto another file Copy a file onto another file
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ echo y > y $ echo y > y
$ hg ci -Aqm 'add x and y' $ hg ci -Aqm 'add x and y'
$ hg cp -f x y $ hg cp -f x y
$ hg debugp1copies $ hg debugp1copies
x -> y x -> y