14
16
# along with this program; if not, write to the Free Software
15
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Bazaar-NG -- a free distributed version-control tool
21
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
23
Current limitation include:
25
* Metadata format is not stable yet -- you may need to
26
discard history in the future.
28
* Insufficient error handling.
30
* Many commands unimplemented or partially implemented.
32
* Space-inefficient storage.
34
* No merge operators yet.
36
Interesting commands::
41
Show software version/licence/non-warranty.
43
Start versioning the current directory
47
Show revision history.
49
Show changes from last revision to working copy.
50
bzr commit -m 'MESSAGE'
51
Store current state as new revision.
52
bzr export REVNO DESTINATION
53
Export the branch state at a previous version.
55
Show summary of pending changes.
57
Make a file not versioned.
59
Show statistics about this branch.
65
import sys, os, random, time, sha, sets, types, re, shutil, tempfile
66
import traceback, socket, fnmatch, difflib
69
from pprint import pprint
22
from bzrlib.trace import mutter, note, log_error, warning
23
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.branch import find_branch
25
from bzrlib import BZRDIR
31
def register_command(cmd):
32
"Utility function to help register a command"
35
if k.startswith("cmd_"):
36
k_unsquished = _unsquish_command_name(k)
39
if not plugin_cmds.has_key(k_unsquished):
40
plugin_cmds[k_unsquished] = cmd
42
log_error('Two plugins defined the same command: %r' % k)
43
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
46
def _squish_command_name(cmd):
47
return 'cmd_' + cmd.replace('-', '_')
50
def _unsquish_command_name(cmd):
51
assert cmd.startswith("cmd_")
52
return cmd[4:].replace('_','-')
55
def _parse_revision_str(revstr):
56
"""This handles a revision string -> revno.
58
This always returns a list. The list will have one element for
60
It supports integers directly, but everything else it
61
defers for passing to Branch.get_revision_info()
63
>>> _parse_revision_str('234')
65
>>> _parse_revision_str('234..567')
67
>>> _parse_revision_str('..')
69
>>> _parse_revision_str('..234')
71
>>> _parse_revision_str('234..')
73
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
75
>>> _parse_revision_str('234....789') # Error?
77
>>> _parse_revision_str('revid:test@other.com-234234')
78
['revid:test@other.com-234234']
79
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
80
['revid:test@other.com-234234', 'revid:test@other.com-234235']
81
>>> _parse_revision_str('revid:test@other.com-234234..23')
82
['revid:test@other.com-234234', 23]
83
>>> _parse_revision_str('date:2005-04-12')
85
>>> _parse_revision_str('date:2005-04-12 12:24:33')
86
['date:2005-04-12 12:24:33']
87
>>> _parse_revision_str('date:2005-04-12T12:24:33')
88
['date:2005-04-12T12:24:33']
89
>>> _parse_revision_str('date:2005-04-12,12:24:33')
90
['date:2005-04-12,12:24:33']
91
>>> _parse_revision_str('-5..23')
93
>>> _parse_revision_str('-5')
95
>>> _parse_revision_str('123a')
97
>>> _parse_revision_str('abc')
101
old_format_re = re.compile('\d*:\d*')
102
m = old_format_re.match(revstr)
104
warning('Colon separator for revision numbers is deprecated.'
107
for rev in revstr.split(':'):
109
revs.append(int(rev))
114
for x in revstr.split('..'):
126
def _get_cmd_dict(plugins_override=True):
128
for k, v in globals().iteritems():
129
if k.startswith("cmd_"):
130
d[_unsquish_command_name(k)] = v
131
# If we didn't load plugins, the plugin_cmds dict will be empty
133
d.update(plugin_cmds)
135
d2 = plugin_cmds.copy()
141
def get_all_cmds(plugins_override=True):
142
"""Return canonical name and class for all registered commands."""
143
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
147
def get_cmd_class(cmd, plugins_override=True):
148
"""Return the canonical name and command class for a command.
150
cmd = str(cmd) # not unicode
152
# first look up this command under the specified name
153
cmds = _get_cmd_dict(plugins_override=plugins_override)
155
return cmd, cmds[cmd]
159
# look for any command which claims this as an alias
160
for cmdname, cmdclass in cmds.iteritems():
161
if cmd in cmdclass.aliases:
162
return cmdname, cmdclass
164
cmdclass = ExternalCommand.find_command(cmd)
168
raise BzrCommandError("unknown command %r" % cmd)
171
class Command(object):
172
"""Base class for commands.
174
The docstring for an actual command should give a single-line
175
summary, then a complete description of the command. A grammar
176
description will be inserted.
179
List of argument forms, marked with whether they are optional,
183
List of options that may be given for this command.
186
If true, this command isn't advertised.
195
def __init__(self, options, arguments):
196
"""Construct and run the command.
198
Sets self.status to the return value of run()."""
199
assert isinstance(options, dict)
200
assert isinstance(arguments, dict)
201
cmdargs = options.copy()
202
cmdargs.update(arguments)
203
assert self.__doc__ != Command.__doc__, \
204
("No help message set for %r" % self)
205
self.status = self.run(**cmdargs)
209
"""Override this in sub-classes.
211
This is invoked with the options and arguments bound to
214
Return 0 or None if the command was successful, or a shell
220
class ExternalCommand(Command):
221
"""Class to wrap external commands.
223
We cheat a little here, when get_cmd_class() calls us we actually give it back
224
an object we construct that has the appropriate path, help, options etc for the
227
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
228
method, which we override to call the Command.__init__ method. That then calls
229
our run method which is pretty straight forward.
231
The only wrinkle is that we have to map bzr's dictionary of options and arguments
232
back into command line options and arguments for the script.
235
def find_command(cls, cmd):
237
bzrpath = os.environ.get('BZRPATH', '')
239
for dir in bzrpath.split(os.pathsep):
240
path = os.path.join(dir, cmd)
241
if os.path.isfile(path):
242
return ExternalCommand(path)
246
find_command = classmethod(find_command)
248
def __init__(self, path):
251
pipe = os.popen('%s --bzr-usage' % path, 'r')
252
self.takes_options = pipe.readline().split()
254
for opt in self.takes_options:
255
if not opt in OPTIONS:
256
raise BzrError("Unknown option '%s' returned by external command %s"
259
# TODO: Is there any way to check takes_args is valid here?
260
self.takes_args = pipe.readline().split()
262
if pipe.close() is not None:
263
raise BzrError("Failed funning '%s --bzr-usage'" % path)
265
pipe = os.popen('%s --bzr-help' % path, 'r')
266
self.__doc__ = pipe.read()
267
if pipe.close() is not None:
268
raise BzrError("Failed funning '%s --bzr-help'" % path)
270
def __call__(self, options, arguments):
271
Command.__init__(self, options, arguments)
274
def run(self, **kargs):
281
optname = name.replace('_','-')
283
if OPTIONS.has_key(optname):
285
opts.append('--%s' % optname)
286
if value is not None and value is not True:
287
opts.append(str(value))
289
# it's an arg, or arg list
290
if type(value) is not list:
296
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
300
class cmd_status(Command):
74
from bzrlib.store import ImmutableStore
75
from bzrlib.trace import mutter, note, log_error
76
from bzrlib.errors import bailout, BzrError
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)'
91
## TODO: Perhaps a different version of inventory commands that
92
## returns iterators...
94
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
96
## TODO: Some kind of locking on branches. Perhaps there should be a
97
## parameter to the branch object saying whether we want a read or
98
## write lock; release it from destructor. Perhaps don't even need a
99
## read lock to look at immutable objects?
101
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
102
## to compare output?
104
## TODO: Some kind of global code to generate the right Branch object
105
## to work on. Almost, but not quite all, commands need one, and it
106
## can be taken either from their parameters or their working
109
## TODO: rename command, needed soon: check destination doesn't exist
110
## either in working copy or tree; move working copy; update
111
## inventory; write out
113
## TODO: move command; check destination is a directory and will not
116
## TODO: command to show renames, one per line, as to->from
121
def cmd_status(all=False):
301
122
"""Display status summary.
303
This reports on versioned and unknown files, reporting them
304
grouped by state. Possible states are:
307
Versioned in the working copy but not in the previous revision.
310
Versioned in the previous revision but removed or deleted
314
Path of this file changed from the previous revision;
315
the text may also have changed. This includes files whose
316
parent directory was renamed.
319
Text has changed since the previous revision.
322
Nothing about this file has changed since the previous revision.
323
Only shown with --all.
326
Not versioned and not matching an ignore pattern.
328
To see ignored files use 'bzr ignored'. For details in the
329
changes to file texts, use 'bzr diff'.
331
If no arguments are specified, the status of the entire working
332
directory is shown. Otherwise, only the status of the specified
333
files or directories is reported. If a directory is given, status
334
is reported for everything inside that directory.
336
If a revision is specified, the changes since that revision are shown.
338
takes_args = ['file*']
339
takes_options = ['all', 'show-ids', 'revision']
340
aliases = ['st', 'stat']
342
def run(self, all=False, show_ids=False, file_list=None):
344
b = find_branch(file_list[0])
345
file_list = [b.relpath(x) for x in file_list]
346
# special case: only one path was given and it's the root
348
if file_list == ['']:
353
from bzrlib.status import show_status
354
show_status(b, show_unchanged=all, show_ids=show_ids,
355
specific_files=file_list)
358
class cmd_cat_revision(Command):
359
"""Write out metadata for a revision."""
362
takes_args = ['revision_id']
364
def run(self, revision_id):
365
from bzrlib.xml import pack_xml
366
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
369
class cmd_revno(Command):
370
"""Show current revision number.
372
This is equal to the number of revisions on this branch."""
374
print find_branch('.').revno()
376
class cmd_revision_info(Command):
377
"""Show revision number and revision id for a given revision identifier.
380
takes_args = ['revision_info*']
381
takes_options = ['revision']
382
def run(self, revision=None, revision_info_list=None):
383
from bzrlib.branch import find_branch
386
if revision is not None:
387
revs.extend(revision)
388
if revision_info_list is not None:
389
revs.extend(revision_info_list)
391
raise BzrCommandError('You must supply a revision identifier')
396
print '%4d %s' % b.get_revision_info(rev)
399
class cmd_add(Command):
124
For each file there is a single line giving its file state and name.
125
The name is that in the current revision unless it is deleted or
126
missing, in which case the old name is shown.
128
:todo: Don't show unchanged files unless ``--all`` is given?
130
Branch('.').show_status(show_all=all)
134
######################################################################
136
def cmd_get_revision(revision_id):
137
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
140
def cmd_get_file_text(text_id):
141
"""Get contents of a file by hash."""
142
sf = Branch('.').text_store[text_id]
143
pumpfile(sf, sys.stdout)
147
######################################################################
152
"""Show number of revisions on this branch"""
153
print Branch('.').revno()
157
def cmd_add(file_list, verbose=False):
400
158
"""Add specified files or directories.
402
160
In non-recursive mode, all the named items are added, regardless
414
172
Therefore simply saying 'bzr add .' will version all files that
415
173
are currently unknown.
417
TODO: Perhaps adding a file whose directly is not versioned should
418
recursively add that parent, rather than giving an error?
420
takes_args = ['file+']
421
takes_options = ['verbose', 'no-recurse']
175
bzrlib.add.smart_add(file_list, verbose)
423
def run(self, file_list, verbose=False, no_recurse=False):
424
from bzrlib.add import smart_add
425
smart_add(file_list, verbose, not no_recurse)
429
class cmd_mkdir(Command):
430
"""Create a new versioned directory.
432
This is equivalent to creating the directory and then adding it.
434
takes_args = ['dir+']
436
def run(self, dir_list):
178
def cmd_relpath(filename):
179
"""Show path of file relative to root"""
180
print Branch(filename).relpath(filename)
184
def cmd_inventory(revision=None):
185
"""Show inventory of the current working copy."""
186
## TODO: Also optionally show a previous inventory
187
## TODO: Format options
190
inv = b.read_working_inventory()
192
inv = b.get_revision_inventory(b.lookup_revision(revision))
443
b.add([d], verbose=True)
446
class cmd_relpath(Command):
447
"""Show path of a file relative to root"""
448
takes_args = ['filename']
451
def run(self, filename):
452
print find_branch(filename).relpath(filename)
456
class cmd_inventory(Command):
457
"""Show inventory of the current working copy or a revision."""
458
takes_options = ['revision', 'show-ids']
460
def run(self, revision=None, show_ids=False):
463
inv = b.read_working_inventory()
465
if len(revision) > 1:
466
raise BzrCommandError('bzr inventory --revision takes'
467
' exactly one revision identifier')
468
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
470
for path, entry in inv.entries():
472
print '%-50s %s' % (path, entry.file_id)
477
class cmd_move(Command):
478
"""Move files to a different directory.
483
The destination must be a versioned directory in the same branch.
485
takes_args = ['source$', 'dest']
486
def run(self, source_list, dest):
489
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
492
class cmd_rename(Command):
194
for path, entry in inv.iter_entries():
195
print '%-50s %s' % (entry.file_id, path)
199
def cmd_mv(source_list, dest):
202
b.rename([b.relpath(s) for s in source_list], b.relpath(dest))
206
def cmd_rename(from_name, to_name):
493
207
"""Change the name of an entry.
496
bzr rename frob.c frobber.c
497
bzr rename src/frob.c lib/frob.c
499
It is an error if the destination name exists.
501
See also the 'move' command, which moves files into a different
502
directory without changing their name.
504
TODO: Some way to rename multiple files without invoking bzr for each
506
takes_args = ['from_name', 'to_name']
209
usage: bzr rename FROM_NAME TO_NAME
212
bzr rename frob.c frobber.c
213
bzr rename src/frob.c lib/frob.c
215
It is an error if the destination name exists.
217
See also the 'move' command, which moves files into a different
218
directory without changing their name.
220
TODO: Some way to rename multiple files without invoking bzr for each
223
b.rename_one(b.relpath(from_name), b.relpath(to_name))
508
def run(self, from_name, to_name):
510
b.rename_one(b.relpath(from_name), b.relpath(to_name))
516
class cmd_pull(Command):
517
"""Pull any changes from another branch into the current one.
519
If the location is omitted, the last-used location will be used.
520
Both the revision history and the working directory will be
523
This command only works on branches that have not diverged. Branches are
524
considered diverged if both branches have had commits without first
525
pulling from the other.
527
If branches have diverged, you can use 'bzr merge' to pull the text changes
528
from one into the other.
530
takes_args = ['location?']
532
def run(self, location=None):
533
from bzrlib.merge import merge
535
from shutil import rmtree
538
br_to = find_branch('.')
541
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
543
if e.errno != errno.ENOENT:
546
if stored_loc is None:
547
raise BzrCommandError("No pull location known or specified.")
549
print "Using last location: %s" % stored_loc
550
location = stored_loc
551
cache_root = tempfile.mkdtemp()
552
from bzrlib.branch import DivergedBranches
553
br_from = find_branch(location)
554
location = pull_loc(br_from)
555
old_revno = br_to.revno()
557
from branch import find_cached_branch, DivergedBranches
558
br_from = find_cached_branch(location, cache_root)
559
location = pull_loc(br_from)
560
old_revno = br_to.revno()
562
br_to.update_revisions(br_from)
563
except DivergedBranches:
564
raise BzrCommandError("These branches have diverged."
567
merge(('.', -1), ('.', old_revno), check_clean=False)
568
if location != stored_loc:
569
br_to.controlfile("x-pull", "wb").write(location + "\n")
575
class cmd_branch(Command):
576
"""Create a new copy of a branch.
578
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
579
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
581
To retrieve the branch as of a particular revision, supply the --revision
582
parameter, as in "branch foo/bar -r 5".
584
takes_args = ['from_location', 'to_location?']
585
takes_options = ['revision']
587
def run(self, from_location, to_location=None, revision=None):
589
from bzrlib.merge import merge
590
from bzrlib.branch import DivergedBranches, NoSuchRevision, \
591
find_cached_branch, Branch
592
from shutil import rmtree
593
from meta_store import CachedStore
595
cache_root = tempfile.mkdtemp()
599
elif len(revision) > 1:
600
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
604
br_from = find_cached_branch(from_location, cache_root)
606
if e.errno == errno.ENOENT:
607
raise BzrCommandError('Source location "%s" does not'
608
' exist.' % to_location)
612
if to_location is None:
613
to_location = os.path.basename(from_location.rstrip("/\\"))
616
os.mkdir(to_location)
618
if e.errno == errno.EEXIST:
619
raise BzrCommandError('Target directory "%s" already'
620
' exists.' % to_location)
621
if e.errno == errno.ENOENT:
622
raise BzrCommandError('Parent of "%s" does not exist.' %
626
br_to = Branch(to_location, init=True)
628
br_to.set_root_id(br_from.get_root_id())
631
if revision[0] is None:
632
revno = br_from.revno()
634
revno, rev_id = br_from.get_revision_info(revision[0])
636
br_to.update_revisions(br_from, stop_revision=revno)
637
except NoSuchRevision:
639
msg = "The branch %s has no revision %d." % (from_location,
641
raise BzrCommandError(msg)
643
merge((to_location, -1), (to_location, 0), this_dir=to_location,
644
check_clean=False, ignore_zero=True)
645
from_location = pull_loc(br_from)
646
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
651
def pull_loc(branch):
652
# TODO: Should perhaps just make attribute be 'base' in
653
# RemoteBranch and Branch?
654
if hasattr(branch, "baseurl"):
655
return branch.baseurl
661
class cmd_renames(Command):
228
def cmd_renames(dir='.'):
662
229
"""Show list of renamed files.
664
TODO: Option to show renames between two historical versions.
666
TODO: Only show renames under dir, rather than in the whole branch.
668
takes_args = ['dir?']
670
def run(self, dir='.'):
672
old_inv = b.basis_tree().inventory
673
new_inv = b.read_working_inventory()
675
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
677
for old_name, new_name in renames:
678
print "%s => %s" % (old_name, new_name)
681
class cmd_info(Command):
682
"""Show statistical information about a branch."""
683
takes_args = ['branch?']
685
def run(self, branch=None):
688
b = find_branch(branch)
692
class cmd_remove(Command):
693
"""Make a file unversioned.
695
This makes bzr stop tracking changes to a versioned file. It does
696
not delete the working copy.
698
takes_args = ['file+']
699
takes_options = ['verbose']
701
def run(self, file_list, verbose=False):
702
b = find_branch(file_list[0])
703
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
706
class cmd_file_id(Command):
707
"""Print file_id of a particular file or directory.
709
The file_id is assigned when the file is first added and remains the
710
same through all revisions where the file exists, even when it is
714
takes_args = ['filename']
715
def run(self, filename):
716
b = find_branch(filename)
717
i = b.inventory.path2id(b.relpath(filename))
719
raise BzrError("%r is not a versioned file" % filename)
724
class cmd_file_path(Command):
725
"""Print path of file_ids to a file or directory.
727
This prints one line for each directory down to the target,
728
starting at the branch root."""
730
takes_args = ['filename']
731
def run(self, filename):
732
b = find_branch(filename)
734
fid = inv.path2id(b.relpath(filename))
736
raise BzrError("%r is not a versioned file" % filename)
737
for fip in inv.get_idpath(fid):
741
class cmd_revision_history(Command):
742
"""Display list of revision ids on this branch."""
745
for patchid in find_branch('.').revision_history():
749
class cmd_directories(Command):
750
"""Display list of versioned directories in this branch."""
752
for name, ie in find_branch('.').read_working_inventory().directories():
759
class cmd_init(Command):
760
"""Make a directory into a versioned branch.
762
Use this to create an empty branch, or before importing an
765
Recipe for importing a tree of files:
770
bzr commit -m 'imported project'
773
from bzrlib.branch import Branch
774
Branch('.', init=True)
777
class cmd_diff(Command):
778
"""Show differences in working tree.
780
If files are listed, only the changes in those files are listed.
781
Otherwise, all changes for the tree are listed.
783
TODO: Given two revision arguments, show the difference between them.
785
TODO: Allow diff across branches.
787
TODO: Option to use external diff command; could be GNU diff, wdiff,
790
TODO: Python difflib is not exactly the same as unidiff; should
791
either fix it up or prefer to use an external diff.
793
TODO: If a directory is given, diff everything under that.
795
TODO: Selected-file diff is inefficient and doesn't show you
798
TODO: This probably handles non-Unix newlines poorly.
801
takes_args = ['file*']
802
takes_options = ['revision', 'diff-options']
803
aliases = ['di', 'dif']
805
def run(self, revision=None, file_list=None, diff_options=None):
806
from bzrlib.diff import show_diff
809
b = find_branch(file_list[0])
810
file_list = [b.relpath(f) for f in file_list]
811
if file_list == ['']:
812
# just pointing to top-of-tree
817
# TODO: Make show_diff support taking 2 arguments
819
if revision is not None:
820
if len(revision) != 1:
821
raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')
822
base_rev = revision[0]
824
show_diff(b, base_rev, specific_files=file_list,
825
external_diff_options=diff_options)
831
class cmd_deleted(Command):
231
usage: bzr renames [BRANCH]
233
TODO: Option to show renames between two historical versions.
235
TODO: Only show renames under dir, rather than in the whole branch.
238
old_inv = b.basis_tree().inventory
239
new_inv = b.read_working_inventory()
241
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
243
for old_name, new_name in renames:
244
print "%s => %s" % (old_name, new_name)
249
"""info: Show statistical information for this branch
253
info.show_info(Branch('.'))
257
def cmd_remove(file_list, verbose=False):
258
b = Branch(file_list[0])
259
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
263
def cmd_file_id(filename):
265
i = b.inventory.path2id(b.relpath(filename))
267
bailout("%s is not a versioned file" % filename)
272
def cmd_find_filename(fileid):
273
n = find_filename(fileid)
275
bailout("%s is not a live file id" % fileid)
280
def cmd_revision_history():
281
for patchid in Branch('.').revision_history():
285
def cmd_directories():
286
for name, ie in Branch('.').read_working_inventory().directories():
294
for name, ie in Branch('.').working_tree().missing():
299
# TODO: Check we're not already in a working directory? At the
300
# moment you'll get an ugly error.
302
# TODO: What if we're in a subdirectory of a branch? Would like
303
# to allow that, but then the parent may need to understand that
304
# the children have disappeared, or should they be versioned in
307
# TODO: Take an argument/option for branch name.
308
Branch('.', init=True)
311
def cmd_diff(revision=None):
312
"""bzr diff: Show differences in working tree.
314
usage: bzr diff [-r REV]
317
Show changes since REV, rather than predecessor.
319
TODO: Given two revision arguments, show the difference between them.
321
TODO: Allow diff across branches.
323
TODO: Option to use external diff command; could be GNU diff, wdiff,
326
TODO: Diff selected files.
329
## TODO: Shouldn't be in the cmd function.
334
old_tree = b.basis_tree()
336
old_tree = b.revision_tree(b.lookup_revision(revision))
338
new_tree = b.working_tree()
339
old_inv = old_tree.inventory
340
new_inv = new_tree.inventory
342
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
346
DEVNULL = '/dev/null'
347
# Windows users, don't panic about this filename -- it is a
348
# special signal to GNU patch that the file should be created or
349
# deleted respectively.
351
# TODO: Generation of pseudo-diffs for added/deleted files could
352
# be usefully made into a much faster special case.
354
# TODO: Better to return them in sorted order I think.
356
for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
359
# Don't show this by default; maybe do it if an option is passed
360
# idlabel = ' {%s}' % fid
363
# FIXME: Something about the diff format makes patch unhappy
364
# with newly-added files.
366
def diffit(oldlines, newlines, **kw):
367
# FIXME: difflib is wrong if there is no trailing newline.
369
# Special workaround for Python2.3, where difflib fails if
370
# both sequences are empty.
371
if oldlines or newlines:
372
sys.stdout.writelines(difflib.unified_diff(oldlines, newlines, **kw))
375
if file_state in ['.', '?', 'I']:
377
elif file_state == 'A':
378
print '*** added %s %r' % (kind, new_name)
381
new_tree.get_file(fid).readlines(),
383
tofile=new_label + new_name + idlabel)
384
elif file_state == 'D':
385
assert isinstance(old_name, types.StringTypes)
386
print '*** deleted %s %r' % (kind, old_name)
388
diffit(old_tree.get_file(fid).readlines(), [],
389
fromfile=old_label + old_name + idlabel,
391
elif file_state in ['M', 'R']:
392
if file_state == 'M':
393
assert kind == 'file'
394
assert old_name == new_name
395
print '*** modified %s %r' % (kind, new_name)
396
elif file_state == 'R':
397
print '*** renamed %s %r => %r' % (kind, old_name, new_name)
400
diffit(old_tree.get_file(fid).readlines(),
401
new_tree.get_file(fid).readlines(),
402
fromfile=old_label + old_name + idlabel,
403
tofile=new_label + new_name)
405
bailout("can't represent state %s {%s}" % (file_state, fid))
409
def cmd_deleted(show_ids=False):
832
410
"""List files deleted in the working tree.
834
TODO: Show files deleted since a previous revision, or between two revisions.
412
TODO: Show files deleted since a previous revision, or between two revisions.
836
def run(self, show_ids=False):
839
new = b.working_tree()
841
## TODO: Much more efficient way to do this: read in new
842
## directories with readdir, rather than stating each one. Same
843
## level of effort but possibly much less IO. (Or possibly not,
844
## if the directories are very large...)
846
for path, ie in old.inventory.iter_entries():
847
if not new.has_id(ie.file_id):
849
print '%-50s %s' % (path, ie.file_id)
854
class cmd_modified(Command):
855
"""List files modified in working tree."""
858
from bzrlib.diff import compare_trees
861
td = compare_trees(b.basis_tree(), b.working_tree())
863
for path, id, kind in td.modified:
868
class cmd_added(Command):
869
"""List files added in working tree."""
873
wt = b.working_tree()
874
basis_inv = b.basis_tree().inventory
877
if file_id in basis_inv:
879
path = inv.id2path(file_id)
880
if not os.access(b.abspath(path), os.F_OK):
886
class cmd_root(Command):
887
"""Show the tree root directory.
889
The root is the nearest enclosing directory with a .bzr control
891
takes_args = ['filename?']
892
def run(self, filename=None):
893
"""Print the branch root."""
894
b = find_branch(filename)
895
print getattr(b, 'base', None) or getattr(b, 'baseurl')
898
class cmd_log(Command):
416
new = b.working_tree()
418
## TODO: Much more efficient way to do this: read in new
419
## directories with readdir, rather than stating each one. Same
420
## level of effort but possibly much less IO. (Or possibly not,
421
## if the directories are very large...)
423
for path, ie in old.inventory.iter_entries():
424
if not new.has_id(ie.file_id):
426
print '%-50s %s' % (path, ie.file_id)
432
def cmd_parse_inventory():
435
cElementTree.ElementTree().parse(file('.bzr/inventory'))
439
def cmd_load_inventory():
440
inv = Branch('.').basis_tree().inventory
444
def cmd_dump_new_inventory():
445
import bzrlib.newinventory
446
inv = Branch('.').basis_tree().inventory
447
bzrlib.newinventory.write_inventory(inv, sys.stdout)
450
def cmd_load_new_inventory():
451
import bzrlib.newinventory
452
bzrlib.newinventory.read_new_inventory(sys.stdin)
455
def cmd_dump_slacker_inventory():
456
import bzrlib.newinventory
457
inv = Branch('.').basis_tree().inventory
458
bzrlib.newinventory.write_slacker_inventory(inv, sys.stdout)
462
def cmd_root(filename=None):
463
"""Print the branch root."""
464
print bzrlib.branch.find_branch_root(filename)
467
def cmd_log(timezone='original'):
899
468
"""Show log of this branch.
901
To request a range of logs, you can use the command -r begin:end
902
-r revision requests a specific revision, -r :end or -r begin: are
905
--message allows you to give a regular expression, which will be evaluated
906
so that only matching entries will be displayed.
908
TODO: Make --revision support uuid: and hash: [future tag:] notation.
470
:todo: Options for utc; to show ids; to limit range; etc.
912
takes_args = ['filename?']
913
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
915
def run(self, filename=None, timezone='original',
922
from bzrlib.branch import find_branch
923
from bzrlib.log import log_formatter, show_log
926
direction = (forward and 'forward') or 'reverse'
929
b = find_branch(filename)
930
fp = b.relpath(filename)
932
file_id = b.read_working_inventory().path2id(fp)
934
file_id = None # points to branch root
942
elif len(revision) == 1:
943
rev1 = rev2 = b.get_revision_info(revision[0])[0]
944
elif len(revision) == 2:
945
rev1 = b.get_revision_info(revision[0])[0]
946
rev2 = b.get_revision_info(revision[1])[0]
948
raise BzrCommandError('bzr log --revision takes one or two values.')
955
mutter('encoding log as %r' % bzrlib.user_encoding)
957
# use 'replace' so that we don't abort if trying to write out
958
# in e.g. the default C locale.
959
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
965
lf = log_formatter(log_format,
968
show_timezone=timezone)
981
class cmd_touching_revisions(Command):
982
"""Return revision-ids which affected a particular file.
984
A more user-friendly interface is "bzr log FILE"."""
986
takes_args = ["filename"]
987
def run(self, filename):
988
b = find_branch(filename)
989
inv = b.read_working_inventory()
990
file_id = inv.path2id(b.relpath(filename))
991
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
992
print "%6d %s" % (revno, what)
995
class cmd_ls(Command):
472
Branch('.').write_log(show_timezone=timezone)
475
def cmd_ls(revision=None, verbose=False):
996
476
"""List files in a tree.
998
TODO: Take a revision or remote path and list that tree instead.
478
:todo: Take a revision or remote path and list that tree instead.
1001
def run(self, revision=None, verbose=False):
1002
b = find_branch('.')
1003
if revision == None:
1004
tree = b.working_tree()
1006
tree = b.revision_tree(b.lookup_revision(revision))
1008
for fp, fc, kind, fid in tree.list_files():
1010
if kind == 'directory':
1012
elif kind == 'file':
1017
print '%-8s %s%s' % (fc, fp, kindch)
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':
1023
class cmd_unknowns(Command):
1024
"""List unknown files."""
1026
from bzrlib.osutils import quotefn
1027
for f in find_branch('.').unknowns():
1032
class cmd_ignore(Command):
1033
"""Ignore a command or pattern.
1035
To remove patterns from the ignore list, edit the .bzrignore file.
1037
If the pattern contains a slash, it is compared to the whole path
1038
from the branch root. Otherwise, it is comapred to only the last
1039
component of the path.
1041
Ignore patterns are case-insensitive on case-insensitive systems.
1043
Note: wildcards must be quoted from the shell on Unix.
1046
bzr ignore ./Makefile
1047
bzr ignore '*.class'
1049
takes_args = ['name_pattern']
1051
def run(self, name_pattern):
1052
from bzrlib.atomicfile import AtomicFile
1055
b = find_branch('.')
1056
ifn = b.abspath('.bzrignore')
1058
if os.path.exists(ifn):
1061
igns = f.read().decode('utf-8')
1067
# TODO: If the file already uses crlf-style termination, maybe
1068
# we should use that for the newly added lines?
1070
if igns and igns[-1] != '\n':
1072
igns += name_pattern + '\n'
1075
f = AtomicFile(ifn, 'wt')
1076
f.write(igns.encode('utf-8'))
1081
inv = b.working_tree().inventory
1082
if inv.path2id('.bzrignore'):
1083
mutter('.bzrignore is already versioned')
1085
mutter('need to make new .bzrignore file versioned')
1086
b.add(['.bzrignore'])
1090
class cmd_ignored(Command):
495
print '%-8s %s%s' % (fc, fp, kindch)
502
"""List unknown files"""
503
for f in Branch('.').unknowns():
508
def cmd_ignored(verbose=True):
1091
509
"""List ignored files and the patterns that matched them.
1093
See also: bzr ignore"""
1095
tree = find_branch('.').working_tree()
1096
for path, file_class, kind, file_id in tree.list_files():
1097
if file_class != 'I':
1099
## XXX: Slightly inefficient since this was already calculated
1100
pat = tree.is_ignored(path)
1101
print '%-50s %s' % (path, pat)
1104
class cmd_lookup_revision(Command):
1105
"""Lookup the revision-id from a revision-number
1108
bzr lookup-revision 33
1111
takes_args = ['revno']
1113
def run(self, revno):
1117
raise BzrCommandError("not a valid revision-number: %r" % revno)
1119
print find_branch('.').lookup_revision(revno)
1122
class cmd_export(Command):
1123
"""Export past revision to destination directory.
1125
If no revision is specified this exports the last committed revision.
1127
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1128
given, try to find the format with the extension. If no extension
1129
is found exports to a directory (equivalent to --format=dir).
1131
Root may be the top directory for tar, tgz and tbz2 formats. If none
1132
is given, the top directory will be the root name of the file."""
1133
# TODO: list known exporters
1134
takes_args = ['dest']
1135
takes_options = ['revision', 'format', 'root']
1136
def run(self, dest, revision=None, format=None, root=None):
1138
b = find_branch('.')
1139
if revision is None:
1140
rev_id = b.last_patch()
1142
if len(revision) != 1:
1143
raise BzrError('bzr export --revision takes exactly 1 argument')
1144
revno, rev_id = b.get_revision_info(revision[0])
1145
t = b.revision_tree(rev_id)
1146
root, ext = os.path.splitext(dest)
1148
if ext in (".tar",):
1150
elif ext in (".gz", ".tgz"):
1152
elif ext in (".bz2", ".tbz2"):
1156
t.export(dest, format, root)
1159
class cmd_cat(Command):
1160
"""Write a file's text from a previous revision."""
1162
takes_options = ['revision']
1163
takes_args = ['filename']
1165
def run(self, filename, revision=None):
1166
if revision == None:
1167
raise BzrCommandError("bzr cat requires a revision number")
1168
elif len(revision) != 1:
1169
raise BzrCommandError("bzr cat --revision takes exactly one number")
1170
b = find_branch('.')
1171
b.print_file(b.relpath(filename), revision[0])
1174
class cmd_local_time_offset(Command):
1175
"""Show the offset in seconds from GMT to local time."""
1178
print bzrlib.osutils.local_time_offset()
1182
class cmd_commit(Command):
1183
"""Commit changes into a new revision.
1185
If selected files are specified, only changes to those files are
1186
committed. If a directory is specified then its contents are also
1189
A selected-file commit may fail in some cases where the committed
1190
tree would be invalid, such as trying to commit a file in a
1191
newly-added directory that is not itself committed.
1193
TODO: Run hooks on tree to-be-committed, and after commit.
1195
TODO: Strict commit that fails if there are unknown or deleted files.
1197
takes_args = ['selected*']
1198
takes_options = ['message', 'file', 'verbose', 'unchanged']
1199
aliases = ['ci', 'checkin']
1201
def run(self, message=None, file=None, verbose=True, selected_list=None,
1203
from bzrlib.errors import PointlessCommit
1204
from bzrlib.osutils import get_text_message
1206
## Warning: shadows builtin file()
1207
if not message and not file:
1210
catcher = cStringIO.StringIO()
1211
sys.stdout = catcher
1212
cmd_status({"file_list":selected_list}, {})
1213
info = catcher.getvalue()
1215
message = get_text_message(info)
1218
raise BzrCommandError("please specify a commit message",
1219
["use either --message or --file"])
1220
elif message and file:
1221
raise BzrCommandError("please specify either --message or --file")
511
tree = Branch('.').working_tree()
512
for path, file_class, kind, id in tree.list_files():
513
if file_class != 'I':
515
## XXX: Slightly inefficient since this was already calculated
516
pat = tree.is_ignored(path)
517
print '%-50s %s' % (path, pat)
520
def cmd_lookup_revision(revno):
524
bailout("usage: lookup-revision REVNO",
525
["REVNO is a non-negative revision number for this branch"])
527
print Branch('.').lookup_revision(revno) or NONE_STRING
531
def cmd_export(revno, dest):
532
"""Export past revision to destination directory."""
534
rh = b.lookup_revision(int(revno))
535
t = b.revision_tree(rh)
540
######################################################################
541
# internal/test commands
545
"""Print a newly-generated UUID."""
546
print bzrlib.osutils.uuid()
550
def cmd_local_time_offset():
551
print bzrlib.osutils.local_time_offset()
555
def cmd_commit(message=None, verbose=False):
556
"""Commit changes to a new revision.
559
Description of changes in this revision; free form text.
560
It is recommended that the first line be a single-sentence
563
Show status of changed files,
565
TODO: Commit only selected files.
567
TODO: Run hooks on tree to-be-committed, and after commit.
569
TODO: Strict commit that fails if there are unknown or deleted files.
573
bailout("please specify a commit message")
574
Branch('.').commit(message, verbose=verbose)
577
def cmd_check(dir='.'):
578
"""check: Consistency check of branch history.
580
usage: bzr check [-v] [BRANCH]
583
--verbose, -v Show progress of checking.
585
This command checks various invariants about the branch storage to
586
detect data corruption or bzr bugs.
589
bzrlib.check.check(Branch(dir, find_root=False))
592
def cmd_is(pred, *rest):
593
"""Test whether PREDICATE is true."""
595
cmd_handler = globals()['assert_' + pred.replace('-', '_')]
597
bailout("unknown predicate: %s" % quotefn(pred))
1225
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1227
b = find_branch('.')
1230
b.commit(message, verbose=verbose,
1231
specific_files=selected_list,
1232
allow_pointless=unchanged)
1233
except PointlessCommit:
1234
# FIXME: This should really happen before the file is read in;
1235
# perhaps prepare the commit; get the message; then actually commit
1236
raise BzrCommandError("no changes to commit",
1237
["use --unchanged to commit anyhow"])
1240
class cmd_check(Command):
1241
"""Validate consistency of branch history.
1243
This command checks various invariants about the branch storage to
1244
detect data corruption or bzr bugs.
1246
If given the --update flag, it will update some optional fields
1247
to help ensure data consistency.
1249
takes_args = ['dir?']
1251
def run(self, dir='.'):
1252
from bzrlib.check import check
1253
check(find_branch(dir))
1257
class cmd_upgrade(Command):
1258
"""Upgrade branch storage to current format.
1260
This should normally be used only after the check command tells
1263
takes_args = ['dir?']
1265
def run(self, dir='.'):
1266
from bzrlib.upgrade import upgrade
1267
upgrade(find_branch(dir))
1271
class cmd_whoami(Command):
1272
"""Show bzr user id."""
1273
takes_options = ['email']
1275
def run(self, email=False):
1277
print bzrlib.osutils.user_email()
1279
print bzrlib.osutils.username()
1282
class cmd_selftest(Command):
601
except BzrCheckError:
602
# by default we don't print the message so that this can
603
# be used from shell scripts without producing noise
608
print bzrlib.osutils.username()
611
def cmd_user_email():
612
print bzrlib.osutils.user_email()
615
def cmd_gen_revision_id():
617
print bzrlib.branch._gen_revision_id(time.time())
620
def cmd_selftest(verbose=False):
1283
621
"""Run internal test suite"""
1286
from bzrlib.selftest import selftest
1287
return int(not selftest())
1290
class cmd_version(Command):
1291
"""Show version of bzr."""
622
## -v, if present, is seen by doctest; the argument is just here
623
## so our parser doesn't complain
625
## TODO: --verbose option
627
failures, tests = 0, 0
629
import doctest, bzrlib.store, bzrlib.tests
630
bzrlib.trace.verbose = False
632
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
633
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
634
mf, mt = doctest.testmod(m)
637
print '%-40s %3d tests' % (m.__name__, mt),
639
print '%3d FAILED!' % mf
643
print '%-40s %3d tests' % ('total', tests),
645
print '%3d FAILED!' % failures
652
cmd_doctest = cmd_selftest
655
######################################################################
659
def cmd_help(topic=None):
664
# otherwise, maybe the name of a command?
666
cmdfn = globals()['cmd_' + topic.replace('-', '_')]
668
bailout("no help for %r" % topic)
672
bailout("sorry, no detailed help yet for %r" % topic)
1296
680
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1297
# is bzrlib itself in a branch?
1298
bzrrev = bzrlib.get_bzr_revision()
1300
print " (bzr checkout, revision %d {%s})" % bzrrev
1301
681
print bzrlib.__copyright__
1302
682
print "http://bazaar-ng.org/"
1304
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1305
print "you may use, modify and redistribute it under the terms of the GNU"
1306
print "General Public License version 2 or later."
1309
class cmd_rocks(Command):
685
"""bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
686
you may use, modify and redistribute it under the terms of the GNU
687
General Public License version 2 or later."""
1310
691
"""Statement of optimism."""
1313
print "it sure does!"
1315
def parse_spec(spec):
1317
>>> parse_spec(None)
1319
>>> parse_spec("./")
1321
>>> parse_spec("../@")
1323
>>> parse_spec("../f/@35")
1325
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1326
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1331
parsed = spec.split('/@')
1332
assert len(parsed) == 2
1337
parsed[1] = int(parsed[1])
1339
pass # We can allow stuff like ./@revid:blahblahblah
1341
assert parsed[1] >=0
1343
parsed = [spec, None]
1348
class cmd_merge(Command):
1349
"""Perform a three-way merge of trees.
1351
The SPEC parameters are working tree or revision specifiers. Working trees
1352
are specified using standard paths or urls. No component of a directory
1353
path may begin with '@'.
1355
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1357
Revisions are specified using a dirname/@revno pair, where dirname is the
1358
branch directory and revno is the revision within that branch. If no revno
1359
is specified, the latest revision is used.
1361
Revision examples: './@127', 'foo/@', '../@1'
1363
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1364
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1367
merge refuses to run if there are any uncommitted changes, unless
1370
takes_args = ['other_spec', 'base_spec?']
1371
takes_options = ['force']
1373
def run(self, other_spec, base_spec=None, force=False):
1374
from bzrlib.merge import merge
1375
merge(parse_spec(other_spec), parse_spec(base_spec),
1376
check_clean=(not force))
1380
class cmd_revert(Command):
1381
"""Restore selected files from a previous revision.
1383
takes_args = ['file+']
1384
def run(self, file_list):
1385
from bzrlib.branch import find_branch
1390
b = find_branch(file_list[0])
1392
b.revert([b.relpath(f) for f in file_list])
1395
class cmd_merge_revert(Command):
1396
"""Reverse all changes since the last commit.
1398
Only versioned files are affected.
1400
TODO: Store backups of any files that will be reverted, so
1401
that the revert can be undone.
1403
takes_options = ['revision']
1405
def run(self, revision=None):
1406
from bzrlib.merge import merge
1407
if revision is None:
1409
elif len(revision) != 1:
1410
raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1411
merge(('.', revision[0]), parse_spec('.'),
1416
class cmd_assert_fail(Command):
1417
"""Test reporting of assertion failures"""
1420
assert False, "always fails"
1423
class cmd_help(Command):
1424
"""Show help on a command or other topic.
1426
For a list of all available commands, say 'bzr help commands'."""
1427
takes_args = ['topic?']
1430
def run(self, topic=None):
1437
class cmd_plugins(Command):
1441
import bzrlib.plugin
1442
from inspect import getdoc
1443
from pprint import pprint
1444
for plugin in bzrlib.plugin.all_plugins:
1445
print plugin.__path__[0]
1448
print '\t', d.split('\n')[0]
1450
#pprint(bzrlib.plugin.all_plugins)
692
print "it sure does!"
696
######################################################################
1454
700
# list of all available options; the rhs can be either None for an
1618
863
# just a plain arg
1621
raise BzrCommandError("command %r requires argument %s"
866
bailout("command %r requires argument %s"
1622
867
% (cmd, argname.upper()))
1624
869
argdict[argname] = args.pop(0)
1627
raise BzrCommandError("extra argument to command %s: %s"
872
bailout("extra arguments to command %s: %r"
1633
def _parse_master_args(argv):
1634
"""Parse the arguments that always go with the original command.
1635
These are things like bzr --no-plugins, etc.
1637
There are now 2 types of option flags. Ones that come *before* the command,
1638
and ones that come *after* the command.
1639
Ones coming *before* the command are applied against all possible commands.
1640
And are generally applied before plugins are loaded.
1642
The current list are:
1643
--builtin Allow plugins to load, but don't let them override builtin commands,
1644
they will still be allowed if they do not override a builtin.
1645
--no-plugins Don't load any plugins. This lets you get back to official source
1647
--profile Enable the hotspot profile before running the command.
1648
For backwards compatibility, this is also a non-master option.
1649
--version Spit out the version of bzr that is running and exit.
1650
This is also a non-master option.
1651
--help Run help and exit, also a non-master option (I think that should stay, though)
1653
>>> argv, opts = _parse_master_args(['bzr', '--test'])
1654
Traceback (most recent call last):
1656
BzrCommandError: Invalid master option: 'test'
1657
>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1660
>>> print opts['version']
1662
>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1664
['command', '--more-options']
1665
>>> print opts['profile']
1667
>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1670
>>> print opts['no-plugins']
1672
>>> print opts['profile']
1674
>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1676
['command', '--profile']
1677
>>> print opts['profile']
1680
master_opts = {'builtin':False,
1687
# This is the point where we could hook into argv[0] to determine
1688
# what front-end is supposed to be run
1689
# For now, we are just ignoring it.
1690
cmd_name = argv.pop(0)
1692
if arg[:2] != '--': # at the first non-option, we return the rest
1694
arg = arg[2:] # Remove '--'
1695
if arg not in master_opts:
1696
# We could say that this is not an error, that we should
1697
# just let it be handled by the main section instead
1698
raise BzrCommandError('Invalid master option: %r' % arg)
1699
argv.pop(0) # We are consuming this entry
1700
master_opts[arg] = True
1701
return argv, master_opts
1705
879
def run_bzr(argv):
1706
880
"""Execute a command.
1708
882
This is similar to main(), but without all the trappings for
1709
logging and error handling.
883
logging and error handling.
1711
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1714
# some options like --builtin and --no-plugins have special effects
1715
argv, master_opts = _parse_master_args(argv)
1716
if not master_opts['no-plugins']:
1717
from bzrlib.plugin import load_plugins
1720
args, opts = parse_args(argv)
1722
if master_opts['help']:
1723
from bzrlib.help import help
886
args, opts = parse_args(argv[1:])
1730
887
if 'help' in opts:
1731
from bzrlib.help import help
888
# TODO: pass down other arguments in case they asked for
889
# help on a command name?
1737
895
elif 'version' in opts:
1740
elif args and args[0] == 'builtin':
1741
include_plugins=False
1743
cmd = str(args.pop(0))
1744
899
except IndexError:
900
log_error('usage: bzr COMMAND\n')
901
log_error(' try "bzr help"\n')
1750
plugins_override = not (master_opts['builtin'])
1751
canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1753
profile = master_opts['profile']
1754
# For backwards compatibility, I would rather stick with --profile being a
1755
# master/global option
905
cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
907
bailout("unknown command " + `cmd`)
1756
910
if 'profile' in opts:
1758
912
del opts['profile']
1760
916
# check options are reasonable
1761
allowed = cmd_class.takes_options
917
allowed = cmd_options.get(cmd, [])
1762
918
for oname in opts:
1763
919
if oname not in allowed:
1764
raise BzrCommandError("option '--%s' is not allowed for command %r"
920
bailout("option %r is not allowed for command %r"
1767
923
# mix arguments and options into one dictionary
1768
cmdargs = _match_argform(cmd, cmd_class.takes_args, args)
924
cmdargs = _match_args(cmd, args)
1770
925
for k, v in opts.items():
1771
cmdopts[k.replace('-', '_')] = v
926
cmdargs[k.replace('-', '_')] = v
1774
import hotshot, tempfile
1775
pffileno, pfname = tempfile.mkstemp()
1777
prof = hotshot.Profile(pfname)
1778
ret = prof.runcall(cmd_class, cmdopts, cmdargs) or 0
1781
import hotshot.stats
1782
stats = hotshot.stats.load(pfname)
1784
stats.sort_stats('time')
1785
## XXX: Might like to write to stderr or the trace file instead but
1786
## print_stats seems hardcoded to stdout
1787
stats.print_stats(20)
930
prof = hotshot.Profile('.bzr.profile')
931
ret = prof.runcall(cmd_handler, **cmdargs) or 0
935
stats = hotshot.stats.load('.bzr.profile')
937
stats.sort_stats('time')
938
stats.print_stats(20)
1795
return cmd_class(cmdopts, cmdargs).status
1798
def _report_exception(summary, quiet=False):
1800
log_error('bzr: ' + summary)
1801
bzrlib.trace.log_exception()
1804
tb = sys.exc_info()[2]
1805
exinfo = traceback.extract_tb(tb)
1807
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
1808
sys.stderr.write(' see ~/.bzr.log for debug information\n')
940
return cmd_handler(**cmdargs) or 0
945
## TODO: Handle command-line options; probably know what options are valid for
948
## TODO: If the arguments are wrong, give a usage message rather
949
## than just a backtrace.
951
bzrlib.trace.create_tracefile(argv)
1814
bzrlib.trace.open_tracefile(argv)
1819
return run_bzr(argv)
1821
# do this here inside the exception wrappers to catch EPIPE
1824
quiet = isinstance(e, (BzrCommandError))
1825
_report_exception('error: ' + e.args[0], quiet=quiet)
1828
# some explanation or hints
1831
except AssertionError, e:
1832
msg = 'assertion failed'
1834
msg += ': ' + str(e)
1835
_report_exception(msg)
1837
except KeyboardInterrupt, e:
1838
_report_exception('interrupted', quiet=True)
1840
except Exception, e:
1843
if (isinstance(e, IOError)
1844
and hasattr(e, 'errno')
1845
and e.errno == errno.EPIPE):
1849
msg = str(e).rstrip('\n')
1850
_report_exception(msg, quiet)
1853
bzrlib.trace.close_trace()
957
log_error('bzr: error: ' + e.args[0] + '\n')
960
log_error(' ' + h + '\n')
963
log_error('bzr: exception: %s\n' % e)
964
log_error(' see .bzr.log for details\n')
965
traceback.print_exc(None, bzrlib.trace._tracefile)
966
traceback.print_exc(None, sys.stderr)
969
# TODO: Maybe nicer handling of IOError?
1856
973
if __name__ == '__main__':
1857
974
sys.exit(main(sys.argv))
976
##profile.run('main(sys.argv)')