e40dc5bad2
When we can't find a .do file, we walk all the way back to the root directory. When that happens, the root directory is actually searched twice. This is harmless (since a .do file doesn't exist there anyway) but causes redo-whichdo to produce the wrong output. Also, add a test, which I forgot to do when writing whichdo in the first place. To make the test work from the root directory, we need a way to initialize redo without actually creating a .redo directory. Add a init_no_state() function for that purpose, and split the necessary path functions into their own module so we can avoid importing builder.py.
47 lines
1,018 B
Python
47 lines
1,018 B
Python
import sys, os
|
|
import vars
|
|
|
|
# By default, no output colouring.
|
|
RED = ""
|
|
GREEN = ""
|
|
YELLOW = ""
|
|
BOLD = ""
|
|
PLAIN = ""
|
|
|
|
if sys.stderr.isatty() and (os.environ.get('TERM') or 'dumb') != 'dumb':
|
|
# ...use ANSI formatting codes.
|
|
RED = "\x1b[31m"
|
|
GREEN = "\x1b[32m"
|
|
YELLOW = "\x1b[33m"
|
|
BOLD = "\x1b[1m"
|
|
PLAIN = "\x1b[m"
|
|
|
|
|
|
def log_(s):
|
|
sys.stdout.flush()
|
|
if vars.DEBUG_PIDS:
|
|
sys.stderr.write('%d %s' % (os.getpid(), s))
|
|
else:
|
|
sys.stderr.write(s)
|
|
sys.stderr.flush()
|
|
|
|
|
|
def log(s):
|
|
log_(''.join([GREEN, "redo ", vars.DEPTH, BOLD, s, PLAIN]))
|
|
|
|
def err(s):
|
|
log_(''.join([RED, "redo ", vars.DEPTH, BOLD, s, PLAIN]))
|
|
|
|
def warn(s):
|
|
log_(''.join([YELLOW, "redo ", vars.DEPTH, BOLD, s, PLAIN]))
|
|
|
|
|
|
def debug(s):
|
|
if vars.DEBUG >= 1:
|
|
log_('redo: %s%s' % (vars.DEPTH, s))
|
|
def debug2(s):
|
|
if vars.DEBUG >= 2:
|
|
log_('redo: %s%s' % (vars.DEPTH, s))
|
|
def debug3(s):
|
|
if vars.DEBUG >= 3:
|
|
log_('redo: %s%s' % (vars.DEPTH, s))
|