bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 1610.1.4
by Martin Pool Doc | 1 | # Copyright (C) 2006 by Canonical Ltd
 | 
| 2 | #
 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 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.
 | |
| 1610.1.4
by Martin Pool Doc | 7 | #
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 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.
 | |
| 1610.1.4
by Martin Pool Doc | 12 | #
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 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: Define arguments by objects, rather than just using names.
 | 
| 22 | # Those objects can specify the expected type of the argument, which
 | |
| 1610.1.4
by Martin Pool Doc | 23 | # would help with validation and shell completion.  They could also provide
 | 
| 24 | # help/explanation for that argument in a structured way.
 | |
| 25 | ||
| 26 | # TODO: Specific "examples" property on commands for consistent formatting.
 | |
| 1095
by Martin Pool todo | 27 | |
| 1393.1.27
by Martin Pool - clean up profile code and change default sort order | 28 | # TODO: "--profile=cum", to change sort order.  Is there any value in leaving
 | 
| 29 | # the profile output behind so it can be interactively examined?
 | |
| 30 | ||
| 1857.1.1
by Aaron Bentley Use optparse for parsing options | 31 | import codecs | 
| 32 | import errno | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 33 | import os | 
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 34 | from warnings import warn | 
| 1857.1.1
by Aaron Bentley Use optparse for parsing options | 35 | import sys | 
| 1
by mbp at sourcefrog import from baz patch-364 | 36 | |
| 37 | import bzrlib | |
| 1740.5.6
by Martin Pool Clean up many exception classes. | 38 | import bzrlib.errors as errors | 
| 1616.1.15
by Martin Pool Handle 'bzr ?', etc. | 39 | from bzrlib.errors import (BzrError, | 
| 1857.1.20
by Aaron Bentley Strip out all the EnumOption stuff | 40 | BzrCommandError, | 
| 41 | BzrCheckError, | |
| 1534.7.154
by Aaron Bentley Removed changes from bzr.ab 1529..1536 | 42 | NotBranchError) | 
| 1857.1.3
by Aaron Bentley Make option adding depend on Option type | 43 | from bzrlib import option | 
| 1581.1.1
by Robert Collins Bugfix aliases to be backwards compatible with plugins providing command.run_argv. | 44 | from bzrlib.option import Option | 
| 1711.4.10
by John Arbash Meinel Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. | 45 | import bzrlib.osutils | 
| 1185.11.5
by John Arbash Meinel Merged up-to-date against mainline, still broken. | 46 | from bzrlib.revisionspec import RevisionSpec | 
| 1773.4.1
by Martin Pool Add pyflakes makefile target; fix many warnings | 47 | from bzrlib.symbol_versioning import (deprecated_method, zero_eight) | 
| 1852.2.1
by Robert Collins General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace. | 48 | import bzrlib.trace | 
| 1581.1.1
by Robert Collins Bugfix aliases to be backwards compatible with plugins providing command.run_argv. | 49 | from bzrlib.trace import mutter, note, log_error, warning, be_quiet | 
| 1
by mbp at sourcefrog import from baz patch-364 | 50 | |
| 731
by Martin Pool - merge plugin patch from john | 51 | plugin_cmds = {} | 
| 52 | ||
| 53 | ||
| 1492
by Robert Collins Support decoration of commands. | 54 | def register_command(cmd, decorate=False): | 
| 1616.1.6
by Martin Pool doc | 55 | """Utility function to help register a command | 
| 56 | ||
| 57 |     :param cmd: Command subclass to register
 | |
| 58 |     :param decorate: If true, allow overriding an existing command
 | |
| 59 |         of the same name; the old command is returned by this function.
 | |
| 60 |         Otherwise it is an error to try to override an existing command.
 | |
| 61 |     """
 | |
| 731
by Martin Pool - merge plugin patch from john | 62 | global plugin_cmds | 
| 63 | k = cmd.__name__ | |
| 64 | if k.startswith("cmd_"): | |
| 65 | k_unsquished = _unsquish_command_name(k) | |
| 66 | else: | |
| 67 | k_unsquished = k | |
| 68 | if not plugin_cmds.has_key(k_unsquished): | |
| 69 | plugin_cmds[k_unsquished] = cmd | |
| 1616.1.6
by Martin Pool doc | 70 | mutter('registered plugin command %s', k_unsquished) | 
| 1492
by Robert Collins Support decoration of commands. | 71 | if decorate and k_unsquished in builtin_command_names(): | 
| 72 | return _builtin_commands()[k_unsquished] | |
| 73 | elif decorate: | |
| 74 | result = plugin_cmds[k_unsquished] | |
| 75 | plugin_cmds[k_unsquished] = cmd | |
| 76 | return result | |
| 731
by Martin Pool - merge plugin patch from john | 77 | else: | 
| 78 | log_error('Two plugins defined the same command: %r' % k) | |
| 79 | log_error('Not loading the one in %r' % sys.modules[cmd.__module__]) | |
| 80 | ||
| 81 | ||
| 350
by Martin Pool - refactor command aliases into command classes | 82 | def _squish_command_name(cmd): | 
| 83 | return 'cmd_' + cmd.replace('-', '_') | |
| 84 | ||
| 85 | ||
| 86 | def _unsquish_command_name(cmd): | |
| 87 | assert cmd.startswith("cmd_") | |
| 88 | return cmd[4:].replace('_','-') | |
| 89 | ||
| 914
by Martin Pool - fix up breakage of 'bzr log -v' by root_id patch | 90 | |
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 91 | def _builtin_commands(): | 
| 1147
by Martin Pool - split builtin commands into separate module bzrlib.builtins; | 92 | import bzrlib.builtins | 
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 93 | r = {} | 
| 1147
by Martin Pool - split builtin commands into separate module bzrlib.builtins; | 94 | builtins = bzrlib.builtins.__dict__ | 
| 95 | for name in builtins: | |
| 96 | if name.startswith("cmd_"): | |
| 1616.1.6
by Martin Pool doc | 97 | real_name = _unsquish_command_name(name) | 
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 98 | r[real_name] = builtins[name] | 
| 99 | return r | |
| 100 | ||
| 101 | ||
| 102 | def builtin_command_names(): | |
| 103 | """Return list of builtin command names.""" | |
| 104 | return _builtin_commands().keys() | |
| 105 | ||
| 106 | ||
| 107 | def plugin_command_names(): | |
| 108 | return plugin_cmds.keys() | |
| 109 | ||
| 110 | ||
| 111 | def _get_cmd_dict(plugins_override=True): | |
| 112 | """Return name->class mapping for all commands.""" | |
| 113 | d = _builtin_commands() | |
| 731
by Martin Pool - merge plugin patch from john | 114 | if plugins_override: | 
| 115 | d.update(plugin_cmds) | |
| 641
by Martin Pool - improved external-command patch from john | 116 | return d | 
| 731
by Martin Pool - merge plugin patch from john | 117 | |
| 641
by Martin Pool - improved external-command patch from john | 118 | |
| 731
by Martin Pool - merge plugin patch from john | 119 | def get_all_cmds(plugins_override=True): | 
| 641
by Martin Pool - improved external-command patch from john | 120 | """Return canonical name and class for all registered commands.""" | 
| 731
by Martin Pool - merge plugin patch from john | 121 | for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems(): | 
| 641
by Martin Pool - improved external-command patch from john | 122 | yield k,v | 
| 123 | ||
| 124 | ||
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 125 | def get_cmd_object(cmd_name, plugins_override=True): | 
| 350
by Martin Pool - refactor command aliases into command classes | 126 | """Return the canonical name and command class for a command. | 
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 127 | |
| 128 |     plugins_override
 | |
| 129 |         If true, plugin commands can override builtins.
 | |
| 350
by Martin Pool - refactor command aliases into command classes | 130 |     """
 | 
| 1163
by Martin Pool - split ExternalCommand class into its own file | 131 | from bzrlib.externalcommand import ExternalCommand | 
| 132 | ||
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 133 | cmd_name = str(cmd_name) # not unicode | 
| 350
by Martin Pool - refactor command aliases into command classes | 134 | |
| 135 |     # first look up this command under the specified name
 | |
| 731
by Martin Pool - merge plugin patch from john | 136 | cmds = _get_cmd_dict(plugins_override=plugins_override) | 
| 272
by Martin Pool - Add command aliases | 137 | try: | 
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 138 | return cmds[cmd_name]() | 
| 272
by Martin Pool - Add command aliases | 139 | except KeyError: | 
| 350
by Martin Pool - refactor command aliases into command classes | 140 |         pass
 | 
| 141 | ||
| 142 |     # look for any command which claims this as an alias
 | |
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 143 | for real_cmd_name, cmd_class in cmds.iteritems(): | 
| 144 | if cmd_name in cmd_class.aliases: | |
| 145 | return cmd_class() | |
| 146 | ||
| 147 | cmd_obj = ExternalCommand.find_command(cmd_name) | |
| 148 | if cmd_obj: | |
| 149 | return cmd_obj | |
| 150 | ||
| 1740.5.6
by Martin Pool Clean up many exception classes. | 151 | raise BzrCommandError('unknown command "%s"' % cmd_name) | 
| 272
by Martin Pool - Add command aliases | 152 | |
| 329
by Martin Pool - refactor command functions into command classes | 153 | |
| 558
by Martin Pool - All top-level classes inherit from object | 154 | class Command(object): | 
| 329
by Martin Pool - refactor command functions into command classes | 155 | """Base class for commands. | 
| 156 | ||
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 157 |     Commands are the heart of the command-line bzr interface.
 | 
| 158 | ||
| 159 |     The command object mostly handles the mapping of command-line
 | |
| 160 |     parameters into one or more bzrlib operations, and of the results
 | |
| 161 |     into textual output.
 | |
| 162 | ||
| 163 |     Commands normally don't have any state.  All their arguments are
 | |
| 164 |     passed in to the run method.  (Subclasses may take a different
 | |
| 165 |     policy if the behaviour of the instance needs to depend on e.g. a
 | |
| 166 |     shell plugin and not just its Python class.)
 | |
| 167 | ||
| 329
by Martin Pool - refactor command functions into command classes | 168 |     The docstring for an actual command should give a single-line
 | 
| 169 |     summary, then a complete description of the command.  A grammar
 | |
| 170 |     description will be inserted.
 | |
| 171 | ||
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 172 |     aliases
 | 
| 173 |         Other accepted names for this command.
 | |
| 174 | ||
| 329
by Martin Pool - refactor command functions into command classes | 175 |     takes_args
 | 
| 176 |         List of argument forms, marked with whether they are optional,
 | |
| 177 |         repeated, etc.
 | |
| 178 | ||
| 1534.4.25
by Robert Collins Add a --transport parameter to the test suite to set the default transport to be used in the test suite. | 179 |                 Examples:
 | 
| 180 | ||
| 181 |                 ['to_location', 'from_branch?', 'file*']
 | |
| 182 | ||
| 183 |                 'to_location' is required
 | |
| 184 |                 'from_branch' is optional
 | |
| 185 |                 'file' can be specified 0 or more times
 | |
| 1185.37.4
by Jamie Wilkinson add some examples to the documentation for Command.takes_args | 186 | |
| 329
by Martin Pool - refactor command functions into command classes | 187 |     takes_options
 | 
| 1185.16.43
by Martin Pool - clean up handling of option objects | 188 |         List of options that may be given for this command.  These can
 | 
| 189 |         be either strings, referring to globally-defined options,
 | |
| 190 |         or option objects.  Retrieve through options().
 | |
| 329
by Martin Pool - refactor command functions into command classes | 191 | |
| 192 |     hidden
 | |
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 193 |         If true, this command isn't advertised.  This is typically
 | 
| 194 |         for commands intended for expert users.
 | |
| 1185.85.22
by John Arbash Meinel Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() | 195 | |
| 196 |     encoding_type
 | |
| 197 |         Command objects will get a 'outf' attribute, which has been
 | |
| 198 |         setup to properly handle encoding of unicode strings.
 | |
| 199 |         encoding_type determines what will happen when characters cannot
 | |
| 200 |         be encoded
 | |
| 201 |             strict - abort if we cannot decode
 | |
| 202 |             replace - put in a bogus character (typically '?')
 | |
| 203 |             exact - do not encode sys.stdout
 | |
| 204 | ||
| 329
by Martin Pool - refactor command functions into command classes | 205 |     """
 | 
| 206 | aliases = [] | |
| 207 | takes_args = [] | |
| 208 | takes_options = [] | |
| 1185.85.22
by John Arbash Meinel Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() | 209 | encoding_type = 'strict' | 
| 329
by Martin Pool - refactor command functions into command classes | 210 | |
| 211 | hidden = False | |
| 212 | ||
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 213 | def __init__(self): | 
| 214 | """Construct an instance of this command.""" | |
| 973
by Martin Pool - various refactorings of command interpreter | 215 | if self.__doc__ == Command.__doc__: | 
| 216 | warn("No help message set for %r" % self) | |
| 329
by Martin Pool - refactor command functions into command classes | 217 | |
| 1185.16.43
by Martin Pool - clean up handling of option objects | 218 | def options(self): | 
| 219 | """Return dict of valid options for this command. | |
| 220 | ||
| 221 |         Maps from long option name to option object."""
 | |
| 222 | r = dict() | |
| 1185.16.48
by mbp at sourcefrog - more refactoring of and tests for option parsing | 223 | r['help'] = Option.OPTIONS['help'] | 
| 1185.16.43
by Martin Pool - clean up handling of option objects | 224 | for o in self.takes_options: | 
| 1857.1.8
by Aaron Bentley Group enum options and add enum options to init and init-repo | 225 | if isinstance(o, basestring): | 
| 1185.16.43
by Martin Pool - clean up handling of option objects | 226 | o = Option.OPTIONS[o] | 
| 227 | r[o.name] = o | |
| 228 | return r | |
| 1165
by Martin Pool - move parsing of argv into arguments and options into Command.run_argv | 229 | |
| 1685.1.80
by Wouter van Heyst more code cleanup | 230 | def _setup_outf(self): | 
| 1185.85.22
by John Arbash Meinel Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() | 231 | """Return a file linked to stdout, which has proper encoding.""" | 
| 232 | assert self.encoding_type in ['strict', 'exact', 'replace'] | |
| 233 | ||
| 234 |         # Originally I was using self.stdout, but that looks
 | |
| 235 |         # *way* too much like sys.stdout
 | |
| 236 | if self.encoding_type == 'exact': | |
| 237 | self.outf = sys.stdout | |
| 238 |             return
 | |
| 239 | ||
| 1711.4.10
by John Arbash Meinel Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. | 240 | output_encoding = bzrlib.osutils.get_terminal_encoding() | 
| 1185.85.22
by John Arbash Meinel Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() | 241 | |
| 242 |         # use 'replace' so that we don't abort if trying to write out
 | |
| 243 |         # in e.g. the default C locale.
 | |
| 244 | self.outf = codecs.getwriter(output_encoding)(sys.stdout, errors=self.encoding_type) | |
| 1711.2.40
by John Arbash Meinel codecs.getwriter() doesn't set '.encoding' properly, so do the work for it. | 245 |         # For whatever reason codecs.getwriter() does not advertise its encoding
 | 
| 246 |         # it just returns the encoding of the wrapped file, which is completely
 | |
| 247 |         # bogus. So set the attribute, so we can find the correct encoding later.
 | |
| 248 | self.outf.encoding = output_encoding | |
| 1185.85.22
by John Arbash Meinel Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() | 249 | |
| 1581.1.1
by Robert Collins Bugfix aliases to be backwards compatible with plugins providing command.run_argv. | 250 | @deprecated_method(zero_eight) | 
| 251 | def run_argv(self, argv): | |
| 252 | """Parse command line and run. | |
| 253 |         
 | |
| 254 |         See run_argv_aliases for the 0.8 and beyond api.
 | |
| 255 |         """
 | |
| 256 | return self.run_argv_aliases(argv) | |
| 257 | ||
| 258 | def run_argv_aliases(self, argv, alias_argv=None): | |
| 259 | """Parse the command line and run with extra aliases in alias_argv.""" | |
| 1857.1.21
by Aaron Bentley Fix bug from cmd_shelf passing Non to run_argv_aliases | 260 | if argv is None: | 
| 261 | warn("Passing None for [] is deprecated from bzrlib 0.10", | |
| 262 | DeprecationWarning, stacklevel=2) | |
| 263 | argv = [] | |
| 1553.6.8
by Erik Bågfors support for overrides | 264 | args, opts = parse_args(self, argv, alias_argv) | 
| 1165
by Martin Pool - move parsing of argv into arguments and options into Command.run_argv | 265 | if 'help' in opts: # e.g. bzr add --help | 
| 266 | from bzrlib.help import help_on_command | |
| 267 | help_on_command(self.name()) | |
| 268 | return 0 | |
| 269 |         # mix arguments and options into one dictionary
 | |
| 270 | cmdargs = _match_argform(self.name(), self.takes_args, args) | |
| 271 | cmdopts = {} | |
| 272 | for k, v in opts.items(): | |
| 273 | cmdopts[k.replace('-', '_')] = v | |
| 274 | ||
| 275 | all_cmd_args = cmdargs.copy() | |
| 276 | all_cmd_args.update(cmdopts) | |
| 277 | ||
| 1685.1.80
by Wouter van Heyst more code cleanup | 278 | self._setup_outf() | 
| 1185.85.22
by John Arbash Meinel Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() | 279 | |
| 1165
by Martin Pool - move parsing of argv into arguments and options into Command.run_argv | 280 | return self.run(**all_cmd_args) | 
| 329
by Martin Pool - refactor command functions into command classes | 281 | |
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 282 | def run(self): | 
| 283 | """Actually run the command. | |
| 329
by Martin Pool - refactor command functions into command classes | 284 | |
| 285 |         This is invoked with the options and arguments bound to
 | |
| 286 |         keyword parameters.
 | |
| 287 | ||
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 288 |         Return 0 or None if the command was successful, or a non-zero
 | 
| 289 |         shell error code if not.  It's OK for this method to allow
 | |
| 290 |         an exception to raise up.
 | |
| 329
by Martin Pool - refactor command functions into command classes | 291 |         """
 | 
| 1610.1.3
by Martin Pool Better error message for Command.run() not implemented | 292 | raise NotImplementedError('no implementation of command %r' | 
| 293 | % self.name()) | |
| 329
by Martin Pool - refactor command functions into command classes | 294 | |
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 295 | def help(self): | 
| 296 | """Return help message for this class.""" | |
| 1610.1.2
by Martin Pool Move rarely-used import into Command.help() | 297 | from inspect import getdoc | 
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 298 | if self.__doc__ is Command.__doc__: | 
| 299 | return None | |
| 300 | return getdoc(self) | |
| 301 | ||
| 302 | def name(self): | |
| 303 | return _unsquish_command_name(self.__class__.__name__) | |
| 304 | ||
| 1733.2.5
by Michael Ellerman Show which plugin (if any) provides a command. | 305 | def plugin_name(self): | 
| 306 | """Get the name of the plugin that provides this command. | |
| 307 | ||
| 308 |         :return: The name of the plugin or None if the command is builtin.
 | |
| 309 |         """
 | |
| 310 | mod_parts = self.__module__.split('.') | |
| 311 | if len(mod_parts) >= 3 and mod_parts[1] == 'plugins': | |
| 312 | return mod_parts[2] | |
| 313 | else: | |
| 314 | return None | |
| 315 | ||
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 316 | |
| 493
by Martin Pool - Merge aaron's merge command | 317 | def parse_spec(spec): | 
| 622
by Martin Pool Updated merge patch from Aaron | 318 | """ | 
| 319 |     >>> parse_spec(None)
 | |
| 320 |     [None, None]
 | |
| 321 |     >>> parse_spec("./")
 | |
| 322 |     ['./', None]
 | |
| 323 |     >>> parse_spec("../@")
 | |
| 324 |     ['..', -1]
 | |
| 325 |     >>> parse_spec("../f/@35")
 | |
| 326 |     ['../f', 35]
 | |
| 897
by Martin Pool - merge john's revision-naming code | 327 |     >>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
 | 
| 328 |     ['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
 | |
| 622
by Martin Pool Updated merge patch from Aaron | 329 |     """
 | 
| 330 | if spec is None: | |
| 331 | return [None, None] | |
| 493
by Martin Pool - Merge aaron's merge command | 332 | if '/@' in spec: | 
| 333 | parsed = spec.split('/@') | |
| 334 | assert len(parsed) == 2 | |
| 335 | if parsed[1] == "": | |
| 336 | parsed[1] = -1 | |
| 337 | else: | |
| 897
by Martin Pool - merge john's revision-naming code | 338 | try: | 
| 339 | parsed[1] = int(parsed[1]) | |
| 340 | except ValueError: | |
| 341 | pass # We can allow stuff like ./@revid:blahblahblah | |
| 342 | else: | |
| 343 | assert parsed[1] >=0 | |
| 493
by Martin Pool - Merge aaron's merge command | 344 | else: | 
| 345 | parsed = [spec, None] | |
| 346 | return parsed | |
| 347 | ||
| 1553.6.11
by Erik Bågfors small bugfixes, all tests pass now | 348 | def parse_args(command, argv, alias_argv=None): | 
| 1
by mbp at sourcefrog import from baz patch-364 | 349 | """Parse command line. | 
| 350 |     
 | |
| 351 |     Arguments and options are parsed at this level before being passed
 | |
| 352 |     down to specific command handlers.  This routine knows, from a
 | |
| 353 |     lookup table, something about the available options, what optargs
 | |
| 354 |     they take, and which commands will accept them.
 | |
| 355 |     """
 | |
| 1857.1.1
by Aaron Bentley Use optparse for parsing options | 356 |     # TODO: make it a method of the Command?
 | 
| 1857.1.3
by Aaron Bentley Make option adding depend on Option type | 357 | parser = option.get_optparser(command.options()) | 
| 1857.1.1
by Aaron Bentley Use optparse for parsing options | 358 | if alias_argv is not None: | 
| 359 | args = alias_argv + argv | |
| 360 | else: | |
| 361 | args = argv | |
| 683
by Martin Pool - short option stacking patch from John A Meinel | 362 | |
| 1857.1.1
by Aaron Bentley Use optparse for parsing options | 363 | options, args = parser.parse_args(args) | 
| 364 | opts = dict([(k, v) for k, v in options.__dict__.iteritems() if | |
| 1857.1.3
by Aaron Bentley Make option adding depend on Option type | 365 | v is not option.OptionParser.DEFAULT_VALUE]) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 366 | return args, opts | 
| 367 | ||
| 368 | ||
| 329
by Martin Pool - refactor command functions into command classes | 369 | def _match_argform(cmd, takes_args, args): | 
| 1
by mbp at sourcefrog import from baz patch-364 | 370 | argdict = {} | 
| 26
by mbp at sourcefrog fix StopIteration error on python2.3(?) | 371 | |
| 329
by Martin Pool - refactor command functions into command classes | 372 |     # step through args and takes_args, allowing appropriate 0-many matches
 | 
| 373 | for ap in takes_args: | |
| 1
by mbp at sourcefrog import from baz patch-364 | 374 | argname = ap[:-1] | 
| 375 | if ap[-1] == '?': | |
| 62
by mbp at sourcefrog - new find_branch_root function; based on suggestion from aaron | 376 | if args: | 
| 377 | argdict[argname] = args.pop(0) | |
| 196
by mbp at sourcefrog selected-file diff | 378 | elif ap[-1] == '*': # all remaining arguments | 
| 379 | if args: | |
| 380 | argdict[argname + '_list'] = args[:] | |
| 381 | args = [] | |
| 382 | else: | |
| 383 | argdict[argname + '_list'] = None | |
| 1
by mbp at sourcefrog import from baz patch-364 | 384 | elif ap[-1] == '+': | 
| 385 | if not args: | |
| 329
by Martin Pool - refactor command functions into command classes | 386 | raise BzrCommandError("command %r needs one or more %s" | 
| 1
by mbp at sourcefrog import from baz patch-364 | 387 | % (cmd, argname.upper())) | 
| 388 | else: | |
| 389 | argdict[argname + '_list'] = args[:] | |
| 390 | 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 | 391 | elif ap[-1] == '$': # all but one | 
| 392 | if len(args) < 2: | |
| 329
by Martin Pool - refactor command functions into command classes | 393 | 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 | 394 | % (cmd, argname.upper())) | 
| 395 | argdict[argname + '_list'] = args[:-1] | |
| 1740.5.6
by Martin Pool Clean up many exception classes. | 396 | args[:-1] = [] | 
| 1
by mbp at sourcefrog import from baz patch-364 | 397 | else: | 
| 398 |             # just a plain arg
 | |
| 399 | argname = ap | |
| 400 | if not args: | |
| 329
by Martin Pool - refactor command functions into command classes | 401 | raise BzrCommandError("command %r requires argument %s" | 
| 1
by mbp at sourcefrog import from baz patch-364 | 402 | % (cmd, argname.upper())) | 
| 403 | else: | |
| 404 | argdict[argname] = args.pop(0) | |
| 405 | ||
| 406 | if args: | |
| 329
by Martin Pool - refactor command functions into command classes | 407 | raise BzrCommandError("extra argument to command %s: %s" | 
| 408 | % (cmd, args[0])) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 409 | |
| 410 | return argdict | |
| 411 | ||
| 412 | ||
| 413 | ||
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 414 | def apply_profiled(the_callable, *args, **kwargs): | 
| 415 | import hotshot | |
| 416 | import tempfile | |
| 1393.1.27
by Martin Pool - clean up profile code and change default sort order | 417 | import hotshot.stats | 
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 418 | pffileno, pfname = tempfile.mkstemp() | 
| 419 | try: | |
| 420 | prof = hotshot.Profile(pfname) | |
| 421 | try: | |
| 422 | ret = prof.runcall(the_callable, *args, **kwargs) or 0 | |
| 423 | finally: | |
| 424 | prof.close() | |
| 425 | stats = hotshot.stats.load(pfname) | |
| 1393.1.27
by Martin Pool - clean up profile code and change default sort order | 426 | stats.strip_dirs() | 
| 427 | stats.sort_stats('cum') # 'time' | |
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 428 |         ## XXX: Might like to write to stderr or the trace file instead but
 | 
| 429 |         ## print_stats seems hardcoded to stdout
 | |
| 430 | stats.print_stats(20) | |
| 431 | return ret | |
| 432 | finally: | |
| 433 | os.close(pffileno) | |
| 434 | os.remove(pfname) | |
| 435 | ||
| 436 | ||
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 437 | def apply_lsprofiled(filename, the_callable, *args, **kwargs): | 
| 1185.33.85
by Martin Pool New --lsprof option from Denys Duchier | 438 | from bzrlib.lsprof import profile | 
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 439 | import cPickle | 
| 440 | ret, stats = profile(the_callable, *args, **kwargs) | |
| 1185.33.85
by Martin Pool New --lsprof option from Denys Duchier | 441 | stats.sort() | 
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 442 | if filename is None: | 
| 443 | stats.pprint() | |
| 444 | else: | |
| 445 | stats.freeze() | |
| 446 | cPickle.dump(stats, open(filename, 'w'), 2) | |
| 447 | print 'Profile data written to %r.' % filename | |
| 1185.33.85
by Martin Pool New --lsprof option from Denys Duchier | 448 | return ret | 
| 449 | ||
| 1553.6.9
by Erik Bågfors PEP8-ify | 450 | |
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 451 | def get_alias(cmd): | 
| 1553.6.14
by Erik Bågfors change get_alias summary to be shorter | 452 | """Return an expanded alias, or None if no alias exists""" | 
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 453 | import bzrlib.config | 
| 1553.6.12
by Erik Bågfors remove AliasConfig, based on input from abentley | 454 | alias = bzrlib.config.GlobalConfig().get_alias(cmd) | 
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 455 | if (alias): | 
| 456 | return alias.split(' ') | |
| 1553.6.8
by Erik Bågfors support for overrides | 457 | return None | 
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 458 | |
| 1553.6.9
by Erik Bågfors PEP8-ify | 459 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 460 | def run_bzr(argv): | 
| 461 | """Execute a command. | |
| 462 | ||
| 463 |     This is similar to main(), but without all the trappings for
 | |
| 245
by mbp at sourcefrog - control files always in utf-8-unix format | 464 |     logging and error handling.  
 | 
| 973
by Martin Pool - various refactorings of command interpreter | 465 |     
 | 
| 466 |     argv
 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 467 |        The command-line arguments, without the program name from argv[0]
 | 
| 1185.85.4
by John Arbash Meinel currently broken, trying to fix things up. | 468 |        These should already be decoded. All library/test code calling
 | 
| 469 |        run_bzr should be passing valid strings (don't need decoding).
 | |
| 973
by Martin Pool - various refactorings of command interpreter | 470 |     
 | 
| 471 |     Returns a command status or raises an exception.
 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 472 | |
| 473 |     Special master options: these must come before the command because
 | |
| 474 |     they control how the command is interpreted.
 | |
| 475 | ||
| 476 |     --no-plugins
 | |
| 477 |         Do not load plugin modules at all
 | |
| 478 | ||
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 479 |     --no-aliases
 | 
| 480 |         Do not allow aliases
 | |
| 481 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 482 |     --builtin
 | 
| 483 |         Only use builtin commands.  (Plugins are still allowed to change
 | |
| 484 |         other behaviour.)
 | |
| 485 | ||
| 486 |     --profile
 | |
| 1185.33.85
by Martin Pool New --lsprof option from Denys Duchier | 487 |         Run under the Python hotshot profiler.
 | 
| 488 | ||
| 489 |     --lsprof
 | |
| 490 |         Run under the Python lsprof profiler.
 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 491 |     """
 | 
| 1185.85.4
by John Arbash Meinel currently broken, trying to fix things up. | 492 | argv = list(argv) | 
| 907.1.21
by John Arbash Meinel Adding http transport as a valid transport protocol. | 493 | |
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 494 | opt_lsprof = opt_profile = opt_no_plugins = opt_builtin = \ | 
| 495 | opt_no_aliases = False | |
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 496 | opt_lsprof_file = None | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 497 | |
| 498 |     # --no-plugins is handled specially at a very early stage. We need
 | |
| 499 |     # to load plugins before doing other command parsing so that they
 | |
| 500 |     # can override commands, but this needs to happen first.
 | |
| 501 | ||
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 502 | argv_copy = [] | 
| 503 | i = 0 | |
| 504 | while i < len(argv): | |
| 505 | a = argv[i] | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 506 | if a == '--profile': | 
| 507 | opt_profile = True | |
| 1185.33.85
by Martin Pool New --lsprof option from Denys Duchier | 508 | elif a == '--lsprof': | 
| 509 | opt_lsprof = True | |
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 510 | elif a == '--lsprof-file': | 
| 1706.2.6
by Robey Pointer when giving --lsprof-file, assume --lsprof | 511 | opt_lsprof = True | 
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 512 | opt_lsprof_file = argv[i + 1] | 
| 513 | i += 1 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 514 | elif a == '--no-plugins': | 
| 515 | opt_no_plugins = True | |
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 516 | elif a == '--no-aliases': | 
| 517 | opt_no_aliases = True | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 518 | elif a == '--builtin': | 
| 519 | opt_builtin = True | |
| 1185.33.42
by Martin Pool [patch] make --quiet a global option (robey) | 520 | elif a in ('--quiet', '-q'): | 
| 521 | be_quiet() | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 522 | else: | 
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 523 | argv_copy.append(a) | 
| 524 | i += 1 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 525 | |
| 1553.7.1
by Robey Pointer add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) | 526 | argv = argv_copy | 
| 1616.1.15
by Martin Pool Handle 'bzr ?', etc. | 527 | if (not argv): | 
| 528 | from bzrlib.builtins import cmd_help | |
| 1558.14.2
by Aaron Bentley Removed deprecation warning when bzr invoked with no arguments | 529 | cmd_help().run_argv_aliases([]) | 
| 1165
by Martin Pool - move parsing of argv into arguments and options into Command.run_argv | 530 | return 0 | 
| 531 | ||
| 532 | if argv[0] == '--version': | |
| 1819.1.8
by Martin Pool Improved reporting of bzrlib revision_id | 533 | from bzrlib.version import show_version | 
| 1165
by Martin Pool - move parsing of argv into arguments and options into Command.run_argv | 534 | show_version() | 
| 535 | return 0 | |
| 536 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 537 | if not opt_no_plugins: | 
| 973
by Martin Pool - various refactorings of command interpreter | 538 | from bzrlib.plugin import load_plugins | 
| 539 | load_plugins() | |
| 1551.3.11
by Aaron Bentley Merge from Robert | 540 | else: | 
| 541 | from bzrlib.plugin import disable_plugins | |
| 542 | disable_plugins() | |
| 973
by Martin Pool - various refactorings of command interpreter | 543 | |
| 1553.6.17
by Erik Bågfors fix for broken --no-aliases | 544 | alias_argv = None | 
| 545 | ||
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 546 | if not opt_no_aliases: | 
| 1553.6.8
by Erik Bågfors support for overrides | 547 | alias_argv = get_alias(argv[0]) | 
| 548 | if alias_argv: | |
| 549 | alias_argv = [a.decode(bzrlib.user_encoding) for a in alias_argv] | |
| 550 | argv[0] = alias_argv.pop(0) | |
| 1553.6.1
by Erik Bågfors support for aliases in bazaar.conf | 551 | |
| 1165
by Martin Pool - move parsing of argv into arguments and options into Command.run_argv | 552 | cmd = str(argv.pop(0)) | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 553 | |
| 1162
by Martin Pool - change Command infrastructure to use (mostly stateless) objects to | 554 | cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin) | 
| 1581.1.1
by Robert Collins Bugfix aliases to be backwards compatible with plugins providing command.run_argv. | 555 | if not getattr(cmd_obj.run_argv, 'is_deprecated', False): | 
| 556 | run = cmd_obj.run_argv | |
| 557 | run_argv = [argv] | |
| 558 | else: | |
| 559 | run = cmd_obj.run_argv_aliases | |
| 560 | run_argv = [argv, alias_argv] | |
| 1534.7.154
by Aaron Bentley Removed changes from bzr.ab 1529..1536 | 561 | |
| 1185.33.42
by Martin Pool [patch] make --quiet a global option (robey) | 562 | try: | 
| 1185.33.85
by Martin Pool New --lsprof option from Denys Duchier | 563 | if opt_lsprof: | 
| 1581.1.1
by Robert Collins Bugfix aliases to be backwards compatible with plugins providing command.run_argv. | 564 | ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv) | 
| 1185.33.85
by Martin Pool New --lsprof option from Denys Duchier | 565 | elif opt_profile: | 
| 1581.1.1
by Robert Collins Bugfix aliases to be backwards compatible with plugins providing command.run_argv. | 566 | ret = apply_profiled(run, *run_argv) | 
| 1185.33.42
by Martin Pool [patch] make --quiet a global option (robey) | 567 | else: | 
| 1581.1.1
by Robert Collins Bugfix aliases to be backwards compatible with plugins providing command.run_argv. | 568 | ret = run(*run_argv) | 
| 1185.33.42
by Martin Pool [patch] make --quiet a global option (robey) | 569 | return ret or 0 | 
| 570 | finally: | |
| 571 |         # reset, in case we may do other commands later within the same process
 | |
| 572 | be_quiet(False) | |
| 267
by Martin Pool - better reporting of errors | 573 | |
| 1185.12.56
by Aaron Bentley Prevented display commands from printing broken pipe errors | 574 | def display_command(func): | 
| 1185.33.18
by Martin Pool [patch] handle bad IOError subclass raised by urlopen | 575 | """Decorator that suppresses pipe/interrupt errors.""" | 
| 1185.12.56
by Aaron Bentley Prevented display commands from printing broken pipe errors | 576 | def ignore_pipe(*args, **kwargs): | 
| 577 | try: | |
| 1185.35.22
by Aaron Bentley Handled more pipe errors for display commands. | 578 | result = func(*args, **kwargs) | 
| 579 | sys.stdout.flush() | |
| 580 | return result | |
| 1185.12.56
by Aaron Bentley Prevented display commands from printing broken pipe errors | 581 | except IOError, e: | 
| 1185.33.18
by Martin Pool [patch] handle bad IOError subclass raised by urlopen | 582 | if not hasattr(e, 'errno'): | 
| 583 |                 raise
 | |
| 1185.12.56
by Aaron Bentley Prevented display commands from printing broken pipe errors | 584 | if e.errno != errno.EPIPE: | 
| 1711.4.31
by John Arbash Meinel Catch proper error instead of EPIPE on win32, also don't double flush | 585 |                 # Win32 raises IOError with errno=0 on a broken pipe
 | 
| 586 | if sys.platform != 'win32' or e.errno != 0: | |
| 587 |                     raise
 | |
| 1185.33.18
by Martin Pool [patch] handle bad IOError subclass raised by urlopen | 588 |             pass
 | 
| 1185.12.69
by Aaron Bentley Ignored ^C in display commands | 589 | except KeyboardInterrupt: | 
| 1490
by Robert Collins Implement a 'bzr push' command, with saved locations; update diff to return 1. | 590 |             pass
 | 
| 1185.12.56
by Aaron Bentley Prevented display commands from printing broken pipe errors | 591 | return ignore_pipe | 
| 267
by Martin Pool - better reporting of errors | 592 | |
| 1185.43.6
by Martin Pool Enable logging early enough to save argv | 593 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 594 | def main(argv): | 
| 1104
by Martin Pool - Add a simple UIFactory | 595 | import bzrlib.ui | 
| 1185.49.21
by John Arbash Meinel Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms. | 596 | from bzrlib.ui.text import TextUIFactory | 
| 597 | bzrlib.ui.ui_factory = TextUIFactory() | |
| 1185.85.4
by John Arbash Meinel currently broken, trying to fix things up. | 598 | argv = [a.decode(bzrlib.user_encoding) for a in argv[1:]] | 
| 599 | ret = run_bzr_catch_errors(argv) | |
| 1185.43.6
by Martin Pool Enable logging early enough to save argv | 600 | mutter("return code %d", ret) | 
| 601 | return ret | |
| 1185.3.19
by Martin Pool - split out commandline error reporting for ease of testing | 602 | |
| 603 | ||
| 604 | def run_bzr_catch_errors(argv): | |
| 1
by mbp at sourcefrog import from baz patch-364 | 605 | try: | 
| 1711.4.31
by John Arbash Meinel Catch proper error instead of EPIPE on win32, also don't double flush | 606 | return run_bzr(argv) | 
| 607 |         # do this here inside the exception wrappers to catch EPIPE
 | |
| 608 | sys.stdout.flush() | |
| 1097
by Martin Pool - send trace messages out through python logging module | 609 | except Exception, e: | 
| 1185.33.19
by Martin Pool Run postmortem debugger if BZR_PDB is set | 610 |         # used to handle AssertionError and KeyboardInterrupt
 | 
| 611 |         # specially here, but hopefully they're handled ok by the logger now
 | |
| 1740.5.3
by Martin Pool Cleanup more exception-formatting code | 612 | bzrlib.trace.report_exception(sys.exc_info(), sys.stderr) | 
| 613 | if os.environ.get('BZR_PDB'): | |
| 614 | print '**** entering debugger' | |
| 615 | import pdb | |
| 616 | pdb.post_mortem(sys.exc_traceback) | |
| 617 | return 3 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 618 | |
| 619 | if __name__ == '__main__': | |
| 620 | sys.exit(main(sys.argv)) |