Mercurial > hg
changeset 38101:6acf41bb8d40
status: add default of --terse=u to tweakdefaults (BC)
This is in line with both Git and Subversion, and strikes me as a more
humane behavior.
Test output changes are expected once you read test-status.t, and I
feel like we've still got adequate coverage on things.
Differential Revision: https://phab.mercurial-scm.org/D3628
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 14 May 2018 22:02:44 -0400 |
| parents | 18424aeece7f |
| children | 9bf0bd4d7a2e |
| files | mercurial/ui.py tests/test-status.t |
| diffstat | 2 files changed, 8 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/ui.py Mon May 14 22:01:27 2018 -0400 +++ b/mercurial/ui.py Mon May 14 22:02:44 2018 -0400 @@ -66,6 +66,8 @@ update.check = noconflict # Show conflicts information in `hg status` status.verbose = True +# Collapse entire directories that contain only unknown files +status.terse = u [diff] git = 1
--- a/tests/test-status.t Mon May 14 22:01:27 2018 -0400 +++ b/tests/test-status.t Mon May 14 22:02:44 2018 -0400 @@ -109,11 +109,8 @@ tweaking defaults works $ hg status --cwd a --config ui.tweakdefaults=yes - ? 1/in_a_1 - ? in_a - ? ../b/1/in_b_1 - ? ../b/2/in_b_2 - ? ../b/in_b + ? . + ? ../b/ ? ../in_root $ HGPLAIN=1 hg status --cwd a --config ui.tweakdefaults=yes ? a/1/in_a_1 (glob) @@ -123,11 +120,8 @@ ? b/in_b (glob) ? in_root $ HGPLAINEXCEPT=tweakdefaults hg status --cwd a --config ui.tweakdefaults=yes - ? 1/in_a_1 (glob) - ? in_a - ? ../b/1/in_b_1 (glob) - ? ../b/2/in_b_2 (glob) - ? ../b/in_b (glob) + ? . + ? ../b/ ? ../in_root (glob) relative paths can be requested @@ -157,11 +151,8 @@ > status.relative = False > EOF $ hg status --cwd a --config ui.tweakdefaults=yes - ? a/1/in_a_1 - ? a/in_a - ? b/1/in_b_1 - ? b/2/in_b_2 - ? b/in_b + ? a/ + ? b/ ? in_root $ cd ..