Mercurial > public > mercurial-scm > hg
diff hgext/largefiles/reposetup.py @ 18142:11d1a9143adb
merge with stable
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 28 Dec 2012 11:55:45 +0100 |
parents | 2acd9c14b0d7 a907826c158c |
children | 93206823bd61 |
line wrap: on
line diff
--- a/hgext/largefiles/reposetup.py Fri Dec 28 00:02:40 2012 +0100 +++ b/hgext/largefiles/reposetup.py Fri Dec 28 11:55:45 2012 +0100 @@ -168,10 +168,8 @@ m = copy.copy(match) m._files = tostandins(m._files) - # Get ignored files here even if we weren't asked for them; we - # must use the result here for filtering later result = super(lfilesrepo, self).status(node1, node2, m, - True, clean, unknown, listsubrepos) + ignored, clean, unknown, listsubrepos) if working: try: # Any non-largefiles that were explicitly listed must be @@ -273,6 +271,8 @@ return f result = [[toname(f) for f in items] for items in result] + lfdirstate.write() + if not listunknown: result[4] = [] if not listignored: