subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) Color extension achieves colorization by overriding the class of "ui" object just before command execution. Before this patch, "diff()" of abstractsubrepo and classes derived from it has no "ui" argument, so "diff()" of hgsubrepo uses "self._repo.ui" to invoke "cmdutil.diffordiffstat()". For separation of configuration between repositories, revision 573bec4ab7ba changed the initialization source of "self._repo.ui" from "ui"(overridden) to "baseui"(plain) of parent repository. And this caused break of colorization. This patch adds "ui" argument to "diff()" of abstractsubrepo and classes derived from it to pass "ui" object of caller side.

     1

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

     2

     3

"$TESTDIR/hghave" bzr || exit 80

     4

     5

TERM=dumb; export TERM

     6

echo '[extensions]' >> $HGRCPATH

     7

echo 'convert = ' >> $HGRCPATH

     8

echo 'hgext.graphlog = ' >> $HGRCPATH

     9

    10

glog()

    11

{

    12

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

    13

}

    14

    15

manifest()

    16

{

    17

    echo "% manifest of $2"

    18

    hg -R $1 manifest -v -r $2

    19

}