Show More
@@ -63,13 +63,21 b' def reposetup(ui, repo):' | |||||
63 | return man1 |
|
63 | return man1 | |
64 | def filectx(self, path, fileid=None, filelog=None): |
|
64 | def filectx(self, path, fileid=None, filelog=None): | |
65 | try: |
|
65 | try: | |
66 | result = super(lfiles_ctx, self).filectx(path, |
|
66 | if filelog is not None: | |
67 |
|
|
67 | result = super(lfiles_ctx, self).filectx( | |
|
68 | path, fileid, filelog) | |||
|
69 | else: | |||
|
70 | result = super(lfiles_ctx, self).filectx( | |||
|
71 | path, fileid) | |||
68 | except error.LookupError: |
|
72 | except error.LookupError: | |
69 | # Adding a null character will cause Mercurial to |
|
73 | # Adding a null character will cause Mercurial to | |
70 | # identify this as a binary file. |
|
74 | # identify this as a binary file. | |
|
75 | if filelog is not None: | |||
71 | result = super(lfiles_ctx, self).filectx( |
|
76 | result = super(lfiles_ctx, self).filectx( | |
72 | lfutil.standin(path), fileid, filelog) |
|
77 | lfutil.standin(path), fileid, filelog) | |
|
78 | else: | |||
|
79 | result = super(lfiles_ctx, self).filectx( | |||
|
80 | lfutil.standin(path), fileid) | |||
73 | olddata = result.data |
|
81 | olddata = result.data | |
74 | result.data = lambda: olddata() + '\0' |
|
82 | result.data = lambda: olddata() + '\0' | |
75 | return result |
|
83 | return result |
@@ -994,4 +994,14 b' related to largefiles in working directo' | |||||
994 | C a/b/c/d/e.normal.txt |
|
994 | C a/b/c/d/e.normal.txt | |
995 | C a/b/c/x/y.normal.txt |
|
995 | C a/b/c/x/y.normal.txt | |
996 |
|
996 | |||
|
997 | verify that largefiles doesn't break filesets | |||
|
998 | ||||
|
999 | $ hg log --rev . --exclude "set:binary()" | |||
|
1000 | changeset: 0:41bd42f10efa | |||
|
1001 | tag: tip | |||
|
1002 | user: test | |||
|
1003 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1004 | summary: add files | |||
|
1005 | ||||
|
1006 | ||||
997 | $ cd .. |
|
1007 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now