D5213: narrow: fix copies._fullcopytracing() narrowspec filtering in graft case
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Nov 1 23:35:28 UTC 2018
martinvonz created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
I broke this too in https://phab.mercurial-scm.org/rHG707c3804e6077e6922fe3a3b7c503d28b596566c (narrow: move copies overrides to
core, 2018-09-28). Hopefully I'm done fixing things broken by that
commit now.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5213
AFFECTED FILES
mercurial/copies.py
tests/test-narrow-copies.t
CHANGE DETAILS
diff --git a/tests/test-narrow-copies.t b/tests/test-narrow-copies.t
--- a/tests/test-narrow-copies.t
+++ b/tests/test-narrow-copies.t
@@ -71,5 +71,4 @@
$ hg ci -Aqm 'add inside/f5'
$ hg --config extensions.rebase= rebase -d 'public()' -r .
rebasing 6:610b60178c28 "add inside/f5" (tip)
- abort: data/outside/f3.i at 54e53435331b: no match found!
- [255]
+ saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/610b60178c28-65716a78-rebase.hg
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -511,8 +511,9 @@
# unmatched file from topological common ancestors (no DAG rotation)
# need to recompute this for directory move handling when grafting
mta = tca.manifest()
- u1u, u2u = _computenonoverlap(repo, c1, c2, m1.filesnotin(mta),
- m2.filesnotin(mta),
+ u1u, u2u = _computenonoverlap(repo, c1, c2,
+ m1.filesnotin(mta, repo.narrowmatch()),
+ m2.filesnotin(mta, repo.narrowmatch()),
baselabel='topological common ancestor')
for f in u1u:
To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list