annotate tests/test-topic-shell-prompt.t @ 5601:3946ee4ee3ae

topic: add a `exp….topic.linear-merge` option to allow some oedipus

If this option is set to `from-branch`, a user can call `hg merge some-topic`
from a bare branch even if `some-topic` is a direct descendant of the current
working copy parents. This was previously denied if the changesets was on the
same branch, since the result would be an "oedipus merge".

Some user have been requesting this, and this type of merge is one of Gitlab
standard way of merging a "Merge Request". That new option will unlock issue
`heptapod#200` and make this mode available for those who wants it.

  $ . $TESTDIR/testlib/topic_setup.sh

Code logically equivalent to the following is used in Zsh to show the branch
and topic (if set) in the prompt. If the format of the files is changed in a
way that it breaks the test, a mail should be sent to [e-mail].

  $ get_branch_like_zsh() {
  >     branchfile=".hg/branch"
  >     topicfile=".hg/topic"
  >     if [ -r "${branchfile}" ] ; then
  >         r_branch=$(cat "${branchfile}")
  >     fi
  >     if [ -f "${topicfile}" ] && [ -r "${topicfile}" ] && [ -s "${topicfile}" ] ; then
  >         IFS= read -r REPLY < ${topicfile}
  >         r_branch=${r_branch}:${REPLY}
  >     fi
  >     echo $r_branch
  > }

  $ hg init
  $ hg branch branch -q
  $ get_branch_like_zsh
  branch
  $ hg topic topic -q
  $ get_branch_like_zsh
  branch:topic
  $ hg topic --clear -q
  $ get_branch_like_zsh
  branch