diff tests/testlib/push-checkheads-util.sh @ 6259:fc60328270ac

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.

--- 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
 }