Mercurial > evolve
view tests/test-topic-shell-prompt.t @ 6889:a66cf9008781
obslog: also display patch for rebased changesets
This applies the same logic that is used for "merge-diff" to rebased
changesets. The successors' content is compared to the content of the
predecessors rebased in-memory on the new parents.
This highlights the changes that were actually introduced while rebasing (like
conflict resolution or API adjustment).
As a side effect, obslog now also outputs slightly more diffs for splits,
showing what parts of the original big changeset were moved to the smaller
split components (but for now it only works for the first few changesets).
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 22 Sep 2024 02:58:54 +0200 |
parents | ce5ebd9c859b |
children |
line wrap: on
line source
$ . $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 zsh-workers@zsh.org. $ 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