1
# Copyright (C) 2004, 2005 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
import sys, os, time, os.path
22
from bzrlib.trace import mutter, note, log_error
23
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
25
from bzrlib.tree import RevisionTree, EmptyTree, Tree
26
from bzrlib.revision import Revision
27
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
29
from bzrlib import merge
32
def _squish_command_name(cmd):
33
return 'cmd_' + cmd.replace('-', '_')
36
def _unsquish_command_name(cmd):
37
assert cmd.startswith("cmd_")
38
return cmd[4:].replace('_','-')
40
def _parse_revision_str(revstr):
41
"""This handles a revision string -> revno.
43
There are several possibilities:
46
'234:345' -> [234, 345]
50
In the future we will also support:
51
'uuid:blah-blah-blah' -> ?
52
'hash:blahblahblah' -> ?
56
if revstr.find(':') != -1:
57
revs = revstr.split(':')
59
raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
64
revs[0] = int(revs[0])
69
revs[1] = int(revs[1])
75
"""Return canonical name and class for all registered commands."""
76
for k, v in globals().iteritems():
77
if k.startswith("cmd_"):
78
yield _unsquish_command_name(k), v
80
def get_cmd_class(cmd):
81
"""Return the canonical name and command class for a command.
83
cmd = str(cmd) # not unicode
85
# first look up this command under the specified name
87
return cmd, globals()[_squish_command_name(cmd)]
91
# look for any command which claims this as an alias
92
for cmdname, cmdclass in get_all_cmds():
93
if cmd in cmdclass.aliases:
94
return cmdname, cmdclass
96
cmdclass = ExternalCommand.find_command(cmd)
100
raise BzrCommandError("unknown command %r" % cmd)
103
class Command(object):
104
"""Base class for commands.
106
The docstring for an actual command should give a single-line
107
summary, then a complete description of the command. A grammar
108
description will be inserted.
111
List of argument forms, marked with whether they are optional,
115
List of options that may be given for this command.
118
If true, this command isn't advertised.
127
def __init__(self, options, arguments):
128
"""Construct and run the command.
130
Sets self.status to the return value of run()."""
131
assert isinstance(options, dict)
132
assert isinstance(arguments, dict)
133
cmdargs = options.copy()
134
cmdargs.update(arguments)
135
assert self.__doc__ != Command.__doc__, \
136
("No help message set for %r" % self)
137
self.status = self.run(**cmdargs)
141
"""Override this in sub-classes.
143
This is invoked with the options and arguments bound to
146
Return 0 or None if the command was successful, or a shell
152
class ExternalCommand(Command):
153
"""Class to wrap external commands.
155
We cheat a little here, when get_cmd_class() calls us we actually give it back
156
an object we construct that has the appropriate path, help, options etc for the
159
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
160
method, which we override to call the Command.__init__ method. That then calls
161
our run method which is pretty straight forward.
163
The only wrinkle is that we have to map bzr's dictionary of options and arguments
164
back into command line options and arguments for the script.
167
def find_command(cls, cmd):
168
bzrpath = os.environ.get('BZRPATH', '')
170
for dir in bzrpath.split(':'):
171
path = os.path.join(dir, cmd)
172
if os.path.isfile(path):
173
return ExternalCommand(path)
177
find_command = classmethod(find_command)
179
def __init__(self, path):
182
# TODO: If either of these fail, we should detect that and
183
# assume that path is not really a bzr plugin after all.
185
pipe = os.popen('%s --bzr-usage' % path, 'r')
186
self.takes_options = pipe.readline().split()
187
self.takes_args = pipe.readline().split()
190
pipe = os.popen('%s --bzr-help' % path, 'r')
191
self.__doc__ = pipe.read()
194
def __call__(self, options, arguments):
195
Command.__init__(self, options, arguments)
198
def run(self, **kargs):
206
if OPTIONS.has_key(name):
208
opts.append('--%s' % name)
209
if value is not None and value is not True:
210
opts.append(str(value))
212
# it's an arg, or arg list
213
if type(value) is not list:
219
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
223
class cmd_status(Command):
224
"""Display status summary.
226
This reports on versioned and unknown files, reporting them
227
grouped by state. Possible states are:
230
Versioned in the working copy but not in the previous revision.
233
Versioned in the previous revision but removed or deleted
237
Path of this file changed from the previous revision;
238
the text may also have changed. This includes files whose
239
parent directory was renamed.
242
Text has changed since the previous revision.
245
Nothing about this file has changed since the previous revision.
246
Only shown with --all.
249
Not versioned and not matching an ignore pattern.
251
To see ignored files use 'bzr ignored'. For details in the
252
changes to file texts, use 'bzr diff'.
254
If no arguments are specified, the status of the entire working
255
directory is shown. Otherwise, only the status of the specified
256
files or directories is reported. If a directory is given, status
257
is reported for everything inside that directory.
259
takes_args = ['file*']
260
takes_options = ['all', 'show-ids']
261
aliases = ['st', 'stat']
263
def run(self, all=False, show_ids=False, file_list=None):
265
b = Branch(file_list[0], lock_mode='r')
266
file_list = [b.relpath(x) for x in file_list]
267
# special case: only one path was given and it's the root
269
if file_list == ['']:
272
b = Branch('.', lock_mode='r')
274
status.show_status(b, show_unchanged=all, show_ids=show_ids,
275
specific_files=file_list)
278
class cmd_cat_revision(Command):
279
"""Write out metadata for a revision."""
282
takes_args = ['revision_id']
284
def run(self, revision_id):
285
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
288
class cmd_revno(Command):
289
"""Show current revision number.
291
This is equal to the number of revisions on this branch."""
293
print Branch('.').revno()
296
class cmd_add(Command):
297
"""Add specified files or directories.
299
In non-recursive mode, all the named items are added, regardless
300
of whether they were previously ignored. A warning is given if
301
any of the named files are already versioned.
303
In recursive mode (the default), files are treated the same way
304
but the behaviour for directories is different. Directories that
305
are already versioned do not give a warning. All directories,
306
whether already versioned or not, are searched for files or
307
subdirectories that are neither versioned or ignored, and these
308
are added. This search proceeds recursively into versioned
311
Therefore simply saying 'bzr add .' will version all files that
312
are currently unknown.
314
TODO: Perhaps adding a file whose directly is not versioned should
315
recursively add that parent, rather than giving an error?
317
takes_args = ['file+']
318
takes_options = ['verbose']
320
def run(self, file_list, verbose=False):
321
bzrlib.add.smart_add(file_list, verbose)
324
class cmd_relpath(Command):
325
"""Show path of a file relative to root"""
326
takes_args = ['filename']
328
def run(self, filename):
329
print Branch(filename).relpath(filename)
333
class cmd_inventory(Command):
334
"""Show inventory of the current working copy or a revision."""
335
takes_options = ['revision']
337
def run(self, revision=None):
340
inv = b.read_working_inventory()
342
inv = b.get_revision_inventory(b.lookup_revision(revision))
344
for path, entry in inv.entries():
345
print '%-50s %s' % (entry.file_id, path)
348
class cmd_move(Command):
349
"""Move files to a different directory.
354
The destination must be a versioned directory in the same branch.
356
takes_args = ['source$', 'dest']
357
def run(self, source_list, dest):
360
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
363
class cmd_rename(Command):
364
"""Change the name of an entry.
367
bzr rename frob.c frobber.c
368
bzr rename src/frob.c lib/frob.c
370
It is an error if the destination name exists.
372
See also the 'move' command, which moves files into a different
373
directory without changing their name.
375
TODO: Some way to rename multiple files without invoking bzr for each
377
takes_args = ['from_name', 'to_name']
379
def run(self, from_name, to_name):
381
b.rename_one(b.relpath(from_name), b.relpath(to_name))
385
class cmd_renames(Command):
386
"""Show list of renamed files.
388
TODO: Option to show renames between two historical versions.
390
TODO: Only show renames under dir, rather than in the whole branch.
392
takes_args = ['dir?']
394
def run(self, dir='.'):
396
old_inv = b.basis_tree().inventory
397
new_inv = b.read_working_inventory()
399
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
401
for old_name, new_name in renames:
402
print "%s => %s" % (old_name, new_name)
405
class cmd_info(Command):
406
"""Show statistical information about a branch."""
407
takes_args = ['branch?']
409
def run(self, branch=None):
412
from branch import find_branch
413
b = find_branch(branch)
417
class cmd_remove(Command):
418
"""Make a file unversioned.
420
This makes bzr stop tracking changes to a versioned file. It does
421
not delete the working copy.
423
takes_args = ['file+']
424
takes_options = ['verbose']
426
def run(self, file_list, verbose=False):
427
b = Branch(file_list[0])
428
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
431
class cmd_file_id(Command):
432
"""Print file_id of a particular file or directory.
434
The file_id is assigned when the file is first added and remains the
435
same through all revisions where the file exists, even when it is
439
takes_args = ['filename']
440
def run(self, filename):
442
i = b.inventory.path2id(b.relpath(filename))
444
bailout("%r is not a versioned file" % filename)
449
class cmd_file_path(Command):
450
"""Print path of file_ids to a file or directory.
452
This prints one line for each directory down to the target,
453
starting at the branch root."""
455
takes_args = ['filename']
456
def run(self, filename):
459
fid = inv.path2id(b.relpath(filename))
461
bailout("%r is not a versioned file" % filename)
462
for fip in inv.get_idpath(fid):
466
class cmd_revision_history(Command):
467
"""Display list of revision ids on this branch."""
469
for patchid in Branch('.').revision_history():
473
class cmd_directories(Command):
474
"""Display list of versioned directories in this branch."""
476
for name, ie in Branch('.').read_working_inventory().directories():
483
class cmd_init(Command):
484
"""Make a directory into a versioned branch.
486
Use this to create an empty branch, or before importing an
489
Recipe for importing a tree of files:
494
bzr commit -m 'imported project'
497
Branch('.', init=True)
500
class cmd_diff(Command):
501
"""Show differences in working tree.
503
If files are listed, only the changes in those files are listed.
504
Otherwise, all changes for the tree are listed.
506
TODO: Given two revision arguments, show the difference between them.
508
TODO: Allow diff across branches.
510
TODO: Option to use external diff command; could be GNU diff, wdiff,
513
TODO: Python difflib is not exactly the same as unidiff; should
514
either fix it up or prefer to use an external diff.
516
TODO: If a directory is given, diff everything under that.
518
TODO: Selected-file diff is inefficient and doesn't show you
521
TODO: This probably handles non-Unix newlines poorly.
524
takes_args = ['file*']
525
takes_options = ['revision', 'diff-options']
528
def run(self, revision=None, file_list=None, diff_options=None):
529
from bzrlib.diff import show_diff
530
from bzrlib import find_branch
533
b = find_branch(file_list[0], lock_mode='r')
534
file_list = [b.relpath(f) for f in file_list]
535
if file_list == ['']:
536
# just pointing to top-of-tree
539
b = Branch('.', lock_mode='r')
541
show_diff(b, revision, specific_files=file_list,
542
external_diff_options=diff_options)
548
class cmd_deleted(Command):
549
"""List files deleted in the working tree.
551
TODO: Show files deleted since a previous revision, or between two revisions.
553
def run(self, show_ids=False):
556
new = b.working_tree()
558
## TODO: Much more efficient way to do this: read in new
559
## directories with readdir, rather than stating each one. Same
560
## level of effort but possibly much less IO. (Or possibly not,
561
## if the directories are very large...)
563
for path, ie in old.inventory.iter_entries():
564
if not new.has_id(ie.file_id):
566
print '%-50s %s' % (path, ie.file_id)
571
class cmd_modified(Command):
572
"""List files modified in working tree."""
577
inv = b.read_working_inventory()
578
sc = statcache.update_cache(b, inv)
579
basis = b.basis_tree()
580
basis_inv = basis.inventory
582
# We used to do this through iter_entries(), but that's slow
583
# when most of the files are unmodified, as is usually the
584
# case. So instead we iterate by inventory entry, and only
585
# calculate paths as necessary.
587
for file_id in basis_inv:
588
cacheentry = sc.get(file_id)
589
if not cacheentry: # deleted
591
ie = basis_inv[file_id]
592
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
593
path = inv.id2path(file_id)
598
class cmd_added(Command):
599
"""List files added in working tree."""
603
wt = b.working_tree()
604
basis_inv = b.basis_tree().inventory
607
if file_id in basis_inv:
609
path = inv.id2path(file_id)
610
if not os.access(b.abspath(path), os.F_OK):
616
class cmd_root(Command):
617
"""Show the tree root directory.
619
The root is the nearest enclosing directory with a .bzr control
621
takes_args = ['filename?']
622
def run(self, filename=None):
623
"""Print the branch root."""
624
from branch import find_branch
625
b = find_branch(filename)
626
print getattr(b, 'base', None) or getattr(b, 'baseurl')
629
class cmd_log(Command):
630
"""Show log of this branch.
632
To request a range of logs, you can use the command -r begin:end
633
-r revision requests a specific revision, -r :end or -r begin: are
636
TODO: Make --revision support uuid: and hash: [future tag:] notation.
640
takes_args = ['filename?']
641
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
643
def run(self, filename=None, timezone='original',
648
from bzrlib import show_log, find_branch
651
direction = (forward and 'forward') or 'reverse'
654
b = find_branch(filename, lock_mode='r')
655
fp = b.relpath(filename)
657
file_id = b.read_working_inventory().path2id(fp)
659
file_id = None # points to branch root
661
b = find_branch('.', lock_mode='r')
665
revision = [None, None]
666
elif isinstance(revision, int):
667
revision = [revision, revision]
672
assert len(revision) == 2
674
mutter('encoding log as %r' % bzrlib.user_encoding)
675
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout)
678
show_timezone=timezone,
683
start_revision=revision[0],
684
end_revision=revision[1])
688
class cmd_touching_revisions(Command):
689
"""Return revision-ids which affected a particular file.
691
A more user-friendly interface is "bzr log FILE"."""
693
takes_args = ["filename"]
694
def run(self, filename):
695
b = Branch(filename, lock_mode='r')
696
inv = b.read_working_inventory()
697
file_id = inv.path2id(b.relpath(filename))
698
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
699
print "%6d %s" % (revno, what)
702
class cmd_ls(Command):
703
"""List files in a tree.
705
TODO: Take a revision or remote path and list that tree instead.
708
def run(self, revision=None, verbose=False):
711
tree = b.working_tree()
713
tree = b.revision_tree(b.lookup_revision(revision))
715
for fp, fc, kind, fid in tree.list_files():
717
if kind == 'directory':
724
print '%-8s %s%s' % (fc, fp, kindch)
730
class cmd_unknowns(Command):
731
"""List unknown files"""
733
for f in Branch('.').unknowns():
738
class cmd_ignore(Command):
739
"""Ignore a command or pattern
741
To remove patterns from the ignore list, edit the .bzrignore file.
743
If the pattern contains a slash, it is compared to the whole path
744
from the branch root. Otherwise, it is comapred to only the last
745
component of the path.
747
Ignore patterns are case-insensitive on case-insensitive systems.
749
Note: wildcards must be quoted from the shell on Unix.
752
bzr ignore ./Makefile
755
takes_args = ['name_pattern']
757
def run(self, name_pattern):
758
from bzrlib.atomicfile import AtomicFile
762
ifn = b.abspath('.bzrignore')
764
if os.path.exists(ifn):
767
igns = f.read().decode('utf-8')
773
if igns and igns[-1] != '\n':
775
igns += name_pattern + '\n'
778
f = AtomicFile(ifn, 'wt')
779
f.write(igns.encode('utf-8'))
784
inv = b.working_tree().inventory
785
if inv.path2id('.bzrignore'):
786
mutter('.bzrignore is already versioned')
788
mutter('need to make new .bzrignore file versioned')
789
b.add(['.bzrignore'])
793
class cmd_ignored(Command):
794
"""List ignored files and the patterns that matched them.
796
See also: bzr ignore"""
798
tree = Branch('.').working_tree()
799
for path, file_class, kind, file_id in tree.list_files():
800
if file_class != 'I':
802
## XXX: Slightly inefficient since this was already calculated
803
pat = tree.is_ignored(path)
804
print '%-50s %s' % (path, pat)
807
class cmd_lookup_revision(Command):
808
"""Lookup the revision-id from a revision-number
811
bzr lookup-revision 33
814
takes_args = ['revno']
816
def run(self, revno):
820
raise BzrCommandError("not a valid revision-number: %r" % revno)
822
print Branch('.').lookup_revision(revno)
825
class cmd_export(Command):
826
"""Export past revision to destination directory.
828
If no revision is specified this exports the last committed revision."""
829
takes_args = ['dest']
830
takes_options = ['revision']
831
def run(self, dest, revision=None):
834
rh = b.revision_history()[-1]
836
rh = b.lookup_revision(int(revision))
837
t = b.revision_tree(rh)
841
class cmd_cat(Command):
842
"""Write a file's text from a previous revision."""
844
takes_options = ['revision']
845
takes_args = ['filename']
847
def run(self, filename, revision=None):
849
raise BzrCommandError("bzr cat requires a revision number")
851
b.print_file(b.relpath(filename), int(revision))
854
class cmd_local_time_offset(Command):
855
"""Show the offset in seconds from GMT to local time."""
858
print bzrlib.osutils.local_time_offset()
862
class cmd_commit(Command):
863
"""Commit changes into a new revision.
865
If selected files are specified, only changes to those files are
866
committed. If a directory is specified then its contents are also
869
A selected-file commit may fail in some cases where the committed
870
tree would be invalid, such as trying to commit a file in a
871
newly-added directory that is not itself committed.
873
TODO: Run hooks on tree to-be-committed, and after commit.
875
TODO: Strict commit that fails if there are unknown or deleted files.
877
takes_args = ['selected*']
878
takes_options = ['message', 'file', 'verbose']
879
aliases = ['ci', 'checkin']
881
def run(self, message=None, file=None, verbose=True, selected_list=None):
882
from bzrlib.commit import commit
884
## Warning: shadows builtin file()
885
if not message and not file:
886
raise BzrCommandError("please specify a commit message",
887
["use either --message or --file"])
888
elif message and file:
889
raise BzrCommandError("please specify either --message or --file")
893
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
896
commit(b, message, verbose=verbose, specific_files=selected_list)
899
class cmd_check(Command):
900
"""Validate consistency of branch history.
902
This command checks various invariants about the branch storage to
903
detect data corruption or bzr bugs.
905
takes_args = ['dir?']
906
def run(self, dir='.'):
908
bzrlib.check.check(Branch(dir))
912
class cmd_whoami(Command):
913
"""Show bzr user id."""
914
takes_options = ['email']
916
def run(self, email=False):
918
print bzrlib.osutils.user_email()
920
print bzrlib.osutils.username()
923
class cmd_selftest(Command):
924
"""Run internal test suite"""
927
failures, tests = 0, 0
929
import doctest, bzrlib.store
930
bzrlib.trace.verbose = False
932
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
933
bzrlib.tree, bzrlib.commands, bzrlib.add:
934
mf, mt = doctest.testmod(m)
937
print '%-40s %3d tests' % (m.__name__, mt),
939
print '%3d FAILED!' % mf
943
print '%-40s %3d tests' % ('total', tests),
945
print '%3d FAILED!' % failures
953
class cmd_version(Command):
954
"""Show version of bzr"""
959
print "bzr (bazaar-ng) %s" % bzrlib.__version__
960
print bzrlib.__copyright__
961
print "http://bazaar-ng.org/"
963
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
964
print "you may use, modify and redistribute it under the terms of the GNU"
965
print "General Public License version 2 or later."
968
class cmd_rocks(Command):
969
"""Statement of optimism."""
972
print "it sure does!"
974
def parse_spec(spec):
976
parsed = spec.split('/@')
977
assert len(parsed) == 2
981
parsed[1] = int(parsed[1])
984
parsed = [spec, None]
987
class cmd_merge(Command):
988
"""Perform a three-way merge of trees."""
989
takes_args = ['other_spec', 'base_spec']
991
def run(self, other_spec, base_spec):
992
merge.merge(parse_spec(other_spec), parse_spec(base_spec))
994
class cmd_assert_fail(Command):
995
"""Test reporting of assertion failures"""
998
assert False, "always fails"
1001
class cmd_help(Command):
1002
"""Show help on a command or other topic.
1004
For a list of all available commands, say 'bzr help commands'."""
1005
takes_args = ['topic?']
1008
def run(self, topic=None):
1013
class cmd_update_stat_cache(Command):
1014
"""Update stat-cache mapping inodes to SHA-1 hashes.
1016
For testing only."""
1021
statcache.update_cache(b.base, b.read_working_inventory())
1024
######################################################################
1028
# list of all available options; the rhs can be either None for an
1029
# option that takes no argument, or a constructor function that checks
1033
'diff-options': str,
1039
'revision': _parse_revision_str,
1055
def parse_args(argv):
1056
"""Parse command line.
1058
Arguments and options are parsed at this level before being passed
1059
down to specific command handlers. This routine knows, from a
1060
lookup table, something about the available options, what optargs
1061
they take, and which commands will accept them.
1063
>>> parse_args('--help'.split())
1064
([], {'help': True})
1065
>>> parse_args('--version'.split())
1066
([], {'version': True})
1067
>>> parse_args('status --all'.split())
1068
(['status'], {'all': True})
1069
>>> parse_args('commit --message=biter'.split())
1070
(['commit'], {'message': u'biter'})
1075
# TODO: Maybe handle '--' to end options?
1080
# option names must not be unicode
1084
mutter(" got option %r" % a)
1086
optname, optarg = a[2:].split('=', 1)
1089
if optname not in OPTIONS:
1090
bailout('unknown long option %r' % a)
1093
if shortopt not in SHORT_OPTIONS:
1094
bailout('unknown short option %r' % a)
1095
optname = SHORT_OPTIONS[shortopt]
1098
# XXX: Do we ever want to support this, e.g. for -r?
1099
bailout('repeated option %r' % a)
1101
optargfn = OPTIONS[optname]
1105
bailout('option %r needs an argument' % a)
1107
optarg = argv.pop(0)
1108
opts[optname] = optargfn(optarg)
1111
bailout('option %r takes no argument' % optname)
1112
opts[optname] = True
1121
def _match_argform(cmd, takes_args, args):
1124
# step through args and takes_args, allowing appropriate 0-many matches
1125
for ap in takes_args:
1129
argdict[argname] = args.pop(0)
1130
elif ap[-1] == '*': # all remaining arguments
1132
argdict[argname + '_list'] = args[:]
1135
argdict[argname + '_list'] = None
1138
raise BzrCommandError("command %r needs one or more %s"
1139
% (cmd, argname.upper()))
1141
argdict[argname + '_list'] = args[:]
1143
elif ap[-1] == '$': # all but one
1145
raise BzrCommandError("command %r needs one or more %s"
1146
% (cmd, argname.upper()))
1147
argdict[argname + '_list'] = args[:-1]
1153
raise BzrCommandError("command %r requires argument %s"
1154
% (cmd, argname.upper()))
1156
argdict[argname] = args.pop(0)
1159
raise BzrCommandError("extra argument to command %s: %s"
1167
"""Execute a command.
1169
This is similar to main(), but without all the trappings for
1170
logging and error handling.
1172
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1175
args, opts = parse_args(argv[1:])
1183
elif 'version' in opts:
1186
cmd = str(args.pop(0))
1193
canonical_cmd, cmd_class = get_cmd_class(cmd)
1196
if 'profile' in opts:
1202
# check options are reasonable
1203
allowed = cmd_class.takes_options
1205
if oname not in allowed:
1206
raise BzrCommandError("option '--%s' is not allowed for command %r"
1209
# mix arguments and options into one dictionary
1210
cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
1212
for k, v in opts.items():
1213
cmdopts[k.replace('-', '_')] = v
1216
import hotshot, tempfile
1217
pffileno, pfname = tempfile.mkstemp()
1219
prof = hotshot.Profile(pfname)
1220
ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
1223
import hotshot.stats
1224
stats = hotshot.stats.load(pfname)
1226
stats.sort_stats('time')
1227
## XXX: Might like to write to stderr or the trace file instead but
1228
## print_stats seems hardcoded to stdout
1229
stats.print_stats(20)
1237
return cmd_class(cmdopts, cmdargs).status
1240
def _report_exception(summary, quiet=False):
1242
log_error('bzr: ' + summary)
1243
bzrlib.trace.log_exception()
1246
tb = sys.exc_info()[2]
1247
exinfo = traceback.extract_tb(tb)
1249
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
1250
sys.stderr.write(' see ~/.bzr.log for debug information\n')
1257
bzrlib.open_tracefile(argv)
1262
return run_bzr(argv)
1264
# do this here inside the exception wrappers to catch EPIPE
1267
quiet = isinstance(e, (BzrCommandError))
1268
_report_exception('error: ' + e.args[0], quiet=quiet)
1271
# some explanation or hints
1274
except AssertionError, e:
1275
msg = 'assertion failed'
1277
msg += ': ' + str(e)
1278
_report_exception(msg)
1280
except KeyboardInterrupt, e:
1281
_report_exception('interrupted', quiet=True)
1283
except Exception, e:
1285
if (isinstance(e, IOError)
1286
and hasattr(e, 'errno')
1287
and e.errno == errno.EPIPE):
1291
msg = str(e).rstrip('\n')
1292
_report_exception(msg, quiet)
1295
bzrlib.trace.close_trace()
1298
if __name__ == '__main__':
1299
sys.exit(main(sys.argv))
added
removed
bzrlib/commands.py
