hgext/remotefilelog/__init__.py
changeset 45334 b9b055f15035
parent 45294 30f3e278c5d7
child 45346 3c783ff08d40
--- a/hgext/remotefilelog/__init__.py	Mon Aug 03 13:30:14 2020 +0530
+++ b/hgext/remotefilelog/__init__.py	Mon Aug 03 14:12:13 2020 +0530
@@ -480,16 +480,16 @@
 
 # prefetch files before update
 def applyupdates(
-    orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts
+    orig, repo, mresult, wctx, mctx, overwrite, wantfiledata, **opts
 ):
     if isenabled(repo):
         manifest = mctx.manifest()
         files = []
-        for f, args, msg in actions[mergestatemod.ACTION_GET]:
+        for f, args, msg in mresult.getactions([mergestatemod.ACTION_GET]):
             files.append((f, hex(manifest[f])))
         # batch fetch the needed files from the server
         repo.fileservice.prefetch(files)
-    return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts)
+    return orig(repo, mresult, wctx, mctx, overwrite, wantfiledata, **opts)
 
 
 # Prefetch merge checkunknownfiles