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