largefiles: include largefiles when doing log on a directory (issue4241)
authorMads Kiilerich <madski@unity3d.com>
Thu, 08 May 2014 19:45:22 +0200
changeset 21275 c7e9fb881a5a
parent 21274 3b4c75690206
child 21276 25b7c760235a
largefiles: include largefiles when doing log on a directory (issue4241) The matchers _files had to include both the real root and the standin version of the root.
hgext/largefiles/overrides.py
tests/test-largefiles.t
--- a/hgext/largefiles/overrides.py	Thu May 08 14:58:25 2014 +0000
+++ b/hgext/largefiles/overrides.py	Thu May 08 19:45:22 2014 +0200
@@ -282,6 +282,8 @@
             standin = lfutil.standin(m._files[i])
             if standin in repo[ctx.node()]:
                 m._files[i] = standin
+            elif m._files[i] not in repo[ctx.node()]:
+                m._files.append(standin)
             pats.add(standin)
 
         m._fmap = set(m._files)
--- a/tests/test-largefiles.t	Thu May 08 14:58:25 2014 +0000
+++ b/tests/test-largefiles.t	Thu May 08 19:45:22 2014 +0200
@@ -390,6 +390,14 @@
   A sub2/large7
   A z/y/x/large2
   A z/y/x/m/large1
+
+(and a bit of log testing)
+
+  $ hg log -T '{rev}\n' z/y/x/m/large1
+  7
+  $ hg log -T '{rev}\n' z/y/x/m  # with only a largefile
+  7
+
   $ hg rollback --quiet
   $ touch z/y/x/m/normal
   $ hg add z/y/x/m/normal