comparison 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.
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 12 Jun 2022 21:54:53 +0400
parents 1227553f82c6
children d1a6d83a7109
comparison
equal deleted inserted replaced
6245:a54db3e55c88 6259:fc60328270ac
3 . $TESTDIR/testlib/common.sh 3 . $TESTDIR/testlib/common.sh
4 4
5 cat >> $HGRCPATH <<EOF 5 cat >> $HGRCPATH <<EOF
6 [ui] 6 [ui]
7 # simpler log output 7 # simpler log output
8 logtemplate ="{node|short} ({phase}){if(topic, "[{topic}]")}: {desc}\n" 8 logtemplate = "{node|short} [{branch}{if(topic, ":{topic}")}] ({phase}): {desc}\n"
9 9
10 [phases] 10 [phases]
11 # non publishing server 11 # non publishing server
12 publish=False 12 publish=False
13 13
29 29
30 if [ "$1" = "single-head" ]; then 30 if [ "$1" = "single-head" ]; then
31 echo >> "server/.hg/hgrc" "[experimental]" 31 echo >> "server/.hg/hgrc" "[experimental]"
32 echo >> "server/.hg/hgrc" "# enforce a single name per branch" 32 echo >> "server/.hg/hgrc" "# enforce a single name per branch"
33 echo >> "server/.hg/hgrc" "single-head-per-branch = yes" 33 echo >> "server/.hg/hgrc" "single-head-per-branch = yes"
34
35 echo >> "client/.hg/hgrc" "[ui]"
36 echo >> "client/.hg/hgrc" "# simpler log output"
37 printf >> "client/.hg/hgrc" "%s" 'logtemplate = "{node|short} [{branch}{if(topic, ":{topic}")}] ({phase}): {desc}\n"'
38 fi 34 fi
39 } 35 }