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

Move initialization of .redo directory into state.init().

Browse source
This commit is contained in:
Avery Pennarun 2010-11-21 02:08:05 -08:00
commit 12983bd88d
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
redo.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import sys, os, glob import sys, os
import options, jwack, atoi import options, jwack, atoi
optspec = """ optspec = """
@ -38,20 +38,12 @@ if not os.environ.get('REDO_BASE', ''):
os.environ['REDO'] = os.path.abspath(sys.argv[0]) os.environ['REDO'] = os.path.abspath(sys.argv[0])
import vars, builder import vars, state, builder
from helpers import * from helpers import err
if is_root: if is_root:
# FIXME: just wiping out all the locks is kind of cheating. But we state.init()
# only do this from the toplevel redo process, so unless the user
# deliberately starts more than one redo on the same repository, it's
# sort of ok.
mkdirp('%s/.redo' % base)
for f in glob.glob('%s/.redo/lock*' % base):
os.unlink(f)
for f in glob.glob('%s/.redo/mark^*' % base):
os.unlink(f)
if not vars.DEPTH: if not vars.DEPTH:

16
state.py
View file

@ -1,6 +1,18 @@
import sys, os, errno import sys, os, errno, glob
import vars import vars
from helpers import unlink, relpath, debug2 from helpers import unlink, relpath, debug2, mkdirp
def init():
# FIXME: just wiping out all the locks is kind of cheating. But we
# only do this from the toplevel redo process, so unless the user
# deliberately starts more than one redo on the same repository, it's
# sort of ok.
mkdirp('%s/.redo' % vars.BASE)
for f in glob.glob('%s/.redo/lock*' % vars.BASE):
os.unlink(f)
for f in glob.glob('%s/.redo/mark^*' % vars.BASE):
os.unlink(f)
def _sname(typ, t, fromdir=None): def _sname(typ, t, fromdir=None):