Show More
@@ -34,6 +34,7 b' def installnormalfilesmatchfn(manifest):' | |||||
34 | manifest) |
|
34 | manifest) | |
35 | m._files = filter(notlfile, m._files) |
|
35 | m._files = filter(notlfile, m._files) | |
36 | m._fmap = set(m._files) |
|
36 | m._fmap = set(m._files) | |
|
37 | m._always = False | |||
37 | origmatchfn = m.matchfn |
|
38 | origmatchfn = m.matchfn | |
38 | m.matchfn = lambda f: notlfile(f) and origmatchfn(f) or None |
|
39 | m.matchfn = lambda f: notlfile(f) and origmatchfn(f) or None | |
39 | return m |
|
40 | return m | |
@@ -251,6 +252,7 b' def overridelog(orig, ui, repo, *pats, *' | |||||
251 | standins = [lfutil.standin(f) for f in m._files] |
|
252 | standins = [lfutil.standin(f) for f in m._files] | |
252 | m._files.extend(standins) |
|
253 | m._files.extend(standins) | |
253 | m._fmap = set(m._files) |
|
254 | m._fmap = set(m._files) | |
|
255 | m._always = False | |||
254 | origmatchfn = m.matchfn |
|
256 | origmatchfn = m.matchfn | |
255 | def lfmatchfn(f): |
|
257 | def lfmatchfn(f): | |
256 | lf = lfutil.splitstandin(f) |
|
258 | lf = lfutil.splitstandin(f) | |
@@ -519,6 +521,7 b' def overridecopy(orig, ui, repo, pats, o' | |||||
519 | lfile = lambda f: lfutil.standin(f) in manifest |
|
521 | lfile = lambda f: lfutil.standin(f) in manifest | |
520 | m._files = [lfutil.standin(f) for f in m._files if lfile(f)] |
|
522 | m._files = [lfutil.standin(f) for f in m._files if lfile(f)] | |
521 | m._fmap = set(m._files) |
|
523 | m._fmap = set(m._files) | |
|
524 | m._always = False | |||
522 | origmatchfn = m.matchfn |
|
525 | origmatchfn = m.matchfn | |
523 | m.matchfn = lambda f: (lfutil.isstandin(f) and |
|
526 | m.matchfn = lambda f: (lfutil.isstandin(f) and | |
524 | (f in manifest) and |
|
527 | (f in manifest) and | |
@@ -625,6 +628,7 b' def overriderevert(orig, ui, repo, *pats' | |||||
625 | m._files = [tostandin(f) for f in m._files] |
|
628 | m._files = [tostandin(f) for f in m._files] | |
626 | m._files = [f for f in m._files if f is not None] |
|
629 | m._files = [f for f in m._files if f is not None] | |
627 | m._fmap = set(m._files) |
|
630 | m._fmap = set(m._files) | |
|
631 | m._always = False | |||
628 | origmatchfn = m.matchfn |
|
632 | origmatchfn = m.matchfn | |
629 | def matchfn(f): |
|
633 | def matchfn(f): | |
630 | if lfutil.isstandin(f): |
|
634 | if lfutil.isstandin(f): |
General Comments 0
You need to be logged in to leave comments.
Login now