Mercurial > public > mercurial-scm > hg

diff tests/test-progress @ 10788:ca6ba6cac6cd stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
progress: use stderr instead of stdout; check stderr.isatty() This means that progress bars will continue to show on the terminal when both stdin and stdout are redirected.
author Augie Fackler <durin42@gmail.com>
date Mon, 29 Mar 2010 16:44:24 -0500
parents c52057614c72
children 83af68e38be3
line wrap: on
line diff
--- a/tests/test-progress	Mon Mar 29 15:16:05 2010 -0500
+++ b/tests/test-progress	Mon Mar 29 16:44:24 2010 -0500
@@ -31,30 +31,29 @@
 echo "[extensions]" >> $HGRCPATH
 echo "progress=" >> $HGRCPATH
 echo "loop=`pwd`/loop.py" >> $HGRCPATH
-echo "[ui]" >> $HGRCPATH
-echo "interactive=1" >> $HGRCPATH
+echo "[progress]" >> $HGRCPATH
+echo "assume-tty=1" >> $HGRCPATH
 
 echo '% test default params, display nothing because of delay'
-hg -y loop 3 | python filtercr.py
+hg -y loop 3 2>&1 | python filtercr.py
 
-echo "[progress]" >> $HGRCPATH
 echo "delay=0" >> $HGRCPATH
 echo "refresh=0" >> $HGRCPATH
 
 echo '% test with delay=0, refresh=0'
-hg -y loop 3 | python filtercr.py
+hg -y loop 3 2>&1 | python filtercr.py
 
 echo '% test refresh is taken in account'
-hg -y --config progress.refresh=100 loop 3 | python filtercr.py
+hg -y --config progress.refresh=100 loop 3 2>&1 | python filtercr.py
 
 echo '% test format options 1'
-hg -y --config 'progress.format=number topic item+2' loop 2 | python filtercr.py
+hg -y --config 'progress.format=number topic item+2' loop 2 2>&1 | python filtercr.py
 
 echo '% test format options 2'
-hg -y --config 'progress.format=number item-3 bar' loop 2 | python filtercr.py
+hg -y --config 'progress.format=number item-3 bar' loop 2 2>&1 | python filtercr.py
 
 echo '% test format options and indeterminate progress'
-hg -y --config 'progress.format=number item bar' loop -- -2 | python filtercr.py
+hg -y --config 'progress.format=number item bar' loop -- -2 2>&1 | python filtercr.py
 
 echo '% test immediate progress completion'
-hg -y loop 0 | python filtercr.py
+hg -y loop 0 2>&1 | python filtercr.py