« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 363
- compare with another revision
- download diff
- download tarball
- view history from revision 363
- Committer: Martin Pool
- Date: 2005-05-05 06:38:18 UTC
- Revision ID: mbp@sourcefrog.net-20050505063818-3eb3260343878325
- do upload CHANGELOG to web server, even though it's autogenerated
- files added:
- bzrlib/cache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- patches
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
# TODO: Split the command framework away from the actual commands.
19
20
# TODO: probably should say which arguments are candidates for glob
21
# expansion on windows and do that at the command level.
22
23
# TODO: Help messages for options.
24
25
# TODO: Define arguments by objects, rather than just using names.
26
# Those objects can specify the expected type of the argument, which
27
# would help with validation and shell completion.
28
29
30
# TODO: Help messages for options.
31
32
# TODO: Define arguments by objects, rather than just using names.
33
# Those objects can specify the expected type of the argument, which
34
# would help with validation and shell completion.
35
36
37
import sys
38
import os
18
19
import sys, os, time, os.path
20
from sets import Set
39
21
40
22
import bzrlib
41
import bzrlib.trace
42
from bzrlib.trace import mutter, note, log_error, warning
43
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
44
from bzrlib.branch import find_branch
45
from bzrlib import BZRDIR
46
47
48
plugin_cmds = {}
49
50
51
def register_command(cmd):
52
"Utility function to help register a command"
53
global plugin_cmds
54
k = cmd.__name__
55
if k.startswith("cmd_"):
56
k_unsquished = _unsquish_command_name(k)
57
else:
58
k_unsquished = k
59
if not plugin_cmds.has_key(k_unsquished):
60
plugin_cmds[k_unsquished] = cmd
61
mutter('registered plugin command %s', k_unsquished)
62
else:
63
log_error('Two plugins defined the same command: %r' % k)
64
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
23
from bzrlib.trace import mutter, note, log_error
24
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
25
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
26
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
27
from bzrlib.revision import Revision
28
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
29
format_date
65
30
66
31
67
32
def _squish_command_name(cmd):
72
37
assert cmd.startswith("cmd_")
73
38
return cmd[4:].replace('_','-')
74
39
75
76
def _parse_revision_str(revstr):
77
"""This handles a revision string -> revno.
78
79
This always returns a list. The list will have one element for
80
81
It supports integers directly, but everything else it
82
defers for passing to Branch.get_revision_info()
83
84
>>> _parse_revision_str('234')
85
[234]
86
>>> _parse_revision_str('234..567')
87
[234, 567]
88
>>> _parse_revision_str('..')
89
[None, None]
90
>>> _parse_revision_str('..234')
91
[None, 234]
92
>>> _parse_revision_str('234..')
93
[234, None]
94
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
95
[234, 456, 789]
96
>>> _parse_revision_str('234....789') # Error?
97
[234, None, 789]
98
>>> _parse_revision_str('revid:test@other.com-234234')
99
['revid:test@other.com-234234']
100
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
101
['revid:test@other.com-234234', 'revid:test@other.com-234235']
102
>>> _parse_revision_str('revid:test@other.com-234234..23')
103
['revid:test@other.com-234234', 23]
104
>>> _parse_revision_str('date:2005-04-12')
105
['date:2005-04-12']
106
>>> _parse_revision_str('date:2005-04-12 12:24:33')
107
['date:2005-04-12 12:24:33']
108
>>> _parse_revision_str('date:2005-04-12T12:24:33')
109
['date:2005-04-12T12:24:33']
110
>>> _parse_revision_str('date:2005-04-12,12:24:33')
111
['date:2005-04-12,12:24:33']
112
>>> _parse_revision_str('-5..23')
113
[-5, 23]
114
>>> _parse_revision_str('-5')
115
[-5]
116
>>> _parse_revision_str('123a')
117
['123a']
118
>>> _parse_revision_str('abc')
119
['abc']
120
"""
121
import re
122
old_format_re = re.compile('\d*:\d*')
123
m = old_format_re.match(revstr)
124
if m:
125
warning('Colon separator for revision numbers is deprecated.'
126
' Use .. instead')
127
revs = []
128
for rev in revstr.split(':'):
129
if rev:
130
revs.append(int(rev))
131
else:
132
revs.append(None)
133
return revs
134
revs = []
135
for x in revstr.split('..'):
136
if not x:
137
revs.append(None)
138
else:
139
try:
140
revs.append(int(x))
141
except ValueError:
142
revs.append(x)
143
return revs
144
145
146
def get_merge_type(typestring):
147
"""Attempt to find the merge class/factory associated with a string."""
148
from merge import merge_types
149
try:
150
return merge_types[typestring][0]
151
except KeyError:
152
templ = '%s%%7s: %%s' % (' '*12)
153
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
154
type_list = '\n'.join(lines)
155
msg = "No known merge type %s. Supported types are:\n%s" %\
156
(typestring, type_list)
157
raise BzrCommandError(msg)
158
159
160
def get_merge_type(typestring):
161
"""Attempt to find the merge class/factory associated with a string."""
162
from merge import merge_types
163
try:
164
return merge_types[typestring][0]
165
except KeyError:
166
templ = '%s%%7s: %%s' % (' '*12)
167
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
168
type_list = '\n'.join(lines)
169
msg = "No known merge type %s. Supported types are:\n%s" %\
170
(typestring, type_list)
171
raise BzrCommandError(msg)
172
173
174
175
def _get_cmd_dict(plugins_override=True):
176
d = {}
40
def get_all_cmds():
41
"""Return canonical name and class for all registered commands."""
177
42
for k, v in globals().iteritems():
178
43
if k.startswith("cmd_"):
179
d[_unsquish_command_name(k)] = v
180
# If we didn't load plugins, the plugin_cmds dict will be empty
181
if plugins_override:
182
d.update(plugin_cmds)
183
else:
184
d2 = plugin_cmds.copy()
185
d2.update(d)
186
d = d2
187
return d
188
189
190
def get_all_cmds(plugins_override=True):
191
"""Return canonical name and class for all registered commands."""
192
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
193
yield k,v
194
195
196
def get_cmd_class(cmd, plugins_override=True):
44
yield _unsquish_command_name(k), v
45
46
def get_cmd_class(cmd):
197
47
"""Return the canonical name and command class for a command.
198
48
"""
199
49
cmd = str(cmd) # not unicode
200
50
201
51
# first look up this command under the specified name
202
cmds = _get_cmd_dict(plugins_override=plugins_override)
203
mutter("all commands: %r", cmds.keys())
204
52
try:
205
return cmd, cmds[cmd]
53
return cmd, globals()[_squish_command_name(cmd)]
206
54
except KeyError:
207
55
pass
208
56
209
57
# look for any command which claims this as an alias
210
for cmdname, cmdclass in cmds.iteritems():
58
for cmdname, cmdclass in get_all_cmds():
211
59
if cmd in cmdclass.aliases:
212
60
return cmdname, cmdclass
213
214
cmdclass = ExternalCommand.find_command(cmd)
215
if cmdclass:
216
return cmd, cmdclass
217
218
raise BzrCommandError("unknown command %r" % cmd)
219
220
221
class Command(object):
61
else:
62
raise BzrCommandError("unknown command %r" % cmd)
63
64
65
class Command:
222
66
"""Base class for commands.
223
67
224
68
The docstring for an actual command should give a single-line
250
94
assert isinstance(arguments, dict)
251
95
cmdargs = options.copy()
252
96
cmdargs.update(arguments)
253
if self.__doc__ == Command.__doc__:
254
from warnings import warn
255
warn("No help message set for %r" % self)
97
assert self.__doc__ != Command.__doc__, \
98
("No help message set for %r" % self)
256
99
self.status = self.run(**cmdargs)
257
if self.status is None:
258
self.status = 0
259
100
260
101
261
102
def run(self):
270
111
return 0
271
112
272
113
273
class ExternalCommand(Command):
274
"""Class to wrap external commands.
275
276
We cheat a little here, when get_cmd_class() calls us we actually
277
give it back an object we construct that has the appropriate path,
278
help, options etc for the specified command.
279
280
When run_bzr() tries to instantiate that 'class' it gets caught by
281
the __call__ method, which we override to call the Command.__init__
282
method. That then calls our run method which is pretty straight
283
forward.
284
285
The only wrinkle is that we have to map bzr's dictionary of options
286
and arguments back into command line options and arguments for the
287
script.
288
"""
289
290
def find_command(cls, cmd):
291
import os.path
292
bzrpath = os.environ.get('BZRPATH', '')
293
294
for dir in bzrpath.split(os.pathsep):
295
path = os.path.join(dir, cmd)
296
if os.path.isfile(path):
297
return ExternalCommand(path)
298
299
return None
300
301
find_command = classmethod(find_command)
302
303
def __init__(self, path):
304
self.path = path
305
306
pipe = os.popen('%s --bzr-usage' % path, 'r')
307
self.takes_options = pipe.readline().split()
308
309
for opt in self.takes_options:
310
if not opt in OPTIONS:
311
raise BzrError("Unknown option '%s' returned by external command %s"
312
% (opt, path))
313
314
# TODO: Is there any way to check takes_args is valid here?
315
self.takes_args = pipe.readline().split()
316
317
if pipe.close() is not None:
318
raise BzrError("Failed funning '%s --bzr-usage'" % path)
319
320
pipe = os.popen('%s --bzr-help' % path, 'r')
321
self.__doc__ = pipe.read()
322
if pipe.close() is not None:
323
raise BzrError("Failed funning '%s --bzr-help'" % path)
324
325
def __call__(self, options, arguments):
326
Command.__init__(self, options, arguments)
327
return self
328
329
def run(self, **kargs):
330
opts = []
331
args = []
332
333
keys = kargs.keys()
334
keys.sort()
335
for name in keys:
336
optname = name.replace('_','-')
337
value = kargs[name]
338
if OPTIONS.has_key(optname):
339
# it's an option
340
opts.append('--%s' % optname)
341
if value is not None and value is not True:
342
opts.append(str(value))
343
else:
344
# it's an arg, or arg list
345
if type(value) is not list:
346
value = [value]
347
for v in value:
348
if v is not None:
349
args.append(str(v))
350
351
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
352
return self.status
353
354
114
355
115
class cmd_status(Command):
356
116
"""Display status summary.
357
117
358
This reports on versioned and unknown files, reporting them
359
grouped by state. Possible states are:
360
361
added
362
Versioned in the working copy but not in the previous revision.
363
364
removed
365
Versioned in the previous revision but removed or deleted
366
in the working copy.
367
368
renamed
369
Path of this file changed from the previous revision;
370
the text may also have changed. This includes files whose
371
parent directory was renamed.
372
373
modified
374
Text has changed since the previous revision.
375
376
unchanged
377
Nothing about this file has changed since the previous revision.
378
Only shown with --all.
379
380
unknown
381
Not versioned and not matching an ignore pattern.
382
383
To see ignored files use 'bzr ignored'. For details in the
384
changes to file texts, use 'bzr diff'.
385
386
If no arguments are specified, the status of the entire working
387
directory is shown. Otherwise, only the status of the specified
388
files or directories is reported. If a directory is given, status
389
is reported for everything inside that directory.
390
391
If a revision is specified, the changes since that revision are shown.
118
For each file there is a single line giving its file state and name.
119
The name is that in the current revision unless it is deleted or
120
missing, in which case the old name is shown.
392
121
"""
393
takes_args = ['file*']
394
takes_options = ['all', 'show-ids', 'revision']
122
takes_options = ['all']
395
123
aliases = ['st', 'stat']
396
124
397
def run(self, all=False, show_ids=False, file_list=None):
398
if file_list:
399
b = find_branch(file_list[0])
400
file_list = [b.relpath(x) for x in file_list]
401
# special case: only one path was given and it's the root
402
# of the branch
403
if file_list == ['']:
404
file_list = None
405
else:
406
b = find_branch('.')
407
408
from bzrlib.status import show_status
409
show_status(b, show_unchanged=all, show_ids=show_ids,
410
specific_files=file_list)
125
def run(self, all=False):
126
#import bzrlib.status
127
#bzrlib.status.tree_status(Branch('.'))
128
Branch('.').show_status(show_all=all)
411
129
412
130
413
131
class cmd_cat_revision(Command):
417
135
takes_args = ['revision_id']
418
136
419
137
def run(self, revision_id):
420
from bzrlib.xml import pack_xml
421
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
138
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
422
139
423
140
424
141
class cmd_revno(Command):
426
143
427
144
This is equal to the number of revisions on this branch."""
428
145
def run(self):
429
print find_branch('.').revno()
430
431
class cmd_revision_info(Command):
432
"""Show revision number and revision id for a given revision identifier.
433
"""
434
hidden = True
435
takes_args = ['revision_info*']
436
takes_options = ['revision']
437
def run(self, revision=None, revision_info_list=None):
438
from bzrlib.branch import find_branch
439
440
revs = []
441
if revision is not None:
442
revs.extend(revision)
443
if revision_info_list is not None:
444
revs.extend(revision_info_list)
445
if len(revs) == 0:
446
raise BzrCommandError('You must supply a revision identifier')
447
448
b = find_branch('.')
449
450
for rev in revs:
451
print '%4d %s' % b.get_revision_info(rev)
146
print Branch('.').revno()
452
147
453
148
454
149
class cmd_add(Command):
464
159
whether already versioned or not, are searched for files or
465
160
subdirectories that are neither versioned or ignored, and these
466
161
are added. This search proceeds recursively into versioned
467
directories. If no names are given '.' is assumed.
162
directories.
468
163
469
Therefore simply saying 'bzr add' will version all files that
164
Therefore simply saying 'bzr add .' will version all files that
470
165
are currently unknown.
471
166
472
167
TODO: Perhaps adding a file whose directly is not versioned should
473
168
recursively add that parent, rather than giving an error?
474
169
"""
475
takes_args = ['file*']
476
takes_options = ['verbose', 'no-recurse']
170
takes_args = ['file+']
171
takes_options = ['verbose']
477
172
478
def run(self, file_list, verbose=False, no_recurse=False):
479
from bzrlib.add import smart_add, _PrintAddCallback
480
recurse = not no_recurse
481
smart_add(file_list, verbose, not no_recurse,
482
callback=_PrintAddCallback)
483
484
485
486
class cmd_mkdir(Command):
487
"""Create a new versioned directory.
488
489
This is equivalent to creating the directory and then adding it.
490
"""
491
takes_args = ['dir+']
492
493
def run(self, dir_list):
494
b = None
495
496
for d in dir_list:
497
os.mkdir(d)
498
if not b:
499
b = find_branch(d)
500
b.add([d])
501
print 'added', d
502
503
504
class cmd_relpath(Command):
173
def run(self, file_list, verbose=False):
174
bzrlib.add.smart_add(file_list, verbose)
175
176
177
def Relpath(Command):
505
178
"""Show path of a file relative to root"""
506
takes_args = ['filename']
507
hidden = True
179
takes_args = ('filename')
508
180
509
def run(self, filename):
510
print find_branch(filename).relpath(filename)
181
def run(self):
182
print Branch(self.args['filename']).relpath(filename)
511
183
512
184
513
185
514
186
class cmd_inventory(Command):
515
187
"""Show inventory of the current working copy or a revision."""
516
takes_options = ['revision', 'show-ids']
188
takes_options = ['revision']
517
189
518
def run(self, revision=None, show_ids=False):
519
b = find_branch('.')
190
def run(self, revision=None):
191
b = Branch('.')
520
192
if revision == None:
521
193
inv = b.read_working_inventory()
522
194
else:
523
if len(revision) > 1:
524
raise BzrCommandError('bzr inventory --revision takes'
525
' exactly one revision identifier')
526
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
195
inv = b.get_revision_inventory(b.lookup_revision(revision))
527
196
528
for path, entry in inv.entries():
529
if show_ids:
530
print '%-50s %s' % (path, entry.file_id)
531
else:
532
print path
197
for path, entry in inv.iter_entries():
198
print '%-50s %s' % (entry.file_id, path)
533
199
534
200
535
201
class cmd_move(Command):
542
208
"""
543
209
takes_args = ['source$', 'dest']
544
210
def run(self, source_list, dest):
545
b = find_branch('.')
211
b = Branch('.')
546
212
547
# TODO: glob expansion on windows?
548
213
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
549
214
550
215
565
230
takes_args = ['from_name', 'to_name']
566
231
567
232
def run(self, from_name, to_name):
568
b = find_branch('.')
233
b = Branch('.')
569
234
b.rename_one(b.relpath(from_name), b.relpath(to_name))
570
235
571
236
572
237
573
class cmd_mv(Command):
574
"""Move or rename a file.
575
576
usage:
577
bzr mv OLDNAME NEWNAME
578
bzr mv SOURCE... DESTINATION
579
580
If the last argument is a versioned directory, all the other names
581
are moved into it. Otherwise, there must be exactly two arguments
582
and the file is changed to a new name, which must not already exist.
583
584
Files cannot be moved between branches.
585
"""
586
takes_args = ['names*']
587
def run(self, names_list):
588
if len(names_list) < 2:
589
raise BzrCommandError("missing file argument")
590
b = find_branch(names_list[0])
591
592
rel_names = [b.relpath(x) for x in names_list]
593
594
if os.path.isdir(names_list[-1]):
595
# move into existing directory
596
for pair in b.move(rel_names[:-1], rel_names[-1]):
597
print "%s => %s" % pair
598
else:
599
if len(names_list) != 2:
600
raise BzrCommandError('to mv multiple files the destination '
601
'must be a versioned directory')
602
for pair in b.move(rel_names[0], rel_names[1]):
603
print "%s => %s" % pair
604
605
606
607
608
class cmd_pull(Command):
609
"""Pull any changes from another branch into the current one.
610
611
If the location is omitted, the last-used location will be used.
612
Both the revision history and the working directory will be
613
updated.
614
615
This command only works on branches that have not diverged. Branches are
616
considered diverged if both branches have had commits without first
617
pulling from the other.
618
619
If branches have diverged, you can use 'bzr merge' to pull the text changes
620
from one into the other.
621
"""
622
takes_args = ['location?']
623
624
def run(self, location=None):
625
from bzrlib.merge import merge
626
import tempfile
627
from shutil import rmtree
628
import errno
629
from bzrlib.branch import pull_loc
630
631
br_to = find_branch('.')
632
stored_loc = None
633
try:
634
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
635
except IOError, e:
636
if e.errno != errno.ENOENT:
637
raise
638
if location is None:
639
if stored_loc is None:
640
raise BzrCommandError("No pull location known or specified.")
641
else:
642
print "Using last location: %s" % stored_loc
643
location = stored_loc
644
cache_root = tempfile.mkdtemp()
645
from bzrlib.branch import DivergedBranches
646
br_from = find_branch(location)
647
location = pull_loc(br_from)
648
old_revno = br_to.revno()
649
try:
650
from branch import find_cached_branch, DivergedBranches
651
br_from = find_cached_branch(location, cache_root)
652
location = pull_loc(br_from)
653
old_revno = br_to.revno()
654
try:
655
br_to.update_revisions(br_from)
656
except DivergedBranches:
657
raise BzrCommandError("These branches have diverged."
658
" Try merge.")
659
660
merge(('.', -1), ('.', old_revno), check_clean=False)
661
if location != stored_loc:
662
br_to.controlfile("x-pull", "wb").write(location + "\n")
663
finally:
664
rmtree(cache_root)
665
666
667
668
class cmd_branch(Command):
669
"""Create a new copy of a branch.
670
671
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
672
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
673
674
To retrieve the branch as of a particular revision, supply the --revision
675
parameter, as in "branch foo/bar -r 5".
676
"""
677
takes_args = ['from_location', 'to_location?']
678
takes_options = ['revision']
679
aliases = ['get', 'clone']
680
681
def run(self, from_location, to_location=None, revision=None):
682
from bzrlib.branch import copy_branch, find_cached_branch
683
import tempfile
684
import errno
685
from shutil import rmtree
686
cache_root = tempfile.mkdtemp()
687
try:
688
if revision is None:
689
revision = [None]
690
elif len(revision) > 1:
691
raise BzrCommandError(
692
'bzr branch --revision takes exactly 1 revision value')
693
try:
694
br_from = find_cached_branch(from_location, cache_root)
695
except OSError, e:
696
if e.errno == errno.ENOENT:
697
raise BzrCommandError('Source location "%s" does not'
698
' exist.' % to_location)
699
else:
700
raise
701
if to_location is None:
702
to_location = os.path.basename(from_location.rstrip("/\\"))
703
try:
704
os.mkdir(to_location)
705
except OSError, e:
706
if e.errno == errno.EEXIST:
707
raise BzrCommandError('Target directory "%s" already'
708
' exists.' % to_location)
709
if e.errno == errno.ENOENT:
710
raise BzrCommandError('Parent of "%s" does not exist.' %
711
to_location)
712
else:
713
raise
714
try:
715
copy_branch(br_from, to_location, revision[0])
716
except bzrlib.errors.NoSuchRevision:
717
rmtree(to_location)
718
msg = "The branch %s has no revision %d." % (from_location, revision[0])
719
raise BzrCommandError(msg)
720
finally:
721
rmtree(cache_root)
722
723
724
238
class cmd_renames(Command):
725
239
"""Show list of renamed files.
726
240
731
245
takes_args = ['dir?']
732
246
733
247
def run(self, dir='.'):
734
b = find_branch(dir)
248
b = Branch(dir)
735
249
old_inv = b.basis_tree().inventory
736
250
new_inv = b.read_working_inventory()
737
251
742
256
743
257
744
258
class cmd_info(Command):
745
"""Show statistical information about a branch."""
746
takes_args = ['branch?']
747
748
def run(self, branch=None):
259
"""Show statistical information for this branch"""
260
def run(self):
749
261
import info
750
751
b = find_branch(branch)
752
info.show_info(b)
262
info.show_info(Branch('.'))
753
263
754
264
755
265
class cmd_remove(Command):
762
272
takes_options = ['verbose']
763
273
764
274
def run(self, file_list, verbose=False):
765
b = find_branch(file_list[0])
275
b = Branch(file_list[0])
766
276
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
767
277
768
278
776
286
hidden = True
777
287
takes_args = ['filename']
778
288
def run(self, filename):
779
b = find_branch(filename)
289
b = Branch(filename)
780
290
i = b.inventory.path2id(b.relpath(filename))
781
291
if i == None:
782
raise BzrError("%r is not a versioned file" % filename)
292
bailout("%r is not a versioned file" % filename)
783
293
else:
784
294
print i
785
295
792
302
hidden = True
793
303
takes_args = ['filename']
794
304
def run(self, filename):
795
b = find_branch(filename)
305
b = Branch(filename)
796
306
inv = b.inventory
797
307
fid = inv.path2id(b.relpath(filename))
798
308
if fid == None:
799
raise BzrError("%r is not a versioned file" % filename)
309
bailout("%r is not a versioned file" % filename)
800
310
for fip in inv.get_idpath(fid):
801
311
print fip
802
312
803
313
804
314
class cmd_revision_history(Command):
805
315
"""Display list of revision ids on this branch."""
806
hidden = True
807
316
def run(self):
808
for patchid in find_branch('.').revision_history():
317
for patchid in Branch('.').revision_history():
809
318
print patchid
810
319
811
320
812
321
class cmd_directories(Command):
813
322
"""Display list of versioned directories in this branch."""
814
323
def run(self):
815
for name, ie in find_branch('.').read_working_inventory().directories():
324
for name, ie in Branch('.').read_working_inventory().directories():
816
325
if name == '':
817
326
print '.'
818
327
else:
833
342
bzr commit -m 'imported project'
834
343
"""
835
344
def run(self):
836
from bzrlib.branch import Branch
837
345
Branch('.', init=True)
838
346
839
347
843
351
If files are listed, only the changes in those files are listed.
844
352
Otherwise, all changes for the tree are listed.
845
353
354
TODO: Given two revision arguments, show the difference between them.
355
846
356
TODO: Allow diff across branches.
847
357
848
358
TODO: Option to use external diff command; could be GNU diff, wdiff,
857
367
deleted files.
858
368
859
369
TODO: This probably handles non-Unix newlines poorly.
860
861
examples:
862
bzr diff
863
bzr diff -r1
864
bzr diff -r1:2
865
370
"""
866
371
867
372
takes_args = ['file*']
868
takes_options = ['revision', 'diff-options']
869
aliases = ['di', 'dif']
373
takes_options = ['revision']
374
aliases = ['di']
870
375
871
def run(self, revision=None, file_list=None, diff_options=None):
376
def run(self, revision=None, file_list=None):
872
377
from bzrlib.diff import show_diff
873
874
if file_list:
875
b = find_branch(file_list[0])
876
file_list = [b.relpath(f) for f in file_list]
877
if file_list == ['']:
878
# just pointing to top-of-tree
879
file_list = None
880
else:
881
b = find_branch('.')
882
883
if revision is not None:
884
if len(revision) == 1:
885
show_diff(b, revision[0], specific_files=file_list,
886
external_diff_options=diff_options)
887
elif len(revision) == 2:
888
show_diff(b, revision[0], specific_files=file_list,
889
external_diff_options=diff_options,
890
revision2=revision[1])
891
else:
892
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
893
else:
894
show_diff(b, None, specific_files=file_list,
895
external_diff_options=diff_options)
896
897
378
379
show_diff(Branch('.'), revision, file_list)
898
380
899
381
900
382
class cmd_deleted(Command):
903
385
TODO: Show files deleted since a previous revision, or between two revisions.
904
386
"""
905
387
def run(self, show_ids=False):
906
b = find_branch('.')
388
b = Branch('.')
907
389
old = b.basis_tree()
908
390
new = b.working_tree()
909
391
919
401
else:
920
402
print path
921
403
922
923
class cmd_modified(Command):
924
"""List files modified in working tree."""
925
hidden = True
926
def run(self):
927
from bzrlib.delta import compare_trees
928
929
b = find_branch('.')
930
td = compare_trees(b.basis_tree(), b.working_tree())
931
932
for path, id, kind in td.modified:
933
print path
934
935
936
937
class cmd_added(Command):
938
"""List files added in working tree."""
939
hidden = True
940
def run(self):
941
b = find_branch('.')
942
wt = b.working_tree()
943
basis_inv = b.basis_tree().inventory
944
inv = wt.inventory
945
for file_id in inv:
946
if file_id in basis_inv:
947
continue
948
path = inv.id2path(file_id)
949
if not os.access(b.abspath(path), os.F_OK):
950
continue
951
print path
952
953
954
955
404
class cmd_root(Command):
956
405
"""Show the tree root directory.
957
406
960
409
takes_args = ['filename?']
961
410
def run(self, filename=None):
962
411
"""Print the branch root."""
963
b = find_branch(filename)
964
print getattr(b, 'base', None) or getattr(b, 'baseurl')
412
print bzrlib.branch.find_branch_root(filename)
413
965
414
966
415
967
416
class cmd_log(Command):
968
417
"""Show log of this branch.
969
418
970
To request a range of logs, you can use the command -r begin:end
971
-r revision requests a specific revision, -r :end or -r begin: are
972
also valid.
973
974
--message allows you to give a regular expression, which will be evaluated
975
so that only matching entries will be displayed.
976
977
TODO: Make --revision support uuid: and hash: [future tag:] notation.
978
419
TODO: Options to show ids; to limit range; etc.
979
420
"""
980
981
takes_args = ['filename?']
982
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
983
'long', 'message', 'short',]
984
985
def run(self, filename=None, timezone='original',
986
verbose=False,
987
show_ids=False,
988
forward=False,
989
revision=None,
990
message=None,
991
long=False,
992
short=False):
993
from bzrlib.branch import find_branch
994
from bzrlib.log import log_formatter, show_log
995
import codecs
996
997
direction = (forward and 'forward') or 'reverse'
998
999
if filename:
1000
b = find_branch(filename)
1001
fp = b.relpath(filename)
1002
if fp:
1003
file_id = b.read_working_inventory().path2id(fp)
1004
else:
1005
file_id = None # points to branch root
1006
else:
1007
b = find_branch('.')
1008
file_id = None
1009
1010
if revision is None:
1011
rev1 = None
1012
rev2 = None
1013
elif len(revision) == 1:
1014
rev1 = rev2 = b.get_revision_info(revision[0])[0]
1015
elif len(revision) == 2:
1016
rev1 = b.get_revision_info(revision[0])[0]
1017
rev2 = b.get_revision_info(revision[1])[0]
1018
else:
1019
raise BzrCommandError('bzr log --revision takes one or two values.')
1020
1021
if rev1 == 0:
1022
rev1 = None
1023
if rev2 == 0:
1024
rev2 = None
1025
1026
mutter('encoding log as %r' % bzrlib.user_encoding)
1027
1028
# use 'replace' so that we don't abort if trying to write out
1029
# in e.g. the default C locale.
1030
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1031
1032
if not short:
1033
log_format = 'long'
1034
else:
1035
log_format = 'short'
1036
lf = log_formatter(log_format,
1037
show_ids=show_ids,
1038
to_file=outf,
1039
show_timezone=timezone)
1040
1041
show_log(b,
1042
lf,
1043
file_id,
1044
verbose=verbose,
1045
direction=direction,
1046
start_revision=rev1,
1047
end_revision=rev2,
1048
search=message)
1049
1050
1051
1052
class cmd_touching_revisions(Command):
1053
"""Return revision-ids which affected a particular file.
1054
1055
A more user-friendly interface is "bzr log FILE"."""
1056
hidden = True
1057
takes_args = ["filename"]
1058
def run(self, filename):
1059
b = find_branch(filename)
1060
inv = b.read_working_inventory()
1061
file_id = inv.path2id(b.relpath(filename))
1062
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1063
print "%6d %s" % (revno, what)
421
takes_options = ['timezone', 'verbose']
422
def run(self, timezone='original', verbose=False):
423
Branch('.', lock_mode='r').write_log(show_timezone=timezone, verbose=verbose)
1064
424
1065
425
1066
426
class cmd_ls(Command):
1070
430
"""
1071
431
hidden = True
1072
432
def run(self, revision=None, verbose=False):
1073
b = find_branch('.')
433
b = Branch('.')
1074
434
if revision == None:
1075
435
tree = b.working_tree()
1076
436
else:
1092
452
1093
453
1094
454
class cmd_unknowns(Command):
1095
"""List unknown files."""
455
"""List unknown files"""
1096
456
def run(self):
1097
from bzrlib.osutils import quotefn
1098
for f in find_branch('.').unknowns():
457
for f in Branch('.').unknowns():
1099
458
print quotefn(f)
1100
459
1101
460
1102
461
1103
462
class cmd_ignore(Command):
1104
"""Ignore a command or pattern.
1105
1106
To remove patterns from the ignore list, edit the .bzrignore file.
1107
1108
If the pattern contains a slash, it is compared to the whole path
1109
from the branch root. Otherwise, it is comapred to only the last
1110
component of the path.
1111
1112
Ignore patterns are case-insensitive on case-insensitive systems.
1113
1114
Note: wildcards must be quoted from the shell on Unix.
1115
1116
examples:
1117
bzr ignore ./Makefile
1118
bzr ignore '*.class'
1119
"""
463
"""Ignore a command or pattern"""
1120
464
takes_args = ['name_pattern']
1121
465
1122
466
def run(self, name_pattern):
1123
from bzrlib.atomicfile import AtomicFile
1124
import os.path
1125
1126
b = find_branch('.')
1127
ifn = b.abspath('.bzrignore')
1128
1129
if os.path.exists(ifn):
1130
f = open(ifn, 'rt')
1131
try:
1132
igns = f.read().decode('utf-8')
1133
finally:
1134
f.close()
1135
else:
1136
igns = ''
1137
1138
# TODO: If the file already uses crlf-style termination, maybe
1139
# we should use that for the newly added lines?
1140
1141
if igns and igns[-1] != '\n':
1142
igns += '\n'
1143
igns += name_pattern + '\n'
1144
1145
try:
1146
f = AtomicFile(ifn, 'wt')
1147
f.write(igns.encode('utf-8'))
1148
f.commit()
1149
finally:
1150
f.close()
467
b = Branch('.')
468
469
# XXX: This will fail if it's a hardlink; should use an AtomicFile class.
470
f = open(b.abspath('.bzrignore'), 'at')
471
f.write(name_pattern + '\n')
472
f.close()
1151
473
1152
474
inv = b.working_tree().inventory
1153
475
if inv.path2id('.bzrignore'):
1159
481
1160
482
1161
483
class cmd_ignored(Command):
1162
"""List ignored files and the patterns that matched them.
1163
1164
See also: bzr ignore"""
484
"""List ignored files and the patterns that matched them."""
1165
485
def run(self):
1166
tree = find_branch('.').working_tree()
486
tree = Branch('.').working_tree()
1167
487
for path, file_class, kind, file_id in tree.list_files():
1168
488
if file_class != 'I':
1169
489
continue
1177
497
1178
498
example:
1179
499
bzr lookup-revision 33
1180
"""
500
"""
1181
501
hidden = True
1182
502
takes_args = ['revno']
1183
503
1187
507
except ValueError:
1188
508
raise BzrCommandError("not a valid revision-number: %r" % revno)
1189
509
1190
print find_branch('.').lookup_revision(revno)
510
print Branch('.').lookup_revision(revno)
1191
511
1192
512
1193
513
class cmd_export(Command):
1194
514
"""Export past revision to destination directory.
1195
515
1196
If no revision is specified this exports the last committed revision.
1197
1198
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1199
given, try to find the format with the extension. If no extension
1200
is found exports to a directory (equivalent to --format=dir).
1201
1202
Root may be the top directory for tar, tgz and tbz2 formats. If none
1203
is given, the top directory will be the root name of the file."""
1204
# TODO: list known exporters
516
If no revision is specified this exports the last committed revision."""
1205
517
takes_args = ['dest']
1206
takes_options = ['revision', 'format', 'root']
1207
def run(self, dest, revision=None, format=None, root=None):
1208
import os.path
1209
b = find_branch('.')
1210
if revision is None:
1211
rev_id = b.last_patch()
518
takes_options = ['revision']
519
def run(self, dest, revno=None):
520
b = Branch('.')
521
if revno == None:
522
rh = b.revision_history[-1]
1212
523
else:
1213
if len(revision) != 1:
1214
raise BzrError('bzr export --revision takes exactly 1 argument')
1215
revno, rev_id = b.get_revision_info(revision[0])
1216
t = b.revision_tree(rev_id)
1217
root, ext = os.path.splitext(dest)
1218
if not format:
1219
if ext in (".tar",):
1220
format = "tar"
1221
elif ext in (".gz", ".tgz"):
1222
format = "tgz"
1223
elif ext in (".bz2", ".tbz2"):
1224
format = "tbz2"
1225
else:
1226
format = "dir"
1227
t.export(dest, format, root)
524
rh = b.lookup_revision(int(revno))
525
t = b.revision_tree(rh)
526
t.export(dest)
1228
527
1229
528
1230
529
class cmd_cat(Command):
1236
535
def run(self, filename, revision=None):
1237
536
if revision == None:
1238
537
raise BzrCommandError("bzr cat requires a revision number")
1239
elif len(revision) != 1:
1240
raise BzrCommandError("bzr cat --revision takes exactly one number")
1241
b = find_branch('.')
1242
b.print_file(b.relpath(filename), revision[0])
538
b = Branch('.')
539
b.print_file(b.relpath(filename), int(revision))
1243
540
1244
541
1245
542
class cmd_local_time_offset(Command):
1252
549
1253
550
class cmd_commit(Command):
1254
551
"""Commit changes into a new revision.
1255
1256
If no arguments are given, the entire tree is committed.
1257
1258
If selected files are specified, only changes to those files are
1259
committed. If a directory is specified then the directory and everything
1260
within it is committed.
1261
1262
A selected-file commit may fail in some cases where the committed
1263
tree would be invalid, such as trying to commit a file in a
1264
newly-added directory that is not itself committed.
552
553
TODO: Commit only selected files.
1265
554
1266
555
TODO: Run hooks on tree to-be-committed, and after commit.
1267
556
1268
557
TODO: Strict commit that fails if there are unknown or deleted files.
1269
558
"""
1270
takes_args = ['selected*']
1271
takes_options = ['message', 'file', 'verbose', 'unchanged']
559
takes_options = ['message', 'verbose']
1272
560
aliases = ['ci', 'checkin']
1273
561
1274
# TODO: Give better message for -s, --summary, used by tla people
1275
1276
def run(self, message=None, file=None, verbose=True, selected_list=None,
1277
unchanged=False):
1278
from bzrlib.errors import PointlessCommit
1279
from bzrlib.osutils import get_text_message
1280
1281
## Warning: shadows builtin file()
1282
if not message and not file:
1283
# FIXME: Ugly; change status code to send to a provided function?
1284
1285
import cStringIO
1286
stdout = sys.stdout
1287
catcher = cStringIO.StringIO()
1288
sys.stdout = catcher
1289
cmd_status({"file_list":selected_list}, {})
1290
info = catcher.getvalue()
1291
sys.stdout = stdout
1292
message = get_text_message(info)
1293
1294
if message is None:
1295
raise BzrCommandError("please specify a commit message",
1296
["use either --message or --file"])
1297
elif message and file:
1298
raise BzrCommandError("please specify either --message or --file")
1299
1300
if file:
1301
import codecs
1302
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1303
1304
b = find_branch('.')
1305
if selected_list:
1306
selected_list = [b.relpath(s) for s in selected_list]
1307
1308
try:
1309
b.commit(message, verbose=verbose,
1310
specific_files=selected_list,
1311
allow_pointless=unchanged)
1312
except PointlessCommit:
1313
# FIXME: This should really happen before the file is read in;
1314
# perhaps prepare the commit; get the message; then actually commit
1315
raise BzrCommandError("no changes to commit",
1316
["use --unchanged to commit anyhow"])
562
def run(self, message=None, verbose=False):
563
if not message:
564
raise BzrCommandError("please specify a commit message")
565
Branch('.').commit(message, verbose=verbose)
1317
566
1318
567
1319
568
class cmd_check(Command):
1321
570
1322
571
This command checks various invariants about the branch storage to
1323
572
detect data corruption or bzr bugs.
1324
1325
If given the --update flag, it will update some optional fields
1326
to help ensure data consistency.
1327
"""
1328
takes_args = ['dir?']
1329
1330
def run(self, dir='.'):
1331
from bzrlib.check import check
1332
1333
check(find_branch(dir))
1334
1335
1336
class cmd_scan_cache(Command):
1337
hidden = True
1338
def run(self):
1339
from bzrlib.hashcache import HashCache
1340
import os
1341
1342
c = HashCache('.')
1343
c.read()
1344
c.scan()
1345
1346
print '%6d stats' % c.stat_count
1347
print '%6d in hashcache' % len(c._cache)
1348
print '%6d files removed from cache' % c.removed_count
1349
print '%6d hashes updated' % c.update_count
1350
print '%6d files changed too recently to cache' % c.danger_count
1351
1352
if c.needs_write:
1353
c.write()
1354
1355
1356
1357
class cmd_upgrade(Command):
1358
"""Upgrade branch storage to current format.
1359
1360
The check command or bzr developers may sometimes advise you to run
1361
this command.
1362
"""
1363
takes_args = ['dir?']
1364
1365
def run(self, dir='.'):
1366
from bzrlib.upgrade import upgrade
1367
upgrade(find_branch(dir))
573
"""
574
takes_args = ['dir?']
575
def run(self, dir='.'):
576
import bzrlib.check
577
bzrlib.check.check(Branch(dir, find_root=False))
1368
578
1369
579
1370
580
1373
583
takes_options = ['email']
1374
584
1375
585
def run(self, email=False):
1376
try:
1377
b = bzrlib.branch.find_branch('.')
1378
except:
1379
b = None
1380
1381
586
if email:
1382
print bzrlib.osutils.user_email(b)
587
print bzrlib.osutils.user_email()
1383
588
else:
1384
print bzrlib.osutils.username(b)
589
print bzrlib.osutils.username()
1385
590
1386
591
1387
592
class cmd_selftest(Command):
1388
593
"""Run internal test suite"""
1389
594
hidden = True
1390
takes_options = ['verbose', 'pattern']
1391
def run(self, verbose=False, pattern=".*"):
1392
import bzrlib.ui
1393
from bzrlib.selftest import selftest
1394
# we don't want progress meters from the tests to go to the
1395
# real output; and we don't want log messages cluttering up
1396
# the real logs.
1397
save_ui = bzrlib.ui.ui_factory
1398
bzrlib.trace.info('running tests...')
1399
try:
1400
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1401
result = selftest(verbose=verbose, pattern=pattern)
1402
if result:
1403
bzrlib.trace.info('tests passed')
595
def run(self):
596
failures, tests = 0, 0
597
598
import doctest, bzrlib.store, bzrlib.tests
599
bzrlib.trace.verbose = False
600
601
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
602
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
603
mf, mt = doctest.testmod(m)
604
failures += mf
605
tests += mt
606
print '%-40s %3d tests' % (m.__name__, mt),
607
if mf:
608
print '%3d FAILED!' % mf
1404
609
else:
1405
bzrlib.trace.info('tests failed')
1406
return int(not result)
1407
finally:
1408
bzrlib.ui.ui_factory = save_ui
610
print
611
612
print '%-40s %3d tests' % ('total', tests),
613
if failures:
614
print '%3d FAILED!' % failures
615
else:
616
print
617
1409
618
1410
619
1411
620
class cmd_version(Command):
1412
"""Show version of bzr."""
621
"""Show version of bzr"""
1413
622
def run(self):
1414
623
show_version()
1415
624
1416
625
def show_version():
1417
626
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1418
# is bzrlib itself in a branch?
1419
bzrrev = bzrlib.get_bzr_revision()
1420
if bzrrev:
1421
print " (bzr checkout, revision %d {%s})" % bzrrev
1422
627
print bzrlib.__copyright__
1423
628
print "http://bazaar-ng.org/"
1424
629
print
1433
638
def run(self):
1434
639
print "it sure does!"
1435
640
1436
def parse_spec(spec):
1437
"""
1438
>>> parse_spec(None)
1439
[None, None]
1440
>>> parse_spec("./")
1441
['./', None]
1442
>>> parse_spec("../@")
1443
['..', -1]
1444
>>> parse_spec("../f/@35")
1445
['../f', 35]
1446
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1447
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1448
"""
1449
if spec is None:
1450
return [None, None]
1451
if '/@' in spec:
1452
parsed = spec.split('/@')
1453
assert len(parsed) == 2
1454
if parsed[1] == "":
1455
parsed[1] = -1
1456
else:
1457
try:
1458
parsed[1] = int(parsed[1])
1459
except ValueError:
1460
pass # We can allow stuff like ./@revid:blahblahblah
1461
else:
1462
assert parsed[1] >=0
1463
else:
1464
parsed = [spec, None]
1465
return parsed
1466
1467
1468
1469
class cmd_find_merge_base(Command):
1470
"""Find and print a base revision for merging two branches.
1471
1472
TODO: Options to specify revisions on either side, as if
1473
merging only part of the history.
1474
"""
1475
takes_args = ['branch', 'other']
1476
hidden = True
1477
1478
def run(self, branch, other):
1479
branch1 = find_branch(branch)
1480
branch2 = find_branch(other)
1481
1482
base_revno, base_revid = branch1.common_ancestor(branch2)
1483
1484
if base_revno is None:
1485
raise bzrlib.errors.UnrelatedBranches()
1486
1487
print 'merge base is revision %s' % base_revid
1488
print ' r%-6d in %s' % (base_revno, branch)
1489
1490
other_revno = branch2.revision_id_to_revno(base_revid)
1491
1492
print ' r%-6d in %s' % (other_revno, other)
1493
1494
1495
1496
class cmd_merge(Command):
1497
"""Perform a three-way merge.
1498
1499
The branch is the branch you will merge from. By default, it will merge
1500
the latest revision. If you specify a revision, that revision will be
1501
merged. If you specify two revisions, the first will be used as a BASE,
1502
and the second one as OTHER. Revision numbers are always relative to the
1503
specified branch.
1504
1505
Examples:
1506
1507
To merge the latest revision from bzr.dev
1508
bzr merge ../bzr.dev
1509
1510
To merge changes up to and including revision 82 from bzr.dev
1511
bzr merge -r 82 ../bzr.dev
1512
1513
To merge the changes introduced by 82, without previous changes:
1514
bzr merge -r 81..82 ../bzr.dev
1515
1516
merge refuses to run if there are any uncommitted changes, unless
1517
--force is given.
1518
"""
1519
takes_args = ['branch?']
1520
takes_options = ['revision', 'force', 'merge-type']
1521
1522
def run(self, branch='.', revision=None, force=False,
1523
merge_type=None):
1524
from bzrlib.merge import merge
1525
from bzrlib.merge_core import ApplyMerge3
1526
if merge_type is None:
1527
merge_type = ApplyMerge3
1528
1529
if revision is None or len(revision) < 1:
1530
base = [None, None]
1531
other = (branch, -1)
1532
else:
1533
if len(revision) == 1:
1534
other = (branch, revision[0])
1535
base = (None, None)
1536
else:
1537
assert len(revision) == 2
1538
if None in revision:
1539
raise BzrCommandError(
1540
"Merge doesn't permit that revision specifier.")
1541
base = (branch, revision[0])
1542
other = (branch, revision[1])
1543
1544
merge(other, base, check_clean=(not force), merge_type=merge_type)
1545
1546
1547
class cmd_revert(Command):
1548
"""Reverse all changes since the last commit.
1549
1550
Only versioned files are affected. Specify filenames to revert only
1551
those files. By default, any files that are changed will be backed up
1552
first. Backup files have a '~' appended to their name.
1553
"""
1554
takes_options = ['revision', 'no-backup']
1555
takes_args = ['file*']
1556
aliases = ['merge-revert']
1557
1558
def run(self, revision=None, no_backup=False, file_list=None):
1559
from bzrlib.merge import merge
1560
from bzrlib.branch import Branch
1561
if file_list is not None:
1562
if len(file_list) == 0:
1563
raise BzrCommandError("No files specified")
1564
if revision is None:
1565
revision = [-1]
1566
elif len(revision) != 1:
1567
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1568
merge(('.', revision[0]), parse_spec('.'),
1569
check_clean=False,
1570
ignore_zero=True,
1571
backup_files=not no_backup,
1572
file_list=file_list)
1573
if not file_list:
1574
Branch('.').set_pending_merges([])
1575
1576
641
1577
642
class cmd_assert_fail(Command):
1578
643
"""Test reporting of assertion failures"""
1585
650
"""Show help on a command or other topic.
1586
651
1587
652
For a list of all available commands, say 'bzr help commands'."""
1588
takes_options = ['long']
1589
653
takes_args = ['topic?']
1590
654
aliases = ['?']
1591
655
1592
def run(self, topic=None, long=False):
656
def run(self, topic=None):
1593
657
import help
1594
if topic is None and long:
1595
topic = "commands"
1596
658
help.help(topic)
1597
659
1598
660
1599
class cmd_shell_complete(Command):
1600
"""Show appropriate completions for context.
1601
1602
For a list of all available commands, say 'bzr shell-complete'."""
1603
takes_args = ['context?']
1604
aliases = ['s-c']
1605
hidden = True
1606
1607
def run(self, context=None):
1608
import shellcomplete
1609
shellcomplete.shellcomplete(context)
1610
1611
1612
class cmd_missing(Command):
1613
"""What is missing in this branch relative to other branch.
1614
"""
1615
takes_args = ['remote?']
1616
aliases = ['mis', 'miss']
1617
# We don't have to add quiet to the list, because
1618
# unknown options are parsed as booleans
1619
takes_options = ['verbose', 'quiet']
1620
1621
def run(self, remote=None, verbose=False, quiet=False):
1622
from bzrlib.branch import find_branch, DivergedBranches
1623
from bzrlib.errors import BzrCommandError
1624
from bzrlib.missing import get_parent, show_missing
1625
1626
if verbose and quiet:
1627
raise BzrCommandError('Cannot pass both quiet and verbose')
1628
1629
b = find_branch('.')
1630
parent = get_parent(b)
1631
if remote is None:
1632
if parent is None:
1633
raise BzrCommandError("No missing location known or specified.")
1634
else:
1635
if not quiet:
1636
print "Using last location: %s" % parent
1637
remote = parent
1638
elif parent is None:
1639
# We only update x-pull if it did not exist, missing should not change the parent
1640
b.controlfile('x-pull', 'wb').write(remote + '\n')
1641
br_remote = find_branch(remote)
1642
1643
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1644
1645
1646
1647
class cmd_plugins(Command):
1648
"""List plugins"""
1649
hidden = True
1650
def run(self):
1651
import bzrlib.plugin
1652
from inspect import getdoc
1653
from pprint import pprint
1654
for plugin in bzrlib.plugin.all_plugins:
1655
if hasattr(plugin, '__path__'):
1656
print plugin.__path__[0]
1657
else:
1658
print `plugin`
1659
d = getdoc(plugin)
1660
if d:
1661
print '\t', d.split('\n')[0]
1662
1663
#pprint(bzrlib.plugin.all_plugins)
1664
661
######################################################################
662
# main routine
1665
663
1666
664
1667
665
# list of all available options; the rhs can be either None for an
1669
667
# the type.
1670
668
OPTIONS = {
1671
669
'all': None,
1672
'diff-options': str,
1673
670
'help': None,
1674
'file': unicode,
1675
'force': None,
1676
'format': unicode,
1677
'forward': None,
1678
671
'message': unicode,
1679
'no-recurse': None,
1680
672
'profile': None,
1681
'revision': _parse_revision_str,
1682
'short': None,
673
'revision': int,
1683
674
'show-ids': None,
1684
675
'timezone': str,
1685
676
'verbose': None,
1686
677
'version': None,
1687
678
'email': None,
1688
'unchanged': None,
1689
'update': None,
1690
'long': None,
1691
'root': str,
1692
'no-backup': None,
1693
'merge-type': get_merge_type,
1694
'pattern': str,
1695
679
}
1696
680
1697
681
SHORT_OPTIONS = {
1698
'F': 'file',
1699
'h': 'help',
1700
682
'm': 'message',
1701
683
'r': 'revision',
1702
684
'v': 'verbose',
1703
'l': 'long',
1704
685
}
1705
686
1706
687
1720
701
(['status'], {'all': True})
1721
702
>>> parse_args('commit --message=biter'.split())
1722
703
(['commit'], {'message': u'biter'})
1723
>>> parse_args('log -r 500'.split())
1724
(['log'], {'revision': [500]})
1725
>>> parse_args('log -r500..600'.split())
1726
(['log'], {'revision': [500, 600]})
1727
>>> parse_args('log -vr500..600'.split())
1728
(['log'], {'verbose': True, 'revision': [500, 600]})
1729
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1730
(['log'], {'revision': ['v500', 600]})
1731
704
"""
1732
705
args = []
1733
706
opts = {}
1747
720
else:
1748
721
optname = a[2:]
1749
722
if optname not in OPTIONS:
1750
raise BzrError('unknown long option %r' % a)
723
bailout('unknown long option %r' % a)
1751
724
else:
1752
725
shortopt = a[1:]
1753
if shortopt in SHORT_OPTIONS:
1754
# Multi-character options must have a space to delimit
1755
# their value
1756
optname = SHORT_OPTIONS[shortopt]
1757
else:
1758
# Single character short options, can be chained,
1759
# and have their value appended to their name
1760
shortopt = a[1:2]
1761
if shortopt not in SHORT_OPTIONS:
1762
# We didn't find the multi-character name, and we
1763
# didn't find the single char name
1764
raise BzrError('unknown short option %r' % a)
1765
optname = SHORT_OPTIONS[shortopt]
1766
1767
if a[2:]:
1768
# There are extra things on this option
1769
# see if it is the value, or if it is another
1770
# short option
1771
optargfn = OPTIONS[optname]
1772
if optargfn is None:
1773
# This option does not take an argument, so the
1774
# next entry is another short option, pack it back
1775
# into the list
1776
argv.insert(0, '-' + a[2:])
1777
else:
1778
# This option takes an argument, so pack it
1779
# into the array
1780
optarg = a[2:]
726
if shortopt not in SHORT_OPTIONS:
727
bailout('unknown short option %r' % a)
728
optname = SHORT_OPTIONS[shortopt]
1781
729
1782
730
if optname in opts:
1783
731
# XXX: Do we ever want to support this, e.g. for -r?
1784
raise BzrError('repeated option %r' % a)
732
bailout('repeated option %r' % a)
1785
733
1786
734
optargfn = OPTIONS[optname]
1787
735
if optargfn:
1788
736
if optarg == None:
1789
737
if not argv:
1790
raise BzrError('option %r needs an argument' % a)
738
bailout('option %r needs an argument' % a)
1791
739
else:
1792
740
optarg = argv.pop(0)
1793
741
opts[optname] = optargfn(optarg)
1794
742
else:
1795
743
if optarg != None:
1796
raise BzrError('option %r takes no argument' % optname)
744
bailout('option %r takes no argument' % optname)
1797
745
opts[optname] = True
1798
746
else:
1799
747
args.append(a)
1853
801
1854
802
This is similar to main(), but without all the trappings for
1855
803
logging and error handling.
1856
1857
argv
1858
The command-line arguments, without the program name from argv[0]
1859
1860
Returns a command status or raises an exception.
1861
1862
Special master options: these must come before the command because
1863
they control how the command is interpreted.
1864
1865
--no-plugins
1866
Do not load plugin modules at all
1867
1868
--builtin
1869
Only use builtin commands. (Plugins are still allowed to change
1870
other behaviour.)
1871
1872
--profile
1873
Run under the Python profiler.
1874
804
"""
1875
1876
805
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1877
1878
opt_profile = opt_no_plugins = opt_builtin = False
1879
1880
# --no-plugins is handled specially at a very early stage. We need
1881
# to load plugins before doing other command parsing so that they
1882
# can override commands, but this needs to happen first.
1883
1884
for a in argv[:]:
1885
if a == '--profile':
1886
opt_profile = True
1887
elif a == '--no-plugins':
1888
opt_no_plugins = True
1889
elif a == '--builtin':
1890
opt_builtin = True
1891
else:
1892
break
1893
argv.remove(a)
1894
1895
if not opt_no_plugins:
1896
from bzrlib.plugin import load_plugins
1897
load_plugins()
1898
1899
args, opts = parse_args(argv)
1900
1901
if 'help' in opts:
1902
from bzrlib.help import help
1903
if args:
1904
help(args[0])
1905
else:
1906
help()
1907
return 0
1908
1909
if 'version' in opts:
1910
show_version()
1911
return 0
1912
1913
if not args:
1914
from bzrlib.help import help
1915
help(None)
1916
return 0
1917
1918
cmd = str(args.pop(0))
1919
1920
canonical_cmd, cmd_class = \
1921
get_cmd_class(cmd, plugins_override=not opt_builtin)
806
807
try:
808
args, opts = parse_args(argv[1:])
809
if 'help' in opts:
810
import help
811
if args:
812
help.help(args[0])
813
else:
814
help.help()
815
return 0
816
elif 'version' in opts:
817
show_version()
818
return 0
819
cmd = str(args.pop(0))
820
except IndexError:
821
log_error('usage: bzr COMMAND')
822
log_error(' try "bzr help"')
823
return 1
824
825
canonical_cmd, cmd_class = get_cmd_class(cmd)
826
827
# global option
828
if 'profile' in opts:
829
profile = True
830
del opts['profile']
831
else:
832
profile = False
1922
833
1923
834
# check options are reasonable
1924
835
allowed = cmd_class.takes_options
1925
836
for oname in opts:
1926
837
if oname not in allowed:
1927
raise BzrCommandError("option '--%s' is not allowed for command %r"
838
raise BzrCommandError("option %r is not allowed for command %r"
1928
839
% (oname, cmd))
1929
840
1930
841
# mix arguments and options into one dictionary
1933
844
for k, v in opts.items():
1934
845
cmdopts[k.replace('-', '_')] = v
1935
846
1936
if opt_profile:
847
if profile:
1937
848
import hotshot, tempfile
1938
849
pffileno, pfname = tempfile.mkstemp()
1939
850
try:
1955
866
os.close(pffileno)
1956
867
os.remove(pfname)
1957
868
else:
1958
return cmd_class(cmdopts, cmdargs).status
869
cmdobj = cmd_class(cmdopts, cmdargs).status
870
871
872
def _report_exception(summary, quiet=False):
873
import traceback
874
log_error('bzr: ' + summary)
875
bzrlib.trace.log_exception()
876
877
if not quiet:
878
tb = sys.exc_info()[2]
879
exinfo = traceback.extract_tb(tb)
880
if exinfo:
881
sys.stderr.write(' at %s:%d in %s()\n' % exinfo[-1][:3])
882
sys.stderr.write(' see ~/.bzr.log for debug information\n')
883
1959
884
1960
885
1961
886
def main(argv):
1962
import bzrlib.ui
1963
bzrlib.trace.log_startup(argv)
1964
bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
887
import errno
888
889
bzrlib.open_tracefile(argv)
1965
890
1966
891
try:
1967
892
try:
1968
return run_bzr(argv[1:])
1969
finally:
1970
# do this here inside the exception wrappers to catch EPIPE
1971
sys.stdout.flush()
1972
except BzrCommandError, e:
1973
# command line syntax error, etc
1974
log_error(str(e))
1975
return 1
1976
except BzrError, e:
1977
bzrlib.trace.log_exception()
1978
return 1
1979
except AssertionError, e:
1980
bzrlib.trace.log_exception('assertion failed: ' + str(e))
1981
return 3
1982
except KeyboardInterrupt, e:
1983
bzrlib.trace.note('interrupted')
1984
return 2
1985
except Exception, e:
1986
import errno
1987
if (isinstance(e, IOError)
1988
and hasattr(e, 'errno')
1989
and e.errno == errno.EPIPE):
1990
bzrlib.trace.note('broken pipe')
1991
return 2
1992
else:
1993
bzrlib.trace.log_exception()
1994
return 2
893
try:
894
return run_bzr(argv)
895
finally:
896
# do this here inside the exception wrappers to catch EPIPE
897
sys.stdout.flush()
898
except BzrError, e:
899
quiet = isinstance(e, (BzrCommandError))
900
_report_exception('error: ' + e.args[0], quiet=quiet)
901
if len(e.args) > 1:
902
for h in e.args[1]:
903
# some explanation or hints
904
log_error(' ' + h)
905
return 1
906
except AssertionError, e:
907
msg = 'assertion failed'
908
if str(e):
909
msg += ': ' + str(e)
910
_report_exception(msg)
911
return 2
912
except KeyboardInterrupt, e:
913
_report_exception('interrupted', quiet=True)
914
return 2
915
except Exception, e:
916
quiet = False
917
if isinstance(e, IOError) and e.errno == errno.EPIPE:
918
quiet = True
919
msg = 'broken pipe'
920
else:
921
msg = str(e).rstrip('\n')
922
_report_exception(msg, quiet)
923
return 2
924
finally:
925
bzrlib.trace.close_trace()
1995
926
1996
927
1997
928
if __name__ == '__main__':
Loggerhead is a web-based interface for Breezy
Version: 2.0.1