« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 363
- compare with another revision
- download diff
- download tarball
- view history from revision 363
- Committer: Martin Pool
- Date: 2005-05-05 06:38:18 UTC
- Revision ID: mbp@sourcefrog.net-20050505063818-3eb3260343878325
- do upload CHANGELOG to web server, even though it's autogenerated
- files added:
- bzrlib/cache.py
- files removed:
- bzr-man.py
- bzrlib/selftest
- effbot
- effbot/org
- patches
- plugins
- plugins/changeset
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
16
16
17
17
18
18
19
import sys, os
19
import sys, os, time, os.path
20
from sets import Set
20
21
21
22
import bzrlib
22
from bzrlib.trace import mutter, note, log_error, warning
23
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
24
from bzrlib.branch import find_branch
25
from bzrlib import BZRDIR
26
27
28
plugin_cmds = {}
29
30
31
def register_command(cmd):
32
"Utility function to help register a command"
33
global plugin_cmds
34
k = cmd.__name__
35
if k.startswith("cmd_"):
36
k_unsquished = _unsquish_command_name(k)
37
else:
38
k_unsquished = k
39
if not plugin_cmds.has_key(k_unsquished):
40
plugin_cmds[k_unsquished] = cmd
41
else:
42
log_error('Two plugins defined the same command: %r' % k)
43
log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
23
from bzrlib.trace import mutter, note, log_error
24
from bzrlib.errors import bailout, BzrError, BzrCheckError, BzrCommandError
25
from bzrlib.osutils import quotefn, pumpfile, isdir, isfile
26
from bzrlib.tree import RevisionTree, EmptyTree, WorkingTree, Tree
27
from bzrlib.revision import Revision
28
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
29
format_date
44
30
45
31
46
32
def _squish_command_name(cmd):
51
37
assert cmd.startswith("cmd_")
52
38
return cmd[4:].replace('_','-')
53
39
54
55
def _parse_revision_str(revstr):
56
"""This handles a revision string -> revno.
57
58
This always returns a list. The list will have one element for
59
60
It supports integers directly, but everything else it
61
defers for passing to Branch.get_revision_info()
62
63
>>> _parse_revision_str('234')
64
[234]
65
>>> _parse_revision_str('234..567')
66
[234, 567]
67
>>> _parse_revision_str('..')
68
[None, None]
69
>>> _parse_revision_str('..234')
70
[None, 234]
71
>>> _parse_revision_str('234..')
72
[234, None]
73
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
74
[234, 456, 789]
75
>>> _parse_revision_str('234....789') # Error?
76
[234, None, 789]
77
>>> _parse_revision_str('revid:test@other.com-234234')
78
['revid:test@other.com-234234']
79
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
80
['revid:test@other.com-234234', 'revid:test@other.com-234235']
81
>>> _parse_revision_str('revid:test@other.com-234234..23')
82
['revid:test@other.com-234234', 23]
83
>>> _parse_revision_str('date:2005-04-12')
84
['date:2005-04-12']
85
>>> _parse_revision_str('date:2005-04-12 12:24:33')
86
['date:2005-04-12 12:24:33']
87
>>> _parse_revision_str('date:2005-04-12T12:24:33')
88
['date:2005-04-12T12:24:33']
89
>>> _parse_revision_str('date:2005-04-12,12:24:33')
90
['date:2005-04-12,12:24:33']
91
>>> _parse_revision_str('-5..23')
92
[-5, 23]
93
>>> _parse_revision_str('-5')
94
[-5]
95
>>> _parse_revision_str('123a')
96
['123a']
97
>>> _parse_revision_str('abc')
98
['abc']
99
"""
100
import re
101
old_format_re = re.compile('\d*:\d*')
102
m = old_format_re.match(revstr)
103
if m:
104
warning('Colon separator for revision numbers is deprecated.'
105
' Use .. instead')
106
revs = []
107
for rev in revstr.split(':'):
108
if rev:
109
revs.append(int(rev))
110
else:
111
revs.append(None)
112
return revs
113
revs = []
114
for x in revstr.split('..'):
115
if not x:
116
revs.append(None)
117
else:
118
try:
119
revs.append(int(x))
120
except ValueError:
121
revs.append(x)
122
return revs
123
124
125
126
def _get_cmd_dict(plugins_override=True):
127
d = {}
40
def get_all_cmds():
41
"""Return canonical name and class for all registered commands."""
128
42
for k, v in globals().iteritems():
129
43
if k.startswith("cmd_"):
130
d[_unsquish_command_name(k)] = v
131
# If we didn't load plugins, the plugin_cmds dict will be empty
132
if plugins_override:
133
d.update(plugin_cmds)
134
else:
135
d2 = plugin_cmds.copy()
136
d2.update(d)
137
d = d2
138
return d
139
140
141
def get_all_cmds(plugins_override=True):
142
"""Return canonical name and class for all registered commands."""
143
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
144
yield k,v
145
146
147
def get_cmd_class(cmd, plugins_override=True):
44
yield _unsquish_command_name(k), v
45
46
def get_cmd_class(cmd):
148
47
"""Return the canonical name and command class for a command.
149
48
"""
150
49
cmd = str(cmd) # not unicode
151
50
152
51
# first look up this command under the specified name
153
cmds = _get_cmd_dict(plugins_override=plugins_override)
154
52
try:
155
return cmd, cmds[cmd]
53
return cmd, globals()[_squish_command_name(cmd)]
156
54
except KeyError:
157
55
pass
158
56
159
57
# look for any command which claims this as an alias
160
for cmdname, cmdclass in cmds.iteritems():
58
for cmdname, cmdclass in get_all_cmds():
161
59
if cmd in cmdclass.aliases:
162
60
return cmdname, cmdclass
163
164
cmdclass = ExternalCommand.find_command(cmd)
165
if cmdclass:
166
return cmd, cmdclass
167
168
raise BzrCommandError("unknown command %r" % cmd)
169
170
171
class Command(object):
61
else:
62
raise BzrCommandError("unknown command %r" % cmd)
63
64
65
class Command:
172
66
"""Base class for commands.
173
67
174
68
The docstring for an actual command should give a single-line
217
111
return 0
218
112
219
113
220
class ExternalCommand(Command):
221
"""Class to wrap external commands.
222
223
We cheat a little here, when get_cmd_class() calls us we actually give it back
224
an object we construct that has the appropriate path, help, options etc for the
225
specified command.
226
227
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
228
method, which we override to call the Command.__init__ method. That then calls
229
our run method which is pretty straight forward.
230
231
The only wrinkle is that we have to map bzr's dictionary of options and arguments
232
back into command line options and arguments for the script.
233
"""
234
235
def find_command(cls, cmd):
236
import os.path
237
bzrpath = os.environ.get('BZRPATH', '')
238
239
for dir in bzrpath.split(os.pathsep):
240
path = os.path.join(dir, cmd)
241
if os.path.isfile(path):
242
return ExternalCommand(path)
243
244
return None
245
246
find_command = classmethod(find_command)
247
248
def __init__(self, path):
249
self.path = path
250
251
pipe = os.popen('%s --bzr-usage' % path, 'r')
252
self.takes_options = pipe.readline().split()
253
254
for opt in self.takes_options:
255
if not opt in OPTIONS:
256
raise BzrError("Unknown option '%s' returned by external command %s"
257
% (opt, path))
258
259
# TODO: Is there any way to check takes_args is valid here?
260
self.takes_args = pipe.readline().split()
261
262
if pipe.close() is not None:
263
raise BzrError("Failed funning '%s --bzr-usage'" % path)
264
265
pipe = os.popen('%s --bzr-help' % path, 'r')
266
self.__doc__ = pipe.read()
267
if pipe.close() is not None:
268
raise BzrError("Failed funning '%s --bzr-help'" % path)
269
270
def __call__(self, options, arguments):
271
Command.__init__(self, options, arguments)
272
return self
273
274
def run(self, **kargs):
275
opts = []
276
args = []
277
278
keys = kargs.keys()
279
keys.sort()
280
for name in keys:
281
optname = name.replace('_','-')
282
value = kargs[name]
283
if OPTIONS.has_key(optname):
284
# it's an option
285
opts.append('--%s' % optname)
286
if value is not None and value is not True:
287
opts.append(str(value))
288
else:
289
# it's an arg, or arg list
290
if type(value) is not list:
291
value = [value]
292
for v in value:
293
if v is not None:
294
args.append(str(v))
295
296
self.status = os.spawnv(os.P_WAIT, self.path, [self.path] + opts + args)
297
return self.status
298
299
114
300
115
class cmd_status(Command):
301
116
"""Display status summary.
302
117
303
This reports on versioned and unknown files, reporting them
304
grouped by state. Possible states are:
305
306
added
307
Versioned in the working copy but not in the previous revision.
308
309
removed
310
Versioned in the previous revision but removed or deleted
311
in the working copy.
312
313
renamed
314
Path of this file changed from the previous revision;
315
the text may also have changed. This includes files whose
316
parent directory was renamed.
317
318
modified
319
Text has changed since the previous revision.
320
321
unchanged
322
Nothing about this file has changed since the previous revision.
323
Only shown with --all.
324
325
unknown
326
Not versioned and not matching an ignore pattern.
327
328
To see ignored files use 'bzr ignored'. For details in the
329
changes to file texts, use 'bzr diff'.
330
331
If no arguments are specified, the status of the entire working
332
directory is shown. Otherwise, only the status of the specified
333
files or directories is reported. If a directory is given, status
334
is reported for everything inside that directory.
335
336
If a revision is specified, the changes since that revision are shown.
118
For each file there is a single line giving its file state and name.
119
The name is that in the current revision unless it is deleted or
120
missing, in which case the old name is shown.
337
121
"""
338
takes_args = ['file*']
339
takes_options = ['all', 'show-ids', 'revision']
122
takes_options = ['all']
340
123
aliases = ['st', 'stat']
341
124
342
def run(self, all=False, show_ids=False, file_list=None):
343
if file_list:
344
b = find_branch(file_list[0])
345
file_list = [b.relpath(x) for x in file_list]
346
# special case: only one path was given and it's the root
347
# of the branch
348
if file_list == ['']:
349
file_list = None
350
else:
351
b = find_branch('.')
352
353
from bzrlib.status import show_status
354
show_status(b, show_unchanged=all, show_ids=show_ids,
355
specific_files=file_list)
125
def run(self, all=False):
126
#import bzrlib.status
127
#bzrlib.status.tree_status(Branch('.'))
128
Branch('.').show_status(show_all=all)
356
129
357
130
358
131
class cmd_cat_revision(Command):
362
135
takes_args = ['revision_id']
363
136
364
137
def run(self, revision_id):
365
from bzrlib.xml import pack_xml
366
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
138
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
367
139
368
140
369
141
class cmd_revno(Command):
371
143
372
144
This is equal to the number of revisions on this branch."""
373
145
def run(self):
374
print find_branch('.').revno()
375
376
class cmd_revision_info(Command):
377
"""Show revision number and revision id for a given revision identifier.
378
"""
379
hidden = True
380
takes_args = ['revision_info*']
381
takes_options = ['revision']
382
def run(self, revision=None, revision_info_list=None):
383
from bzrlib.branch import find_branch
384
385
revs = []
386
if revision is not None:
387
revs.extend(revision)
388
if revision_info_list is not None:
389
revs.extend(revision_info_list)
390
if len(revs) == 0:
391
raise BzrCommandError('You must supply a revision identifier')
392
393
b = find_branch('.')
394
395
for rev in revs:
396
print '%4d %s' % b.get_revision_info(rev)
146
print Branch('.').revno()
397
147
398
148
399
149
class cmd_add(Command):
418
168
recursively add that parent, rather than giving an error?
419
169
"""
420
170
takes_args = ['file+']
421
takes_options = ['verbose', 'no-recurse']
171
takes_options = ['verbose']
422
172
423
def run(self, file_list, verbose=False, no_recurse=False):
424
from bzrlib.add import smart_add
425
smart_add(file_list, verbose, not no_recurse)
426
427
428
429
class cmd_mkdir(Command):
430
"""Create a new versioned directory.
431
432
This is equivalent to creating the directory and then adding it.
433
"""
434
takes_args = ['dir+']
435
436
def run(self, dir_list):
437
b = None
438
439
for d in dir_list:
440
os.mkdir(d)
441
if not b:
442
b = find_branch(d)
443
b.add([d], verbose=True)
444
445
446
class cmd_relpath(Command):
173
def run(self, file_list, verbose=False):
174
bzrlib.add.smart_add(file_list, verbose)
175
176
177
def Relpath(Command):
447
178
"""Show path of a file relative to root"""
448
takes_args = ['filename']
449
hidden = True
179
takes_args = ('filename')
450
180
451
def run(self, filename):
452
print find_branch(filename).relpath(filename)
181
def run(self):
182
print Branch(self.args['filename']).relpath(filename)
453
183
454
184
455
185
456
186
class cmd_inventory(Command):
457
187
"""Show inventory of the current working copy or a revision."""
458
takes_options = ['revision', 'show-ids']
188
takes_options = ['revision']
459
189
460
def run(self, revision=None, show_ids=False):
461
b = find_branch('.')
190
def run(self, revision=None):
191
b = Branch('.')
462
192
if revision == None:
463
193
inv = b.read_working_inventory()
464
194
else:
465
if len(revision) > 1:
466
raise BzrCommandError('bzr inventory --revision takes'
467
' exactly one revision identifier')
468
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
195
inv = b.get_revision_inventory(b.lookup_revision(revision))
469
196
470
for path, entry in inv.entries():
471
if show_ids:
472
print '%-50s %s' % (path, entry.file_id)
473
else:
474
print path
197
for path, entry in inv.iter_entries():
198
print '%-50s %s' % (entry.file_id, path)
475
199
476
200
477
201
class cmd_move(Command):
484
208
"""
485
209
takes_args = ['source$', 'dest']
486
210
def run(self, source_list, dest):
487
b = find_branch('.')
211
b = Branch('.')
488
212
489
213
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
490
214
506
230
takes_args = ['from_name', 'to_name']
507
231
508
232
def run(self, from_name, to_name):
509
b = find_branch('.')
233
b = Branch('.')
510
234
b.rename_one(b.relpath(from_name), b.relpath(to_name))
511
235
512
236
513
237
514
515
516
class cmd_pull(Command):
517
"""Pull any changes from another branch into the current one.
518
519
If the location is omitted, the last-used location will be used.
520
Both the revision history and the working directory will be
521
updated.
522
523
This command only works on branches that have not diverged. Branches are
524
considered diverged if both branches have had commits without first
525
pulling from the other.
526
527
If branches have diverged, you can use 'bzr merge' to pull the text changes
528
from one into the other.
529
"""
530
takes_args = ['location?']
531
532
def run(self, location=None):
533
from bzrlib.merge import merge
534
import tempfile
535
from shutil import rmtree
536
import errno
537
538
br_to = find_branch('.')
539
stored_loc = None
540
try:
541
stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
542
except IOError, e:
543
if e.errno != errno.ENOENT:
544
raise
545
if location is None:
546
if stored_loc is None:
547
raise BzrCommandError("No pull location known or specified.")
548
else:
549
print "Using last location: %s" % stored_loc
550
location = stored_loc
551
cache_root = tempfile.mkdtemp()
552
from bzrlib.branch import DivergedBranches
553
br_from = find_branch(location)
554
location = pull_loc(br_from)
555
old_revno = br_to.revno()
556
try:
557
from branch import find_cached_branch, DivergedBranches
558
br_from = find_cached_branch(location, cache_root)
559
location = pull_loc(br_from)
560
old_revno = br_to.revno()
561
try:
562
br_to.update_revisions(br_from)
563
except DivergedBranches:
564
raise BzrCommandError("These branches have diverged."
565
" Try merge.")
566
567
merge(('.', -1), ('.', old_revno), check_clean=False)
568
if location != stored_loc:
569
br_to.controlfile("x-pull", "wb").write(location + "\n")
570
finally:
571
rmtree(cache_root)
572
573
574
575
class cmd_branch(Command):
576
"""Create a new copy of a branch.
577
578
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
579
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
580
581
To retrieve the branch as of a particular revision, supply the --revision
582
parameter, as in "branch foo/bar -r 5".
583
"""
584
takes_args = ['from_location', 'to_location?']
585
takes_options = ['revision']
586
587
def run(self, from_location, to_location=None, revision=None):
588
import errno
589
from bzrlib.merge import merge
590
from bzrlib.branch import DivergedBranches, NoSuchRevision, \
591
find_cached_branch, Branch
592
from shutil import rmtree
593
from meta_store import CachedStore
594
import tempfile
595
cache_root = tempfile.mkdtemp()
596
597
if revision is None:
598
revision = [None]
599
elif len(revision) > 1:
600
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
601
602
try:
603
try:
604
br_from = find_cached_branch(from_location, cache_root)
605
except OSError, e:
606
if e.errno == errno.ENOENT:
607
raise BzrCommandError('Source location "%s" does not'
608
' exist.' % to_location)
609
else:
610
raise
611
612
if to_location is None:
613
to_location = os.path.basename(from_location.rstrip("/\\"))
614
615
try:
616
os.mkdir(to_location)
617
except OSError, e:
618
if e.errno == errno.EEXIST:
619
raise BzrCommandError('Target directory "%s" already'
620
' exists.' % to_location)
621
if e.errno == errno.ENOENT:
622
raise BzrCommandError('Parent of "%s" does not exist.' %
623
to_location)
624
else:
625
raise
626
br_to = Branch(to_location, init=True)
627
628
br_to.set_root_id(br_from.get_root_id())
629
630
if revision:
631
if revision[0] is None:
632
revno = br_from.revno()
633
else:
634
revno, rev_id = br_from.get_revision_info(revision[0])
635
try:
636
br_to.update_revisions(br_from, stop_revision=revno)
637
except NoSuchRevision:
638
rmtree(to_location)
639
msg = "The branch %s has no revision %d." % (from_location,
640
revno)
641
raise BzrCommandError(msg)
642
643
merge((to_location, -1), (to_location, 0), this_dir=to_location,
644
check_clean=False, ignore_zero=True)
645
from_location = pull_loc(br_from)
646
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
647
finally:
648
rmtree(cache_root)
649
650
651
def pull_loc(branch):
652
# TODO: Should perhaps just make attribute be 'base' in
653
# RemoteBranch and Branch?
654
if hasattr(branch, "baseurl"):
655
return branch.baseurl
656
else:
657
return branch.base
658
659
660
661
238
class cmd_renames(Command):
662
239
"""Show list of renamed files.
663
240
668
245
takes_args = ['dir?']
669
246
670
247
def run(self, dir='.'):
671
b = find_branch(dir)
248
b = Branch(dir)
672
249
old_inv = b.basis_tree().inventory
673
250
new_inv = b.read_working_inventory()
674
251
679
256
680
257
681
258
class cmd_info(Command):
682
"""Show statistical information about a branch."""
683
takes_args = ['branch?']
684
685
def run(self, branch=None):
259
"""Show statistical information for this branch"""
260
def run(self):
686
261
import info
687
688
b = find_branch(branch)
689
info.show_info(b)
262
info.show_info(Branch('.'))
690
263
691
264
692
265
class cmd_remove(Command):
699
272
takes_options = ['verbose']
700
273
701
274
def run(self, file_list, verbose=False):
702
b = find_branch(file_list[0])
275
b = Branch(file_list[0])
703
276
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
704
277
705
278
713
286
hidden = True
714
287
takes_args = ['filename']
715
288
def run(self, filename):
716
b = find_branch(filename)
289
b = Branch(filename)
717
290
i = b.inventory.path2id(b.relpath(filename))
718
291
if i == None:
719
raise BzrError("%r is not a versioned file" % filename)
292
bailout("%r is not a versioned file" % filename)
720
293
else:
721
294
print i
722
295
729
302
hidden = True
730
303
takes_args = ['filename']
731
304
def run(self, filename):
732
b = find_branch(filename)
305
b = Branch(filename)
733
306
inv = b.inventory
734
307
fid = inv.path2id(b.relpath(filename))
735
308
if fid == None:
736
raise BzrError("%r is not a versioned file" % filename)
309
bailout("%r is not a versioned file" % filename)
737
310
for fip in inv.get_idpath(fid):
738
311
print fip
739
312
740
313
741
314
class cmd_revision_history(Command):
742
315
"""Display list of revision ids on this branch."""
743
hidden = True
744
316
def run(self):
745
for patchid in find_branch('.').revision_history():
317
for patchid in Branch('.').revision_history():
746
318
print patchid
747
319
748
320
749
321
class cmd_directories(Command):
750
322
"""Display list of versioned directories in this branch."""
751
323
def run(self):
752
for name, ie in find_branch('.').read_working_inventory().directories():
324
for name, ie in Branch('.').read_working_inventory().directories():
753
325
if name == '':
754
326
print '.'
755
327
else:
770
342
bzr commit -m 'imported project'
771
343
"""
772
344
def run(self):
773
from bzrlib.branch import Branch
774
345
Branch('.', init=True)
775
346
776
347
799
370
"""
800
371
801
372
takes_args = ['file*']
802
takes_options = ['revision', 'diff-options']
803
aliases = ['di', 'dif']
373
takes_options = ['revision']
374
aliases = ['di']
804
375
805
def run(self, revision=None, file_list=None, diff_options=None):
376
def run(self, revision=None, file_list=None):
806
377
from bzrlib.diff import show_diff
807
808
if file_list:
809
b = find_branch(file_list[0])
810
file_list = [b.relpath(f) for f in file_list]
811
if file_list == ['']:
812
# just pointing to top-of-tree
813
file_list = None
814
else:
815
b = find_branch('.')
816
817
# TODO: Make show_diff support taking 2 arguments
818
base_rev = None
819
if revision is not None:
820
if len(revision) != 1:
821
raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')
822
base_rev = revision[0]
823
378
824
show_diff(b, base_rev, specific_files=file_list,
825
external_diff_options=diff_options)
826
827
828
379
show_diff(Branch('.'), revision, file_list)
829
380
830
381
831
382
class cmd_deleted(Command):
834
385
TODO: Show files deleted since a previous revision, or between two revisions.
835
386
"""
836
387
def run(self, show_ids=False):
837
b = find_branch('.')
388
b = Branch('.')
838
389
old = b.basis_tree()
839
390
new = b.working_tree()
840
391
850
401
else:
851
402
print path
852
403
853
854
class cmd_modified(Command):
855
"""List files modified in working tree."""
856
hidden = True
857
def run(self):
858
from bzrlib.diff import compare_trees
859
860
b = find_branch('.')
861
td = compare_trees(b.basis_tree(), b.working_tree())
862
863
for path, id, kind in td.modified:
864
print path
865
866
867
868
class cmd_added(Command):
869
"""List files added in working tree."""
870
hidden = True
871
def run(self):
872
b = find_branch('.')
873
wt = b.working_tree()
874
basis_inv = b.basis_tree().inventory
875
inv = wt.inventory
876
for file_id in inv:
877
if file_id in basis_inv:
878
continue
879
path = inv.id2path(file_id)
880
if not os.access(b.abspath(path), os.F_OK):
881
continue
882
print path
883
884
885
886
404
class cmd_root(Command):
887
405
"""Show the tree root directory.
888
406
891
409
takes_args = ['filename?']
892
410
def run(self, filename=None):
893
411
"""Print the branch root."""
894
b = find_branch(filename)
895
print getattr(b, 'base', None) or getattr(b, 'baseurl')
412
print bzrlib.branch.find_branch_root(filename)
413
896
414
897
415
898
416
class cmd_log(Command):
899
417
"""Show log of this branch.
900
418
901
To request a range of logs, you can use the command -r begin:end
902
-r revision requests a specific revision, -r :end or -r begin: are
903
also valid.
904
905
--message allows you to give a regular expression, which will be evaluated
906
so that only matching entries will be displayed.
907
908
TODO: Make --revision support uuid: and hash: [future tag:] notation.
909
419
TODO: Options to show ids; to limit range; etc.
910
420
"""
911
912
takes_args = ['filename?']
913
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
914
915
def run(self, filename=None, timezone='original',
916
verbose=False,
917
show_ids=False,
918
forward=False,
919
revision=None,
920
message=None,
921
long=False):
922
from bzrlib.branch import find_branch
923
from bzrlib.log import log_formatter, show_log
924
import codecs
925
926
direction = (forward and 'forward') or 'reverse'
927
928
if filename:
929
b = find_branch(filename)
930
fp = b.relpath(filename)
931
if fp:
932
file_id = b.read_working_inventory().path2id(fp)
933
else:
934
file_id = None # points to branch root
935
else:
936
b = find_branch('.')
937
file_id = None
938
939
if revision is None:
940
rev1 = None
941
rev2 = None
942
elif len(revision) == 1:
943
rev1 = rev2 = b.get_revision_info(revision[0])[0]
944
elif len(revision) == 2:
945
rev1 = b.get_revision_info(revision[0])[0]
946
rev2 = b.get_revision_info(revision[1])[0]
947
else:
948
raise BzrCommandError('bzr log --revision takes one or two values.')
949
950
if rev1 == 0:
951
rev1 = None
952
if rev2 == 0:
953
rev2 = None
954
955
mutter('encoding log as %r' % bzrlib.user_encoding)
956
957
# use 'replace' so that we don't abort if trying to write out
958
# in e.g. the default C locale.
959
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
960
961
if long:
962
log_format = 'long'
963
else:
964
log_format = 'short'
965
lf = log_formatter(log_format,
966
show_ids=show_ids,
967
to_file=outf,
968
show_timezone=timezone)
969
970
show_log(b,
971
lf,
972
file_id,
973
verbose=verbose,
974
direction=direction,
975
start_revision=rev1,
976
end_revision=rev2,
977
search=message)
978
979
980
981
class cmd_touching_revisions(Command):
982
"""Return revision-ids which affected a particular file.
983
984
A more user-friendly interface is "bzr log FILE"."""
985
hidden = True
986
takes_args = ["filename"]
987
def run(self, filename):
988
b = find_branch(filename)
989
inv = b.read_working_inventory()
990
file_id = inv.path2id(b.relpath(filename))
991
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
992
print "%6d %s" % (revno, what)
421
takes_options = ['timezone', 'verbose']
422
def run(self, timezone='original', verbose=False):
423
Branch('.', lock_mode='r').write_log(show_timezone=timezone, verbose=verbose)
993
424
994
425
995
426
class cmd_ls(Command):
999
430
"""
1000
431
hidden = True
1001
432
def run(self, revision=None, verbose=False):
1002
b = find_branch('.')
433
b = Branch('.')
1003
434
if revision == None:
1004
435
tree = b.working_tree()
1005
436
else:
1021
452
1022
453
1023
454
class cmd_unknowns(Command):
1024
"""List unknown files."""
455
"""List unknown files"""
1025
456
def run(self):
1026
from bzrlib.osutils import quotefn
1027
for f in find_branch('.').unknowns():
457
for f in Branch('.').unknowns():
1028
458
print quotefn(f)
1029
459
1030
460
1031
461
1032
462
class cmd_ignore(Command):
1033
"""Ignore a command or pattern.
1034
1035
To remove patterns from the ignore list, edit the .bzrignore file.
1036
1037
If the pattern contains a slash, it is compared to the whole path
1038
from the branch root. Otherwise, it is comapred to only the last
1039
component of the path.
1040
1041
Ignore patterns are case-insensitive on case-insensitive systems.
1042
1043
Note: wildcards must be quoted from the shell on Unix.
1044
1045
examples:
1046
bzr ignore ./Makefile
1047
bzr ignore '*.class'
1048
"""
463
"""Ignore a command or pattern"""
1049
464
takes_args = ['name_pattern']
1050
465
1051
466
def run(self, name_pattern):
1052
from bzrlib.atomicfile import AtomicFile
1053
import os.path
1054
1055
b = find_branch('.')
1056
ifn = b.abspath('.bzrignore')
1057
1058
if os.path.exists(ifn):
1059
f = open(ifn, 'rt')
1060
try:
1061
igns = f.read().decode('utf-8')
1062
finally:
1063
f.close()
1064
else:
1065
igns = ''
1066
1067
# TODO: If the file already uses crlf-style termination, maybe
1068
# we should use that for the newly added lines?
1069
1070
if igns and igns[-1] != '\n':
1071
igns += '\n'
1072
igns += name_pattern + '\n'
1073
1074
try:
1075
f = AtomicFile(ifn, 'wt')
1076
f.write(igns.encode('utf-8'))
1077
f.commit()
1078
finally:
1079
f.close()
467
b = Branch('.')
468
469
# XXX: This will fail if it's a hardlink; should use an AtomicFile class.
470
f = open(b.abspath('.bzrignore'), 'at')
471
f.write(name_pattern + '\n')
472
f.close()
1080
473
1081
474
inv = b.working_tree().inventory
1082
475
if inv.path2id('.bzrignore'):
1088
481
1089
482
1090
483
class cmd_ignored(Command):
1091
"""List ignored files and the patterns that matched them.
1092
1093
See also: bzr ignore"""
484
"""List ignored files and the patterns that matched them."""
1094
485
def run(self):
1095
tree = find_branch('.').working_tree()
486
tree = Branch('.').working_tree()
1096
487
for path, file_class, kind, file_id in tree.list_files():
1097
488
if file_class != 'I':
1098
489
continue
1106
497
1107
498
example:
1108
499
bzr lookup-revision 33
1109
"""
500
"""
1110
501
hidden = True
1111
502
takes_args = ['revno']
1112
503
1116
507
except ValueError:
1117
508
raise BzrCommandError("not a valid revision-number: %r" % revno)
1118
509
1119
print find_branch('.').lookup_revision(revno)
510
print Branch('.').lookup_revision(revno)
1120
511
1121
512
1122
513
class cmd_export(Command):
1123
514
"""Export past revision to destination directory.
1124
515
1125
If no revision is specified this exports the last committed revision.
1126
1127
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1128
given, try to find the format with the extension. If no extension
1129
is found exports to a directory (equivalent to --format=dir).
1130
1131
Root may be the top directory for tar, tgz and tbz2 formats. If none
1132
is given, the top directory will be the root name of the file."""
1133
# TODO: list known exporters
516
If no revision is specified this exports the last committed revision."""
1134
517
takes_args = ['dest']
1135
takes_options = ['revision', 'format', 'root']
1136
def run(self, dest, revision=None, format=None, root=None):
1137
import os.path
1138
b = find_branch('.')
1139
if revision is None:
1140
rev_id = b.last_patch()
518
takes_options = ['revision']
519
def run(self, dest, revno=None):
520
b = Branch('.')
521
if revno == None:
522
rh = b.revision_history[-1]
1141
523
else:
1142
if len(revision) != 1:
1143
raise BzrError('bzr export --revision takes exactly 1 argument')
1144
revno, rev_id = b.get_revision_info(revision[0])
1145
t = b.revision_tree(rev_id)
1146
root, ext = os.path.splitext(dest)
1147
if not format:
1148
if ext in (".tar",):
1149
format = "tar"
1150
elif ext in (".gz", ".tgz"):
1151
format = "tgz"
1152
elif ext in (".bz2", ".tbz2"):
1153
format = "tbz2"
1154
else:
1155
format = "dir"
1156
t.export(dest, format, root)
524
rh = b.lookup_revision(int(revno))
525
t = b.revision_tree(rh)
526
t.export(dest)
1157
527
1158
528
1159
529
class cmd_cat(Command):
1165
535
def run(self, filename, revision=None):
1166
536
if revision == None:
1167
537
raise BzrCommandError("bzr cat requires a revision number")
1168
elif len(revision) != 1:
1169
raise BzrCommandError("bzr cat --revision takes exactly one number")
1170
b = find_branch('.')
1171
b.print_file(b.relpath(filename), revision[0])
538
b = Branch('.')
539
b.print_file(b.relpath(filename), int(revision))
1172
540
1173
541
1174
542
class cmd_local_time_offset(Command):
1182
550
class cmd_commit(Command):
1183
551
"""Commit changes into a new revision.
1184
552
1185
If selected files are specified, only changes to those files are
1186
committed. If a directory is specified then its contents are also
1187
committed.
1188
1189
A selected-file commit may fail in some cases where the committed
1190
tree would be invalid, such as trying to commit a file in a
1191
newly-added directory that is not itself committed.
553
TODO: Commit only selected files.
1192
554
1193
555
TODO: Run hooks on tree to-be-committed, and after commit.
1194
556
1195
557
TODO: Strict commit that fails if there are unknown or deleted files.
1196
558
"""
1197
takes_args = ['selected*']
1198
takes_options = ['message', 'file', 'verbose', 'unchanged']
559
takes_options = ['message', 'verbose']
1199
560
aliases = ['ci', 'checkin']
1200
561
1201
def run(self, message=None, file=None, verbose=True, selected_list=None,
1202
unchanged=False):
1203
from bzrlib.errors import PointlessCommit
1204
from bzrlib.osutils import get_text_message
1205
1206
## Warning: shadows builtin file()
1207
if not message and not file:
1208
import cStringIO
1209
stdout = sys.stdout
1210
catcher = cStringIO.StringIO()
1211
sys.stdout = catcher
1212
cmd_status({"file_list":selected_list}, {})
1213
info = catcher.getvalue()
1214
sys.stdout = stdout
1215
message = get_text_message(info)
1216
1217
if message is None:
1218
raise BzrCommandError("please specify a commit message",
1219
["use either --message or --file"])
1220
elif message and file:
1221
raise BzrCommandError("please specify either --message or --file")
1222
1223
if file:
1224
import codecs
1225
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1226
1227
b = find_branch('.')
1228
1229
try:
1230
b.commit(message, verbose=verbose,
1231
specific_files=selected_list,
1232
allow_pointless=unchanged)
1233
except PointlessCommit:
1234
# FIXME: This should really happen before the file is read in;
1235
# perhaps prepare the commit; get the message; then actually commit
1236
raise BzrCommandError("no changes to commit",
1237
["use --unchanged to commit anyhow"])
562
def run(self, message=None, verbose=False):
563
if not message:
564
raise BzrCommandError("please specify a commit message")
565
Branch('.').commit(message, verbose=verbose)
1238
566
1239
567
1240
568
class cmd_check(Command):
1242
570
1243
571
This command checks various invariants about the branch storage to
1244
572
detect data corruption or bzr bugs.
1245
1246
If given the --update flag, it will update some optional fields
1247
to help ensure data consistency.
1248
"""
1249
takes_args = ['dir?']
1250
1251
def run(self, dir='.'):
1252
from bzrlib.check import check
1253
check(find_branch(dir))
1254
1255
1256
1257
class cmd_upgrade(Command):
1258
"""Upgrade branch storage to current format.
1259
1260
This should normally be used only after the check command tells
1261
you to run it.
1262
"""
1263
takes_args = ['dir?']
1264
1265
def run(self, dir='.'):
1266
from bzrlib.upgrade import upgrade
1267
upgrade(find_branch(dir))
573
"""
574
takes_args = ['dir?']
575
def run(self, dir='.'):
576
import bzrlib.check
577
bzrlib.check.check(Branch(dir, find_root=False))
1268
578
1269
579
1270
580
1283
593
"""Run internal test suite"""
1284
594
hidden = True
1285
595
def run(self):
1286
from bzrlib.selftest import selftest
1287
return int(not selftest())
596
failures, tests = 0, 0
597
598
import doctest, bzrlib.store, bzrlib.tests
599
bzrlib.trace.verbose = False
600
601
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
602
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
603
mf, mt = doctest.testmod(m)
604
failures += mf
605
tests += mt
606
print '%-40s %3d tests' % (m.__name__, mt),
607
if mf:
608
print '%3d FAILED!' % mf
609
else:
610
print
611
612
print '%-40s %3d tests' % ('total', tests),
613
if failures:
614
print '%3d FAILED!' % failures
615
else:
616
print
617
1288
618
1289
619
1290
620
class cmd_version(Command):
1291
"""Show version of bzr."""
621
"""Show version of bzr"""
1292
622
def run(self):
1293
623
show_version()
1294
624
1295
625
def show_version():
1296
626
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1297
# is bzrlib itself in a branch?
1298
bzrrev = bzrlib.get_bzr_revision()
1299
if bzrrev:
1300
print " (bzr checkout, revision %d {%s})" % bzrrev
1301
627
print bzrlib.__copyright__
1302
628
print "http://bazaar-ng.org/"
1303
629
print
1312
638
def run(self):
1313
639
print "it sure does!"
1314
640
1315
def parse_spec(spec):
1316
"""
1317
>>> parse_spec(None)
1318
[None, None]
1319
>>> parse_spec("./")
1320
['./', None]
1321
>>> parse_spec("../@")
1322
['..', -1]
1323
>>> parse_spec("../f/@35")
1324
['../f', 35]
1325
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1326
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1327
"""
1328
if spec is None:
1329
return [None, None]
1330
if '/@' in spec:
1331
parsed = spec.split('/@')
1332
assert len(parsed) == 2
1333
if parsed[1] == "":
1334
parsed[1] = -1
1335
else:
1336
try:
1337
parsed[1] = int(parsed[1])
1338
except ValueError:
1339
pass # We can allow stuff like ./@revid:blahblahblah
1340
else:
1341
assert parsed[1] >=0
1342
else:
1343
parsed = [spec, None]
1344
return parsed
1345
1346
1347
1348
class cmd_merge(Command):
1349
"""Perform a three-way merge of trees.
1350
1351
The SPEC parameters are working tree or revision specifiers. Working trees
1352
are specified using standard paths or urls. No component of a directory
1353
path may begin with '@'.
1354
1355
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1356
1357
Revisions are specified using a dirname/@revno pair, where dirname is the
1358
branch directory and revno is the revision within that branch. If no revno
1359
is specified, the latest revision is used.
1360
1361
Revision examples: './@127', 'foo/@', '../@1'
1362
1363
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1364
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1365
as the BASE.
1366
1367
merge refuses to run if there are any uncommitted changes, unless
1368
--force is given.
1369
"""
1370
takes_args = ['other_spec', 'base_spec?']
1371
takes_options = ['force']
1372
1373
def run(self, other_spec, base_spec=None, force=False):
1374
from bzrlib.merge import merge
1375
merge(parse_spec(other_spec), parse_spec(base_spec),
1376
check_clean=(not force))
1377
1378
1379
1380
class cmd_revert(Command):
1381
"""Restore selected files from a previous revision.
1382
"""
1383
takes_args = ['file+']
1384
def run(self, file_list):
1385
from bzrlib.branch import find_branch
1386
1387
if not file_list:
1388
file_list = ['.']
1389
1390
b = find_branch(file_list[0])
1391
1392
b.revert([b.relpath(f) for f in file_list])
1393
1394
1395
class cmd_merge_revert(Command):
1396
"""Reverse all changes since the last commit.
1397
1398
Only versioned files are affected.
1399
1400
TODO: Store backups of any files that will be reverted, so
1401
that the revert can be undone.
1402
"""
1403
takes_options = ['revision']
1404
1405
def run(self, revision=None):
1406
from bzrlib.merge import merge
1407
if revision is None:
1408
revision = [-1]
1409
elif len(revision) != 1:
1410
raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1411
merge(('.', revision[0]), parse_spec('.'),
1412
check_clean=False,
1413
ignore_zero=True)
1414
1415
641
1416
642
class cmd_assert_fail(Command):
1417
643
"""Test reporting of assertion failures"""
1432
658
help.help(topic)
1433
659
1434
660
1435
1436
1437
class cmd_plugins(Command):
1438
"""List plugins"""
1439
hidden = True
1440
def run(self):
1441
import bzrlib.plugin
1442
from inspect import getdoc
1443
from pprint import pprint
1444
for plugin in bzrlib.plugin.all_plugins:
1445
print plugin.__path__[0]
1446
d = getdoc(plugin)
1447
if d:
1448
print '\t', d.split('\n')[0]
1449
1450
#pprint(bzrlib.plugin.all_plugins)
1451
661
######################################################################
662
# main routine
1452
663
1453
664
1454
665
# list of all available options; the rhs can be either None for an
1456
667
# the type.
1457
668
OPTIONS = {
1458
669
'all': None,
1459
'diff-options': str,
1460
670
'help': None,
1461
'file': unicode,
1462
'force': None,
1463
'format': unicode,
1464
'forward': None,
1465
671
'message': unicode,
1466
'no-recurse': None,
1467
672
'profile': None,
1468
'revision': _parse_revision_str,
673
'revision': int,
1469
674
'show-ids': None,
1470
675
'timezone': str,
1471
676
'verbose': None,
1472
677
'version': None,
1473
678
'email': None,
1474
'unchanged': None,
1475
'update': None,
1476
'long': None,
1477
'root': str,
1478
679
}
1479
680
1480
681
SHORT_OPTIONS = {
1481
'F': 'file',
1482
'h': 'help',
1483
682
'm': 'message',
1484
683
'r': 'revision',
1485
684
'v': 'verbose',
1486
'l': 'long',
1487
685
}
1488
686
1489
687
1503
701
(['status'], {'all': True})
1504
702
>>> parse_args('commit --message=biter'.split())
1505
703
(['commit'], {'message': u'biter'})
1506
>>> parse_args('log -r 500'.split())
1507
(['log'], {'revision': [500]})
1508
>>> parse_args('log -r500..600'.split())
1509
(['log'], {'revision': [500, 600]})
1510
>>> parse_args('log -vr500..600'.split())
1511
(['log'], {'verbose': True, 'revision': [500, 600]})
1512
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1513
(['log'], {'revision': ['v500', 600]})
1514
704
"""
1515
705
args = []
1516
706
opts = {}
1530
720
else:
1531
721
optname = a[2:]
1532
722
if optname not in OPTIONS:
1533
raise BzrError('unknown long option %r' % a)
723
bailout('unknown long option %r' % a)
1534
724
else:
1535
725
shortopt = a[1:]
1536
if shortopt in SHORT_OPTIONS:
1537
# Multi-character options must have a space to delimit
1538
# their value
1539
optname = SHORT_OPTIONS[shortopt]
1540
else:
1541
# Single character short options, can be chained,
1542
# and have their value appended to their name
1543
shortopt = a[1:2]
1544
if shortopt not in SHORT_OPTIONS:
1545
# We didn't find the multi-character name, and we
1546
# didn't find the single char name
1547
raise BzrError('unknown short option %r' % a)
1548
optname = SHORT_OPTIONS[shortopt]
1549
1550
if a[2:]:
1551
# There are extra things on this option
1552
# see if it is the value, or if it is another
1553
# short option
1554
optargfn = OPTIONS[optname]
1555
if optargfn is None:
1556
# This option does not take an argument, so the
1557
# next entry is another short option, pack it back
1558
# into the list
1559
argv.insert(0, '-' + a[2:])
1560
else:
1561
# This option takes an argument, so pack it
1562
# into the array
1563
optarg = a[2:]
726
if shortopt not in SHORT_OPTIONS:
727
bailout('unknown short option %r' % a)
728
optname = SHORT_OPTIONS[shortopt]
1564
729
1565
730
if optname in opts:
1566
731
# XXX: Do we ever want to support this, e.g. for -r?
1567
raise BzrError('repeated option %r' % a)
732
bailout('repeated option %r' % a)
1568
733
1569
734
optargfn = OPTIONS[optname]
1570
735
if optargfn:
1571
736
if optarg == None:
1572
737
if not argv:
1573
raise BzrError('option %r needs an argument' % a)
738
bailout('option %r needs an argument' % a)
1574
739
else:
1575
740
optarg = argv.pop(0)
1576
741
opts[optname] = optargfn(optarg)
1577
742
else:
1578
743
if optarg != None:
1579
raise BzrError('option %r takes no argument' % optname)
744
bailout('option %r takes no argument' % optname)
1580
745
opts[optname] = True
1581
746
else:
1582
747
args.append(a)
1630
795
return argdict
1631
796
1632
797
1633
def _parse_master_args(argv):
1634
"""Parse the arguments that always go with the original command.
1635
These are things like bzr --no-plugins, etc.
1636
1637
There are now 2 types of option flags. Ones that come *before* the command,
1638
and ones that come *after* the command.
1639
Ones coming *before* the command are applied against all possible commands.
1640
And are generally applied before plugins are loaded.
1641
1642
The current list are:
1643
--builtin Allow plugins to load, but don't let them override builtin commands,
1644
they will still be allowed if they do not override a builtin.
1645
--no-plugins Don't load any plugins. This lets you get back to official source
1646
behavior.
1647
--profile Enable the hotspot profile before running the command.
1648
For backwards compatibility, this is also a non-master option.
1649
--version Spit out the version of bzr that is running and exit.
1650
This is also a non-master option.
1651
--help Run help and exit, also a non-master option (I think that should stay, though)
1652
1653
>>> argv, opts = _parse_master_args(['bzr', '--test'])
1654
Traceback (most recent call last):
1655
...
1656
BzrCommandError: Invalid master option: 'test'
1657
>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1658
>>> print argv
1659
['command']
1660
>>> print opts['version']
1661
True
1662
>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1663
>>> print argv
1664
['command', '--more-options']
1665
>>> print opts['profile']
1666
True
1667
>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1668
>>> print argv
1669
['command']
1670
>>> print opts['no-plugins']
1671
True
1672
>>> print opts['profile']
1673
False
1674
>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1675
>>> print argv
1676
['command', '--profile']
1677
>>> print opts['profile']
1678
False
1679
"""
1680
master_opts = {'builtin':False,
1681
'no-plugins':False,
1682
'version':False,
1683
'profile':False,
1684
'help':False
1685
}
1686
1687
# This is the point where we could hook into argv[0] to determine
1688
# what front-end is supposed to be run
1689
# For now, we are just ignoring it.
1690
cmd_name = argv.pop(0)
1691
for arg in argv[:]:
1692
if arg[:2] != '--': # at the first non-option, we return the rest
1693
break
1694
arg = arg[2:] # Remove '--'
1695
if arg not in master_opts:
1696
# We could say that this is not an error, that we should
1697
# just let it be handled by the main section instead
1698
raise BzrCommandError('Invalid master option: %r' % arg)
1699
argv.pop(0) # We are consuming this entry
1700
master_opts[arg] = True
1701
return argv, master_opts
1702
1703
1704
798
1705
799
def run_bzr(argv):
1706
800
"""Execute a command.
1711
805
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1712
806
1713
807
try:
1714
# some options like --builtin and --no-plugins have special effects
1715
argv, master_opts = _parse_master_args(argv)
1716
if not master_opts['no-plugins']:
1717
from bzrlib.plugin import load_plugins
1718
load_plugins()
1719
1720
args, opts = parse_args(argv)
1721
1722
if master_opts['help']:
1723
from bzrlib.help import help
1724
if argv:
1725
help(argv[0])
1726
else:
1727
help()
1728
return 0
1729
808
args, opts = parse_args(argv[1:])
1730
809
if 'help' in opts:
1731
from bzrlib.help import help
810
import help
1732
811
if args:
1733
help(args[0])
812
help.help(args[0])
1734
813
else:
1735
help()
814
help.help()
1736
815
return 0
1737
816
elif 'version' in opts:
1738
817
show_version()
1739
818
return 0
1740
elif args and args[0] == 'builtin':
1741
include_plugins=False
1742
args = args[1:]
1743
819
cmd = str(args.pop(0))
1744
820
except IndexError:
1745
import help
1746
help.help()
821
log_error('usage: bzr COMMAND')
822
log_error(' try "bzr help"')
1747
823
return 1
1748
1749
1750
plugins_override = not (master_opts['builtin'])
1751
canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1752
1753
profile = master_opts['profile']
1754
# For backwards compatibility, I would rather stick with --profile being a
1755
# master/global option
824
825
canonical_cmd, cmd_class = get_cmd_class(cmd)
826
827
# global option
1756
828
if 'profile' in opts:
1757
829
profile = True
1758
830
del opts['profile']
831
else:
832
profile = False
1759
833
1760
834
# check options are reasonable
1761
835
allowed = cmd_class.takes_options
1762
836
for oname in opts:
1763
837
if oname not in allowed:
1764
raise BzrCommandError("option '--%s' is not allowed for command %r"
838
raise BzrCommandError("option %r is not allowed for command %r"
1765
839
% (oname, cmd))
1766
840
1767
841
# mix arguments and options into one dictionary
1792
866
os.close(pffileno)
1793
867
os.remove(pfname)
1794
868
else:
1795
return cmd_class(cmdopts, cmdargs).status
869
cmdobj = cmd_class(cmdopts, cmdargs).status
1796
870
1797
871
1798
872
def _report_exception(summary, quiet=False):
1810
884
1811
885
1812
886
def main(argv):
887
import errno
1813
888
1814
bzrlib.trace.open_tracefile(argv)
889
bzrlib.open_tracefile(argv)
1815
890
1816
891
try:
1817
892
try:
1838
913
_report_exception('interrupted', quiet=True)
1839
914
return 2
1840
915
except Exception, e:
1841
import errno
1842
916
quiet = False
1843
if (isinstance(e, IOError)
1844
and hasattr(e, 'errno')
1845
and e.errno == errno.EPIPE):
917
if isinstance(e, IOError) and e.errno == errno.EPIPE:
1846
918
quiet = True
1847
919
msg = 'broken pipe'
1848
920
else:
Loggerhead is a web-based interface for Breezy
Version: 2.0.1