| hg-reviewers |
copies._computeforwardmissing() and copies._computenonoverlap() return
sets, so the overrides should also do that.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| u1, u2 = orig(repo, c1, c2, *args, **kwargs) | u1, u2 = orig(repo, c1, c2, *args, **kwargs) | ||||
| if isenabled(repo): | if isenabled(repo): | ||||
| m1 = c1.manifest() | m1 = c1.manifest() | ||||
| m2 = c2.manifest() | m2 = c2.manifest() | ||||
| files = [] | files = [] | ||||
| sparsematch1 = repo.maybesparsematch(c1.rev()) | sparsematch1 = repo.maybesparsematch(c1.rev()) | ||||
| if sparsematch1: | if sparsematch1: | ||||
| sparseu1 = [] | sparseu1 = set() | ||||
| for f in u1: | for f in u1: | ||||
| if sparsematch1(f): | if sparsematch1(f): | ||||
| files.append((f, hex(m1[f]))) | files.append((f, hex(m1[f]))) | ||||
| sparseu1.append(f) | sparseu1.add(f) | ||||
| u1 = sparseu1 | u1 = sparseu1 | ||||
| sparsematch2 = repo.maybesparsematch(c2.rev()) | sparsematch2 = repo.maybesparsematch(c2.rev()) | ||||
| if sparsematch2: | if sparsematch2: | ||||
| sparseu2 = [] | sparseu2 = set() | ||||
| for f in u2: | for f in u2: | ||||
| if sparsematch2(f): | if sparsematch2(f): | ||||
| files.append((f, hex(m2[f]))) | files.append((f, hex(m2[f]))) | ||||
| sparseu2.append(f) | sparseu2.add(f) | ||||
| u2 = sparseu2 | u2 = sparseu2 | ||||
| # batch fetch the needed files from the server | # batch fetch the needed files from the server | ||||
| repo.fileservice.prefetch(files) | repo.fileservice.prefetch(files) | ||||
| return u1, u2 | return u1, u2 | ||||
| extensions.wrapfunction(copies, '_computenonoverlap', computenonoverlap) | extensions.wrapfunction(copies, '_computenonoverlap', computenonoverlap) | ||||
| # prefetch files before pathcopies check | # prefetch files before pathcopies check | ||||
| def computeforwardmissing(orig, a, b, match=None): | def computeforwardmissing(orig, a, b, match=None): | ||||
| missing = list(orig(a, b, match=match)) | missing = orig(a, b, match=match) | ||||
| repo = a._repo | repo = a._repo | ||||
| if isenabled(repo): | if isenabled(repo): | ||||
| mb = b.manifest() | mb = b.manifest() | ||||
| files = [] | files = [] | ||||
| sparsematch = repo.maybesparsematch(b.rev()) | sparsematch = repo.maybesparsematch(b.rev()) | ||||
| if sparsematch: | if sparsematch: | ||||
| sparsemissing = [] | sparsemissing = set() | ||||
| for f in missing: | for f in missing: | ||||
| if sparsematch(f): | if sparsematch(f): | ||||
| files.append((f, hex(mb[f]))) | files.append((f, hex(mb[f]))) | ||||
| sparsemissing.append(f) | sparsemissing.add(f) | ||||
| missing = sparsemissing | missing = sparsemissing | ||||
| # batch fetch the needed files from the server | # batch fetch the needed files from the server | ||||
| repo.fileservice.prefetch(files) | repo.fileservice.prefetch(files) | ||||
| return missing | return missing | ||||
| extensions.wrapfunction(copies, '_computeforwardmissing', | extensions.wrapfunction(copies, '_computeforwardmissing', | ||||
| computeforwardmissing) | computeforwardmissing) | ||||