Show More
@@ -10,7 +10,6 b'' | |||||
10 | import copy |
|
10 | import copy | |
11 | import types |
|
11 | import types | |
12 | import os |
|
12 | import os | |
13 | import re |
|
|||
14 |
|
13 | |||
15 | from mercurial import context, error, manifest, match as match_, node, util |
|
14 | from mercurial import context, error, manifest, match as match_, node, util | |
16 | from mercurial.i18n import _ |
|
15 | from mercurial.i18n import _ | |
@@ -54,12 +53,11 b' def reposetup(ui, repo):' | |||||
54 | self).__contains__(filename): |
|
53 | self).__contains__(filename): | |
55 | return True |
|
54 | return True | |
56 | return super(lfiles_manifestdict, |
|
55 | return super(lfiles_manifestdict, | |
57 |
self).__contains__(lfutil.s |
|
56 | self).__contains__(lfutil.standin(filename)) | |
58 | class lfiles_ctx(ctx.__class__): |
|
57 | class lfiles_ctx(ctx.__class__): | |
59 | def files(self): |
|
58 | def files(self): | |
60 | filenames = super(lfiles_ctx, self).files() |
|
59 | filenames = super(lfiles_ctx, self).files() | |
61 |
return [ |
|
60 | return [lfutil.splitstandin(f) or f for f in filenames] | |
62 | filename) for filename in filenames] |
|
|||
63 | def manifest(self): |
|
61 | def manifest(self): | |
64 | man1 = super(lfiles_ctx, self).manifest() |
|
62 | man1 = super(lfiles_ctx, self).manifest() | |
65 | man1.__class__ = lfiles_manifestdict |
|
63 | man1.__class__ = lfiles_manifestdict | |
@@ -72,8 +70,7 b' def reposetup(ui, repo):' | |||||
72 | # Adding a null character will cause Mercurial to |
|
70 | # Adding a null character will cause Mercurial to | |
73 | # identify this as a binary file. |
|
71 | # identify this as a binary file. | |
74 | result = super(lfiles_ctx, self).filectx( |
|
72 | result = super(lfiles_ctx, self).filectx( | |
75 |
lfutil.s |
|
73 | lfutil.standin(path), fileid, filelog) | |
76 | filelog) |
|
|||
77 | olddata = result.data |
|
74 | olddata = result.data | |
78 | result.data = lambda: olddata() + '\0' |
|
75 | result.data = lambda: olddata() + '\0' | |
79 | return result |
|
76 | return result |
General Comments 0
You need to be logged in to leave comments.
Login now