« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 588
- compare with another revision
- download diff
- download tarball
- view history from revision 588
- Committer: Martin Pool
- Date: 2005-05-30 02:21:00 UTC
- Revision ID: mbp@sourcefrog.net-20050530022059-398cc7aba9d8d9b1
- change inventory command to not show ids by default
- files added:
- bzrlib/statcache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
# TODO: Split the command framework away from the actual commands.
19
20
# TODO: probably should say which arguments are candidates for glob
21
# expansion on windows and do that at the command level.
22
23
import sys
24
import os
18
19
import sys, os
25
20
26
21
import bzrlib
27
from bzrlib.trace import mutter, note, log_error, warning
28
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
29
from bzrlib.branch import find_branch
30
from bzrlib import BZRDIR
31
32
33
plugin_cmds = {}
34
35
36
def register_command(cmd):
37
"Utility function to help register a command"
38
global plugin_cmds
39
k = cmd.__name__
40
if k.startswith("cmd_"):
41
k_unsquished = _unsquish_command_name(k)
42
else:
43
k_unsquished = k
44
if not plugin_cmds.has_key(k_unsquished):
45
plugin_cmds[k_unsquished] = cmd
46
else:
47
log_error('Two plugins defined the same command: %r' % k)
48
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
22
from bzrlib.trace import mutter, note, log_error
23
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
25
from bzrlib.tree import RevisionTree, EmptyTree, Tree
26
from bzrlib.revision import Revision
27
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
28
format_date
29
from bzrlib import merge
49
30
50
31
51
32
def _squish_command_name(cmd):
56
37
assert cmd.startswith("cmd_")
57
38
return cmd[4:].replace('_','-')
58
39
59
60
40
def _parse_revision_str(revstr):
61
"""This handles a revision string -> revno.
62
63
This always returns a list. The list will have one element for
64
65
It supports integers directly, but everything else it
66
defers for passing to Branch.get_revision_info()
67
68
>>> _parse_revision_str('234')
69
[234]
70
>>> _parse_revision_str('234..567')
71
[234, 567]
72
>>> _parse_revision_str('..')
73
[None, None]
74
>>> _parse_revision_str('..234')
75
[None, 234]
76
>>> _parse_revision_str('234..')
77
[234, None]
78
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
79
[234, 456, 789]
80
>>> _parse_revision_str('234....789') # Error?
81
[234, None, 789]
82
>>> _parse_revision_str('revid:test@other.com-234234')
83
['revid:test@other.com-234234']
84
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
85
['revid:test@other.com-234234', 'revid:test@other.com-234235']
86
>>> _parse_revision_str('revid:test@other.com-234234..23')
87
['revid:test@other.com-234234', 23]
88
>>> _parse_revision_str('date:2005-04-12')
89
['date:2005-04-12']
90
>>> _parse_revision_str('date:2005-04-12 12:24:33')
91
['date:2005-04-12 12:24:33']
92
>>> _parse_revision_str('date:2005-04-12T12:24:33')
93
['date:2005-04-12T12:24:33']
94
>>> _parse_revision_str('date:2005-04-12,12:24:33')
95
['date:2005-04-12,12:24:33']
96
>>> _parse_revision_str('-5..23')
97
[-5, 23]
98
>>> _parse_revision_str('-5')
99
[-5]
100
>>> _parse_revision_str('123a')
101
['123a']
102
>>> _parse_revision_str('abc')
103
['abc']
41
"""This handles a revision string -> revno.
42
43
There are several possibilities:
44
45
'234' -> 234
46
'234:345' -> [234, 345]
47
':234' -> [None, 234]
48
'234:' -> [234, None]
49
50
In the future we will also support:
51
'uuid:blah-blah-blah' -> ?
52
'hash:blahblahblah' -> ?
53
potentially:
54
'tag:mytag' -> ?
104
55
"""
105
import re
106
old_format_re = re.compile('\d*:\d*')
107
m = old_format_re.match(revstr)
108
if m:
109
warning('Colon separator for revision numbers is deprecated.'
110
' Use .. instead')
111
revs = []
112
for rev in revstr.split(':'):
113
if rev:
114
revs.append(int(rev))
115
else:
116
revs.append(None)
117
return revs
118
revs = []
119
for x in revstr.split('..'):
120
if not x:
121
revs.append(None)
122
else:
123
try:
124
revs.append(int(x))
125
except ValueError:
126
revs.append(x)
56
if revstr.find(':') != -1:
57
revs = revstr.split(':')
58
if len(revs) > 2:
59
raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
60
61
if not revs[0]:
62
revs[0] = None
63
else:
64
revs[0] = int(revs[0])
65
66
if not revs[1]:
67
revs[1] = None
68
else:
69
revs[1] = int(revs[1])
70
else:
71
revs = int(revstr)
127
72
return revs
128
73
129
130
def get_merge_type(typestring):
131
"""Attempt to find the merge class/factory associated with a string."""
132
from merge import merge_types
133
try:
134
return merge_types[typestring][0]
135
except KeyError:
136
templ = '%s%%7s: %%s' % (' '*12)
137
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
138
type_list = '\n'.join(lines)
139
msg = "No known merge type %s. Supported types are:\n%s" %\
140
(typestring, type_list)
141
raise BzrCommandError(msg)
142
143
144
def get_merge_type(typestring):
145
"""Attempt to find the merge class/factory associated with a string."""
146
from merge import merge_types
147
try:
148
return merge_types[typestring][0]
149
except KeyError:
150
templ = '%s%%7s: %%s' % (' '*12)
151
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
152
type_list = '\n'.join(lines)
153
msg = "No known merge type %s. Supported types are:\n%s" %\
154
(typestring, type_list)
155
raise BzrCommandError(msg)
156
157
158
159
def _get_cmd_dict(plugins_override=True):
160
d = {}
74
def get_all_cmds():
75
"""Return canonical name and class for all registered commands."""
161
76
for k, v in globals().iteritems():
162
77
if k.startswith("cmd_"):
163
d[_unsquish_command_name(k)] = v
164
# If we didn't load plugins, the plugin_cmds dict will be empty
165
if plugins_override:
166
d.update(plugin_cmds)
167
else:
168
d2 = plugin_cmds.copy()
169
d2.update(d)
170
d = d2
171
return d
172
173
174
def get_all_cmds(plugins_override=True):
175
"""Return canonical name and class for all registered commands."""
176
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
177
yield k,v
178
179
180
def get_cmd_class(cmd, plugins_override=True):
78
yield _unsquish_command_name(k), v
79
80
def get_cmd_class(cmd):
181
81
"""Return the canonical name and command class for a command.
182
82
"""
183
83
cmd = str(cmd) # not unicode
184
84
185
85
# first look up this command under the specified name
186
cmds = _get_cmd_dict(plugins_override=plugins_override)
187
86
try:
188
return cmd, cmds[cmd]
87
return cmd, globals()[_squish_command_name(cmd)]
189
88
except KeyError:
190
89
pass
191
90
192
91
# look for any command which claims this as an alias
193
for cmdname, cmdclass in cmds.iteritems():
92
for cmdname, cmdclass in get_all_cmds():
194
93
if cmd in cmdclass.aliases:
195
94
return cmdname, cmdclass
196
95
233
132
assert isinstance(arguments, dict)
234
133
cmdargs = options.copy()
235
134
cmdargs.update(arguments)
236
if self.__doc__ == Command.__doc__:
237
from warnings import warn
238
warn("No help message set for %r" % self)
135
assert self.__doc__ != Command.__doc__, \
136
("No help message set for %r" % self)
239
137
self.status = self.run(**cmdargs)
240
if self.status is None:
241
self.status = 0
242
138
243
139
244
140
def run(self):
256
152
class ExternalCommand(Command):
257
153
"""Class to wrap external commands.
258
154
259
We cheat a little here, when get_cmd_class() calls us we actually
260
give it back an object we construct that has the appropriate path,
261
help, options etc for the specified command.
262
263
When run_bzr() tries to instantiate that 'class' it gets caught by
264
the __call__ method, which we override to call the Command.__init__
265
method. That then calls our run method which is pretty straight
266
forward.
267
268
The only wrinkle is that we have to map bzr's dictionary of options
269
and arguments back into command line options and arguments for the
270
script.
155
We cheat a little here, when get_cmd_class() calls us we actually give it back
156
an object we construct that has the appropriate path, help, options etc for the
157
specified command.
158
159
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
160
method, which we override to call the Command.__init__ method. That then calls
161
our run method which is pretty straight forward.
162
163
The only wrinkle is that we have to map bzr's dictionary of options and arguments
164
back into command line options and arguments for the script.
271
165
"""
272
166
273
167
def find_command(cls, cmd):
274
168
import os.path
275
169
bzrpath = os.environ.get('BZRPATH', '')
276
170
277
for dir in bzrpath.split(os.pathsep):
171
for dir in bzrpath.split(':'):
278
172
path = os.path.join(dir, cmd)
279
173
if os.path.isfile(path):
280
174
return ExternalCommand(path)
286
180
def __init__(self, path):
287
181
self.path = path
288
182
183
# TODO: If either of these fail, we should detect that and
184
# assume that path is not really a bzr plugin after all.
185
289
186
pipe = os.popen('%s --bzr-usage' % path, 'r')
290
187
self.takes_options = pipe.readline().split()
291
292
for opt in self.takes_options:
293
if not opt in OPTIONS:
294
raise BzrError("Unknown option '%s' returned by external command %s"
295
% (opt, path))
296
297
# TODO: Is there any way to check takes_args is valid here?
298
188
self.takes_args = pipe.readline().split()
299
300
if pipe.close() is not None:
301
raise BzrError("Failed funning '%s --bzr-usage'" % path)
189
pipe.close()
302
190
303
191
pipe = os.popen('%s --bzr-help' % path, 'r')
304
192
self.__doc__ = pipe.read()
305
if pipe.close() is not None:
306
raise BzrError("Failed funning '%s --bzr-help'" % path)
193
pipe.close()
307
194
308
195
def __call__(self, options, arguments):
309
196
Command.__init__(self, options, arguments)
316
203
keys = kargs.keys()
317
204
keys.sort()
318
205
for name in keys:
319
optname = name.replace('_','-')
320
206
value = kargs[name]
321
if OPTIONS.has_key(optname):
207
if OPTIONS.has_key(name):
322
208
# it's an option
323
opts.append('--%s' % optname)
209
opts.append('--%s' % name)
324
210
if value is not None and value is not True:
325
211
opts.append(str(value))
326
212
else:
370
256
directory is shown. Otherwise, only the status of the specified
371
257
files or directories is reported. If a directory is given, status
372
258
is reported for everything inside that directory.
373
374
If a revision is specified, the changes since that revision are shown.
375
259
"""
376
260
takes_args = ['file*']
377
takes_options = ['all', 'show-ids', 'revision']
261
takes_options = ['all', 'show-ids']
378
262
aliases = ['st', 'stat']
379
263
380
264
def run(self, all=False, show_ids=False, file_list=None):
381
265
if file_list:
382
b = find_branch(file_list[0])
266
b = Branch(file_list[0])
383
267
file_list = [b.relpath(x) for x in file_list]
384
268
# special case: only one path was given and it's the root
385
269
# of the branch
386
270
if file_list == ['']:
387
271
file_list = None
388
272
else:
389
b = find_branch('.')
390
391
from bzrlib.status import show_status
392
show_status(b, show_unchanged=all, show_ids=show_ids,
393
specific_files=file_list)
273
b = Branch('.')
274
import status
275
status.show_status(b, show_unchanged=all, show_ids=show_ids,
276
specific_files=file_list)
394
277
395
278
396
279
class cmd_cat_revision(Command):
400
283
takes_args = ['revision_id']
401
284
402
285
def run(self, revision_id):
403
from bzrlib.xml import pack_xml
404
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
286
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
405
287
406
288
407
289
class cmd_revno(Command):
409
291
410
292
This is equal to the number of revisions on this branch."""
411
293
def run(self):
412
print find_branch('.').revno()
413
414
class cmd_revision_info(Command):
415
"""Show revision number and revision id for a given revision identifier.
416
"""
417
hidden = True
418
takes_args = ['revision_info*']
419
takes_options = ['revision']
420
def run(self, revision=None, revision_info_list=None):
421
from bzrlib.branch import find_branch
422
423
revs = []
424
if revision is not None:
425
revs.extend(revision)
426
if revision_info_list is not None:
427
revs.extend(revision_info_list)
428
if len(revs) == 0:
429
raise BzrCommandError('You must supply a revision identifier')
430
431
b = find_branch('.')
432
433
for rev in revs:
434
print '%4d %s' % b.get_revision_info(rev)
294
print Branch('.').revno()
435
295
436
296
437
297
class cmd_add(Command):
447
307
whether already versioned or not, are searched for files or
448
308
subdirectories that are neither versioned or ignored, and these
449
309
are added. This search proceeds recursively into versioned
450
directories. If no names are given '.' is assumed.
310
directories.
451
311
452
Therefore simply saying 'bzr add' will version all files that
312
Therefore simply saying 'bzr add .' will version all files that
453
313
are currently unknown.
454
314
455
315
TODO: Perhaps adding a file whose directly is not versioned should
456
316
recursively add that parent, rather than giving an error?
457
317
"""
458
takes_args = ['file*']
459
takes_options = ['verbose', 'no-recurse']
318
takes_args = ['file+']
319
takes_options = ['verbose']
460
320
461
def run(self, file_list, verbose=False, no_recurse=False):
462
from bzrlib.add import smart_add
463
smart_add(file_list, verbose, not no_recurse)
464
465
466
467
class cmd_mkdir(Command):
468
"""Create a new versioned directory.
469
470
This is equivalent to creating the directory and then adding it.
471
"""
472
takes_args = ['dir+']
473
474
def run(self, dir_list):
475
b = None
476
477
for d in dir_list:
478
os.mkdir(d)
479
if not b:
480
b = find_branch(d)
481
b.add([d], verbose=True)
321
def run(self, file_list, verbose=False):
322
bzrlib.add.smart_add(file_list, verbose)
482
323
483
324
484
325
class cmd_relpath(Command):
487
328
hidden = True
488
329
489
330
def run(self, filename):
490
print find_branch(filename).relpath(filename)
331
print Branch(filename).relpath(filename)
491
332
492
333
493
334
496
337
takes_options = ['revision', 'show-ids']
497
338
498
339
def run(self, revision=None, show_ids=False):
499
b = find_branch('.')
340
b = Branch('.')
500
341
if revision == None:
501
342
inv = b.read_working_inventory()
502
343
else:
503
if len(revision) > 1:
504
raise BzrCommandError('bzr inventory --revision takes'
505
' exactly one revision identifier')
506
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
344
inv = b.get_revision_inventory(b.lookup_revision(revision))
507
345
508
346
for path, entry in inv.entries():
509
347
if show_ids:
522
360
"""
523
361
takes_args = ['source$', 'dest']
524
362
def run(self, source_list, dest):
525
b = find_branch('.')
363
b = Branch('.')
526
364
527
# TODO: glob expansion on windows?
528
365
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
529
366
530
367
545
382
takes_args = ['from_name', 'to_name']
546
383
547
384
def run(self, from_name, to_name):
548
b = find_branch('.')
385
b = Branch('.')
549
386
b.rename_one(b.relpath(from_name), b.relpath(to_name))
550
387
551
388
552
389
553
class cmd_mv(Command):
554
"""Move or rename a file.
555
556
usage:
557
bzr mv OLDNAME NEWNAME
558
bzr mv SOURCE... DESTINATION
559
560
If the last argument is a versioned directory, all the other names
561
are moved into it. Otherwise, there must be exactly two arguments
562
and the file is changed to a new name, which must not already exist.
563
564
Files cannot be moved between branches.
565
"""
566
takes_args = ['names*']
567
def run(self, names_list):
568
if len(names_list) < 2:
569
raise BzrCommandError("missing file argument")
570
b = find_branch(names_list[0])
571
572
rel_names = [b.relpath(x) for x in names_list]
573
574
if os.path.isdir(names_list[-1]):
575
# move into existing directory
576
b.move(rel_names[:-1], rel_names[-1])
577
else:
578
if len(names_list) != 2:
579
raise BzrCommandError('to mv multiple files the destination '
580
'must be a versioned directory')
581
b.move(rel_names[0], rel_names[1])
582
583
584
585
586
class cmd_pull(Command):
587
"""Pull any changes from another branch into the current one.
588
589
If the location is omitted, the last-used location will be used.
590
Both the revision history and the working directory will be
591
updated.
592
593
This command only works on branches that have not diverged. Branches are
594
considered diverged if both branches have had commits without first
595
pulling from the other.
596
597
If branches have diverged, you can use 'bzr merge' to pull the text changes
598
from one into the other.
599
"""
600
takes_args = ['location?']
601
602
def run(self, location=None):
603
from bzrlib.merge import merge
604
import tempfile
605
from shutil import rmtree
606
import errno
607
608
br_to = find_branch('.')
609
stored_loc = None
610
try:
611
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
612
except IOError, e:
613
if e.errno != errno.ENOENT:
614
raise
615
if location is None:
616
if stored_loc is None:
617
raise BzrCommandError("No pull location known or specified.")
618
else:
619
print "Using last location: %s" % stored_loc
620
location = stored_loc
621
cache_root = tempfile.mkdtemp()
622
from bzrlib.branch import DivergedBranches
623
br_from = find_branch(location)
624
location = pull_loc(br_from)
625
old_revno = br_to.revno()
626
try:
627
from branch import find_cached_branch, DivergedBranches
628
br_from = find_cached_branch(location, cache_root)
629
location = pull_loc(br_from)
630
old_revno = br_to.revno()
631
try:
632
br_to.update_revisions(br_from)
633
except DivergedBranches:
634
raise BzrCommandError("These branches have diverged."
635
" Try merge.")
636
637
merge(('.', -1), ('.', old_revno), check_clean=False)
638
if location != stored_loc:
639
br_to.controlfile("x-pull", "wb").write(location + "\n")
640
finally:
641
rmtree(cache_root)
642
643
644
645
class cmd_branch(Command):
646
"""Create a new copy of a branch.
647
648
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
649
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
650
651
To retrieve the branch as of a particular revision, supply the --revision
652
parameter, as in "branch foo/bar -r 5".
653
"""
654
takes_args = ['from_location', 'to_location?']
655
takes_options = ['revision']
656
aliases = ['get', 'clone']
657
658
def run(self, from_location, to_location=None, revision=None):
659
import errno
660
from bzrlib.merge import merge
661
from bzrlib.branch import DivergedBranches, \
662
find_cached_branch, Branch
663
from shutil import rmtree
664
from meta_store import CachedStore
665
import tempfile
666
cache_root = tempfile.mkdtemp()
667
668
if revision is None:
669
revision = [None]
670
elif len(revision) > 1:
671
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
672
673
try:
674
try:
675
br_from = find_cached_branch(from_location, cache_root)
676
except OSError, e:
677
if e.errno == errno.ENOENT:
678
raise BzrCommandError('Source location "%s" does not'
679
' exist.' % to_location)
680
else:
681
raise
682
683
if to_location is None:
684
to_location = os.path.basename(from_location.rstrip("/\\"))
685
686
try:
687
os.mkdir(to_location)
688
except OSError, e:
689
if e.errno == errno.EEXIST:
690
raise BzrCommandError('Target directory "%s" already'
691
' exists.' % to_location)
692
if e.errno == errno.ENOENT:
693
raise BzrCommandError('Parent of "%s" does not exist.' %
694
to_location)
695
else:
696
raise
697
br_to = Branch(to_location, init=True)
698
699
br_to.set_root_id(br_from.get_root_id())
700
701
if revision:
702
if revision[0] is None:
703
revno = br_from.revno()
704
else:
705
revno, rev_id = br_from.get_revision_info(revision[0])
706
try:
707
br_to.update_revisions(br_from, stop_revision=revno)
708
except bzrlib.errors.NoSuchRevision:
709
rmtree(to_location)
710
msg = "The branch %s has no revision %d." % (from_location,
711
revno)
712
raise BzrCommandError(msg)
713
714
merge((to_location, -1), (to_location, 0), this_dir=to_location,
715
check_clean=False, ignore_zero=True)
716
from_location = pull_loc(br_from)
717
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
718
finally:
719
rmtree(cache_root)
720
721
722
def pull_loc(branch):
723
# TODO: Should perhaps just make attribute be 'base' in
724
# RemoteBranch and Branch?
725
if hasattr(branch, "baseurl"):
726
return branch.baseurl
727
else:
728
return branch.base
729
730
731
732
390
class cmd_renames(Command):
733
391
"""Show list of renamed files.
734
392
739
397
takes_args = ['dir?']
740
398
741
399
def run(self, dir='.'):
742
b = find_branch(dir)
400
b = Branch(dir)
743
401
old_inv = b.basis_tree().inventory
744
402
new_inv = b.read_working_inventory()
745
403
756
414
def run(self, branch=None):
757
415
import info
758
416
417
from branch import find_branch
759
418
b = find_branch(branch)
760
419
info.show_info(b)
761
420
770
429
takes_options = ['verbose']
771
430
772
431
def run(self, file_list, verbose=False):
773
b = find_branch(file_list[0])
432
b = Branch(file_list[0])
774
433
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
775
434
776
435
784
443
hidden = True
785
444
takes_args = ['filename']
786
445
def run(self, filename):
787
b = find_branch(filename)
446
b = Branch(filename)
788
447
i = b.inventory.path2id(b.relpath(filename))
789
448
if i == None:
790
raise BzrError("%r is not a versioned file" % filename)
449
bailout("%r is not a versioned file" % filename)
791
450
else:
792
451
print i
793
452
800
459
hidden = True
801
460
takes_args = ['filename']
802
461
def run(self, filename):
803
b = find_branch(filename)
462
b = Branch(filename)
804
463
inv = b.inventory
805
464
fid = inv.path2id(b.relpath(filename))
806
465
if fid == None:
807
raise BzrError("%r is not a versioned file" % filename)
466
bailout("%r is not a versioned file" % filename)
808
467
for fip in inv.get_idpath(fid):
809
468
print fip
810
469
813
472
"""Display list of revision ids on this branch."""
814
473
hidden = True
815
474
def run(self):
816
for patchid in find_branch('.').revision_history():
475
for patchid in Branch('.').revision_history():
817
476
print patchid
818
477
819
478
820
479
class cmd_directories(Command):
821
480
"""Display list of versioned directories in this branch."""
822
481
def run(self):
823
for name, ie in find_branch('.').read_working_inventory().directories():
482
for name, ie in Branch('.').read_working_inventory().directories():
824
483
if name == '':
825
484
print '.'
826
485
else:
841
500
bzr commit -m 'imported project'
842
501
"""
843
502
def run(self):
844
from bzrlib.branch import Branch
845
503
Branch('.', init=True)
846
504
847
505
851
509
If files are listed, only the changes in those files are listed.
852
510
Otherwise, all changes for the tree are listed.
853
511
512
TODO: Given two revision arguments, show the difference between them.
513
854
514
TODO: Allow diff across branches.
855
515
856
516
TODO: Option to use external diff command; could be GNU diff, wdiff,
865
525
deleted files.
866
526
867
527
TODO: This probably handles non-Unix newlines poorly.
868
869
examples:
870
bzr diff
871
bzr diff -r1
872
bzr diff -r1:2
873
528
"""
874
529
875
530
takes_args = ['file*']
876
531
takes_options = ['revision', 'diff-options']
877
aliases = ['di', 'dif']
532
aliases = ['di']
878
533
879
534
def run(self, revision=None, file_list=None, diff_options=None):
880
535
from bzrlib.diff import show_diff
536
from bzrlib import find_branch
881
537
882
538
if file_list:
883
539
b = find_branch(file_list[0])
886
542
# just pointing to top-of-tree
887
543
file_list = None
888
544
else:
889
b = find_branch('.')
545
b = Branch('.')
546
547
show_diff(b, revision, specific_files=file_list,
548
external_diff_options=diff_options)
890
549
891
if revision is not None:
892
if len(revision) == 1:
893
show_diff(b, revision[0], specific_files=file_list,
894
external_diff_options=diff_options)
895
elif len(revision) == 2:
896
show_diff(b, revision[0], specific_files=file_list,
897
external_diff_options=diff_options,
898
revision2=revision[1])
899
else:
900
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
901
else:
902
show_diff(b, None, specific_files=file_list,
903
external_diff_options=diff_options)
904
550
905
551
906
552
911
557
TODO: Show files deleted since a previous revision, or between two revisions.
912
558
"""
913
559
def run(self, show_ids=False):
914
b = find_branch('.')
560
b = Branch('.')
915
561
old = b.basis_tree()
916
562
new = b.working_tree()
917
563
932
578
"""List files modified in working tree."""
933
579
hidden = True
934
580
def run(self):
935
from bzrlib.delta import compare_trees
936
937
b = find_branch('.')
938
td = compare_trees(b.basis_tree(), b.working_tree())
939
940
for path, id, kind in td.modified:
941
print path
581
import statcache
582
b = Branch('.')
583
inv = b.read_working_inventory()
584
sc = statcache.update_cache(b, inv)
585
basis = b.basis_tree()
586
basis_inv = basis.inventory
587
588
# We used to do this through iter_entries(), but that's slow
589
# when most of the files are unmodified, as is usually the
590
# case. So instead we iterate by inventory entry, and only
591
# calculate paths as necessary.
592
593
for file_id in basis_inv:
594
cacheentry = sc.get(file_id)
595
if not cacheentry: # deleted
596
continue
597
ie = basis_inv[file_id]
598
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
599
path = inv.id2path(file_id)
600
print path
942
601
943
602
944
603
946
605
"""List files added in working tree."""
947
606
hidden = True
948
607
def run(self):
949
b = find_branch('.')
608
b = Branch('.')
950
609
wt = b.working_tree()
951
610
basis_inv = b.basis_tree().inventory
952
611
inv = wt.inventory
968
627
takes_args = ['filename?']
969
628
def run(self, filename=None):
970
629
"""Print the branch root."""
630
from branch import find_branch
971
631
b = find_branch(filename)
972
632
print getattr(b, 'base', None) or getattr(b, 'baseurl')
973
633
979
639
-r revision requests a specific revision, -r :end or -r begin: are
980
640
also valid.
981
641
982
--message allows you to give a regular expression, which will be evaluated
983
so that only matching entries will be displayed.
984
985
642
TODO: Make --revision support uuid: and hash: [future tag:] notation.
986
643
987
644
"""
988
645
989
646
takes_args = ['filename?']
990
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
991
'long', 'message', 'short',]
647
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
992
648
993
649
def run(self, filename=None, timezone='original',
994
650
verbose=False,
995
651
show_ids=False,
996
652
forward=False,
997
revision=None,
998
message=None,
999
long=False,
1000
short=False):
1001
from bzrlib.branch import find_branch
1002
from bzrlib.log import log_formatter, show_log
653
revision=None):
654
from bzrlib import show_log, find_branch
1003
655
import codecs
1004
656
1005
657
direction = (forward and 'forward') or 'reverse'
1015
667
b = find_branch('.')
1016
668
file_id = None
1017
669
1018
if revision is None:
1019
rev1 = None
1020
rev2 = None
1021
elif len(revision) == 1:
1022
rev1 = rev2 = b.get_revision_info(revision[0])[0]
1023
elif len(revision) == 2:
1024
rev1 = b.get_revision_info(revision[0])[0]
1025
rev2 = b.get_revision_info(revision[1])[0]
670
if revision == None:
671
revision = [None, None]
672
elif isinstance(revision, int):
673
revision = [revision, revision]
1026
674
else:
1027
raise BzrCommandError('bzr log --revision takes one or two values.')
1028
1029
if rev1 == 0:
1030
rev1 = None
1031
if rev2 == 0:
1032
rev2 = None
675
# pair of revisions?
676
pass
677
678
assert len(revision) == 2
1033
679
1034
680
mutter('encoding log as %r' % bzrlib.user_encoding)
1035
1036
# use 'replace' so that we don't abort if trying to write out
1037
# in e.g. the default C locale.
1038
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1039
1040
if not short:
1041
log_format = 'long'
1042
else:
1043
log_format = 'short'
1044
lf = log_formatter(log_format,
1045
show_ids=show_ids,
1046
to_file=outf,
1047
show_timezone=timezone)
1048
1049
show_log(b,
1050
lf,
1051
file_id,
681
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout)
682
683
show_log(b, file_id,
684
show_timezone=timezone,
1052
685
verbose=verbose,
686
show_ids=show_ids,
687
to_file=outf,
1053
688
direction=direction,
1054
start_revision=rev1,
1055
end_revision=rev2,
1056
search=message)
689
start_revision=revision[0],
690
end_revision=revision[1])
1057
691
1058
692
1059
693
1064
698
hidden = True
1065
699
takes_args = ["filename"]
1066
700
def run(self, filename):
1067
b = find_branch(filename)
701
b = Branch(filename)
1068
702
inv = b.read_working_inventory()
1069
703
file_id = inv.path2id(b.relpath(filename))
1070
704
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1078
712
"""
1079
713
hidden = True
1080
714
def run(self, revision=None, verbose=False):
1081
b = find_branch('.')
715
b = Branch('.')
1082
716
if revision == None:
1083
717
tree = b.working_tree()
1084
718
else:
1100
734
1101
735
1102
736
class cmd_unknowns(Command):
1103
"""List unknown files."""
737
"""List unknown files"""
1104
738
def run(self):
1105
from bzrlib.osutils import quotefn
1106
for f in find_branch('.').unknowns():
739
for f in Branch('.').unknowns():
1107
740
print quotefn(f)
1108
741
1109
742
1110
743
1111
744
class cmd_ignore(Command):
1112
"""Ignore a command or pattern.
745
"""Ignore a command or pattern
1113
746
1114
747
To remove patterns from the ignore list, edit the .bzrignore file.
1115
748
1131
764
from bzrlib.atomicfile import AtomicFile
1132
765
import os.path
1133
766
1134
b = find_branch('.')
767
b = Branch('.')
1135
768
ifn = b.abspath('.bzrignore')
1136
769
1137
770
if os.path.exists(ifn):
1171
804
1172
805
See also: bzr ignore"""
1173
806
def run(self):
1174
tree = find_branch('.').working_tree()
807
tree = Branch('.').working_tree()
1175
808
for path, file_class, kind, file_id in tree.list_files():
1176
809
if file_class != 'I':
1177
810
continue
1195
828
except ValueError:
1196
829
raise BzrCommandError("not a valid revision-number: %r" % revno)
1197
830
1198
print find_branch('.').lookup_revision(revno)
831
print Branch('.').lookup_revision(revno)
1199
832
1200
833
1201
834
class cmd_export(Command):
1202
835
"""Export past revision to destination directory.
1203
836
1204
If no revision is specified this exports the last committed revision.
1205
1206
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1207
given, try to find the format with the extension. If no extension
1208
is found exports to a directory (equivalent to --format=dir).
1209
1210
Root may be the top directory for tar, tgz and tbz2 formats. If none
1211
is given, the top directory will be the root name of the file."""
1212
# TODO: list known exporters
837
If no revision is specified this exports the last committed revision."""
1213
838
takes_args = ['dest']
1214
takes_options = ['revision', 'format', 'root']
1215
def run(self, dest, revision=None, format=None, root=None):
1216
import os.path
1217
b = find_branch('.')
1218
if revision is None:
1219
rev_id = b.last_patch()
839
takes_options = ['revision']
840
def run(self, dest, revision=None):
841
b = Branch('.')
842
if revision == None:
843
rh = b.revision_history()[-1]
1220
844
else:
1221
if len(revision) != 1:
1222
raise BzrError('bzr export --revision takes exactly 1 argument')
1223
revno, rev_id = b.get_revision_info(revision[0])
1224
t = b.revision_tree(rev_id)
1225
root, ext = os.path.splitext(dest)
1226
if not format:
1227
if ext in (".tar",):
1228
format = "tar"
1229
elif ext in (".gz", ".tgz"):
1230
format = "tgz"
1231
elif ext in (".bz2", ".tbz2"):
1232
format = "tbz2"
1233
else:
1234
format = "dir"
1235
t.export(dest, format, root)
845
rh = b.lookup_revision(int(revision))
846
t = b.revision_tree(rh)
847
t.export(dest)
1236
848
1237
849
1238
850
class cmd_cat(Command):
1244
856
def run(self, filename, revision=None):
1245
857
if revision == None:
1246
858
raise BzrCommandError("bzr cat requires a revision number")
1247
elif len(revision) != 1:
1248
raise BzrCommandError("bzr cat --revision takes exactly one number")
1249
b = find_branch('.')
1250
b.print_file(b.relpath(filename), revision[0])
859
b = Branch('.')
860
b.print_file(b.relpath(filename), int(revision))
1251
861
1252
862
1253
863
class cmd_local_time_offset(Command):
1260
870
1261
871
class cmd_commit(Command):
1262
872
"""Commit changes into a new revision.
1263
1264
If no arguments are given, the entire tree is committed.
1265
873
1266
874
If selected files are specified, only changes to those files are
1267
committed. If a directory is specified then the directory and everything
1268
within it is committed.
875
committed. If a directory is specified then its contents are also
876
committed.
1269
877
1270
878
A selected-file commit may fail in some cases where the committed
1271
879
tree would be invalid, such as trying to commit a file in a
1276
884
TODO: Strict commit that fails if there are unknown or deleted files.
1277
885
"""
1278
886
takes_args = ['selected*']
1279
takes_options = ['message', 'file', 'verbose', 'unchanged']
887
takes_options = ['message', 'file', 'verbose']
1280
888
aliases = ['ci', 'checkin']
1281
889
1282
# TODO: Give better message for -s, --summary, used by tla people
1283
1284
def run(self, message=None, file=None, verbose=True, selected_list=None,
1285
unchanged=False):
1286
from bzrlib.errors import PointlessCommit
1287
from bzrlib.osutils import get_text_message
890
def run(self, message=None, file=None, verbose=True, selected_list=None):
891
from bzrlib.commit import commit
1288
892
1289
893
## Warning: shadows builtin file()
1290
894
if not message and not file:
1291
# FIXME: Ugly; change status code to send to a provided function?
1292
1293
import cStringIO
1294
stdout = sys.stdout
1295
catcher = cStringIO.StringIO()
1296
sys.stdout = catcher
1297
cmd_status({"file_list":selected_list}, {})
1298
info = catcher.getvalue()
1299
sys.stdout = stdout
1300
message = get_text_message(info)
1301
1302
if message is None:
1303
raise BzrCommandError("please specify a commit message",
1304
["use either --message or --file"])
895
raise BzrCommandError("please specify a commit message",
896
["use either --message or --file"])
1305
897
elif message and file:
1306
898
raise BzrCommandError("please specify either --message or --file")
1307
899
1309
901
import codecs
1310
902
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1311
903
1312
b = find_branch('.')
1313
if selected_list:
1314
selected_list = [b.relpath(s) for s in selected_list]
1315
1316
try:
1317
b.commit(message, verbose=verbose,
1318
specific_files=selected_list,
1319
allow_pointless=unchanged)
1320
except PointlessCommit:
1321
# FIXME: This should really happen before the file is read in;
1322
# perhaps prepare the commit; get the message; then actually commit
1323
raise BzrCommandError("no changes to commit",
1324
["use --unchanged to commit anyhow"])
904
b = Branch('.')
905
commit(b, message, verbose=verbose, specific_files=selected_list)
1325
906
1326
907
1327
908
class cmd_check(Command):
1329
910
1330
911
This command checks various invariants about the branch storage to
1331
912
detect data corruption or bzr bugs.
1332
1333
If given the --update flag, it will update some optional fields
1334
to help ensure data consistency.
1335
"""
1336
takes_args = ['dir?']
1337
1338
def run(self, dir='.'):
1339
from bzrlib.check import check
1340
check(find_branch(dir))
1341
1342
1343
1344
class cmd_scan_cache(Command):
1345
hidden = True
1346
def run(self):
1347
from bzrlib.hashcache import HashCache
1348
import os
1349
1350
c = HashCache('.')
1351
c.read()
1352
c.scan()
1353
1354
print '%6d stats' % c.stat_count
1355
print '%6d in hashcache' % len(c._cache)
1356
print '%6d files removed from cache' % c.removed_count
1357
print '%6d hashes updated' % c.update_count
1358
print '%6d files changed too recently to cache' % c.danger_count
1359
1360
if c.needs_write:
1361
c.write()
1362
1363
1364
1365
class cmd_upgrade(Command):
1366
"""Upgrade branch storage to current format.
1367
1368
This should normally be used only after the check command tells
1369
you to run it.
1370
"""
1371
takes_args = ['dir?']
1372
1373
def run(self, dir='.'):
1374
from bzrlib.upgrade import upgrade
1375
upgrade(find_branch(dir))
913
"""
914
takes_args = ['dir?']
915
def run(self, dir='.'):
916
import bzrlib.check
917
bzrlib.check.check(Branch(dir))
1376
918
1377
919
1378
920
1390
932
class cmd_selftest(Command):
1391
933
"""Run internal test suite"""
1392
934
hidden = True
1393
takes_options = ['verbose']
1394
def run(self, verbose=False):
1395
from bzrlib.selftest import selftest
1396
return int(not selftest(verbose=verbose))
935
def run(self):
936
failures, tests = 0, 0
937
938
import doctest, bzrlib.store
939
bzrlib.trace.verbose = False
940
941
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
942
bzrlib.tree, bzrlib.commands, bzrlib.add:
943
mf, mt = doctest.testmod(m)
944
failures += mf
945
tests += mt
946
print '%-40s %3d tests' % (m.__name__, mt),
947
if mf:
948
print '%3d FAILED!' % mf
949
else:
950
print
951
952
print '%-40s %3d tests' % ('total', tests),
953
if failures:
954
print '%3d FAILED!' % failures
955
return 1
956
else:
957
print
958
return 0
959
1397
960
1398
961
1399
962
class cmd_version(Command):
1400
"""Show version of bzr."""
963
"""Show version of bzr"""
1401
964
def run(self):
1402
965
show_version()
1403
966
1404
967
def show_version():
1405
968
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1406
# is bzrlib itself in a branch?
1407
bzrrev = bzrlib.get_bzr_revision()
1408
if bzrrev:
1409
print " (bzr checkout, revision %d {%s})" % bzrrev
1410
969
print bzrlib.__copyright__
1411
970
print "http://bazaar-ng.org/"
1412
971
print
1422
981
print "it sure does!"
1423
982
1424
983
def parse_spec(spec):
1425
"""
1426
>>> parse_spec(None)
1427
[None, None]
1428
>>> parse_spec("./")
1429
['./', None]
1430
>>> parse_spec("../@")
1431
['..', -1]
1432
>>> parse_spec("../f/@35")
1433
['../f', 35]
1434
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1435
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1436
"""
1437
if spec is None:
1438
return [None, None]
1439
984
if '/@' in spec:
1440
985
parsed = spec.split('/@')
1441
986
assert len(parsed) == 2
1442
987
if parsed[1] == "":
1443
988
parsed[1] = -1
1444
989
else:
1445
try:
1446
parsed[1] = int(parsed[1])
1447
except ValueError:
1448
pass # We can allow stuff like ./@revid:blahblahblah
1449
else:
1450
assert parsed[1] >=0
990
parsed[1] = int(parsed[1])
991
assert parsed[1] >=0
1451
992
else:
1452
993
parsed = [spec, None]
1453
994
return parsed
1454
995
1455
1456
1457
996
class cmd_merge(Command):
1458
"""Perform a three-way merge.
1459
1460
The branch is the branch you will merge from. By default, it will merge
1461
the latest revision. If you specify a revision, that revision will be
1462
merged. If you specify two revisions, the first will be used as a BASE,
1463
and the second one as OTHER. Revision numbers are always relative to the
1464
specified branch.
1465
1466
Examples:
1467
1468
To merge the latest revision from bzr.dev
1469
bzr merge ../bzr.dev
1470
1471
To merge changes up to and including revision 82 from bzr.dev
1472
bzr merge -r 82 ../bzr.dev
1473
1474
To merge the changes introduced by 82, without previous changes:
1475
bzr merge -r 81..82 ../bzr.dev
1476
1477
merge refuses to run if there are any uncommitted changes, unless
1478
--force is given.
1479
"""
1480
takes_args = ['branch?']
1481
takes_options = ['revision', 'force', 'merge-type']
1482
1483
def run(self, branch='.', revision=None, force=False,
1484
merge_type=None):
1485
from bzrlib.merge import merge
1486
from bzrlib.merge_core import ApplyMerge3
1487
if merge_type is None:
1488
merge_type = ApplyMerge3
1489
1490
if revision is None or len(revision) < 1:
1491
base = (None, None)
1492
other = (branch, -1)
1493
else:
1494
if len(revision) == 1:
1495
other = (branch, revision[0])
1496
base = (None, None)
1497
else:
1498
assert len(revision) == 2
1499
if None in revision:
1500
raise BzrCommandError(
1501
"Merge doesn't permit that revision specifier.")
1502
base = (branch, revision[0])
1503
other = (branch, revision[1])
1504
1505
merge(other, base, check_clean=(not force), merge_type=merge_type)
1506
1507
1508
class cmd_revert(Command):
1509
"""Reverse all changes since the last commit.
1510
1511
Only versioned files are affected. Specify filenames to revert only
1512
those files. By default, any files that are changed will be backed up
1513
first. Backup files have a '~' appended to their name.
1514
"""
1515
takes_options = ['revision', 'no-backup']
1516
takes_args = ['file*']
1517
aliases = ['merge-revert']
1518
1519
def run(self, revision=None, no_backup=False, file_list=None):
1520
from bzrlib.merge import merge
1521
if file_list is not None:
1522
if len(file_list) == 0:
1523
raise BzrCommandError("No files specified")
1524
if revision is None:
1525
revision = [-1]
1526
elif len(revision) != 1:
1527
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1528
merge(('.', revision[0]), parse_spec('.'),
1529
check_clean=False,
1530
ignore_zero=True,
1531
backup_files=not no_backup,
1532
file_list=file_list)
1533
997
"""Perform a three-way merge of trees."""
998
takes_args = ['other_spec', 'base_spec']
999
1000
def run(self, other_spec, base_spec):
1001
merge.merge(parse_spec(other_spec), parse_spec(base_spec))
1534
1002
1535
1003
class cmd_assert_fail(Command):
1536
1004
"""Test reporting of assertion failures"""
1551
1019
help.help(topic)
1552
1020
1553
1021
1554
1555
1556
class cmd_missing(Command):
1557
"""What is missing in this branch relative to other branch.
1558
"""
1559
takes_args = ['remote?']
1560
aliases = ['mis', 'miss']
1561
# We don't have to add quiet to the list, because
1562
# unknown options are parsed as booleans
1563
takes_options = ['verbose', 'quiet']
1564
1565
def run(self, remote=None, verbose=False, quiet=False):
1566
from bzrlib.branch import find_branch, DivergedBranches
1567
from bzrlib.errors import BzrCommandError
1568
from bzrlib.missing import get_parent, show_missing
1569
1570
if verbose and quiet:
1571
raise BzrCommandError('Cannot pass both quiet and verbose')
1572
1573
b = find_branch('.')
1574
parent = get_parent(b)
1575
if remote is None:
1576
if parent is None:
1577
raise BzrCommandError("No missing location known or specified.")
1578
else:
1579
if not quiet:
1580
print "Using last location: %s" % parent
1581
remote = parent
1582
elif parent is None:
1583
# We only update x-pull if it did not exist, missing should not change the parent
1584
b.controlfile('x-pull', 'wb').write(remote + '\n')
1585
br_remote = find_branch(remote)
1586
1587
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1588
1589
1590
class cmd_plugins(Command):
1591
"""List plugins"""
1022
class cmd_update_stat_cache(Command):
1023
"""Update stat-cache mapping inodes to SHA-1 hashes.
1024
1025
For testing only."""
1592
1026
hidden = True
1593
1027
def run(self):
1594
import bzrlib.plugin
1595
from inspect import getdoc
1596
from pprint import pprint
1597
for plugin in bzrlib.plugin.all_plugins:
1598
print plugin.__path__[0]
1599
d = getdoc(plugin)
1600
if d:
1601
print '\t', d.split('\n')[0]
1602
1603
#pprint(bzrlib.plugin.all_plugins)
1028
import statcache
1029
b = Branch('.')
1030
statcache.update_cache(b.base, b.read_working_inventory())
1604
1031
1605
1032
1606
1033
1612
1039
'diff-options': str,
1613
1040
'help': None,
1614
1041
'file': unicode,
1615
'force': None,
1616
'format': unicode,
1617
1042
'forward': None,
1618
1043
'message': unicode,
1619
'no-recurse': None,
1620
1044
'profile': None,
1621
1045
'revision': _parse_revision_str,
1622
'short': None,
1623
1046
'show-ids': None,
1624
1047
'timezone': str,
1625
1048
'verbose': None,
1626
1049
'version': None,
1627
1050
'email': None,
1628
'unchanged': None,
1629
'update': None,
1630
'long': None,
1631
'root': str,
1632
'no-backup': None,
1633
'merge-type': get_merge_type,
1634
1051
}
1635
1052
1636
1053
SHORT_OPTIONS = {
1639
1056
'm': 'message',
1640
1057
'r': 'revision',
1641
1058
'v': 'verbose',
1642
'l': 'long',
1643
1059
}
1644
1060
1645
1061
1659
1075
(['status'], {'all': True})
1660
1076
>>> parse_args('commit --message=biter'.split())
1661
1077
(['commit'], {'message': u'biter'})
1662
>>> parse_args('log -r 500'.split())
1663
(['log'], {'revision': [500]})
1664
>>> parse_args('log -r500..600'.split())
1665
(['log'], {'revision': [500, 600]})
1666
>>> parse_args('log -vr500..600'.split())
1667
(['log'], {'verbose': True, 'revision': [500, 600]})
1668
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1669
(['log'], {'revision': ['v500', 600]})
1670
1078
"""
1671
1079
args = []
1672
1080
opts = {}
1686
1094
else:
1687
1095
optname = a[2:]
1688
1096
if optname not in OPTIONS:
1689
raise BzrError('unknown long option %r' % a)
1097
bailout('unknown long option %r' % a)
1690
1098
else:
1691
1099
shortopt = a[1:]
1692
if shortopt in SHORT_OPTIONS:
1693
# Multi-character options must have a space to delimit
1694
# their value
1695
optname = SHORT_OPTIONS[shortopt]
1696
else:
1697
# Single character short options, can be chained,
1698
# and have their value appended to their name
1699
shortopt = a[1:2]
1700
if shortopt not in SHORT_OPTIONS:
1701
# We didn't find the multi-character name, and we
1702
# didn't find the single char name
1703
raise BzrError('unknown short option %r' % a)
1704
optname = SHORT_OPTIONS[shortopt]
1705
1706
if a[2:]:
1707
# There are extra things on this option
1708
# see if it is the value, or if it is another
1709
# short option
1710
optargfn = OPTIONS[optname]
1711
if optargfn is None:
1712
# This option does not take an argument, so the
1713
# next entry is another short option, pack it back
1714
# into the list
1715
argv.insert(0, '-' + a[2:])
1716
else:
1717
# This option takes an argument, so pack it
1718
# into the array
1719
optarg = a[2:]
1100
if shortopt not in SHORT_OPTIONS:
1101
bailout('unknown short option %r' % a)
1102
optname = SHORT_OPTIONS[shortopt]
1720
1103
1721
1104
if optname in opts:
1722
1105
# XXX: Do we ever want to support this, e.g. for -r?
1723
raise BzrError('repeated option %r' % a)
1106
bailout('repeated option %r' % a)
1724
1107
1725
1108
optargfn = OPTIONS[optname]
1726
1109
if optargfn:
1727
1110
if optarg == None:
1728
1111
if not argv:
1729
raise BzrError('option %r needs an argument' % a)
1112
bailout('option %r needs an argument' % a)
1730
1113
else:
1731
1114
optarg = argv.pop(0)
1732
1115
opts[optname] = optargfn(optarg)
1733
1116
else:
1734
1117
if optarg != None:
1735
raise BzrError('option %r takes no argument' % optname)
1118
bailout('option %r takes no argument' % optname)
1736
1119
opts[optname] = True
1737
1120
else:
1738
1121
args.append(a)
1792
1175
1793
1176
This is similar to main(), but without all the trappings for
1794
1177
logging and error handling.
1795
1796
argv
1797
The command-line arguments, without the program name from argv[0]
1798
1799
Returns a command status or raises an exception.
1800
1801
Special master options: these must come before the command because
1802
they control how the command is interpreted.
1803
1804
--no-plugins
1805
Do not load plugin modules at all
1806
1807
--builtin
1808
Only use builtin commands. (Plugins are still allowed to change
1809
other behaviour.)
1810
1811
--profile
1812
Run under the Python profiler.
1813
1178
"""
1814
1815
1179
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1816
1817
opt_profile = opt_no_plugins = opt_builtin = False
1818
1819
# --no-plugins is handled specially at a very early stage. We need
1820
# to load plugins before doing other command parsing so that they
1821
# can override commands, but this needs to happen first.
1822
1823
for a in argv[:]:
1824
if a == '--profile':
1825
opt_profile = True
1826
elif a == '--no-plugins':
1827
opt_no_plugins = True
1828
elif a == '--builtin':
1829
opt_builtin = True
1830
else:
1831
break
1832
argv.remove(a)
1833
1834
if not opt_no_plugins:
1835
from bzrlib.plugin import load_plugins
1836
load_plugins()
1837
1838
args, opts = parse_args(argv)
1839
1840
if 'help' in opts:
1841
from bzrlib.help import help
1842
if args:
1843
help(args[0])
1844
else:
1845
help()
1846
return 0
1847
1848
if 'version' in opts:
1849
show_version()
1850
return 0
1851
1180
1852
if not args:
1853
print >>sys.stderr, "please try 'bzr help' for help"
1181
try:
1182
args, opts = parse_args(argv[1:])
1183
if 'help' in opts:
1184
import help
1185
if args:
1186
help.help(args[0])
1187
else:
1188
help.help()
1189
return 0
1190
elif 'version' in opts:
1191
show_version()
1192
return 0
1193
cmd = str(args.pop(0))
1194
except IndexError:
1195
import help
1196
help.help()
1854
1197
return 1
1855
1856
cmd = str(args.pop(0))
1857
1858
canonical_cmd, cmd_class = \
1859
get_cmd_class(cmd, plugins_override=not opt_builtin)
1198
1199
1200
canonical_cmd, cmd_class = get_cmd_class(cmd)
1201
1202
# global option
1203
if 'profile' in opts:
1204
profile = True
1205
del opts['profile']
1206
else:
1207
profile = False
1860
1208
1861
1209
# check options are reasonable
1862
1210
allowed = cmd_class.takes_options
1871
1219
for k, v in opts.items():
1872
1220
cmdopts[k.replace('-', '_')] = v
1873
1221
1874
if opt_profile:
1222
if profile:
1875
1223
import hotshot, tempfile
1876
1224
pffileno, pfname = tempfile.mkstemp()
1877
1225
try:
1898
1246
1899
1247
def _report_exception(summary, quiet=False):
1900
1248
import traceback
1901
1902
1249
log_error('bzr: ' + summary)
1903
1250
bzrlib.trace.log_exception()
1904
1251
1905
if os.environ.get('BZR_DEBUG'):
1906
traceback.print_exc()
1907
1908
1252
if not quiet:
1909
sys.stderr.write('\n')
1910
1253
tb = sys.exc_info()[2]
1911
1254
exinfo = traceback.extract_tb(tb)
1912
1255
if exinfo:
1916
1259
1917
1260
1918
1261
def main(argv):
1262
import errno
1919
1263
1920
bzrlib.trace.open_tracefile(argv)
1264
bzrlib.open_tracefile(argv)
1921
1265
1922
1266
try:
1923
1267
try:
1924
1268
try:
1925
return run_bzr(argv[1:])
1269
return run_bzr(argv)
1926
1270
finally:
1927
1271
# do this here inside the exception wrappers to catch EPIPE
1928
1272
sys.stdout.flush()
1929
1273
except BzrError, e:
1930
1274
quiet = isinstance(e, (BzrCommandError))
1931
_report_exception('error: ' + str(e), quiet=quiet)
1275
_report_exception('error: ' + e.args[0], quiet=quiet)
1932
1276
if len(e.args) > 1:
1933
1277
for h in e.args[1]:
1934
1278
# some explanation or hints
1944
1288
_report_exception('interrupted', quiet=True)
1945
1289
return 2
1946
1290
except Exception, e:
1947
import errno
1948
1291
quiet = False
1949
1292
if (isinstance(e, IOError)
1950
1293
and hasattr(e, 'errno')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1