← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/externalcommand.py

Merge Aarons integration branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/externalcommand.py
23
23
import sys
24
24
 
25
25
from bzrlib.commands import Command
 
26
from bzrlib.osutils import pathjoin
26
27
 
27
28
 
28
29
class ExternalCommand(Command):
37
38
            ## Empty directories are not real paths
38
39
            if not dir:
39
40
                continue
 
41
            # This needs to be os.path.join() or windows cannot
 
42
            # find the batch file that you are wanting to execute
40
43
            path = os.path.join(dir, cmd)
41
44
            if os.path.isfile(path):
42
45
                return ExternalCommand(path)
47
50
    def __init__(self, path):
48
51
        self.path = path
49
52
 
50
 
 
51
53
    def name(self):
52
 
        return self.path.split(os.sep)[-1]
53
 
 
 
54
        return os.path.basename(self.path)
54
55
 
55
56
    def run(self, *args, **kwargs):
56
57
        raise NotImplementedError('should not be called on %r' % self)
57
58
 
58
 
 
59
59
    def run_argv(self, argv):
60
60
        return os.spawnv(os.P_WAIT, self.path, [self.path] + argv)
61
61
 
62
 
 
63
62
    def help(self):
64
63
        m = 'external command from %s\n\n' % self.path
65
64
        pipe = os.popen('%s --help' % self.path)
66
65
        return m + pipe.read()
 
66