« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 856
- compare with another revision
- download diff
- download tarball
- view history from revision 856
- Committer: Martin Pool
- Date: 2005-07-07 10:31:36 UTC
- Revision ID: mbp@sourcefrog.net-20050707103135-9b4d911d8df6e880
- fix pwk help
- files added:
- bzrlib/statcache.py
- files removed:
- bzrlib/intset.py
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
19
19
import sys, os
20
20
21
21
import bzrlib
22
from bzrlib.trace import mutter, note, log_error, warning
22
from bzrlib.trace import mutter, note, log_error
23
23
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError
24
24
from bzrlib.branch import find_branch
25
25
from bzrlib import BZRDIR
51
51
assert cmd.startswith("cmd_")
52
52
return cmd[4:].replace('_','-')
53
53
54
55
54
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']
55
"""This handles a revision string -> revno.
56
57
There are several possibilities:
58
59
'234' -> 234
60
'234:345' -> [234, 345]
61
':234' -> [None, 234]
62
'234:' -> [234, None]
63
64
In the future we will also support:
65
'uuid:blah-blah-blah' -> ?
66
'hash:blahblahblah' -> ?
67
potentially:
68
'tag:mytag' -> ?
99
69
"""
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)
70
if revstr.find(':') != -1:
71
revs = revstr.split(':')
72
if len(revs) > 2:
73
raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)
74
75
if not revs[0]:
76
revs[0] = None
77
else:
78
revs[0] = int(revs[0])
79
80
if not revs[1]:
81
revs[1] = None
82
else:
83
revs[1] = int(revs[1])
84
else:
85
revs = int(revstr)
122
86
return revs
123
87
124
88
125
def get_merge_type(typestring):
126
"""Attempt to find the merge class/factory associated with a string."""
127
from merge import merge_types
128
try:
129
return merge_types[typestring][0]
130
except KeyError:
131
templ = '%s%%7s: %%s' % (' '*12)
132
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
133
type_list = '\n'.join(lines)
134
msg = "No known merge type %s. Supported types are:\n%s" %\
135
(typestring, type_list)
136
raise BzrCommandError(msg)
137
138
139
89
140
90
def _get_cmd_dict(plugins_override=True):
141
91
d = {}
214
164
assert isinstance(arguments, dict)
215
165
cmdargs = options.copy()
216
166
cmdargs.update(arguments)
217
if self.__doc__ == Command.__doc__:
218
from warnings import warn
219
warn("No help message set for %r" % self)
167
assert self.__doc__ != Command.__doc__, \
168
("No help message set for %r" % self)
220
169
self.status = self.run(**cmdargs)
221
if self.status is None:
222
self.status = 0
223
170
224
171
225
172
def run(self):
349
296
directory is shown. Otherwise, only the status of the specified
350
297
files or directories is reported. If a directory is given, status
351
298
is reported for everything inside that directory.
352
353
If a revision is specified, the changes since that revision are shown.
354
299
"""
355
300
takes_args = ['file*']
356
takes_options = ['all', 'show-ids', 'revision']
301
takes_options = ['all', 'show-ids']
357
302
aliases = ['st', 'stat']
358
303
359
304
def run(self, all=False, show_ids=False, file_list=None):
366
311
file_list = None
367
312
else:
368
313
b = find_branch('.')
369
370
from bzrlib.status import show_status
371
show_status(b, show_unchanged=all, show_ids=show_ids,
372
specific_files=file_list)
314
import status
315
status.show_status(b, show_unchanged=all, show_ids=show_ids,
316
specific_files=file_list)
373
317
374
318
375
319
class cmd_cat_revision(Command):
390
334
def run(self):
391
335
print find_branch('.').revno()
392
336
393
class cmd_revision_info(Command):
394
"""Show revision number and revision id for a given revision identifier.
395
"""
396
hidden = True
397
takes_args = ['revision_info*']
398
takes_options = ['revision']
399
def run(self, revision=None, revision_info_list=None):
400
from bzrlib.branch import find_branch
401
402
revs = []
403
if revision is not None:
404
revs.extend(revision)
405
if revision_info_list is not None:
406
revs.extend(revision_info_list)
407
if len(revs) == 0:
408
raise BzrCommandError('You must supply a revision identifier')
409
410
b = find_branch('.')
411
412
for rev in revs:
413
print '%4d %s' % b.get_revision_info(rev)
414
415
337
416
338
class cmd_add(Command):
417
339
"""Add specified files or directories.
426
348
whether already versioned or not, are searched for files or
427
349
subdirectories that are neither versioned or ignored, and these
428
350
are added. This search proceeds recursively into versioned
429
directories. If no names are given '.' is assumed.
351
directories.
430
352
431
Therefore simply saying 'bzr add' will version all files that
353
Therefore simply saying 'bzr add .' will version all files that
432
354
are currently unknown.
433
355
434
356
TODO: Perhaps adding a file whose directly is not versioned should
435
357
recursively add that parent, rather than giving an error?
436
358
"""
437
takes_args = ['file*']
359
takes_args = ['file+']
438
360
takes_options = ['verbose', 'no-recurse']
439
361
440
362
def run(self, file_list, verbose=False, no_recurse=False):
479
401
if revision == None:
480
402
inv = b.read_working_inventory()
481
403
else:
482
if len(revision) > 1:
483
raise BzrCommandError('bzr inventory --revision takes'
484
' exactly one revision identifier')
485
inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
404
inv = b.get_revision_inventory(b.lookup_revision(revision))
486
405
487
406
for path, entry in inv.entries():
488
407
if show_ids:
610
529
from meta_store import CachedStore
611
530
import tempfile
612
531
cache_root = tempfile.mkdtemp()
613
614
if revision is None:
615
revision = [None]
616
elif len(revision) > 1:
617
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
618
619
532
try:
620
533
try:
621
534
br_from = find_cached_branch(from_location, cache_root)
642
555
raise
643
556
br_to = Branch(to_location, init=True)
644
557
645
br_to.set_root_id(br_from.get_root_id())
646
647
if revision:
648
if revision[0] is None:
649
revno = br_from.revno()
650
else:
651
revno, rev_id = br_from.get_revision_info(revision[0])
652
try:
653
br_to.update_revisions(br_from, stop_revision=revno)
654
except NoSuchRevision:
655
rmtree(to_location)
656
msg = "The branch %s has no revision %d." % (from_location,
657
revno)
658
raise BzrCommandError(msg)
659
558
try:
559
br_to.update_revisions(br_from, stop_revision=revision)
560
except NoSuchRevision:
561
rmtree(to_location)
562
msg = "The branch %s has no revision %d." % (from_location,
563
revision)
564
raise BzrCommandError(msg)
660
565
merge((to_location, -1), (to_location, 0), this_dir=to_location,
661
566
check_clean=False, ignore_zero=True)
662
567
from_location = pull_loc(br_from)
830
735
file_list = None
831
736
else:
832
737
b = find_branch('.')
833
834
# TODO: Make show_diff support taking 2 arguments
835
base_rev = None
836
if revision is not None:
837
if len(revision) != 1:
838
raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')
839
base_rev = revision[0]
840
738
841
show_diff(b, base_rev, specific_files=file_list,
739
show_diff(b, revision, specific_files=file_list,
842
740
external_diff_options=diff_options)
843
741
844
742
872
770
"""List files modified in working tree."""
873
771
hidden = True
874
772
def run(self):
875
from bzrlib.diff import compare_trees
876
773
from bzrlib.statcache import update_cache, SC_SHA1
877
774
b = find_branch('.')
878
td = compare_trees(b.basis_tree(), b.working_tree())
775
inv = b.read_working_inventory()
776
sc = update_cache(b, inv)
777
basis = b.basis_tree()
778
basis_inv = basis.inventory
779
780
# We used to do this through iter_entries(), but that's slow
781
# when most of the files are unmodified, as is usually the
782
# case. So instead we iterate by inventory entry, and only
783
# calculate paths as necessary.
879
784
880
for path, id, kind in td.modified:
881
print path
785
for file_id in basis_inv:
786
cacheentry = sc.get(file_id)
787
if not cacheentry: # deleted
788
continue
789
ie = basis_inv[file_id]
790
if cacheentry[SC_SHA1] != ie.text_sha1:
791
path = inv.id2path(file_id)
792
print path
882
793
883
794
884
795
919
830
-r revision requests a specific revision, -r :end or -r begin: are
920
831
also valid.
921
832
922
--message allows you to give a regular expression, which will be evaluated
923
so that only matching entries will be displayed.
924
925
833
TODO: Make --revision support uuid: and hash: [future tag:] notation.
926
834
927
835
"""
928
836
929
837
takes_args = ['filename?']
930
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
838
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long']
931
839
932
840
def run(self, filename=None, timezone='original',
933
841
verbose=False,
934
842
show_ids=False,
935
843
forward=False,
936
844
revision=None,
937
message=None,
938
845
long=False):
939
846
from bzrlib.branch import find_branch
940
847
from bzrlib.log import log_formatter, show_log
953
860
b = find_branch('.')
954
861
file_id = None
955
862
956
if revision is None:
957
rev1 = None
958
rev2 = None
959
elif len(revision) == 1:
960
rev1 = rev2 = b.get_revision_info(revision[0])[0]
961
elif len(revision) == 2:
962
rev1 = b.get_revision_info(revision[0])[0]
963
rev2 = b.get_revision_info(revision[1])[0]
863
if revision == None:
864
revision = [None, None]
865
elif isinstance(revision, int):
866
revision = [revision, revision]
964
867
else:
965
raise BzrCommandError('bzr log --revision takes one or two values.')
966
967
if rev1 == 0:
968
rev1 = None
969
if rev2 == 0:
970
rev2 = None
868
# pair of revisions?
869
pass
870
871
assert len(revision) == 2
971
872
972
873
mutter('encoding log as %r' % bzrlib.user_encoding)
973
874
989
890
file_id,
990
891
verbose=verbose,
991
892
direction=direction,
992
start_revision=rev1,
993
end_revision=rev2,
994
search=message)
893
start_revision=revision[0],
894
end_revision=revision[1])
995
895
996
896
997
897
1142
1042
If no revision is specified this exports the last committed revision.
1143
1043
1144
1044
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1145
given, try to find the format with the extension. If no extension
1146
is found exports to a directory (equivalent to --format=dir).
1045
given, exports to a directory (equivalent to --format=dir).
1147
1046
1148
Root may be the top directory for tar, tgz and tbz2 formats. If none
1149
is given, the top directory will be the root name of the file."""
1047
Root may be the top directory for tar, tgz and tbz2 formats."""
1150
1048
# TODO: list known exporters
1151
1049
takes_args = ['dest']
1152
1050
takes_options = ['revision', 'format', 'root']
1153
def run(self, dest, revision=None, format=None, root=None):
1154
import os.path
1051
def run(self, dest, revision=None, format='dir', root=None):
1155
1052
b = find_branch('.')
1156
if revision is None:
1157
rev_id = b.last_patch()
1053
if revision == None:
1054
rh = b.revision_history()[-1]
1158
1055
else:
1159
if len(revision) != 1:
1160
raise BzrError('bzr export --revision takes exactly 1 argument')
1161
revno, rev_id = b.get_revision_info(revision[0])
1162
t = b.revision_tree(rev_id)
1163
root, ext = os.path.splitext(dest)
1164
if not format:
1165
if ext in (".tar",):
1166
format = "tar"
1167
elif ext in (".gz", ".tgz"):
1168
format = "tgz"
1169
elif ext in (".bz2", ".tbz2"):
1170
format = "tbz2"
1171
else:
1172
format = "dir"
1056
rh = b.lookup_revision(int(revision))
1057
t = b.revision_tree(rh)
1173
1058
t.export(dest, format, root)
1174
1059
1175
1060
1182
1067
def run(self, filename, revision=None):
1183
1068
if revision == None:
1184
1069
raise BzrCommandError("bzr cat requires a revision number")
1185
elif len(revision) != 1:
1186
raise BzrCommandError("bzr cat --revision takes exactly one number")
1187
1070
b = find_branch('.')
1188
b.print_file(b.relpath(filename), revision[0])
1071
b.print_file(b.relpath(filename), int(revision))
1189
1072
1190
1073
1191
1074
class cmd_local_time_offset(Command):
1212
1095
TODO: Strict commit that fails if there are unknown or deleted files.
1213
1096
"""
1214
1097
takes_args = ['selected*']
1215
takes_options = ['message', 'file', 'verbose', 'unchanged']
1098
takes_options = ['message', 'file', 'verbose']
1216
1099
aliases = ['ci', 'checkin']
1217
1100
1218
def run(self, message=None, file=None, verbose=True, selected_list=None,
1219
unchanged=False):
1220
from bzrlib.errors import PointlessCommit
1101
def run(self, message=None, file=None, verbose=True, selected_list=None):
1102
from bzrlib.commit import commit
1221
1103
from bzrlib.osutils import get_text_message
1222
1104
1223
1105
## Warning: shadows builtin file()
1242
1124
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1243
1125
1244
1126
b = find_branch('.')
1245
1246
try:
1247
b.commit(message, verbose=verbose,
1248
specific_files=selected_list,
1249
allow_pointless=unchanged)
1250
except PointlessCommit:
1251
# FIXME: This should really happen before the file is read in;
1252
# perhaps prepare the commit; get the message; then actually commit
1253
raise BzrCommandError("no changes to commit",
1254
["use --unchanged to commit anyhow"])
1127
commit(b, message, verbose=verbose, specific_files=selected_list)
1255
1128
1256
1129
1257
1130
class cmd_check(Command):
1271
1144
1272
1145
1273
1146
1274
class cmd_scan_cache(Command):
1275
hidden = True
1276
def run(self):
1277
from bzrlib.hashcache import HashCache
1278
import os
1279
1280
c = HashCache('.')
1281
c.read()
1282
c.scan()
1283
1284
print '%6d stats' % c.stat_count
1285
print '%6d in hashcache' % len(c._cache)
1286
print '%6d files removed from cache' % c.removed_count
1287
print '%6d hashes updated' % c.update_count
1288
print '%6d files changed too recently to cache' % c.danger_count
1289
1290
if c.needs_write:
1291
c.write()
1292
1293
1294
1295
1147
class cmd_upgrade(Command):
1296
1148
"""Upgrade branch storage to current format.
1297
1149
1320
1172
class cmd_selftest(Command):
1321
1173
"""Run internal test suite"""
1322
1174
hidden = True
1323
takes_options = ['verbose']
1324
def run(self, verbose=False):
1175
def run(self):
1325
1176
from bzrlib.selftest import selftest
1326
return int(not selftest(verbose=verbose))
1177
return int(not selftest())
1327
1178
1328
1179
1329
1180
class cmd_version(Command):
1361
1212
['..', -1]
1362
1213
>>> parse_spec("../f/@35")
1363
1214
['../f', 35]
1364
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
1365
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
1366
1215
"""
1367
1216
if spec is None:
1368
1217
return [None, None]
1372
1221
if parsed[1] == "":
1373
1222
parsed[1] = -1
1374
1223
else:
1375
try:
1376
parsed[1] = int(parsed[1])
1377
except ValueError:
1378
pass # We can allow stuff like ./@revid:blahblahblah
1379
else:
1380
assert parsed[1] >=0
1224
parsed[1] = int(parsed[1])
1225
assert parsed[1] >=0
1381
1226
else:
1382
1227
parsed = [spec, None]
1383
1228
return parsed
1407
1252
--force is given.
1408
1253
"""
1409
1254
takes_args = ['other_spec', 'base_spec?']
1410
takes_options = ['force', 'merge-type']
1255
takes_options = ['force']
1411
1256
1412
def run(self, other_spec, base_spec=None, force=False, merge_type=None):
1257
def run(self, other_spec, base_spec=None, force=False):
1413
1258
from bzrlib.merge import merge
1414
from bzrlib.merge_core import ApplyMerge3
1415
if merge_type is None:
1416
merge_type = ApplyMerge3
1417
1259
merge(parse_spec(other_spec), parse_spec(base_spec),
1418
check_clean=(not force), merge_type=merge_type)
1260
check_clean=(not force))
1419
1261
1420
1262
1421
1263
1437
1279
class cmd_merge_revert(Command):
1438
1280
"""Reverse all changes since the last commit.
1439
1281
1440
Only versioned files are affected. By default, any files that are changed
1441
will be backed up first. Backup files have a '~' appended to their name.
1282
Only versioned files are affected.
1283
1284
TODO: Store backups of any files that will be reverted, so
1285
that the revert can be undone.
1442
1286
"""
1443
takes_options = ['revision', 'no-backup']
1287
takes_options = ['revision']
1444
1288
1445
def run(self, revision=None, no_backup=False):
1289
def run(self, revision=-1):
1446
1290
from bzrlib.merge import merge
1447
if revision is None:
1448
revision = [-1]
1449
elif len(revision) != 1:
1450
raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1451
merge(('.', revision[0]), parse_spec('.'),
1291
merge(('.', revision), parse_spec('.'),
1452
1292
check_clean=False,
1453
ignore_zero=True,
1454
backup_files=not no_backup)
1293
ignore_zero=True)
1455
1294
1456
1295
1457
1296
class cmd_assert_fail(Command):
1473
1312
help.help(topic)
1474
1313
1475
1314
1315
class cmd_update_stat_cache(Command):
1316
"""Update stat-cache mapping inodes to SHA-1 hashes.
1317
1318
For testing only."""
1319
hidden = True
1320
def run(self):
1321
from bzrlib.statcache import update_cache
1322
b = find_branch('.')
1323
update_cache(b.base, b.read_working_inventory())
1324
1476
1325
1477
1326
1478
1327
class cmd_plugins(Command):
1480
1329
hidden = True
1481
1330
def run(self):
1482
1331
import bzrlib.plugin
1483
from inspect import getdoc
1484
1332
from pprint import pprint
1485
for plugin in bzrlib.plugin.all_plugins:
1486
print plugin.__path__[0]
1487
d = getdoc(plugin)
1488
if d:
1489
print '\t', d.split('\n')[0]
1490
1491
#pprint(bzrlib.plugin.all_plugins)
1333
pprint(bzrlib.plugin.all_plugins)
1492
1334
1493
1335
1494
1336
1512
1354
'verbose': None,
1513
1355
'version': None,
1514
1356
'email': None,
1515
'unchanged': None,
1516
1357
'update': None,
1517
1358
'long': None,
1518
1359
'root': str,
1519
'no-backup': None,
1520
'merge-type': get_merge_type,
1521
1360
}
1522
1361
1523
1362
SHORT_OPTIONS = {
1547
1386
>>> parse_args('commit --message=biter'.split())
1548
1387
(['commit'], {'message': u'biter'})
1549
1388
>>> parse_args('log -r 500'.split())
1550
(['log'], {'revision': [500]})
1551
>>> parse_args('log -r500..600'.split())
1389
(['log'], {'revision': 500})
1390
>>> parse_args('log -r500:600'.split())
1552
1391
(['log'], {'revision': [500, 600]})
1553
>>> parse_args('log -vr500..600'.split())
1392
>>> parse_args('log -vr500:600'.split())
1554
1393
(['log'], {'verbose': True, 'revision': [500, 600]})
1555
>>> parse_args('log -rv500..600'.split()) #the r takes an argument
1556
(['log'], {'revision': ['v500', 600]})
1394
>>> parse_args('log -rv500:600'.split()) #the r takes an argument
1395
Traceback (most recent call last):
1396
...
1397
ValueError: invalid literal for int(): v500
1557
1398
"""
1558
1399
args = []
1559
1400
opts = {}
1693
1534
This is also a non-master option.
1694
1535
--help Run help and exit, also a non-master option (I think that should stay, though)
1695
1536
1696
>>> argv, opts = _parse_master_args(['--test'])
1537
>>> argv, opts = _parse_master_args(['bzr', '--test'])
1697
1538
Traceback (most recent call last):
1698
1539
...
1699
1540
BzrCommandError: Invalid master option: 'test'
1700
>>> argv, opts = _parse_master_args(['--version', 'command'])
1541
>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1701
1542
>>> print argv
1702
1543
['command']
1703
1544
>>> print opts['version']
1704
1545
True
1705
>>> argv, opts = _parse_master_args(['--profile', 'command', '--more-options'])
1546
>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1706
1547
>>> print argv
1707
1548
['command', '--more-options']
1708
1549
>>> print opts['profile']
1709
1550
True
1710
>>> argv, opts = _parse_master_args(['--no-plugins', 'command'])
1551
>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1711
1552
>>> print argv
1712
1553
['command']
1713
1554
>>> print opts['no-plugins']
1714
1555
True
1715
1556
>>> print opts['profile']
1716
1557
False
1717
>>> argv, opts = _parse_master_args(['command', '--profile'])
1558
>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1718
1559
>>> print argv
1719
1560
['command', '--profile']
1720
1561
>>> print opts['profile']
1727
1568
'help':False
1728
1569
}
1729
1570
1571
# This is the point where we could hook into argv[0] to determine
1572
# what front-end is supposed to be run
1573
# For now, we are just ignoring it.
1574
cmd_name = argv.pop(0)
1730
1575
for arg in argv[:]:
1731
1576
if arg[:2] != '--': # at the first non-option, we return the rest
1732
1577
break
1746
1591
1747
1592
This is similar to main(), but without all the trappings for
1748
1593
logging and error handling.
1749
1750
argv
1751
The command-line arguments, without the program name.
1752
1753
Returns a command status or raises an exception.
1754
1594
"""
1755
1595
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1756
1757
# some options like --builtin and --no-plugins have special effects
1758
argv, master_opts = _parse_master_args(argv)
1759
if not master_opts['no-plugins']:
1760
from bzrlib.plugin import load_plugins
1761
load_plugins()
1762
1763
args, opts = parse_args(argv)
1764
1765
if master_opts.get('help') or 'help' in opts:
1766
from bzrlib.help import help
1767
if argv:
1768
help(argv[0])
1769
else:
1770
help()
1771
return 0
1772
1773
if 'version' in opts:
1774
show_version()
1775
return 0
1776
1777
if args and args[0] == 'builtin':
1778
include_plugins=False
1779
args = args[1:]
1780
1596
1781
1597
try:
1598
# some options like --builtin and --no-plugins have special effects
1599
argv, master_opts = _parse_master_args(argv)
1600
if not master_opts['no-plugins']:
1601
from bzrlib.plugin import load_plugins
1602
load_plugins()
1603
1604
args, opts = parse_args(argv)
1605
1606
if master_opts['help']:
1607
from bzrlib.help import help
1608
if argv:
1609
help(argv[0])
1610
else:
1611
help()
1612
return 0
1613
1614
if 'help' in opts:
1615
from bzrlib.help import help
1616
if args:
1617
help(args[0])
1618
else:
1619
help()
1620
return 0
1621
elif 'version' in opts:
1622
show_version()
1623
return 0
1624
elif args and args[0] == 'builtin':
1625
include_plugins=False
1626
args = args[1:]
1782
1627
cmd = str(args.pop(0))
1783
1628
except IndexError:
1784
print >>sys.stderr, "please try 'bzr help' for help"
1629
import help
1630
help.help()
1785
1631
return 1
1632
1786
1633
1787
1634
plugins_override = not (master_opts['builtin'])
1788
1635
canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1853
1700
try:
1854
1701
try:
1855
1702
try:
1856
return run_bzr(argv[1:])
1703
return run_bzr(argv)
1857
1704
finally:
1858
1705
# do this here inside the exception wrappers to catch EPIPE
1859
1706
sys.stdout.flush()
Loggerhead is a web-based interface for Breezy
Version: 2.0.1