« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 1026
- compare with another revision
- download diff
- download tarball
- view history from revision 1026
- Committer: Martin Pool
- Date: 2005-08-02 23:14:41 UTC
- Revision ID: mbp@sourcefrog.net-20050802231441-d738a6e6ffd03c3e
- new error RevisionNotPresent
- raise this when trying to fetch a revision that's mentioned but not
in the revision store
- Store raises an IndexError from getitem method if key is not found
- raise this when trying to fetch a revision that's mentioned but not
in the revision store
- Store raises an IndexError from getitem method if key is not found
- files added:
- bzr-man.py
- bzrlib/selftest
- contrib/emacs
- effbot
- effbot/org
- patches
- plugins
- plugins/changeset
- tools
- files removed:
- bzrlib/statcache.py
- files renamed:
- contrib/bash/bzr => contrib/bash/bzr.simple
- 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
19
import sys, os, time, os.path
20
from sets import Set
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
21
25
22
26
import bzrlib
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
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__])
30
49
31
50
32
51
def _squish_command_name(cmd):
37
56
assert cmd.startswith("cmd_")
38
57
return cmd[4:].replace('_','-')
39
58
40
def get_all_cmds():
41
"""Return canonical name and class for all registered commands."""
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 = {}
42
147
for k, v in globals().iteritems():
43
148
if k.startswith("cmd_"):
44
yield _unsquish_command_name(k), v
45
46
def get_cmd_class(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):
47
167
"""Return the canonical name and command class for a command.
48
168
"""
49
169
cmd = str(cmd) # not unicode
50
170
51
171
# first look up this command under the specified name
172
cmds = _get_cmd_dict(plugins_override=plugins_override)
52
173
try:
53
return cmd, globals()[_squish_command_name(cmd)]
174
return cmd, cmds[cmd]
54
175
except KeyError:
55
176
pass
56
177
57
178
# look for any command which claims this as an alias
58
for cmdname, cmdclass in get_all_cmds():
179
for cmdname, cmdclass in cmds.iteritems():
59
180
if cmd in cmdclass.aliases:
60
181
return cmdname, cmdclass
61
182
66
187
raise BzrCommandError("unknown command %r" % cmd)
67
188
68
189
69
class Command:
190
class Command(object):
70
191
"""Base class for commands.
71
192
72
193
The docstring for an actual command should give a single-line
98
219
assert isinstance(arguments, dict)
99
220
cmdargs = options.copy()
100
221
cmdargs.update(arguments)
101
assert self.__doc__ != Command.__doc__, \
102
("No help message set for %r" % self)
222
if self.__doc__ == Command.__doc__:
223
from warnings import warn
224
warn("No help message set for %r" % self)
103
225
self.status = self.run(**cmdargs)
226
if self.status is None:
227
self.status = 0
104
228
105
229
106
230
def run(self):
118
242
class ExternalCommand(Command):
119
243
"""Class to wrap external commands.
120
244
121
We cheat a little here, when get_cmd_class() calls us we actually give it back
122
an object we construct that has the appropriate path, help, options etc for the
123
specified command.
124
125
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
126
method, which we override to call the Command.__init__ method. That then calls
127
our run method which is pretty straight forward.
128
129
The only wrinkle is that we have to map bzr's dictionary of options and arguments
130
back into command line options and arguments for the script.
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.
131
257
"""
132
258
133
259
def find_command(cls, cmd):
260
import os.path
134
261
bzrpath = os.environ.get('BZRPATH', '')
135
262
136
for dir in bzrpath.split(':'):
263
for dir in bzrpath.split(os.pathsep):
137
264
path = os.path.join(dir, cmd)
138
265
if os.path.isfile(path):
139
266
return ExternalCommand(path)
145
272
def __init__(self, path):
146
273
self.path = path
147
274
148
# TODO: If either of these fail, we should detect that and
149
# assume that path is not really a bzr plugin after all.
150
151
275
pipe = os.popen('%s --bzr-usage' % path, 'r')
152
276
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?
153
284
self.takes_args = pipe.readline().split()
154
pipe.close()
285
286
if pipe.close() is not None:
287
raise BzrError("Failed funning '%s --bzr-usage'" % path)
155
288
156
289
pipe = os.popen('%s --bzr-help' % path, 'r')
157
290
self.__doc__ = pipe.read()
158
pipe.close()
291
if pipe.close() is not None:
292
raise BzrError("Failed funning '%s --bzr-help'" % path)
159
293
160
294
def __call__(self, options, arguments):
161
295
Command.__init__(self, options, arguments)
168
302
keys = kargs.keys()
169
303
keys.sort()
170
304
for name in keys:
305
optname = name.replace('_','-')
171
306
value = kargs[name]
172
if OPTIONS.has_key(name):
307
if OPTIONS.has_key(optname):
173
308
# it's an option
174
opts.append('--%s' % name)
309
opts.append('--%s' % optname)
175
310
if value is not None and value is not True:
176
311
opts.append(str(value))
177
312
else:
221
356
directory is shown. Otherwise, only the status of the specified
222
357
files or directories is reported. If a directory is given, status
223
358
is reported for everything inside that directory.
359
360
If a revision is specified, the changes since that revision are shown.
224
361
"""
225
362
takes_args = ['file*']
226
takes_options = ['all', 'show-ids']
363
takes_options = ['all', 'show-ids', 'revision']
227
364
aliases = ['st', 'stat']
228
365
229
366
def run(self, all=False, show_ids=False, file_list=None):
230
367
if file_list:
231
b = Branch(file_list[0], lock_mode='r')
368
b = find_branch(file_list[0])
232
369
file_list = [b.relpath(x) for x in file_list]
233
370
# special case: only one path was given and it's the root
234
371
# of the branch
235
372
if file_list == ['']:
236
373
file_list = None
237
374
else:
238
b = Branch('.', lock_mode='r')
239
import status
240
status.show_status(b, show_unchanged=all, show_ids=show_ids,
241
file_list=file_list)
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)
242
380
243
381
244
382
class cmd_cat_revision(Command):
248
386
takes_args = ['revision_id']
249
387
250
388
def run(self, revision_id):
251
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
389
from bzrlib.xml import pack_xml
390
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
252
391
253
392
254
393
class cmd_revno(Command):
256
395
257
396
This is equal to the number of revisions on this branch."""
258
397
def run(self):
259
print Branch('.').revno()
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
421
261
422
262
423
class cmd_add(Command):
272
433
whether already versioned or not, are searched for files or
273
434
subdirectories that are neither versioned or ignored, and these
274
435
are added. This search proceeds recursively into versioned
275
directories.
436
directories. If no names are given '.' is assumed.
276
437
277
Therefore simply saying 'bzr add .' will version all files that
438
Therefore simply saying 'bzr add' will version all files that
278
439
are currently unknown.
279
440
280
441
TODO: Perhaps adding a file whose directly is not versioned should
281
442
recursively add that parent, rather than giving an error?
282
443
"""
283
takes_args = ['file+']
284
takes_options = ['verbose']
444
takes_args = ['file*']
445
takes_options = ['verbose', 'no-recurse']
285
446
286
def run(self, file_list, verbose=False):
287
bzrlib.add.smart_add(file_list, verbose)
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)
288
468
289
469
290
470
class cmd_relpath(Command):
291
471
"""Show path of a file relative to root"""
292
472
takes_args = ['filename']
473
hidden = True
293
474
294
475
def run(self, filename):
295
print Branch(filename).relpath(filename)
476
print find_branch(filename).relpath(filename)
296
477
297
478
298
479
299
480
class cmd_inventory(Command):
300
481
"""Show inventory of the current working copy or a revision."""
301
takes_options = ['revision']
482
takes_options = ['revision', 'show-ids']
302
483
303
def run(self, revision=None):
304
b = Branch('.')
484
def run(self, revision=None, show_ids=False):
485
b = find_branch('.')
305
486
if revision == None:
306
487
inv = b.read_working_inventory()
307
488
else:
308
inv = b.get_revision_inventory(b.lookup_revision(revision))
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
493
310
for path, entry in inv.iter_entries():
311
print '%-50s %s' % (entry.file_id, path)
494
for path, entry in inv.entries():
495
if show_ids:
496
print '%-50s %s' % (path, entry.file_id)
497
else:
498
print path
312
499
313
500
314
501
class cmd_move(Command):
321
508
"""
322
509
takes_args = ['source$', 'dest']
323
510
def run(self, source_list, dest):
324
b = Branch('.')
511
b = find_branch('.')
325
512
513
# TODO: glob expansion on windows?
326
514
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
327
515
328
516
343
531
takes_args = ['from_name', 'to_name']
344
532
345
533
def run(self, from_name, to_name):
346
b = Branch('.')
534
b = find_branch('.')
347
535
b.rename_one(b.relpath(from_name), b.relpath(to_name))
348
536
349
537
350
538
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
351
718
class cmd_renames(Command):
352
719
"""Show list of renamed files.
353
720
358
725
takes_args = ['dir?']
359
726
360
727
def run(self, dir='.'):
361
b = Branch(dir)
728
b = find_branch(dir)
362
729
old_inv = b.basis_tree().inventory
363
730
new_inv = b.read_working_inventory()
364
731
375
742
def run(self, branch=None):
376
743
import info
377
744
378
from branch import find_branch
379
745
b = find_branch(branch)
380
746
info.show_info(b)
381
747
390
756
takes_options = ['verbose']
391
757
392
758
def run(self, file_list, verbose=False):
393
b = Branch(file_list[0])
759
b = find_branch(file_list[0])
394
760
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
395
761
396
762
404
770
hidden = True
405
771
takes_args = ['filename']
406
772
def run(self, filename):
407
b = Branch(filename)
773
b = find_branch(filename)
408
774
i = b.inventory.path2id(b.relpath(filename))
409
775
if i == None:
410
bailout("%r is not a versioned file" % filename)
776
raise BzrError("%r is not a versioned file" % filename)
411
777
else:
412
778
print i
413
779
420
786
hidden = True
421
787
takes_args = ['filename']
422
788
def run(self, filename):
423
b = Branch(filename)
789
b = find_branch(filename)
424
790
inv = b.inventory
425
791
fid = inv.path2id(b.relpath(filename))
426
792
if fid == None:
427
bailout("%r is not a versioned file" % filename)
793
raise BzrError("%r is not a versioned file" % filename)
428
794
for fip in inv.get_idpath(fid):
429
795
print fip
430
796
431
797
432
798
class cmd_revision_history(Command):
433
799
"""Display list of revision ids on this branch."""
800
hidden = True
434
801
def run(self):
435
for patchid in Branch('.').revision_history():
802
for patchid in find_branch('.').revision_history():
436
803
print patchid
437
804
438
805
439
806
class cmd_directories(Command):
440
807
"""Display list of versioned directories in this branch."""
441
808
def run(self):
442
for name, ie in Branch('.').read_working_inventory().directories():
809
for name, ie in find_branch('.').read_working_inventory().directories():
443
810
if name == '':
444
811
print '.'
445
812
else:
460
827
bzr commit -m 'imported project'
461
828
"""
462
829
def run(self):
830
from bzrlib.branch import Branch
463
831
Branch('.', init=True)
464
832
465
833
488
856
"""
489
857
490
858
takes_args = ['file*']
491
takes_options = ['revision']
492
aliases = ['di']
859
takes_options = ['revision', 'diff-options']
860
aliases = ['di', 'dif']
493
861
494
def run(self, revision=None, file_list=None):
862
def run(self, revision=None, file_list=None, diff_options=None):
495
863
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]
496
880
497
show_diff(Branch('.'), revision, file_list)
881
show_diff(b, base_rev, specific_files=file_list,
882
external_diff_options=diff_options)
498
883
499
884
500
885
506
891
TODO: Show files deleted since a previous revision, or between two revisions.
507
892
"""
508
893
def run(self, show_ids=False):
509
b = Branch('.')
894
b = find_branch('.')
510
895
old = b.basis_tree()
511
896
new = b.working_tree()
512
897
527
912
"""List files modified in working tree."""
528
913
hidden = True
529
914
def run(self):
530
import statcache
531
b = Branch('.')
532
inv = b.read_working_inventory()
533
sc = statcache.update_cache(b, inv)
534
basis = b.basis_tree()
535
basis_inv = basis.inventory
536
537
# We used to do this through iter_entries(), but that's slow
538
# when most of the files are unmodified, as is usually the
539
# case. So instead we iterate by inventory entry, and only
540
# calculate paths as necessary.
541
542
for file_id in basis_inv:
543
cacheentry = sc.get(file_id)
544
if not cacheentry: # deleted
545
continue
546
ie = basis_inv[file_id]
547
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
548
path = inv.id2path(file_id)
549
print path
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
550
922
551
923
552
924
554
926
"""List files added in working tree."""
555
927
hidden = True
556
928
def run(self):
557
b = Branch('.')
929
b = find_branch('.')
558
930
wt = b.working_tree()
559
931
basis_inv = b.basis_tree().inventory
560
932
inv = wt.inventory
576
948
takes_args = ['filename?']
577
949
def run(self, filename=None):
578
950
"""Print the branch root."""
579
from branch import find_branch
580
951
b = find_branch(filename)
581
952
print getattr(b, 'base', None) or getattr(b, 'baseurl')
582
953
584
955
class cmd_log(Command):
585
956
"""Show log of this branch.
586
957
587
TODO: Option to limit range.
588
589
TODO: Perhaps show most-recent first with an option for last.
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
590
967
"""
968
591
969
takes_args = ['filename?']
592
takes_options = ['timezone', 'verbose', 'show-ids']
593
def run(self, filename=None, timezone='original', verbose=False, show_ids=False):
594
from branch import find_branch
595
b = find_branch((filename or '.'), lock_mode='r')
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'
984
596
985
if filename:
597
filename = b.relpath(filename)
598
bzrlib.show_log(b, filename,
599
show_timezone=timezone,
600
verbose=verbose,
601
show_ids=show_ids)
986
b = find_branch(filename)
987
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
992
else:
993
b = find_branch('.')
994
file_id = None
995
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,
1030
verbose=verbose,
1031
direction=direction,
1032
start_revision=rev1,
1033
end_revision=rev2,
1034
search=message)
602
1035
603
1036
604
1037
605
1038
class cmd_touching_revisions(Command):
606
"""Return revision-ids which affected a particular file."""
1039
"""Return revision-ids which affected a particular file.
1040
1041
A more user-friendly interface is "bzr log FILE"."""
607
1042
hidden = True
608
1043
takes_args = ["filename"]
609
1044
def run(self, filename):
610
b = Branch(filename, lock_mode='r')
1045
b = find_branch(filename)
611
1046
inv = b.read_working_inventory()
612
1047
file_id = inv.path2id(b.relpath(filename))
613
1048
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
621
1056
"""
622
1057
hidden = True
623
1058
def run(self, revision=None, verbose=False):
624
b = Branch('.')
1059
b = find_branch('.')
625
1060
if revision == None:
626
1061
tree = b.working_tree()
627
1062
else:
643
1078
644
1079
645
1080
class cmd_unknowns(Command):
646
"""List unknown files"""
1081
"""List unknown files."""
647
1082
def run(self):
648
for f in Branch('.').unknowns():
1083
from bzrlib.osutils import quotefn
1084
for f in find_branch('.').unknowns():
649
1085
print quotefn(f)
650
1086
651
1087
652
1088
653
1089
class cmd_ignore(Command):
654
"""Ignore a command or pattern
1090
"""Ignore a command or pattern.
655
1091
656
1092
To remove patterns from the ignore list, edit the .bzrignore file.
657
1093
671
1107
672
1108
def run(self, name_pattern):
673
1109
from bzrlib.atomicfile import AtomicFile
674
import codecs
1110
import os.path
675
1111
676
b = Branch('.')
1112
b = find_branch('.')
677
1113
ifn = b.abspath('.bzrignore')
678
1114
679
# FIXME: probably doesn't handle non-ascii patterns
680
681
1115
if os.path.exists(ifn):
682
f = b.controlfile(ifn, 'rt')
683
igns = f.read()
684
f.close()
1116
f = open(ifn, 'rt')
1117
try:
1118
igns = f.read().decode('utf-8')
1119
finally:
1120
f.close()
685
1121
else:
686
1122
igns = ''
687
1123
1124
# TODO: If the file already uses crlf-style termination, maybe
1125
# we should use that for the newly added lines?
1126
688
1127
if igns and igns[-1] != '\n':
689
1128
igns += '\n'
690
1129
igns += name_pattern + '\n'
691
1130
692
f = AtomicFile(ifn, 'wt')
693
f.write(igns)
694
f.commit()
1131
try:
1132
f = AtomicFile(ifn, 'wt')
1133
f.write(igns.encode('utf-8'))
1134
f.commit()
1135
finally:
1136
f.close()
695
1137
696
1138
inv = b.working_tree().inventory
697
1139
if inv.path2id('.bzrignore'):
707
1149
708
1150
See also: bzr ignore"""
709
1151
def run(self):
710
tree = Branch('.').working_tree()
1152
tree = find_branch('.').working_tree()
711
1153
for path, file_class, kind, file_id in tree.list_files():
712
1154
if file_class != 'I':
713
1155
continue
731
1173
except ValueError:
732
1174
raise BzrCommandError("not a valid revision-number: %r" % revno)
733
1175
734
print Branch('.').lookup_revision(revno)
1176
print find_branch('.').lookup_revision(revno)
735
1177
736
1178
737
1179
class cmd_export(Command):
738
1180
"""Export past revision to destination directory.
739
1181
740
If no revision is specified this exports the last committed revision."""
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
741
1191
takes_args = ['dest']
742
takes_options = ['revision']
743
def run(self, dest, revision=None):
744
b = Branch('.')
745
if revision == None:
746
rh = b.revision_history()[-1]
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()
747
1198
else:
748
rh = b.lookup_revision(int(revision))
749
t = b.revision_tree(rh)
750
t.export(dest)
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)
751
1214
752
1215
753
1216
class cmd_cat(Command):
759
1222
def run(self, filename, revision=None):
760
1223
if revision == None:
761
1224
raise BzrCommandError("bzr cat requires a revision number")
762
b = Branch('.')
763
b.print_file(b.relpath(filename), int(revision))
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])
764
1229
765
1230
766
1231
class cmd_local_time_offset(Command):
773
1238
774
1239
class cmd_commit(Command):
775
1240
"""Commit changes into a new revision.
776
777
TODO: Commit only selected files.
1241
1242
If no arguments are given, the entire tree is committed.
1243
1244
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.
1247
1248
A selected-file commit may fail in some cases where the committed
1249
tree would be invalid, such as trying to commit a file in a
1250
newly-added directory that is not itself committed.
778
1251
779
1252
TODO: Run hooks on tree to-be-committed, and after commit.
780
1253
781
1254
TODO: Strict commit that fails if there are unknown or deleted files.
782
1255
"""
783
takes_options = ['message', 'file', 'verbose']
1256
takes_args = ['selected*']
1257
takes_options = ['message', 'file', 'verbose', 'unchanged']
784
1258
aliases = ['ci', 'checkin']
785
1259
786
def run(self, message=None, file=None, verbose=False):
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
1266
787
1267
## Warning: shadows builtin file()
788
1268
if not message and not file:
789
raise BzrCommandError("please specify a commit message",
790
["use either --message or --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"])
791
1283
elif message and file:
792
1284
raise BzrCommandError("please specify either --message or --file")
793
1285
795
1287
import codecs
796
1288
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
797
1289
798
Branch('.').commit(message, verbose=verbose)
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"])
799
1303
800
1304
801
1305
class cmd_check(Command):
803
1307
804
1308
This command checks various invariants about the branch storage to
805
1309
detect data corruption or bzr bugs.
806
"""
807
takes_args = ['dir?']
808
def run(self, dir='.'):
809
import bzrlib.check
810
bzrlib.check.check(Branch(dir, find_root=False))
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))
811
1354
812
1355
813
1356
825
1368
class cmd_selftest(Command):
826
1369
"""Run internal test suite"""
827
1370
hidden = True
828
def run(self):
829
failures, tests = 0, 0
830
831
import doctest, bzrlib.store, bzrlib.tests
832
bzrlib.trace.verbose = False
833
834
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
835
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
836
mf, mt = doctest.testmod(m)
837
failures += mf
838
tests += mt
839
print '%-40s %3d tests' % (m.__name__, mt),
840
if mf:
841
print '%3d FAILED!' % mf
842
else:
843
print
844
845
print '%-40s %3d tests' % ('total', tests),
846
if failures:
847
print '%3d FAILED!' % failures
848
else:
849
print
850
1371
takes_options = ['verbose']
1372
def run(self, verbose=False):
1373
from bzrlib.selftest import selftest
1374
return int(not selftest(verbose=verbose))
851
1375
852
1376
853
1377
class cmd_version(Command):
854
"""Show version of bzr"""
1378
"""Show version of bzr."""
855
1379
def run(self):
856
1380
show_version()
857
1381
858
1382
def show_version():
859
1383
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
860
1388
print bzrlib.__copyright__
861
1389
print "http://bazaar-ng.org/"
862
1390
print
871
1399
def run(self):
872
1400
print "it sure does!"
873
1401
1402
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
if '/@' in spec:
1418
parsed = spec.split('/@')
1419
assert len(parsed) == 2
1420
if parsed[1] == "":
1421
parsed[1] = -1
1422
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
1429
else:
1430
parsed = [spec, None]
1431
return parsed
1432
1433
1434
1435
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
874
1495
875
1496
class cmd_assert_fail(Command):
876
1497
"""Test reporting of assertion failures"""
891
1512
help.help(topic)
892
1513
893
1514
894
class cmd_update_stat_cache(Command):
895
"""Update stat-cache mapping inodes to SHA-1 hashes.
896
897
For testing only."""
1515
1516
1517
class cmd_plugins(Command):
1518
"""List plugins"""
898
1519
hidden = True
899
1520
def run(self):
900
import statcache
901
b = Branch('.')
902
statcache.update_cache(b.base, b.read_working_inventory())
903
904
905
######################################################################
906
# main routine
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
907
1532
908
1533
909
1534
# list of all available options; the rhs can be either None for an
911
1536
# the type.
912
1537
OPTIONS = {
913
1538
'all': None,
1539
'diff-options': str,
914
1540
'help': None,
915
1541
'file': unicode,
1542
'force': None,
1543
'format': unicode,
1544
'forward': None,
916
1545
'message': unicode,
1546
'no-recurse': None,
917
1547
'profile': None,
918
'revision': int,
1548
'revision': _parse_revision_str,
919
1549
'show-ids': None,
920
1550
'timezone': str,
921
1551
'verbose': None,
922
1552
'version': None,
923
1553
'email': None,
1554
'unchanged': None,
1555
'update': None,
1556
'long': None,
1557
'root': str,
1558
'no-backup': None,
1559
'merge-type': get_merge_type,
924
1560
}
925
1561
926
1562
SHORT_OPTIONS = {
1563
'F': 'file',
1564
'h': 'help',
927
1565
'm': 'message',
928
'F': 'file',
929
1566
'r': 'revision',
930
1567
'v': 'verbose',
1568
'l': 'long',
931
1569
}
932
1570
933
1571
947
1585
(['status'], {'all': True})
948
1586
>>> parse_args('commit --message=biter'.split())
949
1587
(['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]})
950
1596
"""
951
1597
args = []
952
1598
opts = {}
966
1612
else:
967
1613
optname = a[2:]
968
1614
if optname not in OPTIONS:
969
bailout('unknown long option %r' % a)
1615
raise BzrError('unknown long option %r' % a)
970
1616
else:
971
1617
shortopt = a[1:]
972
if shortopt not in SHORT_OPTIONS:
973
bailout('unknown short option %r' % a)
974
optname = SHORT_OPTIONS[shortopt]
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:]
975
1646
976
1647
if optname in opts:
977
1648
# XXX: Do we ever want to support this, e.g. for -r?
978
bailout('repeated option %r' % a)
1649
raise BzrError('repeated option %r' % a)
979
1650
980
1651
optargfn = OPTIONS[optname]
981
1652
if optargfn:
982
1653
if optarg == None:
983
1654
if not argv:
984
bailout('option %r needs an argument' % a)
1655
raise BzrError('option %r needs an argument' % a)
985
1656
else:
986
1657
optarg = argv.pop(0)
987
1658
opts[optname] = optargfn(optarg)
988
1659
else:
989
1660
if optarg != None:
990
bailout('option %r takes no argument' % optname)
1661
raise BzrError('option %r takes no argument' % optname)
991
1662
opts[optname] = True
992
1663
else:
993
1664
args.append(a)
1047
1718
1048
1719
This is similar to main(), but without all the trappings for
1049
1720
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.
1050
1739
"""
1740
1051
1741
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
1052
1777
1053
try:
1054
args, opts = parse_args(argv[1:])
1055
if 'help' in opts:
1056
import help
1057
if args:
1058
help.help(args[0])
1059
else:
1060
help.help()
1061
return 0
1062
elif 'version' in opts:
1063
show_version()
1064
return 0
1065
cmd = str(args.pop(0))
1066
except IndexError:
1067
import help
1068
help.help()
1778
if not args:
1779
print >>sys.stderr, "please try 'bzr help' for help"
1069
1780
return 1
1070
1071
1072
canonical_cmd, cmd_class = get_cmd_class(cmd)
1073
1074
# global option
1075
if 'profile' in opts:
1076
profile = True
1077
del opts['profile']
1078
else:
1079
profile = False
1781
1782
cmd = str(args.pop(0))
1783
1784
canonical_cmd, cmd_class = \
1785
get_cmd_class(cmd, plugins_override=not opt_builtin)
1080
1786
1081
1787
# check options are reasonable
1082
1788
allowed = cmd_class.takes_options
1091
1797
for k, v in opts.items():
1092
1798
cmdopts[k.replace('-', '_')] = v
1093
1799
1094
if profile:
1800
if opt_profile:
1095
1801
import hotshot, tempfile
1096
1802
pffileno, pfname = tempfile.mkstemp()
1097
1803
try:
1113
1819
os.close(pffileno)
1114
1820
os.remove(pfname)
1115
1821
else:
1116
cmdobj = cmd_class(cmdopts, cmdargs).status
1822
return cmd_class(cmdopts, cmdargs).status
1117
1823
1118
1824
1119
1825
def _report_exception(summary, quiet=False):
1120
1826
import traceback
1827
1121
1828
log_error('bzr: ' + summary)
1122
1829
bzrlib.trace.log_exception()
1123
1830
1831
if os.environ.get('BZR_DEBUG'):
1832
traceback.print_exc()
1833
1124
1834
if not quiet:
1835
sys.stderr.write('\n')
1125
1836
tb = sys.exc_info()[2]
1126
1837
exinfo = traceback.extract_tb(tb)
1127
1838
if exinfo:
1131
1842
1132
1843
1133
1844
def main(argv):
1134
import errno
1135
1845
1136
bzrlib.open_tracefile(argv)
1846
bzrlib.trace.open_tracefile(argv)
1137
1847
1138
1848
try:
1139
1849
try:
1140
1850
try:
1141
return run_bzr(argv)
1851
return run_bzr(argv[1:])
1142
1852
finally:
1143
1853
# do this here inside the exception wrappers to catch EPIPE
1144
1854
sys.stdout.flush()
1145
1855
except BzrError, e:
1146
1856
quiet = isinstance(e, (BzrCommandError))
1147
_report_exception('error: ' + e.args[0], quiet=quiet)
1857
_report_exception('error: ' + str(e), quiet=quiet)
1148
1858
if len(e.args) > 1:
1149
1859
for h in e.args[1]:
1150
1860
# some explanation or hints
1160
1870
_report_exception('interrupted', quiet=True)
1161
1871
return 2
1162
1872
except Exception, e:
1873
import errno
1163
1874
quiet = False
1164
1875
if (isinstance(e, IOError)
1165
1876
and hasattr(e, 'errno')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1