diff tests/test-rebase-templates.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
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 29 Oct 2020 09:03:08 -0700
parents 96fcc37a9c80
children
line wrap: on
line diff
--- a/tests/test-rebase-templates.t	Thu Oct 29 13:29:05 2020 +0100
+++ b/tests/test-rebase-templates.t	Thu Oct 29 09:03:08 2020 -0700
@@ -100,3 +100,24 @@
   rebasing override: 7
   note: not rebasing override: 7, its destination already has all its changes
   dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
+
+
+check namespaces and coloring (labels)
+
+  $ hg tag -l -r 7 my-tag
+  $ hg rebase -r 7 -d 8 -n
+  starting dry-run rebase; repository will not be changed
+  rebasing 7:f48cd65c6dc3 my-tag "Added b"
+  note: not rebasing 7:f48cd65c6dc3 my-tag "Added b", its destination already has all its changes
+  dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
+  $ hg bookmark -r 7 my-bookmark
+  $ hg rebase -r 7 -d 8 -n
+  starting dry-run rebase; repository will not be changed
+  rebasing 7:f48cd65c6dc3 my-bookmark my-tag "Added b"
+  note: not rebasing 7:f48cd65c6dc3 my-bookmark my-tag "Added b", its destination already has all its changes
+  dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
+  $ hg rebase -r 7 -d 8 -n --color=debug
+  [ ui.status|starting dry-run rebase; repository will not be changed]
+  [ ui.status|rebasing [oneline-summary.changeset|7:f48cd65c6dc3] [oneline-summary.bookmarks|my-bookmark] [oneline-summary.tags|my-tag] "[oneline-summary.desc|Added b]"]
+  [ ui.warning|note: not rebasing [oneline-summary.changeset|7:f48cd65c6dc3] [oneline-summary.bookmarks|my-bookmark] [oneline-summary.tags|my-tag] "[oneline-summary.desc|Added b]", its destination already has all its changes]
+  [ ui.status|dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase]