← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/externalcommand.py

  • Committer: Aaron Bentley
  • Date: 2007-03-11 16:16:00 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2342.
  • Revision ID: aaron.bentley@utoronto.ca-20070311161600-hvtsmkf3d2z72562
Allow leading junk before merge directive header

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/externalcommand.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
# TODO: Perhaps rather than mapping options and arguments back and
18
18
# forth, we should just pass in the whole argv, and allow
20
20
 
21
21
 
22
22
import os
 
23
import sys
23
24
 
24
25
from bzrlib.commands import Command
 
26
from bzrlib.osutils import pathjoin
25
27
 
26
28
 
27
29
class ExternalCommand(Command):
54
56
    def run(self, *args, **kwargs):
55
57
        raise NotImplementedError('should not be called on %r' % self)
56
58
 
57
 
    def run_argv_aliases(self, argv, alias_argv=None):
 
59
    def run_argv(self, argv, alias_argv=None):
58
60
        return os.spawnv(os.P_WAIT, self.path, [self.path] + argv)
59
61
 
60
62
    def help(self):