Mercurial > hg

changeset 35926:264b90a060b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cat: call the storage prefetch hook It's not important to call in the case of a single file, but maybe it's better to do so for consistency.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 04 Feb 2018 15:26:49 -0500
parents 533f04d4cb6d
children 9b413478f261
files mercurial/cmdutil.py tests/test-lfs-test-server.t
diffstat 2 files changed, 25 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sun Feb 04 14:31:32 2018 -0500
+++ b/mercurial/cmdutil.py	Sun Feb 04 15:26:49 2018 -0500
@@ -2188,12 +2188,16 @@
         mfnode = ctx.manifestnode()
         try:
             if mfnode and mfl[mfnode].find(file)[0]:
+                _prefetchfiles(repo, ctx, [file])
                 write(file)
                 return 0
         except KeyError:
             pass
 
-    for abs in ctx.walk(matcher):
+    files = [f for f in ctx.walk(matcher)]
+    _prefetchfiles(repo, ctx, files)
+
+    for abs in files:
         write(abs)
         err = 0
 
--- a/tests/test-lfs-test-server.t	Sun Feb 04 14:31:32 2018 -0500
+++ b/tests/test-lfs-test-server.t	Sun Feb 04 15:26:49 2018 -0500
@@ -177,6 +177,26 @@
   ../archive/c
   ../archive/d
 
+Cat will prefetch blobs in a group
+
+  $ rm -rf .hg/store/lfs `hg config lfs.usercache`
+  $ hg cat -vr 1 a b c
+  lfs: need to transfer 3 objects (43 bytes)
+  lfs: downloading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes)
+  lfs: adding 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b to the usercache
+  lfs: processed: 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b
+  lfs: downloading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes)
+  lfs: processed: 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b
+  lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes)
+  lfs: adding d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 to the usercache
+  lfs: processed: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998
+  lfs: found 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b in the local lfs store
+  THIS-IS-LFS
+  lfs: found 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b in the local lfs store
+  THIS-IS-LFS
+  lfs: found d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 in the local lfs store
+  ANOTHER-LARGE-FILE
+
 Revert will prefetch blobs in a group
 
   $ rm -rf .hg/store/lfs