Mercurial > hg-stable
changeset 37598:7a9c905e51f9
export: do not start pager if output will be written to file
A copy of 3b569745af6c.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 12 Apr 2018 21:33:47 +0900 |
| parents | d110167610db |
| children | 42a91897f090 |
| files | mercurial/commands.py tests/test-pager.t |
| diffstat | 2 files changed, 39 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Apr 12 23:25:58 2018 +0900 +++ b/mercurial/commands.py Thu Apr 12 21:33:47 2018 +0900 @@ -1971,8 +1971,14 @@ ui.note(_('exporting patches:\n')) else: ui.note(_('exporting patch:\n')) - ui.pager('export') - cmdutil.export(repo, revs, fntemplate=opts.get('output'), + + fntemplate = opts.get('output') + if cmdutil.isstdiofilename(fntemplate): + fntemplate = '' + + if not fntemplate: + ui.pager('export') + cmdutil.export(repo, revs, fntemplate=fntemplate, switch_parent=opts.get('switch_parent'), opts=patch.diffallopts(ui, opts))
--- a/tests/test-pager.t Thu Apr 12 23:25:58 2018 +0900 +++ b/tests/test-pager.t Thu Apr 12 21:33:47 2018 +0900 @@ -322,6 +322,37 @@ $ hg cat -r0 a --output=- paged! 'a\n' $ hg cat -r0 a --output=out + + $ hg export -r0 + paged! '# HG changeset patch\n' + paged! '# User test\n' + paged! '# Date 0 0\n' + paged! '# Thu Jan 01 00:00:00 1970 +0000\n' + paged! '# Node ID 1f0dee641bb7258c56bd60e93edfa2405381c41e\n' + paged! '# Parent 0000000000000000000000000000000000000000\n' + paged! 'add a\n' + paged! '\n' + paged! '\x1b[0;1mdiff -r 000000000000 -r 1f0dee641bb7 a\x1b[0m\n' + paged! '\x1b[0;31;1m--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\x1b[0m\n' + paged! '\x1b[0;32;1m+++ b/a\tThu Jan 01 00:00:00 1970 +0000\x1b[0m\n' + paged! '\x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m\n' + paged! '\x1b[0;32m+a\x1b[0m\n' + $ hg export -r0 -o - + paged! '# HG changeset patch\n' + paged! '# User test\n' + paged! '# Date 0 0\n' + paged! '# Thu Jan 01 00:00:00 1970 +0000\n' + paged! '# Node ID 1f0dee641bb7258c56bd60e93edfa2405381c41e\n' + paged! '# Parent 0000000000000000000000000000000000000000\n' + paged! 'add a\n' + paged! '\n' + paged! '\x1b[0;1mdiff -r 000000000000 -r 1f0dee641bb7 a\x1b[0m\n' + paged! '\x1b[0;31;1m--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\x1b[0m\n' + paged! '\x1b[0;32;1m+++ b/a\tThu Jan 01 00:00:00 1970 +0000\x1b[0m\n' + paged! '\x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m\n' + paged! '\x1b[0;32m+a\x1b[0m\n' + $ hg export -r0 -o out + $ rm out Put annotate in the ignore list for pager: