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

49 lines
1.8 KiB
Python
Raw Normal View History

redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
import os
Rename vars{,_init}.py -> env{,_init}.py. This fixes some pylint 'redefined builtins' warnings. While I was here, I fixed the others too by renaming a few local variables.
2018-12-04 23:34:28 -05:00
import env
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
from logs import debug2
redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
def _default_do_files(filename):
l = filename.split('.')
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
for i in range(1, len(l)+1):
redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
basename = '.'.join(l[:i])
ext = '.'.join(l[i:])
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
if ext:
ext = '.' + ext
redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
yield ("default%s.do" % ext), basename, ext
def possible_do_files(t):
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
dirname, filename = os.path.split(t)
env and env_init: Eliminate weird auto-initialization of globals. Merge the two files into env, and make each command explicitly call the function that sets it up in the way that's needed for that command. This means we can finally just import all the modules at the top of each file, without worrying about import order. Phew. While we're here, remove the weird auto-appending-'all'-to-targets feature in env.init(). Instead, do it explicitly, and only from redo and redo-ifchange, only if is_toplevel and no other targets are given.
2018-12-05 01:07:16 -05:00
yield (os.path.join(env.v.BASE, dirname), "%s.do" % filename,
redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
'', filename, '')
# It's important to try every possibility in a directory before resorting
# to a parent directory. Think about nested projects: We don't want
# ../../default.o.do to take precedence over ../default.do, because
# the former one might just be an artifact of someone embedding my project
# into theirs as a subdir. When they do, my rules should still be used
# for building my project in *all* cases.
env and env_init: Eliminate weird auto-initialization of globals. Merge the two files into env, and make each command explicitly call the function that sets it up in the way that's needed for that command. This means we can finally just import all the modules at the top of each file, without worrying about import order. Phew. While we're here, remove the weird auto-appending-'all'-to-targets feature in env.init(). Instead, do it explicitly, and only from redo and redo-ifchange, only if is_toplevel and no other targets are given.
2018-12-05 01:07:16 -05:00
t = os.path.normpath(os.path.join(env.v.BASE, t))
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
dirname, filename = os.path.split(t)
redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
dirbits = dirname.split('/')
# since t is an absolute path, dirbits[0] is always '', so we don't
# need to count all the way down to i=0.
for i in range(len(dirbits), 0, -1):
basedir = '/'.join(dirbits[:i])
subdir = '/'.join(dirbits[i:])
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
for dofile, basename, ext in _default_do_files(filename):
redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
yield (basedir, dofile,
subdir, os.path.join(subdir, basename), ext)
def find_do_file(f):
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
for dodir, dofile, basedir, basename, ext in possible_do_files(f.name):
redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
dopath = os.path.join(dodir, dofile)
debug2('%s: %s:%s ?\n' % (f.name, dodir, dofile))
if os.path.exists(dopath):
f.add_dep('m', dopath)
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
return dodir, dofile, basedir, basename, ext
redo-whichdo: fix a bug where the last dir was checked twice, and add tests. 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.
2018-10-30 23:23:04 -04:00
else:
f.add_dep('c', dopath)
Move into the 21st century by fixing some pylint warnings.
2018-12-02 23:15:37 -05:00
return None, None, None, None, None
Reference in a new issue Copy permalink