« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 258
- compare with another revision
- download diff
- download tarball
- view history from revision 258
- Committer: Martin Pool
- Date: 2005-04-15 02:34:07 UTC
- Revision ID: mbp@sourcefrog.net-20050415023407-986a296162e726d7
- Take email from ~/.bzr.conf/email
- files added:
- .rsyncexclude
- elementtree
- urlgrabber
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
1
#! /usr/bin/python
2
3
4
1
# Copyright (C) 2004, 2005 by Martin Pool
5
2
# Copyright (C) 2005 by Canonical Ltd
6
3
28
25
* Metadata format is not stable yet -- you may need to
29
26
discard history in the future.
30
27
31
* No handling of subdirectories, symlinks or any non-text files.
32
33
28
* Insufficient error handling.
34
29
35
30
* Many commands unimplemented or partially implemented.
40
35
41
36
Interesting commands::
42
37
43
bzr help
44
Show summary help screen
38
bzr help [COMMAND]
39
Show help screen
45
40
bzr version
46
41
Show software version/licence/non-warranty.
47
42
bzr init
50
45
Make files versioned.
51
46
bzr log
52
47
Show revision history.
53
bzr diff
48
bzr diff [FILE...]
54
49
Show changes from last revision to working copy.
55
50
bzr commit -m 'MESSAGE'
56
51
Store current state as new revision.
60
55
Show summary of pending changes.
61
56
bzr remove FILE...
62
57
Make a file not versioned.
58
bzr info
59
Show statistics about this branch.
63
60
"""
64
61
65
# not currently working:
66
# bzr info
67
# Show some information about this branch.
68
69
70
71
__copyright__ = "Copyright 2005 Canonical Development Ltd."
72
__author__ = "Martin Pool <mbp@canonical.com>"
73
__docformat__ = "restructuredtext en"
74
__version__ = '0.0.0'
75
76
77
import sys, os, random, time, sha, sets, types, re, shutil, tempfile
78
import traceback, socket, fnmatch, difflib
79
from os import path
62
63
64
65
import sys, os, time, types, shutil, tempfile, traceback, fnmatch, difflib, os.path
80
66
from sets import Set
81
67
from pprint import pprint
82
68
from stat import *
83
69
from glob import glob
70
from inspect import getdoc
84
71
85
72
import bzrlib
86
73
from bzrlib.store import ImmutableStore
87
74
from bzrlib.trace import mutter, note, log_error
88
from bzrlib.errors import bailout, BzrError
75
from bzrlib.errors import bailout, BzrError, BzrCheckError
89
76
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
90
77
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
91
78
from bzrlib.revision import Revision
118
105
## can be taken either from their parameters or their working
119
106
## directory.
120
107
108
## TODO: rename command, needed soon: check destination doesn't exist
109
## either in working copy or tree; move working copy; update
110
## inventory; write out
111
112
## TODO: move command; check destination is a directory and will not
113
## clash; move it.
114
115
## TODO: command to show renames, one per line, as to->from
116
117
121
118
122
119
123
120
def cmd_status(all=False):
126
123
For each file there is a single line giving its file state and name.
127
124
The name is that in the current revision unless it is deleted or
128
125
missing, in which case the old name is shown.
129
130
:todo: Don't show unchanged files unless ``--all`` is given?
131
126
"""
127
#import bzrlib.status
128
#bzrlib.status.tree_status(Branch('.'))
132
129
Branch('.').show_status(show_all=all)
133
130
134
131
155
152
print Branch('.').revno()
156
153
157
154
155
158
156
def cmd_add(file_list, verbose=False):
159
"""Add specified files.
157
"""Add specified files or directories.
158
159
In non-recursive mode, all the named items are added, regardless
160
of whether they were previously ignored. A warning is given if
161
any of the named files are already versioned.
162
163
In recursive mode (the default), files are treated the same way
164
but the behaviour for directories is different. Directories that
165
are already versioned do not give a warning. All directories,
166
whether already versioned or not, are searched for files or
167
subdirectories that are neither versioned or ignored, and these
168
are added. This search proceeds recursively into versioned
169
directories.
170
171
Therefore simply saying 'bzr add .' will version all files that
172
are currently unknown.
173
"""
174
bzrlib.add.smart_add(file_list, verbose)
160
175
161
Fails if the files are already added.
162
"""
163
Branch('.').add(file_list, verbose=verbose)
176
177
def cmd_relpath(filename):
178
"""Show path of file relative to root"""
179
print Branch(filename).relpath(filename)
180
164
181
165
182
166
183
def cmd_inventory(revision=None):
178
195
179
196
180
197
198
# TODO: Maybe a 'mv' command that has the combined move/rename
199
# special behaviour of Unix?
200
201
def cmd_move(source_list, dest):
202
b = Branch('.')
203
204
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
205
206
207
208
def cmd_rename(from_name, to_name):
209
"""Change the name of an entry.
210
211
usage: bzr rename FROM_NAME TO_NAME
212
213
examples:
214
bzr rename frob.c frobber.c
215
bzr rename src/frob.c lib/frob.c
216
217
It is an error if the destination name exists.
218
219
See also the 'move' command, which moves files into a different
220
directory without changing their name.
221
222
TODO: Some way to rename multiple files without invoking bzr for each
223
one?"""
224
b = Branch('.')
225
b.rename_one(b.relpath(from_name), b.relpath(to_name))
226
227
228
229
230
def cmd_renames(dir='.'):
231
"""Show list of renamed files.
232
233
usage: bzr renames [BRANCH]
234
235
TODO: Option to show renames between two historical versions.
236
237
TODO: Only show renames under dir, rather than in the whole branch.
238
"""
239
b = Branch(dir)
240
old_inv = b.basis_tree().inventory
241
new_inv = b.read_working_inventory()
242
243
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
244
renames.sort()
245
for old_name, new_name in renames:
246
print "%s => %s" % (old_name, new_name)
247
248
249
181
250
def cmd_info():
182
b = Branch('.')
183
print 'branch format:', b.controlfile('branch-format', 'r').readline().rstrip('\n')
184
185
def plural(n, base='', pl=None):
186
if n == 1:
187
return base
188
elif pl is not None:
189
return pl
190
else:
191
return 's'
192
193
count_version_dirs = 0
194
195
count_status = {'A': 0, 'D': 0, 'M': 0, 'R': 0, '?': 0, 'I': 0, '.': 0}
196
for st_tup in bzrlib.diff_trees(b.basis_tree(), b.working_tree()):
197
fs = st_tup[0]
198
count_status[fs] += 1
199
if fs not in ['I', '?'] and st_tup[4] == 'directory':
200
count_version_dirs += 1
201
202
print
203
print 'in the working tree:'
204
for name, fs in (('unchanged', '.'),
205
('modified', 'M'), ('added', 'A'), ('removed', 'D'),
206
('renamed', 'R'), ('unknown', '?'), ('ignored', 'I'),
207
):
208
print ' %5d %s' % (count_status[fs], name)
209
print ' %5d versioned subdirector%s' % (count_version_dirs,
210
plural(count_version_dirs, 'y', 'ies'))
211
212
print
213
print 'branch history:'
214
history = b.revision_history()
215
revno = len(history)
216
print ' %5d revision%s' % (revno, plural(revno))
217
committers = Set()
218
for rev in history:
219
committers.add(b.get_revision(rev).committer)
220
print ' %5d committer%s' % (len(committers), plural(len(committers)))
221
if revno > 0:
222
firstrev = b.get_revision(history[0])
223
age = int((time.time() - firstrev.timestamp) / 3600 / 24)
224
print ' %5d day%s old' % (age, plural(age))
225
print ' first revision: %s' % format_date(firstrev.timestamp,
226
firstrev.timezone)
227
228
lastrev = b.get_revision(history[-1])
229
print ' latest revision: %s' % format_date(lastrev.timestamp,
230
lastrev.timezone)
231
251
"""info: Show statistical information for this branch
252
253
usage: bzr info"""
254
import info
255
info.show_info(Branch('.'))
232
256
233
257
234
258
235
259
def cmd_remove(file_list, verbose=False):
236
Branch('.').remove(file_list, verbose=verbose)
260
b = Branch(file_list[0])
261
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
237
262
238
263
239
264
240
265
def cmd_file_id(filename):
241
i = Branch('.').read_working_inventory().path2id(filename)
242
if i is None:
243
bailout("%s is not a versioned file" % filename)
266
"""Print file_id of a particular file or directory.
267
268
usage: bzr file-id FILE
269
270
The file_id is assigned when the file is first added and remains the
271
same through all revisions where the file exists, even when it is
272
moved or renamed.
273
"""
274
b = Branch(filename)
275
i = b.inventory.path2id(b.relpath(filename))
276
if i == None:
277
bailout("%r is not a versioned file" % filename)
244
278
else:
245
279
print i
246
280
247
281
248
def cmd_find_filename(fileid):
249
n = find_filename(fileid)
250
if n is None:
251
bailout("%s is not a live file id" % fileid)
252
else:
253
print n
282
def cmd_file_id_path(filename):
283
"""Print path of file_ids to a file or directory.
284
285
usage: bzr file-id-path FILE
286
287
This prints one line for each directory down to the target,
288
starting at the branch root."""
289
b = Branch(filename)
290
inv = b.inventory
291
fid = inv.path2id(b.relpath(filename))
292
if fid == None:
293
bailout("%r is not a versioned file" % filename)
294
for fip in inv.get_idpath(fid):
295
print fip
254
296
255
297
256
298
def cmd_revision_history():
258
300
print patchid
259
301
260
302
303
def cmd_directories():
304
for name, ie in Branch('.').read_working_inventory().directories():
305
if name == '':
306
print '.'
307
else:
308
print name
309
310
311
def cmd_missing():
312
for name, ie in Branch('.').working_tree().missing():
313
print name
314
261
315
262
316
def cmd_init():
263
317
# TODO: Check we're not already in a working directory? At the
272
326
Branch('.', init=True)
273
327
274
328
275
def cmd_diff(revision=None):
276
"""Show diff from basis to working copy.
277
278
:todo: Take one or two revision arguments, look up those trees,
279
and diff them.
280
281
:todo: Allow diff across branches.
282
283
:todo: Mangle filenames in diff to be more relevant.
284
285
:todo: Shouldn't be in the cmd function.
286
"""
329
def cmd_diff(revision=None, file_list=None):
330
"""bzr diff: Show differences in working tree.
331
332
usage: bzr diff [-r REV] [FILE...]
333
334
--revision REV
335
Show changes since REV, rather than predecessor.
336
337
If files are listed, only the changes in those files are listed.
338
Otherwise, all changes for the tree are listed.
339
340
TODO: Given two revision arguments, show the difference between them.
341
342
TODO: Allow diff across branches.
343
344
TODO: Option to use external diff command; could be GNU diff, wdiff,
345
or a graphical diff.
346
347
TODO: If a directory is given, diff everything under that.
348
349
TODO: Selected-file diff is inefficient and doesn't show you deleted files.
350
"""
351
352
## TODO: Shouldn't be in the cmd function.
287
353
288
354
b = Branch('.')
289
355
293
359
old_tree = b.revision_tree(b.lookup_revision(revision))
294
360
295
361
new_tree = b.working_tree()
296
old_inv = old_tree.inventory
297
new_inv = new_tree.inventory
298
362
299
363
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
300
364
old_label = ''
309
373
# be usefully made into a much faster special case.
310
374
311
375
# TODO: Better to return them in sorted order I think.
376
377
# FIXME: If given a file list, compare only those files rather
378
# than comparing everything and then throwing stuff away.
312
379
313
380
for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
314
d = None
315
381
382
if file_list and new_name not in file_list:
383
continue
384
316
385
# Don't show this by default; maybe do it if an option is passed
317
386
# idlabel = ' {%s}' % fid
318
387
idlabel = ''
320
389
# FIXME: Something about the diff format makes patch unhappy
321
390
# with newly-added files.
322
391
323
def diffit(*a, **kw):
324
sys.stdout.writelines(difflib.unified_diff(*a, **kw))
392
def diffit(oldlines, newlines, **kw):
393
# FIXME: difflib is wrong if there is no trailing newline.
394
395
# Special workaround for Python2.3, where difflib fails if
396
# both sequences are empty.
397
if oldlines or newlines:
398
sys.stdout.writelines(difflib.unified_diff(oldlines, newlines, **kw))
325
399
print
326
400
327
401
if file_state in ['.', '?', 'I']:
358
432
359
433
360
434
361
def cmd_log(timezone='original'):
435
def cmd_deleted(show_ids=False):
436
"""List files deleted in the working tree.
437
438
TODO: Show files deleted since a previous revision, or between two revisions.
439
"""
440
b = Branch('.')
441
old = b.basis_tree()
442
new = b.working_tree()
443
444
## TODO: Much more efficient way to do this: read in new
445
## directories with readdir, rather than stating each one. Same
446
## level of effort but possibly much less IO. (Or possibly not,
447
## if the directories are very large...)
448
449
for path, ie in old.inventory.iter_entries():
450
if not new.has_id(ie.file_id):
451
if show_ids:
452
print '%-50s %s' % (path, ie.file_id)
453
else:
454
print path
455
456
457
458
def cmd_parse_inventory():
459
import cElementTree
460
461
cElementTree.ElementTree().parse(file('.bzr/inventory'))
462
463
464
465
def cmd_load_inventory():
466
"""Load inventory for timing purposes"""
467
Branch('.').basis_tree().inventory
468
469
470
def cmd_dump_inventory():
471
Branch('.').read_working_inventory().write_xml(sys.stdout)
472
473
474
def cmd_dump_new_inventory():
475
import bzrlib.newinventory
476
inv = Branch('.').basis_tree().inventory
477
bzrlib.newinventory.write_inventory(inv, sys.stdout)
478
479
480
def cmd_load_new_inventory():
481
import bzrlib.newinventory
482
bzrlib.newinventory.read_new_inventory(sys.stdin)
483
484
485
def cmd_dump_slacker_inventory():
486
import bzrlib.newinventory
487
inv = Branch('.').basis_tree().inventory
488
bzrlib.newinventory.write_slacker_inventory(inv, sys.stdout)
489
490
491
492
def cmd_dump_text_inventory():
493
import bzrlib.textinv
494
inv = Branch('.').basis_tree().inventory
495
bzrlib.textinv.write_text_inventory(inv, sys.stdout)
496
497
498
def cmd_load_text_inventory():
499
import bzrlib.textinv
500
inv = bzrlib.textinv.read_text_inventory(sys.stdin)
501
print 'loaded %d entries' % len(inv)
502
503
504
505
def cmd_root(filename=None):
506
"""Print the branch root."""
507
print bzrlib.branch.find_branch_root(filename)
508
509
510
def cmd_log(timezone='original', verbose=False):
362
511
"""Show log of this branch.
363
512
364
:todo: Options for utc; to show ids; to limit range; etc.
513
TODO: Options for utc; to show ids; to limit range; etc.
365
514
"""
366
Branch('.').write_log(show_timezone=timezone)
515
Branch('.').write_log(show_timezone=timezone, verbose=verbose)
367
516
368
517
369
518
def cmd_ls(revision=None, verbose=False):
370
519
"""List files in a tree.
371
520
372
:todo: Take a revision or remote path and list that tree instead.
521
TODO: Take a revision or remote path and list that tree instead.
373
522
"""
374
523
b = Branch('.')
375
524
if revision == None:
398
547
print quotefn(f)
399
548
400
549
550
551
def cmd_ignored():
552
"""List ignored files and the patterns that matched them.
553
"""
554
tree = Branch('.').working_tree()
555
for path, file_class, kind, file_id in tree.list_files():
556
if file_class != 'I':
557
continue
558
## XXX: Slightly inefficient since this was already calculated
559
pat = tree.is_ignored(path)
560
print '%-50s %s' % (path, pat)
561
562
401
563
def cmd_lookup_revision(revno):
402
564
try:
403
565
revno = int(revno)
416
578
t = b.revision_tree(rh)
417
579
t.export(dest)
418
580
581
def cmd_cat(revision, filename):
582
"""Print file to stdout."""
583
b = Branch('.')
584
b.print_file(b.relpath(filename), int(revision))
419
585
420
586
421
587
######################################################################
424
590
425
591
def cmd_uuid():
426
592
"""Print a newly-generated UUID."""
427
print uuid()
593
print bzrlib.osutils.uuid()
428
594
429
595
430
596
433
599
434
600
435
601
436
def cmd_commit(message, verbose=False):
602
def cmd_commit(message=None, verbose=False):
603
"""Commit changes to a new revision.
604
605
--message MESSAGE
606
Description of changes in this revision; free form text.
607
It is recommended that the first line be a single-sentence
608
summary.
609
--verbose
610
Show status of changed files,
611
612
TODO: Commit only selected files.
613
614
TODO: Run hooks on tree to-be-committed, and after commit.
615
616
TODO: Strict commit that fails if there are unknown or deleted files.
617
"""
618
619
if not message:
620
bailout("please specify a commit message")
437
621
Branch('.').commit(message, verbose=verbose)
438
622
439
623
440
def cmd_check():
441
"""Check consistency of the branch."""
442
check()
624
def cmd_check(dir='.'):
625
"""check: Consistency check of branch history.
626
627
usage: bzr check [-v] [BRANCH]
628
629
options:
630
--verbose, -v Show progress of checking.
631
632
This command checks various invariants about the branch storage to
633
detect data corruption or bzr bugs.
634
"""
635
import bzrlib.check
636
bzrlib.check.check(Branch(dir, find_root=False))
443
637
444
638
445
639
def cmd_is(pred, *rest):
457
651
sys.exit(1)
458
652
459
653
460
def cmd_username():
654
def cmd_whoami():
655
"""Show bzr user id.
656
657
TODO: Command to show only the email-address part as parsed out.
658
"""
461
659
print bzrlib.osutils.username()
462
660
463
661
464
def cmd_user_email():
465
print bzrlib.osutils.user_email()
466
467
468
662
def cmd_gen_revision_id():
469
import time
470
663
print bzrlib.branch._gen_revision_id(time.time())
471
664
472
665
473
def cmd_doctest():
474
"""Run internal doctest suite"""
666
def cmd_selftest():
667
"""Run internal test suite"""
475
668
## -v, if present, is seen by doctest; the argument is just here
476
669
## so our parser doesn't complain
477
670
478
671
## TODO: --verbose option
672
673
failures, tests = 0, 0
479
674
480
import bzr, doctest, bzrlib.store
675
import doctest, bzrlib.store, bzrlib.tests
481
676
bzrlib.trace.verbose = False
482
doctest.testmod(bzr)
483
doctest.testmod(bzrlib.store)
484
doctest.testmod(bzrlib.inventory)
485
doctest.testmod(bzrlib.branch)
486
doctest.testmod(bzrlib.osutils)
487
doctest.testmod(bzrlib.tree)
488
489
# more strenuous tests;
490
import bzrlib.tests
491
doctest.testmod(bzrlib.tests)
677
678
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
679
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
680
mf, mt = doctest.testmod(m)
681
failures += mf
682
tests += mt
683
print '%-40s %3d tests' % (m.__name__, mt),
684
if mf:
685
print '%3d FAILED!' % mf
686
else:
687
print
688
689
print '%-40s %3d tests' % ('total', tests),
690
if failures:
691
print '%3d FAILED!' % failures
692
else:
693
print
694
695
696
697
# deprecated
698
cmd_doctest = cmd_selftest
492
699
493
700
494
701
######################################################################
495
702
# help
496
703
497
704
498
def cmd_help():
499
# TODO: Specific help for particular commands
500
print __doc__
705
def cmd_help(topic=None):
706
if topic == None:
707
print __doc__
708
return
709
710
# otherwise, maybe the name of a command?
711
try:
712
cmdfn = globals()['cmd_' + topic.replace('-', '_')]
713
except KeyError:
714
bailout("no help for %r" % topic)
715
716
doc = getdoc(cmdfn)
717
if doc == None:
718
bailout("sorry, no detailed help yet for %r" % topic)
719
720
print doc
721
722
501
723
502
724
503
725
def cmd_version():
504
print "bzr (bazaar-ng) %s" % __version__
505
print __copyright__
726
print "bzr (bazaar-ng) %s" % bzrlib.__version__
727
print bzrlib.__copyright__
506
728
print "http://bazaar-ng.org/"
507
729
print
508
730
print \
528
750
'all': None,
529
751
'help': None,
530
752
'message': unicode,
753
'profile': None,
531
754
'revision': int,
532
755
'show-ids': None,
533
756
'timezone': str,
545
768
# listed take none.
546
769
cmd_options = {
547
770
'add': ['verbose'],
771
'cat': ['revision'],
548
772
'commit': ['message', 'verbose'],
773
'deleted': ['show-ids'],
549
774
'diff': ['revision'],
550
775
'inventory': ['revision'],
551
'log': ['show-ids', 'timezone'],
776
'log': ['timezone', 'verbose'],
552
777
'ls': ['revision', 'verbose'],
553
778
'remove': ['verbose'],
554
779
'status': ['all'],
556
781
557
782
558
783
cmd_args = {
559
'init': [],
560
784
'add': ['file+'],
785
'cat': ['filename'],
561
786
'commit': [],
562
'diff': [],
787
'diff': ['file*'],
788
'export': ['revno', 'dest'],
563
789
'file-id': ['filename'],
790
'file-id-path': ['filename'],
564
791
'get-file-text': ['text_id'],
565
792
'get-inventory': ['inventory_id'],
566
793
'get-revision': ['revision_id'],
567
794
'get-revision-inventory': ['revision_id'],
795
'help': ['topic?'],
796
'init': [],
568
797
'log': [],
569
798
'lookup-revision': ['revno'],
570
'export': ['revno', 'dest'],
799
'move': ['source$', 'dest'],
800
'relpath': ['filename'],
571
801
'remove': ['file+'],
802
'rename': ['from_name', 'to_name'],
803
'renames': ['dir?'],
804
'root': ['filename?'],
572
805
'status': [],
573
806
}
574
807
625
858
else:
626
859
optarg = argv.pop(0)
627
860
opts[optname] = optargfn(optarg)
628
mutter(" option argument %r" % opts[optname])
629
861
else:
630
862
if optarg != None:
631
863
bailout('option %r takes no argument' % optname)
655
887
# TODO: Need a way to express 'cp SRC... DEST', where it matches
656
888
# all but one.
657
889
890
# step through args and argform, allowing appropriate 0-many matches
658
891
for ap in argform:
659
892
argname = ap[:-1]
660
893
if ap[-1] == '?':
661
assert 0
662
elif ap[-1] == '*':
663
assert 0
894
if args:
895
argdict[argname] = args.pop(0)
896
elif ap[-1] == '*': # all remaining arguments
897
if args:
898
argdict[argname + '_list'] = args[:]
899
args = []
900
else:
901
argdict[argname + '_list'] = None
664
902
elif ap[-1] == '+':
665
903
if not args:
666
904
bailout("command %r needs one or more %s"
668
906
else:
669
907
argdict[argname + '_list'] = args[:]
670
908
args = []
909
elif ap[-1] == '$': # all but one
910
if len(args) < 2:
911
bailout("command %r needs one or more %s"
912
% (cmd, argname.upper()))
913
argdict[argname + '_list'] = args[:-1]
914
args[:-1] = []
671
915
else:
672
916
# just a plain arg
673
917
argname = ap
689
933
"""Execute a command.
690
934
691
935
This is similar to main(), but without all the trappings for
692
logging and error handling.
936
logging and error handling.
693
937
"""
938
939
argv = [a.decode(bzrlib.user_encoding) for a in argv]
940
694
941
try:
695
942
args, opts = parse_args(argv[1:])
696
943
if 'help' in opts:
697
944
# TODO: pass down other arguments in case they asked for
698
945
# help on a command name?
699
cmd_help()
946
if args:
947
cmd_help(args[0])
948
else:
949
cmd_help()
700
950
return 0
701
951
elif 'version' in opts:
702
952
cmd_version()
703
953
return 0
704
954
cmd = args.pop(0)
705
955
except IndexError:
706
log_error('usage: bzr COMMAND\n')
707
log_error(' try "bzr help"\n')
956
log_error('usage: bzr COMMAND')
957
log_error(' try "bzr help"')
708
958
return 1
709
959
710
960
try:
711
961
cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
712
962
except KeyError:
713
963
bailout("unknown command " + `cmd`)
714
964
715
# TODO: special --profile option to turn on the Python profiler
965
# global option
966
if 'profile' in opts:
967
profile = True
968
del opts['profile']
969
else:
970
profile = False
716
971
717
972
# check options are reasonable
718
973
allowed = cmd_options.get(cmd, [])
721
976
bailout("option %r is not allowed for command %r"
722
977
% (oname, cmd))
723
978
979
# TODO: give an error if there are any mandatory options which are
980
# not specified? Or maybe there shouldn't be any "mandatory
981
# options" (it is an oxymoron)
982
983
# mix arguments and options into one dictionary
724
984
cmdargs = _match_args(cmd, args)
725
cmdargs.update(opts)
726
727
ret = cmd_handler(**cmdargs) or 0
985
for k, v in opts.items():
986
cmdargs[str(k.replace('-', '_'))] = v
987
988
if profile:
989
import hotshot
990
pffileno, pfname = tempfile.mkstemp()
991
try:
992
prof = hotshot.Profile(pfname)
993
ret = prof.runcall(cmd_handler, **cmdargs) or 0
994
prof.close()
995
996
import hotshot.stats
997
stats = hotshot.stats.load(pfname)
998
#stats.strip_dirs()
999
stats.sort_stats('time')
1000
## XXX: Might like to write to stderr or the trace file instead but
1001
## print_stats seems hardcoded to stdout
1002
stats.print_stats(20)
1003
1004
return ret
1005
1006
finally:
1007
os.close(pffileno)
1008
os.remove(pfname)
1009
else:
1010
return cmd_handler(**cmdargs) or 0
728
1011
729
1012
730
1013
735
1018
## TODO: If the arguments are wrong, give a usage message rather
736
1019
## than just a backtrace.
737
1020
1021
bzrlib.trace.create_tracefile(argv)
1022
738
1023
try:
739
# TODO: Lift into separate function in trace.py
740
# TODO: Also show contents of /etc/lsb-release, if it can be parsed.
741
# Perhaps that should eventually go into the platform library?
742
# TODO: If the file doesn't exist, add a note describing it.
743
t = bzrlib.trace._tracefile
744
t.write('-' * 60 + '\n')
745
t.write('bzr invoked at %s\n' % format_date(time.time()))
746
t.write(' by %s on %s\n' % (bzrlib.osutils.username(), socket.getfqdn()))
747
t.write(' arguments: %r\n' % argv)
748
749
starttime = os.times()[4]
750
751
import platform
752
t.write(' platform: %s\n' % platform.platform())
753
t.write(' python: %s\n' % platform.python_version())
754
755
1024
ret = run_bzr(argv)
756
757
times = os.times()
758
mutter("finished, %.3fu/%.3fs cpu, %.3fu/%.3fs cum"
759
% times[:4])
760
mutter(" %.3f elapsed" % (times[4] - starttime))
761
762
1025
return ret
763
1026
except BzrError, e:
764
log_error('bzr: error: ' + e.args[0] + '\n')
1027
log_error('bzr: error: ' + e.args[0])
765
1028
if len(e.args) > 1:
766
1029
for h in e.args[1]:
767
log_error(' ' + h + '\n')
1030
log_error(' ' + h)
1031
traceback.print_exc(None, bzrlib.trace._tracefile)
1032
log_error('(see ~/.bzr.log for debug information)')
768
1033
return 1
769
1034
except Exception, e:
770
log_error('bzr: exception: %s\n' % e)
771
log_error(' see .bzr.log for details\n')
1035
log_error('bzr: exception: %s' % str(e).rstrip('\n'))
1036
log_error('(see $HOME/.bzr.log for debug information)')
772
1037
traceback.print_exc(None, bzrlib.trace._tracefile)
773
traceback.print_exc(None, sys.stderr)
1038
## traceback.print_exc(None, sys.stderr)
774
1039
return 1
775
1040
776
# TODO: Maybe nicer handling of IOError?
1041
## TODO: Trap AssertionError
1042
1043
# TODO: Maybe nicer handling of IOError especially for broken pipe.
777
1044
778
1045
779
1046
781
1048
sys.exit(main(sys.argv))
782
1049
##import profile
783
1050
##profile.run('main(sys.argv)')
784
Loggerhead is a web-based interface for Breezy
Version: 2.0.1