This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5213

narrow: fix copies._fullcopytracing() narrowspec filtering in graft case
ClosedPublic

Authored by martinvonz on Nov 1 2018, 7:35 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG07a66c1387d1: narrow: fix copies._fullcopytracing() narrowspec filtering in graft case
Summary

I broke this too in 707c3804e607 (narrow: move copies overrides to
core, 2018-09-28). Hopefully I'm done fixing things broken by that
commit now.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Nov 1 2018, 7:35 PM
Closed by commit rHG07a66c1387d1: narrow: fix copies._fullcopytracing() narrowspec filtering in graft case (authored by martinvonz). · Explain WhyNov 1 2018, 9:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (5 lines)
Mtests/test-narrow-copies.t (3 lines)

Diff 12371

mercurial/copies.py

u1u, u2u = u1r, u2r u1u, u2u = u1r, u2r
else: else:
# unmatched file from base (DAG rotation in the graft case) # unmatched file from base (DAG rotation in the graft case)
u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2,
baselabel='base') baselabel='base')
# unmatched file from topological common ancestors (no DAG rotation) # unmatched file from topological common ancestors (no DAG rotation)
# need to recompute this for directory move handling when grafting # need to recompute this for directory move handling when grafting
mta = tca.manifest() mta = tca.manifest()
u1u, u2u = _computenonoverlap(repo, c1, c2, m1.filesnotin(mta), u1u, u2u = _computenonoverlap(repo, c1, c2,
m2.filesnotin(mta), m1.filesnotin(mta, repo.narrowmatch()),
m2.filesnotin(mta, repo.narrowmatch()),
baselabel='topological common ancestor') baselabel='topological common ancestor')
for f in u1u: for f in u1u:
_checkcopies(c1, c2, f, base, tca, dirtyc1, limit, data1) _checkcopies(c1, c2, f, base, tca, dirtyc1, limit, data1)
for f in u2u: for f in u2u:
_checkcopies(c2, c1, f, base, tca, dirtyc2, limit, data2) _checkcopies(c2, c1, f, base, tca, dirtyc2, limit, data2)

tests/test-narrow-copies.t

$ hg co -q 0 $ hg co -q 0
$ echo modified > inside/f1 $ echo modified > inside/f1
$ hg ci -qm 'modify inside/f1' $ hg ci -qm 'modify inside/f1'
$ echo new > inside/f5 $ echo new > inside/f5
$ hg ci -Aqm 'add inside/f5' $ hg ci -Aqm 'add inside/f5'
$ hg --config extensions.rebase= rebase -d 'public()' -r . $ hg --config extensions.rebase= rebase -d 'public()' -r .
rebasing 6:610b60178c28 "add inside/f5" (tip) rebasing 6:610b60178c28 "add inside/f5" (tip)
abort: data/outside/f3.i@54e53435331b: no match found! saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg
[255]