478 return s |
478 return s |
479 |
479 |
480 |
480 |
481 # prefetch files before update |
481 # prefetch files before update |
482 def applyupdates( |
482 def applyupdates( |
483 orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts |
483 orig, repo, mresult, wctx, mctx, overwrite, wantfiledata, **opts |
484 ): |
484 ): |
485 if isenabled(repo): |
485 if isenabled(repo): |
486 manifest = mctx.manifest() |
486 manifest = mctx.manifest() |
487 files = [] |
487 files = [] |
488 for f, args, msg in actions[mergestatemod.ACTION_GET]: |
488 for f, args, msg in mresult.getactions([mergestatemod.ACTION_GET]): |
489 files.append((f, hex(manifest[f]))) |
489 files.append((f, hex(manifest[f]))) |
490 # batch fetch the needed files from the server |
490 # batch fetch the needed files from the server |
491 repo.fileservice.prefetch(files) |
491 repo.fileservice.prefetch(files) |
492 return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts) |
492 return orig(repo, mresult, wctx, mctx, overwrite, wantfiledata, **opts) |
493 |
493 |
494 |
494 |
495 # Prefetch merge checkunknownfiles |
495 # Prefetch merge checkunknownfiles |
496 def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, *args, **kwargs): |
496 def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, *args, **kwargs): |
497 if isenabled(repo): |
497 if isenabled(repo): |