Mercurial > hg-stable
view tests/test-profile.t @ 12788:de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
ui.forcemerge is set before calling into merge or resolve commands, then unset
to prevent ui pollution for further operations.
ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the
given --tool is not found by the merge-tools machinery. This makes it possible
to do: hg resolve --tool="python mymerge.py" FILE
With this approach, HGMERGE and ui.merge are not harmed by --tool
author | Steve Borho <steve@borho.org> |
---|---|
date | Tue, 19 Oct 2010 22:33:52 -0500 |
parents | bb665db49e32 |
children | bb91c602d4ad |
line wrap: on
line source
test --time $ hg --time help -q help 2>&1 | grep Time > /dev/null $ hg init a $ cd a test --profile $ if "$TESTDIR/hghave" -q lsprof; then > hg --profile st 2>../out || echo --profile failed > grep CallCount < ../out > /dev/null || echo wrong --profile > > hg --profile --config profiling.output=../out st 2>&1 \ > || echo --profile + output to file failed > grep CallCount < ../out > /dev/null \ > || echo wrong --profile output when saving to a file > > hg --profile --config profiling.format=text st 2>&1 \ > | grep CallCount > /dev/null || echo --profile format=text failed > > echo "[profiling]" >> $HGRCPATH > echo "format=kcachegrind" >> $HGRCPATH > > hg --profile st 2>../out || echo --profile format=kcachegrind failed > grep 'events: Ticks' < ../out > /dev/null || echo --profile output is wrong > > hg --profile --config profiling.output=../out st 2>&1 \ > || echo --profile format=kcachegrind + output to file failed > grep 'events: Ticks' < ../out > /dev/null \ > || echo --profile output is wrong > fi