# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1655056493 -14400
# Node ID fc60328270ac7e9915bba43a2c8b621123b98c9a
# Parent  a54db3e55c8848787f879c3c1a18b183f7b62d14
tests: add branch to checkheads-related log output

Just an additional branch is not going to make log output unreadable. The
branch is added even if topic is unset.

This is for consistency with tests that check single head enforcement, that
also get initialized using push-checkheads-util.sh, but previously used a
separate, almost identical, log template. Now they all use the same template.

diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-mixed-branch-topic-G1.t
--- a/tests/test-push-checkheads-mixed-branch-topic-G1.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-mixed-branch-topic-G1.t	Sun Jun 12 21:54:53 2022 +0400
@@ -67,13 +67,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  845eeb768064 (draft)[Z]: B1
+  @  845eeb768064 [default:Z] (draft): B1
   |
-  | x  35d2f30a8ba4 (draft)[Z]: B0
+  | x  35d2f30a8ba4 [default:Z] (draft): B0
   | |
-  | o  8aaa48160adc (draft): A0
+  | o  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-mixed-branch-topic-G2.t
--- a/tests/test-push-checkheads-mixed-branch-topic-G2.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-mixed-branch-topic-G2.t	Sun Jun 12 21:54:53 2022 +0400
@@ -78,17 +78,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  0c76bc104656 (draft): C1
+  @  0c76bc104656 [default] (draft): C1
   |
-  o  f6082bc4ffef (draft): A1
+  o  f6082bc4ffef [default] (draft): A1
   |
-  | x  44759c6d327d (draft): C0
+  | x  44759c6d327d [default] (draft): C0
   | |
-  | *  35d2f30a8ba4 (draft)[Z]: B0
+  | *  35d2f30a8ba4 [default:Z] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-mixed-branch-topic-G3.t
--- a/tests/test-push-checkheads-mixed-branch-topic-G3.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t	Sun Jun 12 21:54:53 2022 +0400
@@ -73,15 +73,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  dc44c53142f0 (draft): C1
+  @  dc44c53142f0 [default] (draft): C1
   |
-  | x  44759c6d327d (draft): C0
+  | x  44759c6d327d [default] (draft): C0
   | |
-  | o  35d2f30a8ba4 (draft)[Z]: B0
+  | o  35d2f30a8ba4 [default:Z] (draft): B0
   | |
-  | o  8aaa48160adc (draft): A0
+  | o  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-multi-topics-F1.t
--- a/tests/test-push-checkheads-multi-topics-F1.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-multi-topics-F1.t	Sun Jun 12 21:54:53 2022 +0400
@@ -71,15 +71,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  845eeb768064 (draft)[Z]: B1
+  @  845eeb768064 [default:Z] (draft): B1
   |
-  | x  e1494106e1ca (draft)[Z]: B0
+  | x  e1494106e1ca [default:Z] (draft): B0
   | |
-  | o  f5cd873e2965 (draft)[Y]: A0
+  | o  f5cd873e2965 [default:Y] (draft): A0
   |/
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-multi-topics-F2.t
--- a/tests/test-push-checkheads-multi-topics-F2.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-multi-topics-F2.t	Sun Jun 12 21:54:53 2022 +0400
@@ -82,17 +82,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  0e26ba57d799 (draft)[Y]: C1
+  @  0e26ba57d799 [default:Y] (draft): C1
   |
-  o  fb4a34222909 (draft)[Y]: A1
+  o  fb4a34222909 [default:Y] (draft): A1
   |
-  | x  345721b128e8 (draft)[Y]: C0
+  | x  345721b128e8 [default:Y] (draft): C0
   | |
-  | *  e1494106e1ca (draft)[Z]: B0
+  | *  e1494106e1ca [default:Z] (draft): B0
   | |
-  | x  f5cd873e2965 (draft)[Y]: A0
+  | x  f5cd873e2965 [default:Y] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-multi-topics-F3.t
--- a/tests/test-push-checkheads-multi-topics-F3.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-multi-topics-F3.t	Sun Jun 12 21:54:53 2022 +0400
@@ -77,15 +77,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  57530ca5eb24 (draft)[Y]: C1
+  @  57530ca5eb24 [default:Y] (draft): C1
   |
-  | x  345721b128e8 (draft)[Y]: C0
+  | x  345721b128e8 [default:Y] (draft): C0
   | |
-  | o  e1494106e1ca (draft)[Z]: B0
+  | o  e1494106e1ca [default:Z] (draft): B0
   | |
-  | o  f5cd873e2965 (draft)[Y]: A0
+  | o  f5cd873e2965 [default:Y] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-multibranches-E1.t
--- a/tests/test-push-checkheads-multibranches-E1.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-multibranches-E1.t	Sun Jun 12 21:54:53 2022 +0400
@@ -68,13 +68,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  c98b855401e7 (draft): B1
+  @  c98b855401e7 [Z] (draft): B1
   |
-  | x  93e5c1321ece (draft): B0
+  | x  93e5c1321ece [Z] (draft): B0
   | |
-  | o  8aaa48160adc (draft): A0
+  | o  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-multibranches-E2.t
--- a/tests/test-push-checkheads-multibranches-E2.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-multibranches-E2.t	Sun Jun 12 21:54:53 2022 +0400
@@ -78,17 +78,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  0c76bc104656 (draft): C1
+  @  0c76bc104656 [default] (draft): C1
   |
-  o  f6082bc4ffef (draft): A1
+  o  f6082bc4ffef [default] (draft): A1
   |
-  | x  afc55ba2ce61 (draft): C0
+  | x  afc55ba2ce61 [default] (draft): C0
   | |
-  | *  93e5c1321ece (draft): B0
+  | *  93e5c1321ece [Z] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-multibranches-E3.t
--- a/tests/test-push-checkheads-multibranches-E3.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-multibranches-E3.t	Sun Jun 12 21:54:53 2022 +0400
@@ -73,15 +73,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  dc44c53142f0 (draft): C1
+  @  dc44c53142f0 [default] (draft): C1
   |
-  | x  afc55ba2ce61 (draft): C0
+  | x  afc55ba2ce61 [default] (draft): C0
   | |
-  | o  93e5c1321ece (draft): B0
+  | o  93e5c1321ece [Z] (draft): B0
   | |
-  | o  8aaa48160adc (draft): A0
+  | o  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-partial-C1.t
--- a/tests/test-push-checkheads-partial-C1.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-partial-C1.t	Sun Jun 12 21:54:53 2022 +0400
@@ -61,13 +61,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  25c56d33e4c4 (draft): B1
+  @  25c56d33e4c4 [default] (draft): B1
   |
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | o  8aaa48160adc (draft): A0
+  | o  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-partial-C2.t	Sun Jun 12 21:54:53 2022 +0400
@@ -64,13 +64,13 @@
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg log -G --hidden
-  @  f6082bc4ffef (draft): A1
+  @  f6082bc4ffef [default] (draft): A1
   |
-  | *  d73caddc5533 (draft): B0
+  | *  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-partial-C3.t
--- a/tests/test-push-checkheads-partial-C3.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-partial-C3.t	Sun Jun 12 21:54:53 2022 +0400
@@ -63,13 +63,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  0f88766e02d6 (draft): C0
+  @  0f88766e02d6 [default] (draft): C0
   |
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | o  8aaa48160adc (draft): A0
+  | o  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-partial-C4.t	Sun Jun 12 21:54:53 2022 +0400
@@ -64,13 +64,13 @@
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg log -G --hidden
-  @  0f88766e02d6 (draft): C0
+  @  0f88766e02d6 [default] (draft): C0
   |
-  | *  d73caddc5533 (draft): B0
+  | *  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-pruned-B1.t
--- a/tests/test-push-checkheads-pruned-B1.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-pruned-B1.t	Sun Jun 12 21:54:53 2022 +0400
@@ -52,11 +52,11 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  74ff5441d343 (draft): B0
+  @  74ff5441d343 [default] (draft): B0
   |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-pruned-B2.t
--- a/tests/test-push-checkheads-pruned-B2.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-pruned-B2.t	Sun Jun 12 21:54:53 2022 +0400
@@ -67,13 +67,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  f6082bc4ffef (draft): A1
+  @  f6082bc4ffef [default] (draft): A1
   |
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-pruned-B3.t
--- a/tests/test-push-checkheads-pruned-B3.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-pruned-B3.t	Sun Jun 12 21:54:53 2022 +0400
@@ -67,13 +67,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  25c56d33e4c4 (draft): B1
+  @  25c56d33e4c4 [default] (draft): B1
   |
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-pruned-B4.t
--- a/tests/test-push-checkheads-pruned-B4.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-pruned-B4.t	Sun Jun 12 21:54:53 2022 +0400
@@ -68,13 +68,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  0f88766e02d6 (draft): C0
+  @  0f88766e02d6 [default] (draft): C0
   |
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-pruned-B5.t
--- a/tests/test-push-checkheads-pruned-B5.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-pruned-B5.t	Sun Jun 12 21:54:53 2022 +0400
@@ -74,15 +74,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  25c56d33e4c4 (draft): B1
+  @  25c56d33e4c4 [default] (draft): B1
   |
-  | x  821fb21d0dd2 (draft): C0
+  | x  821fb21d0dd2 [default] (draft): C0
   | |
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-pruned-B6.t
--- a/tests/test-push-checkheads-pruned-B6.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-pruned-B6.t	Sun Jun 12 21:54:53 2022 +0400
@@ -58,13 +58,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  x  ba93660aff8d (draft): A1
+  x  ba93660aff8d [default] (draft): A1
   |
-  @  74ff5441d343 (draft): B0
+  @  74ff5441d343 [default] (draft): B0
   |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-pruned-B7.t
--- a/tests/test-push-checkheads-pruned-B7.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-pruned-B7.t	Sun Jun 12 21:54:53 2022 +0400
@@ -57,13 +57,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  x  ba93660aff8d (draft): A1
+  x  ba93660aff8d [default] (draft): A1
   |
-  @  74ff5441d343 (draft): B0
+  @  74ff5441d343 [default] (draft): B0
   |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-pruned-B8.t
--- a/tests/test-push-checkheads-pruned-B8.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-pruned-B8.t	Sun Jun 12 21:54:53 2022 +0400
@@ -80,17 +80,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  c1f8d089020f (draft): A2
+  @  c1f8d089020f [default] (draft): A2
   |
-  | x  262c8c798096 (draft): B1
+  | x  262c8c798096 [default] (draft): B1
   | |
-  | x  f6082bc4ffef (draft): A1
+  | x  f6082bc4ffef [default] (draft): A1
   |/
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-supersede-A1.t
--- a/tests/test-push-checkheads-supersede-A1.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-supersede-A1.t	Sun Jun 12 21:54:53 2022 +0400
@@ -49,11 +49,11 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  f6082bc4ffef (draft): A1
+  @  f6082bc4ffef [default] (draft): A1
   |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-supersede-A2.t
--- a/tests/test-push-checkheads-supersede-A2.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-supersede-A2.t	Sun Jun 12 21:54:53 2022 +0400
@@ -67,15 +67,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  262c8c798096 (draft): B1
+  @  262c8c798096 [default] (draft): B1
   |
-  o  f6082bc4ffef (draft): A1
+  o  f6082bc4ffef [default] (draft): A1
   |
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-supersede-A3.t
--- a/tests/test-push-checkheads-supersede-A3.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-supersede-A3.t	Sun Jun 12 21:54:53 2022 +0400
@@ -70,15 +70,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  c1c7524e9488 (draft): A1
+  @  c1c7524e9488 [default] (draft): A1
   |
-  o  25c56d33e4c4 (draft): B1
+  o  25c56d33e4c4 [default] (draft): B1
   |
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-supersede-A4.t
--- a/tests/test-push-checkheads-supersede-A4.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-supersede-A4.t	Sun Jun 12 21:54:53 2022 +0400
@@ -52,13 +52,13 @@
   obsoleted 1 changesets
   $ mkcommit B0
   $ hg log -G --hidden
-  @  f40ded968333 (draft): B0
+  @  f40ded968333 [default] (draft): B0
   |
-  o  f6082bc4ffef (draft): A1
+  o  f6082bc4ffef [default] (draft): A1
   |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-supersede-A5.t
--- a/tests/test-push-checkheads-supersede-A5.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-supersede-A5.t	Sun Jun 12 21:54:53 2022 +0400
@@ -52,13 +52,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  ba93660aff8d (draft): A1
+  @  ba93660aff8d [default] (draft): A1
   |
-  o  74ff5441d343 (draft): B0
+  o  74ff5441d343 [default] (draft): B0
   |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-supersede-A6.t
--- a/tests/test-push-checkheads-supersede-A6.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-supersede-A6.t	Sun Jun 12 21:54:53 2022 +0400
@@ -76,17 +76,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  d70a1f75a020 (draft): B1
+  @  d70a1f75a020 [default] (draft): B1
   |
-  | o  f6082bc4ffef (draft): A1
+  | o  f6082bc4ffef [default] (draft): A1
   | |
-  o |  0f88766e02d6 (draft): C0
+  o |  0f88766e02d6 [default] (draft): C0
   |/
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-supersede-A7.t
--- a/tests/test-push-checkheads-supersede-A7.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-supersede-A7.t	Sun Jun 12 21:54:53 2022 +0400
@@ -76,17 +76,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  25c56d33e4c4 (draft): B1
+  @  25c56d33e4c4 [default] (draft): B1
   |
-  | o  a0802eb7fc1b (draft): A1
+  | o  a0802eb7fc1b [default] (draft): A1
   | |
-  | o  0f88766e02d6 (draft): C0
+  | o  0f88766e02d6 [default] (draft): C0
   |/
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-supersede-A8.t
--- a/tests/test-push-checkheads-supersede-A8.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-supersede-A8.t	Sun Jun 12 21:54:53 2022 +0400
@@ -59,13 +59,13 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  c1f8d089020f (draft): A2
+  @  c1f8d089020f [default] (draft): A2
   |
-  | x  f6082bc4ffef (draft): A1
+  | x  f6082bc4ffef [default] (draft): A1
   |/
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-unpushed-D1.t
--- a/tests/test-push-checkheads-unpushed-D1.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-unpushed-D1.t	Sun Jun 12 21:54:53 2022 +0400
@@ -56,13 +56,13 @@
   $ mkcommit B0
   created new head
   $ hg log -G --hidden
-  @  74ff5441d343 (draft): B0
+  @  74ff5441d343 [default] (draft): B0
   |
-  | o  f6082bc4ffef (draft): A1
+  | o  f6082bc4ffef [default] (draft): A1
   |/
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-push-checkheads-unpushed-D2.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-unpushed-D2.t	Sun Jun 12 21:54:53 2022 +0400
@@ -75,15 +75,15 @@
   $ mkcommit C0
   created new head
   $ hg log -G --hidden
-  @  0f88766e02d6 (draft): C0
+  @  0f88766e02d6 [default] (draft): C0
   |
-  | o  f6082bc4ffef (draft): A1
+  | o  f6082bc4ffef [default] (draft): A1
   |/
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-push-checkheads-unpushed-D3.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-unpushed-D3.t	Sun Jun 12 21:54:53 2022 +0400
@@ -74,15 +74,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  25c56d33e4c4 (draft): B1
+  @  25c56d33e4c4 [default] (draft): B1
   |
-  | o  f6082bc4ffef (draft): A1
+  | o  f6082bc4ffef [default] (draft): A1
   |/
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-push-checkheads-unpushed-D4.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-unpushed-D4.t	Sun Jun 12 21:54:53 2022 +0400
@@ -90,17 +90,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  d70a1f75a020 (draft): B1
+  @  d70a1f75a020 [default] (draft): B1
   |
-  | o  f6082bc4ffef (draft): A1
+  | o  f6082bc4ffef [default] (draft): A1
   | |
-  o |  0f88766e02d6 (draft): C0
+  o |  0f88766e02d6 [default] (draft): C0
   |/
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing (new branch only)
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-push-checkheads-unpushed-D5.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-unpushed-D5.t	Sun Jun 12 21:54:53 2022 +0400
@@ -79,17 +79,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  25c56d33e4c4 (draft): B1
+  @  25c56d33e4c4 [default] (draft): B1
   |
-  | o  a0802eb7fc1b (draft): A1
+  | o  a0802eb7fc1b [default] (draft): A1
   | |
-  | o  0f88766e02d6 (draft): C0
+  | o  0f88766e02d6 [default] (draft): C0
   |/
-  | x  d73caddc5533 (draft): B0
+  | x  d73caddc5533 [default] (draft): B0
   | |
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-unpushed-D6.t
--- a/tests/test-push-checkheads-unpushed-D6.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-unpushed-D6.t	Sun Jun 12 21:54:53 2022 +0400
@@ -62,15 +62,15 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  0f88766e02d6 (draft): C0
+  @  0f88766e02d6 [default] (draft): C0
   |
-  | x  ba93660aff8d (draft): A1
+  | x  ba93660aff8d [default] (draft): A1
   | |
-  | o  74ff5441d343 (draft): B0
+  | o  74ff5441d343 [default] (draft): B0
   |/
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/test-push-checkheads-unpushed-D7.t
--- a/tests/test-push-checkheads-unpushed-D7.t	Mon May 23 14:02:54 2022 +0400
+++ b/tests/test-push-checkheads-unpushed-D7.t	Sun Jun 12 21:54:53 2022 +0400
@@ -74,17 +74,17 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  0f88766e02d6 (draft): C0
+  @  0f88766e02d6 [default] (draft): C0
   |
-  | x  c1f8d089020f (draft): A2
+  | x  c1f8d089020f [default] (draft): A2
   |/
-  | x  ba93660aff8d (draft): A1
+  | x  ba93660aff8d [default] (draft): A1
   | |
-  | o  74ff5441d343 (draft): B0
+  | o  74ff5441d343 [default] (draft): B0
   |/
-  | x  8aaa48160adc (draft): A0
+  | x  8aaa48160adc [default] (draft): A0
   |/
-  o  1e4be0697311 (public): root
+  o  1e4be0697311 [default] (public): root
   
 
 Actual testing
diff -r a54db3e55c88 -r fc60328270ac tests/testlib/push-checkheads-util.sh
--- a/tests/testlib/push-checkheads-util.sh	Mon May 23 14:02:54 2022 +0400
+++ b/tests/testlib/push-checkheads-util.sh	Sun Jun 12 21:54:53 2022 +0400
@@ -5,7 +5,7 @@
 cat >> $HGRCPATH <<EOF
 [ui]
 # simpler log output
-logtemplate ="{node|short} ({phase}){if(topic, "[{topic}]")}: {desc}\n"
+logtemplate = "{node|short} [{branch}{if(topic, ":{topic}")}] ({phase}): {desc}\n"
 
 [phases]
 # non publishing server
@@ -31,9 +31,5 @@
         echo >> "server/.hg/hgrc" "[experimental]"
         echo >> "server/.hg/hgrc" "# enforce a single name per branch"
         echo >> "server/.hg/hgrc" "single-head-per-branch = yes"
-
-        echo >> "client/.hg/hgrc" "[ui]"
-        echo >> "client/.hg/hgrc" "# simpler log output"
-        printf >> "client/.hg/hgrc" "%s" 'logtemplate = "{node|short} [{branch}{if(topic, ":{topic}")}] ({phase}): {desc}\n"'
     fi
 }