equal
deleted
inserted
replaced
1316 fntemplate = opts.pop('output', '') |
1316 fntemplate = opts.pop('output', '') |
1317 if cmdutil.isstdiofilename(fntemplate): |
1317 if cmdutil.isstdiofilename(fntemplate): |
1318 fntemplate = '' |
1318 fntemplate = '' |
1319 |
1319 |
1320 if fntemplate: |
1320 if fntemplate: |
1321 fm = formatter.nullformatter(ui, 'cat') |
1321 fm = formatter.nullformatter(ui, 'cat', opts) |
1322 else: |
1322 else: |
1323 ui.pager('cat') |
1323 ui.pager('cat') |
1324 fm = ui.formatter('cat', opts) |
1324 fm = ui.formatter('cat', opts) |
1325 with fm: |
1325 with fm: |
1326 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', |
1326 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', |