view tests/bzr-definitions @ 34946:5caae380ff90 stable

filemerge: pass a default value to _toolstr (issue5718)

After a refactoring, _toolstr stopped having default="" as one of it's args,
therefore when called without a default it returns None and not "". This causes
concatenation to fail.

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

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
}