# HG changeset patch # User Mads Kiilerich # Date 2014-05-08 17:45:22 # Node ID c7e9fb881a5a2e1934550e957598783e7ca96572 # Parent 3b4c75690206e9ad90864354dbfc36196c97934c 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. diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -282,6 +282,8 @@ def overridelog(orig, ui, repo, *pats, * 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) diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t --- a/tests/test-largefiles.t +++ b/tests/test-largefiles.t @@ -390,6 +390,14 @@ Committing directories containing only l 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