« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 974.1.36
- compare with another revision
- download diff
- download tarball
- view history from revision 974.1.36
- Committer: aaron.bentley at utoronto
- Date: 2005-08-23 05:25:51 UTC
- mto: (1092.1.41) (1185.3.4)
- mto: This revision was merged to the branch mainline in revision 1110.
- Revision ID: aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f
Committed it even though the test case doesn't work
- files added:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- tools
- files removed:
- bzrlib/statcache.py
- files renamed:
- bzrlib/selftest.py => bzrlib/selftest/__init__.py
- bzrlib/whitebox.py => bzrlib/selftest/whitebox.py
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- contrib/bash/bzr => contrib/bash/bzr.simple
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
19
import sys, os
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
20
25
21
26
import bzrlib
22
from bzrlib.trace import mutter, note, log_error
23
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.osutils import quotefn
25
from bzrlib import Branch, Inventory, InventoryEntry, BZRDIR, \
26
format_date
27
from bzrlib.trace import mutter, note, log_error, warning
28
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
29
from bzrlib.branch import find_branch
30
from bzrlib import BZRDIR
31
32
33
plugin_cmds = {}
34
35
36
def register_command(cmd):
37
"Utility function to help register a command"
38
global plugin_cmds
39
k = cmd.__name__
40
if k.startswith("cmd_"):
41
k_unsquished = _unsquish_command_name(k)
42
else:
43
k_unsquished = k
44
if not plugin_cmds.has_key(k_unsquished):
45
plugin_cmds[k_unsquished] = cmd
46
else:
47
log_error('Two plugins defined the same command: %r' % k)
48
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
27
49
28
50
29
51
def _squish_command_name(cmd):
34
56
assert cmd.startswith("cmd_")
35
57
return cmd[4:].replace('_','-')
36
58
59
37
60
def _parse_revision_str(revstr):
38
"""This handles a revision string -> revno.
39
40
There are several possibilities:
41
42
'234' -> 234
43
'234:345' -> [234, 345]
44
':234' -> [None, 234]
45
'234:' -> [234, None]
46
47
In the future we will also support:
48
'uuid:blah-blah-blah' -> ?
49
'hash:blahblahblah' -> ?
50
potentially:
51
'tag:mytag' -> ?
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']
52
104
"""
53
if revstr.find(':') != -1:
54
revs = revstr.split(':')
55
if len(revs) > 2:
56
raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
57
58
if not revs[0]:
59
revs[0] = None
60
else:
61
revs[0] = int(revs[0])
62
63
if not revs[1]:
64
revs[1] = None
65
else:
66
revs[1] = int(revs[1])
67
else:
68
revs = int(revstr)
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)
69
127
return revs
70
128
71
def get_all_cmds():
72
"""Return canonical name and class for all registered commands."""
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 = {}
73
161
for k, v in globals().iteritems():
74
162
if k.startswith("cmd_"):
75
yield _unsquish_command_name(k), v
76
77
def get_cmd_class(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
181
"""Return the canonical name and command class for a command.
79
182
"""
80
183
cmd = str(cmd) # not unicode
81
184
82
185
# first look up this command under the specified name
186
cmds = _get_cmd_dict(plugins_override=plugins_override)
83
187
try:
84
return cmd, globals()[_squish_command_name(cmd)]
188
return cmd, cmds[cmd]
85
189
except KeyError:
86
190
pass
87
191
88
192
# look for any command which claims this as an alias
89
for cmdname, cmdclass in get_all_cmds():
193
for cmdname, cmdclass in cmds.iteritems():
90
194
if cmd in cmdclass.aliases:
91
195
return cmdname, cmdclass
92
196
129
233
assert isinstance(arguments, dict)
130
234
cmdargs = options.copy()
131
235
cmdargs.update(arguments)
132
assert self.__doc__ != Command.__doc__, \
133
("No help message set for %r" % self)
236
if self.__doc__ == Command.__doc__:
237
from warnings import warn
238
warn("No help message set for %r" % self)
134
239
self.status = self.run(**cmdargs)
240
if self.status is None:
241
self.status = 0
135
242
136
243
137
244
def run(self):
149
256
class ExternalCommand(Command):
150
257
"""Class to wrap external commands.
151
258
152
We cheat a little here, when get_cmd_class() calls us we actually give it back
153
an object we construct that has the appropriate path, help, options etc for the
154
specified command.
155
156
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
157
method, which we override to call the Command.__init__ method. That then calls
158
our run method which is pretty straight forward.
159
160
The only wrinkle is that we have to map bzr's dictionary of options and arguments
161
back into command line options and arguments for the script.
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.
162
271
"""
163
272
164
273
def find_command(cls, cmd):
165
274
import os.path
166
275
bzrpath = os.environ.get('BZRPATH', '')
167
276
168
for dir in bzrpath.split(':'):
277
for dir in bzrpath.split(os.pathsep):
169
278
path = os.path.join(dir, cmd)
170
279
if os.path.isfile(path):
171
280
return ExternalCommand(path)
177
286
def __init__(self, path):
178
287
self.path = path
179
288
180
# TODO: If either of these fail, we should detect that and
181
# assume that path is not really a bzr plugin after all.
182
183
289
pipe = os.popen('%s --bzr-usage' % path, 'r')
184
290
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?
185
298
self.takes_args = pipe.readline().split()
186
pipe.close()
299
300
if pipe.close() is not None:
301
raise BzrError("Failed funning '%s --bzr-usage'" % path)
187
302
188
303
pipe = os.popen('%s --bzr-help' % path, 'r')
189
304
self.__doc__ = pipe.read()
190
pipe.close()
305
if pipe.close() is not None:
306
raise BzrError("Failed funning '%s --bzr-help'" % path)
191
307
192
308
def __call__(self, options, arguments):
193
309
Command.__init__(self, options, arguments)
200
316
keys = kargs.keys()
201
317
keys.sort()
202
318
for name in keys:
319
optname = name.replace('_','-')
203
320
value = kargs[name]
204
if OPTIONS.has_key(name):
321
if OPTIONS.has_key(optname):
205
322
# it's an option
206
opts.append('--%s' % name)
323
opts.append('--%s' % optname)
207
324
if value is not None and value is not True:
208
325
opts.append(str(value))
209
326
else:
253
370
directory is shown. Otherwise, only the status of the specified
254
371
files or directories is reported. If a directory is given, status
255
372
is reported for everything inside that directory.
373
374
If a revision is specified, the changes since that revision are shown.
256
375
"""
257
376
takes_args = ['file*']
258
takes_options = ['all', 'show-ids']
377
takes_options = ['all', 'show-ids', 'revision']
259
378
aliases = ['st', 'stat']
260
379
261
380
def run(self, all=False, show_ids=False, file_list=None):
262
381
if file_list:
263
b = Branch(file_list[0])
382
b = find_branch(file_list[0])
264
383
file_list = [b.relpath(x) for x in file_list]
265
384
# special case: only one path was given and it's the root
266
385
# of the branch
267
386
if file_list == ['']:
268
387
file_list = None
269
388
else:
270
b = Branch('.')
271
import status
272
status.show_status(b, show_unchanged=all, show_ids=show_ids,
273
specific_files=file_list)
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)
274
394
275
395
276
396
class cmd_cat_revision(Command):
280
400
takes_args = ['revision_id']
281
401
282
402
def run(self, revision_id):
283
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
403
from bzrlib.xml import pack_xml
404
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
284
405
285
406
286
407
class cmd_revno(Command):
288
409
289
410
This is equal to the number of revisions on this branch."""
290
411
def run(self):
291
print Branch('.').revno()
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)
292
435
293
436
294
437
class cmd_add(Command):
304
447
whether already versioned or not, are searched for files or
305
448
subdirectories that are neither versioned or ignored, and these
306
449
are added. This search proceeds recursively into versioned
307
directories.
450
directories. If no names are given '.' is assumed.
308
451
309
Therefore simply saying 'bzr add .' will version all files that
452
Therefore simply saying 'bzr add' will version all files that
310
453
are currently unknown.
311
454
312
455
TODO: Perhaps adding a file whose directly is not versioned should
313
456
recursively add that parent, rather than giving an error?
314
457
"""
315
takes_args = ['file+']
458
takes_args = ['file*']
316
459
takes_options = ['verbose', 'no-recurse']
317
460
318
461
def run(self, file_list, verbose=False, no_recurse=False):
319
bzrlib.add.smart_add(file_list, verbose, not no_recurse)
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)
320
482
321
483
322
484
class cmd_relpath(Command):
325
487
hidden = True
326
488
327
489
def run(self, filename):
328
print Branch(filename).relpath(filename)
490
print find_branch(filename).relpath(filename)
329
491
330
492
331
493
334
496
takes_options = ['revision', 'show-ids']
335
497
336
498
def run(self, revision=None, show_ids=False):
337
b = Branch('.')
499
b = find_branch('.')
338
500
if revision == None:
339
501
inv = b.read_working_inventory()
340
502
else:
341
inv = b.get_revision_inventory(b.lookup_revision(revision))
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]))
342
507
343
508
for path, entry in inv.entries():
344
509
if show_ids:
357
522
"""
358
523
takes_args = ['source$', 'dest']
359
524
def run(self, source_list, dest):
360
b = Branch('.')
525
b = find_branch('.')
361
526
527
# TODO: glob expansion on windows?
362
528
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
363
529
364
530
379
545
takes_args = ['from_name', 'to_name']
380
546
381
547
def run(self, from_name, to_name):
382
b = Branch('.')
548
b = find_branch('.')
383
549
b.rename_one(b.relpath(from_name), b.relpath(to_name))
384
550
385
551
386
552
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
387
732
class cmd_renames(Command):
388
733
"""Show list of renamed files.
389
734
394
739
takes_args = ['dir?']
395
740
396
741
def run(self, dir='.'):
397
b = Branch(dir)
742
b = find_branch(dir)
398
743
old_inv = b.basis_tree().inventory
399
744
new_inv = b.read_working_inventory()
400
745
411
756
def run(self, branch=None):
412
757
import info
413
758
414
from branch import find_branch
415
759
b = find_branch(branch)
416
760
info.show_info(b)
417
761
426
770
takes_options = ['verbose']
427
771
428
772
def run(self, file_list, verbose=False):
429
b = Branch(file_list[0])
773
b = find_branch(file_list[0])
430
774
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
431
775
432
776
440
784
hidden = True
441
785
takes_args = ['filename']
442
786
def run(self, filename):
443
b = Branch(filename)
787
b = find_branch(filename)
444
788
i = b.inventory.path2id(b.relpath(filename))
445
789
if i == None:
446
bailout("%r is not a versioned file" % filename)
790
raise BzrError("%r is not a versioned file" % filename)
447
791
else:
448
792
print i
449
793
456
800
hidden = True
457
801
takes_args = ['filename']
458
802
def run(self, filename):
459
b = Branch(filename)
803
b = find_branch(filename)
460
804
inv = b.inventory
461
805
fid = inv.path2id(b.relpath(filename))
462
806
if fid == None:
463
bailout("%r is not a versioned file" % filename)
807
raise BzrError("%r is not a versioned file" % filename)
464
808
for fip in inv.get_idpath(fid):
465
809
print fip
466
810
469
813
"""Display list of revision ids on this branch."""
470
814
hidden = True
471
815
def run(self):
472
for patchid in Branch('.').revision_history():
816
for patchid in find_branch('.').revision_history():
473
817
print patchid
474
818
475
819
476
820
class cmd_directories(Command):
477
821
"""Display list of versioned directories in this branch."""
478
822
def run(self):
479
for name, ie in Branch('.').read_working_inventory().directories():
823
for name, ie in find_branch('.').read_working_inventory().directories():
480
824
if name == '':
481
825
print '.'
482
826
else:
497
841
bzr commit -m 'imported project'
498
842
"""
499
843
def run(self):
844
from bzrlib.branch import Branch
500
845
Branch('.', init=True)
501
846
502
847
506
851
If files are listed, only the changes in those files are listed.
507
852
Otherwise, all changes for the tree are listed.
508
853
509
TODO: Given two revision arguments, show the difference between them.
510
511
854
TODO: Allow diff across branches.
512
855
513
856
TODO: Option to use external diff command; could be GNU diff, wdiff,
522
865
deleted files.
523
866
524
867
TODO: This probably handles non-Unix newlines poorly.
868
869
examples:
870
bzr diff
871
bzr diff -r1
872
bzr diff -r1:2
525
873
"""
526
874
527
875
takes_args = ['file*']
528
876
takes_options = ['revision', 'diff-options']
529
aliases = ['di']
877
aliases = ['di', 'dif']
530
878
531
879
def run(self, revision=None, file_list=None, diff_options=None):
532
880
from bzrlib.diff import show_diff
533
from bzrlib import find_branch
534
881
535
882
if file_list:
536
883
b = find_branch(file_list[0])
539
886
# just pointing to top-of-tree
540
887
file_list = None
541
888
else:
542
b = Branch('.')
543
544
show_diff(b, revision, specific_files=file_list,
545
external_diff_options=diff_options)
889
b = find_branch('.')
546
890
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)
547
904
548
905
549
906
554
911
TODO: Show files deleted since a previous revision, or between two revisions.
555
912
"""
556
913
def run(self, show_ids=False):
557
b = Branch('.')
914
b = find_branch('.')
558
915
old = b.basis_tree()
559
916
new = b.working_tree()
560
917
575
932
"""List files modified in working tree."""
576
933
hidden = True
577
934
def run(self):
578
import statcache
579
b = Branch('.')
580
inv = b.read_working_inventory()
581
sc = statcache.update_cache(b, inv)
582
basis = b.basis_tree()
583
basis_inv = basis.inventory
584
585
# We used to do this through iter_entries(), but that's slow
586
# when most of the files are unmodified, as is usually the
587
# case. So instead we iterate by inventory entry, and only
588
# calculate paths as necessary.
589
590
for file_id in basis_inv:
591
cacheentry = sc.get(file_id)
592
if not cacheentry: # deleted
593
continue
594
ie = basis_inv[file_id]
595
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
596
path = inv.id2path(file_id)
597
print path
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
598
942
599
943
600
944
602
946
"""List files added in working tree."""
603
947
hidden = True
604
948
def run(self):
605
b = Branch('.')
949
b = find_branch('.')
606
950
wt = b.working_tree()
607
951
basis_inv = b.basis_tree().inventory
608
952
inv = wt.inventory
624
968
takes_args = ['filename?']
625
969
def run(self, filename=None):
626
970
"""Print the branch root."""
627
from branch import find_branch
628
971
b = find_branch(filename)
629
972
print getattr(b, 'base', None) or getattr(b, 'baseurl')
630
973
636
979
-r revision requests a specific revision, -r :end or -r begin: are
637
980
also valid.
638
981
982
--message allows you to give a regular expression, which will be evaluated
983
so that only matching entries will be displayed.
984
639
985
TODO: Make --revision support uuid: and hash: [future tag:] notation.
640
986
641
987
"""
642
988
643
989
takes_args = ['filename?']
644
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
990
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
991
'long', 'message', 'short',]
645
992
646
993
def run(self, filename=None, timezone='original',
647
994
verbose=False,
648
995
show_ids=False,
649
996
forward=False,
650
revision=None):
651
from bzrlib import show_log, find_branch
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
652
1003
import codecs
653
1004
654
1005
direction = (forward and 'forward') or 'reverse'
664
1015
b = find_branch('.')
665
1016
file_id = None
666
1017
667
if revision == None:
668
revision = [None, None]
669
elif isinstance(revision, int):
670
revision = [revision, revision]
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]
671
1026
else:
672
# pair of revisions?
673
pass
674
675
assert len(revision) == 2
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
676
1033
677
1034
mutter('encoding log as %r' % bzrlib.user_encoding)
678
1035
680
1037
# in e.g. the default C locale.
681
1038
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
682
1039
683
show_log(b, file_id,
684
show_timezone=timezone,
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,
685
1052
verbose=verbose,
686
show_ids=show_ids,
687
to_file=outf,
688
1053
direction=direction,
689
start_revision=revision[0],
690
end_revision=revision[1])
1054
start_revision=rev1,
1055
end_revision=rev2,
1056
search=message)
691
1057
692
1058
693
1059
698
1064
hidden = True
699
1065
takes_args = ["filename"]
700
1066
def run(self, filename):
701
b = Branch(filename)
1067
b = find_branch(filename)
702
1068
inv = b.read_working_inventory()
703
1069
file_id = inv.path2id(b.relpath(filename))
704
1070
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
712
1078
"""
713
1079
hidden = True
714
1080
def run(self, revision=None, verbose=False):
715
b = Branch('.')
1081
b = find_branch('.')
716
1082
if revision == None:
717
1083
tree = b.working_tree()
718
1084
else:
734
1100
735
1101
736
1102
class cmd_unknowns(Command):
737
"""List unknown files"""
1103
"""List unknown files."""
738
1104
def run(self):
739
for f in Branch('.').unknowns():
1105
from bzrlib.osutils import quotefn
1106
for f in find_branch('.').unknowns():
740
1107
print quotefn(f)
741
1108
742
1109
743
1110
744
1111
class cmd_ignore(Command):
745
"""Ignore a command or pattern
1112
"""Ignore a command or pattern.
746
1113
747
1114
To remove patterns from the ignore list, edit the .bzrignore file.
748
1115
764
1131
from bzrlib.atomicfile import AtomicFile
765
1132
import os.path
766
1133
767
b = Branch('.')
1134
b = find_branch('.')
768
1135
ifn = b.abspath('.bzrignore')
769
1136
770
1137
if os.path.exists(ifn):
804
1171
805
1172
See also: bzr ignore"""
806
1173
def run(self):
807
tree = Branch('.').working_tree()
1174
tree = find_branch('.').working_tree()
808
1175
for path, file_class, kind, file_id in tree.list_files():
809
1176
if file_class != 'I':
810
1177
continue
828
1195
except ValueError:
829
1196
raise BzrCommandError("not a valid revision-number: %r" % revno)
830
1197
831
print Branch('.').lookup_revision(revno)
1198
print find_branch('.').lookup_revision(revno)
832
1199
833
1200
834
1201
class cmd_export(Command):
835
1202
"""Export past revision to destination directory.
836
1203
837
If no revision is specified this exports the last committed revision."""
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
838
1213
takes_args = ['dest']
839
takes_options = ['revision']
840
def run(self, dest, revision=None):
841
b = Branch('.')
842
if revision == None:
843
rh = b.revision_history()[-1]
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()
844
1220
else:
845
rh = b.lookup_revision(int(revision))
846
t = b.revision_tree(rh)
847
t.export(dest)
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)
848
1236
849
1237
850
1238
class cmd_cat(Command):
856
1244
def run(self, filename, revision=None):
857
1245
if revision == None:
858
1246
raise BzrCommandError("bzr cat requires a revision number")
859
b = Branch('.')
860
b.print_file(b.relpath(filename), int(revision))
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])
861
1251
862
1252
863
1253
class cmd_local_time_offset(Command):
870
1260
871
1261
class cmd_commit(Command):
872
1262
"""Commit changes into a new revision.
1263
1264
If no arguments are given, the entire tree is committed.
873
1265
874
1266
If selected files are specified, only changes to those files are
875
committed. If a directory is specified then its contents are also
876
committed.
1267
committed. If a directory is specified then the directory and everything
1268
within it is committed.
877
1269
878
1270
A selected-file commit may fail in some cases where the committed
879
1271
tree would be invalid, such as trying to commit a file in a
884
1276
TODO: Strict commit that fails if there are unknown or deleted files.
885
1277
"""
886
1278
takes_args = ['selected*']
887
takes_options = ['message', 'file', 'verbose']
1279
takes_options = ['message', 'file', 'verbose', 'unchanged']
888
1280
aliases = ['ci', 'checkin']
889
1281
890
def run(self, message=None, file=None, verbose=True, selected_list=None):
891
from bzrlib.commit import commit
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
892
1288
893
1289
## Warning: shadows builtin file()
894
1290
if not message and not file:
895
raise BzrCommandError("please specify a commit message",
896
["use either --message or --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"])
897
1305
elif message and file:
898
1306
raise BzrCommandError("please specify either --message or --file")
899
1307
901
1309
import codecs
902
1310
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
903
1311
904
b = Branch('.')
905
commit(b, message, verbose=verbose, specific_files=selected_list)
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"])
906
1325
907
1326
908
1327
class cmd_check(Command):
910
1329
911
1330
This command checks various invariants about the branch storage to
912
1331
detect data corruption or bzr bugs.
913
"""
914
takes_args = ['dir?']
915
def run(self, dir='.'):
916
import bzrlib.check
917
bzrlib.check.check(Branch(dir))
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))
918
1376
919
1377
920
1378
932
1390
class cmd_selftest(Command):
933
1391
"""Run internal test suite"""
934
1392
hidden = True
935
def run(self):
1393
takes_options = ['verbose']
1394
def run(self, verbose=False):
936
1395
from bzrlib.selftest import selftest
937
if selftest():
938
return 0
939
else:
940
return 1
941
1396
return int(not selftest(verbose=verbose))
942
1397
943
1398
944
1399
class cmd_version(Command):
945
"""Show version of bzr"""
1400
"""Show version of bzr."""
946
1401
def run(self):
947
1402
show_version()
948
1403
967
1422
print "it sure does!"
968
1423
969
1424
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]
970
1439
if '/@' in spec:
971
1440
parsed = spec.split('/@')
972
1441
assert len(parsed) == 2
973
1442
if parsed[1] == "":
974
1443
parsed[1] = -1
975
1444
else:
976
parsed[1] = int(parsed[1])
977
assert parsed[1] >=0
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
978
1451
else:
979
1452
parsed = [spec, None]
980
1453
return parsed
981
1454
1455
1456
982
1457
class cmd_merge(Command):
983
"""Perform a three-way merge of trees."""
984
takes_args = ['other_spec', 'base_spec']
985
986
def run(self, other_spec, base_spec):
987
from bzrlib.merge import merge
988
merge(parse_spec(other_spec), parse_spec(base_spec))
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
989
1534
990
1535
class cmd_assert_fail(Command):
991
1536
"""Test reporting of assertion failures"""
1006
1551
help.help(topic)
1007
1552
1008
1553
1009
class cmd_update_stat_cache(Command):
1010
"""Update stat-cache mapping inodes to SHA-1 hashes.
1011
1012
For testing only."""
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"""
1013
1592
hidden = True
1014
1593
def run(self):
1015
import statcache
1016
b = Branch('.')
1017
statcache.update_cache(b.base, b.read_working_inventory())
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)
1018
1604
1019
1605
1020
1606
1026
1612
'diff-options': str,
1027
1613
'help': None,
1028
1614
'file': unicode,
1615
'force': None,
1616
'format': unicode,
1029
1617
'forward': None,
1030
1618
'message': unicode,
1031
1619
'no-recurse': None,
1032
1620
'profile': None,
1033
1621
'revision': _parse_revision_str,
1622
'short': None,
1034
1623
'show-ids': None,
1035
1624
'timezone': str,
1036
1625
'verbose': None,
1037
1626
'version': None,
1038
1627
'email': None,
1628
'unchanged': None,
1629
'update': None,
1630
'long': None,
1631
'root': str,
1632
'no-backup': None,
1633
'merge-type': get_merge_type,
1039
1634
}
1040
1635
1041
1636
SHORT_OPTIONS = {
1044
1639
'm': 'message',
1045
1640
'r': 'revision',
1046
1641
'v': 'verbose',
1642
'l': 'long',
1047
1643
}
1048
1644
1049
1645
1063
1659
(['status'], {'all': True})
1064
1660
>>> parse_args('commit --message=biter'.split())
1065
1661
(['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]})
1066
1670
"""
1067
1671
args = []
1068
1672
opts = {}
1082
1686
else:
1083
1687
optname = a[2:]
1084
1688
if optname not in OPTIONS:
1085
bailout('unknown long option %r' % a)
1689
raise BzrError('unknown long option %r' % a)
1086
1690
else:
1087
1691
shortopt = a[1:]
1088
if shortopt not in SHORT_OPTIONS:
1089
bailout('unknown short option %r' % a)
1090
optname = SHORT_OPTIONS[shortopt]
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:]
1091
1720
1092
1721
if optname in opts:
1093
1722
# XXX: Do we ever want to support this, e.g. for -r?
1094
bailout('repeated option %r' % a)
1723
raise BzrError('repeated option %r' % a)
1095
1724
1096
1725
optargfn = OPTIONS[optname]
1097
1726
if optargfn:
1098
1727
if optarg == None:
1099
1728
if not argv:
1100
bailout('option %r needs an argument' % a)
1729
raise BzrError('option %r needs an argument' % a)
1101
1730
else:
1102
1731
optarg = argv.pop(0)
1103
1732
opts[optname] = optargfn(optarg)
1104
1733
else:
1105
1734
if optarg != None:
1106
bailout('option %r takes no argument' % optname)
1735
raise BzrError('option %r takes no argument' % optname)
1107
1736
opts[optname] = True
1108
1737
else:
1109
1738
args.append(a)
1163
1792
1164
1793
This is similar to main(), but without all the trappings for
1165
1794
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.
1166
1813
"""
1814
1167
1815
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
1168
1851
1169
try:
1170
args, opts = parse_args(argv[1:])
1171
if 'help' in opts:
1172
import help
1173
if args:
1174
help.help(args[0])
1175
else:
1176
help.help()
1177
return 0
1178
elif 'version' in opts:
1179
show_version()
1180
return 0
1181
cmd = str(args.pop(0))
1182
except IndexError:
1183
import help
1184
help.help()
1852
if not args:
1853
print >>sys.stderr, "please try 'bzr help' for help"
1185
1854
return 1
1186
1187
1188
canonical_cmd, cmd_class = get_cmd_class(cmd)
1189
1190
# global option
1191
if 'profile' in opts:
1192
profile = True
1193
del opts['profile']
1194
else:
1195
profile = False
1855
1856
cmd = str(args.pop(0))
1857
1858
canonical_cmd, cmd_class = \
1859
get_cmd_class(cmd, plugins_override=not opt_builtin)
1196
1860
1197
1861
# check options are reasonable
1198
1862
allowed = cmd_class.takes_options
1207
1871
for k, v in opts.items():
1208
1872
cmdopts[k.replace('-', '_')] = v
1209
1873
1210
if profile:
1874
if opt_profile:
1211
1875
import hotshot, tempfile
1212
1876
pffileno, pfname = tempfile.mkstemp()
1213
1877
try:
1234
1898
1235
1899
def _report_exception(summary, quiet=False):
1236
1900
import traceback
1901
1237
1902
log_error('bzr: ' + summary)
1238
1903
bzrlib.trace.log_exception()
1239
1904
1905
if os.environ.get('BZR_DEBUG'):
1906
traceback.print_exc()
1907
1240
1908
if not quiet:
1909
sys.stderr.write('\n')
1241
1910
tb = sys.exc_info()[2]
1242
1911
exinfo = traceback.extract_tb(tb)
1243
1912
if exinfo:
1247
1916
1248
1917
1249
1918
def main(argv):
1250
import errno
1251
1919
1252
bzrlib.open_tracefile(argv)
1920
bzrlib.trace.open_tracefile(argv)
1253
1921
1254
1922
try:
1255
1923
try:
1256
1924
try:
1257
return run_bzr(argv)
1925
return run_bzr(argv[1:])
1258
1926
finally:
1259
1927
# do this here inside the exception wrappers to catch EPIPE
1260
1928
sys.stdout.flush()
1261
1929
except BzrError, e:
1262
1930
quiet = isinstance(e, (BzrCommandError))
1263
_report_exception('error: ' + e.args[0], quiet=quiet)
1931
_report_exception('error: ' + str(e), quiet=quiet)
1264
1932
if len(e.args) > 1:
1265
1933
for h in e.args[1]:
1266
1934
# some explanation or hints
1276
1944
_report_exception('interrupted', quiet=True)
1277
1945
return 2
1278
1946
except Exception, e:
1947
import errno
1279
1948
quiet = False
1280
1949
if (isinstance(e, IOError)
1281
1950
and hasattr(e, 'errno')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1