« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 647
- compare with another revision
- download diff
- download tarball
- view history from revision 647
- Committer: Martin Pool
- Date: 2005-06-10 06:34:26 UTC
- Revision ID: mbp@sourcefrog.net-20050610063426-cfcf5c0f96c271ec
- split out updated progress indicator
- 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):
71
def _find_plugins():
72
"""Find all python files which are plugins, and load their commands
73
to add to the list of "all commands"
74
75
The environment variable BZRPATH is considered a delimited set of
76
paths to look through. Each entry is searched for *.py files.
77
If a directory is found, it is also searched, but they are
78
not searched recursively. This allows you to revctl the plugins.
79
80
Inside the plugin should be a series of cmd_* function, which inherit from
81
the bzrlib.commands.Command class.
82
"""
83
bzrpath = os.environ.get('BZRPLUGINPATH', '')
84
85
plugin_cmds = {}
86
if not bzrpath:
87
return plugin_cmds
88
_platform_extensions = {
89
'win32':'.pyd',
90
'cygwin':'.dll',
91
'darwin':'.dylib',
92
'linux2':'.so'
93
}
94
if _platform_extensions.has_key(sys.platform):
95
platform_extension = _platform_extensions[sys.platform]
96
else:
97
platform_extension = None
98
for d in bzrpath.split(os.pathsep):
99
plugin_names = {} # This should really be a set rather than a dict
100
for f in os.listdir(d):
101
if f.endswith('.py'):
102
f = f[:-3]
103
elif f.endswith('.pyc') or f.endswith('.pyo'):
104
f = f[:-4]
105
elif platform_extension and f.endswith(platform_extension):
106
f = f[:-len(platform_extension)]
107
if f.endswidth('module'):
108
f = f[:-len('module')]
109
else:
110
continue
111
if not plugin_names.has_key(f):
112
plugin_names[f] = True
113
114
plugin_names = plugin_names.keys()
115
plugin_names.sort()
116
try:
117
sys.path.insert(0, d)
118
for name in plugin_names:
119
try:
120
old_module = None
121
try:
122
if sys.modules.has_key(name):
123
old_module = sys.modules[name]
124
del sys.modules[name]
125
plugin = __import__(name, locals())
126
for k in dir(plugin):
127
if k.startswith('cmd_'):
128
k_unsquished = _unsquish_command_name(k)
129
if not plugin_cmds.has_key(k_unsquished):
130
plugin_cmds[k_unsquished] = getattr(plugin, k)
131
else:
132
log_error('Two plugins defined the same command: %r' % k)
133
log_error('Not loading the one in %r in dir %r' % (name, d))
134
finally:
135
if old_module:
136
sys.modules[name] = old_module
137
except ImportError, e:
138
log_error('Unable to load plugin: %r from %r\n%s' % (name, d, e))
139
finally:
140
sys.path.pop(0)
141
return plugin_cmds
142
143
def _get_cmd_dict(include_plugins=True):
160
144
d = {}
161
145
for k, v in globals().iteritems():
162
146
if k.startswith("cmd_"):
163
147
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
148
if include_plugins:
149
d.update(_find_plugins())
171
150
return d
172
173
151
174
def get_all_cmds(plugins_override=True):
152
def get_all_cmds(include_plugins=True):
175
153
"""Return canonical name and class for all registered commands."""
176
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
154
for k, v in _get_cmd_dict(include_plugins=include_plugins).iteritems():
177
155
yield k,v
178
156
179
157
180
def get_cmd_class(cmd, plugins_override=True):
158
def get_cmd_class(cmd,include_plugins=True):
181
159
"""Return the canonical name and command class for a command.
182
160
"""
183
161
cmd = str(cmd) # not unicode
184
162
185
163
# first look up this command under the specified name
186
cmds = _get_cmd_dict(plugins_override=plugins_override)
164
cmds = _get_cmd_dict(include_plugins=include_plugins)
187
165
try:
188
166
return cmd, cmds[cmd]
189
167
except KeyError:
233
211
assert isinstance(arguments, dict)
234
212
cmdargs = options.copy()
235
213
cmdargs.update(arguments)
236
if self.__doc__ == Command.__doc__:
237
from warnings import warn
238
warn("No help message set for %r" % self)
214
assert self.__doc__ != Command.__doc__, \
215
("No help message set for %r" % self)
239
216
self.status = self.run(**cmdargs)
240
if self.status is None:
241
self.status = 0
242
217
243
218
244
219
def run(self):
256
231
class ExternalCommand(Command):
257
232
"""Class to wrap external commands.
258
233
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.
234
We cheat a little here, when get_cmd_class() calls us we actually give it back
235
an object we construct that has the appropriate path, help, options etc for the
236
specified command.
237
238
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
239
method, which we override to call the Command.__init__ method. That then calls
240
our run method which is pretty straight forward.
241
242
The only wrinkle is that we have to map bzr's dictionary of options and arguments
243
back into command line options and arguments for the script.
271
244
"""
272
245
273
246
def find_command(cls, cmd):
286
259
def __init__(self, path):
287
260
self.path = path
288
261
262
# TODO: If either of these fail, we should detect that and
263
# assume that path is not really a bzr plugin after all.
264
289
265
pipe = os.popen('%s --bzr-usage' % path, 'r')
290
266
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
267
self.takes_args = pipe.readline().split()
299
300
if pipe.close() is not None:
301
raise BzrError("Failed funning '%s --bzr-usage'" % path)
268
pipe.close()
302
269
303
270
pipe = os.popen('%s --bzr-help' % path, 'r')
304
271
self.__doc__ = pipe.read()
305
if pipe.close() is not None:
306
raise BzrError("Failed funning '%s --bzr-help'" % path)
272
pipe.close()
307
273
308
274
def __call__(self, options, arguments):
309
275
Command.__init__(self, options, arguments)
316
282
keys = kargs.keys()
317
283
keys.sort()
318
284
for name in keys:
319
optname = name.replace('_','-')
320
285
value = kargs[name]
321
if OPTIONS.has_key(optname):
286
if OPTIONS.has_key(name):
322
287
# it's an option
323
opts.append('--%s' % optname)
288
opts.append('--%s' % name)
324
289
if value is not None and value is not True:
325
290
opts.append(str(value))
326
291
else:
370
335
directory is shown. Otherwise, only the status of the specified
371
336
files or directories is reported. If a directory is given, status
372
337
is reported for everything inside that directory.
373
374
If a revision is specified, the changes since that revision are shown.
375
338
"""
376
339
takes_args = ['file*']
377
takes_options = ['all', 'show-ids', 'revision']
340
takes_options = ['all', 'show-ids']
378
341
aliases = ['st', 'stat']
379
342
380
343
def run(self, all=False, show_ids=False, file_list=None):
381
344
if file_list:
382
b = find_branch(file_list[0])
345
b = Branch(file_list[0])
383
346
file_list = [b.relpath(x) for x in file_list]
384
347
# special case: only one path was given and it's the root
385
348
# of the branch
386
349
if file_list == ['']:
387
350
file_list = None
388
351
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)
352
b = Branch('.')
353
import status
354
status.show_status(b, show_unchanged=all, show_ids=show_ids,
355
specific_files=file_list)
394
356
395
357
396
358
class cmd_cat_revision(Command):
400
362
takes_args = ['revision_id']
401
363
402
364
def run(self, revision_id):
403
from bzrlib.xml import pack_xml
404
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
365
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
405
366
406
367
407
368
class cmd_revno(Command):
409
370
410
371
This is equal to the number of revisions on this branch."""
411
372
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)
373
print Branch('.').revno()
435
374
436
375
437
376
class cmd_add(Command):
447
386
whether already versioned or not, are searched for files or
448
387
subdirectories that are neither versioned or ignored, and these
449
388
are added. This search proceeds recursively into versioned
450
directories. If no names are given '.' is assumed.
389
directories.
451
390
452
Therefore simply saying 'bzr add' will version all files that
391
Therefore simply saying 'bzr add .' will version all files that
453
392
are currently unknown.
454
393
455
394
TODO: Perhaps adding a file whose directly is not versioned should
456
395
recursively add that parent, rather than giving an error?
457
396
"""
458
takes_args = ['file*']
397
takes_args = ['file+']
459
398
takes_options = ['verbose', 'no-recurse']
460
399
461
400
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)
401
bzrlib.add.smart_add(file_list, verbose, not no_recurse)
482
402
483
403
484
404
class cmd_relpath(Command):
487
407
hidden = True
488
408
489
409
def run(self, filename):
490
print find_branch(filename).relpath(filename)
410
print Branch(filename).relpath(filename)
491
411
492
412
493
413
496
416
takes_options = ['revision', 'show-ids']
497
417
498
418
def run(self, revision=None, show_ids=False):
499
b = find_branch('.')
419
b = Branch('.')
500
420
if revision == None:
501
421
inv = b.read_working_inventory()
502
422
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]))
423
inv = b.get_revision_inventory(b.lookup_revision(revision))
507
424
508
425
for path, entry in inv.entries():
509
426
if show_ids:
522
439
"""
523
440
takes_args = ['source$', 'dest']
524
441
def run(self, source_list, dest):
525
b = find_branch('.')
442
b = Branch('.')
526
443
527
# TODO: glob expansion on windows?
528
444
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
529
445
530
446
545
461
takes_args = ['from_name', 'to_name']
546
462
547
463
def run(self, from_name, to_name):
548
b = find_branch('.')
464
b = Branch('.')
549
465
b.rename_one(b.relpath(from_name), b.relpath(to_name))
550
466
551
467
552
468
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
469
585
470
586
471
class cmd_pull(Command):
601
486
602
487
def run(self, location=None):
603
488
from bzrlib.merge import merge
604
import tempfile
605
from shutil import rmtree
606
489
import errno
607
490
608
br_to = find_branch('.')
491
br_to = Branch('.')
609
492
stored_loc = None
610
493
try:
611
494
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
612
495
except IOError, e:
613
if e.errno != errno.ENOENT:
496
if errno == errno.ENOENT:
614
497
raise
615
498
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
499
location = stored_loc
500
if location is None:
501
raise BzrCommandError("No pull location known or specified.")
502
from branch import find_branch, DivergedBranches
623
503
br_from = find_branch(location)
624
504
location = pull_loc(br_from)
625
505
old_revno = br_to.revno()
626
506
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)
507
br_to.update_revisions(br_from)
508
except DivergedBranches:
509
raise BzrCommandError("These branches have diverged. Try merge.")
510
511
merge(('.', -1), ('.', old_revno), check_clean=False)
512
if location != stored_loc:
513
br_to.controlfile("x-pull", "wb").write(location + "\n")
642
514
643
515
644
516
645
517
class cmd_branch(Command):
646
518
"""Create a new copy of a branch.
647
519
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".
520
If the TO_LOCATION is omitted, the last component of the
521
FROM_LOCATION will be used. In other words,
522
"branch ../foo/bar" will attempt to create ./bar.
653
523
"""
654
524
takes_args = ['from_location', 'to_location?']
655
takes_options = ['revision']
656
aliases = ['get', 'clone']
657
525
658
def run(self, from_location, to_location=None, revision=None):
526
def run(self, from_location, to_location=None):
659
527
import errno
660
528
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)
529
530
if to_location is None:
531
to_location = os.path.basename(from_location)
532
# FIXME: If there's a trailing slash, keep removing them
533
# until we find the right bit
534
535
try:
536
os.mkdir(to_location)
537
except OSError, e:
538
if e.errno == errno.EEXIST:
539
raise BzrCommandError('Target directory "%s" already exists.' %
540
to_location)
541
if e.errno == errno.ENOENT:
542
raise BzrCommandError('Parent of "%s" does not exist.' %
543
to_location)
544
else:
545
raise
546
br_to = Branch(to_location, init=True)
547
from branch import find_branch, DivergedBranches
548
try:
549
br_from = find_branch(from_location)
550
except OSError, e:
551
if e.errno == errno.ENOENT:
552
raise BzrCommandError('Source location "%s" does not exist.' %
553
to_location)
554
else:
555
raise
556
557
from_location = pull_loc(br_from)
558
br_to.update_revisions(br_from)
559
merge((to_location, -1), (to_location, 0), this_dir=to_location,
560
check_clean=False)
561
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
720
562
721
563
722
564
def pull_loc(branch):
739
581
takes_args = ['dir?']
740
582
741
583
def run(self, dir='.'):
742
b = find_branch(dir)
584
b = Branch(dir)
743
585
old_inv = b.basis_tree().inventory
744
586
new_inv = b.read_working_inventory()
745
587
756
598
def run(self, branch=None):
757
599
import info
758
600
601
from branch import find_branch
759
602
b = find_branch(branch)
760
603
info.show_info(b)
761
604
770
613
takes_options = ['verbose']
771
614
772
615
def run(self, file_list, verbose=False):
773
b = find_branch(file_list[0])
616
b = Branch(file_list[0])
774
617
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
775
618
776
619
784
627
hidden = True
785
628
takes_args = ['filename']
786
629
def run(self, filename):
787
b = find_branch(filename)
630
b = Branch(filename)
788
631
i = b.inventory.path2id(b.relpath(filename))
789
632
if i == None:
790
raise BzrError("%r is not a versioned file" % filename)
633
bailout("%r is not a versioned file" % filename)
791
634
else:
792
635
print i
793
636
800
643
hidden = True
801
644
takes_args = ['filename']
802
645
def run(self, filename):
803
b = find_branch(filename)
646
b = Branch(filename)
804
647
inv = b.inventory
805
648
fid = inv.path2id(b.relpath(filename))
806
649
if fid == None:
807
raise BzrError("%r is not a versioned file" % filename)
650
bailout("%r is not a versioned file" % filename)
808
651
for fip in inv.get_idpath(fid):
809
652
print fip
810
653
813
656
"""Display list of revision ids on this branch."""
814
657
hidden = True
815
658
def run(self):
816
for patchid in find_branch('.').revision_history():
659
for patchid in Branch('.').revision_history():
817
660
print patchid
818
661
819
662
820
663
class cmd_directories(Command):
821
664
"""Display list of versioned directories in this branch."""
822
665
def run(self):
823
for name, ie in find_branch('.').read_working_inventory().directories():
666
for name, ie in Branch('.').read_working_inventory().directories():
824
667
if name == '':
825
668
print '.'
826
669
else:
841
684
bzr commit -m 'imported project'
842
685
"""
843
686
def run(self):
844
from bzrlib.branch import Branch
845
687
Branch('.', init=True)
846
688
847
689
851
693
If files are listed, only the changes in those files are listed.
852
694
Otherwise, all changes for the tree are listed.
853
695
696
TODO: Given two revision arguments, show the difference between them.
697
854
698
TODO: Allow diff across branches.
855
699
856
700
TODO: Option to use external diff command; could be GNU diff, wdiff,
865
709
deleted files.
866
710
867
711
TODO: This probably handles non-Unix newlines poorly.
868
869
examples:
870
bzr diff
871
bzr diff -r1
872
bzr diff -r1:2
873
712
"""
874
713
875
714
takes_args = ['file*']
878
717
879
718
def run(self, revision=None, file_list=None, diff_options=None):
880
719
from bzrlib.diff import show_diff
720
from bzrlib import find_branch
881
721
882
722
if file_list:
883
723
b = find_branch(file_list[0])
886
726
# just pointing to top-of-tree
887
727
file_list = None
888
728
else:
889
b = find_branch('.')
729
b = Branch('.')
730
731
show_diff(b, revision, specific_files=file_list,
732
external_diff_options=diff_options)
890
733
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
734
905
735
906
736
911
741
TODO: Show files deleted since a previous revision, or between two revisions.
912
742
"""
913
743
def run(self, show_ids=False):
914
b = find_branch('.')
744
b = Branch('.')
915
745
old = b.basis_tree()
916
746
new = b.working_tree()
917
747
932
762
"""List files modified in working tree."""
933
763
hidden = True
934
764
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
765
import statcache
766
b = Branch('.')
767
inv = b.read_working_inventory()
768
sc = statcache.update_cache(b, inv)
769
basis = b.basis_tree()
770
basis_inv = basis.inventory
771
772
# We used to do this through iter_entries(), but that's slow
773
# when most of the files are unmodified, as is usually the
774
# case. So instead we iterate by inventory entry, and only
775
# calculate paths as necessary.
776
777
for file_id in basis_inv:
778
cacheentry = sc.get(file_id)
779
if not cacheentry: # deleted
780
continue
781
ie = basis_inv[file_id]
782
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
783
path = inv.id2path(file_id)
784
print path
942
785
943
786
944
787
946
789
"""List files added in working tree."""
947
790
hidden = True
948
791
def run(self):
949
b = find_branch('.')
792
b = Branch('.')
950
793
wt = b.working_tree()
951
794
basis_inv = b.basis_tree().inventory
952
795
inv = wt.inventory
968
811
takes_args = ['filename?']
969
812
def run(self, filename=None):
970
813
"""Print the branch root."""
814
from branch import find_branch
971
815
b = find_branch(filename)
972
816
print getattr(b, 'base', None) or getattr(b, 'baseurl')
973
817
979
823
-r revision requests a specific revision, -r :end or -r begin: are
980
824
also valid.
981
825
982
--message allows you to give a regular expression, which will be evaluated
983
so that only matching entries will be displayed.
984
985
826
TODO: Make --revision support uuid: and hash: [future tag:] notation.
986
827
987
828
"""
988
829
989
830
takes_args = ['filename?']
990
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
991
'long', 'message', 'short',]
831
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']
992
832
993
833
def run(self, filename=None, timezone='original',
994
834
verbose=False,
995
835
show_ids=False,
996
836
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
837
revision=None):
838
from bzrlib import show_log, find_branch
1003
839
import codecs
1004
840
1005
841
direction = (forward and 'forward') or 'reverse'
1015
851
b = find_branch('.')
1016
852
file_id = None
1017
853
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]
854
if revision == None:
855
revision = [None, None]
856
elif isinstance(revision, int):
857
revision = [revision, revision]
1026
858
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
859
# pair of revisions?
860
pass
861
862
assert len(revision) == 2
1033
863
1034
864
mutter('encoding log as %r' % bzrlib.user_encoding)
1035
865
1037
867
# in e.g. the default C locale.
1038
868
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1039
869
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,
870
show_log(b, file_id,
871
show_timezone=timezone,
1052
872
verbose=verbose,
873
show_ids=show_ids,
874
to_file=outf,
1053
875
direction=direction,
1054
start_revision=rev1,
1055
end_revision=rev2,
1056
search=message)
876
start_revision=revision[0],
877
end_revision=revision[1])
1057
878
1058
879
1059
880
1064
885
hidden = True
1065
886
takes_args = ["filename"]
1066
887
def run(self, filename):
1067
b = find_branch(filename)
888
b = Branch(filename)
1068
889
inv = b.read_working_inventory()
1069
890
file_id = inv.path2id(b.relpath(filename))
1070
891
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1078
899
"""
1079
900
hidden = True
1080
901
def run(self, revision=None, verbose=False):
1081
b = find_branch('.')
902
b = Branch('.')
1082
903
if revision == None:
1083
904
tree = b.working_tree()
1084
905
else:
1102
923
class cmd_unknowns(Command):
1103
924
"""List unknown files."""
1104
925
def run(self):
1105
from bzrlib.osutils import quotefn
1106
for f in find_branch('.').unknowns():
926
for f in Branch('.').unknowns():
1107
927
print quotefn(f)
1108
928
1109
929
1131
951
from bzrlib.atomicfile import AtomicFile
1132
952
import os.path
1133
953
1134
b = find_branch('.')
954
b = Branch('.')
1135
955
ifn = b.abspath('.bzrignore')
1136
956
1137
957
if os.path.exists(ifn):
1171
991
1172
992
See also: bzr ignore"""
1173
993
def run(self):
1174
tree = find_branch('.').working_tree()
994
tree = Branch('.').working_tree()
1175
995
for path, file_class, kind, file_id in tree.list_files():
1176
996
if file_class != 'I':
1177
997
continue
1195
1015
except ValueError:
1196
1016
raise BzrCommandError("not a valid revision-number: %r" % revno)
1197
1017
1198
print find_branch('.').lookup_revision(revno)
1018
print Branch('.').lookup_revision(revno)
1199
1019
1200
1020
1201
1021
class cmd_export(Command):
1202
1022
"""Export past revision to destination directory.
1203
1023
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
1024
If no revision is specified this exports the last committed revision."""
1213
1025
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()
1026
takes_options = ['revision']
1027
def run(self, dest, revision=None):
1028
b = Branch('.')
1029
if revision == None:
1030
rh = b.revision_history()[-1]
1220
1031
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)
1032
rh = b.lookup_revision(int(revision))
1033
t = b.revision_tree(rh)
1034
t.export(dest)
1236
1035
1237
1036
1238
1037
class cmd_cat(Command):
1244
1043
def run(self, filename, revision=None):
1245
1044
if revision == None:
1246
1045
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])
1046
b = Branch('.')
1047
b.print_file(b.relpath(filename), int(revision))
1251
1048
1252
1049
1253
1050
class cmd_local_time_offset(Command):
1260
1057
1261
1058
class cmd_commit(Command):
1262
1059
"""Commit changes into a new revision.
1263
1264
If no arguments are given, the entire tree is committed.
1265
1060
1266
1061
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.
1062
committed. If a directory is specified then its contents are also
1063
committed.
1269
1064
1270
1065
A selected-file commit may fail in some cases where the committed
1271
1066
tree would be invalid, such as trying to commit a file in a
1276
1071
TODO: Strict commit that fails if there are unknown or deleted files.
1277
1072
"""
1278
1073
takes_args = ['selected*']
1279
takes_options = ['message', 'file', 'verbose', 'unchanged']
1074
takes_options = ['message', 'file', 'verbose']
1280
1075
aliases = ['ci', 'checkin']
1281
1076
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
1077
def run(self, message=None, file=None, verbose=True, selected_list=None):
1078
from bzrlib.commit import commit
1288
1079
1289
1080
## Warning: shadows builtin file()
1290
1081
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"])
1082
raise BzrCommandError("please specify a commit message",
1083
["use either --message or --file"])
1305
1084
elif message and file:
1306
1085
raise BzrCommandError("please specify either --message or --file")
1307
1086
1309
1088
import codecs
1310
1089
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1311
1090
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"])
1091
b = Branch('.')
1092
commit(b, message, verbose=verbose, specific_files=selected_list)
1325
1093
1326
1094
1327
1095
class cmd_check(Command):
1329
1097
1330
1098
This command checks various invariants about the branch storage to
1331
1099
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))
1100
"""
1101
takes_args = ['dir?']
1102
def run(self, dir='.'):
1103
import bzrlib.check
1104
bzrlib.check.check(Branch(dir))
1376
1105
1377
1106
1378
1107
1390
1119
class cmd_selftest(Command):
1391
1120
"""Run internal test suite"""
1392
1121
hidden = True
1393
takes_options = ['verbose']
1394
def run(self, verbose=False):
1122
def run(self):
1395
1123
from bzrlib.selftest import selftest
1396
return int(not selftest(verbose=verbose))
1124
if selftest():
1125
return 0
1126
else:
1127
return 1
1128
1397
1129
1398
1130
1399
1131
class cmd_version(Command):
1431
1163
['..', -1]
1432
1164
>>> parse_spec("../f/@35")
1433
1165
['../f', 35]
1434
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1435
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1436
1166
"""
1437
1167
if spec is None:
1438
1168
return [None, None]
1442
1172
if parsed[1] == "":
1443
1173
parsed[1] = -1
1444
1174
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
1175
parsed[1] = int(parsed[1])
1176
assert parsed[1] >=0
1451
1177
else:
1452
1178
parsed = [spec, None]
1453
1179
return parsed
1455
1181
1456
1182
1457
1183
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
1184
"""Perform a three-way merge of trees.
1185
1186
The SPEC parameters are working tree or revision specifiers. Working trees
1187
are specified using standard paths or urls. No component of a directory
1188
path may begin with '@'.
1189
1190
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1191
1192
Revisions are specified using a dirname/@revno pair, where dirname is the
1193
branch directory and revno is the revision within that branch. If no revno
1194
is specified, the latest revision is used.
1195
1196
Revision examples: './@127', 'foo/@', '../@1'
1197
1198
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1199
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1200
as the BASE.
1201
1477
1202
merge refuses to run if there are any uncommitted changes, unless
1478
1203
--force is given.
1479
1204
"""
1480
takes_args = ['branch?']
1481
takes_options = ['revision', 'force', 'merge-type']
1205
takes_args = ['other_spec', 'base_spec?']
1206
takes_options = ['force']
1482
1207
1483
def run(self, branch='.', revision=None, force=False,
1484
merge_type=None):
1208
def run(self, other_spec, base_spec=None, force=False):
1485
1209
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)
1210
merge(parse_spec(other_spec), parse_spec(base_spec),
1211
check_clean=(not force))
1506
1212
1507
1213
1508
1214
class cmd_revert(Command):
1509
1215
"""Reverse all changes since the last commit.
1510
1216
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.
1217
Only versioned files are affected.
1218
1219
TODO: Store backups of any files that will be reverted, so
1220
that the revert can be undone.
1514
1221
"""
1515
takes_options = ['revision', 'no-backup']
1516
takes_args = ['file*']
1517
aliases = ['merge-revert']
1222
takes_options = ['revision']
1518
1223
1519
def run(self, revision=None, no_backup=False, file_list=None):
1224
def run(self, revision=-1):
1520
1225
from bzrlib.merge import merge
1521
from bzrlib.branch import Branch
1522
if file_list is not None:
1523
if len(file_list) == 0:
1524
raise BzrCommandError("No files specified")
1525
if revision is None:
1526
revision = [-1]
1527
elif len(revision) != 1:
1528
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1529
merge(('.', revision[0]), parse_spec('.'),
1226
merge(('.', revision), parse_spec('.'),
1530
1227
check_clean=False,
1531
ignore_zero=True,
1532
backup_files=not no_backup,
1533
file_list=file_list)
1534
if not file_list:
1535
Branch('.').set_pending_merges([])
1228
ignore_zero=True)
1536
1229
1537
1230
1538
1231
class cmd_assert_fail(Command):
1554
1247
help.help(topic)
1555
1248
1556
1249
1557
1558
1559
class cmd_missing(Command):
1560
"""What is missing in this branch relative to other branch.
1561
"""
1562
takes_args = ['remote?']
1563
aliases = ['mis', 'miss']
1564
# We don't have to add quiet to the list, because
1565
# unknown options are parsed as booleans
1566
takes_options = ['verbose', 'quiet']
1567
1568
def run(self, remote=None, verbose=False, quiet=False):
1569
from bzrlib.branch import find_branch, DivergedBranches
1570
from bzrlib.errors import BzrCommandError
1571
from bzrlib.missing import get_parent, show_missing
1572
1573
if verbose and quiet:
1574
raise BzrCommandError('Cannot pass both quiet and verbose')
1575
1576
b = find_branch('.')
1577
parent = get_parent(b)
1578
if remote is None:
1579
if parent is None:
1580
raise BzrCommandError("No missing location known or specified.")
1581
else:
1582
if not quiet:
1583
print "Using last location: %s" % parent
1584
remote = parent
1585
elif parent is None:
1586
# We only update x-pull if it did not exist, missing should not change the parent
1587
b.controlfile('x-pull', 'wb').write(remote + '\n')
1588
br_remote = find_branch(remote)
1589
1590
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1591
1592
1593
class cmd_plugins(Command):
1594
"""List plugins"""
1250
class cmd_update_stat_cache(Command):
1251
"""Update stat-cache mapping inodes to SHA-1 hashes.
1252
1253
For testing only."""
1595
1254
hidden = True
1596
1255
def run(self):
1597
import bzrlib.plugin
1598
from inspect import getdoc
1599
from pprint import pprint
1600
for plugin in bzrlib.plugin.all_plugins:
1601
print plugin.__path__[0]
1602
d = getdoc(plugin)
1603
if d:
1604
print '\t', d.split('\n')[0]
1605
1606
#pprint(bzrlib.plugin.all_plugins)
1256
import statcache
1257
b = Branch('.')
1258
statcache.update_cache(b.base, b.read_working_inventory())
1607
1259
1608
1260
1609
1261
1616
1268
'help': None,
1617
1269
'file': unicode,
1618
1270
'force': None,
1619
'format': unicode,
1620
1271
'forward': None,
1621
1272
'message': unicode,
1622
1273
'no-recurse': None,
1623
1274
'profile': None,
1624
1275
'revision': _parse_revision_str,
1625
'short': None,
1626
1276
'show-ids': None,
1627
1277
'timezone': str,
1628
1278
'verbose': None,
1629
1279
'version': None,
1630
1280
'email': None,
1631
'unchanged': None,
1632
'update': None,
1633
'long': None,
1634
'root': str,
1635
'no-backup': None,
1636
'merge-type': get_merge_type,
1637
1281
}
1638
1282
1639
1283
SHORT_OPTIONS = {
1642
1286
'm': 'message',
1643
1287
'r': 'revision',
1644
1288
'v': 'verbose',
1645
'l': 'long',
1646
1289
}
1647
1290
1648
1291
1662
1305
(['status'], {'all': True})
1663
1306
>>> parse_args('commit --message=biter'.split())
1664
1307
(['commit'], {'message': u'biter'})
1665
>>> parse_args('log -r 500'.split())
1666
(['log'], {'revision': [500]})
1667
>>> parse_args('log -r500..600'.split())
1668
(['log'], {'revision': [500, 600]})
1669
>>> parse_args('log -vr500..600'.split())
1670
(['log'], {'verbose': True, 'revision': [500, 600]})
1671
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1672
(['log'], {'revision': ['v500', 600]})
1673
1308
"""
1674
1309
args = []
1675
1310
opts = {}
1689
1324
else:
1690
1325
optname = a[2:]
1691
1326
if optname not in OPTIONS:
1692
raise BzrError('unknown long option %r' % a)
1327
bailout('unknown long option %r' % a)
1693
1328
else:
1694
1329
shortopt = a[1:]
1695
if shortopt in SHORT_OPTIONS:
1696
# Multi-character options must have a space to delimit
1697
# their value
1698
optname = SHORT_OPTIONS[shortopt]
1699
else:
1700
# Single character short options, can be chained,
1701
# and have their value appended to their name
1702
shortopt = a[1:2]
1703
if shortopt not in SHORT_OPTIONS:
1704
# We didn't find the multi-character name, and we
1705
# didn't find the single char name
1706
raise BzrError('unknown short option %r' % a)
1707
optname = SHORT_OPTIONS[shortopt]
1708
1709
if a[2:]:
1710
# There are extra things on this option
1711
# see if it is the value, or if it is another
1712
# short option
1713
optargfn = OPTIONS[optname]
1714
if optargfn is None:
1715
# This option does not take an argument, so the
1716
# next entry is another short option, pack it back
1717
# into the list
1718
argv.insert(0, '-' + a[2:])
1719
else:
1720
# This option takes an argument, so pack it
1721
# into the array
1722
optarg = a[2:]
1330
if shortopt not in SHORT_OPTIONS:
1331
bailout('unknown short option %r' % a)
1332
optname = SHORT_OPTIONS[shortopt]
1723
1333
1724
1334
if optname in opts:
1725
1335
# XXX: Do we ever want to support this, e.g. for -r?
1726
raise BzrError('repeated option %r' % a)
1336
bailout('repeated option %r' % a)
1727
1337
1728
1338
optargfn = OPTIONS[optname]
1729
1339
if optargfn:
1730
1340
if optarg == None:
1731
1341
if not argv:
1732
raise BzrError('option %r needs an argument' % a)
1342
bailout('option %r needs an argument' % a)
1733
1343
else:
1734
1344
optarg = argv.pop(0)
1735
1345
opts[optname] = optargfn(optarg)
1736
1346
else:
1737
1347
if optarg != None:
1738
raise BzrError('option %r takes no argument' % optname)
1348
bailout('option %r takes no argument' % optname)
1739
1349
opts[optname] = True
1740
1350
else:
1741
1351
args.append(a)
1795
1405
1796
1406
This is similar to main(), but without all the trappings for
1797
1407
logging and error handling.
1798
1799
argv
1800
The command-line arguments, without the program name from argv[0]
1801
1802
Returns a command status or raises an exception.
1803
1804
Special master options: these must come before the command because
1805
they control how the command is interpreted.
1806
1807
--no-plugins
1808
Do not load plugin modules at all
1809
1810
--builtin
1811
Only use builtin commands. (Plugins are still allowed to change
1812
other behaviour.)
1813
1814
--profile
1815
Run under the Python profiler.
1816
1408
"""
1817
1818
1409
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1819
1820
opt_profile = opt_no_plugins = opt_builtin = False
1821
1822
# --no-plugins is handled specially at a very early stage. We need
1823
# to load plugins before doing other command parsing so that they
1824
# can override commands, but this needs to happen first.
1825
1826
for a in argv[:]:
1827
if a == '--profile':
1828
opt_profile = True
1829
elif a == '--no-plugins':
1830
opt_no_plugins = True
1831
elif a == '--builtin':
1832
opt_builtin = True
1833
else:
1834
break
1835
argv.remove(a)
1836
1837
if not opt_no_plugins:
1838
from bzrlib.plugin import load_plugins
1839
load_plugins()
1840
1841
args, opts = parse_args(argv)
1842
1843
if 'help' in opts:
1844
from bzrlib.help import help
1845
if args:
1846
help(args[0])
1847
else:
1848
help()
1849
return 0
1850
1851
if 'version' in opts:
1852
show_version()
1853
return 0
1854
1410
1855
if not args:
1856
print >>sys.stderr, "please try 'bzr help' for help"
1411
include_plugins=True
1412
try:
1413
args, opts = parse_args(argv[1:])
1414
if 'help' in opts:
1415
import help
1416
if args:
1417
help.help(args[0])
1418
else:
1419
help.help()
1420
return 0
1421
elif 'version' in opts:
1422
show_version()
1423
return 0
1424
elif args and args[0] == 'builtin':
1425
include_plugins=False
1426
args = args[1:]
1427
cmd = str(args.pop(0))
1428
except IndexError:
1429
import help
1430
help.help()
1857
1431
return 1
1858
1859
cmd = str(args.pop(0))
1860
1861
canonical_cmd, cmd_class = \
1862
get_cmd_class(cmd, plugins_override=not opt_builtin)
1432
1433
1434
canonical_cmd, cmd_class = get_cmd_class(cmd,include_plugins=include_plugins)
1435
1436
# global option
1437
if 'profile' in opts:
1438
profile = True
1439
del opts['profile']
1440
else:
1441
profile = False
1863
1442
1864
1443
# check options are reasonable
1865
1444
allowed = cmd_class.takes_options
1874
1453
for k, v in opts.items():
1875
1454
cmdopts[k.replace('-', '_')] = v
1876
1455
1877
if opt_profile:
1456
if profile:
1878
1457
import hotshot, tempfile
1879
1458
pffileno, pfname = tempfile.mkstemp()
1880
1459
try:
1901
1480
1902
1481
def _report_exception(summary, quiet=False):
1903
1482
import traceback
1904
1905
1483
log_error('bzr: ' + summary)
1906
1484
bzrlib.trace.log_exception()
1907
1485
1908
if os.environ.get('BZR_DEBUG'):
1909
traceback.print_exc()
1910
1911
1486
if not quiet:
1912
sys.stderr.write('\n')
1913
1487
tb = sys.exc_info()[2]
1914
1488
exinfo = traceback.extract_tb(tb)
1915
1489
if exinfo:
1919
1493
1920
1494
1921
1495
def main(argv):
1496
import errno
1922
1497
1923
bzrlib.trace.open_tracefile(argv)
1498
bzrlib.open_tracefile(argv)
1924
1499
1925
1500
try:
1926
1501
try:
1927
1502
try:
1928
return run_bzr(argv[1:])
1503
return run_bzr(argv)
1929
1504
finally:
1930
1505
# do this here inside the exception wrappers to catch EPIPE
1931
1506
sys.stdout.flush()
1932
1507
except BzrError, e:
1933
1508
quiet = isinstance(e, (BzrCommandError))
1934
_report_exception('error: ' + str(e), quiet=quiet)
1509
_report_exception('error: ' + e.args[0], quiet=quiet)
1935
1510
if len(e.args) > 1:
1936
1511
for h in e.args[1]:
1937
1512
# some explanation or hints
1947
1522
_report_exception('interrupted', quiet=True)
1948
1523
return 2
1949
1524
except Exception, e:
1950
import errno
1951
1525
quiet = False
1952
1526
if (isinstance(e, IOError)
1953
1527
and hasattr(e, 'errno')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1