« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 532
- compare with another revision
- download diff
- download tarball
- view history from revision 532
- Committer: Martin Pool
- Date: 2005-05-17 08:23:28 UTC
- Revision ID: mbp@sourcefrog.net-20050517082328-2187a086f257ac68
- put back support for log on specific files
- files added:
- bzrlib/statcache.py
- files removed:
- bzr-man.py
- bzrlib/selftest
- contrib/emacs
- effbot
- effbot/org
- plugins
- plugins/changeset
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
# TODO: Split the command framework away from the actual commands.
19
20
# TODO: probably should say which arguments are candidates for glob
21
# expansion on windows and do that at the command level.
22
23
import sys
24
import os
18
19
import sys, os, time, os.path
20
from sets import Set
25
21
26
22
import bzrlib
27
from bzrlib.trace import mutter, note, log_error, warning
28
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
29
from bzrlib.branch import find_branch
30
from bzrlib import BZRDIR
31
32
33
plugin_cmds = {}
34
35
36
def register_command(cmd):
37
"Utility function to help register a command"
38
global plugin_cmds
39
k = cmd.__name__
40
if k.startswith("cmd_"):
41
k_unsquished = _unsquish_command_name(k)
42
else:
43
k_unsquished = k
44
if not plugin_cmds.has_key(k_unsquished):
45
plugin_cmds[k_unsquished] = cmd
46
else:
47
log_error('Two plugins defined the same command: %r' % k)
48
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
23
from bzrlib.trace import mutter, note, log_error
24
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
25
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
26
from bzrlib.tree import RevisionTree, EmptyTree, Tree
27
from bzrlib.revision import Revision
28
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
29
format_date
30
from bzrlib import merge
49
31
50
32
51
33
def _squish_command_name(cmd):
56
38
assert cmd.startswith("cmd_")
57
39
return cmd[4:].replace('_','-')
58
40
59
60
def _parse_revision_str(revstr):
61
"""This handles a revision string -> revno.
62
63
This always returns a list. The list will have one element for
64
65
It supports integers directly, but everything else it
66
defers for passing to Branch.get_revision_info()
67
68
>>> _parse_revision_str('234')
69
[234]
70
>>> _parse_revision_str('234..567')
71
[234, 567]
72
>>> _parse_revision_str('..')
73
[None, None]
74
>>> _parse_revision_str('..234')
75
[None, 234]
76
>>> _parse_revision_str('234..')
77
[234, None]
78
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
79
[234, 456, 789]
80
>>> _parse_revision_str('234....789') # Error?
81
[234, None, 789]
82
>>> _parse_revision_str('revid:test@other.com-234234')
83
['revid:test@other.com-234234']
84
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
85
['revid:test@other.com-234234', 'revid:test@other.com-234235']
86
>>> _parse_revision_str('revid:test@other.com-234234..23')
87
['revid:test@other.com-234234', 23]
88
>>> _parse_revision_str('date:2005-04-12')
89
['date:2005-04-12']
90
>>> _parse_revision_str('date:2005-04-12 12:24:33')
91
['date:2005-04-12 12:24:33']
92
>>> _parse_revision_str('date:2005-04-12T12:24:33')
93
['date:2005-04-12T12:24:33']
94
>>> _parse_revision_str('date:2005-04-12,12:24:33')
95
['date:2005-04-12,12:24:33']
96
>>> _parse_revision_str('-5..23')
97
[-5, 23]
98
>>> _parse_revision_str('-5')
99
[-5]
100
>>> _parse_revision_str('123a')
101
['123a']
102
>>> _parse_revision_str('abc')
103
['abc']
104
"""
105
import re
106
old_format_re = re.compile('\d*:\d*')
107
m = old_format_re.match(revstr)
108
if m:
109
warning('Colon separator for revision numbers is deprecated.'
110
' Use .. instead')
111
revs = []
112
for rev in revstr.split(':'):
113
if rev:
114
revs.append(int(rev))
115
else:
116
revs.append(None)
117
return revs
118
revs = []
119
for x in revstr.split('..'):
120
if not x:
121
revs.append(None)
122
else:
123
try:
124
revs.append(int(x))
125
except ValueError:
126
revs.append(x)
127
return revs
128
129
130
def get_merge_type(typestring):
131
"""Attempt to find the merge class/factory associated with a string."""
132
from merge import merge_types
133
try:
134
return merge_types[typestring][0]
135
except KeyError:
136
templ = '%s%%7s: %%s' % (' '*12)
137
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
138
type_list = '\n'.join(lines)
139
msg = "No known merge type %s. Supported types are:\n%s" %\
140
(typestring, type_list)
141
raise BzrCommandError(msg)
142
143
144
145
def _get_cmd_dict(plugins_override=True):
146
d = {}
41
def get_all_cmds():
42
"""Return canonical name and class for all registered commands."""
147
43
for k, v in globals().iteritems():
148
44
if k.startswith("cmd_"):
149
d[_unsquish_command_name(k)] = v
150
# If we didn't load plugins, the plugin_cmds dict will be empty
151
if plugins_override:
152
d.update(plugin_cmds)
153
else:
154
d2 = plugin_cmds.copy()
155
d2.update(d)
156
d = d2
157
return d
158
159
160
def get_all_cmds(plugins_override=True):
161
"""Return canonical name and class for all registered commands."""
162
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
163
yield k,v
164
165
166
def get_cmd_class(cmd, plugins_override=True):
45
yield _unsquish_command_name(k), v
46
47
def get_cmd_class(cmd):
167
48
"""Return the canonical name and command class for a command.
168
49
"""
169
50
cmd = str(cmd) # not unicode
170
51
171
52
# first look up this command under the specified name
172
cmds = _get_cmd_dict(plugins_override=plugins_override)
173
53
try:
174
return cmd, cmds[cmd]
54
return cmd, globals()[_squish_command_name(cmd)]
175
55
except KeyError:
176
56
pass
177
57
178
58
# look for any command which claims this as an alias
179
for cmdname, cmdclass in cmds.iteritems():
59
for cmdname, cmdclass in get_all_cmds():
180
60
if cmd in cmdclass.aliases:
181
61
return cmdname, cmdclass
182
62
187
67
raise BzrCommandError("unknown command %r" % cmd)
188
68
189
69
190
class Command(object):
70
class Command:
191
71
"""Base class for commands.
192
72
193
73
The docstring for an actual command should give a single-line
219
99
assert isinstance(arguments, dict)
220
100
cmdargs = options.copy()
221
101
cmdargs.update(arguments)
222
if self.__doc__ == Command.__doc__:
223
from warnings import warn
224
warn("No help message set for %r" % self)
102
assert self.__doc__ != Command.__doc__, \
103
("No help message set for %r" % self)
225
104
self.status = self.run(**cmdargs)
226
if self.status is None:
227
self.status = 0
228
105
229
106
230
107
def run(self):
242
119
class ExternalCommand(Command):
243
120
"""Class to wrap external commands.
244
121
245
We cheat a little here, when get_cmd_class() calls us we actually
246
give it back an object we construct that has the appropriate path,
247
help, options etc for the specified command.
248
249
When run_bzr() tries to instantiate that 'class' it gets caught by
250
the __call__ method, which we override to call the Command.__init__
251
method. That then calls our run method which is pretty straight
252
forward.
253
254
The only wrinkle is that we have to map bzr's dictionary of options
255
and arguments back into command line options and arguments for the
256
script.
122
We cheat a little here, when get_cmd_class() calls us we actually give it back
123
an object we construct that has the appropriate path, help, options etc for the
124
specified command.
125
126
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
127
method, which we override to call the Command.__init__ method. That then calls
128
our run method which is pretty straight forward.
129
130
The only wrinkle is that we have to map bzr's dictionary of options and arguments
131
back into command line options and arguments for the script.
257
132
"""
258
133
259
134
def find_command(cls, cmd):
260
import os.path
261
135
bzrpath = os.environ.get('BZRPATH', '')
262
136
263
for dir in bzrpath.split(os.pathsep):
137
for dir in bzrpath.split(':'):
264
138
path = os.path.join(dir, cmd)
265
139
if os.path.isfile(path):
266
140
return ExternalCommand(path)
272
146
def __init__(self, path):
273
147
self.path = path
274
148
149
# TODO: If either of these fail, we should detect that and
150
# assume that path is not really a bzr plugin after all.
151
275
152
pipe = os.popen('%s --bzr-usage' % path, 'r')
276
153
self.takes_options = pipe.readline().split()
277
278
for opt in self.takes_options:
279
if not opt in OPTIONS:
280
raise BzrError("Unknown option '%s' returned by external command %s"
281
% (opt, path))
282
283
# TODO: Is there any way to check takes_args is valid here?
284
154
self.takes_args = pipe.readline().split()
285
286
if pipe.close() is not None:
287
raise BzrError("Failed funning '%s --bzr-usage'" % path)
155
pipe.close()
288
156
289
157
pipe = os.popen('%s --bzr-help' % path, 'r')
290
158
self.__doc__ = pipe.read()
291
if pipe.close() is not None:
292
raise BzrError("Failed funning '%s --bzr-help'" % path)
159
pipe.close()
293
160
294
161
def __call__(self, options, arguments):
295
162
Command.__init__(self, options, arguments)
302
169
keys = kargs.keys()
303
170
keys.sort()
304
171
for name in keys:
305
optname = name.replace('_','-')
306
172
value = kargs[name]
307
if OPTIONS.has_key(optname):
173
if OPTIONS.has_key(name):
308
174
# it's an option
309
opts.append('--%s' % optname)
175
opts.append('--%s' % name)
310
176
if value is not None and value is not True:
311
177
opts.append(str(value))
312
178
else:
356
222
directory is shown. Otherwise, only the status of the specified
357
223
files or directories is reported. If a directory is given, status
358
224
is reported for everything inside that directory.
359
360
If a revision is specified, the changes since that revision are shown.
361
225
"""
362
226
takes_args = ['file*']
363
takes_options = ['all', 'show-ids', 'revision']
227
takes_options = ['all', 'show-ids']
364
228
aliases = ['st', 'stat']
365
229
366
230
def run(self, all=False, show_ids=False, file_list=None):
367
231
if file_list:
368
b = find_branch(file_list[0])
232
b = Branch(file_list[0], lock_mode='r')
369
233
file_list = [b.relpath(x) for x in file_list]
370
234
# special case: only one path was given and it's the root
371
235
# of the branch
372
236
if file_list == ['']:
373
237
file_list = None
374
238
else:
375
b = find_branch('.')
376
377
from bzrlib.status import show_status
378
show_status(b, show_unchanged=all, show_ids=show_ids,
379
specific_files=file_list)
239
b = Branch('.', lock_mode='r')
240
import status
241
status.show_status(b, show_unchanged=all, show_ids=show_ids,
242
specific_files=file_list)
380
243
381
244
382
245
class cmd_cat_revision(Command):
386
249
takes_args = ['revision_id']
387
250
388
251
def run(self, revision_id):
389
from bzrlib.xml import pack_xml
390
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
252
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
391
253
392
254
393
255
class cmd_revno(Command):
395
257
396
258
This is equal to the number of revisions on this branch."""
397
259
def run(self):
398
print find_branch('.').revno()
399
400
class cmd_revision_info(Command):
401
"""Show revision number and revision id for a given revision identifier.
402
"""
403
hidden = True
404
takes_args = ['revision_info*']
405
takes_options = ['revision']
406
def run(self, revision=None, revision_info_list=None):
407
from bzrlib.branch import find_branch
408
409
revs = []
410
if revision is not None:
411
revs.extend(revision)
412
if revision_info_list is not None:
413
revs.extend(revision_info_list)
414
if len(revs) == 0:
415
raise BzrCommandError('You must supply a revision identifier')
416
417
b = find_branch('.')
418
419
for rev in revs:
420
print '%4d %s' % b.get_revision_info(rev)
260
print Branch('.').revno()
421
261
422
262
423
263
class cmd_add(Command):
433
273
whether already versioned or not, are searched for files or
434
274
subdirectories that are neither versioned or ignored, and these
435
275
are added. This search proceeds recursively into versioned
436
directories. If no names are given '.' is assumed.
276
directories.
437
277
438
Therefore simply saying 'bzr add' will version all files that
278
Therefore simply saying 'bzr add .' will version all files that
439
279
are currently unknown.
440
280
441
281
TODO: Perhaps adding a file whose directly is not versioned should
442
282
recursively add that parent, rather than giving an error?
443
283
"""
444
takes_args = ['file*']
445
takes_options = ['verbose', 'no-recurse']
284
takes_args = ['file+']
285
takes_options = ['verbose']
446
286
447
def run(self, file_list, verbose=False, no_recurse=False):
448
from bzrlib.add import smart_add
449
smart_add(file_list, verbose, not no_recurse)
450
451
452
453
class cmd_mkdir(Command):
454
"""Create a new versioned directory.
455
456
This is equivalent to creating the directory and then adding it.
457
"""
458
takes_args = ['dir+']
459
460
def run(self, dir_list):
461
b = None
462
463
for d in dir_list:
464
os.mkdir(d)
465
if not b:
466
b = find_branch(d)
467
b.add([d], verbose=True)
287
def run(self, file_list, verbose=False):
288
bzrlib.add.smart_add(file_list, verbose)
468
289
469
290
470
291
class cmd_relpath(Command):
471
292
"""Show path of a file relative to root"""
472
293
takes_args = ['filename']
473
hidden = True
474
294
475
295
def run(self, filename):
476
print find_branch(filename).relpath(filename)
296
print Branch(filename).relpath(filename)
477
297
478
298
479
299
480
300
class cmd_inventory(Command):
481
301
"""Show inventory of the current working copy or a revision."""
482
takes_options = ['revision', 'show-ids']
302
takes_options = ['revision']
483
303
484
def run(self, revision=None, show_ids=False):
485
b = find_branch('.')
304
def run(self, revision=None):
305
b = Branch('.')
486
306
if revision == None:
487
307
inv = b.read_working_inventory()
488
308
else:
489
if len(revision) > 1:
490
raise BzrCommandError('bzr inventory --revision takes'
491
' exactly one revision identifier')
492
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
309
inv = b.get_revision_inventory(b.lookup_revision(revision))
493
310
494
for path, entry in inv.entries():
495
if show_ids:
496
print '%-50s %s' % (path, entry.file_id)
497
else:
498
print path
311
for path, entry in inv.iter_entries():
312
print '%-50s %s' % (entry.file_id, path)
499
313
500
314
501
315
class cmd_move(Command):
508
322
"""
509
323
takes_args = ['source$', 'dest']
510
324
def run(self, source_list, dest):
511
b = find_branch('.')
325
b = Branch('.')
512
326
513
# TODO: glob expansion on windows?
514
327
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
515
328
516
329
531
344
takes_args = ['from_name', 'to_name']
532
345
533
346
def run(self, from_name, to_name):
534
b = find_branch('.')
347
b = Branch('.')
535
348
b.rename_one(b.relpath(from_name), b.relpath(to_name))
536
349
537
350
538
351
539
class cmd_mv(Command):
540
"""Move or rename a file.
541
542
usage:
543
bzr mv OLDNAME NEWNAME
544
bzr mv SOURCE... DESTINATION
545
546
If the last argument is a versioned directory, all the other names
547
are moved into it. Otherwise, there must be exactly two arguments
548
and the file is changed to a new name, which must not already exist.
549
550
Files cannot be moved between branches.
551
"""
552
takes_args = ['names*']
553
def run(self, names_list):
554
if len(names_list) < 2:
555
raise BzrCommandError("missing file argument")
556
b = find_branch(names_list[0])
557
558
rel_names = [b.relpath(x) for x in names_list]
559
560
if os.path.isdir(names_list[-1]):
561
# move into existing directory
562
b.move(rel_names[:-1], rel_names[-1])
563
else:
564
if len(names_list) != 2:
565
raise BzrCommandError('to mv multiple files the destination '
566
'must be a versioned directory')
567
b.move(rel_names[0], rel_names[1])
568
569
570
571
572
class cmd_pull(Command):
573
"""Pull any changes from another branch into the current one.
574
575
If the location is omitted, the last-used location will be used.
576
Both the revision history and the working directory will be
577
updated.
578
579
This command only works on branches that have not diverged. Branches are
580
considered diverged if both branches have had commits without first
581
pulling from the other.
582
583
If branches have diverged, you can use 'bzr merge' to pull the text changes
584
from one into the other.
585
"""
586
takes_args = ['location?']
587
588
def run(self, location=None):
589
from bzrlib.merge import merge
590
import tempfile
591
from shutil import rmtree
592
import errno
593
594
br_to = find_branch('.')
595
stored_loc = None
596
try:
597
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
598
except IOError, e:
599
if e.errno != errno.ENOENT:
600
raise
601
if location is None:
602
if stored_loc is None:
603
raise BzrCommandError("No pull location known or specified.")
604
else:
605
print "Using last location: %s" % stored_loc
606
location = stored_loc
607
cache_root = tempfile.mkdtemp()
608
from bzrlib.branch import DivergedBranches
609
br_from = find_branch(location)
610
location = pull_loc(br_from)
611
old_revno = br_to.revno()
612
try:
613
from branch import find_cached_branch, DivergedBranches
614
br_from = find_cached_branch(location, cache_root)
615
location = pull_loc(br_from)
616
old_revno = br_to.revno()
617
try:
618
br_to.update_revisions(br_from)
619
except DivergedBranches:
620
raise BzrCommandError("These branches have diverged."
621
" Try merge.")
622
623
merge(('.', -1), ('.', old_revno), check_clean=False)
624
if location != stored_loc:
625
br_to.controlfile("x-pull", "wb").write(location + "\n")
626
finally:
627
rmtree(cache_root)
628
629
630
631
class cmd_branch(Command):
632
"""Create a new copy of a branch.
633
634
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
635
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
636
637
To retrieve the branch as of a particular revision, supply the --revision
638
parameter, as in "branch foo/bar -r 5".
639
"""
640
takes_args = ['from_location', 'to_location?']
641
takes_options = ['revision']
642
aliases = ['get', 'clone']
643
644
def run(self, from_location, to_location=None, revision=None):
645
import errno
646
from bzrlib.merge import merge
647
from bzrlib.branch import DivergedBranches, NoSuchRevision, \
648
find_cached_branch, Branch
649
from shutil import rmtree
650
from meta_store import CachedStore
651
import tempfile
652
cache_root = tempfile.mkdtemp()
653
654
if revision is None:
655
revision = [None]
656
elif len(revision) > 1:
657
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
658
659
try:
660
try:
661
br_from = find_cached_branch(from_location, cache_root)
662
except OSError, e:
663
if e.errno == errno.ENOENT:
664
raise BzrCommandError('Source location "%s" does not'
665
' exist.' % to_location)
666
else:
667
raise
668
669
if to_location is None:
670
to_location = os.path.basename(from_location.rstrip("/\\"))
671
672
try:
673
os.mkdir(to_location)
674
except OSError, e:
675
if e.errno == errno.EEXIST:
676
raise BzrCommandError('Target directory "%s" already'
677
' exists.' % to_location)
678
if e.errno == errno.ENOENT:
679
raise BzrCommandError('Parent of "%s" does not exist.' %
680
to_location)
681
else:
682
raise
683
br_to = Branch(to_location, init=True)
684
685
br_to.set_root_id(br_from.get_root_id())
686
687
if revision:
688
if revision[0] is None:
689
revno = br_from.revno()
690
else:
691
revno, rev_id = br_from.get_revision_info(revision[0])
692
try:
693
br_to.update_revisions(br_from, stop_revision=revno)
694
except NoSuchRevision:
695
rmtree(to_location)
696
msg = "The branch %s has no revision %d." % (from_location,
697
revno)
698
raise BzrCommandError(msg)
699
700
merge((to_location, -1), (to_location, 0), this_dir=to_location,
701
check_clean=False, ignore_zero=True)
702
from_location = pull_loc(br_from)
703
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
704
finally:
705
rmtree(cache_root)
706
707
708
def pull_loc(branch):
709
# TODO: Should perhaps just make attribute be 'base' in
710
# RemoteBranch and Branch?
711
if hasattr(branch, "baseurl"):
712
return branch.baseurl
713
else:
714
return branch.base
715
716
717
718
352
class cmd_renames(Command):
719
353
"""Show list of renamed files.
720
354
725
359
takes_args = ['dir?']
726
360
727
361
def run(self, dir='.'):
728
b = find_branch(dir)
362
b = Branch(dir)
729
363
old_inv = b.basis_tree().inventory
730
364
new_inv = b.read_working_inventory()
731
365
742
376
def run(self, branch=None):
743
377
import info
744
378
379
from branch import find_branch
745
380
b = find_branch(branch)
746
381
info.show_info(b)
747
382
756
391
takes_options = ['verbose']
757
392
758
393
def run(self, file_list, verbose=False):
759
b = find_branch(file_list[0])
394
b = Branch(file_list[0])
760
395
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
761
396
762
397
770
405
hidden = True
771
406
takes_args = ['filename']
772
407
def run(self, filename):
773
b = find_branch(filename)
408
b = Branch(filename)
774
409
i = b.inventory.path2id(b.relpath(filename))
775
410
if i == None:
776
raise BzrError("%r is not a versioned file" % filename)
411
bailout("%r is not a versioned file" % filename)
777
412
else:
778
413
print i
779
414
786
421
hidden = True
787
422
takes_args = ['filename']
788
423
def run(self, filename):
789
b = find_branch(filename)
424
b = Branch(filename)
790
425
inv = b.inventory
791
426
fid = inv.path2id(b.relpath(filename))
792
427
if fid == None:
793
raise BzrError("%r is not a versioned file" % filename)
428
bailout("%r is not a versioned file" % filename)
794
429
for fip in inv.get_idpath(fid):
795
430
print fip
796
431
797
432
798
433
class cmd_revision_history(Command):
799
434
"""Display list of revision ids on this branch."""
800
hidden = True
801
435
def run(self):
802
for patchid in find_branch('.').revision_history():
436
for patchid in Branch('.').revision_history():
803
437
print patchid
804
438
805
439
806
440
class cmd_directories(Command):
807
441
"""Display list of versioned directories in this branch."""
808
442
def run(self):
809
for name, ie in find_branch('.').read_working_inventory().directories():
443
for name, ie in Branch('.').read_working_inventory().directories():
810
444
if name == '':
811
445
print '.'
812
446
else:
827
461
bzr commit -m 'imported project'
828
462
"""
829
463
def run(self):
830
from bzrlib.branch import Branch
831
464
Branch('.', init=True)
832
465
833
466
856
489
"""
857
490
858
491
takes_args = ['file*']
859
takes_options = ['revision', 'diff-options']
860
aliases = ['di', 'dif']
492
takes_options = ['revision']
493
aliases = ['di']
861
494
862
def run(self, revision=None, file_list=None, diff_options=None):
495
def run(self, revision=None, file_list=None):
863
496
from bzrlib.diff import show_diff
864
865
if file_list:
866
b = find_branch(file_list[0])
867
file_list = [b.relpath(f) for f in file_list]
868
if file_list == ['']:
869
# just pointing to top-of-tree
870
file_list = None
871
else:
872
b = find_branch('.')
873
874
# TODO: Make show_diff support taking 2 arguments
875
base_rev = None
876
if revision is not None:
877
if len(revision) != 1:
878
raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')
879
base_rev = revision[0]
880
497
881
show_diff(b, base_rev, specific_files=file_list,
882
external_diff_options=diff_options)
498
show_diff(Branch('.'), revision, specific_files=file_list)
883
499
884
500
885
501
891
507
TODO: Show files deleted since a previous revision, or between two revisions.
892
508
"""
893
509
def run(self, show_ids=False):
894
b = find_branch('.')
510
b = Branch('.')
895
511
old = b.basis_tree()
896
512
new = b.working_tree()
897
513
912
528
"""List files modified in working tree."""
913
529
hidden = True
914
530
def run(self):
915
from bzrlib.delta import compare_trees
916
917
b = find_branch('.')
918
td = compare_trees(b.basis_tree(), b.working_tree())
919
920
for path, id, kind in td.modified:
921
print path
531
import statcache
532
b = Branch('.')
533
inv = b.read_working_inventory()
534
sc = statcache.update_cache(b, inv)
535
basis = b.basis_tree()
536
basis_inv = basis.inventory
537
538
# We used to do this through iter_entries(), but that's slow
539
# when most of the files are unmodified, as is usually the
540
# case. So instead we iterate by inventory entry, and only
541
# calculate paths as necessary.
542
543
for file_id in basis_inv:
544
cacheentry = sc.get(file_id)
545
if not cacheentry: # deleted
546
continue
547
ie = basis_inv[file_id]
548
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
549
path = inv.id2path(file_id)
550
print path
922
551
923
552
924
553
926
555
"""List files added in working tree."""
927
556
hidden = True
928
557
def run(self):
929
b = find_branch('.')
558
b = Branch('.')
930
559
wt = b.working_tree()
931
560
basis_inv = b.basis_tree().inventory
932
561
inv = wt.inventory
948
577
takes_args = ['filename?']
949
578
def run(self, filename=None):
950
579
"""Print the branch root."""
580
from branch import find_branch
951
581
b = find_branch(filename)
952
582
print getattr(b, 'base', None) or getattr(b, 'baseurl')
953
583
955
585
class cmd_log(Command):
956
586
"""Show log of this branch.
957
587
958
To request a range of logs, you can use the command -r begin:end
959
-r revision requests a specific revision, -r :end or -r begin: are
960
also valid.
961
962
--message allows you to give a regular expression, which will be evaluated
963
so that only matching entries will be displayed.
964
965
TODO: Make --revision support uuid: and hash: [future tag:] notation.
966
588
TODO: Option to limit range.
589
590
TODO: Option to show in forward order.
967
591
"""
968
969
592
takes_args = ['filename?']
970
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
971
972
def run(self, filename=None, timezone='original',
973
verbose=False,
974
show_ids=False,
975
forward=False,
976
revision=None,
977
message=None,
978
long=False):
979
from bzrlib.branch import find_branch
980
from bzrlib.log import log_formatter, show_log
981
import codecs
982
983
direction = (forward and 'forward') or 'reverse'
593
takes_options = ['timezone', 'verbose', 'show-ids']
594
def run(self, filename=None, timezone='original', verbose=False, show_ids=False):
595
from bzrlib import show_log, find_branch
984
596
985
597
if filename:
986
b = find_branch(filename)
598
b = find_branch(filename, lock_mode='r')
987
599
fp = b.relpath(filename)
988
if fp:
989
file_id = b.read_working_inventory().path2id(fp)
990
else:
991
file_id = None # points to branch root
600
file_id = b.read_working_inventory().path2id(fp)
992
601
else:
993
b = find_branch('.')
602
b = find_branch('.', lock_mode='r')
994
603
file_id = None
995
604
996
if revision is None:
997
rev1 = None
998
rev2 = None
999
elif len(revision) == 1:
1000
rev1 = rev2 = b.get_revision_info(revision[0])[0]
1001
elif len(revision) == 2:
1002
rev1 = b.get_revision_info(revision[0])[0]
1003
rev2 = b.get_revision_info(revision[1])[0]
1004
else:
1005
raise BzrCommandError('bzr log --revision takes one or two values.')
1006
1007
if rev1 == 0:
1008
rev1 = None
1009
if rev2 == 0:
1010
rev2 = None
1011
1012
mutter('encoding log as %r' % bzrlib.user_encoding)
1013
1014
# use 'replace' so that we don't abort if trying to write out
1015
# in e.g. the default C locale.
1016
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1017
1018
if long:
1019
log_format = 'long'
1020
else:
1021
log_format = 'short'
1022
lf = log_formatter(log_format,
1023
show_ids=show_ids,
1024
to_file=outf,
1025
show_timezone=timezone)
1026
1027
show_log(b,
1028
lf,
1029
file_id,
605
show_log(b, file_id,
606
show_timezone=timezone,
1030
607
verbose=verbose,
1031
direction=direction,
1032
start_revision=rev1,
1033
end_revision=rev2,
1034
search=message)
608
show_ids=show_ids,
609
to_file=sys.stdout)
1035
610
1036
611
1037
612
1042
617
hidden = True
1043
618
takes_args = ["filename"]
1044
619
def run(self, filename):
1045
b = find_branch(filename)
620
b = Branch(filename, lock_mode='r')
1046
621
inv = b.read_working_inventory()
1047
622
file_id = inv.path2id(b.relpath(filename))
1048
623
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1056
631
"""
1057
632
hidden = True
1058
633
def run(self, revision=None, verbose=False):
1059
b = find_branch('.')
634
b = Branch('.')
1060
635
if revision == None:
1061
636
tree = b.working_tree()
1062
637
else:
1078
653
1079
654
1080
655
class cmd_unknowns(Command):
1081
"""List unknown files."""
656
"""List unknown files"""
1082
657
def run(self):
1083
from bzrlib.osutils import quotefn
1084
for f in find_branch('.').unknowns():
658
for f in Branch('.').unknowns():
1085
659
print quotefn(f)
1086
660
1087
661
1088
662
1089
663
class cmd_ignore(Command):
1090
"""Ignore a command or pattern.
664
"""Ignore a command or pattern
1091
665
1092
666
To remove patterns from the ignore list, edit the .bzrignore file.
1093
667
1107
681
1108
682
def run(self, name_pattern):
1109
683
from bzrlib.atomicfile import AtomicFile
1110
import os.path
684
import codecs
1111
685
1112
b = find_branch('.')
686
b = Branch('.')
1113
687
ifn = b.abspath('.bzrignore')
1114
688
1115
689
if os.path.exists(ifn):
1121
695
else:
1122
696
igns = ''
1123
697
1124
# TODO: If the file already uses crlf-style termination, maybe
1125
# we should use that for the newly added lines?
1126
1127
698
if igns and igns[-1] != '\n':
1128
699
igns += '\n'
1129
700
igns += name_pattern + '\n'
1149
720
1150
721
See also: bzr ignore"""
1151
722
def run(self):
1152
tree = find_branch('.').working_tree()
723
tree = Branch('.').working_tree()
1153
724
for path, file_class, kind, file_id in tree.list_files():
1154
725
if file_class != 'I':
1155
726
continue
1173
744
except ValueError:
1174
745
raise BzrCommandError("not a valid revision-number: %r" % revno)
1175
746
1176
print find_branch('.').lookup_revision(revno)
747
print Branch('.').lookup_revision(revno)
1177
748
1178
749
1179
750
class cmd_export(Command):
1180
751
"""Export past revision to destination directory.
1181
752
1182
If no revision is specified this exports the last committed revision.
1183
1184
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1185
given, try to find the format with the extension. If no extension
1186
is found exports to a directory (equivalent to --format=dir).
1187
1188
Root may be the top directory for tar, tgz and tbz2 formats. If none
1189
is given, the top directory will be the root name of the file."""
1190
# TODO: list known exporters
753
If no revision is specified this exports the last committed revision."""
1191
754
takes_args = ['dest']
1192
takes_options = ['revision', 'format', 'root']
1193
def run(self, dest, revision=None, format=None, root=None):
1194
import os.path
1195
b = find_branch('.')
1196
if revision is None:
1197
rev_id = b.last_patch()
755
takes_options = ['revision']
756
def run(self, dest, revision=None):
757
b = Branch('.')
758
if revision == None:
759
rh = b.revision_history()[-1]
1198
760
else:
1199
if len(revision) != 1:
1200
raise BzrError('bzr export --revision takes exactly 1 argument')
1201
revno, rev_id = b.get_revision_info(revision[0])
1202
t = b.revision_tree(rev_id)
1203
root, ext = os.path.splitext(dest)
1204
if not format:
1205
if ext in (".tar",):
1206
format = "tar"
1207
elif ext in (".gz", ".tgz"):
1208
format = "tgz"
1209
elif ext in (".bz2", ".tbz2"):
1210
format = "tbz2"
1211
else:
1212
format = "dir"
1213
t.export(dest, format, root)
761
rh = b.lookup_revision(int(revision))
762
t = b.revision_tree(rh)
763
t.export(dest)
1214
764
1215
765
1216
766
class cmd_cat(Command):
1222
772
def run(self, filename, revision=None):
1223
773
if revision == None:
1224
774
raise BzrCommandError("bzr cat requires a revision number")
1225
elif len(revision) != 1:
1226
raise BzrCommandError("bzr cat --revision takes exactly one number")
1227
b = find_branch('.')
1228
b.print_file(b.relpath(filename), revision[0])
775
b = Branch('.')
776
b.print_file(b.relpath(filename), int(revision))
1229
777
1230
778
1231
779
class cmd_local_time_offset(Command):
1238
786
1239
787
class cmd_commit(Command):
1240
788
"""Commit changes into a new revision.
1241
1242
If no arguments are given, the entire tree is committed.
1243
789
1244
790
If selected files are specified, only changes to those files are
1245
committed. If a directory is specified then the directory and everything
1246
within it is committed.
791
committed. If a directory is specified then its contents are also
792
committed.
1247
793
1248
794
A selected-file commit may fail in some cases where the committed
1249
795
tree would be invalid, such as trying to commit a file in a
1254
800
TODO: Strict commit that fails if there are unknown or deleted files.
1255
801
"""
1256
802
takes_args = ['selected*']
1257
takes_options = ['message', 'file', 'verbose', 'unchanged']
803
takes_options = ['message', 'file', 'verbose']
1258
804
aliases = ['ci', 'checkin']
1259
805
1260
# TODO: Give better message for -s, --summary, used by tla people
1261
1262
def run(self, message=None, file=None, verbose=True, selected_list=None,
1263
unchanged=False):
1264
from bzrlib.errors import PointlessCommit
1265
from bzrlib.osutils import get_text_message
806
def run(self, message=None, file=None, verbose=True, selected_list=None):
807
from bzrlib.commit import commit
1266
808
1267
809
## Warning: shadows builtin file()
1268
810
if not message and not file:
1269
# FIXME: Ugly; change status code to send to a provided function?
1270
1271
import cStringIO
1272
stdout = sys.stdout
1273
catcher = cStringIO.StringIO()
1274
sys.stdout = catcher
1275
cmd_status({"file_list":selected_list}, {})
1276
info = catcher.getvalue()
1277
sys.stdout = stdout
1278
message = get_text_message(info)
1279
1280
if message is None:
1281
raise BzrCommandError("please specify a commit message",
1282
["use either --message or --file"])
811
raise BzrCommandError("please specify a commit message",
812
["use either --message or --file"])
1283
813
elif message and file:
1284
814
raise BzrCommandError("please specify either --message or --file")
1285
815
1287
817
import codecs
1288
818
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1289
819
1290
b = find_branch('.')
1291
if selected_list:
1292
selected_list = [b.relpath(s) for s in selected_list]
1293
1294
try:
1295
b.commit(message, verbose=verbose,
1296
specific_files=selected_list,
1297
allow_pointless=unchanged)
1298
except PointlessCommit:
1299
# FIXME: This should really happen before the file is read in;
1300
# perhaps prepare the commit; get the message; then actually commit
1301
raise BzrCommandError("no changes to commit",
1302
["use --unchanged to commit anyhow"])
820
b = Branch('.')
821
commit(b, message, verbose=verbose, specific_files=selected_list)
1303
822
1304
823
1305
824
class cmd_check(Command):
1307
826
1308
827
This command checks various invariants about the branch storage to
1309
828
detect data corruption or bzr bugs.
1310
1311
If given the --update flag, it will update some optional fields
1312
to help ensure data consistency.
1313
"""
1314
takes_args = ['dir?']
1315
1316
def run(self, dir='.'):
1317
from bzrlib.check import check
1318
check(find_branch(dir))
1319
1320
1321
1322
class cmd_scan_cache(Command):
1323
hidden = True
1324
def run(self):
1325
from bzrlib.hashcache import HashCache
1326
import os
1327
1328
c = HashCache('.')
1329
c.read()
1330
c.scan()
1331
1332
print '%6d stats' % c.stat_count
1333
print '%6d in hashcache' % len(c._cache)
1334
print '%6d files removed from cache' % c.removed_count
1335
print '%6d hashes updated' % c.update_count
1336
print '%6d files changed too recently to cache' % c.danger_count
1337
1338
if c.needs_write:
1339
c.write()
1340
1341
1342
1343
class cmd_upgrade(Command):
1344
"""Upgrade branch storage to current format.
1345
1346
This should normally be used only after the check command tells
1347
you to run it.
1348
"""
1349
takes_args = ['dir?']
1350
1351
def run(self, dir='.'):
1352
from bzrlib.upgrade import upgrade
1353
upgrade(find_branch(dir))
829
"""
830
takes_args = ['dir?']
831
def run(self, dir='.'):
832
import bzrlib.check
833
bzrlib.check.check(Branch(dir))
1354
834
1355
835
1356
836
1368
848
class cmd_selftest(Command):
1369
849
"""Run internal test suite"""
1370
850
hidden = True
1371
takes_options = ['verbose']
1372
def run(self, verbose=False):
1373
from bzrlib.selftest import selftest
1374
return int(not selftest(verbose=verbose))
851
def run(self):
852
failures, tests = 0, 0
853
854
import doctest, bzrlib.store
855
bzrlib.trace.verbose = False
856
857
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
858
bzrlib.tree, bzrlib.commands, bzrlib.add:
859
mf, mt = doctest.testmod(m)
860
failures += mf
861
tests += mt
862
print '%-40s %3d tests' % (m.__name__, mt),
863
if mf:
864
print '%3d FAILED!' % mf
865
else:
866
print
867
868
print '%-40s %3d tests' % ('total', tests),
869
if failures:
870
print '%3d FAILED!' % failures
871
return 1
872
else:
873
print
874
return 0
875
1375
876
1376
877
1377
878
class cmd_version(Command):
1378
"""Show version of bzr."""
879
"""Show version of bzr"""
1379
880
def run(self):
1380
881
show_version()
1381
882
1382
883
def show_version():
1383
884
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1384
# is bzrlib itself in a branch?
1385
bzrrev = bzrlib.get_bzr_revision()
1386
if bzrrev:
1387
print " (bzr checkout, revision %d {%s})" % bzrrev
1388
885
print bzrlib.__copyright__
1389
886
print "http://bazaar-ng.org/"
1390
887
print
1400
897
print "it sure does!"
1401
898
1402
899
def parse_spec(spec):
1403
"""
1404
>>> parse_spec(None)
1405
[None, None]
1406
>>> parse_spec("./")
1407
['./', None]
1408
>>> parse_spec("../@")
1409
['..', -1]
1410
>>> parse_spec("../f/@35")
1411
['../f', 35]
1412
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1413
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1414
"""
1415
if spec is None:
1416
return [None, None]
1417
900
if '/@' in spec:
1418
901
parsed = spec.split('/@')
1419
902
assert len(parsed) == 2
1420
903
if parsed[1] == "":
1421
904
parsed[1] = -1
1422
905
else:
1423
try:
1424
parsed[1] = int(parsed[1])
1425
except ValueError:
1426
pass # We can allow stuff like ./@revid:blahblahblah
1427
else:
1428
assert parsed[1] >=0
906
parsed[1] = int(parsed[1])
907
assert parsed[1] >=0
1429
908
else:
1430
909
parsed = [spec, None]
1431
910
return parsed
1432
911
1433
1434
1435
912
class cmd_merge(Command):
1436
"""Perform a three-way merge of trees.
1437
1438
The SPEC parameters are working tree or revision specifiers. Working trees
1439
are specified using standard paths or urls. No component of a directory
1440
path may begin with '@'.
1441
1442
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1443
1444
Revisions are specified using a dirname/@revno pair, where dirname is the
1445
branch directory and revno is the revision within that branch. If no revno
1446
is specified, the latest revision is used.
1447
1448
Revision examples: './@127', 'foo/@', '../@1'
1449
1450
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1451
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1452
as the BASE.
1453
1454
merge refuses to run if there are any uncommitted changes, unless
1455
--force is given.
1456
"""
1457
takes_args = ['other_spec', 'base_spec?']
1458
takes_options = ['force', 'merge-type']
1459
1460
def run(self, other_spec, base_spec=None, force=False, merge_type=None):
1461
from bzrlib.merge import merge
1462
from bzrlib.merge_core import ApplyMerge3
1463
if merge_type is None:
1464
merge_type = ApplyMerge3
1465
merge(parse_spec(other_spec), parse_spec(base_spec),
1466
check_clean=(not force), merge_type=merge_type)
1467
1468
1469
class cmd_revert(Command):
1470
"""Reverse all changes since the last commit.
1471
1472
Only versioned files are affected. Specify filenames to revert only
1473
those files. By default, any files that are changed will be backed up
1474
first. Backup files have a '~' appended to their name.
1475
"""
1476
takes_options = ['revision', 'no-backup']
1477
takes_args = ['file*']
1478
aliases = ['merge-revert']
1479
1480
def run(self, revision=None, no_backup=False, file_list=None):
1481
from bzrlib.merge import merge
1482
if file_list is not None:
1483
if len(file_list) == 0:
1484
raise BzrCommandError("No files specified")
1485
if revision is None:
1486
revision = [-1]
1487
elif len(revision) != 1:
1488
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1489
merge(('.', revision[0]), parse_spec('.'),
1490
check_clean=False,
1491
ignore_zero=True,
1492
backup_files=not no_backup,
1493
file_list=file_list)
1494
913
"""Perform a three-way merge of trees."""
914
takes_args = ['other_spec', 'base_spec']
915
916
def run(self, other_spec, base_spec):
917
merge.merge(parse_spec(other_spec), parse_spec(base_spec))
1495
918
1496
919
class cmd_assert_fail(Command):
1497
920
"""Test reporting of assertion failures"""
1512
935
help.help(topic)
1513
936
1514
937
1515
1516
1517
class cmd_plugins(Command):
1518
"""List plugins"""
938
class cmd_update_stat_cache(Command):
939
"""Update stat-cache mapping inodes to SHA-1 hashes.
940
941
For testing only."""
1519
942
hidden = True
1520
943
def run(self):
1521
import bzrlib.plugin
1522
from inspect import getdoc
1523
from pprint import pprint
1524
for plugin in bzrlib.plugin.all_plugins:
1525
print plugin.__path__[0]
1526
d = getdoc(plugin)
1527
if d:
1528
print '\t', d.split('\n')[0]
1529
1530
#pprint(bzrlib.plugin.all_plugins)
1531
944
import statcache
945
b = Branch('.')
946
statcache.update_cache(b.base, b.read_working_inventory())
947
948
949
######################################################################
950
# main routine
1532
951
1533
952
1534
953
# list of all available options; the rhs can be either None for an
1536
955
# the type.
1537
956
OPTIONS = {
1538
957
'all': None,
1539
'diff-options': str,
1540
958
'help': None,
1541
959
'file': unicode,
1542
'force': None,
1543
'format': unicode,
1544
'forward': None,
1545
960
'message': unicode,
1546
'no-recurse': None,
1547
961
'profile': None,
1548
'revision': _parse_revision_str,
962
'revision': int,
1549
963
'show-ids': None,
1550
964
'timezone': str,
1551
965
'verbose': None,
1552
966
'version': None,
1553
967
'email': None,
1554
'unchanged': None,
1555
'update': None,
1556
'long': None,
1557
'root': str,
1558
'no-backup': None,
1559
'merge-type': get_merge_type,
1560
968
}
1561
969
1562
970
SHORT_OPTIONS = {
971
'm': 'message',
1563
972
'F': 'file',
1564
'h': 'help',
1565
'm': 'message',
1566
973
'r': 'revision',
1567
974
'v': 'verbose',
1568
'l': 'long',
1569
975
}
1570
976
1571
977
1585
991
(['status'], {'all': True})
1586
992
>>> parse_args('commit --message=biter'.split())
1587
993
(['commit'], {'message': u'biter'})
1588
>>> parse_args('log -r 500'.split())
1589
(['log'], {'revision': [500]})
1590
>>> parse_args('log -r500..600'.split())
1591
(['log'], {'revision': [500, 600]})
1592
>>> parse_args('log -vr500..600'.split())
1593
(['log'], {'verbose': True, 'revision': [500, 600]})
1594
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1595
(['log'], {'revision': ['v500', 600]})
1596
994
"""
1597
995
args = []
1598
996
opts = {}
1612
1010
else:
1613
1011
optname = a[2:]
1614
1012
if optname not in OPTIONS:
1615
raise BzrError('unknown long option %r' % a)
1013
bailout('unknown long option %r' % a)
1616
1014
else:
1617
1015
shortopt = a[1:]
1618
if shortopt in SHORT_OPTIONS:
1619
# Multi-character options must have a space to delimit
1620
# their value
1621
optname = SHORT_OPTIONS[shortopt]
1622
else:
1623
# Single character short options, can be chained,
1624
# and have their value appended to their name
1625
shortopt = a[1:2]
1626
if shortopt not in SHORT_OPTIONS:
1627
# We didn't find the multi-character name, and we
1628
# didn't find the single char name
1629
raise BzrError('unknown short option %r' % a)
1630
optname = SHORT_OPTIONS[shortopt]
1631
1632
if a[2:]:
1633
# There are extra things on this option
1634
# see if it is the value, or if it is another
1635
# short option
1636
optargfn = OPTIONS[optname]
1637
if optargfn is None:
1638
# This option does not take an argument, so the
1639
# next entry is another short option, pack it back
1640
# into the list
1641
argv.insert(0, '-' + a[2:])
1642
else:
1643
# This option takes an argument, so pack it
1644
# into the array
1645
optarg = a[2:]
1016
if shortopt not in SHORT_OPTIONS:
1017
bailout('unknown short option %r' % a)
1018
optname = SHORT_OPTIONS[shortopt]
1646
1019
1647
1020
if optname in opts:
1648
1021
# XXX: Do we ever want to support this, e.g. for -r?
1649
raise BzrError('repeated option %r' % a)
1022
bailout('repeated option %r' % a)
1650
1023
1651
1024
optargfn = OPTIONS[optname]
1652
1025
if optargfn:
1653
1026
if optarg == None:
1654
1027
if not argv:
1655
raise BzrError('option %r needs an argument' % a)
1028
bailout('option %r needs an argument' % a)
1656
1029
else:
1657
1030
optarg = argv.pop(0)
1658
1031
opts[optname] = optargfn(optarg)
1659
1032
else:
1660
1033
if optarg != None:
1661
raise BzrError('option %r takes no argument' % optname)
1034
bailout('option %r takes no argument' % optname)
1662
1035
opts[optname] = True
1663
1036
else:
1664
1037
args.append(a)
1718
1091
1719
1092
This is similar to main(), but without all the trappings for
1720
1093
logging and error handling.
1721
1722
argv
1723
The command-line arguments, without the program name from argv[0]
1724
1725
Returns a command status or raises an exception.
1726
1727
Special master options: these must come before the command because
1728
they control how the command is interpreted.
1729
1730
--no-plugins
1731
Do not load plugin modules at all
1732
1733
--builtin
1734
Only use builtin commands. (Plugins are still allowed to change
1735
other behaviour.)
1736
1737
--profile
1738
Run under the Python profiler.
1739
1094
"""
1740
1741
1095
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1742
1743
opt_profile = opt_no_plugins = opt_builtin = False
1744
1745
# --no-plugins is handled specially at a very early stage. We need
1746
# to load plugins before doing other command parsing so that they
1747
# can override commands, but this needs to happen first.
1748
1749
for a in argv[:]:
1750
if a == '--profile':
1751
opt_profile = True
1752
elif a == '--no-plugins':
1753
opt_no_plugins = True
1754
elif a == '--builtin':
1755
opt_builtin = True
1756
else:
1757
break
1758
argv.remove(a)
1759
1760
if not opt_no_plugins:
1761
from bzrlib.plugin import load_plugins
1762
load_plugins()
1763
1764
args, opts = parse_args(argv)
1765
1766
if 'help' in opts:
1767
from bzrlib.help import help
1768
if args:
1769
help(args[0])
1770
else:
1771
help()
1772
return 0
1773
1774
if 'version' in opts:
1775
show_version()
1776
return 0
1777
1096
1778
if not args:
1779
print >>sys.stderr, "please try 'bzr help' for help"
1097
try:
1098
args, opts = parse_args(argv[1:])
1099
if 'help' in opts:
1100
import help
1101
if args:
1102
help.help(args[0])
1103
else:
1104
help.help()
1105
return 0
1106
elif 'version' in opts:
1107
show_version()
1108
return 0
1109
cmd = str(args.pop(0))
1110
except IndexError:
1111
import help
1112
help.help()
1780
1113
return 1
1781
1782
cmd = str(args.pop(0))
1783
1784
canonical_cmd, cmd_class = \
1785
get_cmd_class(cmd, plugins_override=not opt_builtin)
1114
1115
1116
canonical_cmd, cmd_class = get_cmd_class(cmd)
1117
1118
# global option
1119
if 'profile' in opts:
1120
profile = True
1121
del opts['profile']
1122
else:
1123
profile = False
1786
1124
1787
1125
# check options are reasonable
1788
1126
allowed = cmd_class.takes_options
1797
1135
for k, v in opts.items():
1798
1136
cmdopts[k.replace('-', '_')] = v
1799
1137
1800
if opt_profile:
1138
if profile:
1801
1139
import hotshot, tempfile
1802
1140
pffileno, pfname = tempfile.mkstemp()
1803
1141
try:
1824
1162
1825
1163
def _report_exception(summary, quiet=False):
1826
1164
import traceback
1827
1828
1165
log_error('bzr: ' + summary)
1829
1166
bzrlib.trace.log_exception()
1830
1167
1831
if os.environ.get('BZR_DEBUG'):
1832
traceback.print_exc()
1833
1834
1168
if not quiet:
1835
sys.stderr.write('\n')
1836
1169
tb = sys.exc_info()[2]
1837
1170
exinfo = traceback.extract_tb(tb)
1838
1171
if exinfo:
1842
1175
1843
1176
1844
1177
def main(argv):
1178
import errno
1845
1179
1846
bzrlib.trace.open_tracefile(argv)
1180
bzrlib.open_tracefile(argv)
1847
1181
1848
1182
try:
1849
1183
try:
1850
1184
try:
1851
return run_bzr(argv[1:])
1185
return run_bzr(argv)
1852
1186
finally:
1853
1187
# do this here inside the exception wrappers to catch EPIPE
1854
1188
sys.stdout.flush()
1855
1189
except BzrError, e:
1856
1190
quiet = isinstance(e, (BzrCommandError))
1857
_report_exception('error: ' + str(e), quiet=quiet)
1191
_report_exception('error: ' + e.args[0], quiet=quiet)
1858
1192
if len(e.args) > 1:
1859
1193
for h in e.args[1]:
1860
1194
# some explanation or hints
1870
1204
_report_exception('interrupted', quiet=True)
1871
1205
return 2
1872
1206
except Exception, e:
1873
import errno
1874
1207
quiet = False
1875
1208
if (isinstance(e, IOError)
1876
1209
and hasattr(e, 'errno')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1