Show More
@@ -23,7 +23,6 b' from mercurial import (' | |||||
23 | from . import ( |
|
23 | from . import ( | |
24 | narrowbundle2, |
|
24 | narrowbundle2, | |
25 | narrowcommands, |
|
25 | narrowcommands, | |
26 | narrowcopies, |
|
|||
27 | narrowrepo, |
|
26 | narrowrepo, | |
28 | narrowtemplates, |
|
27 | narrowtemplates, | |
29 | narrowwirepeer, |
|
28 | narrowwirepeer, | |
@@ -65,7 +64,6 b' def reposetup(ui, repo):' | |||||
65 |
|
64 | |||
66 | if repository.NARROW_REQUIREMENT in repo.requirements: |
|
65 | if repository.NARROW_REQUIREMENT in repo.requirements: | |
67 | narrowrepo.wraprepo(repo) |
|
66 | narrowrepo.wraprepo(repo) | |
68 | narrowcopies.setup(repo) |
|
|||
69 | narrowwirepeer.reposetup(repo) |
|
67 | narrowwirepeer.reposetup(repo) | |
70 |
|
68 | |||
71 | templatekeyword = narrowtemplates.templatekeyword |
|
69 | templatekeyword = narrowtemplates.templatekeyword |
@@ -258,10 +258,6 b' def _computenonoverlap(repo, c1, c2, add' | |||||
258 | if u2: |
|
258 | if u2: | |
259 | repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) |
|
259 | repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) | |
260 |
|
260 | |||
261 | narrowmatch = repo.narrowmatch() |
|
|||
262 | if not narrowmatch.always(): |
|
|||
263 | u1 = [f for f in u1 if narrowmatch(f)] |
|
|||
264 | u2 = [f for f in u2 if narrowmatch(f)] |
|
|||
265 | return u1, u2 |
|
261 | return u1, u2 | |
266 |
|
262 | |||
267 | def _makegetfctx(ctx): |
|
263 | def _makegetfctx(ctx): | |
@@ -467,8 +463,8 b' def _fullcopytracing(repo, c1, c2, base)' | |||||
467 | } |
|
463 | } | |
468 |
|
464 | |||
469 | # find interesting file sets from manifests |
|
465 | # find interesting file sets from manifests | |
470 | addedinm1 = m1.filesnotin(mb) |
|
466 | addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) | |
471 | addedinm2 = m2.filesnotin(mb) |
|
467 | addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) | |
472 | bothnew = sorted(addedinm1 & addedinm2) |
|
468 | bothnew = sorted(addedinm1 & addedinm2) | |
473 | if tca == base: |
|
469 | if tca == base: | |
474 | # unmatched file from base |
|
470 | # unmatched file from base |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now