diff --git a/tests/test-status-color.t b/tests/test-status-color.t --- a/tests/test-status-color.t +++ b/tests/test-status-color.t @@ -31,11 +31,11 @@ [status.unknown|? ][status.unknown|in_root] HGPLAIN disables color $ HGPLAIN=1 hg status --color=debug - ? a/1/in_a_1 (glob) - ? a/in_a (glob) - ? b/1/in_b_1 (glob) - ? b/2/in_b_2 (glob) - ? b/in_b (glob) + ? a/1/in_a_1 + ? a/in_a + ? b/1/in_b_1 + ? b/2/in_b_2 + ? b/in_b ? in_root HGPLAINEXCEPT=color does not disable color $ HGPLAINEXCEPT=color hg status --color=debug diff --git a/tests/test-status.t b/tests/test-status.t --- a/tests/test-status.t +++ b/tests/test-status.t @@ -116,11 +116,11 @@ ? ../b/in_b ? ../in_root $ HGPLAIN=1 hg status --cwd a --config ui.tweakdefaults=yes - ? a/1/in_a_1 (glob) - ? a/in_a (glob) - ? b/1/in_b_1 (glob) - ? b/2/in_b_2 (glob) - ? b/in_b (glob) + ? a/1/in_a_1 + ? a/in_a + ? b/1/in_b_1 + ? b/2/in_b_2 + ? b/in_b ? in_root $ HGPLAINEXCEPT=tweakdefaults hg status --cwd a --config ui.tweakdefaults=yes ? 1/in_a_1 @@ -163,11 +163,11 @@ ? ../b/in_b ? ../in_root $ HGPLAIN=1 hg status --cwd a - ? a/1/in_a_1 (glob) - ? a/in_a (glob) - ? b/1/in_b_1 (glob) - ? b/2/in_b_2 (glob) - ? b/in_b (glob) + ? a/1/in_a_1 + ? a/in_a + ? b/1/in_b_1 + ? b/2/in_b_2 + ? b/in_b ? in_root if relative paths are explicitly off, tweakdefaults doesn't change it