comparison tests/test-rebase-obsolete.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 f90a5c211251
children 21733e8c924f
comparison
equal deleted inserted replaced
45795:c4ab93849383 45796:e9555305c5c6
1705 > EOS 1705 > EOS
1706 $ hg update D1 -q 1706 $ hg update D1 -q
1707 $ hg bookmark book -i 1707 $ hg bookmark book -i
1708 $ hg rebase -r B+D1 -d E 1708 $ hg rebase -r B+D1 -d E
1709 rebasing 1:112478962961 B "B" 1709 rebasing 1:112478962961 B "B"
1710 note: not rebasing 5:15ecf15e0114 D1 tip book "D1", already in destination as 2:0807738e0be9 D2 "D2" 1710 note: not rebasing 5:15ecf15e0114 book D1 tip "D1", already in destination as 2:0807738e0be9 D2 "D2"
1711 1 new orphan changesets 1711 1 new orphan changesets
1712 $ hg log -G -T '{desc} {bookmarks}' 1712 $ hg log -G -T '{desc} {bookmarks}'
1713 @ B book 1713 @ B book
1714 | 1714 |
1715 | x D1 1715 | x D1