archive: migrate to the fileprefetch callback mechanism
authorMatt Harbison <matt_harbison@yahoo.com>
Sun, 11 Feb 2018 00:49:43 -0500
changeset 36177 b72c6ff4e4c0
parent 36176 a991fcc48222
child 36178 3a90159c2c2e
archive: migrate to the fileprefetch callback mechanism
mercurial/archival.py
mercurial/subrepo.py
--- a/mercurial/archival.py	Sun Feb 11 00:30:15 2018 -0500
+++ b/mercurial/archival.py	Sun Feb 11 00:49:43 2018 -0500
@@ -18,10 +18,10 @@
 from .i18n import _
 
 from . import (
-    cmdutil,
     error,
     formatter,
     match as matchmod,
+    scmutil,
     util,
     vfs as vfsmod,
 )
@@ -338,7 +338,7 @@
     total = len(files)
     if total:
         files.sort()
-        cmdutil._prefetchfiles(repo, ctx, files)
+        scmutil.fileprefetchhooks(repo, ctx, files)
         repo.ui.progress(_('archiving'), 0, unit=_('files'), total=total)
         for i, f in enumerate(files):
             ff = ctx.flags(f)
--- a/mercurial/subrepo.py	Sun Feb 11 00:30:15 2018 -0500
+++ b/mercurial/subrepo.py	Sun Feb 11 00:49:43 2018 -0500
@@ -556,7 +556,7 @@
             files = [f for f in files if match(f)]
         rev = self._state[1]
         ctx = self._repo[rev]
-        cmdutil._prefetchfiles(self._repo, ctx, files)
+        scmutil.fileprefetchhooks(self._repo, ctx, files)
         total = abstractsubrepo.archive(self, archiver, prefix, match)
         for subpath in ctx.substate:
             s = subrepo(ctx, subpath, True)