« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 495
- compare with another revision
- download diff
- download tarball
- view history from revision 495
- Committer: Martin Pool
- Date: 2005-05-16 01:57:48 UTC
- Revision ID: mbp@sourcefrog.net-20050516015748-e217422f1da5794a
- disallow slash in store ids
- files added:
- bzrlib/statcache.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, Tree
27
from bzrlib.revision import Revision
28
from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
29
format_date
30
from bzrlib import merge
44
31
45
32
46
33
def _squish_command_name(cmd):
51
38
assert cmd.startswith("cmd_")
52
39
return cmd[4:].replace('_','-')
53
40
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 = {}
41
def get_all_cmds():
42
"""Return canonical name and class for all registered commands."""
128
43
for k, v in globals().iteritems():
129
44
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):
45
yield _unsquish_command_name(k), v
46
47
def get_cmd_class(cmd):
148
48
"""Return the canonical name and command class for a command.
149
49
"""
150
50
cmd = str(cmd) # not unicode
151
51
152
52
# first look up this command under the specified name
153
cmds = _get_cmd_dict(plugins_override=plugins_override)
154
53
try:
155
return cmd, cmds[cmd]
54
return cmd, globals()[_squish_command_name(cmd)]
156
55
except KeyError:
157
56
pass
158
57
159
58
# look for any command which claims this as an alias
160
for cmdname, cmdclass in cmds.iteritems():
59
for cmdname, cmdclass in get_all_cmds():
161
60
if cmd in cmdclass.aliases:
162
61
return cmdname, cmdclass
163
62
168
67
raise BzrCommandError("unknown command %r" % cmd)
169
68
170
69
171
class Command(object):
70
class Command:
172
71
"""Base class for commands.
173
72
174
73
The docstring for an actual command should give a single-line
233
132
"""
234
133
235
134
def find_command(cls, cmd):
236
import os.path
237
135
bzrpath = os.environ.get('BZRPATH', '')
238
136
239
for dir in bzrpath.split(os.pathsep):
137
for dir in bzrpath.split(':'):
240
138
path = os.path.join(dir, cmd)
241
139
if os.path.isfile(path):
242
140
return ExternalCommand(path)
248
146
def __init__(self, path):
249
147
self.path = path
250
148
149
# TODO: If either of these fail, we should detect that and
150
# assume that path is not really a bzr plugin after all.
151
251
152
pipe = os.popen('%s --bzr-usage' % path, 'r')
252
153
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
154
self.takes_args = pipe.readline().split()
261
262
if pipe.close() is not None:
263
raise BzrError("Failed funning '%s --bzr-usage'" % path)
155
pipe.close()
264
156
265
157
pipe = os.popen('%s --bzr-help' % path, 'r')
266
158
self.__doc__ = pipe.read()
267
if pipe.close() is not None:
268
raise BzrError("Failed funning '%s --bzr-help'" % path)
159
pipe.close()
269
160
270
161
def __call__(self, options, arguments):
271
162
Command.__init__(self, options, arguments)
278
169
keys = kargs.keys()
279
170
keys.sort()
280
171
for name in keys:
281
optname = name.replace('_','-')
282
172
value = kargs[name]
283
if OPTIONS.has_key(optname):
173
if OPTIONS.has_key(name):
284
174
# it's an option
285
opts.append('--%s' % optname)
175
opts.append('--%s' % name)
286
176
if value is not None and value is not True:
287
177
opts.append(str(value))
288
178
else:
332
222
directory is shown. Otherwise, only the status of the specified
333
223
files or directories is reported. If a directory is given, status
334
224
is reported for everything inside that directory.
335
336
If a revision is specified, the changes since that revision are shown.
337
225
"""
338
226
takes_args = ['file*']
339
takes_options = ['all', 'show-ids', 'revision']
227
takes_options = ['all', 'show-ids']
340
228
aliases = ['st', 'stat']
341
229
342
230
def run(self, all=False, show_ids=False, file_list=None):
343
231
if file_list:
344
b = find_branch(file_list[0])
232
b = Branch(file_list[0], lock_mode='r')
345
233
file_list = [b.relpath(x) for x in file_list]
346
234
# special case: only one path was given and it's the root
347
235
# of the branch
348
236
if file_list == ['']:
349
237
file_list = None
350
238
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)
239
b = Branch('.', lock_mode='r')
240
import status
241
status.show_status(b, show_unchanged=all, show_ids=show_ids,
242
specific_files=file_list)
356
243
357
244
358
245
class cmd_cat_revision(Command):
362
249
takes_args = ['revision_id']
363
250
364
251
def run(self, revision_id):
365
from bzrlib.xml import pack_xml
366
pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
252
Branch('.').get_revision(revision_id).write_xml(sys.stdout)
367
253
368
254
369
255
class cmd_revno(Command):
371
257
372
258
This is equal to the number of revisions on this branch."""
373
259
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)
260
print Branch('.').revno()
397
261
398
262
399
263
class cmd_add(Command):
418
282
recursively add that parent, rather than giving an error?
419
283
"""
420
284
takes_args = ['file+']
421
takes_options = ['verbose', 'no-recurse']
285
takes_options = ['verbose']
422
286
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)
287
def run(self, file_list, verbose=False):
288
bzrlib.add.smart_add(file_list, verbose)
444
289
445
290
446
291
class cmd_relpath(Command):
447
292
"""Show path of a file relative to root"""
448
293
takes_args = ['filename']
449
hidden = True
450
294
451
295
def run(self, filename):
452
print find_branch(filename).relpath(filename)
296
print Branch(filename).relpath(filename)
453
297
454
298
455
299
456
300
class cmd_inventory(Command):
457
301
"""Show inventory of the current working copy or a revision."""
458
takes_options = ['revision', 'show-ids']
302
takes_options = ['revision']
459
303
460
def run(self, revision=None, show_ids=False):
461
b = find_branch('.')
304
def run(self, revision=None):
305
b = Branch('.')
462
306
if revision == None:
463
307
inv = b.read_working_inventory()
464
308
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]))
309
inv = b.get_revision_inventory(b.lookup_revision(revision))
469
310
470
for path, entry in inv.entries():
471
if show_ids:
472
print '%-50s %s' % (path, entry.file_id)
473
else:
474
print path
311
for path, entry in inv.iter_entries():
312
print '%-50s %s' % (entry.file_id, path)
475
313
476
314
477
315
class cmd_move(Command):
484
322
"""
485
323
takes_args = ['source$', 'dest']
486
324
def run(self, source_list, dest):
487
b = find_branch('.')
325
b = Branch('.')
488
326
489
327
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
490
328
506
344
takes_args = ['from_name', 'to_name']
507
345
508
346
def run(self, from_name, to_name):
509
b = find_branch('.')
347
b = Branch('.')
510
348
b.rename_one(b.relpath(from_name), b.relpath(to_name))
511
349
512
350
513
351
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
352
class cmd_renames(Command):
662
353
"""Show list of renamed files.
663
354
668
359
takes_args = ['dir?']
669
360
670
361
def run(self, dir='.'):
671
b = find_branch(dir)
362
b = Branch(dir)
672
363
old_inv = b.basis_tree().inventory
673
364
new_inv = b.read_working_inventory()
674
365
685
376
def run(self, branch=None):
686
377
import info
687
378
379
from branch import find_branch
688
380
b = find_branch(branch)
689
381
info.show_info(b)
690
382
699
391
takes_options = ['verbose']
700
392
701
393
def run(self, file_list, verbose=False):
702
b = find_branch(file_list[0])
394
b = Branch(file_list[0])
703
395
b.remove([b.relpath(f) for f in file_list], verbose=verbose)
704
396
705
397
713
405
hidden = True
714
406
takes_args = ['filename']
715
407
def run(self, filename):
716
b = find_branch(filename)
408
b = Branch(filename)
717
409
i = b.inventory.path2id(b.relpath(filename))
718
410
if i == None:
719
raise BzrError("%r is not a versioned file" % filename)
411
bailout("%r is not a versioned file" % filename)
720
412
else:
721
413
print i
722
414
729
421
hidden = True
730
422
takes_args = ['filename']
731
423
def run(self, filename):
732
b = find_branch(filename)
424
b = Branch(filename)
733
425
inv = b.inventory
734
426
fid = inv.path2id(b.relpath(filename))
735
427
if fid == None:
736
raise BzrError("%r is not a versioned file" % filename)
428
bailout("%r is not a versioned file" % filename)
737
429
for fip in inv.get_idpath(fid):
738
430
print fip
739
431
740
432
741
433
class cmd_revision_history(Command):
742
434
"""Display list of revision ids on this branch."""
743
hidden = True
744
435
def run(self):
745
for patchid in find_branch('.').revision_history():
436
for patchid in Branch('.').revision_history():
746
437
print patchid
747
438
748
439
749
440
class cmd_directories(Command):
750
441
"""Display list of versioned directories in this branch."""
751
442
def run(self):
752
for name, ie in find_branch('.').read_working_inventory().directories():
443
for name, ie in Branch('.').read_working_inventory().directories():
753
444
if name == '':
754
445
print '.'
755
446
else:
770
461
bzr commit -m 'imported project'
771
462
"""
772
463
def run(self):
773
from bzrlib.branch import Branch
774
464
Branch('.', init=True)
775
465
776
466
799
489
"""
800
490
801
491
takes_args = ['file*']
802
takes_options = ['revision', 'diff-options']
803
aliases = ['di', 'dif']
492
takes_options = ['revision']
493
aliases = ['di']
804
494
805
def run(self, revision=None, file_list=None, diff_options=None):
495
def run(self, revision=None, file_list=None):
806
496
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
497
824
show_diff(b, base_rev, specific_files=file_list,
825
external_diff_options=diff_options)
498
show_diff(Branch('.'), revision, specific_files=file_list)
826
499
827
500
828
501
834
507
TODO: Show files deleted since a previous revision, or between two revisions.
835
508
"""
836
509
def run(self, show_ids=False):
837
b = find_branch('.')
510
b = Branch('.')
838
511
old = b.basis_tree()
839
512
new = b.working_tree()
840
513
855
528
"""List files modified in working tree."""
856
529
hidden = True
857
530
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
531
import statcache
532
b = Branch('.')
533
inv = b.read_working_inventory()
534
sc = statcache.update_cache(b, inv)
535
basis = b.basis_tree()
536
basis_inv = basis.inventory
537
538
# We used to do this through iter_entries(), but that's slow
539
# when most of the files are unmodified, as is usually the
540
# case. So instead we iterate by inventory entry, and only
541
# calculate paths as necessary.
542
543
for file_id in basis_inv:
544
cacheentry = sc.get(file_id)
545
if not cacheentry: # deleted
546
continue
547
ie = basis_inv[file_id]
548
if cacheentry[statcache.SC_SHA1] != ie.text_sha1:
549
path = inv.id2path(file_id)
550
print path
865
551
866
552
867
553
869
555
"""List files added in working tree."""
870
556
hidden = True
871
557
def run(self):
872
b = find_branch('.')
558
b = Branch('.')
873
559
wt = b.working_tree()
874
560
basis_inv = b.basis_tree().inventory
875
561
inv = wt.inventory
891
577
takes_args = ['filename?']
892
578
def run(self, filename=None):
893
579
"""Print the branch root."""
580
from branch import find_branch
894
581
b = find_branch(filename)
895
582
print getattr(b, 'base', None) or getattr(b, 'baseurl')
896
583
898
585
class cmd_log(Command):
899
586
"""Show log of this branch.
900
587
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
588
TODO: Option to limit range.
589
590
TODO: Perhaps show most-recent first with an option for last.
910
591
"""
911
912
592
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
593
takes_options = ['timezone', 'verbose', 'show-ids']
594
def run(self, filename=None, timezone='original', verbose=False, show_ids=False):
595
from branch import find_branch
596
b = find_branch((filename or '.'), lock_mode='r')
928
597
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)
598
filename = b.relpath(filename)
599
bzrlib.show_log(b, filename,
600
show_timezone=timezone,
601
verbose=verbose,
602
show_ids=show_ids)
978
603
979
604
980
605
981
606
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"."""
607
"""Return revision-ids which affected a particular file."""
985
608
hidden = True
986
609
takes_args = ["filename"]
987
610
def run(self, filename):
988
b = find_branch(filename)
611
b = Branch(filename, lock_mode='r')
989
612
inv = b.read_working_inventory()
990
613
file_id = inv.path2id(b.relpath(filename))
991
614
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
999
622
"""
1000
623
hidden = True
1001
624
def run(self, revision=None, verbose=False):
1002
b = find_branch('.')
625
b = Branch('.')
1003
626
if revision == None:
1004
627
tree = b.working_tree()
1005
628
else:
1021
644
1022
645
1023
646
class cmd_unknowns(Command):
1024
"""List unknown files."""
647
"""List unknown files"""
1025
648
def run(self):
1026
from bzrlib.osutils import quotefn
1027
for f in find_branch('.').unknowns():
649
for f in Branch('.').unknowns():
1028
650
print quotefn(f)
1029
651
1030
652
1031
653
1032
654
class cmd_ignore(Command):
1033
"""Ignore a command or pattern.
655
"""Ignore a command or pattern
1034
656
1035
657
To remove patterns from the ignore list, edit the .bzrignore file.
1036
658
1050
672
1051
673
def run(self, name_pattern):
1052
674
from bzrlib.atomicfile import AtomicFile
1053
import os.path
675
import codecs
1054
676
1055
b = find_branch('.')
677
b = Branch('.')
1056
678
ifn = b.abspath('.bzrignore')
1057
679
680
# FIXME: probably doesn't handle non-ascii patterns
681
1058
682
if os.path.exists(ifn):
1059
f = open(ifn, 'rt')
1060
try:
1061
igns = f.read().decode('utf-8')
1062
finally:
1063
f.close()
683
f = b.controlfile(ifn, 'rt')
684
igns = f.read()
685
f.close()
1064
686
else:
1065
687
igns = ''
1066
688
1067
# TODO: If the file already uses crlf-style termination, maybe
1068
# we should use that for the newly added lines?
1069
1070
689
if igns and igns[-1] != '\n':
1071
690
igns += '\n'
1072
691
igns += name_pattern + '\n'
1073
692
1074
try:
1075
f = AtomicFile(ifn, 'wt')
1076
f.write(igns.encode('utf-8'))
1077
f.commit()
1078
finally:
1079
f.close()
693
f = AtomicFile(ifn, 'wt')
694
f.write(igns)
695
f.commit()
1080
696
1081
697
inv = b.working_tree().inventory
1082
698
if inv.path2id('.bzrignore'):
1092
708
1093
709
See also: bzr ignore"""
1094
710
def run(self):
1095
tree = find_branch('.').working_tree()
711
tree = Branch('.').working_tree()
1096
712
for path, file_class, kind, file_id in tree.list_files():
1097
713
if file_class != 'I':
1098
714
continue
1116
732
except ValueError:
1117
733
raise BzrCommandError("not a valid revision-number: %r" % revno)
1118
734
1119
print find_branch('.').lookup_revision(revno)
735
print Branch('.').lookup_revision(revno)
1120
736
1121
737
1122
738
class cmd_export(Command):
1123
739
"""Export past revision to destination directory.
1124
740
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
741
If no revision is specified this exports the last committed revision."""
1134
742
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()
743
takes_options = ['revision']
744
def run(self, dest, revision=None):
745
b = Branch('.')
746
if revision == None:
747
rh = b.revision_history()[-1]
1141
748
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)
749
rh = b.lookup_revision(int(revision))
750
t = b.revision_tree(rh)
751
t.export(dest)
1157
752
1158
753
1159
754
class cmd_cat(Command):
1165
760
def run(self, filename, revision=None):
1166
761
if revision == None:
1167
762
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])
763
b = Branch('.')
764
b.print_file(b.relpath(filename), int(revision))
1172
765
1173
766
1174
767
class cmd_local_time_offset(Command):
1195
788
TODO: Strict commit that fails if there are unknown or deleted files.
1196
789
"""
1197
790
takes_args = ['selected*']
1198
takes_options = ['message', 'file', 'verbose', 'unchanged']
791
takes_options = ['message', 'file', 'verbose']
1199
792
aliases = ['ci', 'checkin']
1200
793
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
794
def run(self, message=None, file=None, verbose=False, selected_list=None):
795
from bzrlib.commit import commit
1205
796
1206
797
## Warning: shadows builtin file()
1207
798
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"])
799
raise BzrCommandError("please specify a commit message",
800
["use either --message or --file"])
1220
801
elif message and file:
1221
802
raise BzrCommandError("please specify either --message or --file")
1222
803
1224
805
import codecs
1225
806
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1226
807
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"])
808
b = Branch('.')
809
commit(b, message, verbose=verbose, specific_files=selected_list)
1238
810
1239
811
1240
812
class cmd_check(Command):
1242
814
1243
815
This command checks various invariants about the branch storage to
1244
816
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_scan_cache(Command):
1258
hidden = True
1259
def run(self):
1260
from bzrlib.hashcache import HashCache
1261
import os
1262
1263
c = HashCache('.')
1264
c.read()
1265
c.scan()
1266
1267
print '%6d stats' % c.stat_count
1268
print '%6d in hashcache' % len(c._cache)
1269
print '%6d files removed from cache' % c.removed_count
1270
print '%6d hashes updated' % c.update_count
1271
print '%6d files changed too recently to cache' % c.danger_count
1272
1273
if c.needs_write:
1274
c.write()
1275
1276
1277
1278
class cmd_upgrade(Command):
1279
"""Upgrade branch storage to current format.
1280
1281
This should normally be used only after the check command tells
1282
you to run it.
1283
"""
1284
takes_args = ['dir?']
1285
1286
def run(self, dir='.'):
1287
from bzrlib.upgrade import upgrade
1288
upgrade(find_branch(dir))
817
"""
818
takes_args = ['dir?']
819
def run(self, dir='.'):
820
import bzrlib.check
821
bzrlib.check.check(Branch(dir, find_root=False))
1289
822
1290
823
1291
824
1304
837
"""Run internal test suite"""
1305
838
hidden = True
1306
839
def run(self):
1307
from bzrlib.selftest import selftest
1308
return int(not selftest())
840
failures, tests = 0, 0
841
842
import doctest, bzrlib.store, bzrlib.tests
843
bzrlib.trace.verbose = False
844
845
for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
846
bzrlib.tree, bzrlib.tests, bzrlib.commands, bzrlib.add:
847
mf, mt = doctest.testmod(m)
848
failures += mf
849
tests += mt
850
print '%-40s %3d tests' % (m.__name__, mt),
851
if mf:
852
print '%3d FAILED!' % mf
853
else:
854
print
855
856
print '%-40s %3d tests' % ('total', tests),
857
if failures:
858
print '%3d FAILED!' % failures
859
else:
860
print
861
1309
862
1310
863
1311
864
class cmd_version(Command):
1312
"""Show version of bzr."""
865
"""Show version of bzr"""
1313
866
def run(self):
1314
867
show_version()
1315
868
1316
869
def show_version():
1317
870
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1318
# is bzrlib itself in a branch?
1319
bzrrev = bzrlib.get_bzr_revision()
1320
if bzrrev:
1321
print " (bzr checkout, revision %d {%s})" % bzrrev
1322
871
print bzrlib.__copyright__
1323
872
print "http://bazaar-ng.org/"
1324
873
print
1334
883
print "it sure does!"
1335
884
1336
885
def parse_spec(spec):
1337
"""
1338
>>> parse_spec(None)
1339
[None, None]
1340
>>> parse_spec("./")
1341
['./', None]
1342
>>> parse_spec("../@")
1343
['..', -1]
1344
>>> parse_spec("../f/@35")
1345
['../f', 35]
1346
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1347
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1348
"""
1349
if spec is None:
1350
return [None, None]
1351
886
if '/@' in spec:
1352
887
parsed = spec.split('/@')
1353
888
assert len(parsed) == 2
1354
889
if parsed[1] == "":
1355
890
parsed[1] = -1
1356
891
else:
1357
try:
1358
parsed[1] = int(parsed[1])
1359
except ValueError:
1360
pass # We can allow stuff like ./@revid:blahblahblah
1361
else:
1362
assert parsed[1] >=0
892
parsed[1] = int(parsed[1])
893
assert parsed[1] >=0
1363
894
else:
1364
895
parsed = [spec, None]
1365
896
return parsed
1366
897
1367
1368
1369
898
class cmd_merge(Command):
1370
"""Perform a three-way merge of trees.
1371
1372
The SPEC parameters are working tree or revision specifiers. Working trees
1373
are specified using standard paths or urls. No component of a directory
1374
path may begin with '@'.
1375
1376
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1377
1378
Revisions are specified using a dirname/@revno pair, where dirname is the
1379
branch directory and revno is the revision within that branch. If no revno
1380
is specified, the latest revision is used.
1381
1382
Revision examples: './@127', 'foo/@', '../@1'
1383
1384
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1385
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1386
as the BASE.
1387
1388
merge refuses to run if there are any uncommitted changes, unless
1389
--force is given.
1390
"""
1391
takes_args = ['other_spec', 'base_spec?']
1392
takes_options = ['force']
1393
1394
def run(self, other_spec, base_spec=None, force=False):
1395
from bzrlib.merge import merge
1396
merge(parse_spec(other_spec), parse_spec(base_spec),
1397
check_clean=(not force))
1398
1399
1400
1401
class cmd_revert(Command):
1402
"""Restore selected files from a previous revision.
1403
"""
1404
takes_args = ['file+']
1405
def run(self, file_list):
1406
from bzrlib.branch import find_branch
1407
1408
if not file_list:
1409
file_list = ['.']
1410
1411
b = find_branch(file_list[0])
1412
1413
b.revert([b.relpath(f) for f in file_list])
1414
1415
1416
class cmd_merge_revert(Command):
1417
"""Reverse all changes since the last commit.
1418
1419
Only versioned files are affected.
1420
1421
TODO: Store backups of any files that will be reverted, so
1422
that the revert can be undone.
1423
"""
1424
takes_options = ['revision']
1425
1426
def run(self, revision=None):
1427
from bzrlib.merge import merge
1428
if revision is None:
1429
revision = [-1]
1430
elif len(revision) != 1:
1431
raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1432
merge(('.', revision[0]), parse_spec('.'),
1433
check_clean=False,
1434
ignore_zero=True)
1435
899
"""Perform a three-way merge of trees."""
900
takes_args = ['other_spec', 'base_spec']
901
902
def run(self, other_spec, base_spec):
903
merge.merge(parse_spec(other_spec), parse_spec(base_spec))
1436
904
1437
905
class cmd_assert_fail(Command):
1438
906
"""Test reporting of assertion failures"""
1453
921
help.help(topic)
1454
922
1455
923
1456
1457
1458
class cmd_plugins(Command):
1459
"""List plugins"""
924
class cmd_update_stat_cache(Command):
925
"""Update stat-cache mapping inodes to SHA-1 hashes.
926
927
For testing only."""
1460
928
hidden = True
1461
929
def run(self):
1462
import bzrlib.plugin
1463
from inspect import getdoc
1464
from pprint import pprint
1465
for plugin in bzrlib.plugin.all_plugins:
1466
print plugin.__path__[0]
1467
d = getdoc(plugin)
1468
if d:
1469
print '\t', d.split('\n')[0]
1470
1471
#pprint(bzrlib.plugin.all_plugins)
1472
930
import statcache
931
b = Branch('.')
932
statcache.update_cache(b.base, b.read_working_inventory())
933
934
935
######################################################################
936
# main routine
1473
937
1474
938
1475
939
# list of all available options; the rhs can be either None for an
1477
941
# the type.
1478
942
OPTIONS = {
1479
943
'all': None,
1480
'diff-options': str,
1481
944
'help': None,
1482
945
'file': unicode,
1483
'force': None,
1484
'format': unicode,
1485
'forward': None,
1486
946
'message': unicode,
1487
'no-recurse': None,
1488
947
'profile': None,
1489
'revision': _parse_revision_str,
948
'revision': int,
1490
949
'show-ids': None,
1491
950
'timezone': str,
1492
951
'verbose': None,
1493
952
'version': None,
1494
953
'email': None,
1495
'unchanged': None,
1496
'update': None,
1497
'long': None,
1498
'root': str,
1499
954
}
1500
955
1501
956
SHORT_OPTIONS = {
957
'm': 'message',
1502
958
'F': 'file',
1503
'h': 'help',
1504
'm': 'message',
1505
959
'r': 'revision',
1506
960
'v': 'verbose',
1507
'l': 'long',
1508
961
}
1509
962
1510
963
1524
977
(['status'], {'all': True})
1525
978
>>> parse_args('commit --message=biter'.split())
1526
979
(['commit'], {'message': u'biter'})
1527
>>> parse_args('log -r 500'.split())
1528
(['log'], {'revision': [500]})
1529
>>> parse_args('log -r500..600'.split())
1530
(['log'], {'revision': [500, 600]})
1531
>>> parse_args('log -vr500..600'.split())
1532
(['log'], {'verbose': True, 'revision': [500, 600]})
1533
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1534
(['log'], {'revision': ['v500', 600]})
1535
980
"""
1536
981
args = []
1537
982
opts = {}
1551
996
else:
1552
997
optname = a[2:]
1553
998
if optname not in OPTIONS:
1554
raise BzrError('unknown long option %r' % a)
999
bailout('unknown long option %r' % a)
1555
1000
else:
1556
1001
shortopt = a[1:]
1557
if shortopt in SHORT_OPTIONS:
1558
# Multi-character options must have a space to delimit
1559
# their value
1560
optname = SHORT_OPTIONS[shortopt]
1561
else:
1562
# Single character short options, can be chained,
1563
# and have their value appended to their name
1564
shortopt = a[1:2]
1565
if shortopt not in SHORT_OPTIONS:
1566
# We didn't find the multi-character name, and we
1567
# didn't find the single char name
1568
raise BzrError('unknown short option %r' % a)
1569
optname = SHORT_OPTIONS[shortopt]
1570
1571
if a[2:]:
1572
# There are extra things on this option
1573
# see if it is the value, or if it is another
1574
# short option
1575
optargfn = OPTIONS[optname]
1576
if optargfn is None:
1577
# This option does not take an argument, so the
1578
# next entry is another short option, pack it back
1579
# into the list
1580
argv.insert(0, '-' + a[2:])
1581
else:
1582
# This option takes an argument, so pack it
1583
# into the array
1584
optarg = a[2:]
1002
if shortopt not in SHORT_OPTIONS:
1003
bailout('unknown short option %r' % a)
1004
optname = SHORT_OPTIONS[shortopt]
1585
1005
1586
1006
if optname in opts:
1587
1007
# XXX: Do we ever want to support this, e.g. for -r?
1588
raise BzrError('repeated option %r' % a)
1008
bailout('repeated option %r' % a)
1589
1009
1590
1010
optargfn = OPTIONS[optname]
1591
1011
if optargfn:
1592
1012
if optarg == None:
1593
1013
if not argv:
1594
raise BzrError('option %r needs an argument' % a)
1014
bailout('option %r needs an argument' % a)
1595
1015
else:
1596
1016
optarg = argv.pop(0)
1597
1017
opts[optname] = optargfn(optarg)
1598
1018
else:
1599
1019
if optarg != None:
1600
raise BzrError('option %r takes no argument' % optname)
1020
bailout('option %r takes no argument' % optname)
1601
1021
opts[optname] = True
1602
1022
else:
1603
1023
args.append(a)
1651
1071
return argdict
1652
1072
1653
1073
1654
def _parse_master_args(argv):
1655
"""Parse the arguments that always go with the original command.
1656
These are things like bzr --no-plugins, etc.
1657
1658
There are now 2 types of option flags. Ones that come *before* the command,
1659
and ones that come *after* the command.
1660
Ones coming *before* the command are applied against all possible commands.
1661
And are generally applied before plugins are loaded.
1662
1663
The current list are:
1664
--builtin Allow plugins to load, but don't let them override builtin commands,
1665
they will still be allowed if they do not override a builtin.
1666
--no-plugins Don't load any plugins. This lets you get back to official source
1667
behavior.
1668
--profile Enable the hotspot profile before running the command.
1669
For backwards compatibility, this is also a non-master option.
1670
--version Spit out the version of bzr that is running and exit.
1671
This is also a non-master option.
1672
--help Run help and exit, also a non-master option (I think that should stay, though)
1673
1674
>>> argv, opts = _parse_master_args(['bzr', '--test'])
1675
Traceback (most recent call last):
1676
...
1677
BzrCommandError: Invalid master option: 'test'
1678
>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1679
>>> print argv
1680
['command']
1681
>>> print opts['version']
1682
True
1683
>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1684
>>> print argv
1685
['command', '--more-options']
1686
>>> print opts['profile']
1687
True
1688
>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1689
>>> print argv
1690
['command']
1691
>>> print opts['no-plugins']
1692
True
1693
>>> print opts['profile']
1694
False
1695
>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1696
>>> print argv
1697
['command', '--profile']
1698
>>> print opts['profile']
1699
False
1700
"""
1701
master_opts = {'builtin':False,
1702
'no-plugins':False,
1703
'version':False,
1704
'profile':False,
1705
'help':False
1706
}
1707
1708
# This is the point where we could hook into argv[0] to determine
1709
# what front-end is supposed to be run
1710
# For now, we are just ignoring it.
1711
cmd_name = argv.pop(0)
1712
for arg in argv[:]:
1713
if arg[:2] != '--': # at the first non-option, we return the rest
1714
break
1715
arg = arg[2:] # Remove '--'
1716
if arg not in master_opts:
1717
# We could say that this is not an error, that we should
1718
# just let it be handled by the main section instead
1719
raise BzrCommandError('Invalid master option: %r' % arg)
1720
argv.pop(0) # We are consuming this entry
1721
master_opts[arg] = True
1722
return argv, master_opts
1723
1724
1725
1074
1726
1075
def run_bzr(argv):
1727
1076
"""Execute a command.
1732
1081
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1733
1082
1734
1083
try:
1735
# some options like --builtin and --no-plugins have special effects
1736
argv, master_opts = _parse_master_args(argv)
1737
if not master_opts['no-plugins']:
1738
from bzrlib.plugin import load_plugins
1739
load_plugins()
1740
1741
args, opts = parse_args(argv)
1742
1743
if master_opts['help']:
1744
from bzrlib.help import help
1745
if argv:
1746
help(argv[0])
1747
else:
1748
help()
1749
return 0
1750
1084
args, opts = parse_args(argv[1:])
1751
1085
if 'help' in opts:
1752
from bzrlib.help import help
1086
import help
1753
1087
if args:
1754
help(args[0])
1088
help.help(args[0])
1755
1089
else:
1756
help()
1090
help.help()
1757
1091
return 0
1758
1092
elif 'version' in opts:
1759
1093
show_version()
1760
1094
return 0
1761
elif args and args[0] == 'builtin':
1762
include_plugins=False
1763
args = args[1:]
1764
1095
cmd = str(args.pop(0))
1765
1096
except IndexError:
1766
1097
import help
1768
1099
return 1
1769
1100
1770
1101
1771
plugins_override = not (master_opts['builtin'])
1772
canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1102
canonical_cmd, cmd_class = get_cmd_class(cmd)
1773
1103
1774
profile = master_opts['profile']
1775
# For backwards compatibility, I would rather stick with --profile being a
1776
# master/global option
1104
# global option
1777
1105
if 'profile' in opts:
1778
1106
profile = True
1779
1107
del opts['profile']
1108
else:
1109
profile = False
1780
1110
1781
1111
# check options are reasonable
1782
1112
allowed = cmd_class.takes_options
1813
1143
os.close(pffileno)
1814
1144
os.remove(pfname)
1815
1145
else:
1816
return cmd_class(cmdopts, cmdargs).status
1146
cmdobj = cmd_class(cmdopts, cmdargs).status
1817
1147
1818
1148
1819
1149
def _report_exception(summary, quiet=False):
1831
1161
1832
1162
1833
1163
def main(argv):
1164
import errno
1834
1165
1835
bzrlib.trace.open_tracefile(argv)
1166
bzrlib.open_tracefile(argv)
1836
1167
1837
1168
try:
1838
1169
try:
1859
1190
_report_exception('interrupted', quiet=True)
1860
1191
return 2
1861
1192
except Exception, e:
1862
import errno
1863
1193
quiet = False
1864
1194
if (isinstance(e, IOError)
1865
1195
and hasattr(e, 'errno')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1