view tests/testlib/content-divergence-util.sh @ 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).

#!/bin/sh
# setup config and various utility to test content-divergence resolution

. $TESTDIR/testlib/common.sh

cat >> $HGRCPATH <<EOF
[ui]
# simpler log output
logtemplate ="{rev}:{node|short} ({phase}): {desc|firstline} {if(troubles, '[{troubles}]')}\n"

[phases]
# non publishing server
publish=False

[extensions]
evolve=
rebase=
EOF

setuprepos() {
    echo creating test repo for test case $1
    mkdir $1
    cd $1

    echo - upstream
    hg init upstream
    cd upstream
    mkcommit O
    hg phase --public .
    cd ..
    echo - local
    hg clone -q upstream local
    echo - other
    hg clone -q upstream other
    echo 'cd into `local` and proceed with env setup'
}