diff tests/test-rebase-abort.t @ 45796:e9555305c5c6

templates: include all non-branch namespaces in default one-line summary

I left out branches and custom namespaces on purpose from D9252
because I figured that people like us (Google) who have custom
namespaces can also have custom configs. However, I just realized that
this makes everyone with the topic extension lose the topic they've
had in rebase output for a long time (ever since someone was nice
enough to add it in D741). Sorry about the churn.

The more generic template couldn't easily keep the "log.bookmark"
label in the template because the namespace is called "bookmarks"
(plural). That means that we can't be compatible with users' existing
configs for "log.bookmark", so I decided to change the labels to be in
a brand-new "oneline-summary" namespace.

Differential Revision: https://phab.mercurial-scm.org/D9262

--- a/tests/test-rebase-abort.t	Thu Oct 29 13:29:05 2020 +0100
+++ b/tests/test-rebase-abort.t	Thu Oct 29 09:03:08 2020 -0700
@@ -274,7 +274,7 @@
   
 
   $ hg rebase -d master -r foo
-  rebasing 3:6c0f977a22d8 tip foo "C"
+  rebasing 3:6c0f977a22d8 foo tip "C"
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -314,7 +314,7 @@
   created new head
 
   $ hg rebase -d @ -b foo --tool=internal:fail
-  rebasing 2:070cf4580bb5 tip foo "b2"
+  rebasing 2:070cf4580bb5 foo tip "b2"
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]