forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve 'redo -v' output whitespace.

Browse source 
It was too hard to tell when an ifchange ended and the commands from the
prior level started running again.  Now it's a little better.
This commit is contained in:
Avery Pennarun 2010-11-18 23:06:38 -08:00
commit c4287b9d81
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
helpers.py
View file

@ -33,23 +33,21 @@ def mkdirp(d, mode=None):
raise raise
def _log(s): def log_(s):
sys.stdout.flush() sys.stdout.flush()
sys.stderr.write(s) sys.stderr.write(s)
sys.stderr.flush() sys.stderr.flush()
def _clog(s): def _clog(s):
if vars.VERBOSE: _log('\n') log_('\x1b[32mredo %s\x1b[1m%s\x1b[m' % (vars.DEPTH, s))
_log('\x1b[32mredo %s\x1b[1m%s\x1b[m' % (vars.DEPTH, s))
def _bwlog(s): def _bwlog(s):
if vars.VERBOSE: _log('\n') log_('redo %s%s' % (vars.DEPTH, s))
_log('redo %s%s' % (vars.DEPTH, s))
def _cerr(s): def _cerr(s):
_log('\x1b[31mredo: %s\x1b[1m%s\x1b[m' % (vars.DEPTH, s)) log_('\x1b[31mredo: %s\x1b[1m%s\x1b[m' % (vars.DEPTH, s))
def _bwerr(s): def _bwerr(s):
_log('redo: %s%s' % (vars.DEPTH, s)) log_('redo: %s%s' % (vars.DEPTH, s))
if os.isatty(2): if os.isatty(2):
@ -62,10 +60,10 @@ else:
def debug(s): def debug(s):
if vars.DEBUG >= 1: if vars.DEBUG >= 1:
_log('redo: %s%s' % (vars.DEPTH, s)) log_('redo: %s%s' % (vars.DEPTH, s))
def debug2(s): def debug2(s):
if vars.DEBUG >= 2: if vars.DEBUG >= 2:
_log('redo: %s%s' % (vars.DEPTH, s)) log_('redo: %s%s' % (vars.DEPTH, s))
def relpath(t, base): def relpath(t, base):

3
redo.py
View file

@ -131,6 +131,7 @@ def _build(t):
] ]
if vars.VERBOSE: if vars.VERBOSE:
argv[1] += 'v' argv[1] += 'v'
log_('\n')
log('%s\n' % relpath(t, vars.STARTDIR)) log('%s\n' % relpath(t, vars.STARTDIR))
rv = subprocess.call(argv, preexec_fn=lambda: _preexec(t), rv = subprocess.call(argv, preexec_fn=lambda: _preexec(t),
stdout=f.fileno()) stdout=f.fileno())
@ -150,6 +151,8 @@ def _build(t):
f.close() f.close()
if rv != 0: if rv != 0:
raise BuildError('%s: exit code %d' % (t,rv)) raise BuildError('%s: exit code %d' % (t,rv))
if vars.VERBOSE:
log('%s (done)\n\n' % relpath(t, vars.STARTDIR))
def build(t): def build(t):

1
test.do
View file

@ -1,2 +1,3 @@
redo-ifchange t/c.c t/all redo-ifchange t/c.c t/all
echo >&2
./wvtestrun "$REDO" runtests >&2 ./wvtestrun "$REDO" runtests >&2