equal
deleted
inserted
replaced
1073 finally: |
1073 finally: |
1074 repo._istransplanting = False |
1074 repo._istransplanting = False |
1075 return result |
1075 return result |
1076 |
1076 |
1077 def overridecat(orig, ui, repo, file1, *pats, **opts): |
1077 def overridecat(orig, ui, repo, file1, *pats, **opts): |
1078 rev = opts.get('rev') |
1078 ctx = scmutil.revsingle(repo, opts.get('rev')) |
1079 if not lfutil.standin(file1) in repo[rev]: |
1079 if not lfutil.standin(file1) in ctx: |
1080 result = orig(ui, repo, file1, *pats, **opts) |
1080 result = orig(ui, repo, file1, *pats, **opts) |
1081 return result |
1081 return result |
1082 return lfcommands.catlfile(repo, file1, opts.get('rev'), opts.get('output')) |
1082 return lfcommands.catlfile(repo, file1, ctx.rev(), opts.get('output')) |