equal
deleted
inserted
replaced
599 |
599 |
600 def hghave(reqs): |
600 def hghave(reqs): |
601 # TODO: do something smarter when all other uses of hghave is gone |
601 # TODO: do something smarter when all other uses of hghave is gone |
602 tdir = TESTDIR.replace('\\', '/') |
602 tdir = TESTDIR.replace('\\', '/') |
603 proc = Popen4('%s -c "%s/hghave %s"' % |
603 proc = Popen4('%s -c "%s/hghave %s"' % |
604 (options.shell, tdir, ' '.join(reqs)), TESTDIR, 0) |
604 (options.shell, tdir, ' '.join(reqs)), wd, 0) |
605 proc.communicate() |
605 proc.communicate() |
606 ret = proc.wait() |
606 ret = proc.wait() |
607 if wifexited(ret): |
607 if wifexited(ret): |
608 ret = os.WEXITSTATUS(ret) |
608 ret = os.WEXITSTATUS(ret) |
609 return ret == 0 |
609 return ret == 0 |
657 inpython = False |
657 inpython = False |
658 after.setdefault(pos, []).append(l) |
658 after.setdefault(pos, []).append(l) |
659 prepos = pos |
659 prepos = pos |
660 pos = n |
660 pos = n |
661 addsalt(n, False) |
661 addsalt(n, False) |
|
662 cmd = l[4:].split() |
|
663 if len(cmd) == 2 and cmd[0] == 'cd': |
|
664 l = ' $ cd %s || exit 1\n' % cmd[1] |
662 script.append(l[4:]) |
665 script.append(l[4:]) |
663 elif l.startswith(' > '): # continuations |
666 elif l.startswith(' > '): # continuations |
664 after.setdefault(prepos, []).append(l) |
667 after.setdefault(prepos, []).append(l) |
665 script.append(l[4:]) |
668 script.append(l[4:]) |
666 elif l.startswith(' '): # results |
669 elif l.startswith(' '): # results |