[PATCH 2 of 4] largefiles: fix _always for match overrides

Siddharth Agarwal sid0 at fb.com
Fri Mar 22 21:37:02 CDT 2013


# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1364004188 25200
#      Fri Mar 22 19:03:08 2013 -0700
# Node ID 90293fb6b3d77c76a5985f7003bdeac8d60878e0
# Parent  54e5c022f4d4e7b7f536d395268a04313f532340
largefiles: fix _always for match overrides

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -34,6 +34,7 @@ def installnormalfilesmatchfn(manifest):
                 manifest)
         m._files = filter(notlfile, m._files)
         m._fmap = set(m._files)
+        m._always = False
         origmatchfn = m.matchfn
         m.matchfn = lambda f: notlfile(f) and origmatchfn(f) or None
         return m
@@ -251,6 +252,7 @@ def overridelog(orig, ui, repo, *pats, *
         standins = [lfutil.standin(f) for f in m._files]
         m._files.extend(standins)
         m._fmap = set(m._files)
+        m._always = False
         origmatchfn = m.matchfn
         def lfmatchfn(f):
             lf = lfutil.splitstandin(f)
@@ -519,6 +521,7 @@ def overridecopy(orig, ui, repo, pats, o
                 lfile = lambda f: lfutil.standin(f) in manifest
                 m._files = [lfutil.standin(f) for f in m._files if lfile(f)]
                 m._fmap = set(m._files)
+                m._always = False
                 origmatchfn = m.matchfn
                 m.matchfn = lambda f: (lfutil.isstandin(f) and
                                     (f in manifest) and
@@ -625,6 +628,7 @@ def overriderevert(orig, ui, repo, *pats
                 m._files = [tostandin(f) for f in m._files]
                 m._files = [f for f in m._files if f is not None]
                 m._fmap = set(m._files)
+                m._always = False
                 origmatchfn = m.matchfn
                 def matchfn(f):
                     if lfutil.isstandin(f):


More information about the Mercurial-devel mailing list