view tests/bzr-definitions @ 24328:603a8d09e12d

convert: adjust progress bar for octopus merges (issue4169) For merges, we walk the files N-1 times, where N is the number of parents. This means that for an octopus merge with 3 parents and 2 changed files, we actually fetch 6 files. This corrects the progress output of the convert command when such commits are encountered.
author Augie Fackler <augie@google.com>
date Thu, 12 Mar 2015 21:41:50 -0400
parents aa9385f983fa
children 89872688893f
line wrap: on
line source

# this file holds the definitions that are used in various bzr tests

"$TESTDIR/hghave" bzr || exit 80

TERM=dumb; export TERM
echo '[extensions]' >> $HGRCPATH
echo 'convert = ' >> $HGRCPATH

glog()
{
    hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
}

manifest()
{
    echo "% manifest of $2"
    hg -R $1 manifest -v -r $2
}