« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 1393
- compare with another revision
- download diff
- download tarball
- view history from revision 1393
- Committer: Robert Collins
- Date: 2005-09-29 02:01:49 UTC
- Revision ID: robertc@robertcollins.net-20050929020149-1ff16722c6a01b2c
reenable remotebranch tests
- files added:
- .rsyncexclude
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/urlgrabber
- contrib
- contrib/bash
- contrib/emacs
- contrib/zsh
- patches
- tools
- files removed:
- bzrlib/tests.py
- files renamed:
- elementtree/ => bzrlib/util/elementtree/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
1
# Copyright (C) 2004, 2005 by Martin Pool
2
# Copyright (C) 2005 by Canonical Ltd
3
1
# Copyright (C) 2004, 2005 by Canonical Ltd
4
2
5
3
# This program is free software; you can redistribute it and/or modify
6
4
# it under the terms of the GNU General Public License as published by
16
14
# along with this program; if not, write to the Free Software
17
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
16
19
"""Bazaar-NG -- a free distributed version-control tool
20
21
**WARNING: THIS IS AN UNSTABLE DEVELOPMENT VERSION**
22
23
Current limitation include:
24
25
* Metadata format is not stable yet -- you may need to
26
discard history in the future.
27
28
* Insufficient error handling.
29
30
* Many commands unimplemented or partially implemented.
31
32
* Space-inefficient storage.
33
34
* No merge operators yet.
35
36
Interesting commands::
37
38
bzr help [COMMAND]
39
Show help screen
40
bzr version
41
Show software version/licence/non-warranty.
42
bzr init
43
Start versioning the current directory
44
bzr add FILE...
45
Make files versioned.
46
bzr log
47
Show revision history.
48
bzr diff
49
Show changes from last revision to working copy.
50
bzr commit -m 'MESSAGE'
51
Store current state as new revision.
52
bzr export REVNO DESTINATION
53
Export the branch state at a previous version.
54
bzr status
55
Show summary of pending changes.
56
bzr remove FILE...
57
Make a file not versioned.
58
bzr info
59
Show statistics about this branch.
60
"""
61
62
63
64
65
import sys, os, random, time, sha, sets, types, re, shutil, tempfile
66
import traceback, socket, fnmatch, difflib
67
from os import path
68
from sets import Set
69
from pprint import pprint
70
from stat import *
71
from glob import glob
17
18
# TODO: probably should say which arguments are candidates for glob
19
# expansion on windows and do that at the command level.
20
21
# TODO: Help messages for options.
22
23
# TODO: Define arguments by objects, rather than just using names.
24
# Those objects can specify the expected type of the argument, which
25
# would help with validation and shell completion.
26
27
28
# TODO: Help messages for options.
29
30
# TODO: Define arguments by objects, rather than just using names.
31
# Those objects can specify the expected type of the argument, which
32
# would help with validation and shell completion.
33
34
35
36
import sys
37
import os
38
from warnings import warn
39
from inspect import getdoc
72
40
73
41
import bzrlib
74
from bzrlib.store import ImmutableStore
75
from bzrlib.trace import mutter, note, log_error
76
from bzrlib.errors import bailout, BzrError
77
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
78
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
79
from bzrlib.revision import Revision
80
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
81
format_date
82
83
BZR_DIFF_FORMAT = "## Bazaar-NG diff, format 0 ##\n"
84
BZR_PATCHNAME_FORMAT = 'cset:sha1:%s'
85
86
## standard representation
87
NONE_STRING = '(none)'
88
EMPTY = 'empty'
89
90
91
## TODO: Perhaps a different version of inventory commands that
92
## returns iterators...
93
94
## TODO: Perhaps an AtomicFile class that writes to a temporary file and then renames.
95
96
## TODO: Some kind of locking on branches. Perhaps there should be a
97
## parameter to the branch object saying whether we want a read or
98
## write lock; release it from destructor. Perhaps don't even need a
99
## read lock to look at immutable objects?
100
101
## TODO: Perhaps make UUIDs predictable in test mode to make it easier
102
## to compare output?
103
104
## TODO: Some kind of global code to generate the right Branch object
105
## to work on. Almost, but not quite all, commands need one, and it
106
## can be taken either from their parameters or their working
107
## directory.
108
109
## TODO: rename command, needed soon: check destination doesn't exist
110
## either in working copy or tree; move working copy; update
111
## inventory; write out
112
113
## TODO: move command; check destination is a directory and will not
114
## clash; move it.
115
116
## TODO: command to show renames, one per line, as to->from
117
118
119
120
121
def cmd_status(all=False):
122
"""Display status summary.
123
124
For each file there is a single line giving its file state and name.
125
The name is that in the current revision unless it is deleted or
126
missing, in which case the old name is shown.
127
128
:todo: Don't show unchanged files unless ``--all`` is given?
129
"""
130
Branch('.').show_status(show_all=all)
131
132
133
134
######################################################################
135
# examining history
136
def cmd_get_revision(revision_id):
137
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
138
139
140
def cmd_get_file_text(text_id):
141
"""Get contents of a file by hash."""
142
sf = Branch('.').text_store[text_id]
143
pumpfile(sf, sys.stdout)
144
145
146
147
######################################################################
148
# commands
149
150
151
def cmd_revno():
152
"""Show number of revisions on this branch"""
153
print Branch('.').revno()
154
155
156
157
def cmd_add(file_list, verbose=False):
158
"""Add specified files or directories.
159
160
In non-recursive mode, all the named items are added, regardless
161
of whether they were previously ignored. A warning is given if
162
any of the named files are already versioned.
163
164
In recursive mode (the default), files are treated the same way
165
but the behaviour for directories is different. Directories that
166
are already versioned do not give a warning. All directories,
167
whether already versioned or not, are searched for files or
168
subdirectories that are neither versioned or ignored, and these
169
are added. This search proceeds recursively into versioned
170
directories.
171
172
Therefore simply saying 'bzr add .' will version all files that
173
are currently unknown.
174
"""
175
bzrlib.add.smart_add(file_list, verbose)
176
177
178
def cmd_relpath(filename):
179
"""Show path of file relative to root"""
180
print Branch(filename).relpath(filename)
181
182
183
184
def cmd_inventory(revision=None):
185
"""Show inventory of the current working copy."""
186
## TODO: Also optionally show a previous inventory
187
## TODO: Format options
188
b = Branch('.')
189
if revision == None:
190
inv = b.read_working_inventory()
191
else:
192
inv = b.get_revision_inventory(b.lookup_revision(revision))
193
194
for path, entry in inv.iter_entries():
195
print '%-50s %s' % (entry.file_id, path)
196
197
198
199
def cmd_mv(source_list, dest):
200
b = Branch('.')
201
202
b.rename([b.relpath(s) for s in source_list], b.relpath(dest))
203
204
205
206
def cmd_rename(from_name, to_name):
207
"""Change the name of an entry.
208
209
usage: bzr rename FROM_NAME TO_NAME
210
211
examples:
212
bzr rename frob.c frobber.c
213
bzr rename src/frob.c lib/frob.c
214
215
It is an error if the destination name exists.
216
217
See also the 'move' command, which moves files into a different
218
directory without changing their name.
219
220
TODO: Some way to rename multiple files without invoking bzr for each
221
one?"""
222
b = Branch('.')
223
b.rename_one(b.relpath(from_name), b.relpath(to_name))
224
225
226
227
228
def cmd_renames(dir='.'):
229
"""Show list of renamed files.
230
231
usage: bzr renames [BRANCH]
232
233
TODO: Option to show renames between two historical versions.
234
235
TODO: Only show renames under dir, rather than in the whole branch.
236
"""
237
b = Branch(dir)
238
old_inv = b.basis_tree().inventory
239
new_inv = b.read_working_inventory()
240
241
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
242
renames.sort()
243
for old_name, new_name in renames:
244
print "%s => %s" % (old_name, new_name)
245
246
247
248
def cmd_info():
249
"""info: Show statistical information for this branch
250
251
usage: bzr info"""
252
import info
253
info.show_info(Branch('.'))
254
255
256
257
def cmd_remove(file_list, verbose=False):
258
b = Branch(file_list[0])
259
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
260
261
262
263
def cmd_file_id(filename):
264
b = Branch(filename)
265
i = b.inventory.path2id(b.relpath(filename))
266
if i is None:
267
bailout("%s is not a versioned file" % filename)
268
else:
269
print i
270
271
272
def cmd_find_filename(fileid):
273
n = find_filename(fileid)
274
if n is None:
275
bailout("%s is not a live file id" % fileid)
276
else:
277
print n
278
279
280
def cmd_revision_history():
281
for patchid in Branch('.').revision_history():
282
print patchid
283
284
285
def cmd_directories():
286
for name, ie in Branch('.').read_working_inventory().directories():
287
if name == '':
288
print '.'
289
else:
290
print name
291
292
293
def cmd_missing():
294
for name, ie in Branch('.').working_tree().missing():
295
print name
296
297
298
def cmd_init():
299
# TODO: Check we're not already in a working directory? At the
300
# moment you'll get an ugly error.
301
302
# TODO: What if we're in a subdirectory of a branch? Would like
303
# to allow that, but then the parent may need to understand that
304
# the children have disappeared, or should they be versioned in
305
# both?
306
307
# TODO: Take an argument/option for branch name.
308
Branch('.', init=True)
309
310
311
def cmd_diff(revision=None):
312
"""bzr diff: Show differences in working tree.
313
314
usage: bzr diff [-r REV]
315
316
--revision REV
317
Show changes since REV, rather than predecessor.
318
319
TODO: Given two revision arguments, show the difference between them.
320
321
TODO: Allow diff across branches.
322
323
TODO: Option to use external diff command; could be GNU diff, wdiff,
324
or a graphical diff.
325
326
TODO: Diff selected files.
327
"""
328
329
## TODO: Shouldn't be in the cmd function.
330
331
b = Branch('.')
332
333
if revision == None:
334
old_tree = b.basis_tree()
335
else:
336
old_tree = b.revision_tree(b.lookup_revision(revision))
337
338
new_tree = b.working_tree()
339
old_inv = old_tree.inventory
340
new_inv = new_tree.inventory
341
342
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
343
old_label = ''
344
new_label = ''
345
346
DEVNULL = '/dev/null'
347
# Windows users, don't panic about this filename -- it is a
348
# special signal to GNU patch that the file should be created or
349
# deleted respectively.
350
351
# TODO: Generation of pseudo-diffs for added/deleted files could
352
# be usefully made into a much faster special case.
353
354
# TODO: Better to return them in sorted order I think.
355
356
for file_state, fid, old_name, new_name, kind in bzrlib.diff_trees(old_tree, new_tree):
357
d = None
358
359
# Don't show this by default; maybe do it if an option is passed
360
# idlabel = ' {%s}' % fid
361
idlabel = ''
362
363
# FIXME: Something about the diff format makes patch unhappy
364
# with newly-added files.
365
366
def diffit(oldlines, newlines, **kw):
367
# FIXME: difflib is wrong if there is no trailing newline.
368
369
# Special workaround for Python2.3, where difflib fails if
370
# both sequences are empty.
371
if oldlines or newlines:
372
sys.stdout.writelines(difflib.unified_diff(oldlines, newlines, **kw))
373
print
374
375
if file_state in ['.', '?', 'I']:
376
continue
377
elif file_state == 'A':
378
print '*** added %s %r' % (kind, new_name)
379
if kind == 'file':
380
diffit([],
381
new_tree.get_file(fid).readlines(),
382
fromfile=DEVNULL,
383
tofile=new_label + new_name + idlabel)
384
elif file_state == 'D':
385
assert isinstance(old_name, types.StringTypes)
386
print '*** deleted %s %r' % (kind, old_name)
387
if kind == 'file':
388
diffit(old_tree.get_file(fid).readlines(), [],
389
fromfile=old_label + old_name + idlabel,
390
tofile=DEVNULL)
391
elif file_state in ['M', 'R']:
392
if file_state == 'M':
393
assert kind == 'file'
394
assert old_name == new_name
395
print '*** modified %s %r' % (kind, new_name)
396
elif file_state == 'R':
397
print '*** renamed %s %r => %r' % (kind, old_name, new_name)
398
399
if kind == 'file':
400
diffit(old_tree.get_file(fid).readlines(),
401
new_tree.get_file(fid).readlines(),
402
fromfile=old_label + old_name + idlabel,
403
tofile=new_label + new_name)
404
else:
405
bailout("can't represent state %s {%s}" % (file_state, fid))
406
407
408
409
def cmd_deleted(show_ids=False):
410
"""List files deleted in the working tree.
411
412
TODO: Show files deleted since a previous revision, or between two revisions.
413
"""
414
b = Branch('.')
415
old = b.basis_tree()
416
new = b.working_tree()
417
418
## TODO: Much more efficient way to do this: read in new
419
## directories with readdir, rather than stating each one. Same
420
## level of effort but possibly much less IO. (Or possibly not,
421
## if the directories are very large...)
422
423
for path, ie in old.inventory.iter_entries():
424
if not new.has_id(ie.file_id):
425
if show_ids:
426
print '%-50s %s' % (path, ie.file_id)
427
else:
428
print path
429
430
431
432
def cmd_parse_inventory():
433
import cElementTree
434
435
cElementTree.ElementTree().parse(file('.bzr/inventory'))
436
437
438
439
def cmd_load_inventory():
440
inv = Branch('.').basis_tree().inventory
441
442
443
444
def cmd_dump_new_inventory():
445
import bzrlib.newinventory
446
inv = Branch('.').basis_tree().inventory
447
bzrlib.newinventory.write_inventory(inv, sys.stdout)
448
449
450
def cmd_load_new_inventory():
451
import bzrlib.newinventory
452
bzrlib.newinventory.read_new_inventory(sys.stdin)
453
454
455
def cmd_dump_slacker_inventory():
456
import bzrlib.newinventory
457
inv = Branch('.').basis_tree().inventory
458
bzrlib.newinventory.write_slacker_inventory(inv, sys.stdout)
459
460
461
462
def cmd_root(filename=None):
463
"""Print the branch root."""
464
print bzrlib.branch.find_branch_root(filename)
465
466
467
def cmd_log(timezone='original'):
468
"""Show log of this branch.
469
470
:todo: Options for utc; to show ids; to limit range; etc.
471
"""
472
Branch('.').write_log(show_timezone=timezone)
473
474
475
def cmd_ls(revision=None, verbose=False):
476
"""List files in a tree.
477
478
:todo: Take a revision or remote path and list that tree instead.
479
"""
480
b = Branch('.')
481
if revision == None:
482
tree = b.working_tree()
483
else:
484
tree = b.revision_tree(b.lookup_revision(revision))
485
486
for fp, fc, kind, fid in tree.list_files():
487
if verbose:
488
if kind == 'directory':
489
kindch = '/'
490
elif kind == 'file':
491
kindch = ''
492
else:
493
kindch = '???'
494
495
print '%-8s %s%s' % (fc, fp, kindch)
496
else:
497
print fp
498
499
500
501
def cmd_unknowns():
502
"""List unknown files"""
503
for f in Branch('.').unknowns():
504
print quotefn(f)
505
506
507
508
def cmd_ignored(verbose=True):
509
"""List ignored files and the patterns that matched them.
510
"""
511
tree = Branch('.').working_tree()
512
for path, file_class, kind, id in tree.list_files():
513
if file_class != 'I':
514
continue
515
## XXX: Slightly inefficient since this was already calculated
516
pat = tree.is_ignored(path)
517
print '%-50s %s' % (path, pat)
518
519
520
def cmd_lookup_revision(revno):
521
try:
522
revno = int(revno)
523
except ValueError:
524
bailout("usage: lookup-revision REVNO",
525
["REVNO is a non-negative revision number for this branch"])
526
527
print Branch('.').lookup_revision(revno) or NONE_STRING
528
529
530
531
def cmd_export(revno, dest):
532
"""Export past revision to destination directory."""
533
b = Branch('.')
534
rh = b.lookup_revision(int(revno))
535
t = b.revision_tree(rh)
536
t.export(dest)
537
538
539
540
######################################################################
541
# internal/test commands
542
543
544
def cmd_uuid():
545
"""Print a newly-generated UUID."""
546
print bzrlib.osutils.uuid()
547
548
549
550
def cmd_local_time_offset():
551
print bzrlib.osutils.local_time_offset()
552
553
554
555
def cmd_commit(message=None, verbose=False):
556
"""Commit changes to a new revision.
557
558
--message MESSAGE
559
Description of changes in this revision; free form text.
560
It is recommended that the first line be a single-sentence
561
summary.
562
--verbose
563
Show status of changed files,
564
565
TODO: Commit only selected files.
566
567
TODO: Run hooks on tree to-be-committed, and after commit.
568
569
TODO: Strict commit that fails if there are unknown or deleted files.
570
"""
571
572
if not message:
573
bailout("please specify a commit message")
574
Branch('.').commit(message, verbose=verbose)
575
576
577
def cmd_check(dir='.'):
578
"""check: Consistency check of branch history.
579
580
usage: bzr check [-v] [BRANCH]
581
582
options:
583
--verbose, -v Show progress of checking.
584
585
This command checks various invariants about the branch storage to
586
detect data corruption or bzr bugs.
587
"""
588
import bzrlib.check
589
bzrlib.check.check(Branch(dir, find_root=False))
590
591
592
def cmd_is(pred, *rest):
593
"""Test whether PREDICATE is true."""
594
try:
595
cmd_handler = globals()['assert_' + pred.replace('-', '_')]
596
except KeyError:
597
bailout("unknown predicate: %s" % quotefn(pred))
598
599
try:
600
cmd_handler(*rest)
601
except BzrCheckError:
602
# by default we don't print the message so that this can
603
# be used from shell scripts without producing noise
604
sys.exit(1)
605
606
607
def cmd_username():
608
print bzrlib.osutils.username()
609
610
611
def cmd_user_email():
612
print bzrlib.osutils.user_email()
613
614
615
def cmd_gen_revision_id():
616
import time
617
print bzrlib.branch._gen_revision_id(time.time())
618
619
620
def cmd_selftest(verbose=False):
621
"""Run internal test suite"""
622
## -v, if present, is seen by doctest; the argument is just here
623
## so our parser doesn't complain
624
625
## TODO: --verbose option
626
627
failures, tests = 0, 0
628
629
import doctest, bzrlib.store, bzrlib.tests
630
bzrlib.trace.verbose = False
631
632
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
633
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
634
mf, mt = doctest.testmod(m)
635
failures += mf
636
tests += mt
637
print '%-40s %3d tests' % (m.__name__, mt),
638
if mf:
639
print '%3d FAILED!' % mf
640
else:
641
print
642
643
print '%-40s %3d tests' % ('total', tests),
644
if failures:
645
print '%3d FAILED!' % failures
646
else:
647
print
648
649
650
651
# deprecated
652
cmd_doctest = cmd_selftest
653
654
655
######################################################################
656
# help
657
658
659
def cmd_help(topic=None):
660
if topic == None:
661
print __doc__
662
return
663
664
# otherwise, maybe the name of a command?
665
try:
666
cmdfn = globals()['cmd_' + topic.replace('-', '_')]
667
except KeyError:
668
bailout("no help for %r" % topic)
669
670
doc = cmdfn.__doc__
671
if doc == None:
672
bailout("sorry, no detailed help yet for %r" % topic)
673
674
print doc
675
676
677
678
679
def cmd_version():
680
print "bzr (bazaar-ng) %s" % bzrlib.__version__
681
print bzrlib.__copyright__
682
print "http://bazaar-ng.org/"
683
print
684
print \
685
"""bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
686
you may use, modify and redistribute it under the terms of the GNU
687
General Public License version 2 or later."""
688
689
690
def cmd_rocks():
691
"""Statement of optimism."""
692
print "it sure does!"
693
694
695
696
######################################################################
697
# main routine
42
import bzrlib.trace
43
from bzrlib.trace import mutter, note, log_error, warning
44
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError, NotBranchError
45
from bzrlib.revisionspec import RevisionSpec
46
from bzrlib import BZRDIR
47
48
plugin_cmds = {}
49
50
51
def register_command(cmd):
52
"Utility function to help register a command"
53
global plugin_cmds
54
k = cmd.__name__
55
if k.startswith("cmd_"):
56
k_unsquished = _unsquish_command_name(k)
57
else:
58
k_unsquished = k
59
if not plugin_cmds.has_key(k_unsquished):
60
plugin_cmds[k_unsquished] = cmd
61
mutter('registered plugin command %s', k_unsquished)
62
else:
63
log_error('Two plugins defined the same command: %r' % k)
64
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
65
66
67
def _squish_command_name(cmd):
68
return 'cmd_' + cmd.replace('-', '_')
69
70
71
def _unsquish_command_name(cmd):
72
assert cmd.startswith("cmd_")
73
return cmd[4:].replace('_','-')
74
75
76
def _parse_revision_str(revstr):
77
"""This handles a revision string -> revno.
78
79
This always returns a list. The list will have one element for
80
each revision.
81
82
>>> _parse_revision_str('234')
83
[<RevisionSpec_int 234>]
84
>>> _parse_revision_str('234..567')
85
[<RevisionSpec_int 234>, <RevisionSpec_int 567>]
86
>>> _parse_revision_str('..')
87
[<RevisionSpec None>, <RevisionSpec None>]
88
>>> _parse_revision_str('..234')
89
[<RevisionSpec None>, <RevisionSpec_int 234>]
90
>>> _parse_revision_str('234..')
91
[<RevisionSpec_int 234>, <RevisionSpec None>]
92
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
93
[<RevisionSpec_int 234>, <RevisionSpec_int 456>, <RevisionSpec_int 789>]
94
>>> _parse_revision_str('234....789') # Error?
95
[<RevisionSpec_int 234>, <RevisionSpec None>, <RevisionSpec_int 789>]
96
>>> _parse_revision_str('revid:test@other.com-234234')
97
[<RevisionSpec_revid revid:test@other.com-234234>]
98
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
99
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
100
>>> _parse_revision_str('revid:test@other.com-234234..23')
101
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_int 23>]
102
>>> _parse_revision_str('date:2005-04-12')
103
[<RevisionSpec_date date:2005-04-12>]
104
>>> _parse_revision_str('date:2005-04-12 12:24:33')
105
[<RevisionSpec_date date:2005-04-12 12:24:33>]
106
>>> _parse_revision_str('date:2005-04-12T12:24:33')
107
[<RevisionSpec_date date:2005-04-12T12:24:33>]
108
>>> _parse_revision_str('date:2005-04-12,12:24:33')
109
[<RevisionSpec_date date:2005-04-12,12:24:33>]
110
>>> _parse_revision_str('-5..23')
111
[<RevisionSpec_int -5>, <RevisionSpec_int 23>]
112
>>> _parse_revision_str('-5')
113
[<RevisionSpec_int -5>]
114
>>> _parse_revision_str('123a')
115
Traceback (most recent call last):
116
...
117
BzrError: No namespace registered for string: '123a'
118
>>> _parse_revision_str('abc')
119
Traceback (most recent call last):
120
...
121
BzrError: No namespace registered for string: 'abc'
122
"""
123
import re
124
old_format_re = re.compile('\d*:\d*')
125
m = old_format_re.match(revstr)
126
revs = []
127
if m:
128
warning('Colon separator for revision numbers is deprecated.'
129
' Use .. instead')
130
for rev in revstr.split(':'):
131
if rev:
132
revs.append(RevisionSpec(int(rev)))
133
else:
134
revs.append(RevisionSpec(None))
135
else:
136
for x in revstr.split('..'):
137
if not x:
138
revs.append(RevisionSpec(None))
139
else:
140
revs.append(RevisionSpec(x))
141
return revs
142
143
144
def _builtin_commands():
145
import bzrlib.builtins
146
r = {}
147
builtins = bzrlib.builtins.__dict__
148
for name in builtins:
149
if name.startswith("cmd_"):
150
real_name = _unsquish_command_name(name)
151
r[real_name] = builtins[name]
152
return r
153
154
155
156
def builtin_command_names():
157
"""Return list of builtin command names."""
158
return _builtin_commands().keys()
159
160
161
def plugin_command_names():
162
return plugin_cmds.keys()
163
164
165
def _get_cmd_dict(plugins_override=True):
166
"""Return name->class mapping for all commands."""
167
d = _builtin_commands()
168
if plugins_override:
169
d.update(plugin_cmds)
170
return d
171
172
173
def get_all_cmds(plugins_override=True):
174
"""Return canonical name and class for all registered commands."""
175
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
176
yield k,v
177
178
179
def get_cmd_object(cmd_name, plugins_override=True):
180
"""Return the canonical name and command class for a command.
181
182
plugins_override
183
If true, plugin commands can override builtins.
184
"""
185
from bzrlib.externalcommand import ExternalCommand
186
187
cmd_name = str(cmd_name) # not unicode
188
189
# first look up this command under the specified name
190
cmds = _get_cmd_dict(plugins_override=plugins_override)
191
try:
192
return cmds[cmd_name]()
193
except KeyError:
194
pass
195
196
# look for any command which claims this as an alias
197
for real_cmd_name, cmd_class in cmds.iteritems():
198
if cmd_name in cmd_class.aliases:
199
return cmd_class()
200
201
cmd_obj = ExternalCommand.find_command(cmd_name)
202
if cmd_obj:
203
return cmd_obj
204
205
raise BzrCommandError("unknown command %r" % cmd_name)
206
207
208
class Command(object):
209
"""Base class for commands.
210
211
Commands are the heart of the command-line bzr interface.
212
213
The command object mostly handles the mapping of command-line
214
parameters into one or more bzrlib operations, and of the results
215
into textual output.
216
217
Commands normally don't have any state. All their arguments are
218
passed in to the run method. (Subclasses may take a different
219
policy if the behaviour of the instance needs to depend on e.g. a
220
shell plugin and not just its Python class.)
221
222
The docstring for an actual command should give a single-line
223
summary, then a complete description of the command. A grammar
224
description will be inserted.
225
226
aliases
227
Other accepted names for this command.
228
229
takes_args
230
List of argument forms, marked with whether they are optional,
231
repeated, etc.
232
233
takes_options
234
List of options that may be given for this command.
235
236
hidden
237
If true, this command isn't advertised. This is typically
238
for commands intended for expert users.
239
"""
240
aliases = []
241
242
takes_args = []
243
takes_options = []
244
245
hidden = False
246
247
def __init__(self):
248
"""Construct an instance of this command."""
249
if self.__doc__ == Command.__doc__:
250
warn("No help message set for %r" % self)
251
252
253
def run_argv(self, argv):
254
"""Parse command line and run."""
255
args, opts = parse_args(argv)
256
257
if 'help' in opts: # e.g. bzr add --help
258
from bzrlib.help import help_on_command
259
help_on_command(self.name())
260
return 0
261
262
# check options are reasonable
263
allowed = self.takes_options
264
for oname in opts:
265
if oname not in allowed:
266
raise BzrCommandError("option '--%s' is not allowed for command %r"
267
% (oname, self.name()))
268
269
# mix arguments and options into one dictionary
270
cmdargs = _match_argform(self.name(), self.takes_args, args)
271
cmdopts = {}
272
for k, v in opts.items():
273
cmdopts[k.replace('-', '_')] = v
274
275
all_cmd_args = cmdargs.copy()
276
all_cmd_args.update(cmdopts)
277
278
return self.run(**all_cmd_args)
279
280
281
def run(self):
282
"""Actually run the command.
283
284
This is invoked with the options and arguments bound to
285
keyword parameters.
286
287
Return 0 or None if the command was successful, or a non-zero
288
shell error code if not. It's OK for this method to allow
289
an exception to raise up.
290
"""
291
raise NotImplementedError()
292
293
294
def help(self):
295
"""Return help message for this class."""
296
if self.__doc__ is Command.__doc__:
297
return None
298
return getdoc(self)
299
300
def name(self):
301
return _unsquish_command_name(self.__class__.__name__)
302
303
304
def parse_spec(spec):
305
"""
306
>>> parse_spec(None)
307
[None, None]
308
>>> parse_spec("./")
309
['./', None]
310
>>> parse_spec("../@")
311
['..', -1]
312
>>> parse_spec("../f/@35")
313
['../f', 35]
314
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
315
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
316
"""
317
if spec is None:
318
return [None, None]
319
if '/@' in spec:
320
parsed = spec.split('/@')
321
assert len(parsed) == 2
322
if parsed[1] == "":
323
parsed[1] = -1
324
else:
325
try:
326
parsed[1] = int(parsed[1])
327
except ValueError:
328
pass # We can allow stuff like ./@revid:blahblahblah
329
else:
330
assert parsed[1] >=0
331
else:
332
parsed = [spec, None]
333
return parsed
698
334
699
335
700
336
# list of all available options; the rhs can be either None for an
702
338
# the type.
703
339
OPTIONS = {
704
340
'all': None,
341
'basis': str,
342
'diff-options': str,
705
343
'help': None,
344
'file': unicode,
345
'force': None,
346
'format': unicode,
347
'forward': None,
706
348
'message': unicode,
349
'no-recurse': None,
707
350
'profile': None,
708
'revision': int,
351
'revision': _parse_revision_str,
352
'short': None,
709
353
'show-ids': None,
710
354
'timezone': str,
711
355
'verbose': None,
712
356
'version': None,
357
'email': None,
358
'unchanged': None,
359
'update': None,
360
'long': None,
361
'root': str,
362
'no-backup': None,
363
'pattern': str,
713
364
}
714
365
715
366
SHORT_OPTIONS = {
367
'F': 'file',
368
'h': 'help',
716
369
'm': 'message',
717
370
'r': 'revision',
718
371
'v': 'verbose',
372
'l': 'long',
719
373
}
720
374
721
# List of options that apply to particular commands; commands not
722
# listed take none.
723
cmd_options = {
724
'add': ['verbose'],
725
'commit': ['message', 'verbose'],
726
'deleted': ['show-ids'],
727
'diff': ['revision'],
728
'inventory': ['revision'],
729
'log': ['timezone'],
730
'ls': ['revision', 'verbose'],
731
'remove': ['verbose'],
732
'status': ['all'],
733
}
734
735
736
cmd_args = {
737
'add': ['file+'],
738
'commit': [],
739
'diff': [],
740
'export': ['revno', 'dest'],
741
'file-id': ['filename'],
742
'get-file-text': ['text_id'],
743
'get-inventory': ['inventory_id'],
744
'get-revision': ['revision_id'],
745
'get-revision-inventory': ['revision_id'],
746
'help': ['topic?'],
747
'init': [],
748
'log': [],
749
'lookup-revision': ['revno'],
750
'mv': ['source$', 'dest'],
751
'relpath': ['filename'],
752
'remove': ['file+'],
753
'rename': ['from_name', 'to_name'],
754
'renames': ['dir?'],
755
'root': ['filename?'],
756
'status': [],
757
}
758
759
375
760
376
def parse_args(argv):
761
377
"""Parse command line.
767
383
768
384
>>> parse_args('--help'.split())
769
385
([], {'help': True})
386
>>> parse_args('help -- --invalidcmd'.split())
387
(['help', '--invalidcmd'], {})
770
388
>>> parse_args('--version'.split())
771
389
([], {'version': True})
772
390
>>> parse_args('status --all'.split())
773
391
(['status'], {'all': True})
774
392
>>> parse_args('commit --message=biter'.split())
775
393
(['commit'], {'message': u'biter'})
394
>>> parse_args('log -r 500'.split())
395
(['log'], {'revision': [<RevisionSpec_int 500>]})
396
>>> parse_args('log -r500..600'.split())
397
(['log'], {'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
398
>>> parse_args('log -vr500..600'.split())
399
(['log'], {'verbose': True, 'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
400
>>> parse_args('log -rrevno:500..600'.split()) #the r takes an argument
401
(['log'], {'revision': [<RevisionSpec_revno revno:500>, <RevisionSpec_int 600>]})
776
402
"""
777
403
args = []
778
404
opts = {}
779
405
780
# TODO: Maybe handle '--' to end options?
781
406
argsover = False
782
407
while argv:
783
408
a = argv.pop(0)
784
if a[0] == '-':
409
if not argsover and a[0] == '-':
410
# option names must not be unicode
411
a = str(a)
785
412
optarg = None
786
413
if a[1] == '-':
414
if a == '--':
415
# We've received a standalone -- No more flags
416
argsover = True
417
continue
787
418
mutter(" got option %r" % a)
788
419
if '=' in a:
789
420
optname, optarg = a[2:].split('=', 1)
790
421
else:
791
422
optname = a[2:]
792
423
if optname not in OPTIONS:
793
bailout('unknown long option %r' % a)
424
raise BzrError('unknown long option %r' % a)
794
425
else:
795
426
shortopt = a[1:]
796
if shortopt not in SHORT_OPTIONS:
797
bailout('unknown short option %r' % a)
798
optname = SHORT_OPTIONS[shortopt]
427
if shortopt in SHORT_OPTIONS:
428
# Multi-character options must have a space to delimit
429
# their value
430
optname = SHORT_OPTIONS[shortopt]
431
else:
432
# Single character short options, can be chained,
433
# and have their value appended to their name
434
shortopt = a[1:2]
435
if shortopt not in SHORT_OPTIONS:
436
# We didn't find the multi-character name, and we
437
# didn't find the single char name
438
raise BzrError('unknown short option %r' % a)
439
optname = SHORT_OPTIONS[shortopt]
440
441
if a[2:]:
442
# There are extra things on this option
443
# see if it is the value, or if it is another
444
# short option
445
optargfn = OPTIONS[optname]
446
if optargfn is None:
447
# This option does not take an argument, so the
448
# next entry is another short option, pack it back
449
# into the list
450
argv.insert(0, '-' + a[2:])
451
else:
452
# This option takes an argument, so pack it
453
# into the array
454
optarg = a[2:]
799
455
800
456
if optname in opts:
801
457
# XXX: Do we ever want to support this, e.g. for -r?
802
bailout('repeated option %r' % a)
458
raise BzrError('repeated option %r' % a)
803
459
804
460
optargfn = OPTIONS[optname]
805
461
if optargfn:
806
462
if optarg == None:
807
463
if not argv:
808
bailout('option %r needs an argument' % a)
464
raise BzrError('option %r needs an argument' % a)
809
465
else:
810
466
optarg = argv.pop(0)
811
467
opts[optname] = optargfn(optarg)
812
468
else:
813
469
if optarg != None:
814
bailout('option %r takes no argument' % optname)
470
raise BzrError('option %r takes no argument' % optname)
815
471
opts[optname] = True
816
472
else:
817
473
args.append(a)
820
476
821
477
822
478
823
def _match_args(cmd, args):
824
"""Check non-option arguments match required pattern.
825
479
826
>>> _match_args('status', ['asdasdsadasd'])
827
Traceback (most recent call last):
828
...
829
BzrError: ("extra arguments to command status: ['asdasdsadasd']", [])
830
>>> _match_args('add', ['asdasdsadasd'])
831
{'file_list': ['asdasdsadasd']}
832
>>> _match_args('add', 'abc def gj'.split())
833
{'file_list': ['abc', 'def', 'gj']}
834
"""
835
# match argument pattern
836
argform = cmd_args.get(cmd, [])
480
def _match_argform(cmd, takes_args, args):
837
481
argdict = {}
838
# TODO: Need a way to express 'cp SRC... DEST', where it matches
839
# all but one.
840
482
841
# step through args and argform, allowing appropriate 0-many matches
842
for ap in argform:
483
# step through args and takes_args, allowing appropriate 0-many matches
484
for ap in takes_args:
843
485
argname = ap[:-1]
844
486
if ap[-1] == '?':
845
487
if args:
846
488
argdict[argname] = args.pop(0)
847
elif ap[-1] == '*':
848
assert 0
489
elif ap[-1] == '*': # all remaining arguments
490
if args:
491
argdict[argname + '_list'] = args[:]
492
args = []
493
else:
494
argdict[argname + '_list'] = None
849
495
elif ap[-1] == '+':
850
496
if not args:
851
bailout("command %r needs one or more %s"
497
raise BzrCommandError("command %r needs one or more %s"
852
498
% (cmd, argname.upper()))
853
499
else:
854
500
argdict[argname + '_list'] = args[:]
855
501
args = []
856
502
elif ap[-1] == '$': # all but one
857
503
if len(args) < 2:
858
bailout("command %r needs one or more %s"
504
raise BzrCommandError("command %r needs one or more %s"
859
505
% (cmd, argname.upper()))
860
506
argdict[argname + '_list'] = args[:-1]
861
507
args[:-1] = []
863
509
# just a plain arg
864
510
argname = ap
865
511
if not args:
866
bailout("command %r requires argument %s"
512
raise BzrCommandError("command %r requires argument %s"
867
513
% (cmd, argname.upper()))
868
514
else:
869
515
argdict[argname] = args.pop(0)
870
516
871
517
if args:
872
bailout("extra arguments to command %s: %r"
873
% (cmd, args))
518
raise BzrCommandError("extra argument to command %s: %s"
519
% (cmd, args[0]))
874
520
875
521
return argdict
876
522
877
523
878
524
879
def run_bzr(argv):
880
"""Execute a command.
881
882
This is similar to main(), but without all the trappings for
883
logging and error handling.
884
"""
885
try:
886
args, opts = parse_args(argv[1:])
887
if 'help' in opts:
888
# TODO: pass down other arguments in case they asked for
889
# help on a command name?
890
if args:
891
cmd_help(args[0])
892
else:
893
cmd_help()
894
return 0
895
elif 'version' in opts:
896
cmd_version()
897
return 0
898
cmd = args.pop(0)
899
except IndexError:
900
log_error('usage: bzr COMMAND\n')
901
log_error(' try "bzr help"\n')
902
return 1
903
904
try:
905
cmd_handler = globals()['cmd_' + cmd.replace('-', '_')]
906
except KeyError:
907
bailout("unknown command " + `cmd`)
908
909
# global option
910
if 'profile' in opts:
911
profile = True
912
del opts['profile']
913
else:
914
profile = False
915
916
# check options are reasonable
917
allowed = cmd_options.get(cmd, [])
918
for oname in opts:
919
if oname not in allowed:
920
bailout("option %r is not allowed for command %r"
921
% (oname, cmd))
922
923
# mix arguments and options into one dictionary
924
cmdargs = _match_args(cmd, args)
925
for k, v in opts.items():
926
cmdargs[k.replace('-', '_')] = v
927
928
if profile:
929
import hotshot
930
prof = hotshot.Profile('.bzr.profile')
931
ret = prof.runcall(cmd_handler, **cmdargs) or 0
932
prof.close()
525
def apply_profiled(the_callable, *args, **kwargs):
526
import hotshot
527
import tempfile
528
pffileno, pfname = tempfile.mkstemp()
529
try:
530
prof = hotshot.Profile(pfname)
531
try:
532
ret = prof.runcall(the_callable, *args, **kwargs) or 0
533
finally:
534
prof.close()
933
535
934
536
import hotshot.stats
935
stats = hotshot.stats.load('.bzr.profile')
537
stats = hotshot.stats.load(pfname)
936
538
#stats.strip_dirs()
937
539
stats.sort_stats('time')
540
## XXX: Might like to write to stderr or the trace file instead but
541
## print_stats seems hardcoded to stdout
938
542
stats.print_stats(20)
543
544
return ret
545
finally:
546
os.close(pffileno)
547
os.remove(pfname)
548
549
550
def run_bzr(argv):
551
"""Execute a command.
552
553
This is similar to main(), but without all the trappings for
554
logging and error handling.
555
556
argv
557
The command-line arguments, without the program name from argv[0]
558
559
Returns a command status or raises an exception.
560
561
Special master options: these must come before the command because
562
they control how the command is interpreted.
563
564
--no-plugins
565
Do not load plugin modules at all
566
567
--builtin
568
Only use builtin commands. (Plugins are still allowed to change
569
other behaviour.)
570
571
--profile
572
Run under the Python profiler.
573
"""
574
575
argv = [a.decode(bzrlib.user_encoding) for a in argv]
576
577
opt_profile = opt_no_plugins = opt_builtin = False
578
579
# --no-plugins is handled specially at a very early stage. We need
580
# to load plugins before doing other command parsing so that they
581
# can override commands, but this needs to happen first.
582
583
for a in argv:
584
if a == '--profile':
585
opt_profile = True
586
elif a == '--no-plugins':
587
opt_no_plugins = True
588
elif a == '--builtin':
589
opt_builtin = True
590
else:
591
break
592
argv.remove(a)
593
594
if (not argv) or (argv[0] == '--help'):
595
from bzrlib.help import help
596
if len(argv) > 1:
597
help(argv[1])
598
else:
599
help()
600
return 0
601
602
if argv[0] == '--version':
603
from bzrlib.builtins import show_version
604
show_version()
605
return 0
606
607
if not opt_no_plugins:
608
from bzrlib.plugin import load_plugins
609
load_plugins()
610
611
cmd = str(argv.pop(0))
612
613
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
614
615
if opt_profile:
616
ret = apply_profiled(cmd_obj.run_argv, argv)
939
617
else:
940
return cmd_handler(**cmdargs) or 0
941
618
ret = cmd_obj.run_argv(argv)
619
return ret or 0
942
620
943
621
944
622
def main(argv):
945
## TODO: Handle command-line options; probably know what options are valid for
946
## each command
947
948
## TODO: If the arguments are wrong, give a usage message rather
949
## than just a backtrace.
950
951
bzrlib.trace.create_tracefile(argv)
952
623
import bzrlib.ui
624
bzrlib.trace.log_startup(argv)
625
bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
626
627
return run_bzr_catch_errors(argv[1:])
628
629
630
def run_bzr_catch_errors(argv):
953
631
try:
954
ret = run_bzr(argv)
955
return ret
632
try:
633
try:
634
return run_bzr(argv)
635
finally:
636
# do this here inside the exception wrappers to catch EPIPE
637
sys.stdout.flush()
638
#wrap common errors as CommandErrors.
639
except (NotBranchError,), e:
640
raise BzrCommandError(str(e))
641
except BzrCommandError, e:
642
# command line syntax error, etc
643
log_error(str(e))
644
return 1
956
645
except BzrError, e:
957
log_error('bzr: error: ' + e.args[0] + '\n')
958
if len(e.args) > 1:
959
for h in e.args[1]:
960
log_error(' ' + h + '\n')
646
bzrlib.trace.log_exception()
961
647
return 1
648
except AssertionError, e:
649
bzrlib.trace.log_exception('assertion failed: ' + str(e))
650
return 3
651
except KeyboardInterrupt, e:
652
bzrlib.trace.log_exception('interrupted')
653
return 2
962
654
except Exception, e:
963
log_error('bzr: exception: %s\n' % e)
964
log_error(' see .bzr.log for details\n')
965
traceback.print_exc(None, bzrlib.trace._tracefile)
966
traceback.print_exc(None, sys.stderr)
967
return 1
968
969
# TODO: Maybe nicer handling of IOError?
970
655
import errno
656
if (isinstance(e, IOError)
657
and hasattr(e, 'errno')
658
and e.errno == errno.EPIPE):
659
bzrlib.trace.note('broken pipe')
660
return 2
661
else:
662
bzrlib.trace.log_exception()
663
return 2
971
664
972
665
973
666
if __name__ == '__main__':
974
667
sys.exit(main(sys.argv))
975
##import profile
976
##profile.run('main(sys.argv)')
977
Loggerhead is a web-based interface for Breezy
Version: 2.0.1