50
135
def _unsquish_command_name(cmd):
51
assert cmd.startswith("cmd_")
52
136
return cmd[4:].replace('_','-')
54
def _parse_revision_str(revstr):
55
"""This handles a revision string -> revno.
57
There are several possibilities:
60
'234:345' -> [234, 345]
64
In the future we will also support:
65
'uuid:blah-blah-blah' -> ?
66
'hash:blahblahblah' -> ?
70
if revstr.find(':') != -1:
71
revs = revstr.split(':')
73
raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
78
revs[0] = int(revs[0])
83
revs[1] = int(revs[1])
90
def _get_cmd_dict(plugins_override=True):
92
for k, v in globals().iteritems():
93
if k.startswith("cmd_"):
94
d[_unsquish_command_name(k)] = v
95
# If we didn't load plugins, the plugin_cmds dict will be empty
139
def _builtin_commands():
140
import bzrlib.builtins
141
return _scan_module_for_commands(bzrlib.builtins)
144
def _scan_module_for_commands(module):
146
for name, obj in module.__dict__.iteritems():
147
if name.startswith("cmd_"):
148
real_name = _unsquish_command_name(name)
153
def _list_bzr_commands(names):
154
"""Find commands from bzr's core and plugins."""
155
# to eliminate duplicates
156
names.update(builtin_command_names())
157
names.update(plugin_command_names())
161
def all_command_names():
162
"""Return a set of all command names."""
164
for hook in Command.hooks['list_commands']:
167
raise AssertionError(
168
'hook %s returned None' % Command.hooks.get_hook_name(hook))
172
def builtin_command_names():
173
"""Return list of builtin command names.
175
Use of all_command_names() is encouraged rather than builtin_command_names
176
and/or plugin_command_names.
178
return _builtin_commands().keys()
181
def plugin_command_names():
182
"""Returns command names from commands registered by plugins."""
183
return plugin_cmds.keys()
186
@deprecated_function(deprecated_in((1, 17, 0)))
187
def get_all_cmds(plugins_override=False):
188
"""Return canonical name and class for most commands.
190
NB: This does not return all commands since the introduction of
191
command hooks, and returning the class is not sufficient to
192
get correctly setup commands, which is why it is deprecated.
194
Use 'all_command_names' + 'get_cmd_object' instead.
196
d = _builtin_commands()
96
197
if plugins_override:
99
d2 = plugin_cmds.copy()
105
def get_all_cmds(plugins_override=True):
106
"""Return canonical name and class for all registered commands."""
107
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
198
d.update(plugin_cmds.iteritems())
199
for k, v in d.iteritems():
111
def get_cmd_class(cmd, plugins_override=True):
112
"""Return the canonical name and command class for a command.
114
cmd = str(cmd) # not unicode
116
# first look up this command under the specified name
117
cmds = _get_cmd_dict(plugins_override=plugins_override)
119
return cmd, cmds[cmd]
203
def get_cmd_object(cmd_name, plugins_override=True):
204
"""Return the command object for a command.
207
If true, plugin commands can override builtins.
210
return _get_cmd_object(cmd_name, plugins_override)
212
raise errors.BzrCommandError('unknown command "%s"' % cmd_name)
215
def _get_cmd_object(cmd_name, plugins_override=True):
216
"""Get a command object.
218
:param cmd_name: The name of the command.
219
:param plugins_override: Allow plugins to override builtins.
220
:return: A Command object instance
221
:raises KeyError: If no command is found.
223
# We want only 'ascii' command names, but the user may have typed
224
# in a Unicode name. In that case, they should just get a
225
# 'command not found' error later.
226
# In the future, we may actually support Unicode command names.
229
for hook in Command.hooks['get_command']:
230
cmd = hook(cmd, cmd_name)
231
if cmd is not None and not plugins_override and not cmd.plugin_name():
232
# We've found a non-plugin command, don't permit it to be
236
for hook in Command.hooks['get_missing_command']:
243
# Allow plugins to extend commands
244
for hook in Command.hooks['extend_command']:
249
def _try_plugin_provider(cmd_name):
250
"""Probe for a plugin provider having cmd_name."""
252
plugin_metadata, provider = probe_for_provider(cmd_name)
253
raise errors.CommandAvailableInPlugin(cmd_name,
254
plugin_metadata, provider)
255
except errors.NoPluginAvailable:
259
def probe_for_provider(cmd_name):
260
"""Look for a provider for cmd_name.
262
:param cmd_name: The command name.
263
:return: plugin_metadata, provider for getting cmd_name.
264
:raises NoPluginAvailable: When no provider can supply the plugin.
266
# look for providers that provide this command but aren't installed
267
for provider in command_providers_registry:
269
return provider.plugin_for_command(cmd_name), provider
270
except errors.NoPluginAvailable:
272
raise errors.NoPluginAvailable(cmd_name)
275
def _get_bzr_command(cmd_or_None, cmd_name):
276
"""Get a command from bzr's core."""
277
cmds = _builtin_commands()
279
return cmds[cmd_name]()
123
282
# look for any command which claims this as an alias
124
for cmdname, cmdclass in cmds.iteritems():
125
if cmd in cmdclass.aliases:
126
return cmdname, cmdclass
128
cmdclass = ExternalCommand.find_command(cmd)
132
raise BzrCommandError("unknown command %r" % cmd)
283
for real_cmd_name, cmd_class in cmds.iteritems():
284
if cmd_name in cmd_class.aliases:
289
def _get_external_command(cmd_or_None, cmd_name):
290
"""Lookup a command that is a shell script."""
291
# Only do external command lookups when no command is found so far.
292
if cmd_or_None is not None:
294
from bzrlib.externalcommand import ExternalCommand
295
cmd_obj = ExternalCommand.find_command(cmd_name)
300
def _get_plugin_command(cmd_or_None, cmd_name):
301
"""Get a command from bzr's plugins."""
303
return plugin_cmds.get(cmd_name)()
306
for key in plugin_cmds.keys():
307
info = plugin_cmds.get_info(key)
308
if cmd_name in info.aliases:
309
return plugin_cmds.get(key)()
135
313
class Command(object):
136
314
"""Base class for commands.
316
Commands are the heart of the command-line bzr interface.
318
The command object mostly handles the mapping of command-line
319
parameters into one or more bzrlib operations, and of the results
322
Commands normally don't have any state. All their arguments are
323
passed in to the run method. (Subclasses may take a different
324
policy if the behaviour of the instance needs to depend on e.g. a
325
shell plugin and not just its Python class.)
138
327
The docstring for an actual command should give a single-line
139
328
summary, then a complete description of the command. A grammar
140
329
description will be inserted.
332
Other accepted names for this command.
143
335
List of argument forms, marked with whether they are optional,
340
['to_location', 'from_branch?', 'file*']
342
'to_location' is required
343
'from_branch' is optional
344
'file' can be specified 0 or more times
147
List of options that may be given for this command.
347
List of options that may be given for this command. These can
348
be either strings, referring to globally-defined options,
349
or option objects. Retrieve through options().
150
If true, this command isn't advertised.
352
If true, this command isn't advertised. This is typically
353
for commands intended for expert users.
356
Command objects will get a 'outf' attribute, which has been
357
setup to properly handle encoding of unicode strings.
358
encoding_type determines what will happen when characters cannot
360
strict - abort if we cannot decode
361
replace - put in a bogus character (typically '?')
362
exact - do not encode sys.stdout
364
NOTE: by default on Windows, sys.stdout is opened as a text
365
stream, therefore LF line-endings are converted to CRLF.
366
When a command uses encoding_type = 'exact', then
367
sys.stdout is forced to be a binary stream, and line-endings
370
:cvar hooks: An instance of CommandHooks.
155
374
takes_options = []
375
encoding_type = 'strict'
159
def __init__(self, options, arguments):
160
"""Construct and run the command.
162
Sets self.status to the return value of run()."""
163
assert isinstance(options, dict)
164
assert isinstance(arguments, dict)
165
cmdargs = options.copy()
166
cmdargs.update(arguments)
167
assert self.__doc__ != Command.__doc__, \
168
("No help message set for %r" % self)
169
self.status = self.run(**cmdargs)
380
"""Construct an instance of this command."""
381
if self.__doc__ == Command.__doc__:
382
warn("No help message set for %r" % self)
383
# List of standard options directly supported
384
self.supported_std_options = []
386
def _maybe_expand_globs(self, file_list):
387
"""Glob expand file_list if the platform does not do that itself.
389
:return: A possibly empty list of unicode paths.
391
Introduced in bzrlib 0.18.
395
if sys.platform == 'win32':
396
file_list = win32utils.glob_expand(file_list)
397
return list(file_list)
400
"""Return single-line grammar for this command.
402
Only describes arguments, not options.
404
s = 'bzr ' + self.name() + ' '
405
for aname in self.takes_args:
406
aname = aname.upper()
407
if aname[-1] in ['$', '+']:
408
aname = aname[:-1] + '...'
409
elif aname[-1] == '?':
410
aname = '[' + aname[:-1] + ']'
411
elif aname[-1] == '*':
412
aname = '[' + aname[:-1] + '...]'
414
s = s[:-1] # remove last space
417
def get_help_text(self, additional_see_also=None, plain=True,
418
see_also_as_links=False, verbose=True):
419
"""Return a text string with help for this command.
421
:param additional_see_also: Additional help topics to be
423
:param plain: if False, raw help (reStructuredText) is
424
returned instead of plain text.
425
:param see_also_as_links: if True, convert items in 'See also'
426
list to internal links (used by bzr_man rstx generator)
427
:param verbose: if True, display the full help, otherwise
428
leave out the descriptive sections and just display
429
usage help (e.g. Purpose, Usage, Options) with a
430
message explaining how to obtain full help.
434
raise NotImplementedError("sorry, no detailed help yet for %r" % self.name())
436
# Extract the summary (purpose) and sections out from the text
437
purpose,sections,order = self._get_help_parts(doc)
439
# If a custom usage section was provided, use it
440
if sections.has_key('Usage'):
441
usage = sections.pop('Usage')
443
usage = self._usage()
445
# The header is the purpose and usage
447
result += ':Purpose: %s\n' % purpose
448
if usage.find('\n') >= 0:
449
result += ':Usage:\n%s\n' % usage
451
result += ':Usage: %s\n' % usage
456
# XXX: optparse implicitly rewraps the help, and not always perfectly,
457
# so we get <https://bugs.launchpad.net/bzr/+bug/249908>. -- mbp
459
options = option.get_optparser(self.options()).format_option_help()
460
# XXX: According to the spec, ReST option lists actually don't support
461
# options like --1.9 so that causes syntax errors (in Sphinx at least).
462
# As that pattern always appears in the commands that break, we trap
463
# on that and then format that block of 'format' options as a literal
465
if not plain and options.find(' --1.9 ') != -1:
466
options = options.replace(' format:\n', ' format::\n\n', 1)
467
if options.startswith('Options:'):
468
result += ':' + options
469
elif options.startswith('options:'):
470
# Python 2.4 version of optparse
471
result += ':Options:' + options[len('options:'):]
477
# Add the description, indenting it 2 spaces
478
# to match the indentation of the options
479
if sections.has_key(None):
480
text = sections.pop(None)
481
text = '\n '.join(text.splitlines())
482
result += ':%s:\n %s\n\n' % ('Description',text)
484
# Add the custom sections (e.g. Examples). Note that there's no need
485
# to indent these as they must be indented already in the source.
488
if sections.has_key(label):
489
result += ':%s:\n%s\n' % (label,sections[label])
492
result += ("See bzr help %s for more details and examples.\n\n"
495
# Add the aliases, source (plug-in) and see also links, if any
497
result += ':Aliases: '
498
result += ', '.join(self.aliases) + '\n'
499
plugin_name = self.plugin_name()
500
if plugin_name is not None:
501
result += ':From: plugin "%s"\n' % plugin_name
502
see_also = self.get_see_also(additional_see_also)
504
if not plain and see_also_as_links:
506
for item in see_also:
508
# topics doesn't have an independent section
509
# so don't create a real link
510
see_also_links.append(item)
512
# Use a reST link for this entry
513
see_also_links.append("`%s`_" % (item,))
514
see_also = see_also_links
515
result += ':See also: '
516
result += ', '.join(see_also) + '\n'
518
# If this will be rendered as plain text, convert it
520
import bzrlib.help_topics
521
result = bzrlib.help_topics.help_as_plain_text(result)
525
def _get_help_parts(text):
526
"""Split help text into a summary and named sections.
528
:return: (summary,sections,order) where summary is the top line and
529
sections is a dictionary of the rest indexed by section name.
530
order is the order the section appear in the text.
531
A section starts with a heading line of the form ":xxx:".
532
Indented text on following lines is the section value.
533
All text found outside a named section is assigned to the
534
default section which is given the key of None.
536
def save_section(sections, order, label, section):
538
if sections.has_key(label):
539
sections[label] += '\n' + section
542
sections[label] = section
544
lines = text.rstrip().splitlines()
545
summary = lines.pop(0)
548
label,section = None,''
550
if line.startswith(':') and line.endswith(':') and len(line) > 2:
551
save_section(sections, order, label, section)
552
label,section = line[1:-1],''
553
elif (label is not None) and len(line) > 1 and not line[0].isspace():
554
save_section(sections, order, label, section)
555
label,section = None,line
558
section += '\n' + line
561
save_section(sections, order, label, section)
562
return summary, sections, order
564
def get_help_topic(self):
565
"""Return the commands help topic - its name."""
568
def get_see_also(self, additional_terms=None):
569
"""Return a list of help topics that are related to this command.
571
The list is derived from the content of the _see_also attribute. Any
572
duplicates are removed and the result is in lexical order.
573
:param additional_terms: Additional help topics to cross-reference.
574
:return: A list of help topics.
576
see_also = set(getattr(self, '_see_also', []))
578
see_also.update(additional_terms)
579
return sorted(see_also)
582
"""Return dict of valid options for this command.
584
Maps from long option name to option object."""
585
r = Option.STD_OPTIONS.copy()
587
for o in self.takes_options:
588
if isinstance(o, basestring):
589
o = option.Option.OPTIONS[o]
591
if o.name in std_names:
592
self.supported_std_options.append(o.name)
595
def _setup_outf(self):
596
"""Return a file linked to stdout, which has proper encoding."""
597
# Originally I was using self.stdout, but that looks
598
# *way* too much like sys.stdout
599
if self.encoding_type == 'exact':
600
# force sys.stdout to be binary stream on win32
601
if sys.platform == 'win32':
602
fileno = getattr(sys.stdout, 'fileno', None)
605
msvcrt.setmode(fileno(), os.O_BINARY)
606
self.outf = sys.stdout
609
output_encoding = osutils.get_terminal_encoding()
611
self.outf = codecs.getwriter(output_encoding)(sys.stdout,
612
errors=self.encoding_type)
613
# For whatever reason codecs.getwriter() does not advertise its encoding
614
# it just returns the encoding of the wrapped file, which is completely
615
# bogus. So set the attribute, so we can find the correct encoding later.
616
self.outf.encoding = output_encoding
618
def run_argv_aliases(self, argv, alias_argv=None):
619
"""Parse the command line and run with extra aliases in alias_argv."""
621
warn("Passing None for [] is deprecated from bzrlib 0.10",
622
DeprecationWarning, stacklevel=2)
624
args, opts = parse_args(self, argv, alias_argv)
626
# Process the standard options
627
if 'help' in opts: # e.g. bzr add --help
628
sys.stdout.write(self.get_help_text())
630
if 'usage' in opts: # e.g. bzr add --usage
631
sys.stdout.write(self.get_help_text(verbose=False))
633
trace.set_verbosity_level(option._verbosity_level)
634
if 'verbose' in self.supported_std_options:
635
opts['verbose'] = trace.is_verbose()
636
elif opts.has_key('verbose'):
638
if 'quiet' in self.supported_std_options:
639
opts['quiet'] = trace.is_quiet()
640
elif opts.has_key('quiet'):
643
# mix arguments and options into one dictionary
644
cmdargs = _match_argform(self.name(), self.takes_args, args)
646
for k, v in opts.items():
647
cmdopts[k.replace('-', '_')] = v
649
all_cmd_args = cmdargs.copy()
650
all_cmd_args.update(cmdopts)
654
return self.run(**all_cmd_args)
173
"""Override this in sub-classes.
657
"""Actually run the command.
175
659
This is invoked with the options and arguments bound to
176
660
keyword parameters.
178
Return 0 or None if the command was successful, or a shell
184
class ExternalCommand(Command):
185
"""Class to wrap external commands.
187
We cheat a little here, when get_cmd_class() calls us we actually give it back
188
an object we construct that has the appropriate path, help, options etc for the
191
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
192
method, which we override to call the Command.__init__ method. That then calls
193
our run method which is pretty straight forward.
195
The only wrinkle is that we have to map bzr's dictionary of options and arguments
196
back into command line options and arguments for the script.
199
def find_command(cls, cmd):
201
bzrpath = os.environ.get('BZRPATH', '')
203
for dir in bzrpath.split(os.pathsep):
204
path = os.path.join(dir, cmd)
205
if os.path.isfile(path):
206
return ExternalCommand(path)
210
find_command = classmethod(find_command)
212
def __init__(self, path):
215
pipe = os.popen('%s --bzr-usage' % path, 'r')
216
self.takes_options = pipe.readline().split()
218
for opt in self.takes_options:
219
if not opt in OPTIONS:
220
raise BzrError("Unknown option '%s' returned by external command %s"
223
# TODO: Is there any way to check takes_args is valid here?
224
self.takes_args = pipe.readline().split()
226
if pipe.close() is not None:
227
raise BzrError("Failed funning '%s --bzr-usage'" % path)
229
pipe = os.popen('%s --bzr-help' % path, 'r')
230
self.__doc__ = pipe.read()
231
if pipe.close() is not None:
232
raise BzrError("Failed funning '%s --bzr-help'" % path)
234
def __call__(self, options, arguments):
235
Command.__init__(self, options, arguments)
238
def run(self, **kargs):
245
optname = name.replace('_','-')
247
if OPTIONS.has_key(optname):
249
opts.append('--%s' % optname)
250
if value is not None and value is not True:
251
opts.append(str(value))
253
# it's an arg, or arg list
254
if type(value) is not list:
260
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
264
class cmd_status(Command):
265
"""Display status summary.
267
This reports on versioned and unknown files, reporting them
268
grouped by state. Possible states are:
271
Versioned in the working copy but not in the previous revision.
274
Versioned in the previous revision but removed or deleted
278
Path of this file changed from the previous revision;
279
the text may also have changed. This includes files whose
280
parent directory was renamed.
283
Text has changed since the previous revision.
286
Nothing about this file has changed since the previous revision.
287
Only shown with --all.
290
Not versioned and not matching an ignore pattern.
292
To see ignored files use 'bzr ignored'. For details in the
293
changes to file texts, use 'bzr diff'.
295
If no arguments are specified, the status of the entire working
296
directory is shown. Otherwise, only the status of the specified
297
files or directories is reported. If a directory is given, status
298
is reported for everything inside that directory.
300
takes_args = ['file*']
301
takes_options = ['all', 'show-ids']
302
aliases = ['st', 'stat']
304
def run(self, all=False, show_ids=False, file_list=None):
306
b = find_branch(file_list[0])
307
file_list = [b.relpath(x) for x in file_list]
308
# special case: only one path was given and it's the root
310
if file_list == ['']:
315
status.show_status(b, show_unchanged=all, show_ids=show_ids,
316
specific_files=file_list)
319
class cmd_cat_revision(Command):
320
"""Write out metadata for a revision."""
323
takes_args = ['revision_id']
325
def run(self, revision_id):
326
from bzrlib.xml import pack_xml
327
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
330
class cmd_revno(Command):
331
"""Show current revision number.
333
This is equal to the number of revisions on this branch."""
335
print find_branch('.').revno()
338
class cmd_add(Command):
339
"""Add specified files or directories.
341
In non-recursive mode, all the named items are added, regardless
342
of whether they were previously ignored. A warning is given if
343
any of the named files are already versioned.
345
In recursive mode (the default), files are treated the same way
346
but the behaviour for directories is different. Directories that
347
are already versioned do not give a warning. All directories,
348
whether already versioned or not, are searched for files or
349
subdirectories that are neither versioned or ignored, and these
350
are added. This search proceeds recursively into versioned
353
Therefore simply saying 'bzr add .' will version all files that
354
are currently unknown.
356
TODO: Perhaps adding a file whose directly is not versioned should
357
recursively add that parent, rather than giving an error?
359
takes_args = ['file+']
360
takes_options = ['verbose', 'no-recurse']
362
def run(self, file_list, verbose=False, no_recurse=False):
363
from bzrlib.add import smart_add
364
smart_add(file_list, verbose, not no_recurse)
368
class cmd_mkdir(Command):
369
"""Create a new versioned directory.
371
This is equivalent to creating the directory and then adding it.
373
takes_args = ['dir+']
375
def run(self, dir_list):
382
b.add([d], verbose=True)
385
class cmd_relpath(Command):
386
"""Show path of a file relative to root"""
387
takes_args = ['filename']
390
def run(self, filename):
391
print find_branch(filename).relpath(filename)
395
class cmd_inventory(Command):
396
"""Show inventory of the current working copy or a revision."""
397
takes_options = ['revision', 'show-ids']
399
def run(self, revision=None, show_ids=False):
402
inv = b.read_working_inventory()
404
inv = b.get_revision_inventory(b.lookup_revision(revision))
406
for path, entry in inv.entries():
408
print '%-50s %s' % (path, entry.file_id)
413
class cmd_move(Command):
414
"""Move files to a different directory.
419
The destination must be a versioned directory in the same branch.
421
takes_args = ['source$', 'dest']
422
def run(self, source_list, dest):
425
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
428
class cmd_rename(Command):
429
"""Change the name of an entry.
432
bzr rename frob.c frobber.c
433
bzr rename src/frob.c lib/frob.c
435
It is an error if the destination name exists.
437
See also the 'move' command, which moves files into a different
438
directory without changing their name.
440
TODO: Some way to rename multiple files without invoking bzr for each
442
takes_args = ['from_name', 'to_name']
444
def run(self, from_name, to_name):
446
b.rename_one(b.relpath(from_name), b.relpath(to_name))
452
class cmd_pull(Command):
453
"""Pull any changes from another branch into the current one.
455
If the location is omitted, the last-used location will be used.
456
Both the revision history and the working directory will be
459
This command only works on branches that have not diverged. Branches are
460
considered diverged if both branches have had commits without first
461
pulling from the other.
463
If branches have diverged, you can use 'bzr merge' to pull the text changes
464
from one into the other.
466
takes_args = ['location?']
468
def run(self, location=None):
469
from bzrlib.merge import merge
471
from shutil import rmtree
474
br_to = find_branch('.')
477
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
479
if e.errno != errno.ENOENT:
482
if stored_loc is None:
483
raise BzrCommandError("No pull location known or specified.")
485
print "Using last location: %s" % stored_loc
486
location = stored_loc
487
cache_root = tempfile.mkdtemp()
488
from bzrlib.branch import DivergedBranches
489
br_from = find_branch(location)
490
location = pull_loc(br_from)
491
old_revno = br_to.revno()
493
from branch import find_cached_branch, DivergedBranches
494
br_from = find_cached_branch(location, cache_root)
495
location = pull_loc(br_from)
496
old_revno = br_to.revno()
498
br_to.update_revisions(br_from)
499
except DivergedBranches:
500
raise BzrCommandError("These branches have diverged."
503
merge(('.', -1), ('.', old_revno), check_clean=False)
504
if location != stored_loc:
505
br_to.controlfile("x-pull", "wb").write(location + "\n")
511
class cmd_branch(Command):
512
"""Create a new copy of a branch.
514
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
515
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
517
To retrieve the branch as of a particular revision, supply the --revision
518
parameter, as in "branch foo/bar -r 5".
520
takes_args = ['from_location', 'to_location?']
521
takes_options = ['revision']
523
def run(self, from_location, to_location=None, revision=None):
525
from bzrlib.merge import merge
526
from bzrlib.branch import DivergedBranches, NoSuchRevision, \
527
find_cached_branch, Branch
528
from shutil import rmtree
529
from meta_store import CachedStore
531
cache_root = tempfile.mkdtemp()
534
br_from = find_cached_branch(from_location, cache_root)
536
if e.errno == errno.ENOENT:
537
raise BzrCommandError('Source location "%s" does not'
538
' exist.' % to_location)
542
if to_location is None:
543
to_location = os.path.basename(from_location.rstrip("/\\"))
546
os.mkdir(to_location)
548
if e.errno == errno.EEXIST:
549
raise BzrCommandError('Target directory "%s" already'
550
' exists.' % to_location)
551
if e.errno == errno.ENOENT:
552
raise BzrCommandError('Parent of "%s" does not exist.' %
556
br_to = Branch(to_location, init=True)
559
br_to.update_revisions(br_from, stop_revision=revision)
560
except NoSuchRevision:
562
msg = "The branch %s has no revision %d." % (from_location,
564
raise BzrCommandError(msg)
565
merge((to_location, -1), (to_location, 0), this_dir=to_location,
566
check_clean=False, ignore_zero=True)
567
from_location = pull_loc(br_from)
568
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
573
def pull_loc(branch):
574
# TODO: Should perhaps just make attribute be 'base' in
575
# RemoteBranch and Branch?
576
if hasattr(branch, "baseurl"):
577
return branch.baseurl
583
class cmd_renames(Command):
584
"""Show list of renamed files.
586
TODO: Option to show renames between two historical versions.
588
TODO: Only show renames under dir, rather than in the whole branch.
590
takes_args = ['dir?']
592
def run(self, dir='.'):
594
old_inv = b.basis_tree().inventory
595
new_inv = b.read_working_inventory()
597
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
599
for old_name, new_name in renames:
600
print "%s => %s" % (old_name, new_name)
603
class cmd_info(Command):
604
"""Show statistical information about a branch."""
605
takes_args = ['branch?']
607
def run(self, branch=None):
610
b = find_branch(branch)
614
class cmd_remove(Command):
615
"""Make a file unversioned.
617
This makes bzr stop tracking changes to a versioned file. It does
618
not delete the working copy.
620
takes_args = ['file+']
621
takes_options = ['verbose']
623
def run(self, file_list, verbose=False):
624
b = find_branch(file_list[0])
625
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
628
class cmd_file_id(Command):
629
"""Print file_id of a particular file or directory.
631
The file_id is assigned when the file is first added and remains the
632
same through all revisions where the file exists, even when it is
636
takes_args = ['filename']
637
def run(self, filename):
638
b = find_branch(filename)
639
i = b.inventory.path2id(b.relpath(filename))
641
raise BzrError("%r is not a versioned file" % filename)
646
class cmd_file_path(Command):
647
"""Print path of file_ids to a file or directory.
649
This prints one line for each directory down to the target,
650
starting at the branch root."""
652
takes_args = ['filename']
653
def run(self, filename):
654
b = find_branch(filename)
656
fid = inv.path2id(b.relpath(filename))
658
raise BzrError("%r is not a versioned file" % filename)
659
for fip in inv.get_idpath(fid):
663
class cmd_revision_history(Command):
664
"""Display list of revision ids on this branch."""
667
for patchid in find_branch('.').revision_history():
671
class cmd_directories(Command):
672
"""Display list of versioned directories in this branch."""
674
for name, ie in find_branch('.').read_working_inventory().directories():
681
class cmd_init(Command):
682
"""Make a directory into a versioned branch.
684
Use this to create an empty branch, or before importing an
687
Recipe for importing a tree of files:
692
bzr commit -m 'imported project'
695
from bzrlib.branch import Branch
696
Branch('.', init=True)
699
class cmd_diff(Command):
700
"""Show differences in working tree.
702
If files are listed, only the changes in those files are listed.
703
Otherwise, all changes for the tree are listed.
705
TODO: Given two revision arguments, show the difference between them.
707
TODO: Allow diff across branches.
709
TODO: Option to use external diff command; could be GNU diff, wdiff,
712
TODO: Python difflib is not exactly the same as unidiff; should
713
either fix it up or prefer to use an external diff.
715
TODO: If a directory is given, diff everything under that.
717
TODO: Selected-file diff is inefficient and doesn't show you
720
TODO: This probably handles non-Unix newlines poorly.
723
takes_args = ['file*']
724
takes_options = ['revision', 'diff-options']
725
aliases = ['di', 'dif']
727
def run(self, revision=None, file_list=None, diff_options=None):
728
from bzrlib.diff import show_diff
731
b = find_branch(file_list[0])
732
file_list = [b.relpath(f) for f in file_list]
733
if file_list == ['']:
734
# just pointing to top-of-tree
739
show_diff(b, revision, specific_files=file_list,
740
external_diff_options=diff_options)
746
class cmd_deleted(Command):
747
"""List files deleted in the working tree.
749
TODO: Show files deleted since a previous revision, or between two revisions.
751
def run(self, show_ids=False):
754
new = b.working_tree()
756
## TODO: Much more efficient way to do this: read in new
757
## directories with readdir, rather than stating each one. Same
758
## level of effort but possibly much less IO. (Or possibly not,
759
## if the directories are very large...)
761
for path, ie in old.inventory.iter_entries():
762
if not new.has_id(ie.file_id):
764
print '%-50s %s' % (path, ie.file_id)
769
class cmd_modified(Command):
770
"""List files modified in working tree."""
775
inv = b.read_working_inventory()
776
sc = statcache.update_cache(b, inv)
777
basis = b.basis_tree()
778
basis_inv = basis.inventory
780
# We used to do this through iter_entries(), but that's slow
781
# when most of the files are unmodified, as is usually the
782
# case. So instead we iterate by inventory entry, and only
783
# calculate paths as necessary.
785
for file_id in basis_inv:
786
cacheentry = sc.get(file_id)
787
if not cacheentry: # deleted
789
ie = basis_inv[file_id]
790
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
791
path = inv.id2path(file_id)
796
class cmd_added(Command):
797
"""List files added in working tree."""
801
wt = b.working_tree()
802
basis_inv = b.basis_tree().inventory
805
if file_id in basis_inv:
807
path = inv.id2path(file_id)
808
if not os.access(b.abspath(path), os.F_OK):
814
class cmd_root(Command):
815
"""Show the tree root directory.
817
The root is the nearest enclosing directory with a .bzr control
819
takes_args = ['filename?']
820
def run(self, filename=None):
821
"""Print the branch root."""
822
b = find_branch(filename)
823
print getattr(b, 'base', None) or getattr(b, 'baseurl')
826
class cmd_log(Command):
827
"""Show log of this branch.
829
To request a range of logs, you can use the command -r begin:end
830
-r revision requests a specific revision, -r :end or -r begin: are
833
TODO: Make --revision support uuid: and hash: [future tag:] notation.
837
takes_args = ['filename?']
838
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
840
def run(self, filename=None, timezone='original',
845
from bzrlib.branch import find_branch
846
from bzrlib.log import log_formatter, show_log
849
direction = (forward and 'forward') or 'reverse'
852
b = find_branch(filename)
853
fp = b.relpath(filename)
855
file_id = b.read_working_inventory().path2id(fp)
857
file_id = None # points to branch root
863
revision = [None, None]
864
elif isinstance(revision, int):
865
revision = [revision, revision]
870
assert len(revision) == 2
872
mutter('encoding log as %r' % bzrlib.user_encoding)
874
# use 'replace' so that we don't abort if trying to write out
875
# in e.g. the default C locale.
876
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
878
lf = log_formatter('short',
881
show_timezone=timezone)
888
start_revision=revision[0],
889
end_revision=revision[1])
893
class cmd_touching_revisions(Command):
894
"""Return revision-ids which affected a particular file.
896
A more user-friendly interface is "bzr log FILE"."""
898
takes_args = ["filename"]
899
def run(self, filename):
900
b = find_branch(filename)
901
inv = b.read_working_inventory()
902
file_id = inv.path2id(b.relpath(filename))
903
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
904
print "%6d %s" % (revno, what)
907
class cmd_ls(Command):
908
"""List files in a tree.
910
TODO: Take a revision or remote path and list that tree instead.
913
def run(self, revision=None, verbose=False):
916
tree = b.working_tree()
918
tree = b.revision_tree(b.lookup_revision(revision))
920
for fp, fc, kind, fid in tree.list_files():
922
if kind == 'directory':
929
print '%-8s %s%s' % (fc, fp, kindch)
935
class cmd_unknowns(Command):
936
"""List unknown files."""
938
from bzrlib.osutils import quotefn
939
for f in find_branch('.').unknowns():
944
class cmd_ignore(Command):
945
"""Ignore a command or pattern.
947
To remove patterns from the ignore list, edit the .bzrignore file.
949
If the pattern contains a slash, it is compared to the whole path
950
from the branch root. Otherwise, it is comapred to only the last
951
component of the path.
953
Ignore patterns are case-insensitive on case-insensitive systems.
955
Note: wildcards must be quoted from the shell on Unix.
958
bzr ignore ./Makefile
961
takes_args = ['name_pattern']
963
def run(self, name_pattern):
964
from bzrlib.atomicfile import AtomicFile
968
ifn = b.abspath('.bzrignore')
970
if os.path.exists(ifn):
973
igns = f.read().decode('utf-8')
979
# TODO: If the file already uses crlf-style termination, maybe
980
# we should use that for the newly added lines?
982
if igns and igns[-1] != '\n':
984
igns += name_pattern + '\n'
987
f = AtomicFile(ifn, 'wt')
988
f.write(igns.encode('utf-8'))
993
inv = b.working_tree().inventory
994
if inv.path2id('.bzrignore'):
995
mutter('.bzrignore is already versioned')
997
mutter('need to make new .bzrignore file versioned')
998
b.add(['.bzrignore'])
1002
class cmd_ignored(Command):
1003
"""List ignored files and the patterns that matched them.
1005
See also: bzr ignore"""
1007
tree = find_branch('.').working_tree()
1008
for path, file_class, kind, file_id in tree.list_files():
1009
if file_class != 'I':
1011
## XXX: Slightly inefficient since this was already calculated
1012
pat = tree.is_ignored(path)
1013
print '%-50s %s' % (path, pat)
1016
class cmd_lookup_revision(Command):
1017
"""Lookup the revision-id from a revision-number
1020
bzr lookup-revision 33
1023
takes_args = ['revno']
1025
def run(self, revno):
1029
raise BzrCommandError("not a valid revision-number: %r" % revno)
1031
print find_branch('.').lookup_revision(revno)
1034
class cmd_export(Command):
1035
"""Export past revision to destination directory.
1037
If no revision is specified this exports the last committed revision.
1039
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1040
given, exports to a directory (equivalent to --format=dir)."""
1041
# TODO: list known exporters
1042
takes_args = ['dest']
1043
takes_options = ['revision', 'format']
1044
def run(self, dest, revision=None, format='dir'):
1045
b = find_branch('.')
1046
if revision == None:
1047
rh = b.revision_history()[-1]
1049
rh = b.lookup_revision(int(revision))
1050
t = b.revision_tree(rh)
1051
t.export(dest, format)
1054
class cmd_cat(Command):
1055
"""Write a file's text from a previous revision."""
1057
takes_options = ['revision']
1058
takes_args = ['filename']
1060
def run(self, filename, revision=None):
1061
if revision == None:
1062
raise BzrCommandError("bzr cat requires a revision number")
1063
b = find_branch('.')
1064
b.print_file(b.relpath(filename), int(revision))
1067
class cmd_local_time_offset(Command):
1068
"""Show the offset in seconds from GMT to local time."""
1071
print bzrlib.osutils.local_time_offset()
1075
class cmd_commit(Command):
1076
"""Commit changes into a new revision.
1078
If selected files are specified, only changes to those files are
1079
committed. If a directory is specified then its contents are also
1082
A selected-file commit may fail in some cases where the committed
1083
tree would be invalid, such as trying to commit a file in a
1084
newly-added directory that is not itself committed.
1086
TODO: Run hooks on tree to-be-committed, and after commit.
1088
TODO: Strict commit that fails if there are unknown or deleted files.
1090
takes_args = ['selected*']
1091
takes_options = ['message', 'file', 'verbose']
1092
aliases = ['ci', 'checkin']
1094
def run(self, message=None, file=None, verbose=True, selected_list=None):
1095
from bzrlib.commit import commit
1096
from bzrlib.osutils import get_text_message
1098
## Warning: shadows builtin file()
1099
if not message and not file:
1102
catcher = cStringIO.StringIO()
1103
sys.stdout = catcher
1104
cmd_status({"file_list":selected_list}, {})
1105
info = catcher.getvalue()
1107
message = get_text_message(info)
1110
raise BzrCommandError("please specify a commit message",
1111
["use either --message or --file"])
1112
elif message and file:
1113
raise BzrCommandError("please specify either --message or --file")
1117
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1119
b = find_branch('.')
1120
commit(b, message, verbose=verbose, specific_files=selected_list)
1123
class cmd_check(Command):
1124
"""Validate consistency of branch history.
1126
This command checks various invariants about the branch storage to
1127
detect data corruption or bzr bugs.
1129
If given the --update flag, it will update some optional fields
1130
to help ensure data consistency.
1132
takes_args = ['dir?']
1134
def run(self, dir='.'):
1135
from bzrlib.check import check
1136
check(find_branch(dir))
1140
class cmd_upgrade(Command):
1141
"""Upgrade branch storage to current format.
1143
This should normally be used only after the check command tells
1146
takes_args = ['dir?']
1148
def run(self, dir='.'):
1149
from bzrlib.upgrade import upgrade
1150
upgrade(find_branch(dir))
1154
class cmd_whoami(Command):
1155
"""Show bzr user id."""
1156
takes_options = ['email']
1158
def run(self, email=False):
1160
print bzrlib.osutils.user_email()
1162
print bzrlib.osutils.username()
1165
class cmd_selftest(Command):
1166
"""Run internal test suite"""
1169
from bzrlib.selftest import selftest
1170
return int(not selftest())
1173
class cmd_version(Command):
1174
"""Show version of bzr."""
1179
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1180
# is bzrlib itself in a branch?
1181
bzrrev = bzrlib.get_bzr_revision()
1183
print " (bzr checkout, revision %d {%s})" % bzrrev
1184
print bzrlib.__copyright__
1185
print "http://bazaar-ng.org/"
1187
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1188
print "you may use, modify and redistribute it under the terms of the GNU"
1189
print "General Public License version 2 or later."
1192
class cmd_rocks(Command):
1193
"""Statement of optimism."""
1196
print "it sure does!"
1198
def parse_spec(spec):
1200
>>> parse_spec(None)
1202
>>> parse_spec("./")
1204
>>> parse_spec("../@")
1206
>>> parse_spec("../f/@35")
1212
parsed = spec.split('/@')
1213
assert len(parsed) == 2
1217
parsed[1] = int(parsed[1])
1218
assert parsed[1] >=0
1220
parsed = [spec, None]
1225
class cmd_merge(Command):
1226
"""Perform a three-way merge of trees.
1228
The SPEC parameters are working tree or revision specifiers. Working trees
1229
are specified using standard paths or urls. No component of a directory
1230
path may begin with '@'.
1232
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1234
Revisions are specified using a dirname/@revno pair, where dirname is the
1235
branch directory and revno is the revision within that branch. If no revno
1236
is specified, the latest revision is used.
1238
Revision examples: './@127', 'foo/@', '../@1'
1240
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1241
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1244
merge refuses to run if there are any uncommitted changes, unless
1247
takes_args = ['other_spec', 'base_spec?']
1248
takes_options = ['force']
1250
def run(self, other_spec, base_spec=None, force=False):
1251
from bzrlib.merge import merge
1252
merge(parse_spec(other_spec), parse_spec(base_spec),
1253
check_clean=(not force))
1257
class cmd_revert(Command):
1258
"""Restore selected files from a previous revision.
1260
takes_args = ['file+']
1261
def run(self, file_list):
1262
from bzrlib.branch import find_branch
1267
b = find_branch(file_list[0])
1269
b.revert([b.relpath(f) for f in file_list])
1272
class cmd_merge_revert(Command):
1273
"""Reverse all changes since the last commit.
1275
Only versioned files are affected.
1277
TODO: Store backups of any files that will be reverted, so
1278
that the revert can be undone.
1280
takes_options = ['revision']
1282
def run(self, revision=-1):
1283
from bzrlib.merge import merge
1284
merge(('.', revision), parse_spec('.'),
1289
class cmd_assert_fail(Command):
1290
"""Test reporting of assertion failures"""
1293
assert False, "always fails"
1296
class cmd_help(Command):
1297
"""Show help on a command or other topic.
1299
For a list of all available commands, say 'bzr help commands'."""
1300
takes_args = ['topic?']
1303
def run(self, topic=None):
1308
class cmd_update_stat_cache(Command):
1309
"""Update stat-cache mapping inodes to SHA-1 hashes.
1311
For testing only."""
1315
b = find_branch('.')
1316
statcache.update_cache(b.base, b.read_working_inventory())
1320
class cmd_plugins(Command):
1324
import bzrlib.plugin
1325
from pprint import pprint
1326
pprint(bzrlib.plugin.all_plugins)
1330
# list of all available options; the rhs can be either None for an
1331
# option that takes no argument, or a constructor function that checks
1335
'diff-options': str,
1344
'revision': _parse_revision_str,
1362
def parse_args(argv):
662
Return 0 or None if the command was successful, or a non-zero
663
shell error code if not. It's OK for this method to allow
664
an exception to raise up.
666
raise NotImplementedError('no implementation of command %r'
670
"""Return help message for this class."""
671
from inspect import getdoc
672
if self.__doc__ is Command.__doc__:
677
return _unsquish_command_name(self.__class__.__name__)
679
def plugin_name(self):
680
"""Get the name of the plugin that provides this command.
682
:return: The name of the plugin or None if the command is builtin.
684
mod_parts = self.__module__.split('.')
685
if len(mod_parts) >= 3 and mod_parts[1] == 'plugins':
691
class CommandHooks(Hooks):
692
"""Hooks related to Command object creation/enumeration."""
695
"""Create the default hooks.
697
These are all empty initially, because by default nothing should get
701
self.create_hook(HookPoint('extend_command',
702
"Called after creating a command object to allow modifications "
703
"such as adding or removing options, docs etc. Called with the "
704
"new bzrlib.commands.Command object.", (1, 13), None))
705
self.create_hook(HookPoint('get_command',
706
"Called when creating a single command. Called with "
707
"(cmd_or_None, command_name). get_command should either return "
708
"the cmd_or_None parameter, or a replacement Command object that "
709
"should be used for the command. Note that the Command.hooks "
710
"hooks are core infrastructure. Many users will prefer to use "
711
"bzrlib.commands.register_command or plugin_cmds.register_lazy.",
713
self.create_hook(HookPoint('get_missing_command',
714
"Called when creating a single command if no command could be "
715
"found. Called with (command_name). get_missing_command should "
716
"either return None, or a Command object to be used for the "
717
"command.", (1, 17), None))
718
self.create_hook(HookPoint('list_commands',
719
"Called when enumerating commands. Called with a set of "
720
"cmd_name strings for all the commands found so far. This set "
721
" is safe to mutate - e.g. to remove a command. "
722
"list_commands should return the updated set of command names.",
725
Command.hooks = CommandHooks()
728
def parse_args(command, argv, alias_argv=None):
1363
729
"""Parse command line.
1365
731
Arguments and options are parsed at this level before being passed
1366
732
down to specific command handlers. This routine knows, from a
1367
733
lookup table, something about the available options, what optargs
1368
734
they take, and which commands will accept them.
1370
>>> parse_args('--help'.split())
1371
([], {'help': True})
1372
>>> parse_args('--version'.split())
1373
([], {'version': True})
1374
>>> parse_args('status --all'.split())
1375
(['status'], {'all': True})
1376
>>> parse_args('commit --message=biter'.split())
1377
(['commit'], {'message': u'biter'})
1378
>>> parse_args('log -r 500'.split())
1379
(['log'], {'revision': 500})
1380
>>> parse_args('log -r500:600'.split())
1381
(['log'], {'revision': [500, 600]})
1382
>>> parse_args('log -vr500:600'.split())
1383
(['log'], {'verbose': True, 'revision': [500, 600]})
1384
>>> parse_args('log -rv500:600'.split()) #the r takes an argument
1385
Traceback (most recent call last):
1387
ValueError: invalid literal for int(): v500
1392
# TODO: Maybe handle '--' to end options?
1397
# option names must not be unicode
1401
mutter(" got option %r" % a)
1403
optname, optarg = a[2:].split('=', 1)
1406
if optname not in OPTIONS:
1407
raise BzrError('unknown long option %r' % a)
1410
if shortopt in SHORT_OPTIONS:
1411
# Multi-character options must have a space to delimit
1413
optname = SHORT_OPTIONS[shortopt]
1415
# Single character short options, can be chained,
1416
# and have their value appended to their name
1418
if shortopt not in SHORT_OPTIONS:
1419
# We didn't find the multi-character name, and we
1420
# didn't find the single char name
1421
raise BzrError('unknown short option %r' % a)
1422
optname = SHORT_OPTIONS[shortopt]
1425
# There are extra things on this option
1426
# see if it is the value, or if it is another
1428
optargfn = OPTIONS[optname]
1429
if optargfn is None:
1430
# This option does not take an argument, so the
1431
# next entry is another short option, pack it back
1433
argv.insert(0, '-' + a[2:])
1435
# This option takes an argument, so pack it
1440
# XXX: Do we ever want to support this, e.g. for -r?
1441
raise BzrError('repeated option %r' % a)
1443
optargfn = OPTIONS[optname]
1447
raise BzrError('option %r needs an argument' % a)
1449
optarg = argv.pop(0)
1450
opts[optname] = optargfn(optarg)
1453
raise BzrError('option %r takes no argument' % optname)
1454
opts[optname] = True
736
# TODO: make it a method of the Command?
737
parser = option.get_optparser(command.options())
738
if alias_argv is not None:
739
args = alias_argv + argv
743
options, args = parser.parse_args(args)
744
opts = dict([(k, v) for k, v in options.__dict__.iteritems() if
745
v is not option.OptionParser.DEFAULT_VALUE])
1458
746
return args, opts
1463
749
def _match_argform(cmd, takes_args, args):
1477
763
argdict[argname + '_list'] = None
1478
764
elif ap[-1] == '+':
1480
raise BzrCommandError("command %r needs one or more %s"
1481
% (cmd, argname.upper()))
766
raise errors.BzrCommandError("command %r needs one or more %s"
767
% (cmd, argname.upper()))
1483
769
argdict[argname + '_list'] = args[:]
1485
771
elif ap[-1] == '$': # all but one
1486
772
if len(args) < 2:
1487
raise BzrCommandError("command %r needs one or more %s"
1488
% (cmd, argname.upper()))
773
raise errors.BzrCommandError("command %r needs one or more %s"
774
% (cmd, argname.upper()))
1489
775
argdict[argname + '_list'] = args[:-1]
1492
778
# just a plain arg
1495
raise BzrCommandError("command %r requires argument %s"
1496
% (cmd, argname.upper()))
781
raise errors.BzrCommandError("command %r requires argument %s"
782
% (cmd, argname.upper()))
1498
784
argdict[argname] = args.pop(0)
1501
raise BzrCommandError("extra argument to command %s: %s"
787
raise errors.BzrCommandError("extra argument to command %s: %s"
1507
def _parse_master_args(argv):
1508
"""Parse the arguments that always go with the original command.
1509
These are things like bzr --no-plugins, etc.
1511
There are now 2 types of option flags. Ones that come *before* the command,
1512
and ones that come *after* the command.
1513
Ones coming *before* the command are applied against all possible commands.
1514
And are generally applied before plugins are loaded.
1516
The current list are:
1517
--builtin Allow plugins to load, but don't let them override builtin commands,
1518
they will still be allowed if they do not override a builtin.
1519
--no-plugins Don't load any plugins. This lets you get back to official source
1521
--profile Enable the hotspot profile before running the command.
1522
For backwards compatibility, this is also a non-master option.
1523
--version Spit out the version of bzr that is running and exit.
1524
This is also a non-master option.
1525
--help Run help and exit, also a non-master option (I think that should stay, though)
1527
>>> argv, opts = _parse_master_args(['bzr', '--test'])
1528
Traceback (most recent call last):
1530
BzrCommandError: Invalid master option: 'test'
1531
>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1534
>>> print opts['version']
1536
>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1538
['command', '--more-options']
1539
>>> print opts['profile']
1541
>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1544
>>> print opts['no-plugins']
1546
>>> print opts['profile']
1548
>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1550
['command', '--profile']
1551
>>> print opts['profile']
1554
master_opts = {'builtin':False,
1561
# This is the point where we could hook into argv[0] to determine
1562
# what front-end is supposed to be run
1563
# For now, we are just ignoring it.
1564
cmd_name = argv.pop(0)
1566
if arg[:2] != '--': # at the first non-option, we return the rest
1568
arg = arg[2:] # Remove '--'
1569
if arg not in master_opts:
1570
# We could say that this is not an error, that we should
1571
# just let it be handled by the main section instead
1572
raise BzrCommandError('Invalid master option: %r' % arg)
1573
argv.pop(0) # We are consuming this entry
1574
master_opts[arg] = True
1575
return argv, master_opts
792
def apply_coveraged(dirname, the_callable, *args, **kwargs):
793
# Cannot use "import trace", as that would import bzrlib.trace instead of
794
# the standard library's trace.
795
trace = __import__('trace')
797
tracer = trace.Trace(count=1, trace=0)
798
sys.settrace(tracer.globaltrace)
799
threading.settrace(tracer.globaltrace)
802
return exception_to_return_code(the_callable, *args, **kwargs)
805
results = tracer.results()
806
results.write_results(show_missing=1, summary=False,
810
def apply_profiled(the_callable, *args, **kwargs):
814
pffileno, pfname = tempfile.mkstemp()
816
prof = hotshot.Profile(pfname)
818
ret = prof.runcall(exception_to_return_code, the_callable, *args,
822
stats = hotshot.stats.load(pfname)
824
stats.sort_stats('cum') # 'time'
825
## XXX: Might like to write to stderr or the trace file instead but
826
## print_stats seems hardcoded to stdout
827
stats.print_stats(20)
834
def exception_to_return_code(the_callable, *args, **kwargs):
835
"""UI level helper for profiling and coverage.
837
This transforms exceptions into a return value of 3. As such its only
838
relevant to the UI layer, and should never be called where catching
839
exceptions may be desirable.
842
return the_callable(*args, **kwargs)
843
except (KeyboardInterrupt, Exception), e:
844
# used to handle AssertionError and KeyboardInterrupt
845
# specially here, but hopefully they're handled ok by the logger now
846
exc_info = sys.exc_info()
847
exitcode = trace.report_exception(exc_info, sys.stderr)
848
if os.environ.get('BZR_PDB'):
849
print '**** entering debugger'
852
if sys.version_info[:2] < (2, 6):
854
# pdb.post_mortem(tb)
855
# but because pdb.post_mortem gives bad results for tracebacks
856
# from inside generators, we do it manually.
857
# (http://bugs.python.org/issue4150, fixed in Python 2.6)
859
# Setup pdb on the traceback
862
p.setup(tb.tb_frame, tb)
863
# Point the debugger at the deepest frame of the stack
864
p.curindex = len(p.stack) - 1
865
p.curframe = p.stack[p.curindex][0]
866
# Start the pdb prompt.
867
p.print_stack_entry(p.stack[p.curindex])
875
def apply_lsprofiled(filename, the_callable, *args, **kwargs):
876
from bzrlib.lsprof import profile
877
ret, stats = profile(exception_to_return_code, the_callable, *args, **kwargs)
883
trace.note('Profile data written to "%s".', filename)
887
def shlex_split_unicode(unsplit):
889
return [u.decode('utf-8') for u in shlex.split(unsplit.encode('utf-8'))]
892
def get_alias(cmd, config=None):
893
"""Return an expanded alias, or None if no alias exists.
896
Command to be checked for an alias.
898
Used to specify an alternative config to use,
899
which is especially useful for testing.
900
If it is unspecified, the global config will be used.
904
config = bzrlib.config.GlobalConfig()
905
alias = config.get_alias(cmd)
907
return shlex_split_unicode(alias)
1579
911
def run_bzr(argv):
1580
912
"""Execute a command.
1582
This is similar to main(), but without all the trappings for
1583
logging and error handling.
915
The command-line arguments, without the program name from argv[0]
916
These should already be decoded. All library/test code calling
917
run_bzr should be passing valid strings (don't need decoding).
919
Returns a command status or raises an exception.
921
Special master options: these must come before the command because
922
they control how the command is interpreted.
925
Do not load plugin modules at all
931
Only use builtin commands. (Plugins are still allowed to change
935
Run under the Python hotshot profiler.
938
Run under the Python lsprof profiler.
941
Generate line coverage report in the specified directory.
1585
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1588
# some options like --builtin and --no-plugins have special effects
1589
argv, master_opts = _parse_master_args(argv)
1590
if not master_opts['no-plugins']:
1591
from bzrlib.plugin import load_plugins
1594
args, opts = parse_args(argv)
1596
if master_opts['help']:
1597
from bzrlib.help import help
1605
from bzrlib.help import help
1611
elif 'version' in opts:
1614
elif args and args[0] == 'builtin':
1615
include_plugins=False
1617
cmd = str(args.pop(0))
1624
plugins_override = not (master_opts['builtin'])
1625
canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1627
profile = master_opts['profile']
1628
# For backwards compatibility, I would rather stick with --profile being a
1629
# master/global option
1630
if 'profile' in opts:
1634
# check options are reasonable
1635
allowed = cmd_class.takes_options
1637
if oname not in allowed:
1638
raise BzrCommandError("option '--%s' is not allowed for command %r"
1641
# mix arguments and options into one dictionary
1642
cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1644
for k, v in opts.items():
1645
cmdopts[k.replace('-', '_')] = v
1648
import hotshot, tempfile
1649
pffileno, pfname = tempfile.mkstemp()
1651
prof = hotshot.Profile(pfname)
1652
ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
1655
import hotshot.stats
1656
stats = hotshot.stats.load(pfname)
1658
stats.sort_stats('time')
1659
## XXX: Might like to write to stderr or the trace file instead but
1660
## print_stats seems hardcoded to stdout
1661
stats.print_stats(20)
944
trace.mutter("bzr arguments: %r", argv)
946
opt_lsprof = opt_profile = opt_no_plugins = opt_builtin = \
947
opt_no_aliases = False
948
opt_lsprof_file = opt_coverage_dir = None
950
# --no-plugins is handled specially at a very early stage. We need
951
# to load plugins before doing other command parsing so that they
952
# can override commands, but this needs to happen first.
960
elif a == '--lsprof':
962
elif a == '--lsprof-file':
964
opt_lsprof_file = argv[i + 1]
966
elif a == '--no-plugins':
967
opt_no_plugins = True
968
elif a == '--no-aliases':
969
opt_no_aliases = True
970
elif a == '--builtin':
972
elif a == '--coverage':
973
opt_coverage_dir = argv[i + 1]
975
elif a.startswith('-D'):
976
debug.debug_flags.add(a[2:])
981
debug.set_debug_flags_from_config()
985
from bzrlib.builtins import cmd_help
986
cmd_help().run_argv_aliases([])
989
if argv[0] == '--version':
990
from bzrlib.builtins import cmd_version
991
cmd_version().run_argv_aliases([])
994
if not opt_no_plugins:
995
from bzrlib.plugin import load_plugins
1669
return cmd_class(cmdopts, cmdargs).status
1672
def _report_exception(summary, quiet=False):
1674
log_error('bzr: ' + summary)
1675
bzrlib.trace.log_exception()
1678
tb = sys.exc_info()[2]
1679
exinfo = traceback.extract_tb(tb)
1681
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
1682
sys.stderr.write(' see ~/.bzr.log for debug information\n')
1688
bzrlib.trace.open_tracefile(argv)
998
from bzrlib.plugin import disable_plugins
1003
if not opt_no_aliases:
1004
alias_argv = get_alias(argv[0])
1006
user_encoding = osutils.get_user_encoding()
1007
alias_argv = [a.decode(user_encoding) for a in alias_argv]
1008
argv[0] = alias_argv.pop(0)
1011
# We want only 'ascii' command names, but the user may have typed
1012
# in a Unicode name. In that case, they should just get a
1013
# 'command not found' error later.
1015
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
1016
run = cmd_obj.run_argv_aliases
1017
run_argv = [argv, alias_argv]
1693
return run_bzr(argv)
1695
# do this here inside the exception wrappers to catch EPIPE
1698
quiet = isinstance(e, (BzrCommandError))
1699
_report_exception('error: ' + e.args[0], quiet=quiet)
1702
# some explanation or hints
1705
except AssertionError, e:
1706
msg = 'assertion failed'
1708
msg += ': ' + str(e)
1709
_report_exception(msg)
1711
except KeyboardInterrupt, e:
1712
_report_exception('interrupted', quiet=True)
1714
except Exception, e:
1717
if (isinstance(e, IOError)
1718
and hasattr(e, 'errno')
1719
and e.errno == errno.EPIPE):
1723
msg = str(e).rstrip('\n')
1724
_report_exception(msg, quiet)
1020
# We can be called recursively (tests for example), but we don't want
1021
# the verbosity level to propagate.
1022
saved_verbosity_level = option._verbosity_level
1023
option._verbosity_level = 0
1025
if opt_coverage_dir:
1027
'--coverage ignored, because --lsprof is in use.')
1028
ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv)
1030
if opt_coverage_dir:
1032
'--coverage ignored, because --profile is in use.')
1033
ret = apply_profiled(run, *run_argv)
1034
elif opt_coverage_dir:
1035
ret = apply_coveraged(opt_coverage_dir, run, *run_argv)
1037
ret = run(*run_argv)
1038
if 'memory' in debug.debug_flags:
1039
trace.debug_memory('Process status after command:', short=False)
1727
bzrlib.trace.close_trace()
1042
# reset, in case we may do other commands later within the same
1043
# process. Commands that want to execute sub-commands must propagate
1044
# --verbose in their own way.
1045
option._verbosity_level = saved_verbosity_level
1048
def display_command(func):
1049
"""Decorator that suppresses pipe/interrupt errors."""
1050
def ignore_pipe(*args, **kwargs):
1052
result = func(*args, **kwargs)
1056
if getattr(e, 'errno', None) is None:
1058
if e.errno != errno.EPIPE:
1059
# Win32 raises IOError with errno=0 on a broken pipe
1060
if sys.platform != 'win32' or (e.errno not in (0, errno.EINVAL)):
1063
except KeyboardInterrupt:
1068
def install_bzr_command_hooks():
1069
"""Install the hooks to supply bzr's own commands."""
1070
if _list_bzr_commands in Command.hooks["list_commands"]:
1072
Command.hooks.install_named_hook("list_commands", _list_bzr_commands,
1074
Command.hooks.install_named_hook("get_command", _get_bzr_command,
1076
Command.hooks.install_named_hook("get_command", _get_plugin_command,
1077
"bzr plugin commands")
1078
Command.hooks.install_named_hook("get_command", _get_external_command,
1079
"bzr external command lookup")
1080
Command.hooks.install_named_hook("get_missing_command", _try_plugin_provider,
1081
"bzr plugin-provider-db check")
1084
def main(argv=None):
1085
"""Main entry point of command-line interface.
1087
:param argv: list of unicode command-line arguments similar to sys.argv.
1088
argv[0] is script name usually, it will be ignored.
1089
Don't pass here sys.argv because this list contains plain strings
1090
and not unicode; pass None instead.
1092
:return: exit code of bzr command.
1095
bzrlib.ui.ui_factory = bzrlib.ui.make_ui_for_terminal(
1096
sys.stdin, sys.stdout, sys.stderr)
1098
# Is this a final release version? If so, we should suppress warnings
1099
if bzrlib.version_info[3] == 'final':
1100
suppress_deprecation_warnings(override=True)
1102
argv = osutils.get_unicode_argv()
1106
# ensure all arguments are unicode strings
1108
if isinstance(a, unicode):
1111
new_argv.append(a.decode('ascii'))
1112
except UnicodeDecodeError:
1113
raise errors.BzrError("argv should be list of unicode strings.")
1115
ret = run_bzr_catch_errors(argv)
1116
trace.mutter("return code %d", ret)
1120
def run_bzr_catch_errors(argv):
1121
"""Run a bzr command with parameters as described by argv.
1123
This function assumed that that UI layer is setup, that symbol deprecations
1124
are already applied, and that unicode decoding has already been performed on argv.
1126
install_bzr_command_hooks()
1127
return exception_to_return_code(run_bzr, argv)
1130
def run_bzr_catch_user_errors(argv):
1131
"""Run bzr and report user errors, but let internal errors propagate.
1133
This is used for the test suite, and might be useful for other programs
1134
that want to wrap the commandline interface.
1136
install_bzr_command_hooks()
1138
return run_bzr(argv)
1139
except Exception, e:
1140
if (isinstance(e, (OSError, IOError))
1141
or not getattr(e, 'internal_error', True)):
1142
trace.report_exception(sys.exc_info(), sys.stderr)
1148
class HelpCommandIndex(object):
1149
"""A index for bzr help that returns commands."""
1152
self.prefix = 'commands/'
1154
def get_topics(self, topic):
1155
"""Search for topic amongst commands.
1157
:param topic: A topic to search for.
1158
:return: A list which is either empty or contains a single
1161
if topic and topic.startswith(self.prefix):
1162
topic = topic[len(self.prefix):]
1164
cmd = _get_cmd_object(topic)
1171
class Provider(object):
1172
'''Generic class to be overriden by plugins'''
1174
def plugin_for_command(self, cmd_name):
1175
'''Takes a command and returns the information for that plugin
1177
:return: A dictionary with all the available information
1178
for the requested plugin
1180
raise NotImplementedError
1183
class ProvidersRegistry(registry.Registry):
1184
'''This registry exists to allow other providers to exist'''
1187
for key, provider in self.iteritems():
1190
command_providers_registry = ProvidersRegistry()
1730
1193
if __name__ == '__main__':
added
removed
bzrlib/commands.py
