1
# Copyright (C) 2004, 2005 by Canonical Ltd
1
# Copyright (C) 2006 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Bazaar-NG -- a free distributed version-control tool
20
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
22
* Metadata format is not stable yet -- you may need to
23
discard history in the future.
25
* Many commands unimplemented or partially implemented.
27
* Space-inefficient storage.
29
* No merge operators yet.
36
Show software version/licence/non-warranty.
38
Start versioning the current directory
42
Show revision history.
45
bzr move FROM... DESTDIR
46
Move one or more files to a different directory.
48
Show changes from last revision to working copy.
49
bzr commit -m 'MESSAGE'
50
Store current state as new revision.
51
bzr export [-r REVNO] DESTINATION
52
Export the branch state at a previous version.
54
Show summary of pending changes.
56
Make a file not versioned.
58
Show statistics about this branch.
60
Verify history is stored safely.
61
(for more type 'bzr help commands')
67
import sys, os, time, types, shutil, tempfile, fnmatch, difflib, os.path
69
from pprint import pprint
18
# TODO: probably should say which arguments are candidates for glob
19
# expansion on windows and do that at the command level.
21
# TODO: Define arguments by objects, rather than just using names.
22
# Those objects can specify the expected type of the argument, which
23
# would help with validation and shell completion. They could also provide
24
# help/explanation for that argument in a structured way.
26
# TODO: Specific "examples" property on commands for consistent formatting.
28
# TODO: "--profile=cum", to change sort order. Is there any value in leaving
29
# the profile output behind so it can be interactively examined?
34
from bzrlib.lazy_import import lazy_import
35
lazy_import(globals(), """
38
from warnings import warn
74
from bzrlib.store import ImmutableStore
75
from bzrlib.trace import mutter, note, log_error
76
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
77
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
78
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
79
from bzrlib.revision import Revision
80
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
83
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
84
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
86
## standard representation
87
NONE_STRING = '(none)'
101
def get_cmd_class(cmd):
104
cmd = CMD_ALIASES.get(cmd, cmd)
50
from bzrlib.symbol_versioning import (
57
from bzrlib.option import Option
63
def register_command(cmd, decorate=False):
64
"""Utility function to help register a command
66
:param cmd: Command subclass to register
67
:param decorate: If true, allow overriding an existing command
68
of the same name; the old command is returned by this function.
69
Otherwise it is an error to try to override an existing command.
73
if k.startswith("cmd_"):
74
k_unsquished = _unsquish_command_name(k)
77
if k_unsquished not in plugin_cmds:
78
plugin_cmds[k_unsquished] = cmd
79
## trace.mutter('registered plugin command %s', k_unsquished)
80
if decorate and k_unsquished in builtin_command_names():
81
return _builtin_commands()[k_unsquished]
83
result = plugin_cmds[k_unsquished]
84
plugin_cmds[k_unsquished] = cmd
87
trace.log_error('Two plugins defined the same command: %r' % k)
88
trace.log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
91
def _squish_command_name(cmd):
92
return 'cmd_' + cmd.replace('-', '_')
95
def _unsquish_command_name(cmd):
96
assert cmd.startswith("cmd_")
97
return cmd[4:].replace('_','-')
100
def _builtin_commands():
101
import bzrlib.builtins
103
builtins = bzrlib.builtins.__dict__
104
for name in builtins:
105
if name.startswith("cmd_"):
106
real_name = _unsquish_command_name(name)
107
r[real_name] = builtins[name]
111
def builtin_command_names():
112
"""Return list of builtin command names."""
113
return _builtin_commands().keys()
116
def plugin_command_names():
117
return plugin_cmds.keys()
120
def _get_cmd_dict(plugins_override=True):
121
"""Return name->class mapping for all commands."""
122
d = _builtin_commands()
124
d.update(plugin_cmds)
128
def get_all_cmds(plugins_override=True):
129
"""Return canonical name and class for all registered commands."""
130
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
134
def get_cmd_object(cmd_name, plugins_override=True):
135
"""Return the canonical name and command class for a command.
138
If true, plugin commands can override builtins.
140
from bzrlib.externalcommand import ExternalCommand
142
# We want only 'ascii' command names, but the user may have typed
143
# in a Unicode name. In that case, they should just get a
144
# 'command not found' error later.
145
# In the future, we may actually support Unicode command names.
147
# first look up this command under the specified name
148
cmds = _get_cmd_dict(plugins_override=plugins_override)
107
cmd_class = globals()['cmd_' + cmd.replace('-', '_')]
150
return cmds[cmd_name]()
109
raise BzrError("unknown command %r" % cmd)
111
return cmd, cmd_class
154
# look for any command which claims this as an alias
155
for real_cmd_name, cmd_class in cmds.iteritems():
156
if cmd_name in cmd_class.aliases:
159
cmd_obj = ExternalCommand.find_command(cmd_name)
163
raise errors.BzrCommandError('unknown command "%s"' % cmd_name)
166
class Command(object):
116
167
"""Base class for commands.
169
Commands are the heart of the command-line bzr interface.
171
The command object mostly handles the mapping of command-line
172
parameters into one or more bzrlib operations, and of the results
175
Commands normally don't have any state. All their arguments are
176
passed in to the run method. (Subclasses may take a different
177
policy if the behaviour of the instance needs to depend on e.g. a
178
shell plugin and not just its Python class.)
118
180
The docstring for an actual command should give a single-line
119
181
summary, then a complete description of the command. A grammar
120
182
description will be inserted.
185
Other accepted names for this command.
123
188
List of argument forms, marked with whether they are optional,
193
['to_location', 'from_branch?', 'file*']
195
'to_location' is required
196
'from_branch' is optional
197
'file' can be specified 0 or more times
127
List of options that may be given for this command.
200
List of options that may be given for this command. These can
201
be either strings, referring to globally-defined options,
202
or option objects. Retrieve through options().
130
If true, this command isn't advertised.
205
If true, this command isn't advertised. This is typically
206
for commands intended for expert users.
209
Command objects will get a 'outf' attribute, which has been
210
setup to properly handle encoding of unicode strings.
211
encoding_type determines what will happen when characters cannot
213
strict - abort if we cannot decode
214
replace - put in a bogus character (typically '?')
215
exact - do not encode sys.stdout
217
NOTE: by default on Windows, sys.stdout is opened as a text
218
stream, therefore LF line-endings are converted to CRLF.
219
When a command uses encoding_type = 'exact', then
220
sys.stdout is forced to be a binary stream, and line-endings
135
226
takes_options = []
227
encoding_type = 'strict'
139
def __init__(self, options, arguments):
140
"""Construct and run the command.
142
Sets self.status to the return value of run()."""
143
assert isinstance(options, dict)
144
assert isinstance(arguments, dict)
145
cmdargs = options.copy()
146
cmdargs.update(arguments)
147
assert self.__doc__ != Command.__doc__, \
148
("No help message set for %r" % self)
149
self.status = self.run(**cmdargs)
232
"""Construct an instance of this command."""
233
if self.__doc__ == Command.__doc__:
234
warn("No help message set for %r" % self)
237
"""Return dict of valid options for this command.
239
Maps from long option name to option object."""
241
r['help'] = option.Option.OPTIONS['help']
242
for o in self.takes_options:
243
if isinstance(o, basestring):
244
o = option.Option.OPTIONS[o]
248
def _setup_outf(self):
249
"""Return a file linked to stdout, which has proper encoding."""
250
assert self.encoding_type in ['strict', 'exact', 'replace']
252
# Originally I was using self.stdout, but that looks
253
# *way* too much like sys.stdout
254
if self.encoding_type == 'exact':
255
# force sys.stdout to be binary stream on win32
256
if sys.platform == 'win32':
257
fileno = getattr(sys.stdout, 'fileno', None)
260
msvcrt.setmode(fileno(), os.O_BINARY)
261
self.outf = sys.stdout
264
output_encoding = osutils.get_terminal_encoding()
266
# use 'replace' so that we don't abort if trying to write out
267
# in e.g. the default C locale.
268
self.outf = codecs.getwriter(output_encoding)(sys.stdout, errors=self.encoding_type)
269
# For whatever reason codecs.getwriter() does not advertise its encoding
270
# it just returns the encoding of the wrapped file, which is completely
271
# bogus. So set the attribute, so we can find the correct encoding later.
272
self.outf.encoding = output_encoding
274
@deprecated_method(zero_eight)
275
def run_argv(self, argv):
276
"""Parse command line and run.
278
See run_argv_aliases for the 0.8 and beyond api.
280
return self.run_argv_aliases(argv)
282
def run_argv_aliases(self, argv, alias_argv=None):
283
"""Parse the command line and run with extra aliases in alias_argv."""
285
warn("Passing None for [] is deprecated from bzrlib 0.10",
286
DeprecationWarning, stacklevel=2)
288
args, opts = parse_args(self, argv, alias_argv)
289
if 'help' in opts: # e.g. bzr add --help
290
from bzrlib.help import help_on_command
291
help_on_command(self.name())
293
# mix arguments and options into one dictionary
294
cmdargs = _match_argform(self.name(), self.takes_args, args)
296
for k, v in opts.items():
297
cmdopts[k.replace('-', '_')] = v
299
all_cmd_args = cmdargs.copy()
300
all_cmd_args.update(cmdopts)
304
return self.run(**all_cmd_args)
153
"""Override this in sub-classes.
307
"""Actually run the command.
155
309
This is invoked with the options and arguments bound to
156
310
keyword parameters.
158
Return True if the command was successful, False if not.
164
class cmd_status(Command):
165
"""Display status summary.
167
For each file there is a single line giving its file state and name.
168
The name is that in the current revision unless it is deleted or
169
missing, in which case the old name is shown.
171
takes_options = ['all']
173
def run(self, all=False):
174
#import bzrlib.status
175
#bzrlib.status.tree_status(Branch('.'))
176
Branch('.').show_status(show_all=all)
179
class cmd_cat_revision(Command):
180
"""Write out metadata for a revision."""
183
takes_args = ['revision_id']
185
def run(self, revision_id):
186
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
189
class cmd_revno(Command):
190
"""Show current revision number.
192
This is equal to the number of revisions on this branch."""
194
print Branch('.').revno()
197
class cmd_add(Command):
198
"""Add specified files or directories.
200
In non-recursive mode, all the named items are added, regardless
201
of whether they were previously ignored. A warning is given if
202
any of the named files are already versioned.
204
In recursive mode (the default), files are treated the same way
205
but the behaviour for directories is different. Directories that
206
are already versioned do not give a warning. All directories,
207
whether already versioned or not, are searched for files or
208
subdirectories that are neither versioned or ignored, and these
209
are added. This search proceeds recursively into versioned
212
Therefore simply saying 'bzr add .' will version all files that
213
are currently unknown.
215
TODO: Perhaps adding a file whose directly is not versioned should
216
recursively add that parent, rather than giving an error?
218
takes_args = ['file+']
219
takes_options = ['verbose']
221
def run(self, file_list, verbose=False):
222
bzrlib.add.smart_add(file_list, verbose)
225
def Relpath(Command):
226
"""Show path of a file relative to root"""
227
takes_args = ('filename')
230
print Branch(self.args['filename']).relpath(filename)
234
class cmd_inventory(Command):
235
"""Show inventory of the current working copy or a revision."""
236
takes_options = ['revision']
238
def run(self, revision=None):
241
inv = b.read_working_inventory()
243
inv = b.get_revision_inventory(b.lookup_revision(revision))
245
for path, entry in inv.iter_entries():
246
print '%-50s %s' % (entry.file_id, path)
249
class cmd_move(Command):
250
"""Move files to a different directory.
255
The destination must be a versioned directory in the same branch.
257
takes_args = ['source$', 'dest']
258
def run(self, source_list, dest):
261
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
264
class cmd_rename(Command):
265
"""Change the name of an entry.
268
bzr rename frob.c frobber.c
269
bzr rename src/frob.c lib/frob.c
271
It is an error if the destination name exists.
273
See also the 'move' command, which moves files into a different
274
directory without changing their name.
276
TODO: Some way to rename multiple files without invoking bzr for each
278
takes_args = ['from_name', 'to_name']
280
def run(self, from_name, to_name):
282
b.rename_one(b.relpath(from_name), b.relpath(to_name))
286
class cmd_renames(Command):
287
"""Show list of renamed files.
289
TODO: Option to show renames between two historical versions.
291
TODO: Only show renames under dir, rather than in the whole branch.
293
takes_args = ['dir?']
295
def run(self, dir='.'):
297
old_inv = b.basis_tree().inventory
298
new_inv = b.read_working_inventory()
300
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
302
for old_name, new_name in renames:
303
print "%s => %s" % (old_name, new_name)
306
class cmd_info(Command):
307
"""Show statistical information for this branch"""
310
info.show_info(Branch('.'))
313
class cmd_remove(Command):
314
"""Make a file unversioned.
316
This makes bzr stop tracking changes to a versioned file. It does
317
not delete the working copy.
319
takes_args = ['file+']
320
takes_options = ['verbose']
322
def run(self, file_list, verbose=False):
323
b = Branch(file_list[0])
324
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
327
class cmd_file_id(Command):
328
"""Print file_id of a particular file or directory.
330
The file_id is assigned when the file is first added and remains the
331
same through all revisions where the file exists, even when it is
335
takes_args = ['filename']
336
def run(self, filename):
338
i = b.inventory.path2id(b.relpath(filename))
340
bailout("%r is not a versioned file" % filename)
345
class cmd_file_path(Command):
346
"""Print path of file_ids to a file or directory.
348
This prints one line for each directory down to the target,
349
starting at the branch root."""
351
takes_args = ['filename']
352
def run(self, filename):
355
fid = inv.path2id(b.relpath(filename))
357
bailout("%r is not a versioned file" % filename)
358
for fip in inv.get_idpath(fid):
362
class cmd_revision_history(Command):
363
"""Display list of revision ids on this branch."""
365
for patchid in Branch('.').revision_history():
369
class cmd_directories(Command):
370
"""Display list of versioned directories in this branch."""
372
for name, ie in Branch('.').read_working_inventory().directories():
379
class cmd_init(Command):
380
"""Make a directory into a versioned branch.
382
Use this to create an empty branch, or before importing an
385
Recipe for importing a tree of files:
390
bzr commit -m 'imported project'
393
Branch('.', init=True)
396
class cmd_diff(Command):
397
"""Show differences in working tree.
399
If files are listed, only the changes in those files are listed.
400
Otherwise, all changes for the tree are listed.
402
TODO: Given two revision arguments, show the difference between them.
404
TODO: Allow diff across branches.
406
TODO: Option to use external diff command; could be GNU diff, wdiff,
409
TODO: Python difflib is not exactly the same as unidiff; should
410
either fix it up or prefer to use an external diff.
412
TODO: If a directory is given, diff everything under that.
414
TODO: Selected-file diff is inefficient and doesn't show you
417
TODO: This probably handles non-Unix newlines poorly.
420
takes_args = ['file*']
421
takes_options = ['revision']
423
def run(self, revision=None, file_list=None):
424
from bzrlib.diff import show_diff
426
show_diff(Branch('.'), revision, file_list)
429
class cmd_deleted(Command):
430
"""List files deleted in the working tree.
432
TODO: Show files deleted since a previous revision, or between two revisions.
434
def run(self, show_ids=False):
437
new = b.working_tree()
439
## TODO: Much more efficient way to do this: read in new
440
## directories with readdir, rather than stating each one. Same
441
## level of effort but possibly much less IO. (Or possibly not,
442
## if the directories are very large...)
444
for path, ie in old.inventory.iter_entries():
445
if not new.has_id(ie.file_id):
447
print '%-50s %s' % (path, ie.file_id)
451
class cmd_root(Command):
452
"""Show the tree root directory.
454
The root is the nearest enclosing directory with a .bzr control
456
takes_args = ['filename?']
457
def run(self, filename=None):
458
"""Print the branch root."""
459
print bzrlib.branch.find_branch_root(filename)
463
class cmd_log(Command):
464
"""Show log of this branch.
466
TODO: Options to show ids; to limit range; etc.
468
takes_options = ['timezone', 'verbose']
469
def run(self, timezone='original', verbose=False):
470
Branch('.').write_log(show_timezone=timezone, verbose=verbose)
473
class cmd_ls(Command):
474
"""List files in a tree.
476
TODO: Take a revision or remote path and list that tree instead.
479
def run(self, revision=None, verbose=False):
482
tree = b.working_tree()
484
tree = b.revision_tree(b.lookup_revision(revision))
486
for fp, fc, kind, fid in tree.list_files():
488
if kind == 'directory':
495
print '%-8s %s%s' % (fc, fp, kindch)
501
class cmd_unknowns(Command):
502
"""List unknown files"""
504
for f in Branch('.').unknowns():
509
class cmd_ignore(Command):
510
"""Ignore a command or pattern"""
511
takes_args = ['name_pattern']
513
def run(self, name_pattern):
516
# XXX: This will fail if it's a hardlink; should use an AtomicFile class.
517
f = open(b.abspath('.bzrignore'), 'at')
518
f.write(name_pattern + '\n')
521
inv = b.working_tree().inventory
522
if inv.path2id('.bzrignore'):
523
mutter('.bzrignore is already versioned')
525
mutter('need to make new .bzrignore file versioned')
526
b.add(['.bzrignore'])
530
class cmd_ignored(Command):
531
"""List ignored files and the patterns that matched them."""
533
tree = Branch('.').working_tree()
534
for path, file_class, kind, file_id in tree.list_files():
535
if file_class != 'I':
537
## XXX: Slightly inefficient since this was already calculated
538
pat = tree.is_ignored(path)
539
print '%-50s %s' % (path, pat)
542
class cmd_lookup_revision(Command):
543
"""Lookup the revision-id from a revision-number
546
bzr lookup-revision 33
549
def run(self, revno):
553
raise BzrError("not a valid revision-number: %r" % revno)
555
print Branch('.').lookup_revision(revno) or NONE_STRING
559
class cmd_export(Command):
560
"""Export past revision to destination directory.
562
If no revision is specified this exports the last committed revision."""
563
takes_args = ['dest']
564
takes_options = ['revision']
565
def run(self, dest, revno=None):
568
rh = b.revision_history[-1]
570
rh = b.lookup_revision(int(revno))
571
t = b.revision_tree(rh)
575
class cmd_cat(Command):
576
"""Write a file's text from a previous revision."""
578
takes_options = ['revision']
579
takes_args = ['filename']
581
def run(self, filename, revision=None):
583
raise BzrCommandError("bzr cat requires a revision number")
585
b.print_file(b.relpath(filename), int(revision))
588
class cmd_local_time_offset(Command):
589
"""Show the offset in seconds from GMT to local time."""
592
print bzrlib.osutils.local_time_offset()
596
class cmd_commit(Command):
597
"""Commit changes into a new revision.
599
TODO: Commit only selected files.
601
TODO: Run hooks on tree to-be-committed, and after commit.
603
TODO: Strict commit that fails if there are unknown or deleted files.
605
takes_options = ['message', 'verbose']
607
def run(self, message=None, verbose=False):
609
raise BzrCommandError("please specify a commit message")
610
Branch('.').commit(message, verbose=verbose)
613
class cmd_check(Command):
614
"""Validate consistency of branch history.
616
This command checks various invariants about the branch storage to
617
detect data corruption or bzr bugs.
619
takes_args = ['dir?']
620
def run(self, dir='.'):
622
bzrlib.check.check(Branch(dir, find_root=False))
626
class cmd_whoami(Command):
627
"""Show bzr user id."""
628
takes_options = ['email']
630
def run(self, email=False):
632
print bzrlib.osutils.user_email()
634
print bzrlib.osutils.username()
637
class cmd_selftest(Command):
638
"""Run internal test suite"""
641
failures, tests = 0, 0
643
import doctest, bzrlib.store, bzrlib.tests
644
bzrlib.trace.verbose = False
646
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
647
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
648
mf, mt = doctest.testmod(m)
651
print '%-40s %3d tests' % (m.__name__, mt),
653
print '%3d FAILED!' % mf
657
print '%-40s %3d tests' % ('total', tests),
659
print '%3d FAILED!' % failures
665
class cmd_version(Command):
666
"""Show version of bzr"""
671
print "bzr (bazaar-ng) %s" % bzrlib.__version__
672
print bzrlib.__copyright__
673
print "http://bazaar-ng.org/"
675
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
676
print "you may use, modify and redistribute it under the terms of the GNU"
677
print "General Public License version 2 or later."
680
class cmd_rocks(Command):
681
"""Statement of optimism."""
684
print "it sure does!"
687
class cmd_assert_fail(Command):
688
"""Test reporting of assertion failures"""
691
assert False, "always fails"
694
class cmd_help(Command):
695
"""Show help on a command or other topic.
697
For a list of all available commands, say 'bzr help commands'."""
698
takes_args = ['topic?']
700
def run(self, topic=None):
704
def help(topic=None):
707
elif topic == 'commands':
710
help_on_command(topic)
713
def help_on_command(cmdname):
714
cmdname = str(cmdname)
716
from inspect import getdoc
717
topic, cmdclass = get_cmd_class(cmdname)
719
doc = getdoc(cmdclass)
721
raise NotImplementedError("sorry, no detailed help yet for %r" % cmdname)
724
short, rest = doc.split('\n', 1)
729
print 'usage: bzr ' + topic,
730
for aname in cmdclass.takes_args:
731
aname = aname.upper()
732
if aname[-1] in ['$', '+']:
733
aname = aname[:-1] + '...'
734
elif aname[-1] == '?':
735
aname = '[' + aname[:-1] + ']'
736
elif aname[-1] == '*':
737
aname = '[' + aname[:-1] + '...]'
744
if cmdclass.takes_options:
747
for on in cmdclass.takes_options:
752
"""List all commands"""
756
for k, v in globals().items():
757
if k.startswith('cmd_'):
758
accu.append((k[4:].replace('_','-'), v))
760
for cmdname, cmdclass in accu:
764
help = inspect.getdoc(cmdclass)
766
print " " + help.split('\n', 1)[0]
769
######################################################################
773
# list of all available options; the rhs can be either None for an
774
# option that takes no argument, or a constructor function that checks
796
def parse_args(argv):
312
Return 0 or None if the command was successful, or a non-zero
313
shell error code if not. It's OK for this method to allow
314
an exception to raise up.
316
raise NotImplementedError('no implementation of command %r'
320
"""Return help message for this class."""
321
from inspect import getdoc
322
if self.__doc__ is Command.__doc__:
327
return _unsquish_command_name(self.__class__.__name__)
329
def plugin_name(self):
330
"""Get the name of the plugin that provides this command.
332
:return: The name of the plugin or None if the command is builtin.
334
mod_parts = self.__module__.split('.')
335
if len(mod_parts) >= 3 and mod_parts[1] == 'plugins':
341
# Technically, this function hasn't been use in a *really* long time
342
# but we are only deprecating it now.
343
@deprecated_function(zero_eleven)
344
def parse_spec(spec):
350
>>> parse_spec("../@")
352
>>> parse_spec("../f/@35")
354
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
355
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
360
parsed = spec.split('/@')
361
assert len(parsed) == 2
366
parsed[1] = int(parsed[1])
368
pass # We can allow stuff like ./@revid:blahblahblah
372
parsed = [spec, None]
375
def parse_args(command, argv, alias_argv=None):
797
376
"""Parse command line.
799
378
Arguments and options are parsed at this level before being passed
800
379
down to specific command handlers. This routine knows, from a
801
380
lookup table, something about the available options, what optargs
802
381
they take, and which commands will accept them.
804
>>> parse_args('--help'.split())
806
>>> parse_args('--version'.split())
807
([], {'version': True})
808
>>> parse_args('status --all'.split())
809
(['status'], {'all': True})
810
>>> parse_args('commit --message=biter'.split())
811
(['commit'], {'message': u'biter'})
816
# TODO: Maybe handle '--' to end options?
821
# option names must not be unicode
825
mutter(" got option %r" % a)
827
optname, optarg = a[2:].split('=', 1)
830
if optname not in OPTIONS:
831
bailout('unknown long option %r' % a)
834
if shortopt not in SHORT_OPTIONS:
835
bailout('unknown short option %r' % a)
836
optname = SHORT_OPTIONS[shortopt]
839
# XXX: Do we ever want to support this, e.g. for -r?
840
bailout('repeated option %r' % a)
842
optargfn = OPTIONS[optname]
846
bailout('option %r needs an argument' % a)
849
opts[optname] = optargfn(optarg)
852
bailout('option %r takes no argument' % optname)
383
# TODO: make it a method of the Command?
384
parser = option.get_optparser(command.options())
385
if alias_argv is not None:
386
args = alias_argv + argv
390
options, args = parser.parse_args(args)
391
opts = dict([(k, v) for k, v in options.__dict__.iteritems() if
392
v is not option.OptionParser.DEFAULT_VALUE])
857
393
return args, opts
862
396
def _match_argform(cmd, takes_args, args):
876
410
argdict[argname + '_list'] = None
877
411
elif ap[-1] == '+':
879
raise BzrCommandError("command %r needs one or more %s"
880
% (cmd, argname.upper()))
413
raise errors.BzrCommandError("command %r needs one or more %s"
414
% (cmd, argname.upper()))
882
416
argdict[argname + '_list'] = args[:]
884
418
elif ap[-1] == '$': # all but one
885
419
if len(args) < 2:
886
raise BzrCommandError("command %r needs one or more %s"
887
% (cmd, argname.upper()))
420
raise errors.BzrCommandError("command %r needs one or more %s"
421
% (cmd, argname.upper()))
888
422
argdict[argname + '_list'] = args[:-1]
891
425
# just a plain arg
894
raise BzrCommandError("command %r requires argument %s"
895
% (cmd, argname.upper()))
428
raise errors.BzrCommandError("command %r requires argument %s"
429
% (cmd, argname.upper()))
897
431
argdict[argname] = args.pop(0)
900
raise BzrCommandError("extra argument to command %s: %s"
434
raise errors.BzrCommandError("extra argument to command %s: %s"
441
def apply_profiled(the_callable, *args, **kwargs):
445
pffileno, pfname = tempfile.mkstemp()
447
prof = hotshot.Profile(pfname)
449
ret = prof.runcall(the_callable, *args, **kwargs) or 0
452
stats = hotshot.stats.load(pfname)
454
stats.sort_stats('cum') # 'time'
455
## XXX: Might like to write to stderr or the trace file instead but
456
## print_stats seems hardcoded to stdout
457
stats.print_stats(20)
464
def apply_lsprofiled(filename, the_callable, *args, **kwargs):
465
from bzrlib.lsprof import profile
467
ret, stats = profile(the_callable, *args, **kwargs)
473
cPickle.dump(stats, open(filename, 'w'), 2)
474
print 'Profile data written to %r.' % filename
478
def get_alias(cmd, config=None):
479
"""Return an expanded alias, or None if no alias exists.
482
Command to be checked for an alias.
484
Used to specify an alternative config to use,
485
which is especially useful for testing.
486
If it is unspecified, the global config will be used.
490
config = bzrlib.config.GlobalConfig()
491
alias = config.get_alias(cmd)
494
return [a.decode('utf-8') for a in shlex.split(alias.encode('utf-8'))]
907
498
def run_bzr(argv):
908
499
"""Execute a command.
910
501
This is similar to main(), but without all the trappings for
911
502
logging and error handling.
505
The command-line arguments, without the program name from argv[0]
506
These should already be decoded. All library/test code calling
507
run_bzr should be passing valid strings (don't need decoding).
509
Returns a command status or raises an exception.
511
Special master options: these must come before the command because
512
they control how the command is interpreted.
515
Do not load plugin modules at all
521
Only use builtin commands. (Plugins are still allowed to change
525
Run under the Python hotshot profiler.
528
Run under the Python lsprof profiler.
914
argv = [a.decode(bzrlib.user_encoding) for a in argv]
531
trace.mutter("bzr arguments: %r", argv)
533
opt_lsprof = opt_profile = opt_no_plugins = opt_builtin = \
534
opt_no_aliases = False
535
opt_lsprof_file = None
537
# --no-plugins is handled specially at a very early stage. We need
538
# to load plugins before doing other command parsing so that they
539
# can override commands, but this needs to happen first.
547
elif a == '--lsprof':
549
elif a == '--lsprof-file':
551
opt_lsprof_file = argv[i + 1]
553
elif a == '--no-plugins':
554
opt_no_plugins = True
555
elif a == '--no-aliases':
556
opt_no_aliases = True
557
elif a == '--builtin':
559
elif a in ('--quiet', '-q'):
561
elif a.startswith('-D'):
562
debug.debug_flags.add(a[2:])
569
from bzrlib.builtins import cmd_help
570
cmd_help().run_argv_aliases([])
573
if argv[0] == '--version':
574
from bzrlib.version import show_version
578
if not opt_no_plugins:
579
from bzrlib.plugin import load_plugins
582
from bzrlib.plugin import disable_plugins
587
if not opt_no_aliases:
588
alias_argv = get_alias(argv[0])
590
alias_argv = [a.decode(bzrlib.user_encoding) for a in alias_argv]
591
argv[0] = alias_argv.pop(0)
594
# We want only 'ascii' command names, but the user may have typed
595
# in a Unicode name. In that case, they should just get a
596
# 'command not found' error later.
598
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
599
if not getattr(cmd_obj.run_argv, 'is_deprecated', False):
600
run = cmd_obj.run_argv
603
run = cmd_obj.run_argv_aliases
604
run_argv = [argv, alias_argv]
917
args, opts = parse_args(argv[1:])
924
elif 'version' in opts:
927
cmd = str(args.pop(0))
929
log_error('usage: bzr COMMAND')
930
log_error(' try "bzr help"')
933
canonical_cmd, cmd_class = get_cmd_class(cmd)
936
if 'profile' in opts:
942
# check options are reasonable
943
allowed = cmd_class.takes_options
945
if oname not in allowed:
946
raise BzrCommandError("option %r is not allowed for command %r"
949
# mix arguments and options into one dictionary
950
cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
952
for k, v in opts.items():
953
cmdopts[k.replace('-', '_')] = v
957
pffileno, pfname = tempfile.mkstemp()
608
ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv)
610
ret = apply_profiled(run, *run_argv)
615
# reset, in case we may do other commands later within the same process
616
trace.be_quiet(False)
618
def display_command(func):
619
"""Decorator that suppresses pipe/interrupt errors."""
620
def ignore_pipe(*args, **kwargs):
959
prof = hotshot.Profile(pfname)
960
ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
964
stats = hotshot.stats.load(pfname)
966
stats.sort_stats('time')
967
## XXX: Might like to write to stderr or the trace file instead but
968
## print_stats seems hardcoded to stdout
969
stats.print_stats(20)
977
cmdobj = cmd_class(cmdopts, cmdargs) or 0
981
def _report_exception(e, summary, quiet=False):
983
log_error('bzr: ' + summary)
984
bzrlib.trace.log_exception(e)
987
tb = sys.exc_info()[2]
988
exinfo = traceback.extract_tb(tb)
990
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
991
sys.stderr.write(' see ~/.bzr.log for debug information\n')
622
result = func(*args, **kwargs)
626
if getattr(e, 'errno', None) is None:
628
if e.errno != errno.EPIPE:
629
# Win32 raises IOError with errno=0 on a broken pipe
630
if sys.platform != 'win32' or e.errno != 0:
633
except KeyboardInterrupt:
998
bzrlib.trace.create_tracefile(argv)
640
from bzrlib.ui.text import TextUIFactory
641
bzrlib.ui.ui_factory = TextUIFactory()
642
argv = [a.decode(bzrlib.user_encoding) for a in argv[1:]]
643
ret = run_bzr_catch_errors(argv)
644
trace.mutter("return code %d", ret)
648
def run_bzr_catch_errors(argv):
1003
# do this here to catch EPIPE
1007
quiet = isinstance(e, (BzrCommandError))
1008
_report_exception(e, 'error: ' + e.args[0], quiet=quiet)
1011
# some explanation or hints
1014
except AssertionError, e:
1015
msg = 'assertion failed'
1017
msg += ': ' + str(e)
1018
_report_exception(e, msg)
1020
except KeyboardInterrupt, e:
1021
_report_exception(e, 'interrupted', quiet=True)
1023
except Exception, e:
1025
if isinstance(e, IOError) and e.errno == errno.EPIPE:
1029
msg = str(e).rstrip('\n')
1030
_report_exception(e, msg, quiet)
1033
bzrlib.trace.close_trace()
651
# do this here inside the exception wrappers to catch EPIPE
653
except (KeyboardInterrupt, Exception), e:
654
# used to handle AssertionError and KeyboardInterrupt
655
# specially here, but hopefully they're handled ok by the logger now
656
trace.report_exception(sys.exc_info(), sys.stderr)
657
if os.environ.get('BZR_PDB'):
658
print '**** entering debugger'
660
pdb.post_mortem(sys.exc_traceback)
1036
663
if __name__ == '__main__':
1037
664
sys.exit(main(sys.argv))
added
removed
bzrlib/commands.py
