Show More
@@ -1116,9 +1116,11 b' def overridecat(orig, ui, repo, file1, *' | |||||
1116 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1116 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
1117 | origmatchfn = m.matchfn |
|
1117 | origmatchfn = m.matchfn | |
1118 | def lfmatchfn(f): |
|
1118 | def lfmatchfn(f): | |
|
1119 | if origmatchfn(f): | |||
|
1120 | return True | |||
1119 | lf = lfutil.splitstandin(f) |
|
1121 | lf = lfutil.splitstandin(f) | |
1120 | if lf is None: |
|
1122 | if lf is None: | |
1121 |
return |
|
1123 | return False | |
1122 | notbad.add(lf) |
|
1124 | notbad.add(lf) | |
1123 | return origmatchfn(lf) |
|
1125 | return origmatchfn(lf) | |
1124 | m.matchfn = lfmatchfn |
|
1126 | m.matchfn = lfmatchfn | |
@@ -1131,7 +1133,7 b' def overridecat(orig, ui, repo, file1, *' | |||||
1131 | fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(), |
|
1133 | fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(), | |
1132 | pathname=f) |
|
1134 | pathname=f) | |
1133 | lf = lfutil.splitstandin(f) |
|
1135 | lf = lfutil.splitstandin(f) | |
1134 | if lf is None: |
|
1136 | if lf is None or origmatchfn(f): | |
1135 | # duplicating unreachable code from commands.cat |
|
1137 | # duplicating unreachable code from commands.cat | |
1136 | data = ctx[f].data() |
|
1138 | data = ctx[f].data() | |
1137 | if opts.get('decode'): |
|
1139 | if opts.get('decode'): |
@@ -1506,6 +1506,12 b' Cat a largefile' | |||||
1506 | large4-modified |
|
1506 | large4-modified | |
1507 | $ hg --cwd sub cat -r '.^' ../normal3 |
|
1507 | $ hg --cwd sub cat -r '.^' ../normal3 | |
1508 | normal3-modified |
|
1508 | normal3-modified | |
|
1509 | Cat a standin | |||
|
1510 | $ hg cat .hglf/sub/large4 | |||
|
1511 | e166e74c7303192238d60af5a9c4ce9bef0b7928 | |||
|
1512 | $ hg cat .hglf/normal3 | |||
|
1513 | .hglf/normal3: no such file in rev 598410d3eb9a | |||
|
1514 | [1] | |||
1509 |
|
1515 | |||
1510 | Test that renaming a largefile results in correct output for status |
|
1516 | Test that renaming a largefile results in correct output for status | |
1511 |
|
1517 |
General Comments 0
You need to be logged in to leave comments.
Login now