« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 443
- compare with another revision
- download diff
- download tarball
- view history from revision 443
- Committer: Martin Pool
- Date: 2005-05-10 08:15:58 UTC
- Revision ID: mbp@sourcefrog.net-20050510081558-9a38e2c46ba4ebc4
- Patch from Fredrik Lundh to check Python version and
try to find a better one if it's too old.
Patched to try to prevent infinite loops in wierd configurations,
and to log to stderr.
try to find a better one if it's too old.
Patched to try to prevent infinite loops in wierd configurations,
and to log to stderr.
- files added:
- bzrlib/statcache.py
- files removed:
- bzr-man.py
- bzrlib/selftest
- effbot
- effbot/org
- patches
- plugins
- plugins/changeset
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
16
16
17
17
18
18
19
import sys, os
19
import sys, os, time, os.path
20
from sets import Set
20
21
21
22
import bzrlib
22
from bzrlib.trace import mutter, note, log_error, warning
23
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.branch import find_branch
25
from bzrlib import BZRDIR
26
27
28
plugin_cmds = {}
29
30
31
def register_command(cmd):
32
"Utility function to help register a command"
33
global plugin_cmds
34
k = cmd.__name__
35
if k.startswith("cmd_"):
36
k_unsquished = _unsquish_command_name(k)
37
else:
38
k_unsquished = k
39
if not plugin_cmds.has_key(k_unsquished):
40
plugin_cmds[k_unsquished] = cmd
41
else:
42
log_error('Two plugins defined the same command: %r' % k)
43
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, WorkingTree, Tree
27
from bzrlib.revision import Revision
28
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
29
format_date
44
30
45
31
46
32
def _squish_command_name(cmd):
51
37
assert cmd.startswith("cmd_")
52
38
return cmd[4:].replace('_','-')
53
39
54
55
def _parse_revision_str(revstr):
56
"""This handles a revision string -> revno.
57
58
This always returns a list. The list will have one element for
59
60
It supports integers directly, but everything else it
61
defers for passing to Branch.get_revision_info()
62
63
>>> _parse_revision_str('234')
64
[234]
65
>>> _parse_revision_str('234..567')
66
[234, 567]
67
>>> _parse_revision_str('..')
68
[None, None]
69
>>> _parse_revision_str('..234')
70
[None, 234]
71
>>> _parse_revision_str('234..')
72
[234, None]
73
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
74
[234, 456, 789]
75
>>> _parse_revision_str('234....789') # Error?
76
[234, None, 789]
77
>>> _parse_revision_str('revid:test@other.com-234234')
78
['revid:test@other.com-234234']
79
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
80
['revid:test@other.com-234234', 'revid:test@other.com-234235']
81
>>> _parse_revision_str('revid:test@other.com-234234..23')
82
['revid:test@other.com-234234', 23]
83
>>> _parse_revision_str('date:2005-04-12')
84
['date:2005-04-12']
85
>>> _parse_revision_str('date:2005-04-12 12:24:33')
86
['date:2005-04-12 12:24:33']
87
>>> _parse_revision_str('date:2005-04-12T12:24:33')
88
['date:2005-04-12T12:24:33']
89
>>> _parse_revision_str('date:2005-04-12,12:24:33')
90
['date:2005-04-12,12:24:33']
91
>>> _parse_revision_str('-5..23')
92
[-5, 23]
93
>>> _parse_revision_str('-5')
94
[-5]
95
>>> _parse_revision_str('123a')
96
['123a']
97
>>> _parse_revision_str('abc')
98
['abc']
99
"""
100
import re
101
old_format_re = re.compile('\d*:\d*')
102
m = old_format_re.match(revstr)
103
if m:
104
warning('Colon separator for revision numbers is deprecated.'
105
' Use .. instead')
106
revs = []
107
for rev in revstr.split(':'):
108
if rev:
109
revs.append(int(rev))
110
else:
111
revs.append(None)
112
return revs
113
revs = []
114
for x in revstr.split('..'):
115
if not x:
116
revs.append(None)
117
else:
118
try:
119
revs.append(int(x))
120
except ValueError:
121
revs.append(x)
122
return revs
123
124
125
126
def _get_cmd_dict(plugins_override=True):
127
d = {}
40
def get_all_cmds():
41
"""Return canonical name and class for all registered commands."""
128
42
for k, v in globals().iteritems():
129
43
if k.startswith("cmd_"):
130
d[_unsquish_command_name(k)] = v
131
# If we didn't load plugins, the plugin_cmds dict will be empty
132
if plugins_override:
133
d.update(plugin_cmds)
134
else:
135
d2 = plugin_cmds.copy()
136
d2.update(d)
137
d = d2
138
return d
139
140
141
def get_all_cmds(plugins_override=True):
142
"""Return canonical name and class for all registered commands."""
143
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
144
yield k,v
145
146
147
def get_cmd_class(cmd, plugins_override=True):
44
yield _unsquish_command_name(k), v
45
46
def get_cmd_class(cmd):
148
47
"""Return the canonical name and command class for a command.
149
48
"""
150
49
cmd = str(cmd) # not unicode
151
50
152
51
# first look up this command under the specified name
153
cmds = _get_cmd_dict(plugins_override=plugins_override)
154
52
try:
155
return cmd, cmds[cmd]
53
return cmd, globals()[_squish_command_name(cmd)]
156
54
except KeyError:
157
55
pass
158
56
159
57
# look for any command which claims this as an alias
160
for cmdname, cmdclass in cmds.iteritems():
58
for cmdname, cmdclass in get_all_cmds():
161
59
if cmd in cmdclass.aliases:
162
60
return cmdname, cmdclass
163
61
168
66
raise BzrCommandError("unknown command %r" % cmd)
169
67
170
68
171
class Command(object):
69
class Command:
172
70
"""Base class for commands.
173
71
174
72
The docstring for an actual command should give a single-line
233
131
"""
234
132
235
133
def find_command(cls, cmd):
236
import os.path
237
134
bzrpath = os.environ.get('BZRPATH', '')
238
135
239
for dir in bzrpath.split(os.pathsep):
136
for dir in bzrpath.split(':'):
240
137
path = os.path.join(dir, cmd)
241
138
if os.path.isfile(path):
242
139
return ExternalCommand(path)
248
145
def __init__(self, path):
249
146
self.path = path
250
147
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
251
151
pipe = os.popen('%s --bzr-usage' % path, 'r')
252
152
self.takes_options = pipe.readline().split()
253
254
for opt in self.takes_options:
255
if not opt in OPTIONS:
256
raise BzrError("Unknown option '%s' returned by external command %s"
257
% (opt, path))
258
259
# TODO: Is there any way to check takes_args is valid here?
260
153
self.takes_args = pipe.readline().split()
261
262
if pipe.close() is not None:
263
raise BzrError("Failed funning '%s --bzr-usage'" % path)
154
pipe.close()
264
155
265
156
pipe = os.popen('%s --bzr-help' % path, 'r')
266
157
self.__doc__ = pipe.read()
267
if pipe.close() is not None:
268
raise BzrError("Failed funning '%s --bzr-help'" % path)
158
pipe.close()
269
159
270
160
def __call__(self, options, arguments):
271
161
Command.__init__(self, options, arguments)
278
168
keys = kargs.keys()
279
169
keys.sort()
280
170
for name in keys:
281
optname = name.replace('_','-')
282
171
value = kargs[name]
283
if OPTIONS.has_key(optname):
172
if OPTIONS.has_key(name):
284
173
# it's an option
285
opts.append('--%s' % optname)
174
opts.append('--%s' % name)
286
175
if value is not None and value is not True:
287
176
opts.append(str(value))
288
177
else:
300
189
class cmd_status(Command):
301
190
"""Display status summary.
302
191
303
This reports on versioned and unknown files, reporting them
304
grouped by state. Possible states are:
305
306
added
307
Versioned in the working copy but not in the previous revision.
308
309
removed
310
Versioned in the previous revision but removed or deleted
311
in the working copy.
312
313
renamed
314
Path of this file changed from the previous revision;
315
the text may also have changed. This includes files whose
316
parent directory was renamed.
317
318
modified
319
Text has changed since the previous revision.
320
321
unchanged
322
Nothing about this file has changed since the previous revision.
323
Only shown with --all.
324
325
unknown
326
Not versioned and not matching an ignore pattern.
327
328
To see ignored files use 'bzr ignored'. For details in the
329
changes to file texts, use 'bzr diff'.
330
331
If no arguments are specified, the status of the entire working
332
directory is shown. Otherwise, only the status of the specified
333
files or directories is reported. If a directory is given, status
334
is reported for everything inside that directory.
335
336
If a revision is specified, the changes since that revision are shown.
192
For each file there is a single line giving its file state and name.
193
The name is that in the current revision unless it is deleted or
194
missing, in which case the old name is shown.
337
195
"""
338
196
takes_args = ['file*']
339
takes_options = ['all', 'show-ids', 'revision']
197
takes_options = ['all']
340
198
aliases = ['st', 'stat']
341
199
342
def run(self, all=False, show_ids=False, file_list=None):
343
if file_list:
344
b = find_branch(file_list[0])
345
file_list = [b.relpath(x) for x in file_list]
346
# special case: only one path was given and it's the root
347
# of the branch
348
if file_list == ['']:
349
file_list = None
350
else:
351
b = find_branch('.')
352
353
from bzrlib.status import show_status
354
show_status(b, show_unchanged=all, show_ids=show_ids,
355
specific_files=file_list)
200
def run(self, all=False, file_list=None):
201
b = Branch('.', lock_mode='r')
202
b.show_status(show_all=all, file_list=file_list)
356
203
357
204
358
205
class cmd_cat_revision(Command):
362
209
takes_args = ['revision_id']
363
210
364
211
def run(self, revision_id):
365
from bzrlib.xml import pack_xml
366
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
212
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
367
213
368
214
369
215
class cmd_revno(Command):
371
217
372
218
This is equal to the number of revisions on this branch."""
373
219
def run(self):
374
print find_branch('.').revno()
375
376
class cmd_revision_info(Command):
377
"""Show revision number and revision id for a given revision identifier.
378
"""
379
hidden = True
380
takes_args = ['revision_info*']
381
takes_options = ['revision']
382
def run(self, revision=None, revision_info_list=None):
383
from bzrlib.branch import find_branch
384
385
revs = []
386
if revision is not None:
387
revs.extend(revision)
388
if revision_info_list is not None:
389
revs.extend(revision_info_list)
390
if len(revs) == 0:
391
raise BzrCommandError('You must supply a revision identifier')
392
393
b = find_branch('.')
394
395
for rev in revs:
396
print '%4d %s' % b.get_revision_info(rev)
220
print Branch('.').revno()
397
221
398
222
399
223
class cmd_add(Command):
418
242
recursively add that parent, rather than giving an error?
419
243
"""
420
244
takes_args = ['file+']
421
takes_options = ['verbose', 'no-recurse']
245
takes_options = ['verbose']
422
246
423
def run(self, file_list, verbose=False, no_recurse=False):
424
from bzrlib.add import smart_add
425
smart_add(file_list, verbose, not no_recurse)
426
427
428
429
class cmd_mkdir(Command):
430
"""Create a new versioned directory.
431
432
This is equivalent to creating the directory and then adding it.
433
"""
434
takes_args = ['dir+']
435
436
def run(self, dir_list):
437
b = None
438
439
for d in dir_list:
440
os.mkdir(d)
441
if not b:
442
b = find_branch(d)
443
b.add([d], verbose=True)
247
def run(self, file_list, verbose=False):
248
bzrlib.add.smart_add(file_list, verbose)
444
249
445
250
446
251
class cmd_relpath(Command):
447
252
"""Show path of a file relative to root"""
448
253
takes_args = ['filename']
449
hidden = True
450
254
451
255
def run(self, filename):
452
print find_branch(filename).relpath(filename)
256
print Branch(filename).relpath(filename)
453
257
454
258
455
259
456
260
class cmd_inventory(Command):
457
261
"""Show inventory of the current working copy or a revision."""
458
takes_options = ['revision', 'show-ids']
262
takes_options = ['revision']
459
263
460
def run(self, revision=None, show_ids=False):
461
b = find_branch('.')
264
def run(self, revision=None):
265
b = Branch('.')
462
266
if revision == None:
463
267
inv = b.read_working_inventory()
464
268
else:
465
if len(revision) > 1:
466
raise BzrCommandError('bzr inventory --revision takes'
467
' exactly one revision identifier')
468
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
269
inv = b.get_revision_inventory(b.lookup_revision(revision))
469
270
470
for path, entry in inv.entries():
471
if show_ids:
472
print '%-50s %s' % (path, entry.file_id)
473
else:
474
print path
271
for path, entry in inv.iter_entries():
272
print '%-50s %s' % (entry.file_id, path)
475
273
476
274
477
275
class cmd_move(Command):
484
282
"""
485
283
takes_args = ['source$', 'dest']
486
284
def run(self, source_list, dest):
487
b = find_branch('.')
285
b = Branch('.')
488
286
489
287
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
490
288
506
304
takes_args = ['from_name', 'to_name']
507
305
508
306
def run(self, from_name, to_name):
509
b = find_branch('.')
307
b = Branch('.')
510
308
b.rename_one(b.relpath(from_name), b.relpath(to_name))
511
309
512
310
513
311
514
515
516
class cmd_pull(Command):
517
"""Pull any changes from another branch into the current one.
518
519
If the location is omitted, the last-used location will be used.
520
Both the revision history and the working directory will be
521
updated.
522
523
This command only works on branches that have not diverged. Branches are
524
considered diverged if both branches have had commits without first
525
pulling from the other.
526
527
If branches have diverged, you can use 'bzr merge' to pull the text changes
528
from one into the other.
529
"""
530
takes_args = ['location?']
531
532
def run(self, location=None):
533
from bzrlib.merge import merge
534
import tempfile
535
from shutil import rmtree
536
import errno
537
538
br_to = find_branch('.')
539
stored_loc = None
540
try:
541
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
542
except IOError, e:
543
if e.errno != errno.ENOENT:
544
raise
545
if location is None:
546
if stored_loc is None:
547
raise BzrCommandError("No pull location known or specified.")
548
else:
549
print "Using last location: %s" % stored_loc
550
location = stored_loc
551
cache_root = tempfile.mkdtemp()
552
from bzrlib.branch import DivergedBranches
553
br_from = find_branch(location)
554
location = pull_loc(br_from)
555
old_revno = br_to.revno()
556
try:
557
from branch import find_cached_branch, DivergedBranches
558
br_from = find_cached_branch(location, cache_root)
559
location = pull_loc(br_from)
560
old_revno = br_to.revno()
561
try:
562
br_to.update_revisions(br_from)
563
except DivergedBranches:
564
raise BzrCommandError("These branches have diverged."
565
" Try merge.")
566
567
merge(('.', -1), ('.', old_revno), check_clean=False)
568
if location != stored_loc:
569
br_to.controlfile("x-pull", "wb").write(location + "\n")
570
finally:
571
rmtree(cache_root)
572
573
574
575
class cmd_branch(Command):
576
"""Create a new copy of a branch.
577
578
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
579
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
580
581
To retrieve the branch as of a particular revision, supply the --revision
582
parameter, as in "branch foo/bar -r 5".
583
"""
584
takes_args = ['from_location', 'to_location?']
585
takes_options = ['revision']
586
587
def run(self, from_location, to_location=None, revision=None):
588
import errno
589
from bzrlib.merge import merge
590
from bzrlib.branch import DivergedBranches, NoSuchRevision, \
591
find_cached_branch, Branch
592
from shutil import rmtree
593
from meta_store import CachedStore
594
import tempfile
595
cache_root = tempfile.mkdtemp()
596
597
if revision is None:
598
revision = [None]
599
elif len(revision) > 1:
600
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
601
602
try:
603
try:
604
br_from = find_cached_branch(from_location, cache_root)
605
except OSError, e:
606
if e.errno == errno.ENOENT:
607
raise BzrCommandError('Source location "%s" does not'
608
' exist.' % to_location)
609
else:
610
raise
611
612
if to_location is None:
613
to_location = os.path.basename(from_location.rstrip("/\\"))
614
615
try:
616
os.mkdir(to_location)
617
except OSError, e:
618
if e.errno == errno.EEXIST:
619
raise BzrCommandError('Target directory "%s" already'
620
' exists.' % to_location)
621
if e.errno == errno.ENOENT:
622
raise BzrCommandError('Parent of "%s" does not exist.' %
623
to_location)
624
else:
625
raise
626
br_to = Branch(to_location, init=True)
627
628
br_to.set_root_id(br_from.get_root_id())
629
630
if revision:
631
if revision[0] is None:
632
revno = br_from.revno()
633
else:
634
revno, rev_id = br_from.get_revision_info(revision[0])
635
try:
636
br_to.update_revisions(br_from, stop_revision=revno)
637
except NoSuchRevision:
638
rmtree(to_location)
639
msg = "The branch %s has no revision %d." % (from_location,
640
revno)
641
raise BzrCommandError(msg)
642
643
merge((to_location, -1), (to_location, 0), this_dir=to_location,
644
check_clean=False, ignore_zero=True)
645
from_location = pull_loc(br_from)
646
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
647
finally:
648
rmtree(cache_root)
649
650
651
def pull_loc(branch):
652
# TODO: Should perhaps just make attribute be 'base' in
653
# RemoteBranch and Branch?
654
if hasattr(branch, "baseurl"):
655
return branch.baseurl
656
else:
657
return branch.base
658
659
660
661
312
class cmd_renames(Command):
662
313
"""Show list of renamed files.
663
314
668
319
takes_args = ['dir?']
669
320
670
321
def run(self, dir='.'):
671
b = find_branch(dir)
322
b = Branch(dir)
672
323
old_inv = b.basis_tree().inventory
673
324
new_inv = b.read_working_inventory()
674
325
679
330
680
331
681
332
class cmd_info(Command):
682
"""Show statistical information about a branch."""
683
takes_args = ['branch?']
684
685
def run(self, branch=None):
333
"""Show statistical information for this branch"""
334
def run(self):
686
335
import info
687
688
b = find_branch(branch)
689
info.show_info(b)
336
info.show_info(Branch('.'))
690
337
691
338
692
339
class cmd_remove(Command):
699
346
takes_options = ['verbose']
700
347
701
348
def run(self, file_list, verbose=False):
702
b = find_branch(file_list[0])
349
b = Branch(file_list[0])
703
350
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
704
351
705
352
713
360
hidden = True
714
361
takes_args = ['filename']
715
362
def run(self, filename):
716
b = find_branch(filename)
363
b = Branch(filename)
717
364
i = b.inventory.path2id(b.relpath(filename))
718
365
if i == None:
719
raise BzrError("%r is not a versioned file" % filename)
366
bailout("%r is not a versioned file" % filename)
720
367
else:
721
368
print i
722
369
729
376
hidden = True
730
377
takes_args = ['filename']
731
378
def run(self, filename):
732
b = find_branch(filename)
379
b = Branch(filename)
733
380
inv = b.inventory
734
381
fid = inv.path2id(b.relpath(filename))
735
382
if fid == None:
736
raise BzrError("%r is not a versioned file" % filename)
383
bailout("%r is not a versioned file" % filename)
737
384
for fip in inv.get_idpath(fid):
738
385
print fip
739
386
740
387
741
388
class cmd_revision_history(Command):
742
389
"""Display list of revision ids on this branch."""
743
hidden = True
744
390
def run(self):
745
for patchid in find_branch('.').revision_history():
391
for patchid in Branch('.').revision_history():
746
392
print patchid
747
393
748
394
749
395
class cmd_directories(Command):
750
396
"""Display list of versioned directories in this branch."""
751
397
def run(self):
752
for name, ie in find_branch('.').read_working_inventory().directories():
398
for name, ie in Branch('.').read_working_inventory().directories():
753
399
if name == '':
754
400
print '.'
755
401
else:
770
416
bzr commit -m 'imported project'
771
417
"""
772
418
def run(self):
773
from bzrlib.branch import Branch
774
419
Branch('.', init=True)
775
420
776
421
799
444
"""
800
445
801
446
takes_args = ['file*']
802
takes_options = ['revision', 'diff-options']
803
aliases = ['di', 'dif']
447
takes_options = ['revision']
448
aliases = ['di']
804
449
805
def run(self, revision=None, file_list=None, diff_options=None):
450
def run(self, revision=None, file_list=None):
806
451
from bzrlib.diff import show_diff
807
808
if file_list:
809
b = find_branch(file_list[0])
810
file_list = [b.relpath(f) for f in file_list]
811
if file_list == ['']:
812
# just pointing to top-of-tree
813
file_list = None
814
else:
815
b = find_branch('.')
816
817
# TODO: Make show_diff support taking 2 arguments
818
base_rev = None
819
if revision is not None:
820
if len(revision) != 1:
821
raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')
822
base_rev = revision[0]
823
452
824
show_diff(b, base_rev, specific_files=file_list,
825
external_diff_options=diff_options)
453
show_diff(Branch('.'), revision, file_list)
826
454
827
455
828
456
834
462
TODO: Show files deleted since a previous revision, or between two revisions.
835
463
"""
836
464
def run(self, show_ids=False):
837
b = find_branch('.')
465
b = Branch('.')
838
466
old = b.basis_tree()
839
467
new = b.working_tree()
840
468
855
483
"""List files modified in working tree."""
856
484
hidden = True
857
485
def run(self):
858
from bzrlib.diff import compare_trees
859
860
b = find_branch('.')
861
td = compare_trees(b.basis_tree(), b.working_tree())
862
863
for path, id, kind in td.modified:
864
print path
486
import statcache
487
b = Branch('.')
488
inv = b.read_working_inventory()
489
sc = statcache.update_cache(b, inv)
490
basis = b.basis_tree()
491
basis_inv = basis.inventory
492
493
# We used to do this through iter_entries(), but that's slow
494
# when most of the files are unmodified, as is usually the
495
# case. So instead we iterate by inventory entry, and only
496
# calculate paths as necessary.
497
498
for file_id in basis_inv:
499
cacheentry = sc.get(file_id)
500
if not cacheentry: # deleted
501
continue
502
ie = basis_inv[file_id]
503
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
504
path = inv.id2path(file_id)
505
print path
865
506
866
507
867
508
869
510
"""List files added in working tree."""
870
511
hidden = True
871
512
def run(self):
872
b = find_branch('.')
513
b = Branch('.')
873
514
wt = b.working_tree()
874
515
basis_inv = b.basis_tree().inventory
875
516
inv = wt.inventory
891
532
takes_args = ['filename?']
892
533
def run(self, filename=None):
893
534
"""Print the branch root."""
535
from branch import find_branch
894
536
b = find_branch(filename)
895
537
print getattr(b, 'base', None) or getattr(b, 'baseurl')
896
538
898
540
class cmd_log(Command):
899
541
"""Show log of this branch.
900
542
901
To request a range of logs, you can use the command -r begin:end
902
-r revision requests a specific revision, -r :end or -r begin: are
903
also valid.
904
905
--message allows you to give a regular expression, which will be evaluated
906
so that only matching entries will be displayed.
907
908
TODO: Make --revision support uuid: and hash: [future tag:] notation.
909
543
TODO: Option to limit range.
544
545
TODO: Perhaps show most-recent first with an option for last.
910
546
"""
911
912
547
takes_args = ['filename?']
913
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
914
915
def run(self, filename=None, timezone='original',
916
verbose=False,
917
show_ids=False,
918
forward=False,
919
revision=None,
920
message=None,
921
long=False):
922
from bzrlib.branch import find_branch
923
from bzrlib.log import log_formatter, show_log
924
import codecs
925
926
direction = (forward and 'forward') or 'reverse'
927
548
takes_options = ['timezone', 'verbose', 'show-ids']
549
def run(self, filename=None, timezone='original', verbose=False, show_ids=False):
550
from branch import find_branch
551
b = find_branch((filename or '.'), lock_mode='r')
928
552
if filename:
929
b = find_branch(filename)
930
fp = b.relpath(filename)
931
if fp:
932
file_id = b.read_working_inventory().path2id(fp)
933
else:
934
file_id = None # points to branch root
935
else:
936
b = find_branch('.')
937
file_id = None
938
939
if revision is None:
940
rev1 = None
941
rev2 = None
942
elif len(revision) == 1:
943
rev1 = rev2 = b.get_revision_info(revision[0])[0]
944
elif len(revision) == 2:
945
rev1 = b.get_revision_info(revision[0])[0]
946
rev2 = b.get_revision_info(revision[1])[0]
947
else:
948
raise BzrCommandError('bzr log --revision takes one or two values.')
949
950
if rev1 == 0:
951
rev1 = None
952
if rev2 == 0:
953
rev2 = None
954
955
mutter('encoding log as %r' % bzrlib.user_encoding)
956
957
# use 'replace' so that we don't abort if trying to write out
958
# in e.g. the default C locale.
959
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
960
961
if long:
962
log_format = 'long'
963
else:
964
log_format = 'short'
965
lf = log_formatter(log_format,
966
show_ids=show_ids,
967
to_file=outf,
968
show_timezone=timezone)
969
970
show_log(b,
971
lf,
972
file_id,
973
verbose=verbose,
974
direction=direction,
975
start_revision=rev1,
976
end_revision=rev2,
977
search=message)
553
filename = b.relpath(filename)
554
bzrlib.show_log(b, filename,
555
show_timezone=timezone,
556
verbose=verbose,
557
show_ids=show_ids)
978
558
979
559
980
560
981
561
class cmd_touching_revisions(Command):
982
"""Return revision-ids which affected a particular file.
983
984
A more user-friendly interface is "bzr log FILE"."""
562
"""Return revision-ids which affected a particular file."""
985
563
hidden = True
986
564
takes_args = ["filename"]
987
565
def run(self, filename):
988
b = find_branch(filename)
566
b = Branch(filename, lock_mode='r')
989
567
inv = b.read_working_inventory()
990
568
file_id = inv.path2id(b.relpath(filename))
991
569
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
999
577
"""
1000
578
hidden = True
1001
579
def run(self, revision=None, verbose=False):
1002
b = find_branch('.')
580
b = Branch('.')
1003
581
if revision == None:
1004
582
tree = b.working_tree()
1005
583
else:
1021
599
1022
600
1023
601
class cmd_unknowns(Command):
1024
"""List unknown files."""
602
"""List unknown files"""
1025
603
def run(self):
1026
from bzrlib.osutils import quotefn
1027
for f in find_branch('.').unknowns():
604
for f in Branch('.').unknowns():
1028
605
print quotefn(f)
1029
606
1030
607
1031
608
1032
609
class cmd_ignore(Command):
1033
"""Ignore a command or pattern.
610
"""Ignore a command or pattern
1034
611
1035
612
To remove patterns from the ignore list, edit the .bzrignore file.
1036
613
1050
627
1051
628
def run(self, name_pattern):
1052
629
from bzrlib.atomicfile import AtomicFile
1053
import os.path
630
import codecs
1054
631
1055
b = find_branch('.')
632
b = Branch('.')
1056
633
ifn = b.abspath('.bzrignore')
1057
634
635
# FIXME: probably doesn't handle non-ascii patterns
636
1058
637
if os.path.exists(ifn):
1059
f = open(ifn, 'rt')
1060
try:
1061
igns = f.read().decode('utf-8')
1062
finally:
1063
f.close()
638
f = b.controlfile(ifn, 'rt')
639
igns = f.read()
640
f.close()
1064
641
else:
1065
642
igns = ''
1066
643
1067
# TODO: If the file already uses crlf-style termination, maybe
1068
# we should use that for the newly added lines?
1069
1070
644
if igns and igns[-1] != '\n':
1071
645
igns += '\n'
1072
646
igns += name_pattern + '\n'
1073
647
1074
try:
1075
f = AtomicFile(ifn, 'wt')
1076
f.write(igns.encode('utf-8'))
1077
f.commit()
1078
finally:
1079
f.close()
648
f = AtomicFile(ifn, 'wt')
649
f.write(igns)
650
f.commit()
1080
651
1081
652
inv = b.working_tree().inventory
1082
653
if inv.path2id('.bzrignore'):
1092
663
1093
664
See also: bzr ignore"""
1094
665
def run(self):
1095
tree = find_branch('.').working_tree()
666
tree = Branch('.').working_tree()
1096
667
for path, file_class, kind, file_id in tree.list_files():
1097
668
if file_class != 'I':
1098
669
continue
1116
687
except ValueError:
1117
688
raise BzrCommandError("not a valid revision-number: %r" % revno)
1118
689
1119
print find_branch('.').lookup_revision(revno)
690
print Branch('.').lookup_revision(revno)
1120
691
1121
692
1122
693
class cmd_export(Command):
1123
694
"""Export past revision to destination directory.
1124
695
1125
If no revision is specified this exports the last committed revision.
1126
1127
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1128
given, try to find the format with the extension. If no extension
1129
is found exports to a directory (equivalent to --format=dir).
1130
1131
Root may be the top directory for tar, tgz and tbz2 formats. If none
1132
is given, the top directory will be the root name of the file."""
1133
# TODO: list known exporters
696
If no revision is specified this exports the last committed revision."""
1134
697
takes_args = ['dest']
1135
takes_options = ['revision', 'format', 'root']
1136
def run(self, dest, revision=None, format=None, root=None):
1137
import os.path
1138
b = find_branch('.')
1139
if revision is None:
1140
rev_id = b.last_patch()
698
takes_options = ['revision']
699
def run(self, dest, revision=None):
700
b = Branch('.')
701
if revision == None:
702
rh = b.revision_history()[-1]
1141
703
else:
1142
if len(revision) != 1:
1143
raise BzrError('bzr export --revision takes exactly 1 argument')
1144
revno, rev_id = b.get_revision_info(revision[0])
1145
t = b.revision_tree(rev_id)
1146
root, ext = os.path.splitext(dest)
1147
if not format:
1148
if ext in (".tar",):
1149
format = "tar"
1150
elif ext in (".gz", ".tgz"):
1151
format = "tgz"
1152
elif ext in (".bz2", ".tbz2"):
1153
format = "tbz2"
1154
else:
1155
format = "dir"
1156
t.export(dest, format, root)
704
rh = b.lookup_revision(int(revision))
705
t = b.revision_tree(rh)
706
t.export(dest)
1157
707
1158
708
1159
709
class cmd_cat(Command):
1165
715
def run(self, filename, revision=None):
1166
716
if revision == None:
1167
717
raise BzrCommandError("bzr cat requires a revision number")
1168
elif len(revision) != 1:
1169
raise BzrCommandError("bzr cat --revision takes exactly one number")
1170
b = find_branch('.')
1171
b.print_file(b.relpath(filename), revision[0])
718
b = Branch('.')
719
b.print_file(b.relpath(filename), int(revision))
1172
720
1173
721
1174
722
class cmd_local_time_offset(Command):
1182
730
class cmd_commit(Command):
1183
731
"""Commit changes into a new revision.
1184
732
1185
If selected files are specified, only changes to those files are
1186
committed. If a directory is specified then its contents are also
1187
committed.
1188
1189
A selected-file commit may fail in some cases where the committed
1190
tree would be invalid, such as trying to commit a file in a
1191
newly-added directory that is not itself committed.
733
TODO: Commit only selected files.
1192
734
1193
735
TODO: Run hooks on tree to-be-committed, and after commit.
1194
736
1195
737
TODO: Strict commit that fails if there are unknown or deleted files.
1196
738
"""
1197
takes_args = ['selected*']
1198
takes_options = ['message', 'file', 'verbose', 'unchanged']
739
takes_options = ['message', 'file', 'verbose']
1199
740
aliases = ['ci', 'checkin']
1200
741
1201
def run(self, message=None, file=None, verbose=True, selected_list=None,
1202
unchanged=False):
1203
from bzrlib.errors import PointlessCommit
1204
from bzrlib.osutils import get_text_message
1205
742
def run(self, message=None, file=None, verbose=False):
1206
743
## Warning: shadows builtin file()
1207
744
if not message and not file:
1208
import cStringIO
1209
stdout = sys.stdout
1210
catcher = cStringIO.StringIO()
1211
sys.stdout = catcher
1212
cmd_status({"file_list":selected_list}, {})
1213
info = catcher.getvalue()
1214
sys.stdout = stdout
1215
message = get_text_message(info)
1216
1217
if message is None:
1218
raise BzrCommandError("please specify a commit message",
1219
["use either --message or --file"])
745
raise BzrCommandError("please specify a commit message",
746
["use either --message or --file"])
1220
747
elif message and file:
1221
748
raise BzrCommandError("please specify either --message or --file")
1222
749
1224
751
import codecs
1225
752
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1226
753
1227
b = find_branch('.')
1228
1229
try:
1230
b.commit(message, verbose=verbose,
1231
specific_files=selected_list,
1232
allow_pointless=unchanged)
1233
except PointlessCommit:
1234
# FIXME: This should really happen before the file is read in;
1235
# perhaps prepare the commit; get the message; then actually commit
1236
raise BzrCommandError("no changes to commit",
1237
["use --unchanged to commit anyhow"])
754
Branch('.').commit(message, verbose=verbose)
1238
755
1239
756
1240
757
class cmd_check(Command):
1242
759
1243
760
This command checks various invariants about the branch storage to
1244
761
detect data corruption or bzr bugs.
1245
1246
If given the --update flag, it will update some optional fields
1247
to help ensure data consistency.
1248
"""
1249
takes_args = ['dir?']
1250
1251
def run(self, dir='.'):
1252
from bzrlib.check import check
1253
check(find_branch(dir))
1254
1255
1256
1257
class cmd_upgrade(Command):
1258
"""Upgrade branch storage to current format.
1259
1260
This should normally be used only after the check command tells
1261
you to run it.
1262
"""
1263
takes_args = ['dir?']
1264
1265
def run(self, dir='.'):
1266
from bzrlib.upgrade import upgrade
1267
upgrade(find_branch(dir))
762
"""
763
takes_args = ['dir?']
764
def run(self, dir='.'):
765
import bzrlib.check
766
bzrlib.check.check(Branch(dir, find_root=False))
1268
767
1269
768
1270
769
1283
782
"""Run internal test suite"""
1284
783
hidden = True
1285
784
def run(self):
1286
from bzrlib.selftest import selftest
1287
return int(not selftest())
785
failures, tests = 0, 0
786
787
import doctest, bzrlib.store, bzrlib.tests
788
bzrlib.trace.verbose = False
789
790
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
791
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
792
mf, mt = doctest.testmod(m)
793
failures += mf
794
tests += mt
795
print '%-40s %3d tests' % (m.__name__, mt),
796
if mf:
797
print '%3d FAILED!' % mf
798
else:
799
print
800
801
print '%-40s %3d tests' % ('total', tests),
802
if failures:
803
print '%3d FAILED!' % failures
804
else:
805
print
806
1288
807
1289
808
1290
809
class cmd_version(Command):
1291
"""Show version of bzr."""
810
"""Show version of bzr"""
1292
811
def run(self):
1293
812
show_version()
1294
813
1295
814
def show_version():
1296
815
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1297
# is bzrlib itself in a branch?
1298
bzrrev = bzrlib.get_bzr_revision()
1299
if bzrrev:
1300
print " (bzr checkout, revision %d {%s})" % bzrrev
1301
816
print bzrlib.__copyright__
1302
817
print "http://bazaar-ng.org/"
1303
818
print
1312
827
def run(self):
1313
828
print "it sure does!"
1314
829
1315
def parse_spec(spec):
1316
"""
1317
>>> parse_spec(None)
1318
[None, None]
1319
>>> parse_spec("./")
1320
['./', None]
1321
>>> parse_spec("../@")
1322
['..', -1]
1323
>>> parse_spec("../f/@35")
1324
['../f', 35]
1325
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1326
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1327
"""
1328
if spec is None:
1329
return [None, None]
1330
if '/@' in spec:
1331
parsed = spec.split('/@')
1332
assert len(parsed) == 2
1333
if parsed[1] == "":
1334
parsed[1] = -1
1335
else:
1336
try:
1337
parsed[1] = int(parsed[1])
1338
except ValueError:
1339
pass # We can allow stuff like ./@revid:blahblahblah
1340
else:
1341
assert parsed[1] >=0
1342
else:
1343
parsed = [spec, None]
1344
return parsed
1345
1346
1347
1348
class cmd_merge(Command):
1349
"""Perform a three-way merge of trees.
1350
1351
The SPEC parameters are working tree or revision specifiers. Working trees
1352
are specified using standard paths or urls. No component of a directory
1353
path may begin with '@'.
1354
1355
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1356
1357
Revisions are specified using a dirname/@revno pair, where dirname is the
1358
branch directory and revno is the revision within that branch. If no revno
1359
is specified, the latest revision is used.
1360
1361
Revision examples: './@127', 'foo/@', '../@1'
1362
1363
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1364
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1365
as the BASE.
1366
1367
merge refuses to run if there are any uncommitted changes, unless
1368
--force is given.
1369
"""
1370
takes_args = ['other_spec', 'base_spec?']
1371
takes_options = ['force']
1372
1373
def run(self, other_spec, base_spec=None, force=False):
1374
from bzrlib.merge import merge
1375
merge(parse_spec(other_spec), parse_spec(base_spec),
1376
check_clean=(not force))
1377
1378
1379
1380
class cmd_revert(Command):
1381
"""Restore selected files from a previous revision.
1382
"""
1383
takes_args = ['file+']
1384
def run(self, file_list):
1385
from bzrlib.branch import find_branch
1386
1387
if not file_list:
1388
file_list = ['.']
1389
1390
b = find_branch(file_list[0])
1391
1392
b.revert([b.relpath(f) for f in file_list])
1393
1394
1395
class cmd_merge_revert(Command):
1396
"""Reverse all changes since the last commit.
1397
1398
Only versioned files are affected.
1399
1400
TODO: Store backups of any files that will be reverted, so
1401
that the revert can be undone.
1402
"""
1403
takes_options = ['revision']
1404
1405
def run(self, revision=None):
1406
from bzrlib.merge import merge
1407
if revision is None:
1408
revision = [-1]
1409
elif len(revision) != 1:
1410
raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1411
merge(('.', revision[0]), parse_spec('.'),
1412
check_clean=False,
1413
ignore_zero=True)
1414
1415
830
1416
831
class cmd_assert_fail(Command):
1417
832
"""Test reporting of assertion failures"""
1432
847
help.help(topic)
1433
848
1434
849
1435
1436
1437
class cmd_plugins(Command):
1438
"""List plugins"""
850
class cmd_update_stat_cache(Command):
851
"""Update stat-cache mapping inodes to SHA-1 hashes.
852
853
For testing only."""
1439
854
hidden = True
1440
855
def run(self):
1441
import bzrlib.plugin
1442
from inspect import getdoc
1443
from pprint import pprint
1444
for plugin in bzrlib.plugin.all_plugins:
1445
print plugin.__path__[0]
1446
d = getdoc(plugin)
1447
if d:
1448
print '\t', d.split('\n')[0]
1449
1450
#pprint(bzrlib.plugin.all_plugins)
1451
856
import statcache
857
b = Branch('.')
858
statcache.update_cache(b)
859
860
861
######################################################################
862
# main routine
1452
863
1453
864
1454
865
# list of all available options; the rhs can be either None for an
1456
867
# the type.
1457
868
OPTIONS = {
1458
869
'all': None,
1459
'diff-options': str,
1460
870
'help': None,
1461
871
'file': unicode,
1462
'force': None,
1463
'format': unicode,
1464
'forward': None,
1465
872
'message': unicode,
1466
'no-recurse': None,
1467
873
'profile': None,
1468
'revision': _parse_revision_str,
874
'revision': int,
1469
875
'show-ids': None,
1470
876
'timezone': str,
1471
877
'verbose': None,
1472
878
'version': None,
1473
879
'email': None,
1474
'unchanged': None,
1475
'update': None,
1476
'long': None,
1477
'root': str,
1478
880
}
1479
881
1480
882
SHORT_OPTIONS = {
883
'm': 'message',
1481
884
'F': 'file',
1482
'h': 'help',
1483
'm': 'message',
1484
885
'r': 'revision',
1485
886
'v': 'verbose',
1486
'l': 'long',
1487
887
}
1488
888
1489
889
1503
903
(['status'], {'all': True})
1504
904
>>> parse_args('commit --message=biter'.split())
1505
905
(['commit'], {'message': u'biter'})
1506
>>> parse_args('log -r 500'.split())
1507
(['log'], {'revision': [500]})
1508
>>> parse_args('log -r500..600'.split())
1509
(['log'], {'revision': [500, 600]})
1510
>>> parse_args('log -vr500..600'.split())
1511
(['log'], {'verbose': True, 'revision': [500, 600]})
1512
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1513
(['log'], {'revision': ['v500', 600]})
1514
906
"""
1515
907
args = []
1516
908
opts = {}
1530
922
else:
1531
923
optname = a[2:]
1532
924
if optname not in OPTIONS:
1533
raise BzrError('unknown long option %r' % a)
925
bailout('unknown long option %r' % a)
1534
926
else:
1535
927
shortopt = a[1:]
1536
if shortopt in SHORT_OPTIONS:
1537
# Multi-character options must have a space to delimit
1538
# their value
1539
optname = SHORT_OPTIONS[shortopt]
1540
else:
1541
# Single character short options, can be chained,
1542
# and have their value appended to their name
1543
shortopt = a[1:2]
1544
if shortopt not in SHORT_OPTIONS:
1545
# We didn't find the multi-character name, and we
1546
# didn't find the single char name
1547
raise BzrError('unknown short option %r' % a)
1548
optname = SHORT_OPTIONS[shortopt]
1549
1550
if a[2:]:
1551
# There are extra things on this option
1552
# see if it is the value, or if it is another
1553
# short option
1554
optargfn = OPTIONS[optname]
1555
if optargfn is None:
1556
# This option does not take an argument, so the
1557
# next entry is another short option, pack it back
1558
# into the list
1559
argv.insert(0, '-' + a[2:])
1560
else:
1561
# This option takes an argument, so pack it
1562
# into the array
1563
optarg = a[2:]
928
if shortopt not in SHORT_OPTIONS:
929
bailout('unknown short option %r' % a)
930
optname = SHORT_OPTIONS[shortopt]
1564
931
1565
932
if optname in opts:
1566
933
# XXX: Do we ever want to support this, e.g. for -r?
1567
raise BzrError('repeated option %r' % a)
934
bailout('repeated option %r' % a)
1568
935
1569
936
optargfn = OPTIONS[optname]
1570
937
if optargfn:
1571
938
if optarg == None:
1572
939
if not argv:
1573
raise BzrError('option %r needs an argument' % a)
940
bailout('option %r needs an argument' % a)
1574
941
else:
1575
942
optarg = argv.pop(0)
1576
943
opts[optname] = optargfn(optarg)
1577
944
else:
1578
945
if optarg != None:
1579
raise BzrError('option %r takes no argument' % optname)
946
bailout('option %r takes no argument' % optname)
1580
947
opts[optname] = True
1581
948
else:
1582
949
args.append(a)
1630
997
return argdict
1631
998
1632
999
1633
def _parse_master_args(argv):
1634
"""Parse the arguments that always go with the original command.
1635
These are things like bzr --no-plugins, etc.
1636
1637
There are now 2 types of option flags. Ones that come *before* the command,
1638
and ones that come *after* the command.
1639
Ones coming *before* the command are applied against all possible commands.
1640
And are generally applied before plugins are loaded.
1641
1642
The current list are:
1643
--builtin Allow plugins to load, but don't let them override builtin commands,
1644
they will still be allowed if they do not override a builtin.
1645
--no-plugins Don't load any plugins. This lets you get back to official source
1646
behavior.
1647
--profile Enable the hotspot profile before running the command.
1648
For backwards compatibility, this is also a non-master option.
1649
--version Spit out the version of bzr that is running and exit.
1650
This is also a non-master option.
1651
--help Run help and exit, also a non-master option (I think that should stay, though)
1652
1653
>>> argv, opts = _parse_master_args(['bzr', '--test'])
1654
Traceback (most recent call last):
1655
...
1656
BzrCommandError: Invalid master option: 'test'
1657
>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1658
>>> print argv
1659
['command']
1660
>>> print opts['version']
1661
True
1662
>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1663
>>> print argv
1664
['command', '--more-options']
1665
>>> print opts['profile']
1666
True
1667
>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1668
>>> print argv
1669
['command']
1670
>>> print opts['no-plugins']
1671
True
1672
>>> print opts['profile']
1673
False
1674
>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1675
>>> print argv
1676
['command', '--profile']
1677
>>> print opts['profile']
1678
False
1679
"""
1680
master_opts = {'builtin':False,
1681
'no-plugins':False,
1682
'version':False,
1683
'profile':False,
1684
'help':False
1685
}
1686
1687
# This is the point where we could hook into argv[0] to determine
1688
# what front-end is supposed to be run
1689
# For now, we are just ignoring it.
1690
cmd_name = argv.pop(0)
1691
for arg in argv[:]:
1692
if arg[:2] != '--': # at the first non-option, we return the rest
1693
break
1694
arg = arg[2:] # Remove '--'
1695
if arg not in master_opts:
1696
# We could say that this is not an error, that we should
1697
# just let it be handled by the main section instead
1698
raise BzrCommandError('Invalid master option: %r' % arg)
1699
argv.pop(0) # We are consuming this entry
1700
master_opts[arg] = True
1701
return argv, master_opts
1702
1703
1704
1000
1705
1001
def run_bzr(argv):
1706
1002
"""Execute a command.
1711
1007
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1712
1008
1713
1009
try:
1714
# some options like --builtin and --no-plugins have special effects
1715
argv, master_opts = _parse_master_args(argv)
1716
if not master_opts['no-plugins']:
1717
from bzrlib.plugin import load_plugins
1718
load_plugins()
1719
1720
args, opts = parse_args(argv)
1721
1722
if master_opts['help']:
1723
from bzrlib.help import help
1724
if argv:
1725
help(argv[0])
1726
else:
1727
help()
1728
return 0
1729
1010
args, opts = parse_args(argv[1:])
1730
1011
if 'help' in opts:
1731
from bzrlib.help import help
1012
import help
1732
1013
if args:
1733
help(args[0])
1014
help.help(args[0])
1734
1015
else:
1735
help()
1016
help.help()
1736
1017
return 0
1737
1018
elif 'version' in opts:
1738
1019
show_version()
1739
1020
return 0
1740
elif args and args[0] == 'builtin':
1741
include_plugins=False
1742
args = args[1:]
1743
1021
cmd = str(args.pop(0))
1744
1022
except IndexError:
1745
import help
1746
help.help()
1023
log_error('usage: bzr COMMAND')
1024
log_error(' try "bzr help"')
1747
1025
return 1
1748
1749
1750
plugins_override = not (master_opts['builtin'])
1751
canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1752
1753
profile = master_opts['profile']
1754
# For backwards compatibility, I would rather stick with --profile being a
1755
# master/global option
1026
1027
canonical_cmd, cmd_class = get_cmd_class(cmd)
1028
1029
# global option
1756
1030
if 'profile' in opts:
1757
1031
profile = True
1758
1032
del opts['profile']
1033
else:
1034
profile = False
1759
1035
1760
1036
# check options are reasonable
1761
1037
allowed = cmd_class.takes_options
1792
1068
os.close(pffileno)
1793
1069
os.remove(pfname)
1794
1070
else:
1795
return cmd_class(cmdopts, cmdargs).status
1071
cmdobj = cmd_class(cmdopts, cmdargs).status
1796
1072
1797
1073
1798
1074
def _report_exception(summary, quiet=False):
1810
1086
1811
1087
1812
1088
def main(argv):
1089
import errno
1813
1090
1814
bzrlib.trace.open_tracefile(argv)
1091
bzrlib.open_tracefile(argv)
1815
1092
1816
1093
try:
1817
1094
try:
1838
1115
_report_exception('interrupted', quiet=True)
1839
1116
return 2
1840
1117
except Exception, e:
1841
import errno
1842
1118
quiet = False
1843
1119
if (isinstance(e, IOError)
1844
1120
and hasattr(e, 'errno')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1