← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shell.py

  • Committer: Aaron Bentley
  • Date: 2006-02-21 05:51:15 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060221055115-d1a74f28c9016983
Fixed the push command

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell.py
22
22
import string
23
23
from itertools import chain
24
24
from bzrlib.errors import BzrError
25
 
from bzrlib.commands import get_cmd_object, get_all_cmds, get_alias
 
25
from bzrlib.commands import get_cmd_object, get_all_cmds
26
26
from bzrlib.branch import Branch
27
27
 
28
28
SHELL_BLACKLIST = set(['rm', 'ls'])
154
154
 
155
155
    def default(self, line):
156
156
        args = line.split()
157
 
        alias_args = get_alias(args[0])
158
 
        if alias_args is not None:
159
 
            args[0] = alias_args.pop(0)
160
 
            
161
157
        commandname = args.pop(0)
162
158
        for char in ('|', '<', '>'):
163
159
            commandname = commandname.split(char)[0]
174
170
            if too_complicated(line):
175
171
                return os.system("bzr "+line)
176
172
            else:
177
 
                return (cmd_obj.run_argv_aliases(args, alias_args) or 0)
 
173
                return (cmd_obj.run_argv(args) or 0)
178
174
        except BzrError, e:
179
175
            print e
180
176
        except KeyboardInterrupt, e: