1
# Copyright (C) 2004, 2005 by Martin Pool
2
# Copyright (C) 2005 by Canonical Ltd
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
# GNU General Public License for more details.
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Bazaar-NG -- a free distributed version-control tool
22
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
24
* Metadata format is not stable yet -- you may need to
25
discard history in the future.
27
* Many commands unimplemented or partially implemented.
29
* Space-inefficient storage.
31
* No merge operators yet.
38
Show software version/licence/non-warranty.
40
Start versioning the current directory
44
Show revision history.
46
Show changes from last revision to working copy.
47
bzr commit -m 'MESSAGE'
48
Store current state as new revision.
49
bzr export REVNO DESTINATION
50
Export the branch state at a previous version.
52
Show summary of pending changes.
54
Make a file not versioned.
56
Show statistics about this branch.
58
Verify history is stored safely.
59
(for more type 'bzr help commands')
65
import sys, os, time, types, shutil, tempfile, fnmatch, difflib, os.path
67
from pprint import pprint
70
from inspect import getdoc
73
from bzrlib.store import ImmutableStore
74
from bzrlib.trace import mutter, note, log_error
75
from bzrlib.errors import bailout, BzrError, BzrCheckError
76
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
77
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
78
from bzrlib.revision import Revision
79
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
82
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
83
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
85
## standard representation
86
NONE_STRING = '(none)'
90
## TODO: Perhaps a different version of inventory commands that
91
## returns iterators...
93
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
95
## TODO: Some kind of locking on branches. Perhaps there should be a
96
## parameter to the branch object saying whether we want a read or
97
## write lock; release it from destructor. Perhaps don't even need a
98
## read lock to look at immutable objects?
100
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
101
## to compare output?
103
## TODO: Some kind of global code to generate the right Branch object
104
## to work on. Almost, but not quite all, commands need one, and it
105
## can be taken either from their parameters or their working
108
## TODO: rename command, needed soon: check destination doesn't exist
109
## either in working copy or tree; move working copy; update
110
## inventory; write out
112
## TODO: move command; check destination is a directory and will not
115
## TODO: command to show renames, one per line, as to->from
129
def get_cmd_handler(cmd):
132
cmd = cmd_aliases.get(cmd, cmd)
135
cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
137
raise BzrError("unknown command %r" % cmd)
139
return cmd, cmd_handler
143
def cmd_status(all=False):
144
"""Display status summary.
146
For each file there is a single line giving its file state and name.
147
The name is that in the current revision unless it is deleted or
148
missing, in which case the old name is shown.
150
#import bzrlib.status
151
#bzrlib.status.tree_status(Branch('.'))
152
Branch('.').show_status(show_all=all)
156
######################################################################
158
def cmd_get_revision(revision_id):
159
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
162
def cmd_get_file_text(text_id):
163
"""Get contents of a file by hash."""
164
sf = Branch('.').text_store[text_id]
165
pumpfile(sf, sys.stdout)
169
######################################################################
174
"""Show number of revisions on this branch"""
175
print Branch('.').revno()
179
def cmd_add(file_list, verbose=False):
180
"""Add specified files or directories.
182
In non-recursive mode, all the named items are added, regardless
183
of whether they were previously ignored. A warning is given if
184
any of the named files are already versioned.
186
In recursive mode (the default), files are treated the same way
187
but the behaviour for directories is different. Directories that
188
are already versioned do not give a warning. All directories,
189
whether already versioned or not, are searched for files or
190
subdirectories that are neither versioned or ignored, and these
191
are added. This search proceeds recursively into versioned
194
Therefore simply saying 'bzr add .' will version all files that
195
are currently unknown.
197
TODO: Perhaps adding a file whose directly is not versioned should
198
recursively add that parent, rather than giving an error?
200
bzrlib.add.smart_add(file_list, verbose)
203
def cmd_relpath(filename):
204
"""Show path of file relative to root"""
205
print Branch(filename).relpath(filename)
209
def cmd_inventory(revision=None):
210
"""Show inventory of the current working copy."""
211
## TODO: Also optionally show a previous inventory
212
## TODO: Format options
215
inv = b.read_working_inventory()
217
inv = b.get_revision_inventory(b.lookup_revision(revision))
219
for path, entry in inv.iter_entries():
220
print '%-50s %s' % (entry.file_id, path)
224
# TODO: Maybe a 'mv' command that has the combined move/rename
225
# special behaviour of Unix?
227
def cmd_move(source_list, dest):
230
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
234
def cmd_rename(from_name, to_name):
235
"""Change the name of an entry.
237
usage: bzr rename FROM_NAME TO_NAME
240
bzr rename frob.c frobber.c
241
bzr rename src/frob.c lib/frob.c
243
It is an error if the destination name exists.
245
See also the 'move' command, which moves files into a different
246
directory without changing their name.
248
TODO: Some way to rename multiple files without invoking bzr for each
251
b.rename_one(b.relpath(from_name), b.relpath(to_name))
256
def cmd_renames(dir='.'):
257
"""Show list of renamed files.
259
usage: bzr renames [BRANCH]
261
TODO: Option to show renames between two historical versions.
263
TODO: Only show renames under dir, rather than in the whole branch.
266
old_inv = b.basis_tree().inventory
267
new_inv = b.read_working_inventory()
269
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
271
for old_name, new_name in renames:
272
print "%s => %s" % (old_name, new_name)
277
"""info: Show statistical information for this branch
281
info.show_info(Branch('.'))
285
def cmd_remove(file_list, verbose=False):
286
b = Branch(file_list[0])
287
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
291
def cmd_file_id(filename):
292
"""Print file_id of a particular file or directory.
294
usage: bzr file-id FILE
296
The file_id is assigned when the file is first added and remains the
297
same through all revisions where the file exists, even when it is
301
i = b.inventory.path2id(b.relpath(filename))
303
bailout("%r is not a versioned file" % filename)
308
def cmd_file_id_path(filename):
309
"""Print path of file_ids to a file or directory.
311
usage: bzr file-id-path FILE
313
This prints one line for each directory down to the target,
314
starting at the branch root."""
317
fid = inv.path2id(b.relpath(filename))
319
bailout("%r is not a versioned file" % filename)
320
for fip in inv.get_idpath(fid):
324
def cmd_revision_history():
325
for patchid in Branch('.').revision_history():
329
def cmd_directories():
330
for name, ie in Branch('.').read_working_inventory().directories():
338
for name, ie in Branch('.').working_tree().missing():
343
# TODO: Check we're not already in a working directory? At the
344
# moment you'll get an ugly error.
346
# TODO: What if we're in a subdirectory of a branch? Would like
347
# to allow that, but then the parent may need to understand that
348
# the children have disappeared, or should they be versioned in
351
# TODO: Take an argument/option for branch name.
352
Branch('.', init=True)
355
def cmd_diff(revision=None, file_list=None):
356
"""bzr diff: Show differences in working tree.
358
usage: bzr diff [-r REV] [FILE...]
361
Show changes since REV, rather than predecessor.
363
If files are listed, only the changes in those files are listed.
364
Otherwise, all changes for the tree are listed.
366
TODO: Given two revision arguments, show the difference between them.
368
TODO: Allow diff across branches.
370
TODO: Option to use external diff command; could be GNU diff, wdiff,
373
TODO: Python difflib is not exactly the same as unidiff; should
374
either fix it up or prefer to use an external diff.
376
TODO: If a directory is given, diff everything under that.
378
TODO: Selected-file diff is inefficient and doesn't show you
381
TODO: This probably handles non-Unix newlines poorly.
384
## TODO: Shouldn't be in the cmd function.
389
old_tree = b.basis_tree()
391
old_tree = b.revision_tree(b.lookup_revision(revision))
393
new_tree = b.working_tree()
395
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
399
DEVNULL = '/dev/null'
400
# Windows users, don't panic about this filename -- it is a
401
# special signal to GNU patch that the file should be created or
402
# deleted respectively.
404
# TODO: Generation of pseudo-diffs for added/deleted files could
405
# be usefully made into a much faster special case.
407
# TODO: Better to return them in sorted order I think.
410
file_list = [b.relpath(f) for f in file_list]
412
# FIXME: If given a file list, compare only those files rather
413
# than comparing everything and then throwing stuff away.
415
for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
417
if file_list and (new_name not in file_list):
420
# Don't show this by default; maybe do it if an option is passed
421
# idlabel = ' {%s}' % fid
424
# FIXME: Something about the diff format makes patch unhappy
425
# with newly-added files.
427
def diffit(oldlines, newlines, **kw):
429
# FIXME: difflib is wrong if there is no trailing newline.
430
# The syntax used by patch seems to be "\ No newline at
431
# end of file" following the last diff line from that
432
# file. This is not trivial to insert into the
433
# unified_diff output and it might be better to just fix
434
# or replace that function.
436
# In the meantime we at least make sure the patch isn't
440
# Special workaround for Python2.3, where difflib fails if
441
# both sequences are empty.
442
if not oldlines and not newlines:
447
if oldlines and (oldlines[-1][-1] != '\n'):
450
if newlines and (newlines[-1][-1] != '\n'):
454
ud = difflib.unified_diff(oldlines, newlines, **kw)
455
sys.stdout.writelines(ud)
457
print "\\ No newline at end of file"
458
sys.stdout.write('\n')
460
if file_state in ['.', '?', 'I']:
462
elif file_state == 'A':
463
print '*** added %s %r' % (kind, new_name)
466
new_tree.get_file(fid).readlines(),
468
tofile=new_label + new_name + idlabel)
469
elif file_state == 'D':
470
assert isinstance(old_name, types.StringTypes)
471
print '*** deleted %s %r' % (kind, old_name)
473
diffit(old_tree.get_file(fid).readlines(), [],
474
fromfile=old_label + old_name + idlabel,
476
elif file_state in ['M', 'R']:
477
if file_state == 'M':
478
assert kind == 'file'
479
assert old_name == new_name
480
print '*** modified %s %r' % (kind, new_name)
481
elif file_state == 'R':
482
print '*** renamed %s %r => %r' % (kind, old_name, new_name)
485
diffit(old_tree.get_file(fid).readlines(),
486
new_tree.get_file(fid).readlines(),
487
fromfile=old_label + old_name + idlabel,
488
tofile=new_label + new_name)
490
bailout("can't represent state %s {%s}" % (file_state, fid))
494
def cmd_deleted(show_ids=False):
495
"""List files deleted in the working tree.
497
TODO: Show files deleted since a previous revision, or between two revisions.
501
new = b.working_tree()
503
## TODO: Much more efficient way to do this: read in new
504
## directories with readdir, rather than stating each one. Same
505
## level of effort but possibly much less IO. (Or possibly not,
506
## if the directories are very large...)
508
for path, ie in old.inventory.iter_entries():
509
if not new.has_id(ie.file_id):
511
print '%-50s %s' % (path, ie.file_id)
517
def cmd_parse_inventory():
520
cElementTree.ElementTree().parse(file('.bzr/inventory'))
524
def cmd_load_inventory():
525
"""Load inventory for timing purposes"""
526
Branch('.').basis_tree().inventory
529
def cmd_dump_inventory():
530
Branch('.').read_working_inventory().write_xml(sys.stdout)
533
def cmd_dump_new_inventory():
534
import bzrlib.newinventory
535
inv = Branch('.').basis_tree().inventory
536
bzrlib.newinventory.write_inventory(inv, sys.stdout)
539
def cmd_load_new_inventory():
540
import bzrlib.newinventory
541
bzrlib.newinventory.read_new_inventory(sys.stdin)
544
def cmd_dump_slacker_inventory():
545
import bzrlib.newinventory
546
inv = Branch('.').basis_tree().inventory
547
bzrlib.newinventory.write_slacker_inventory(inv, sys.stdout)
551
def cmd_dump_text_inventory():
552
import bzrlib.textinv
553
inv = Branch('.').basis_tree().inventory
554
bzrlib.textinv.write_text_inventory(inv, sys.stdout)
557
def cmd_load_text_inventory():
558
import bzrlib.textinv
559
inv = bzrlib.textinv.read_text_inventory(sys.stdin)
560
print 'loaded %d entries' % len(inv)
564
def cmd_root(filename=None):
565
"""Print the branch root."""
566
print bzrlib.branch.find_branch_root(filename)
569
def cmd_log(timezone='original', verbose=False):
570
"""Show log of this branch.
572
TODO: Options for utc; to show ids; to limit range; etc.
574
Branch('.').write_log(show_timezone=timezone, verbose=verbose)
577
def cmd_ls(revision=None, verbose=False):
578
"""List files in a tree.
580
TODO: Take a revision or remote path and list that tree instead.
584
tree = b.working_tree()
586
tree = b.revision_tree(b.lookup_revision(revision))
588
for fp, fc, kind, fid in tree.list_files():
590
if kind == 'directory':
597
print '%-8s %s%s' % (fc, fp, kindch)
604
"""List unknown files"""
605
for f in Branch('.').unknowns():
611
"""List ignored files and the patterns that matched them.
613
tree = Branch('.').working_tree()
614
for path, file_class, kind, file_id in tree.list_files():
615
if file_class != 'I':
617
## XXX: Slightly inefficient since this was already calculated
618
pat = tree.is_ignored(path)
619
print '%-50s %s' % (path, pat)
622
def cmd_lookup_revision(revno):
626
bailout("usage: lookup-revision REVNO",
627
["REVNO is a non-negative revision number for this branch"])
629
print Branch('.').lookup_revision(revno) or NONE_STRING
633
def cmd_export(revno, dest):
634
"""Export past revision to destination directory."""
636
rh = b.lookup_revision(int(revno))
637
t = b.revision_tree(rh)
640
def cmd_cat(revision, filename):
641
"""Print file to stdout."""
643
b.print_file(b.relpath(filename), int(revision))
646
######################################################################
647
# internal/test commands
651
"""Print a newly-generated UUID."""
652
print bzrlib.osutils.uuid()
656
def cmd_local_time_offset():
657
print bzrlib.osutils.local_time_offset()
661
def cmd_commit(message=None, verbose=False):
662
"""Commit changes to a new revision.
665
Description of changes in this revision; free form text.
666
It is recommended that the first line be a single-sentence
669
Show status of changed files,
671
TODO: Commit only selected files.
673
TODO: Run hooks on tree to-be-committed, and after commit.
675
TODO: Strict commit that fails if there are unknown or deleted files.
679
bailout("please specify a commit message")
680
Branch('.').commit(message, verbose=verbose)
683
def cmd_check(dir='.'):
684
"""check: Consistency check of branch history.
686
usage: bzr check [-v] [BRANCH]
689
--verbose, -v Show progress of checking.
691
This command checks various invariants about the branch storage to
692
detect data corruption or bzr bugs.
695
bzrlib.check.check(Branch(dir, find_root=False))
698
def cmd_is(pred, *rest):
699
"""Test whether PREDICATE is true."""
701
cmd_handler = globals()['assert_' + pred.replace('-', '_')]
703
bailout("unknown predicate: %s" % quotefn(pred))
707
except BzrCheckError:
708
# by default we don't print the message so that this can
709
# be used from shell scripts without producing noise
718
TODO: Command to show only the email-address part as parsed out.
720
print bzrlib.osutils.username()
723
def cmd_gen_revision_id():
724
print bzrlib.branch._gen_revision_id(time.time())
728
"""Run internal test suite"""
729
## -v, if present, is seen by doctest; the argument is just here
730
## so our parser doesn't complain
732
## TODO: --verbose option
734
failures, tests = 0, 0
736
import doctest, bzrlib.store, bzrlib.tests
737
bzrlib.trace.verbose = False
739
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
740
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
741
mf, mt = doctest.testmod(m)
744
print '%-40s %3d tests' % (m.__name__, mt),
746
print '%3d FAILED!' % mf
750
print '%-40s %3d tests' % ('total', tests),
752
print '%3d FAILED!' % failures
759
cmd_doctest = cmd_selftest
762
######################################################################
766
def cmd_help(topic=None):
769
elif topic == 'commands':
772
# otherwise, maybe the name of a command?
773
topic, cmdfn = get_cmd_handler(topic)
777
bailout("sorry, no detailed help yet for %r" % topic)
783
"""List all commands"""
785
for k in globals().keys():
786
if k.startswith('cmd_'):
787
accu.append(k[4:].replace('_','-'))
789
print "bzr commands: "
792
print "note: some of these commands are internal-use or obsolete"
793
# TODO: Some kind of marker for internal-use commands?
794
# TODO: Show aliases?
800
print "bzr (bazaar-ng) %s" % bzrlib.__version__
801
print bzrlib.__copyright__
802
print "http://bazaar-ng.org/"
805
"""bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
806
you may use, modify and redistribute it under the terms of the GNU
807
General Public License version 2 or later."""
811
"""Statement of optimism."""
812
print "it sure does!"
816
######################################################################
820
# list of all available options; the rhs can be either None for an
821
# option that takes no argument, or a constructor function that checks
841
# List of options that apply to particular commands; commands not
846
'commit': ['message', 'verbose'],
847
'deleted': ['show-ids'],
848
'diff': ['revision'],
849
'inventory': ['revision'],
850
'log': ['timezone', 'verbose'],
851
'ls': ['revision', 'verbose'],
852
'remove': ['verbose'],
862
'export': ['revno', 'dest'],
863
'file-id': ['filename'],
864
'file-id-path': ['filename'],
865
'get-file-text': ['text_id'],
866
'get-inventory': ['inventory_id'],
867
'get-revision': ['revision_id'],
868
'get-revision-inventory': ['revision_id'],
872
'lookup-revision': ['revno'],
873
'move': ['source$', 'dest'],
874
'relpath': ['filename'],
876
'rename': ['from_name', 'to_name'],
878
'root': ['filename?'],
883
def parse_args(argv):
884
"""Parse command line.
886
Arguments and options are parsed at this level before being passed
887
down to specific command handlers. This routine knows, from a
888
lookup table, something about the available options, what optargs
889
they take, and which commands will accept them.
891
>>> parse_args('--help'.split())
893
>>> parse_args('--version'.split())
894
([], {'version': True})
895
>>> parse_args('status --all'.split())
896
(['status'], {'all': True})
897
>>> parse_args('commit --message=biter'.split())
898
(['commit'], {'message': u'biter'})
903
# TODO: Maybe handle '--' to end options?
908
# option names must not be unicode
912
mutter(" got option %r" % a)
914
optname, optarg = a[2:].split('=', 1)
917
if optname not in OPTIONS:
918
bailout('unknown long option %r' % a)
921
if shortopt not in SHORT_OPTIONS:
922
bailout('unknown short option %r' % a)
923
optname = SHORT_OPTIONS[shortopt]
926
# XXX: Do we ever want to support this, e.g. for -r?
927
bailout('repeated option %r' % a)
929
optargfn = OPTIONS[optname]
933
bailout('option %r needs an argument' % a)
936
opts[optname] = optargfn(optarg)
939
bailout('option %r takes no argument' % optname)
948
def _match_args(cmd, args):
949
"""Check non-option arguments match required pattern.
951
>>> _match_args('status', ['asdasdsadasd'])
952
Traceback (most recent call last):
954
BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
955
>>> _match_args('add', ['asdasdsadasd'])
956
{'file_list': ['asdasdsadasd']}
957
>>> _match_args('add', 'abc def gj'.split())
958
{'file_list': ['abc', 'def', 'gj']}
960
# match argument pattern
961
argform = cmd_args.get(cmd, [])
963
# TODO: Need a way to express 'cp SRC... DEST', where it matches
966
# step through args and argform, allowing appropriate 0-many matches
971
argdict[argname] = args.pop(0)
972
elif ap[-1] == '*': # all remaining arguments
974
argdict[argname + '_list'] = args[:]
977
argdict[argname + '_list'] = None
980
bailout("command %r needs one or more %s"
981
% (cmd, argname.upper()))
983
argdict[argname + '_list'] = args[:]
985
elif ap[-1] == '$': # all but one
987
bailout("command %r needs one or more %s"
988
% (cmd, argname.upper()))
989
argdict[argname + '_list'] = args[:-1]
995
bailout("command %r requires argument %s"
996
% (cmd, argname.upper()))
998
argdict[argname] = args.pop(0)
1001
bailout("extra arguments to command %s: %r"
1009
"""Execute a command.
1011
This is similar to main(), but without all the trappings for
1012
logging and error handling.
1015
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1018
args, opts = parse_args(argv[1:])
1020
# TODO: pass down other arguments in case they asked for
1021
# help on a command name?
1027
elif 'version' in opts:
1030
cmd = str(args.pop(0))
1032
log_error('usage: bzr COMMAND')
1033
log_error(' try "bzr help"')
1036
canonical_cmd, cmd_handler = get_cmd_handler(cmd)
1039
if 'profile' in opts:
1045
# check options are reasonable
1046
allowed = cmd_options.get(canonical_cmd, [])
1048
if oname not in allowed:
1049
bailout("option %r is not allowed for command %r"
1052
# TODO: give an error if there are any mandatory options which are
1053
# not specified? Or maybe there shouldn't be any "mandatory
1054
# options" (it is an oxymoron)
1056
# mix arguments and options into one dictionary
1057
cmdargs = _match_args(canonical_cmd, args)
1058
for k, v in opts.items():
1059
cmdargs[k.replace('-', '_')] = v
1063
pffileno, pfname = tempfile.mkstemp()
1065
prof = hotshot.Profile(pfname)
1066
ret = prof.runcall(cmd_handler, **cmdargs) or 0
1069
import hotshot.stats
1070
stats = hotshot.stats.load(pfname)
1072
stats.sort_stats('time')
1073
## XXX: Might like to write to stderr or the trace file instead but
1074
## print_stats seems hardcoded to stdout
1075
stats.print_stats(20)
1083
return cmd_handler(**cmdargs) or 0
1087
def _report_exception(e, summary):
1089
log_error('bzr: ' + summary)
1090
bzrlib.trace.log_exception(e)
1091
tb = sys.exc_info()[2]
1092
exinfo = traceback.extract_tb(tb)
1094
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
1095
sys.stderr.write(' see ~/.bzr.log for debug information\n')
1098
def cmd_assert_fail():
1099
assert False, "always fails"
1103
bzrlib.trace.create_tracefile(argv)
1110
_report_exception(e, 'error: ' + e.args[0])
1113
# some explanation or hints
1116
except AssertionError, e:
1117
msg = 'assertion failed'
1119
msg += ': ' + str(e)
1120
_report_exception(e, msg)
1121
except Exception, e:
1122
_report_exception(e, 'exception: %s' % str(e).rstrip('\n'))
1125
bzrlib.trace.close_trace()
1127
## TODO: Trap AssertionError
1129
# TODO: Maybe nicer handling of IOError especially for broken pipe.
1133
if __name__ == '__main__':
1134
sys.exit(main(sys.argv))
added
removed
bzrlib/commands.py
