Show More
@@ -2754,7 +2754,6 b' def _updatecatformatter(fm, ctx, matcher' | |||||
2754 |
|
2754 | |||
2755 | def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts): |
|
2755 | def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts): | |
2756 | err = 1 |
|
2756 | err = 1 | |
2757 | opts = pycompat.byteskwargs(opts) |
|
|||
2758 |
|
2757 | |||
2759 | def write(path): |
|
2758 | def write(path): | |
2760 | filename = None |
|
2759 | filename = None | |
@@ -2768,7 +2767,7 b' def cat(ui, repo, ctx, matcher, basefm, ' | |||||
2768 | except OSError: |
|
2767 | except OSError: | |
2769 | pass |
|
2768 | pass | |
2770 | with formatter.maybereopen(basefm, filename) as fm: |
|
2769 | with formatter.maybereopen(basefm, filename) as fm: | |
2771 |
_updatecatformatter(fm, ctx, matcher, path, opts.get( |
|
2770 | _updatecatformatter(fm, ctx, matcher, path, opts.get('decode')) | |
2772 |
|
2771 | |||
2773 | # Automation often uses hg cat on single files, so special case it |
|
2772 | # Automation often uses hg cat on single files, so special case it | |
2774 | # for performance to avoid the cost of parsing the manifest. |
|
2773 | # for performance to avoid the cost of parsing the manifest. | |
@@ -2803,7 +2802,7 b' def cat(ui, repo, ctx, matcher, basefm, ' | |||||
2803 | basefm, |
|
2802 | basefm, | |
2804 | fntemplate, |
|
2803 | fntemplate, | |
2805 | subprefix, |
|
2804 | subprefix, | |
2806 |
** |
|
2805 | **opts, | |
2807 | ): |
|
2806 | ): | |
2808 | err = 0 |
|
2807 | err = 0 | |
2809 | except error.RepoLookupError: |
|
2808 | except error.RepoLookupError: |
General Comments 0
You need to be logged in to leave comments.
Login now