Submitter | phabricator |
---|---|
Date | Dec. 8, 2020, 9:40 p.m. |
Message ID | <differential-rev-PHID-DREV-qsdnhqgaf63pxosxvm7e-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47841/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/tests/test-conflict.t b/tests/test-conflict.t --- a/tests/test-conflict.t +++ b/tests/test-conflict.t @@ -80,6 +80,8 @@ } ] + $ hg status -0 + M a\x00? a.orig\x00 (no-eol) (esc) $ cat a Small Mathematical Series. 1 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6766,8 +6766,10 @@ morestatus = None if ( - ui.verbose or ui.configbool(b'commands', b'status.verbose') - ) and not ui.plain(): + (ui.verbose or ui.configbool(b'commands', b'status.verbose')) + and not ui.plain() + and not opts.get(b'print0') + ): morestatus = cmdutil.readmorestatus(repo) ui.pager(b'status')