« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 626
- compare with another revision
- download diff
- download tarball
- view history from revision 626
- Committer: Martin Pool
- Date: 2005-06-06 11:37:20 UTC
- Revision ID: mbp@sourcefrog.net-20050606113720-67ba802e69fe05c4
- add Store.copy_multi for use in pulling changes into a branch
- 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:
- bzrlib/selftest/__init__.py => bzrlib/selftest.py
- bzrlib/selftest/whitebox.py => bzrlib/whitebox.py
- 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
25
from bzrlib import Branch, Inventory, InventoryEntry, BZRDIR, \
26
format_date
49
27
50
28
51
29
def _squish_command_name(cmd):
56
34
assert cmd.startswith("cmd_")
57
35
return cmd[4:].replace('_','-')
58
36
59
60
37
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']
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' -> ?
104
52
"""
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)
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)
127
69
return revs
128
70
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 = {}
71
def get_all_cmds():
72
"""Return canonical name and class for all registered commands."""
161
73
for k, v in globals().iteritems():
162
74
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):
75
yield _unsquish_command_name(k), v
76
77
def get_cmd_class(cmd):
181
78
"""Return the canonical name and command class for a command.
182
79
"""
183
80
cmd = str(cmd) # not unicode
184
81
185
82
# first look up this command under the specified name
186
cmds = _get_cmd_dict(plugins_override=plugins_override)
187
83
try:
188
return cmd, cmds[cmd]
84
return cmd, globals()[_squish_command_name(cmd)]
189
85
except KeyError:
190
86
pass
191
87
192
88
# look for any command which claims this as an alias
193
for cmdname, cmdclass in cmds.iteritems():
89
for cmdname, cmdclass in get_all_cmds():
194
90
if cmd in cmdclass.aliases:
195
91
return cmdname, cmdclass
196
92
233
129
assert isinstance(arguments, dict)
234
130
cmdargs = options.copy()
235
131
cmdargs.update(arguments)
236
if self.__doc__ == Command.__doc__:
237
from warnings import warn
238
warn("No help message set for %r" % self)
132
assert self.__doc__ != Command.__doc__, \
133
("No help message set for %r" % self)
239
134
self.status = self.run(**cmdargs)
240
if self.status is None:
241
self.status = 0
242
135
243
136
244
137
def run(self):
256
149
class ExternalCommand(Command):
257
150
"""Class to wrap external commands.
258
151
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.
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.
271
162
"""
272
163
273
164
def find_command(cls, cmd):
274
165
import os.path
275
166
bzrpath = os.environ.get('BZRPATH', '')
276
167
277
for dir in bzrpath.split(os.pathsep):
168
for dir in bzrpath.split(':'):
278
169
path = os.path.join(dir, cmd)
279
170
if os.path.isfile(path):
280
171
return ExternalCommand(path)
286
177
def __init__(self, path):
287
178
self.path = path
288
179
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
289
183
pipe = os.popen('%s --bzr-usage' % path, 'r')
290
184
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
185
self.takes_args = pipe.readline().split()
299
300
if pipe.close() is not None:
301
raise BzrError("Failed funning '%s --bzr-usage'" % path)
186
pipe.close()
302
187
303
188
pipe = os.popen('%s --bzr-help' % path, 'r')
304
189
self.__doc__ = pipe.read()
305
if pipe.close() is not None:
306
raise BzrError("Failed funning '%s --bzr-help'" % path)
190
pipe.close()
307
191
308
192
def __call__(self, options, arguments):
309
193
Command.__init__(self, options, arguments)
316
200
keys = kargs.keys()
317
201
keys.sort()
318
202
for name in keys:
319
optname = name.replace('_','-')
320
203
value = kargs[name]
321
if OPTIONS.has_key(optname):
204
if OPTIONS.has_key(name):
322
205
# it's an option
323
opts.append('--%s' % optname)
206
opts.append('--%s' % name)
324
207
if value is not None and value is not True:
325
208
opts.append(str(value))
326
209
else:
370
253
directory is shown. Otherwise, only the status of the specified
371
254
files or directories is reported. If a directory is given, status
372
255
is reported for everything inside that directory.
373
374
If a revision is specified, the changes since that revision are shown.
375
256
"""
376
257
takes_args = ['file*']
377
takes_options = ['all', 'show-ids', 'revision']
258
takes_options = ['all', 'show-ids']
378
259
aliases = ['st', 'stat']
379
260
380
261
def run(self, all=False, show_ids=False, file_list=None):
381
262
if file_list:
382
b = find_branch(file_list[0])
263
b = Branch(file_list[0])
383
264
file_list = [b.relpath(x) for x in file_list]
384
265
# special case: only one path was given and it's the root
385
266
# of the branch
386
267
if file_list == ['']:
387
268
file_list = None
388
269
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)
270
b = Branch('.')
271
import status
272
status.show_status(b, show_unchanged=all, show_ids=show_ids,
273
specific_files=file_list)
394
274
395
275
396
276
class cmd_cat_revision(Command):
400
280
takes_args = ['revision_id']
401
281
402
282
def run(self, revision_id):
403
from bzrlib.xml import pack_xml
404
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
283
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
405
284
406
285
407
286
class cmd_revno(Command):
409
288
410
289
This is equal to the number of revisions on this branch."""
411
290
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)
291
print Branch('.').revno()
435
292
436
293
437
294
class cmd_add(Command):
447
304
whether already versioned or not, are searched for files or
448
305
subdirectories that are neither versioned or ignored, and these
449
306
are added. This search proceeds recursively into versioned
450
directories. If no names are given '.' is assumed.
307
directories.
451
308
452
Therefore simply saying 'bzr add' will version all files that
309
Therefore simply saying 'bzr add .' will version all files that
453
310
are currently unknown.
454
311
455
312
TODO: Perhaps adding a file whose directly is not versioned should
456
313
recursively add that parent, rather than giving an error?
457
314
"""
458
takes_args = ['file*']
315
takes_args = ['file+']
459
316
takes_options = ['verbose', 'no-recurse']
460
317
461
318
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)
319
bzrlib.add.smart_add(file_list, verbose, not no_recurse)
482
320
483
321
484
322
class cmd_relpath(Command):
487
325
hidden = True
488
326
489
327
def run(self, filename):
490
print find_branch(filename).relpath(filename)
328
print Branch(filename).relpath(filename)
491
329
492
330
493
331
496
334
takes_options = ['revision', 'show-ids']
497
335
498
336
def run(self, revision=None, show_ids=False):
499
b = find_branch('.')
337
b = Branch('.')
500
338
if revision == None:
501
339
inv = b.read_working_inventory()
502
340
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]))
341
inv = b.get_revision_inventory(b.lookup_revision(revision))
507
342
508
343
for path, entry in inv.entries():
509
344
if show_ids:
522
357
"""
523
358
takes_args = ['source$', 'dest']
524
359
def run(self, source_list, dest):
525
b = find_branch('.')
360
b = Branch('.')
526
361
527
# TODO: glob expansion on windows?
528
362
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
529
363
530
364
545
379
takes_args = ['from_name', 'to_name']
546
380
547
381
def run(self, from_name, to_name):
548
b = find_branch('.')
382
b = Branch('.')
549
383
b.rename_one(b.relpath(from_name), b.relpath(to_name))
550
384
551
385
552
386
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
387
class cmd_renames(Command):
733
388
"""Show list of renamed files.
734
389
739
394
takes_args = ['dir?']
740
395
741
396
def run(self, dir='.'):
742
b = find_branch(dir)
397
b = Branch(dir)
743
398
old_inv = b.basis_tree().inventory
744
399
new_inv = b.read_working_inventory()
745
400
756
411
def run(self, branch=None):
757
412
import info
758
413
414
from branch import find_branch
759
415
b = find_branch(branch)
760
416
info.show_info(b)
761
417
770
426
takes_options = ['verbose']
771
427
772
428
def run(self, file_list, verbose=False):
773
b = find_branch(file_list[0])
429
b = Branch(file_list[0])
774
430
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
775
431
776
432
784
440
hidden = True
785
441
takes_args = ['filename']
786
442
def run(self, filename):
787
b = find_branch(filename)
443
b = Branch(filename)
788
444
i = b.inventory.path2id(b.relpath(filename))
789
445
if i == None:
790
raise BzrError("%r is not a versioned file" % filename)
446
bailout("%r is not a versioned file" % filename)
791
447
else:
792
448
print i
793
449
800
456
hidden = True
801
457
takes_args = ['filename']
802
458
def run(self, filename):
803
b = find_branch(filename)
459
b = Branch(filename)
804
460
inv = b.inventory
805
461
fid = inv.path2id(b.relpath(filename))
806
462
if fid == None:
807
raise BzrError("%r is not a versioned file" % filename)
463
bailout("%r is not a versioned file" % filename)
808
464
for fip in inv.get_idpath(fid):
809
465
print fip
810
466
813
469
"""Display list of revision ids on this branch."""
814
470
hidden = True
815
471
def run(self):
816
for patchid in find_branch('.').revision_history():
472
for patchid in Branch('.').revision_history():
817
473
print patchid
818
474
819
475
820
476
class cmd_directories(Command):
821
477
"""Display list of versioned directories in this branch."""
822
478
def run(self):
823
for name, ie in find_branch('.').read_working_inventory().directories():
479
for name, ie in Branch('.').read_working_inventory().directories():
824
480
if name == '':
825
481
print '.'
826
482
else:
841
497
bzr commit -m 'imported project'
842
498
"""
843
499
def run(self):
844
from bzrlib.branch import Branch
845
500
Branch('.', init=True)
846
501
847
502
851
506
If files are listed, only the changes in those files are listed.
852
507
Otherwise, all changes for the tree are listed.
853
508
509
TODO: Given two revision arguments, show the difference between them.
510
854
511
TODO: Allow diff across branches.
855
512
856
513
TODO: Option to use external diff command; could be GNU diff, wdiff,
865
522
deleted files.
866
523
867
524
TODO: This probably handles non-Unix newlines poorly.
868
869
examples:
870
bzr diff
871
bzr diff -r1
872
bzr diff -r1:2
873
525
"""
874
526
875
527
takes_args = ['file*']
876
528
takes_options = ['revision', 'diff-options']
877
aliases = ['di', 'dif']
529
aliases = ['di']
878
530
879
531
def run(self, revision=None, file_list=None, diff_options=None):
880
532
from bzrlib.diff import show_diff
533
from bzrlib import find_branch
881
534
882
535
if file_list:
883
536
b = find_branch(file_list[0])
886
539
# just pointing to top-of-tree
887
540
file_list = None
888
541
else:
889
b = find_branch('.')
542
b = Branch('.')
543
544
show_diff(b, revision, specific_files=file_list,
545
external_diff_options=diff_options)
890
546
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
547
905
548
906
549
911
554
TODO: Show files deleted since a previous revision, or between two revisions.
912
555
"""
913
556
def run(self, show_ids=False):
914
b = find_branch('.')
557
b = Branch('.')
915
558
old = b.basis_tree()
916
559
new = b.working_tree()
917
560
932
575
"""List files modified in working tree."""
933
576
hidden = True
934
577
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
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
942
598
943
599
944
600
946
602
"""List files added in working tree."""
947
603
hidden = True
948
604
def run(self):
949
b = find_branch('.')
605
b = Branch('.')
950
606
wt = b.working_tree()
951
607
basis_inv = b.basis_tree().inventory
952
608
inv = wt.inventory
968
624
takes_args = ['filename?']
969
625
def run(self, filename=None):
970
626
"""Print the branch root."""
627
from branch import find_branch
971
628
b = find_branch(filename)
972
629
print getattr(b, 'base', None) or getattr(b, 'baseurl')
973
630
979
636
-r revision requests a specific revision, -r :end or -r begin: are
980
637
also valid.
981
638
982
--message allows you to give a regular expression, which will be evaluated
983
so that only matching entries will be displayed.
984
985
639
TODO: Make --revision support uuid: and hash: [future tag:] notation.
986
640
987
641
"""
988
642
989
643
takes_args = ['filename?']
990
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
991
'long', 'message', 'short',]
644
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
992
645
993
646
def run(self, filename=None, timezone='original',
994
647
verbose=False,
995
648
show_ids=False,
996
649
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
650
revision=None):
651
from bzrlib import show_log, find_branch
1003
652
import codecs
1004
653
1005
654
direction = (forward and 'forward') or 'reverse'
1015
664
b = find_branch('.')
1016
665
file_id = None
1017
666
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]
667
if revision == None:
668
revision = [None, None]
669
elif isinstance(revision, int):
670
revision = [revision, revision]
1026
671
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
672
# pair of revisions?
673
pass
674
675
assert len(revision) == 2
1033
676
1034
677
mutter('encoding log as %r' % bzrlib.user_encoding)
1035
678
1037
680
# in e.g. the default C locale.
1038
681
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1039
682
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,
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):
935
def run(self):
1395
936
from bzrlib.selftest import selftest
1396
return int(not selftest(verbose=verbose))
937
if selftest():
938
return 0
939
else:
940
return 1
941
1397
942
1398
943
1399
944
class cmd_version(Command):
1400
"""Show version of bzr."""
945
"""Show version of bzr"""
1401
946
def run(self):
1402
947
show_version()
1403
948
1431
976
['..', -1]
1432
977
>>> parse_spec("../f/@35")
1433
978
['../f', 35]
1434
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1435
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1436
979
"""
1437
980
if spec is None:
1438
981
return [None, None]
1442
985
if parsed[1] == "":
1443
986
parsed[1] = -1
1444
987
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
988
parsed[1] = int(parsed[1])
989
assert parsed[1] >=0
1451
990
else:
1452
991
parsed = [spec, None]
1453
992
return parsed
1454
993
1455
1456
1457
994
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.
995
"""Perform a three-way merge of trees.
996
997
The SPEC parameters are working tree or revision specifiers. Working trees
998
are specified using standard paths or urls. No component of a directory
999
path may begin with '@'.
1000
1001
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1002
1003
Revisions are specified using a dirname/@revno pair, where dirname is the
1004
branch directory and revno is the revision within that branch. If no revno
1005
is specified, the latest revision is used.
1006
1007
Revision examples: './@127', 'foo/@', '../@1'
1008
1009
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1010
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1011
as the BASE.
1479
1012
"""
1480
takes_args = ['branch?']
1481
takes_options = ['revision', 'force', 'merge-type']
1013
takes_args = ['other_spec', 'base_spec?']
1482
1014
1483
def run(self, branch='.', revision=None, force=False,
1484
merge_type=None):
1015
def run(self, other_spec, base_spec=None):
1485
1016
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)
1017
merge(parse_spec(other_spec), parse_spec(base_spec))
1506
1018
1507
1019
1508
1020
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)
1021
"""
1022
Reverse all changes since the last commit. Only versioned files are
1023
affected.
1024
"""
1025
takes_options = ['revision']
1026
1027
def run(self, revision=-1):
1028
merge.merge(('.', revision), parse_spec('.'), no_changes=False,
1029
ignore_zero=True)
1533
1030
1534
1031
1535
1032
class cmd_assert_fail(Command):
1551
1048
help.help(topic)
1552
1049
1553
1050
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"""
1051
class cmd_update_stat_cache(Command):
1052
"""Update stat-cache mapping inodes to SHA-1 hashes.
1053
1054
For testing only."""
1592
1055
hidden = True
1593
1056
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)
1057
import statcache
1058
b = Branch('.')
1059
statcache.update_cache(b.base, b.read_working_inventory())
1604
1060
1605
1061
1606
1062
1612
1068
'diff-options': str,
1613
1069
'help': None,
1614
1070
'file': unicode,
1615
'force': None,
1616
'format': unicode,
1617
1071
'forward': None,
1618
1072
'message': unicode,
1619
1073
'no-recurse': None,
1620
1074
'profile': None,
1621
1075
'revision': _parse_revision_str,
1622
'short': None,
1623
1076
'show-ids': None,
1624
1077
'timezone': str,
1625
1078
'verbose': None,
1626
1079
'version': None,
1627
1080
'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
1081
}
1635
1082
1636
1083
SHORT_OPTIONS = {
1639
1086
'm': 'message',
1640
1087
'r': 'revision',
1641
1088
'v': 'verbose',
1642
'l': 'long',
1643
1089
}
1644
1090
1645
1091
1659
1105
(['status'], {'all': True})
1660
1106
>>> parse_args('commit --message=biter'.split())
1661
1107
(['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
1108
"""
1671
1109
args = []
1672
1110
opts = {}
1686
1124
else:
1687
1125
optname = a[2:]
1688
1126
if optname not in OPTIONS:
1689
raise BzrError('unknown long option %r' % a)
1127
bailout('unknown long option %r' % a)
1690
1128
else:
1691
1129
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:]
1130
if shortopt not in SHORT_OPTIONS:
1131
bailout('unknown short option %r' % a)
1132
optname = SHORT_OPTIONS[shortopt]
1720
1133
1721
1134
if optname in opts:
1722
1135
# XXX: Do we ever want to support this, e.g. for -r?
1723
raise BzrError('repeated option %r' % a)
1136
bailout('repeated option %r' % a)
1724
1137
1725
1138
optargfn = OPTIONS[optname]
1726
1139
if optargfn:
1727
1140
if optarg == None:
1728
1141
if not argv:
1729
raise BzrError('option %r needs an argument' % a)
1142
bailout('option %r needs an argument' % a)
1730
1143
else:
1731
1144
optarg = argv.pop(0)
1732
1145
opts[optname] = optargfn(optarg)
1733
1146
else:
1734
1147
if optarg != None:
1735
raise BzrError('option %r takes no argument' % optname)
1148
bailout('option %r takes no argument' % optname)
1736
1149
opts[optname] = True
1737
1150
else:
1738
1151
args.append(a)
1792
1205
1793
1206
This is similar to main(), but without all the trappings for
1794
1207
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
1208
"""
1814
1815
1209
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
1210
1852
if not args:
1853
print >>sys.stderr, "please try 'bzr help' for help"
1211
try:
1212
args, opts = parse_args(argv[1:])
1213
if 'help' in opts:
1214
import help
1215
if args:
1216
help.help(args[0])
1217
else:
1218
help.help()
1219
return 0
1220
elif 'version' in opts:
1221
show_version()
1222
return 0
1223
cmd = str(args.pop(0))
1224
except IndexError:
1225
import help
1226
help.help()
1854
1227
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)
1228
1229
1230
canonical_cmd, cmd_class = get_cmd_class(cmd)
1231
1232
# global option
1233
if 'profile' in opts:
1234
profile = True
1235
del opts['profile']
1236
else:
1237
profile = False
1860
1238
1861
1239
# check options are reasonable
1862
1240
allowed = cmd_class.takes_options
1871
1249
for k, v in opts.items():
1872
1250
cmdopts[k.replace('-', '_')] = v
1873
1251
1874
if opt_profile:
1252
if profile:
1875
1253
import hotshot, tempfile
1876
1254
pffileno, pfname = tempfile.mkstemp()
1877
1255
try:
1898
1276
1899
1277
def _report_exception(summary, quiet=False):
1900
1278
import traceback
1901
1902
1279
log_error('bzr: ' + summary)
1903
1280
bzrlib.trace.log_exception()
1904
1281
1905
if os.environ.get('BZR_DEBUG'):
1906
traceback.print_exc()
1907
1908
1282
if not quiet:
1909
sys.stderr.write('\n')
1910
1283
tb = sys.exc_info()[2]
1911
1284
exinfo = traceback.extract_tb(tb)
1912
1285
if exinfo:
1916
1289
1917
1290
1918
1291
def main(argv):
1292
import errno
1919
1293
1920
bzrlib.trace.open_tracefile(argv)
1294
bzrlib.open_tracefile(argv)
1921
1295
1922
1296
try:
1923
1297
try:
1924
1298
try:
1925
return run_bzr(argv[1:])
1299
return run_bzr(argv)
1926
1300
finally:
1927
1301
# do this here inside the exception wrappers to catch EPIPE
1928
1302
sys.stdout.flush()
1929
1303
except BzrError, e:
1930
1304
quiet = isinstance(e, (BzrCommandError))
1931
_report_exception('error: ' + str(e), quiet=quiet)
1305
_report_exception('error: ' + e.args[0], quiet=quiet)
1932
1306
if len(e.args) > 1:
1933
1307
for h in e.args[1]:
1934
1308
# some explanation or hints
1944
1318
_report_exception('interrupted', quiet=True)
1945
1319
return 2
1946
1320
except Exception, e:
1947
import errno
1948
1321
quiet = False
1949
1322
if (isinstance(e, IOError)
1950
1323
and hasattr(e, 'errno')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1