bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
1  | 
# Copyright (C) 2004, 2005 by Canonical Ltd
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
2  | 
|
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
||
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
||
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
17  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
18  | 
# TODO: probably should say which arguments are candidates for glob
 | 
19  | 
# expansion on windows and do that at the command level.
 | 
|
20  | 
||
| 
1095
by Martin Pool
 todo  | 
21  | 
# TODO: Help messages for options.
 | 
22  | 
||
23  | 
# TODO: Define arguments by objects, rather than just using names.
 | 
|
24  | 
# Those objects can specify the expected type of the argument, which
 | 
|
25  | 
# would help with validation and shell completion.
 | 
|
26  | 
||
| 
1393.1.27
by Martin Pool
 - clean up profile code and change default sort order  | 
27  | 
# TODO: "--profile=cum", to change sort order.  Is there any value in leaving
 | 
28  | 
# the profile output behind so it can be interactively examined?
 | 
|
29  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
30  | 
import sys  | 
31  | 
import os  | 
|
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
32  | 
from warnings import warn  | 
33  | 
from inspect import getdoc  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
34  | 
|
35  | 
import bzrlib  | 
|
| 
1112
by Martin Pool
 - disable standard logging to .bzr.log and stderr while running  | 
36  | 
import bzrlib.trace  | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
37  | 
from bzrlib.trace import mutter, note, log_error, warning  | 
| 
974.1.82
by Aaron Bentley
 Handled NotBranchError like a CommandError in main()  | 
38  | 
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError, NotBranchError  | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
39  | 
from bzrlib.revisionspec import RevisionSpec  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
40  | 
from bzrlib import BZRDIR  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
41  | 
|
| 
731
by Martin Pool
 - merge plugin patch from john  | 
42  | 
plugin_cmds = {}  | 
43  | 
||
44  | 
||
| 
759
by Martin Pool
 - fix up register_command() names  | 
45  | 
def register_command(cmd):  | 
| 
731
by Martin Pool
 - merge plugin patch from john  | 
46  | 
    "Utility function to help register a command"
 | 
47  | 
global plugin_cmds  | 
|
48  | 
k = cmd.__name__  | 
|
49  | 
if k.startswith("cmd_"):  | 
|
50  | 
k_unsquished = _unsquish_command_name(k)  | 
|
51  | 
else:  | 
|
52  | 
k_unsquished = k  | 
|
53  | 
if not plugin_cmds.has_key(k_unsquished):  | 
|
54  | 
plugin_cmds[k_unsquished] = cmd  | 
|
| 
1137
by Martin Pool
 - additional trace messages for plugins  | 
55  | 
mutter('registered plugin command %s', k_unsquished)  | 
| 
731
by Martin Pool
 - merge plugin patch from john  | 
56  | 
else:  | 
57  | 
log_error('Two plugins defined the same command: %r' % k)  | 
|
58  | 
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])  | 
|
59  | 
||
60  | 
||
| 
350
by Martin Pool
 - refactor command aliases into command classes  | 
61  | 
def _squish_command_name(cmd):  | 
62  | 
return 'cmd_' + cmd.replace('-', '_')  | 
|
63  | 
||
64  | 
||
65  | 
def _unsquish_command_name(cmd):  | 
|
66  | 
assert cmd.startswith("cmd_")  | 
|
67  | 
return cmd[4:].replace('_','-')  | 
|
68  | 
||
| 
914
by Martin Pool
 - fix up breakage of 'bzr log -v' by root_id patch  | 
69  | 
|
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
70  | 
def _parse_revision_str(revstr):  | 
| 
914
by Martin Pool
 - fix up breakage of 'bzr log -v' by root_id patch  | 
71  | 
"""This handles a revision string -> revno.  | 
72  | 
||
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
73  | 
    This always returns a list.  The list will have one element for
 | 
| 
1432
by Robert Collins
 branch: namespace  | 
74  | 
    each revision specifier supplied.
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
75  | 
|
76  | 
    >>> _parse_revision_str('234')
 | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
77  | 
    [<RevisionSpec_int 234>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
78  | 
    >>> _parse_revision_str('234..567')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
79  | 
    [<RevisionSpec_int 234>, <RevisionSpec_int 567>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
80  | 
    >>> _parse_revision_str('..')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
81  | 
    [<RevisionSpec None>, <RevisionSpec None>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
82  | 
    >>> _parse_revision_str('..234')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
83  | 
    [<RevisionSpec None>, <RevisionSpec_int 234>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
84  | 
    >>> _parse_revision_str('234..')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
85  | 
    [<RevisionSpec_int 234>, <RevisionSpec None>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
86  | 
    >>> _parse_revision_str('234..456..789') # Maybe this should be an error
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
87  | 
    [<RevisionSpec_int 234>, <RevisionSpec_int 456>, <RevisionSpec_int 789>]
 | 
| 
1432
by Robert Collins
 branch: namespace  | 
88  | 
    >>> _parse_revision_str('234....789') #Error ?
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
89  | 
    [<RevisionSpec_int 234>, <RevisionSpec None>, <RevisionSpec_int 789>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
90  | 
    >>> _parse_revision_str('revid:test@other.com-234234')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
91  | 
    [<RevisionSpec_revid revid:test@other.com-234234>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
92  | 
    >>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
93  | 
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
94  | 
    >>> _parse_revision_str('revid:test@other.com-234234..23')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
95  | 
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_int 23>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
96  | 
    >>> _parse_revision_str('date:2005-04-12')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
97  | 
    [<RevisionSpec_date date:2005-04-12>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
98  | 
    >>> _parse_revision_str('date:2005-04-12 12:24:33')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
99  | 
    [<RevisionSpec_date date:2005-04-12 12:24:33>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
100  | 
    >>> _parse_revision_str('date:2005-04-12T12:24:33')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
101  | 
    [<RevisionSpec_date date:2005-04-12T12:24:33>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
102  | 
    >>> _parse_revision_str('date:2005-04-12,12:24:33')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
103  | 
    [<RevisionSpec_date date:2005-04-12,12:24:33>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
104  | 
    >>> _parse_revision_str('-5..23')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
105  | 
    [<RevisionSpec_int -5>, <RevisionSpec_int 23>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
106  | 
    >>> _parse_revision_str('-5')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
107  | 
    [<RevisionSpec_int -5>]
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
108  | 
    >>> _parse_revision_str('123a')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
109  | 
    Traceback (most recent call last):
 | 
110  | 
      ...
 | 
|
111  | 
    BzrError: No namespace registered for string: '123a'
 | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
112  | 
    >>> _parse_revision_str('abc')
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
113  | 
    Traceback (most recent call last):
 | 
114  | 
      ...
 | 
|
115  | 
    BzrError: No namespace registered for string: 'abc'
 | 
|
| 
1432
by Robert Collins
 branch: namespace  | 
116  | 
    >>> _parse_revision_str('branch:../branch2')
 | 
117  | 
    [<RevisionSpec_branch branch:../branch2>]
 | 
|
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
118  | 
    """
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
119  | 
import re  | 
120  | 
old_format_re = re.compile('\d*:\d*')  | 
|
121  | 
m = old_format_re.match(revstr)  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
122  | 
revs = []  | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
123  | 
if m:  | 
124  | 
warning('Colon separator for revision numbers is deprecated.'  | 
|
125  | 
' Use .. instead')  | 
|
126  | 
for rev in revstr.split(':'):  | 
|
127  | 
if rev:  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
128  | 
revs.append(RevisionSpec(int(rev)))  | 
129  | 
else:  | 
|
130  | 
revs.append(RevisionSpec(None))  | 
|
131  | 
else:  | 
|
| 
1432
by Robert Collins
 branch: namespace  | 
132  | 
next_prefix = None  | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
133  | 
for x in revstr.split('..'):  | 
134  | 
if not x:  | 
|
135  | 
revs.append(RevisionSpec(None))  | 
|
| 
1432
by Robert Collins
 branch: namespace  | 
136  | 
elif x[-1] == ':':  | 
137  | 
                # looks like a namespace:.. has happened
 | 
|
138  | 
next_prefix = x + '..'  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
139  | 
else:  | 
| 
1432
by Robert Collins
 branch: namespace  | 
140  | 
if next_prefix is not None:  | 
141  | 
x = next_prefix + x  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
142  | 
revs.append(RevisionSpec(x))  | 
| 
1432
by Robert Collins
 branch: namespace  | 
143  | 
next_prefix = None  | 
144  | 
if next_prefix is not None:  | 
|
145  | 
revs.append(RevisionSpec(next_prefix))  | 
|
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
146  | 
return revs  | 
147  | 
||
| 
731
by Martin Pool
 - merge plugin patch from john  | 
148  | 
|
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
149  | 
def _builtin_commands():  | 
| 
1147
by Martin Pool
 - split builtin commands into separate module bzrlib.builtins;  | 
150  | 
import bzrlib.builtins  | 
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
151  | 
r = {}  | 
| 
1147
by Martin Pool
 - split builtin commands into separate module bzrlib.builtins;  | 
152  | 
builtins = bzrlib.builtins.__dict__  | 
153  | 
for name in builtins:  | 
|
154  | 
if name.startswith("cmd_"):  | 
|
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
155  | 
real_name = _unsquish_command_name(name)  | 
156  | 
r[real_name] = builtins[name]  | 
|
157  | 
return r  | 
|
158  | 
||
159  | 
||
160  | 
||
161  | 
def builtin_command_names():  | 
|
162  | 
"""Return list of builtin command names."""  | 
|
163  | 
return _builtin_commands().keys()  | 
|
164  | 
||
165  | 
||
166  | 
def plugin_command_names():  | 
|
167  | 
return plugin_cmds.keys()  | 
|
168  | 
||
169  | 
||
170  | 
def _get_cmd_dict(plugins_override=True):  | 
|
171  | 
"""Return name->class mapping for all commands."""  | 
|
172  | 
d = _builtin_commands()  | 
|
| 
731
by Martin Pool
 - merge plugin patch from john  | 
173  | 
if plugins_override:  | 
174  | 
d.update(plugin_cmds)  | 
|
| 
641
by Martin Pool
 - improved external-command patch from john  | 
175  | 
return d  | 
| 
731
by Martin Pool
 - merge plugin patch from john  | 
176  | 
|
| 
641
by Martin Pool
 - improved external-command patch from john  | 
177  | 
|
| 
731
by Martin Pool
 - merge plugin patch from john  | 
178  | 
def get_all_cmds(plugins_override=True):  | 
| 
641
by Martin Pool
 - improved external-command patch from john  | 
179  | 
"""Return canonical name and class for all registered commands."""  | 
| 
731
by Martin Pool
 - merge plugin patch from john  | 
180  | 
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():  | 
| 
641
by Martin Pool
 - improved external-command patch from john  | 
181  | 
yield k,v  | 
182  | 
||
183  | 
||
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
184  | 
def get_cmd_object(cmd_name, plugins_override=True):  | 
| 
350
by Martin Pool
 - refactor command aliases into command classes  | 
185  | 
"""Return the canonical name and command class for a command.  | 
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
186  | 
|
187  | 
    plugins_override
 | 
|
188  | 
        If true, plugin commands can override builtins.
 | 
|
| 
350
by Martin Pool
 - refactor command aliases into command classes  | 
189  | 
    """
 | 
| 
1163
by Martin Pool
 - split ExternalCommand class into its own file  | 
190  | 
from bzrlib.externalcommand import ExternalCommand  | 
191  | 
||
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
192  | 
cmd_name = str(cmd_name) # not unicode  | 
| 
350
by Martin Pool
 - refactor command aliases into command classes  | 
193  | 
|
194  | 
    # first look up this command under the specified name
 | 
|
| 
731
by Martin Pool
 - merge plugin patch from john  | 
195  | 
cmds = _get_cmd_dict(plugins_override=plugins_override)  | 
| 
272
by Martin Pool
 - Add command aliases  | 
196  | 
try:  | 
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
197  | 
return cmds[cmd_name]()  | 
| 
272
by Martin Pool
 - Add command aliases  | 
198  | 
except KeyError:  | 
| 
350
by Martin Pool
 - refactor command aliases into command classes  | 
199  | 
        pass
 | 
200  | 
||
201  | 
    # look for any command which claims this as an alias
 | 
|
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
202  | 
for real_cmd_name, cmd_class in cmds.iteritems():  | 
203  | 
if cmd_name in cmd_class.aliases:  | 
|
204  | 
return cmd_class()  | 
|
205  | 
||
206  | 
cmd_obj = ExternalCommand.find_command(cmd_name)  | 
|
207  | 
if cmd_obj:  | 
|
208  | 
return cmd_obj  | 
|
209  | 
||
210  | 
raise BzrCommandError("unknown command %r" % cmd_name)  | 
|
| 
272
by Martin Pool
 - Add command aliases  | 
211  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
212  | 
|
| 
558
by Martin Pool
 - All top-level classes inherit from object  | 
213  | 
class Command(object):  | 
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
214  | 
"""Base class for commands.  | 
215  | 
||
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
216  | 
    Commands are the heart of the command-line bzr interface.
 | 
217  | 
||
218  | 
    The command object mostly handles the mapping of command-line
 | 
|
219  | 
    parameters into one or more bzrlib operations, and of the results
 | 
|
220  | 
    into textual output.
 | 
|
221  | 
||
222  | 
    Commands normally don't have any state.  All their arguments are
 | 
|
223  | 
    passed in to the run method.  (Subclasses may take a different
 | 
|
224  | 
    policy if the behaviour of the instance needs to depend on e.g. a
 | 
|
225  | 
    shell plugin and not just its Python class.)
 | 
|
226  | 
||
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
227  | 
    The docstring for an actual command should give a single-line
 | 
228  | 
    summary, then a complete description of the command.  A grammar
 | 
|
229  | 
    description will be inserted.
 | 
|
230  | 
||
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
231  | 
    aliases
 | 
232  | 
        Other accepted names for this command.
 | 
|
233  | 
||
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
234  | 
    takes_args
 | 
235  | 
        List of argument forms, marked with whether they are optional,
 | 
|
236  | 
        repeated, etc.
 | 
|
237  | 
||
238  | 
    takes_options
 | 
|
239  | 
        List of options that may be given for this command.
 | 
|
240  | 
||
241  | 
    hidden
 | 
|
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
242  | 
        If true, this command isn't advertised.  This is typically
 | 
243  | 
        for commands intended for expert users.
 | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
244  | 
    """
 | 
245  | 
aliases = []  | 
|
246  | 
||
247  | 
takes_args = []  | 
|
248  | 
takes_options = []  | 
|
249  | 
||
250  | 
hidden = False  | 
|
251  | 
||
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
252  | 
def __init__(self):  | 
253  | 
"""Construct an instance of this command."""  | 
|
| 
973
by Martin Pool
 - various refactorings of command interpreter  | 
254  | 
if self.__doc__ == Command.__doc__:  | 
255  | 
warn("No help message set for %r" % self)  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
256  | 
|
| 
1165
by Martin Pool
 - move parsing of argv into arguments and options into Command.run_argv  | 
257  | 
|
258  | 
def run_argv(self, argv):  | 
|
259  | 
"""Parse command line and run."""  | 
|
260  | 
args, opts = parse_args(argv)  | 
|
261  | 
||
262  | 
if 'help' in opts: # e.g. bzr add --help  | 
|
263  | 
from bzrlib.help import help_on_command  | 
|
264  | 
help_on_command(self.name())  | 
|
265  | 
return 0  | 
|
266  | 
||
267  | 
        # check options are reasonable
 | 
|
268  | 
allowed = self.takes_options  | 
|
269  | 
for oname in opts:  | 
|
270  | 
if oname not in allowed:  | 
|
271  | 
raise BzrCommandError("option '--%s' is not allowed for command %r"  | 
|
272  | 
% (oname, self.name()))  | 
|
273  | 
||
274  | 
        # mix arguments and options into one dictionary
 | 
|
275  | 
cmdargs = _match_argform(self.name(), self.takes_args, args)  | 
|
276  | 
cmdopts = {}  | 
|
277  | 
for k, v in opts.items():  | 
|
278  | 
cmdopts[k.replace('-', '_')] = v  | 
|
279  | 
||
280  | 
all_cmd_args = cmdargs.copy()  | 
|
281  | 
all_cmd_args.update(cmdopts)  | 
|
282  | 
||
283  | 
return self.run(**all_cmd_args)  | 
|
284  | 
||
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
285  | 
|
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
286  | 
def run(self):  | 
287  | 
"""Actually run the command.  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
288  | 
|
289  | 
        This is invoked with the options and arguments bound to
 | 
|
290  | 
        keyword parameters.
 | 
|
291  | 
||
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
292  | 
        Return 0 or None if the command was successful, or a non-zero
 | 
293  | 
        shell error code if not.  It's OK for this method to allow
 | 
|
294  | 
        an exception to raise up.
 | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
295  | 
        """
 | 
| 
1147
by Martin Pool
 - split builtin commands into separate module bzrlib.builtins;  | 
296  | 
raise NotImplementedError()  | 
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
297  | 
|
298  | 
||
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
299  | 
def help(self):  | 
300  | 
"""Return help message for this class."""  | 
|
301  | 
if self.__doc__ is Command.__doc__:  | 
|
302  | 
return None  | 
|
303  | 
return getdoc(self)  | 
|
304  | 
||
305  | 
def name(self):  | 
|
306  | 
return _unsquish_command_name(self.__class__.__name__)  | 
|
307  | 
||
308  | 
||
| 
493
by Martin Pool
 - Merge aaron's merge command  | 
309  | 
def parse_spec(spec):  | 
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
310  | 
"""  | 
311  | 
    >>> parse_spec(None)
 | 
|
312  | 
    [None, None]
 | 
|
313  | 
    >>> parse_spec("./")
 | 
|
314  | 
    ['./', None]
 | 
|
315  | 
    >>> parse_spec("../@")
 | 
|
316  | 
    ['..', -1]
 | 
|
317  | 
    >>> parse_spec("../f/@35")
 | 
|
318  | 
    ['../f', 35]
 | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
319  | 
    >>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
 | 
320  | 
    ['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
 | 
|
| 
622
by Martin Pool
 Updated merge patch from Aaron  | 
321  | 
    """
 | 
322  | 
if spec is None:  | 
|
323  | 
return [None, None]  | 
|
| 
493
by Martin Pool
 - Merge aaron's merge command  | 
324  | 
if '/@' in spec:  | 
325  | 
parsed = spec.split('/@')  | 
|
326  | 
assert len(parsed) == 2  | 
|
327  | 
if parsed[1] == "":  | 
|
328  | 
parsed[1] = -1  | 
|
329  | 
else:  | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
330  | 
try:  | 
331  | 
parsed[1] = int(parsed[1])  | 
|
332  | 
except ValueError:  | 
|
333  | 
pass # We can allow stuff like ./@revid:blahblahblah  | 
|
334  | 
else:  | 
|
335  | 
assert parsed[1] >=0  | 
|
| 
493
by Martin Pool
 - Merge aaron's merge command  | 
336  | 
else:  | 
337  | 
parsed = [spec, None]  | 
|
338  | 
return parsed  | 
|
339  | 
||
| 
628
by Martin Pool
 - merge aaron's updated merge/pull code  | 
340  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
341  | 
# list of all available options; the rhs can be either None for an
 | 
342  | 
# option that takes no argument, or a constructor function that checks
 | 
|
343  | 
# the type.
 | 
|
344  | 
OPTIONS = {  | 
|
345  | 
'all': None,  | 
|
| 
1185.10.1
by Aaron Bentley
 Added --basis option to bzr branch  | 
346  | 
'basis': str,  | 
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
347  | 
'diff-options': str,  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
348  | 
'help': None,  | 
| 
389
by Martin Pool
 - new commit --file option!  | 
349  | 
'file': unicode,  | 
| 
628
by Martin Pool
 - merge aaron's updated merge/pull code  | 
350  | 
'force': None,  | 
| 
678
by Martin Pool
 - export to tarballs  | 
351  | 
'format': unicode,  | 
| 
545
by Martin Pool
 - --forward option for log  | 
352  | 
'forward': None,  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
353  | 
'message': unicode,  | 
| 
594
by Martin Pool
 - add --no-recurse option for add command  | 
354  | 
'no-recurse': None,  | 
| 
137
by mbp at sourcefrog
 new --profile option  | 
355  | 
'profile': None,  | 
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
356  | 
'revision': _parse_revision_str,  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
357  | 
'short': None,  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
358  | 
'show-ids': None,  | 
| 
12
by mbp at sourcefrog
 new --timezone option for bzr log  | 
359  | 
'timezone': str,  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
360  | 
'verbose': None,  | 
361  | 
'version': None,  | 
|
| 
286
by Martin Pool
 - New bzr whoami --email option  | 
362  | 
'email': None,  | 
| 
885
by Martin Pool
 - commit command refuses unless something is changed or --unchanged is given  | 
363  | 
'unchanged': None,  | 
| 
674
by Martin Pool
 - check command now also checks new inventory_sha1 and  | 
364  | 
'update': None,  | 
| 
807
by Martin Pool
 - New log --long option  | 
365  | 
'long': None,  | 
| 
849
by Martin Pool
 - Put files inside an exported tarball into a top-level directory rather than  | 
366  | 
'root': str,  | 
| 
974.1.8
by Aaron Bentley
 Added default backups for merge-revert  | 
367  | 
'no-backup': None,  | 
| 
1092.1.20
by Robert Collins
 import and use TestUtil to do regex based partial test runs  | 
368  | 
'pattern': str,  | 
| 
1185.12.11
by Aaron Bentley
 Made pull only save the parent location if it is unset, or on --remember  | 
369  | 
'remember': None,  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
370  | 
    }
 | 
371  | 
||
372  | 
SHORT_OPTIONS = {  | 
|
| 
583
by Martin Pool
 - add -h as short name for --help  | 
373  | 
'F': 'file',  | 
374  | 
'h': 'help',  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
375  | 
'm': 'message',  | 
376  | 
'r': 'revision',  | 
|
377  | 
'v': 'verbose',  | 
|
| 
807
by Martin Pool
 - New log --long option  | 
378  | 
'l': 'long',  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
379  | 
}
 | 
380  | 
||
381  | 
||
382  | 
def parse_args(argv):  | 
|
383  | 
"""Parse command line.  | 
|
384  | 
    
 | 
|
385  | 
    Arguments and options are parsed at this level before being passed
 | 
|
386  | 
    down to specific command handlers.  This routine knows, from a
 | 
|
387  | 
    lookup table, something about the available options, what optargs
 | 
|
388  | 
    they take, and which commands will accept them.
 | 
|
389  | 
||
| 
31
by Martin Pool
 fix up parse_args doctest  | 
390  | 
    >>> parse_args('--help'.split())
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
391  | 
    ([], {'help': True})
 | 
| 
1144
by Martin Pool
 - accept -- to terminate options  | 
392  | 
    >>> parse_args('help -- --invalidcmd'.split())
 | 
393  | 
    (['help', '--invalidcmd'], {})
 | 
|
| 
31
by Martin Pool
 fix up parse_args doctest  | 
394  | 
    >>> parse_args('--version'.split())
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
395  | 
    ([], {'version': True})
 | 
| 
31
by Martin Pool
 fix up parse_args doctest  | 
396  | 
    >>> parse_args('status --all'.split())
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
397  | 
    (['status'], {'all': True})
 | 
| 
31
by Martin Pool
 fix up parse_args doctest  | 
398  | 
    >>> parse_args('commit --message=biter'.split())
 | 
| 
17
by mbp at sourcefrog
 allow --option=ARG syntax  | 
399  | 
    (['commit'], {'message': u'biter'})
 | 
| 
683
by Martin Pool
 - short option stacking patch from John A Meinel  | 
400  | 
    >>> parse_args('log -r 500'.split())
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
401  | 
    (['log'], {'revision': [<RevisionSpec_int 500>]})
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
402  | 
    >>> parse_args('log -r500..600'.split())
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
403  | 
    (['log'], {'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
 | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
404  | 
    >>> parse_args('log -vr500..600'.split())
 | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
405  | 
    (['log'], {'verbose': True, 'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
 | 
406  | 
    >>> parse_args('log -rrevno:500..600'.split()) #the r takes an argument
 | 
|
407  | 
    (['log'], {'revision': [<RevisionSpec_revno revno:500>, <RevisionSpec_int 600>]})
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
408  | 
    """
 | 
409  | 
args = []  | 
|
410  | 
opts = {}  | 
|
411  | 
||
| 
1144
by Martin Pool
 - accept -- to terminate options  | 
412  | 
argsover = False  | 
| 
26
by mbp at sourcefrog
 fix StopIteration error on python2.3(?)  | 
413  | 
while argv:  | 
414  | 
a = argv.pop(0)  | 
|
| 
1144
by Martin Pool
 - accept -- to terminate options  | 
415  | 
if not argsover and a[0] == '-':  | 
| 
264
by Martin Pool
 parse_args: option names must be ascii  | 
416  | 
            # option names must not be unicode
 | 
417  | 
a = str(a)  | 
|
| 
17
by mbp at sourcefrog
 allow --option=ARG syntax  | 
418  | 
optarg = None  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
419  | 
if a[1] == '-':  | 
| 
1144
by Martin Pool
 - accept -- to terminate options  | 
420  | 
if a == '--':  | 
421  | 
                    # We've received a standalone -- No more flags
 | 
|
422  | 
argsover = True  | 
|
423  | 
                    continue
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
424  | 
mutter(" got option %r" % a)  | 
| 
17
by mbp at sourcefrog
 allow --option=ARG syntax  | 
425  | 
if '=' in a:  | 
426  | 
optname, optarg = a[2:].split('=', 1)  | 
|
427  | 
else:  | 
|
428  | 
optname = a[2:]  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
429  | 
if optname not in OPTIONS:  | 
| 
694
by Martin Pool
 - weed out all remaining calls to bailout() and remove the function  | 
430  | 
raise BzrError('unknown long option %r' % a)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
431  | 
else:  | 
432  | 
shortopt = a[1:]  | 
|
| 
683
by Martin Pool
 - short option stacking patch from John A Meinel  | 
433  | 
if shortopt in SHORT_OPTIONS:  | 
434  | 
                    # Multi-character options must have a space to delimit
 | 
|
435  | 
                    # their value
 | 
|
436  | 
optname = SHORT_OPTIONS[shortopt]  | 
|
437  | 
else:  | 
|
438  | 
                    # Single character short options, can be chained,
 | 
|
439  | 
                    # and have their value appended to their name
 | 
|
440  | 
shortopt = a[1:2]  | 
|
441  | 
if shortopt not in SHORT_OPTIONS:  | 
|
442  | 
                        # We didn't find the multi-character name, and we
 | 
|
443  | 
                        # didn't find the single char name
 | 
|
| 
694
by Martin Pool
 - weed out all remaining calls to bailout() and remove the function  | 
444  | 
raise BzrError('unknown short option %r' % a)  | 
| 
683
by Martin Pool
 - short option stacking patch from John A Meinel  | 
445  | 
optname = SHORT_OPTIONS[shortopt]  | 
446  | 
||
447  | 
if a[2:]:  | 
|
448  | 
                        # There are extra things on this option
 | 
|
449  | 
                        # see if it is the value, or if it is another
 | 
|
450  | 
                        # short option
 | 
|
451  | 
optargfn = OPTIONS[optname]  | 
|
452  | 
if optargfn is None:  | 
|
453  | 
                            # This option does not take an argument, so the
 | 
|
454  | 
                            # next entry is another short option, pack it back
 | 
|
455  | 
                            # into the list
 | 
|
456  | 
argv.insert(0, '-' + a[2:])  | 
|
457  | 
else:  | 
|
458  | 
                            # This option takes an argument, so pack it
 | 
|
459  | 
                            # into the array
 | 
|
460  | 
optarg = a[2:]  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
461  | 
|
462  | 
if optname in opts:  | 
|
463  | 
                # XXX: Do we ever want to support this, e.g. for -r?
 | 
|
| 
694
by Martin Pool
 - weed out all remaining calls to bailout() and remove the function  | 
464  | 
raise BzrError('repeated option %r' % a)  | 
| 
17
by mbp at sourcefrog
 allow --option=ARG syntax  | 
465  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
466  | 
optargfn = OPTIONS[optname]  | 
467  | 
if optargfn:  | 
|
| 
17
by mbp at sourcefrog
 allow --option=ARG syntax  | 
468  | 
if optarg == None:  | 
| 
26
by mbp at sourcefrog
 fix StopIteration error on python2.3(?)  | 
469  | 
if not argv:  | 
| 
694
by Martin Pool
 - weed out all remaining calls to bailout() and remove the function  | 
470  | 
raise BzrError('option %r needs an argument' % a)  | 
| 
17
by mbp at sourcefrog
 allow --option=ARG syntax  | 
471  | 
else:  | 
| 
26
by mbp at sourcefrog
 fix StopIteration error on python2.3(?)  | 
472  | 
optarg = argv.pop(0)  | 
| 
17
by mbp at sourcefrog
 allow --option=ARG syntax  | 
473  | 
opts[optname] = optargfn(optarg)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
474  | 
else:  | 
| 
17
by mbp at sourcefrog
 allow --option=ARG syntax  | 
475  | 
if optarg != None:  | 
| 
694
by Martin Pool
 - weed out all remaining calls to bailout() and remove the function  | 
476  | 
raise BzrError('option %r takes no argument' % optname)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
477  | 
opts[optname] = True  | 
478  | 
else:  | 
|
479  | 
args.append(a)  | 
|
480  | 
||
481  | 
return args, opts  | 
|
482  | 
||
483  | 
||
484  | 
||
485  | 
||
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
486  | 
def _match_argform(cmd, takes_args, args):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
487  | 
argdict = {}  | 
| 
26
by mbp at sourcefrog
 fix StopIteration error on python2.3(?)  | 
488  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
489  | 
    # step through args and takes_args, allowing appropriate 0-many matches
 | 
490  | 
for ap in takes_args:  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
491  | 
argname = ap[:-1]  | 
492  | 
if ap[-1] == '?':  | 
|
| 
62
by mbp at sourcefrog
 - new find_branch_root function; based on suggestion from aaron  | 
493  | 
if args:  | 
494  | 
argdict[argname] = args.pop(0)  | 
|
| 
196
by mbp at sourcefrog
 selected-file diff  | 
495  | 
elif ap[-1] == '*': # all remaining arguments  | 
496  | 
if args:  | 
|
497  | 
argdict[argname + '_list'] = args[:]  | 
|
498  | 
args = []  | 
|
499  | 
else:  | 
|
500  | 
argdict[argname + '_list'] = None  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
501  | 
elif ap[-1] == '+':  | 
502  | 
if not args:  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
503  | 
raise BzrCommandError("command %r needs one or more %s"  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
504  | 
% (cmd, argname.upper()))  | 
505  | 
else:  | 
|
506  | 
argdict[argname + '_list'] = args[:]  | 
|
507  | 
args = []  | 
|
| 
160
by mbp at sourcefrog
 - basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think  | 
508  | 
elif ap[-1] == '$': # all but one  | 
509  | 
if len(args) < 2:  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
510  | 
raise BzrCommandError("command %r needs one or more %s"  | 
| 
160
by mbp at sourcefrog
 - basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think  | 
511  | 
% (cmd, argname.upper()))  | 
512  | 
argdict[argname + '_list'] = args[:-1]  | 
|
513  | 
args[:-1] = []  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
514  | 
else:  | 
515  | 
            # just a plain arg
 | 
|
516  | 
argname = ap  | 
|
517  | 
if not args:  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
518  | 
raise BzrCommandError("command %r requires argument %s"  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
519  | 
% (cmd, argname.upper()))  | 
520  | 
else:  | 
|
521  | 
argdict[argname] = args.pop(0)  | 
|
522  | 
||
523  | 
if args:  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
524  | 
raise BzrCommandError("extra argument to command %s: %s"  | 
525  | 
% (cmd, args[0]))  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
526  | 
|
527  | 
return argdict  | 
|
528  | 
||
529  | 
||
530  | 
||
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
531  | 
def apply_profiled(the_callable, *args, **kwargs):  | 
532  | 
import hotshot  | 
|
533  | 
import tempfile  | 
|
| 
1393.1.27
by Martin Pool
 - clean up profile code and change default sort order  | 
534  | 
import hotshot.stats  | 
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
535  | 
pffileno, pfname = tempfile.mkstemp()  | 
536  | 
try:  | 
|
537  | 
prof = hotshot.Profile(pfname)  | 
|
538  | 
try:  | 
|
539  | 
ret = prof.runcall(the_callable, *args, **kwargs) or 0  | 
|
540  | 
finally:  | 
|
541  | 
prof.close()  | 
|
542  | 
stats = hotshot.stats.load(pfname)  | 
|
| 
1393.1.27
by Martin Pool
 - clean up profile code and change default sort order  | 
543  | 
stats.strip_dirs()  | 
544  | 
stats.sort_stats('cum') # 'time'  | 
|
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
545  | 
        ## XXX: Might like to write to stderr or the trace file instead but
 | 
546  | 
        ## print_stats seems hardcoded to stdout
 | 
|
547  | 
stats.print_stats(20)  | 
|
548  | 
return ret  | 
|
549  | 
finally:  | 
|
550  | 
os.close(pffileno)  | 
|
551  | 
os.remove(pfname)  | 
|
552  | 
||
553  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
554  | 
def run_bzr(argv):  | 
555  | 
"""Execute a command.  | 
|
556  | 
||
557  | 
    This is similar to main(), but without all the trappings for
 | 
|
| 
245
by mbp at sourcefrog
 - control files always in utf-8-unix format  | 
558  | 
    logging and error handling.  
 | 
| 
973
by Martin Pool
 - various refactorings of command interpreter  | 
559  | 
    
 | 
560  | 
    argv
 | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
561  | 
       The command-line arguments, without the program name from argv[0]
 | 
| 
973
by Martin Pool
 - various refactorings of command interpreter  | 
562  | 
    
 | 
563  | 
    Returns a command status or raises an exception.
 | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
564  | 
|
565  | 
    Special master options: these must come before the command because
 | 
|
566  | 
    they control how the command is interpreted.
 | 
|
567  | 
||
568  | 
    --no-plugins
 | 
|
569  | 
        Do not load plugin modules at all
 | 
|
570  | 
||
571  | 
    --builtin
 | 
|
572  | 
        Only use builtin commands.  (Plugins are still allowed to change
 | 
|
573  | 
        other behaviour.)
 | 
|
574  | 
||
575  | 
    --profile
 | 
|
576  | 
        Run under the Python profiler.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
577  | 
    """
 | 
| 
1185.11.1
by John Arbash Meinel
 (broken) Transport work is merged in. Tests do not pass yet.  | 
578  | 
    # Load all of the transport methods
 | 
579  | 
import bzrlib.transport.local, bzrlib.transport.http  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
580  | 
|
| 
251
by mbp at sourcefrog
 - factor out locale.getpreferredencoding()  | 
581  | 
argv = [a.decode(bzrlib.user_encoding) for a in argv]  | 
| 
907.1.21
by John Arbash Meinel
 Adding http transport as a valid transport protocol.  | 
582  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
583  | 
opt_profile = opt_no_plugins = opt_builtin = False  | 
584  | 
||
585  | 
    # --no-plugins is handled specially at a very early stage. We need
 | 
|
586  | 
    # to load plugins before doing other command parsing so that they
 | 
|
587  | 
    # can override commands, but this needs to happen first.
 | 
|
588  | 
||
| 
1165
by Martin Pool
 - move parsing of argv into arguments and options into Command.run_argv  | 
589  | 
for a in argv:  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
590  | 
if a == '--profile':  | 
591  | 
opt_profile = True  | 
|
592  | 
elif a == '--no-plugins':  | 
|
593  | 
opt_no_plugins = True  | 
|
594  | 
elif a == '--builtin':  | 
|
595  | 
opt_builtin = True  | 
|
596  | 
else:  | 
|
597  | 
            break
 | 
|
598  | 
argv.remove(a)  | 
|
599  | 
||
| 
1165
by Martin Pool
 - move parsing of argv into arguments and options into Command.run_argv  | 
600  | 
if (not argv) or (argv[0] == '--help'):  | 
601  | 
from bzrlib.help import help  | 
|
602  | 
if len(argv) > 1:  | 
|
603  | 
help(argv[1])  | 
|
604  | 
else:  | 
|
605  | 
help()  | 
|
606  | 
return 0  | 
|
607  | 
||
608  | 
if argv[0] == '--version':  | 
|
609  | 
from bzrlib.builtins import show_version  | 
|
610  | 
show_version()  | 
|
611  | 
return 0  | 
|
612  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
613  | 
if not opt_no_plugins:  | 
| 
973
by Martin Pool
 - various refactorings of command interpreter  | 
614  | 
from bzrlib.plugin import load_plugins  | 
615  | 
load_plugins()  | 
|
616  | 
||
| 
1165
by Martin Pool
 - move parsing of argv into arguments and options into Command.run_argv  | 
617  | 
cmd = str(argv.pop(0))  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
618  | 
|
| 
1162
by Martin Pool
 - change Command infrastructure to use (mostly stateless) objects to  | 
619  | 
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
620  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
621  | 
if opt_profile:  | 
| 
1165
by Martin Pool
 - move parsing of argv into arguments and options into Command.run_argv  | 
622  | 
ret = apply_profiled(cmd_obj.run_argv, argv)  | 
| 
137
by mbp at sourcefrog
 new --profile option  | 
623  | 
else:  | 
| 
1165
by Martin Pool
 - move parsing of argv into arguments and options into Command.run_argv  | 
624  | 
ret = cmd_obj.run_argv(argv)  | 
625  | 
return ret or 0  | 
|
| 
267
by Martin Pool
 - better reporting of errors  | 
626  | 
|
627  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
628  | 
def main(argv):  | 
| 
1104
by Martin Pool
 - Add a simple UIFactory  | 
629  | 
import bzrlib.ui  | 
| 
1111
by Martin Pool
 - add functions to enable and disable default logging, so that we can  | 
630  | 
bzrlib.trace.log_startup(argv)  | 
| 
1104
by Martin Pool
 - Add a simple UIFactory  | 
631  | 
bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()  | 
632  | 
||
| 
1185.3.20
by Martin Pool
 - run_bzr_captured also includes logged errors in  | 
633  | 
return run_bzr_catch_errors(argv[1:])  | 
| 
1185.3.19
by Martin Pool
 - split out commandline error reporting for ease of testing  | 
634  | 
|
635  | 
||
636  | 
def run_bzr_catch_errors(argv):  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
637  | 
try:  | 
| 
260
by Martin Pool
 - remove atexit() dependency for writing out execution times  | 
638  | 
try:  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
639  | 
return run_bzr(argv)  | 
640  | 
finally:  | 
|
641  | 
            # do this here inside the exception wrappers to catch EPIPE
 | 
|
642  | 
sys.stdout.flush()  | 
|
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
643  | 
except BzrCommandError, e:  | 
644  | 
        # command line syntax error, etc
 | 
|
645  | 
log_error(str(e))  | 
|
646  | 
return 1  | 
|
647  | 
except BzrError, e:  | 
|
648  | 
bzrlib.trace.log_exception()  | 
|
649  | 
return 1  | 
|
650  | 
except AssertionError, e:  | 
|
651  | 
bzrlib.trace.log_exception('assertion failed: ' + str(e))  | 
|
652  | 
return 3  | 
|
653  | 
except KeyboardInterrupt, e:  | 
|
| 
1360
by Martin Pool
 - give possible traceback when interrupted  | 
654  | 
bzrlib.trace.log_exception('interrupted')  | 
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
655  | 
return 2  | 
656  | 
except Exception, e:  | 
|
657  | 
import errno  | 
|
658  | 
if (isinstance(e, IOError)  | 
|
659  | 
and hasattr(e, 'errno')  | 
|
660  | 
and e.errno == errno.EPIPE):  | 
|
661  | 
bzrlib.trace.note('broken pipe')  | 
|
662  | 
return 2  | 
|
663  | 
else:  | 
|
| 
1393.1.65
by Martin Pool
 - remove accidental pdb invocation  | 
664  | 
            ## import pdb
 | 
665  | 
            ## pdb.pm()
 | 
|
| 
1108
by Martin Pool
 - more cleanups of error reporting  | 
666  | 
bzrlib.trace.log_exception()  | 
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
667  | 
return 2  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
668  | 
|
669  | 
if __name__ == '__main__':  | 
|
670  | 
sys.exit(main(sys.argv))  |