71
164
def _unsquish_command_name(cmd):
72
assert cmd.startswith("cmd_")
73
165
return cmd[4:].replace('_','-')
76
def _parse_revision_str(revstr):
77
"""This handles a revision string -> revno.
79
This always returns a list. The list will have one element for
81
It supports integers directly, but everything else it
82
defers for passing to Branch.get_revision_info()
84
>>> _parse_revision_str('234')
86
>>> _parse_revision_str('234..567')
88
>>> _parse_revision_str('..')
90
>>> _parse_revision_str('..234')
92
>>> _parse_revision_str('234..')
94
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
96
>>> _parse_revision_str('234....789') # Error?
98
>>> _parse_revision_str('revid:test@other.com-234234')
99
['revid:test@other.com-234234']
100
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
101
['revid:test@other.com-234234', 'revid:test@other.com-234235']
102
>>> _parse_revision_str('revid:test@other.com-234234..23')
103
['revid:test@other.com-234234', 23]
104
>>> _parse_revision_str('date:2005-04-12')
106
>>> _parse_revision_str('date:2005-04-12 12:24:33')
107
['date:2005-04-12 12:24:33']
108
>>> _parse_revision_str('date:2005-04-12T12:24:33')
109
['date:2005-04-12T12:24:33']
110
>>> _parse_revision_str('date:2005-04-12,12:24:33')
111
['date:2005-04-12,12:24:33']
112
>>> _parse_revision_str('-5..23')
114
>>> _parse_revision_str('-5')
116
>>> _parse_revision_str('123a')
118
>>> _parse_revision_str('abc')
122
old_format_re = re.compile('\d*:\d*')
123
m = old_format_re.match(revstr)
125
warning('Colon separator for revision numbers is deprecated.'
128
for rev in revstr.split(':'):
130
revs.append(int(rev))
135
for x in revstr.split('..'):
146
def get_merge_type(typestring):
147
"""Attempt to find the merge class/factory associated with a string."""
148
from merge import merge_types
150
return merge_types[typestring][0]
152
templ = '%s%%7s: %%s' % (' '*12)
153
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
154
type_list = '\n'.join(lines)
155
msg = "No known merge type %s. Supported types are:\n%s" %\
156
(typestring, type_list)
157
raise BzrCommandError(msg)
160
def get_merge_type(typestring):
161
"""Attempt to find the merge class/factory associated with a string."""
162
from merge import merge_types
164
return merge_types[typestring][0]
166
templ = '%s%%7s: %%s' % (' '*12)
167
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
168
type_list = '\n'.join(lines)
169
msg = "No known merge type %s. Supported types are:\n%s" %\
170
(typestring, type_list)
171
raise BzrCommandError(msg)
175
def _get_cmd_dict(plugins_override=True):
177
for k, v in globals().iteritems():
178
if k.startswith("cmd_"):
179
d[_unsquish_command_name(k)] = v
180
# If we didn't load plugins, the plugin_cmds dict will be empty
182
d.update(plugin_cmds)
168
@deprecated_function(deprecated_in((2, 2, 0)))
169
def _builtin_commands():
170
"""Return a dict of {name: cmd_class} for builtin commands.
172
:deprecated: Use the builtin_command_registry registry instead
174
# return dict(name: cmd_class)
175
return dict(builtin_command_registry.items())
178
def _register_builtin_commands():
179
if builtin_command_registry.keys():
182
import bzrlib.builtins
183
for cmd_class in _scan_module_for_commands(bzrlib.builtins).values():
184
builtin_command_registry.register(cmd_class)
185
bzrlib.builtins._register_lazy_builtins()
188
def _scan_module_for_commands(module):
190
for name, obj in module.__dict__.iteritems():
191
if name.startswith("cmd_"):
192
real_name = _unsquish_command_name(name)
197
def _list_bzr_commands(names):
198
"""Find commands from bzr's core and plugins.
200
This is not the public interface, just the default hook called by all_command_names.
202
# to eliminate duplicates
203
names.update(builtin_command_names())
204
names.update(plugin_command_names())
208
def all_command_names():
209
"""Return a set of all command names."""
211
for hook in Command.hooks['list_commands']:
214
raise AssertionError(
215
'hook %s returned None' % Command.hooks.get_hook_name(hook))
219
def builtin_command_names():
220
"""Return list of builtin command names.
222
Use of all_command_names() is encouraged rather than builtin_command_names
223
and/or plugin_command_names.
225
return builtin_command_registry.keys()
228
def plugin_command_names():
229
"""Returns command names from commands registered by plugins."""
230
return plugin_cmds.keys()
233
def get_cmd_object(cmd_name, plugins_override=True):
234
"""Return the command object for a command.
237
If true, plugin commands can override builtins.
240
return _get_cmd_object(cmd_name, plugins_override)
242
raise errors.BzrCommandError('unknown command "%s"' % cmd_name)
245
def _get_cmd_object(cmd_name, plugins_override=True, check_missing=True):
246
"""Get a command object.
248
:param cmd_name: The name of the command.
249
:param plugins_override: Allow plugins to override builtins.
250
:param check_missing: Look up commands not found in the regular index via
251
the get_missing_command hook.
252
:return: A Command object instance
253
:raises KeyError: If no command is found.
255
# We want only 'ascii' command names, but the user may have typed
256
# in a Unicode name. In that case, they should just get a
257
# 'command not found' error later.
258
# In the future, we may actually support Unicode command names.
261
for hook in Command.hooks['get_command']:
262
cmd = hook(cmd, cmd_name)
263
if cmd is not None and not plugins_override and not cmd.plugin_name():
264
# We've found a non-plugin command, don't permit it to be
267
if cmd is None and check_missing:
268
for hook in Command.hooks['get_missing_command']:
275
# Allow plugins to extend commands
276
for hook in Command.hooks['extend_command']:
281
def _try_plugin_provider(cmd_name):
282
"""Probe for a plugin provider having cmd_name."""
284
plugin_metadata, provider = probe_for_provider(cmd_name)
285
raise errors.CommandAvailableInPlugin(cmd_name,
286
plugin_metadata, provider)
287
except errors.NoPluginAvailable:
291
def probe_for_provider(cmd_name):
292
"""Look for a provider for cmd_name.
294
:param cmd_name: The command name.
295
:return: plugin_metadata, provider for getting cmd_name.
296
:raises NoPluginAvailable: When no provider can supply the plugin.
298
# look for providers that provide this command but aren't installed
299
for provider in command_providers_registry:
301
return provider.plugin_for_command(cmd_name), provider
302
except errors.NoPluginAvailable:
304
raise errors.NoPluginAvailable(cmd_name)
307
def _get_bzr_command(cmd_or_None, cmd_name):
308
"""Get a command from bzr's core."""
310
cmd_class = builtin_command_registry.get(cmd_name)
184
d2 = plugin_cmds.copy()
190
def get_all_cmds(plugins_override=True):
191
"""Return canonical name and class for all registered commands."""
192
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
196
def get_cmd_class(cmd, plugins_override=True):
197
"""Return the canonical name and command class for a command.
199
cmd = str(cmd) # not unicode
201
# first look up this command under the specified name
202
cmds = _get_cmd_dict(plugins_override=plugins_override)
203
mutter("all commands: %r", cmds.keys())
318
def _get_external_command(cmd_or_None, cmd_name):
319
"""Lookup a command that is a shell script."""
320
# Only do external command lookups when no command is found so far.
321
if cmd_or_None is not None:
323
from bzrlib.externalcommand import ExternalCommand
324
cmd_obj = ExternalCommand.find_command(cmd_name)
329
def _get_plugin_command(cmd_or_None, cmd_name):
330
"""Get a command from bzr's plugins."""
205
return cmd, cmds[cmd]
332
return plugin_cmds.get(cmd_name)()
209
# look for any command which claims this as an alias
210
for cmdname, cmdclass in cmds.iteritems():
211
if cmd in cmdclass.aliases:
212
return cmdname, cmdclass
214
cmdclass = ExternalCommand.find_command(cmd)
218
raise BzrCommandError("unknown command %r" % cmd)
335
for key in plugin_cmds.keys():
336
info = plugin_cmds.get_info(key)
337
if cmd_name in info.aliases:
338
return plugin_cmds.get(key)()
221
342
class Command(object):
222
343
"""Base class for commands.
345
Commands are the heart of the command-line bzr interface.
347
The command object mostly handles the mapping of command-line
348
parameters into one or more bzrlib operations, and of the results
351
Commands normally don't have any state. All their arguments are
352
passed in to the run method. (Subclasses may take a different
353
policy if the behaviour of the instance needs to depend on e.g. a
354
shell plugin and not just its Python class.)
224
356
The docstring for an actual command should give a single-line
225
357
summary, then a complete description of the command. A grammar
226
358
description will be inserted.
361
Other accepted names for this command.
229
364
List of argument forms, marked with whether they are optional,
369
['to_location', 'from_branch?', 'file*']
371
'to_location' is required
372
'from_branch' is optional
373
'file' can be specified 0 or more times
233
List of options that may be given for this command.
376
List of options that may be given for this command. These can
377
be either strings, referring to globally-defined options,
378
or option objects. Retrieve through options().
236
If true, this command isn't advertised.
381
If true, this command isn't advertised. This is typically
382
for commands intended for expert users.
385
Command objects will get a 'outf' attribute, which has been
386
setup to properly handle encoding of unicode strings.
387
encoding_type determines what will happen when characters cannot
389
strict - abort if we cannot decode
390
replace - put in a bogus character (typically '?')
391
exact - do not encode sys.stdout
393
NOTE: by default on Windows, sys.stdout is opened as a text
394
stream, therefore LF line-endings are converted to CRLF.
395
When a command uses encoding_type = 'exact', then
396
sys.stdout is forced to be a binary stream, and line-endings
399
:cvar hooks: An instance of CommandHooks.
241
403
takes_options = []
404
encoding_type = 'strict'
245
def __init__(self, options, arguments):
246
"""Construct and run the command.
248
Sets self.status to the return value of run()."""
249
assert isinstance(options, dict)
250
assert isinstance(arguments, dict)
251
cmdargs = options.copy()
252
cmdargs.update(arguments)
409
"""Construct an instance of this command."""
253
410
if self.__doc__ == Command.__doc__:
254
from warnings import warn
255
411
warn("No help message set for %r" % self)
256
self.status = self.run(**cmdargs)
257
if self.status is None:
412
# List of standard options directly supported
413
self.supported_std_options = []
416
def add_cleanup(self, cleanup_func, *args, **kwargs):
417
"""Register a function to call after self.run returns or raises.
419
Functions will be called in LIFO order.
421
self._operation.add_cleanup(cleanup_func, *args, **kwargs)
423
def cleanup_now(self):
424
"""Execute and empty pending cleanup functions immediately.
426
After cleanup_now all registered cleanups are forgotten. add_cleanup
427
may be called again after cleanup_now; these cleanups will be called
428
after self.run returns or raises (or when cleanup_now is next called).
430
This is useful for releasing expensive or contentious resources (such
431
as write locks) before doing further work that does not require those
432
resources (such as writing results to self.outf). Note though, that
433
as it releases all resources, this may release locks that the command
434
wants to hold, so use should be done with care.
436
self._operation.cleanup_now()
438
@deprecated_method(deprecated_in((2, 1, 0)))
439
def _maybe_expand_globs(self, file_list):
440
"""Glob expand file_list if the platform does not do that itself.
442
Not used anymore, now that the bzr command-line parser globs on
445
:return: A possibly empty list of unicode paths.
447
Introduced in bzrlib 0.18.
452
"""Return single-line grammar for this command.
454
Only describes arguments, not options.
456
s = 'bzr ' + self.name() + ' '
457
for aname in self.takes_args:
458
aname = aname.upper()
459
if aname[-1] in ['$', '+']:
460
aname = aname[:-1] + '...'
461
elif aname[-1] == '?':
462
aname = '[' + aname[:-1] + ']'
463
elif aname[-1] == '*':
464
aname = '[' + aname[:-1] + '...]'
466
s = s[:-1] # remove last space
469
def get_help_text(self, additional_see_also=None, plain=True,
470
see_also_as_links=False, verbose=True):
471
"""Return a text string with help for this command.
473
:param additional_see_also: Additional help topics to be
475
:param plain: if False, raw help (reStructuredText) is
476
returned instead of plain text.
477
:param see_also_as_links: if True, convert items in 'See also'
478
list to internal links (used by bzr_man rstx generator)
479
:param verbose: if True, display the full help, otherwise
480
leave out the descriptive sections and just display
481
usage help (e.g. Purpose, Usage, Options) with a
482
message explaining how to obtain full help.
486
raise NotImplementedError("sorry, no detailed help yet for %r" % self.name())
488
# Extract the summary (purpose) and sections out from the text
489
purpose,sections,order = self._get_help_parts(doc)
491
# If a custom usage section was provided, use it
492
if sections.has_key('Usage'):
493
usage = sections.pop('Usage')
495
usage = self._usage()
497
# The header is the purpose and usage
499
result += ':Purpose: %s\n' % purpose
500
if usage.find('\n') >= 0:
501
result += ':Usage:\n%s\n' % usage
503
result += ':Usage: %s\n' % usage
508
# XXX: optparse implicitly rewraps the help, and not always perfectly,
509
# so we get <https://bugs.launchpad.net/bzr/+bug/249908>. -- mbp
511
options = option.get_optparser(self.options()).format_option_help()
512
# XXX: According to the spec, ReST option lists actually don't support
513
# options like --1.9 so that causes syntax errors (in Sphinx at least).
514
# As that pattern always appears in the commands that break, we trap
515
# on that and then format that block of 'format' options as a literal
517
if not plain and options.find(' --1.9 ') != -1:
518
options = options.replace(' format:\n', ' format::\n\n', 1)
519
if options.startswith('Options:'):
520
result += ':' + options
521
elif options.startswith('options:'):
522
# Python 2.4 version of optparse
523
result += ':Options:' + options[len('options:'):]
529
# Add the description, indenting it 2 spaces
530
# to match the indentation of the options
531
if sections.has_key(None):
532
text = sections.pop(None)
533
text = '\n '.join(text.splitlines())
534
result += ':%s:\n %s\n\n' % ('Description',text)
536
# Add the custom sections (e.g. Examples). Note that there's no need
537
# to indent these as they must be indented already in the source.
540
if sections.has_key(label):
541
result += ':%s:\n%s\n' % (label,sections[label])
544
result += ("See bzr help %s for more details and examples.\n\n"
547
# Add the aliases, source (plug-in) and see also links, if any
549
result += ':Aliases: '
550
result += ', '.join(self.aliases) + '\n'
551
plugin_name = self.plugin_name()
552
if plugin_name is not None:
553
result += ':From: plugin "%s"\n' % plugin_name
554
see_also = self.get_see_also(additional_see_also)
556
if not plain and see_also_as_links:
558
for item in see_also:
560
# topics doesn't have an independent section
561
# so don't create a real link
562
see_also_links.append(item)
564
# Use a Sphinx link for this entry
565
link_text = ":doc:`%s <%s-help>`" % (item, item)
566
see_also_links.append(link_text)
567
see_also = see_also_links
568
result += ':See also: '
569
result += ', '.join(see_also) + '\n'
571
# If this will be rendered as plain text, convert it
573
import bzrlib.help_topics
574
result = bzrlib.help_topics.help_as_plain_text(result)
578
def _get_help_parts(text):
579
"""Split help text into a summary and named sections.
581
:return: (summary,sections,order) where summary is the top line and
582
sections is a dictionary of the rest indexed by section name.
583
order is the order the section appear in the text.
584
A section starts with a heading line of the form ":xxx:".
585
Indented text on following lines is the section value.
586
All text found outside a named section is assigned to the
587
default section which is given the key of None.
589
def save_section(sections, order, label, section):
591
if sections.has_key(label):
592
sections[label] += '\n' + section
595
sections[label] = section
597
lines = text.rstrip().splitlines()
598
summary = lines.pop(0)
601
label,section = None,''
603
if line.startswith(':') and line.endswith(':') and len(line) > 2:
604
save_section(sections, order, label, section)
605
label,section = line[1:-1],''
606
elif (label is not None) and len(line) > 1 and not line[0].isspace():
607
save_section(sections, order, label, section)
608
label,section = None,line
611
section += '\n' + line
614
save_section(sections, order, label, section)
615
return summary, sections, order
617
def get_help_topic(self):
618
"""Return the commands help topic - its name."""
621
def get_see_also(self, additional_terms=None):
622
"""Return a list of help topics that are related to this command.
624
The list is derived from the content of the _see_also attribute. Any
625
duplicates are removed and the result is in lexical order.
626
:param additional_terms: Additional help topics to cross-reference.
627
:return: A list of help topics.
629
see_also = set(getattr(self, '_see_also', []))
631
see_also.update(additional_terms)
632
return sorted(see_also)
635
"""Return dict of valid options for this command.
637
Maps from long option name to option object."""
638
r = Option.STD_OPTIONS.copy()
640
for o in self.takes_options:
641
if isinstance(o, basestring):
642
o = option.Option.OPTIONS[o]
644
if o.name in std_names:
645
self.supported_std_options.append(o.name)
648
def _setup_outf(self):
649
"""Return a file linked to stdout, which has proper encoding."""
650
self.outf = ui.ui_factory.make_output_stream(
651
encoding_type=self.encoding_type)
653
def run_argv_aliases(self, argv, alias_argv=None):
654
"""Parse the command line and run with extra aliases in alias_argv."""
655
args, opts = parse_args(self, argv, alias_argv)
657
# Process the standard options
658
if 'help' in opts: # e.g. bzr add --help
659
sys.stdout.write(self.get_help_text())
661
if 'usage' in opts: # e.g. bzr add --usage
662
sys.stdout.write(self.get_help_text(verbose=False))
664
trace.set_verbosity_level(option._verbosity_level)
665
if 'verbose' in self.supported_std_options:
666
opts['verbose'] = trace.is_verbose()
667
elif opts.has_key('verbose'):
669
if 'quiet' in self.supported_std_options:
670
opts['quiet'] = trace.is_quiet()
671
elif opts.has_key('quiet'):
674
# mix arguments and options into one dictionary
675
cmdargs = _match_argform(self.name(), self.takes_args, args)
677
for k, v in opts.items():
678
cmdopts[k.replace('-', '_')] = v
680
all_cmd_args = cmdargs.copy()
681
all_cmd_args.update(cmdopts)
685
return self.run(**all_cmd_args)
687
def _setup_run(self):
688
"""Wrap the defined run method on self with a cleanup.
690
This is called by __init__ to make the Command be able to be run
691
by just calling run(), as it could be before cleanups were added.
693
If a different form of cleanups are in use by your Command subclass,
694
you can override this method.
697
def run(*args, **kwargs):
698
self._operation = cleanup.OperationWithCleanups(class_run)
700
return self._operation.run_simple(*args, **kwargs)
705
@deprecated_method(deprecated_in((2, 2, 0)))
706
def run_direct(self, *args, **kwargs):
707
"""Deprecated thunk from bzrlib 2.1."""
708
return self.run(*args, **kwargs)
262
"""Override this in sub-classes.
711
"""Actually run the command.
264
713
This is invoked with the options and arguments bound to
265
714
keyword parameters.
267
Return 0 or None if the command was successful, or a shell
716
Return 0 or None if the command was successful, or a non-zero
717
shell error code if not. It's OK for this method to allow
718
an exception to raise up.
720
This method is automatically wrapped by Command.__init__ with a
721
cleanup operation, stored as self._operation. This can be used
722
via self.add_cleanup to perform automatic cleanups at the end of
725
The argument for run are assembled by introspection. So for instance,
726
if your command takes an argument files, you would declare::
728
def run(self, files=None):
273
class ExternalCommand(Command):
274
"""Class to wrap external commands.
276
We cheat a little here, when get_cmd_class() calls us we actually
277
give it back an object we construct that has the appropriate path,
278
help, options etc for the specified command.
280
When run_bzr() tries to instantiate that 'class' it gets caught by
281
the __call__ method, which we override to call the Command.__init__
282
method. That then calls our run method which is pretty straight
285
The only wrinkle is that we have to map bzr's dictionary of options
286
and arguments back into command line options and arguments for the
290
def find_command(cls, cmd):
292
bzrpath = os.environ.get('BZRPATH', '')
294
for dir in bzrpath.split(os.pathsep):
295
path = os.path.join(dir, cmd)
296
if os.path.isfile(path):
297
return ExternalCommand(path)
301
find_command = classmethod(find_command)
303
def __init__(self, path):
306
pipe = os.popen('%s --bzr-usage' % path, 'r')
307
self.takes_options = pipe.readline().split()
309
for opt in self.takes_options:
310
if not opt in OPTIONS:
311
raise BzrError("Unknown option '%s' returned by external command %s"
314
# TODO: Is there any way to check takes_args is valid here?
315
self.takes_args = pipe.readline().split()
317
if pipe.close() is not None:
318
raise BzrError("Failed funning '%s --bzr-usage'" % path)
320
pipe = os.popen('%s --bzr-help' % path, 'r')
321
self.__doc__ = pipe.read()
322
if pipe.close() is not None:
323
raise BzrError("Failed funning '%s --bzr-help'" % path)
325
def __call__(self, options, arguments):
326
Command.__init__(self, options, arguments)
329
def run(self, **kargs):
336
optname = name.replace('_','-')
338
if OPTIONS.has_key(optname):
340
opts.append('--%s' % optname)
341
if value is not None and value is not True:
342
opts.append(str(value))
344
# it's an arg, or arg list
345
if type(value) is not list:
351
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
355
class cmd_status(Command):
356
"""Display status summary.
358
This reports on versioned and unknown files, reporting them
359
grouped by state. Possible states are:
362
Versioned in the working copy but not in the previous revision.
365
Versioned in the previous revision but removed or deleted
369
Path of this file changed from the previous revision;
370
the text may also have changed. This includes files whose
371
parent directory was renamed.
374
Text has changed since the previous revision.
377
Nothing about this file has changed since the previous revision.
378
Only shown with --all.
381
Not versioned and not matching an ignore pattern.
383
To see ignored files use 'bzr ignored'. For details in the
384
changes to file texts, use 'bzr diff'.
386
If no arguments are specified, the status of the entire working
387
directory is shown. Otherwise, only the status of the specified
388
files or directories is reported. If a directory is given, status
389
is reported for everything inside that directory.
391
If a revision is specified, the changes since that revision are shown.
393
takes_args = ['file*']
394
takes_options = ['all', 'show-ids', 'revision']
395
aliases = ['st', 'stat']
397
def run(self, all=False, show_ids=False, file_list=None):
399
b = find_branch(file_list[0])
400
file_list = [b.relpath(x) for x in file_list]
401
# special case: only one path was given and it's the root
403
if file_list == ['']:
408
from bzrlib.status import show_status
409
show_status(b, show_unchanged=all, show_ids=show_ids,
410
specific_files=file_list)
413
class cmd_cat_revision(Command):
414
"""Write out metadata for a revision."""
417
takes_args = ['revision_id']
419
def run(self, revision_id):
420
from bzrlib.xml import pack_xml
421
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
424
class cmd_revno(Command):
425
"""Show current revision number.
427
This is equal to the number of revisions on this branch."""
429
print find_branch('.').revno()
431
class cmd_revision_info(Command):
432
"""Show revision number and revision id for a given revision identifier.
435
takes_args = ['revision_info*']
436
takes_options = ['revision']
437
def run(self, revision=None, revision_info_list=None):
438
from bzrlib.branch import find_branch
441
if revision is not None:
442
revs.extend(revision)
443
if revision_info_list is not None:
444
revs.extend(revision_info_list)
446
raise BzrCommandError('You must supply a revision identifier')
451
print '%4d %s' % b.get_revision_info(rev)
454
class cmd_add(Command):
455
"""Add specified files or directories.
457
In non-recursive mode, all the named items are added, regardless
458
of whether they were previously ignored. A warning is given if
459
any of the named files are already versioned.
461
In recursive mode (the default), files are treated the same way
462
but the behaviour for directories is different. Directories that
463
are already versioned do not give a warning. All directories,
464
whether already versioned or not, are searched for files or
465
subdirectories that are neither versioned or ignored, and these
466
are added. This search proceeds recursively into versioned
467
directories. If no names are given '.' is assumed.
469
Therefore simply saying 'bzr add' will version all files that
470
are currently unknown.
472
TODO: Perhaps adding a file whose directly is not versioned should
473
recursively add that parent, rather than giving an error?
475
takes_args = ['file*']
476
takes_options = ['verbose', 'no-recurse']
478
def run(self, file_list, verbose=False, no_recurse=False):
479
from bzrlib.add import smart_add, _PrintAddCallback
480
recurse = not no_recurse
481
smart_add(file_list, verbose, not no_recurse,
482
callback=_PrintAddCallback)
486
class cmd_mkdir(Command):
487
"""Create a new versioned directory.
489
This is equivalent to creating the directory and then adding it.
491
takes_args = ['dir+']
493
def run(self, dir_list):
504
class cmd_relpath(Command):
505
"""Show path of a file relative to root"""
506
takes_args = ['filename']
509
def run(self, filename):
510
print find_branch(filename).relpath(filename)
514
class cmd_inventory(Command):
515
"""Show inventory of the current working copy or a revision."""
516
takes_options = ['revision', 'show-ids']
518
def run(self, revision=None, show_ids=False):
521
inv = b.read_working_inventory()
523
if len(revision) > 1:
524
raise BzrCommandError('bzr inventory --revision takes'
525
' exactly one revision identifier')
526
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
528
for path, entry in inv.entries():
530
print '%-50s %s' % (path, entry.file_id)
535
class cmd_move(Command):
536
"""Move files to a different directory.
541
The destination must be a versioned directory in the same branch.
543
takes_args = ['source$', 'dest']
544
def run(self, source_list, dest):
547
# TODO: glob expansion on windows?
548
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
551
class cmd_rename(Command):
552
"""Change the name of an entry.
555
bzr rename frob.c frobber.c
556
bzr rename src/frob.c lib/frob.c
558
It is an error if the destination name exists.
560
See also the 'move' command, which moves files into a different
561
directory without changing their name.
563
TODO: Some way to rename multiple files without invoking bzr for each
565
takes_args = ['from_name', 'to_name']
567
def run(self, from_name, to_name):
569
b.rename_one(b.relpath(from_name), b.relpath(to_name))
573
class cmd_mv(Command):
574
"""Move or rename a file.
577
bzr mv OLDNAME NEWNAME
578
bzr mv SOURCE... DESTINATION
580
If the last argument is a versioned directory, all the other names
581
are moved into it. Otherwise, there must be exactly two arguments
582
and the file is changed to a new name, which must not already exist.
584
Files cannot be moved between branches.
586
takes_args = ['names*']
587
def run(self, names_list):
588
if len(names_list) < 2:
589
raise BzrCommandError("missing file argument")
590
b = find_branch(names_list[0])
592
rel_names = [b.relpath(x) for x in names_list]
594
if os.path.isdir(names_list[-1]):
595
# move into existing directory
596
for pair in b.move(rel_names[:-1], rel_names[-1]):
597
print "%s => %s" % pair
599
if len(names_list) != 2:
600
raise BzrCommandError('to mv multiple files the destination '
601
'must be a versioned directory')
602
for pair in b.move(rel_names[0], rel_names[1]):
603
print "%s => %s" % pair
608
class cmd_pull(Command):
609
"""Pull any changes from another branch into the current one.
611
If the location is omitted, the last-used location will be used.
612
Both the revision history and the working directory will be
615
This command only works on branches that have not diverged. Branches are
616
considered diverged if both branches have had commits without first
617
pulling from the other.
619
If branches have diverged, you can use 'bzr merge' to pull the text changes
620
from one into the other.
622
takes_args = ['location?']
624
def run(self, location=None):
625
from bzrlib.merge import merge
627
from shutil import rmtree
629
from bzrlib.branch import pull_loc
631
br_to = find_branch('.')
634
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
636
if e.errno != errno.ENOENT:
639
if stored_loc is None:
640
raise BzrCommandError("No pull location known or specified.")
642
print "Using last location: %s" % stored_loc
643
location = stored_loc
644
cache_root = tempfile.mkdtemp()
645
from bzrlib.branch import DivergedBranches
646
br_from = find_branch(location)
647
location = pull_loc(br_from)
648
old_revno = br_to.revno()
650
from branch import find_cached_branch, DivergedBranches
651
br_from = find_cached_branch(location, cache_root)
652
location = pull_loc(br_from)
653
old_revno = br_to.revno()
655
br_to.update_revisions(br_from)
656
except DivergedBranches:
657
raise BzrCommandError("These branches have diverged."
660
merge(('.', -1), ('.', old_revno), check_clean=False)
661
if location != stored_loc:
662
br_to.controlfile("x-pull", "wb").write(location + "\n")
668
class cmd_branch(Command):
669
"""Create a new copy of a branch.
671
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
672
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
674
To retrieve the branch as of a particular revision, supply the --revision
675
parameter, as in "branch foo/bar -r 5".
677
takes_args = ['from_location', 'to_location?']
678
takes_options = ['revision']
679
aliases = ['get', 'clone']
681
def run(self, from_location, to_location=None, revision=None):
682
from bzrlib.branch import copy_branch, find_cached_branch
685
from shutil import rmtree
686
cache_root = tempfile.mkdtemp()
690
elif len(revision) > 1:
691
raise BzrCommandError(
692
'bzr branch --revision takes exactly 1 revision value')
694
br_from = find_cached_branch(from_location, cache_root)
696
if e.errno == errno.ENOENT:
697
raise BzrCommandError('Source location "%s" does not'
698
' exist.' % to_location)
701
if to_location is None:
702
to_location = os.path.basename(from_location.rstrip("/\\"))
704
os.mkdir(to_location)
706
if e.errno == errno.EEXIST:
707
raise BzrCommandError('Target directory "%s" already'
708
' exists.' % to_location)
709
if e.errno == errno.ENOENT:
710
raise BzrCommandError('Parent of "%s" does not exist.' %
715
copy_branch(br_from, to_location, revision[0])
716
except bzrlib.errors.NoSuchRevision:
718
msg = "The branch %s has no revision %d." % (from_location, revision[0])
719
raise BzrCommandError(msg)
724
class cmd_renames(Command):
725
"""Show list of renamed files.
727
TODO: Option to show renames between two historical versions.
729
TODO: Only show renames under dir, rather than in the whole branch.
731
takes_args = ['dir?']
733
def run(self, dir='.'):
735
old_inv = b.basis_tree().inventory
736
new_inv = b.read_working_inventory()
738
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
740
for old_name, new_name in renames:
741
print "%s => %s" % (old_name, new_name)
744
class cmd_info(Command):
745
"""Show statistical information about a branch."""
746
takes_args = ['branch?']
748
def run(self, branch=None):
751
b = find_branch(branch)
755
class cmd_remove(Command):
756
"""Make a file unversioned.
758
This makes bzr stop tracking changes to a versioned file. It does
759
not delete the working copy.
761
takes_args = ['file+']
762
takes_options = ['verbose']
764
def run(self, file_list, verbose=False):
765
b = find_branch(file_list[0])
766
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
769
class cmd_file_id(Command):
770
"""Print file_id of a particular file or directory.
772
The file_id is assigned when the file is first added and remains the
773
same through all revisions where the file exists, even when it is
777
takes_args = ['filename']
778
def run(self, filename):
779
b = find_branch(filename)
780
i = b.inventory.path2id(b.relpath(filename))
782
raise BzrError("%r is not a versioned file" % filename)
787
class cmd_file_path(Command):
788
"""Print path of file_ids to a file or directory.
790
This prints one line for each directory down to the target,
791
starting at the branch root."""
793
takes_args = ['filename']
794
def run(self, filename):
795
b = find_branch(filename)
797
fid = inv.path2id(b.relpath(filename))
799
raise BzrError("%r is not a versioned file" % filename)
800
for fip in inv.get_idpath(fid):
804
class cmd_revision_history(Command):
805
"""Display list of revision ids on this branch."""
808
for patchid in find_branch('.').revision_history():
812
class cmd_directories(Command):
813
"""Display list of versioned directories in this branch."""
815
for name, ie in find_branch('.').read_working_inventory().directories():
822
class cmd_init(Command):
823
"""Make a directory into a versioned branch.
825
Use this to create an empty branch, or before importing an
828
Recipe for importing a tree of files:
833
bzr commit -m 'imported project'
836
from bzrlib.branch import Branch
837
Branch('.', init=True)
840
class cmd_diff(Command):
841
"""Show differences in working tree.
843
If files are listed, only the changes in those files are listed.
844
Otherwise, all changes for the tree are listed.
846
TODO: Allow diff across branches.
848
TODO: Option to use external diff command; could be GNU diff, wdiff,
851
TODO: Python difflib is not exactly the same as unidiff; should
852
either fix it up or prefer to use an external diff.
854
TODO: If a directory is given, diff everything under that.
856
TODO: Selected-file diff is inefficient and doesn't show you
859
TODO: This probably handles non-Unix newlines poorly.
867
takes_args = ['file*']
868
takes_options = ['revision', 'diff-options']
869
aliases = ['di', 'dif']
871
def run(self, revision=None, file_list=None, diff_options=None):
872
from bzrlib.diff import show_diff
875
b = find_branch(file_list[0])
876
file_list = [b.relpath(f) for f in file_list]
877
if file_list == ['']:
878
# just pointing to top-of-tree
883
if revision is not None:
884
if len(revision) == 1:
885
show_diff(b, revision[0], specific_files=file_list,
886
external_diff_options=diff_options)
887
elif len(revision) == 2:
888
show_diff(b, revision[0], specific_files=file_list,
889
external_diff_options=diff_options,
890
revision2=revision[1])
892
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
894
show_diff(b, None, specific_files=file_list,
895
external_diff_options=diff_options)
900
class cmd_deleted(Command):
901
"""List files deleted in the working tree.
903
TODO: Show files deleted since a previous revision, or between two revisions.
905
def run(self, show_ids=False):
908
new = b.working_tree()
910
## TODO: Much more efficient way to do this: read in new
911
## directories with readdir, rather than stating each one. Same
912
## level of effort but possibly much less IO. (Or possibly not,
913
## if the directories are very large...)
915
for path, ie in old.inventory.iter_entries():
916
if not new.has_id(ie.file_id):
918
print '%-50s %s' % (path, ie.file_id)
923
class cmd_modified(Command):
924
"""List files modified in working tree."""
927
from bzrlib.delta import compare_trees
930
td = compare_trees(b.basis_tree(), b.working_tree())
932
for path, id, kind in td.modified:
937
class cmd_added(Command):
938
"""List files added in working tree."""
942
wt = b.working_tree()
943
basis_inv = b.basis_tree().inventory
946
if file_id in basis_inv:
948
path = inv.id2path(file_id)
949
if not os.access(b.abspath(path), os.F_OK):
955
class cmd_root(Command):
956
"""Show the tree root directory.
958
The root is the nearest enclosing directory with a .bzr control
960
takes_args = ['filename?']
961
def run(self, filename=None):
962
"""Print the branch root."""
963
b = find_branch(filename)
964
print getattr(b, 'base', None) or getattr(b, 'baseurl')
967
class cmd_log(Command):
968
"""Show log of this branch.
970
To request a range of logs, you can use the command -r begin:end
971
-r revision requests a specific revision, -r :end or -r begin: are
974
--message allows you to give a regular expression, which will be evaluated
975
so that only matching entries will be displayed.
977
TODO: Make --revision support uuid: and hash: [future tag:] notation.
981
takes_args = ['filename?']
982
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
983
'long', 'message', 'short',]
985
def run(self, filename=None, timezone='original',
993
from bzrlib.branch import find_branch
994
from bzrlib.log import log_formatter, show_log
997
direction = (forward and 'forward') or 'reverse'
1000
b = find_branch(filename)
1001
fp = b.relpath(filename)
1003
file_id = b.read_working_inventory().path2id(fp)
1005
file_id = None # points to branch root
1007
b = find_branch('.')
1010
if revision is None:
1013
elif len(revision) == 1:
1014
rev1 = rev2 = b.get_revision_info(revision[0])[0]
1015
elif len(revision) == 2:
1016
rev1 = b.get_revision_info(revision[0])[0]
1017
rev2 = b.get_revision_info(revision[1])[0]
1019
raise BzrCommandError('bzr log --revision takes one or two values.')
1026
mutter('encoding log as %r' % bzrlib.user_encoding)
1028
# use 'replace' so that we don't abort if trying to write out
1029
# in e.g. the default C locale.
1030
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1035
log_format = 'short'
1036
lf = log_formatter(log_format,
1039
show_timezone=timezone)
1045
direction=direction,
1046
start_revision=rev1,
1052
class cmd_touching_revisions(Command):
1053
"""Return revision-ids which affected a particular file.
1055
A more user-friendly interface is "bzr log FILE"."""
1057
takes_args = ["filename"]
1058
def run(self, filename):
1059
b = find_branch(filename)
1060
inv = b.read_working_inventory()
1061
file_id = inv.path2id(b.relpath(filename))
1062
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1063
print "%6d %s" % (revno, what)
1066
class cmd_ls(Command):
1067
"""List files in a tree.
1069
TODO: Take a revision or remote path and list that tree instead.
1072
def run(self, revision=None, verbose=False):
1073
b = find_branch('.')
1074
if revision == None:
1075
tree = b.working_tree()
1077
tree = b.revision_tree(b.lookup_revision(revision))
1079
for fp, fc, kind, fid in tree.list_files():
1081
if kind == 'directory':
1083
elif kind == 'file':
1088
print '%-8s %s%s' % (fc, fp, kindch)
1094
class cmd_unknowns(Command):
1095
"""List unknown files."""
1097
from bzrlib.osutils import quotefn
1098
for f in find_branch('.').unknowns():
1103
class cmd_ignore(Command):
1104
"""Ignore a command or pattern.
1106
To remove patterns from the ignore list, edit the .bzrignore file.
1108
If the pattern contains a slash, it is compared to the whole path
1109
from the branch root. Otherwise, it is comapred to only the last
1110
component of the path.
1112
Ignore patterns are case-insensitive on case-insensitive systems.
1114
Note: wildcards must be quoted from the shell on Unix.
1117
bzr ignore ./Makefile
1118
bzr ignore '*.class'
1120
takes_args = ['name_pattern']
1122
def run(self, name_pattern):
1123
from bzrlib.atomicfile import AtomicFile
1126
b = find_branch('.')
1127
ifn = b.abspath('.bzrignore')
1129
if os.path.exists(ifn):
1132
igns = f.read().decode('utf-8')
1138
# TODO: If the file already uses crlf-style termination, maybe
1139
# we should use that for the newly added lines?
1141
if igns and igns[-1] != '\n':
1143
igns += name_pattern + '\n'
1146
f = AtomicFile(ifn, 'wt')
1147
f.write(igns.encode('utf-8'))
1152
inv = b.working_tree().inventory
1153
if inv.path2id('.bzrignore'):
1154
mutter('.bzrignore is already versioned')
1156
mutter('need to make new .bzrignore file versioned')
1157
b.add(['.bzrignore'])
1161
class cmd_ignored(Command):
1162
"""List ignored files and the patterns that matched them.
1164
See also: bzr ignore"""
1166
tree = find_branch('.').working_tree()
1167
for path, file_class, kind, file_id in tree.list_files():
1168
if file_class != 'I':
1170
## XXX: Slightly inefficient since this was already calculated
1171
pat = tree.is_ignored(path)
1172
print '%-50s %s' % (path, pat)
1175
class cmd_lookup_revision(Command):
1176
"""Lookup the revision-id from a revision-number
1179
bzr lookup-revision 33
1182
takes_args = ['revno']
1184
def run(self, revno):
1188
raise BzrCommandError("not a valid revision-number: %r" % revno)
1190
print find_branch('.').lookup_revision(revno)
1193
class cmd_export(Command):
1194
"""Export past revision to destination directory.
1196
If no revision is specified this exports the last committed revision.
1198
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1199
given, try to find the format with the extension. If no extension
1200
is found exports to a directory (equivalent to --format=dir).
1202
Root may be the top directory for tar, tgz and tbz2 formats. If none
1203
is given, the top directory will be the root name of the file."""
1204
# TODO: list known exporters
1205
takes_args = ['dest']
1206
takes_options = ['revision', 'format', 'root']
1207
def run(self, dest, revision=None, format=None, root=None):
1209
b = find_branch('.')
1210
if revision is None:
1211
rev_id = b.last_patch()
1213
if len(revision) != 1:
1214
raise BzrError('bzr export --revision takes exactly 1 argument')
1215
revno, rev_id = b.get_revision_info(revision[0])
1216
t = b.revision_tree(rev_id)
1217
root, ext = os.path.splitext(dest)
1219
if ext in (".tar",):
1221
elif ext in (".gz", ".tgz"):
1223
elif ext in (".bz2", ".tbz2"):
1227
t.export(dest, format, root)
1230
class cmd_cat(Command):
1231
"""Write a file's text from a previous revision."""
1233
takes_options = ['revision']
1234
takes_args = ['filename']
1236
def run(self, filename, revision=None):
1237
if revision == None:
1238
raise BzrCommandError("bzr cat requires a revision number")
1239
elif len(revision) != 1:
1240
raise BzrCommandError("bzr cat --revision takes exactly one number")
1241
b = find_branch('.')
1242
b.print_file(b.relpath(filename), revision[0])
1245
class cmd_local_time_offset(Command):
1246
"""Show the offset in seconds from GMT to local time."""
1249
print bzrlib.osutils.local_time_offset()
1253
class cmd_commit(Command):
1254
"""Commit changes into a new revision.
1256
If no arguments are given, the entire tree is committed.
1258
If selected files are specified, only changes to those files are
1259
committed. If a directory is specified then the directory and everything
1260
within it is committed.
1262
A selected-file commit may fail in some cases where the committed
1263
tree would be invalid, such as trying to commit a file in a
1264
newly-added directory that is not itself committed.
1266
TODO: Run hooks on tree to-be-committed, and after commit.
1268
TODO: Strict commit that fails if there are unknown or deleted files.
1270
takes_args = ['selected*']
1271
takes_options = ['message', 'file', 'verbose', 'unchanged']
1272
aliases = ['ci', 'checkin']
1274
# TODO: Give better message for -s, --summary, used by tla people
1276
def run(self, message=None, file=None, verbose=True, selected_list=None,
1278
from bzrlib.errors import PointlessCommit
1279
from bzrlib.osutils import get_text_message
1281
## Warning: shadows builtin file()
1282
if not message and not file:
1283
# FIXME: Ugly; change status code to send to a provided function?
1287
catcher = cStringIO.StringIO()
1288
sys.stdout = catcher
1289
cmd_status({"file_list":selected_list}, {})
1290
info = catcher.getvalue()
1292
message = get_text_message(info)
1295
raise BzrCommandError("please specify a commit message",
1296
["use either --message or --file"])
1297
elif message and file:
1298
raise BzrCommandError("please specify either --message or --file")
1302
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1304
b = find_branch('.')
1306
selected_list = [b.relpath(s) for s in selected_list]
1309
b.commit(message, verbose=verbose,
1310
specific_files=selected_list,
1311
allow_pointless=unchanged)
1312
except PointlessCommit:
1313
# FIXME: This should really happen before the file is read in;
1314
# perhaps prepare the commit; get the message; then actually commit
1315
raise BzrCommandError("no changes to commit",
1316
["use --unchanged to commit anyhow"])
1319
class cmd_check(Command):
1320
"""Validate consistency of branch history.
1322
This command checks various invariants about the branch storage to
1323
detect data corruption or bzr bugs.
1325
If given the --update flag, it will update some optional fields
1326
to help ensure data consistency.
1328
takes_args = ['dir?']
1330
def run(self, dir='.'):
1331
from bzrlib.check import check
1333
check(find_branch(dir))
1336
class cmd_scan_cache(Command):
1339
from bzrlib.hashcache import HashCache
1346
print '%6d stats' % c.stat_count
1347
print '%6d in hashcache' % len(c._cache)
1348
print '%6d files removed from cache' % c.removed_count
1349
print '%6d hashes updated' % c.update_count
1350
print '%6d files changed too recently to cache' % c.danger_count
1357
class cmd_upgrade(Command):
1358
"""Upgrade branch storage to current format.
1360
The check command or bzr developers may sometimes advise you to run
1363
takes_args = ['dir?']
1365
def run(self, dir='.'):
1366
from bzrlib.upgrade import upgrade
1367
upgrade(find_branch(dir))
1371
class cmd_whoami(Command):
1372
"""Show bzr user id."""
1373
takes_options = ['email']
1375
def run(self, email=False):
1377
b = bzrlib.branch.find_branch('.')
1382
print bzrlib.osutils.user_email(b)
1384
print bzrlib.osutils.username(b)
1387
class cmd_selftest(Command):
1388
"""Run internal test suite"""
1390
takes_options = ['verbose', 'pattern']
1391
def run(self, verbose=False, pattern=".*"):
1393
from bzrlib.selftest import selftest
1394
# we don't want progress meters from the tests to go to the
1395
# real output; and we don't want log messages cluttering up
1397
save_ui = bzrlib.ui.ui_factory
1398
bzrlib.trace.info('running tests...')
1400
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1401
result = selftest(verbose=verbose, pattern=pattern)
1403
bzrlib.trace.info('tests passed')
1405
bzrlib.trace.info('tests failed')
1406
return int(not result)
1408
bzrlib.ui.ui_factory = save_ui
1411
class cmd_version(Command):
1412
"""Show version of bzr."""
1417
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1418
# is bzrlib itself in a branch?
1419
bzrrev = bzrlib.get_bzr_revision()
1421
print " (bzr checkout, revision %d {%s})" % bzrrev
1422
print bzrlib.__copyright__
1423
print "http://bazaar-ng.org/"
1425
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1426
print "you may use, modify and redistribute it under the terms of the GNU"
1427
print "General Public License version 2 or later."
1430
class cmd_rocks(Command):
1431
"""Statement of optimism."""
1434
print "it sure does!"
1436
def parse_spec(spec):
1438
>>> parse_spec(None)
1440
>>> parse_spec("./")
1442
>>> parse_spec("../@")
1444
>>> parse_spec("../f/@35")
1446
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1447
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1452
parsed = spec.split('/@')
1453
assert len(parsed) == 2
1458
parsed[1] = int(parsed[1])
1460
pass # We can allow stuff like ./@revid:blahblahblah
1462
assert parsed[1] >=0
1464
parsed = [spec, None]
1469
class cmd_find_merge_base(Command):
1470
"""Find and print a base revision for merging two branches.
1472
TODO: Options to specify revisions on either side, as if
1473
merging only part of the history.
1475
takes_args = ['branch', 'other']
1478
def run(self, branch, other):
1479
branch1 = find_branch(branch)
1480
branch2 = find_branch(other)
1482
base_revno, base_revid = branch1.common_ancestor(branch2)
1484
if base_revno is None:
1485
raise bzrlib.errors.UnrelatedBranches()
1487
print 'merge base is revision %s' % base_revid
1488
print ' r%-6d in %s' % (base_revno, branch)
1490
other_revno = branch2.revision_id_to_revno(base_revid)
1492
print ' r%-6d in %s' % (other_revno, other)
1496
class cmd_merge(Command):
1497
"""Perform a three-way merge.
1499
The branch is the branch you will merge from. By default, it will merge
1500
the latest revision. If you specify a revision, that revision will be
1501
merged. If you specify two revisions, the first will be used as a BASE,
1502
and the second one as OTHER. Revision numbers are always relative to the
1507
To merge the latest revision from bzr.dev
1508
bzr merge ../bzr.dev
1510
To merge changes up to and including revision 82 from bzr.dev
1511
bzr merge -r 82 ../bzr.dev
1513
To merge the changes introduced by 82, without previous changes:
1514
bzr merge -r 81..82 ../bzr.dev
1516
merge refuses to run if there are any uncommitted changes, unless
1519
takes_args = ['branch?']
1520
takes_options = ['revision', 'force', 'merge-type']
1522
def run(self, branch='.', revision=None, force=False,
1524
from bzrlib.merge import merge
1525
from bzrlib.merge_core import ApplyMerge3
1526
if merge_type is None:
1527
merge_type = ApplyMerge3
1529
if revision is None or len(revision) < 1:
1531
other = (branch, -1)
1533
if len(revision) == 1:
1534
other = (branch, revision[0])
1537
assert len(revision) == 2
1538
if None in revision:
1539
raise BzrCommandError(
1540
"Merge doesn't permit that revision specifier.")
1541
base = (branch, revision[0])
1542
other = (branch, revision[1])
1544
merge(other, base, check_clean=(not force), merge_type=merge_type)
1547
class cmd_revert(Command):
1548
"""Reverse all changes since the last commit.
1550
Only versioned files are affected. Specify filenames to revert only
1551
those files. By default, any files that are changed will be backed up
1552
first. Backup files have a '~' appended to their name.
1554
takes_options = ['revision', 'no-backup']
1555
takes_args = ['file*']
1556
aliases = ['merge-revert']
1558
def run(self, revision=None, no_backup=False, file_list=None):
1559
from bzrlib.merge import merge
1560
from bzrlib.branch import Branch
1561
if file_list is not None:
1562
if len(file_list) == 0:
1563
raise BzrCommandError("No files specified")
1564
if revision is None:
1566
elif len(revision) != 1:
1567
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1568
merge(('.', revision[0]), parse_spec('.'),
1571
backup_files=not no_backup,
1572
file_list=file_list)
1574
Branch('.').set_pending_merges([])
1577
class cmd_assert_fail(Command):
1578
"""Test reporting of assertion failures"""
1581
assert False, "always fails"
1584
class cmd_help(Command):
1585
"""Show help on a command or other topic.
1587
For a list of all available commands, say 'bzr help commands'."""
1588
takes_options = ['long']
1589
takes_args = ['topic?']
1592
def run(self, topic=None, long=False):
1594
if topic is None and long:
1599
class cmd_shell_complete(Command):
1600
"""Show appropriate completions for context.
1602
For a list of all available commands, say 'bzr shell-complete'."""
1603
takes_args = ['context?']
1607
def run(self, context=None):
1608
import shellcomplete
1609
shellcomplete.shellcomplete(context)
1612
class cmd_missing(Command):
1613
"""What is missing in this branch relative to other branch.
1615
takes_args = ['remote?']
1616
aliases = ['mis', 'miss']
1617
# We don't have to add quiet to the list, because
1618
# unknown options are parsed as booleans
1619
takes_options = ['verbose', 'quiet']
1621
def run(self, remote=None, verbose=False, quiet=False):
1622
from bzrlib.branch import find_branch, DivergedBranches
1623
from bzrlib.errors import BzrCommandError
1624
from bzrlib.missing import get_parent, show_missing
1626
if verbose and quiet:
1627
raise BzrCommandError('Cannot pass both quiet and verbose')
1629
b = find_branch('.')
1630
parent = get_parent(b)
1633
raise BzrCommandError("No missing location known or specified.")
1636
print "Using last location: %s" % parent
1638
elif parent is None:
1639
# We only update x-pull if it did not exist, missing should not change the parent
1640
b.controlfile('x-pull', 'wb').write(remote + '\n')
1641
br_remote = find_branch(remote)
1643
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1647
class cmd_plugins(Command):
1651
import bzrlib.plugin
731
raise NotImplementedError('no implementation of command %r'
735
"""Return help message for this class."""
1652
736
from inspect import getdoc
1653
from pprint import pprint
1654
for plugin in bzrlib.plugin.all_plugins:
1655
if hasattr(plugin, '__path__'):
1656
print plugin.__path__[0]
1661
print '\t', d.split('\n')[0]
1663
#pprint(bzrlib.plugin.all_plugins)
1667
# list of all available options; the rhs can be either None for an
1668
# option that takes no argument, or a constructor function that checks
1672
'diff-options': str,
1681
'revision': _parse_revision_str,
1693
'merge-type': get_merge_type,
1707
def parse_args(argv):
737
if self.__doc__ is Command.__doc__:
742
return _unsquish_command_name(self.__class__.__name__)
744
def plugin_name(self):
745
"""Get the name of the plugin that provides this command.
747
:return: The name of the plugin or None if the command is builtin.
749
mod_parts = self.__module__.split('.')
750
if len(mod_parts) >= 3 and mod_parts[1] == 'plugins':
756
class CommandHooks(Hooks):
757
"""Hooks related to Command object creation/enumeration."""
760
"""Create the default hooks.
762
These are all empty initially, because by default nothing should get
766
self.create_hook(HookPoint('extend_command',
767
"Called after creating a command object to allow modifications "
768
"such as adding or removing options, docs etc. Called with the "
769
"new bzrlib.commands.Command object.", (1, 13), None))
770
self.create_hook(HookPoint('get_command',
771
"Called when creating a single command. Called with "
772
"(cmd_or_None, command_name). get_command should either return "
773
"the cmd_or_None parameter, or a replacement Command object that "
774
"should be used for the command. Note that the Command.hooks "
775
"hooks are core infrastructure. Many users will prefer to use "
776
"bzrlib.commands.register_command or plugin_cmds.register_lazy.",
778
self.create_hook(HookPoint('get_missing_command',
779
"Called when creating a single command if no command could be "
780
"found. Called with (command_name). get_missing_command should "
781
"either return None, or a Command object to be used for the "
782
"command.", (1, 17), None))
783
self.create_hook(HookPoint('list_commands',
784
"Called when enumerating commands. Called with a set of "
785
"cmd_name strings for all the commands found so far. This set "
786
" is safe to mutate - e.g. to remove a command. "
787
"list_commands should return the updated set of command names.",
790
Command.hooks = CommandHooks()
793
def parse_args(command, argv, alias_argv=None):
1708
794
"""Parse command line.
1710
796
Arguments and options are parsed at this level before being passed
1711
797
down to specific command handlers. This routine knows, from a
1712
798
lookup table, something about the available options, what optargs
1713
799
they take, and which commands will accept them.
1715
>>> parse_args('--help'.split())
1716
([], {'help': True})
1717
>>> parse_args('--version'.split())
1718
([], {'version': True})
1719
>>> parse_args('status --all'.split())
1720
(['status'], {'all': True})
1721
>>> parse_args('commit --message=biter'.split())
1722
(['commit'], {'message': u'biter'})
1723
>>> parse_args('log -r 500'.split())
1724
(['log'], {'revision': [500]})
1725
>>> parse_args('log -r500..600'.split())
1726
(['log'], {'revision': [500, 600]})
1727
>>> parse_args('log -vr500..600'.split())
1728
(['log'], {'verbose': True, 'revision': [500, 600]})
1729
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1730
(['log'], {'revision': ['v500', 600]})
1735
# TODO: Maybe handle '--' to end options?
1740
# option names must not be unicode
1744
mutter(" got option %r" % a)
1746
optname, optarg = a[2:].split('=', 1)
1749
if optname not in OPTIONS:
1750
raise BzrError('unknown long option %r' % a)
1753
if shortopt in SHORT_OPTIONS:
1754
# Multi-character options must have a space to delimit
1756
optname = SHORT_OPTIONS[shortopt]
1758
# Single character short options, can be chained,
1759
# and have their value appended to their name
1761
if shortopt not in SHORT_OPTIONS:
1762
# We didn't find the multi-character name, and we
1763
# didn't find the single char name
1764
raise BzrError('unknown short option %r' % a)
1765
optname = SHORT_OPTIONS[shortopt]
1768
# There are extra things on this option
1769
# see if it is the value, or if it is another
1771
optargfn = OPTIONS[optname]
1772
if optargfn is None:
1773
# This option does not take an argument, so the
1774
# next entry is another short option, pack it back
1776
argv.insert(0, '-' + a[2:])
1778
# This option takes an argument, so pack it
1783
# XXX: Do we ever want to support this, e.g. for -r?
1784
raise BzrError('repeated option %r' % a)
1786
optargfn = OPTIONS[optname]
1790
raise BzrError('option %r needs an argument' % a)
1792
optarg = argv.pop(0)
1793
opts[optname] = optargfn(optarg)
1796
raise BzrError('option %r takes no argument' % optname)
1797
opts[optname] = True
801
# TODO: make it a method of the Command?
802
parser = option.get_optparser(command.options())
803
if alias_argv is not None:
804
args = alias_argv + argv
808
options, args = parser.parse_args(args)
809
opts = dict([(k, v) for k, v in options.__dict__.iteritems() if
810
v is not option.OptionParser.DEFAULT_VALUE])
1801
811
return args, opts
1806
814
def _match_argform(cmd, takes_args, args):
added
removed
bzrlib/commands.py
