« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 926
- compare with another revision
- download diff
- download tarball
- view history from revision 926
- Committer: Martin Pool
- Date: 2005-07-17 18:06:53 UTC
- Revision ID: mbp@sourcefrog.net-20050717180653-f16d08bd74610f6d
- update more weave code to use intsets
- files added:
- plugins/changeset
- files removed:
- HACKING
- bzrlib/util
- contrib/emacs
- files renamed:
- bzrlib/util/effbot/ => effbot/
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/plugins/ => plugins/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/commands.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
# TODO: Split the command framework away from the actual commands.
19
20
# TODO: probably should say which arguments are candidates for glob
21
# expansion on windows and do that at the command level.
22
23
import sys
24
import os
18
19
import sys, os
25
20
26
21
import bzrlib
27
22
from bzrlib.trace import mutter, note, log_error, warning
127
122
return revs
128
123
129
124
130
def get_merge_type(typestring):
131
"""Attempt to find the merge class/factory associated with a string."""
132
from merge import merge_types
133
try:
134
return merge_types[typestring][0]
135
except KeyError:
136
templ = '%s%%7s: %%s' % (' '*12)
137
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
138
type_list = '\n'.join(lines)
139
msg = "No known merge type %s. Supported types are:\n%s" %\
140
(typestring, type_list)
141
raise BzrCommandError(msg)
142
143
144
def get_merge_type(typestring):
145
"""Attempt to find the merge class/factory associated with a string."""
146
from merge import merge_types
147
try:
148
return merge_types[typestring][0]
149
except KeyError:
150
templ = '%s%%7s: %%s' % (' '*12)
151
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
152
type_list = '\n'.join(lines)
153
msg = "No known merge type %s. Supported types are:\n%s" %\
154
(typestring, type_list)
155
raise BzrCommandError(msg)
156
157
158
125
159
126
def _get_cmd_dict(plugins_override=True):
160
127
d = {}
233
200
assert isinstance(arguments, dict)
234
201
cmdargs = options.copy()
235
202
cmdargs.update(arguments)
236
if self.__doc__ == Command.__doc__:
237
from warnings import warn
238
warn("No help message set for %r" % self)
203
assert self.__doc__ != Command.__doc__, \
204
("No help message set for %r" % self)
239
205
self.status = self.run(**cmdargs)
240
if self.status is None:
241
self.status = 0
242
206
243
207
244
208
def run(self):
256
220
class ExternalCommand(Command):
257
221
"""Class to wrap external commands.
258
222
259
We cheat a little here, when get_cmd_class() calls us we actually
260
give it back an object we construct that has the appropriate path,
261
help, options etc for the specified command.
262
263
When run_bzr() tries to instantiate that 'class' it gets caught by
264
the __call__ method, which we override to call the Command.__init__
265
method. That then calls our run method which is pretty straight
266
forward.
267
268
The only wrinkle is that we have to map bzr's dictionary of options
269
and arguments back into command line options and arguments for the
270
script.
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.
271
233
"""
272
234
273
235
def find_command(cls, cmd):
447
409
whether already versioned or not, are searched for files or
448
410
subdirectories that are neither versioned or ignored, and these
449
411
are added. This search proceeds recursively into versioned
450
directories. If no names are given '.' is assumed.
412
directories.
451
413
452
Therefore simply saying 'bzr add' will version all files that
414
Therefore simply saying 'bzr add .' will version all files that
453
415
are currently unknown.
454
416
455
417
TODO: Perhaps adding a file whose directly is not versioned should
456
418
recursively add that parent, rather than giving an error?
457
419
"""
458
takes_args = ['file*']
420
takes_args = ['file+']
459
421
takes_options = ['verbose', 'no-recurse']
460
422
461
423
def run(self, file_list, verbose=False, no_recurse=False):
524
486
def run(self, source_list, dest):
525
487
b = find_branch('.')
526
488
527
# TODO: glob expansion on windows?
528
489
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
529
490
530
491
550
511
551
512
552
513
553
class cmd_mv(Command):
554
"""Move or rename a file.
555
556
usage:
557
bzr mv OLDNAME NEWNAME
558
bzr mv SOURCE... DESTINATION
559
560
If the last argument is a versioned directory, all the other names
561
are moved into it. Otherwise, there must be exactly two arguments
562
and the file is changed to a new name, which must not already exist.
563
564
Files cannot be moved between branches.
565
"""
566
takes_args = ['names*']
567
def run(self, names_list):
568
if len(names_list) < 2:
569
raise BzrCommandError("missing file argument")
570
b = find_branch(names_list[0])
571
572
rel_names = [b.relpath(x) for x in names_list]
573
574
if os.path.isdir(names_list[-1]):
575
# move into existing directory
576
b.move(rel_names[:-1], rel_names[-1])
577
else:
578
if len(names_list) != 2:
579
raise BzrCommandError('to mv multiple files the destination '
580
'must be a versioned directory')
581
b.move(rel_names[0], rel_names[1])
582
583
584
514
585
515
586
516
class cmd_pull(Command):
653
583
"""
654
584
takes_args = ['from_location', 'to_location?']
655
585
takes_options = ['revision']
656
aliases = ['get', 'clone']
657
586
658
587
def run(self, from_location, to_location=None, revision=None):
659
588
import errno
660
589
from bzrlib.merge import merge
661
from bzrlib.branch import DivergedBranches, \
590
from bzrlib.branch import DivergedBranches, NoSuchRevision, \
662
591
find_cached_branch, Branch
663
592
from shutil import rmtree
664
593
from meta_store import CachedStore
705
634
revno, rev_id = br_from.get_revision_info(revision[0])
706
635
try:
707
636
br_to.update_revisions(br_from, stop_revision=revno)
708
except bzrlib.errors.NoSuchRevision:
637
except NoSuchRevision:
709
638
rmtree(to_location)
710
639
msg = "The branch %s has no revision %d." % (from_location,
711
640
revno)
851
780
If files are listed, only the changes in those files are listed.
852
781
Otherwise, all changes for the tree are listed.
853
782
783
TODO: Given two revision arguments, show the difference between them.
784
854
785
TODO: Allow diff across branches.
855
786
856
787
TODO: Option to use external diff command; could be GNU diff, wdiff,
865
796
deleted files.
866
797
867
798
TODO: This probably handles non-Unix newlines poorly.
868
869
examples:
870
bzr diff
871
bzr diff -r1
872
bzr diff -r1:2
873
799
"""
874
800
875
801
takes_args = ['file*']
888
814
else:
889
815
b = find_branch('.')
890
816
817
# TODO: Make show_diff support taking 2 arguments
818
base_rev = None
891
819
if revision is not None:
892
if len(revision) == 1:
893
show_diff(b, revision[0], specific_files=file_list,
894
external_diff_options=diff_options)
895
elif len(revision) == 2:
896
show_diff(b, revision[0], specific_files=file_list,
897
external_diff_options=diff_options,
898
revision2=revision[1])
899
else:
900
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
901
else:
902
show_diff(b, None, specific_files=file_list,
903
external_diff_options=diff_options)
820
if len(revision) != 1:
821
raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')
822
base_rev = revision[0]
823
824
show_diff(b, base_rev, specific_files=file_list,
825
external_diff_options=diff_options)
826
904
827
905
828
906
829
932
855
"""List files modified in working tree."""
933
856
hidden = True
934
857
def run(self):
935
from bzrlib.delta import compare_trees
858
from bzrlib.diff import compare_trees
936
859
937
860
b = find_branch('.')
938
861
td = compare_trees(b.basis_tree(), b.working_tree())
987
910
"""
988
911
989
912
takes_args = ['filename?']
990
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
991
'long', 'message', 'short',]
913
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
992
914
993
915
def run(self, filename=None, timezone='original',
994
916
verbose=False,
996
918
forward=False,
997
919
revision=None,
998
920
message=None,
999
long=False,
1000
short=False):
921
long=False):
1001
922
from bzrlib.branch import find_branch
1002
923
from bzrlib.log import log_formatter, show_log
1003
924
import codecs
1037
958
# in e.g. the default C locale.
1038
959
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1039
960
1040
if not short:
961
if long:
1041
962
log_format = 'long'
1042
963
else:
1043
964
log_format = 'short'
1260
1181
1261
1182
class cmd_commit(Command):
1262
1183
"""Commit changes into a new revision.
1263
1264
If no arguments are given, the entire tree is committed.
1265
1184
1266
1185
If selected files are specified, only changes to those files are
1267
committed. If a directory is specified then the directory and everything
1268
within it is committed.
1186
committed. If a directory is specified then its contents are also
1187
committed.
1269
1188
1270
1189
A selected-file commit may fail in some cases where the committed
1271
1190
tree would be invalid, such as trying to commit a file in a
1279
1198
takes_options = ['message', 'file', 'verbose', 'unchanged']
1280
1199
aliases = ['ci', 'checkin']
1281
1200
1282
# TODO: Give better message for -s, --summary, used by tla people
1283
1284
1201
def run(self, message=None, file=None, verbose=True, selected_list=None,
1285
1202
unchanged=False):
1286
1203
from bzrlib.errors import PointlessCommit
1288
1205
1289
1206
## Warning: shadows builtin file()
1290
1207
if not message and not file:
1291
# FIXME: Ugly; change status code to send to a provided function?
1292
1293
1208
import cStringIO
1294
1209
stdout = sys.stdout
1295
1210
catcher = cStringIO.StringIO()
1310
1225
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1311
1226
1312
1227
b = find_branch('.')
1313
if selected_list:
1314
selected_list = [b.relpath(s) for s in selected_list]
1315
1228
1316
1229
try:
1317
1230
b.commit(message, verbose=verbose,
1318
1231
specific_files=selected_list,
1341
1254
1342
1255
1343
1256
1344
class cmd_scan_cache(Command):
1345
hidden = True
1346
def run(self):
1347
from bzrlib.hashcache import HashCache
1348
import os
1349
1350
c = HashCache('.')
1351
c.read()
1352
c.scan()
1353
1354
print '%6d stats' % c.stat_count
1355
print '%6d in hashcache' % len(c._cache)
1356
print '%6d files removed from cache' % c.removed_count
1357
print '%6d hashes updated' % c.update_count
1358
print '%6d files changed too recently to cache' % c.danger_count
1359
1360
if c.needs_write:
1361
c.write()
1362
1363
1364
1365
1257
class cmd_upgrade(Command):
1366
1258
"""Upgrade branch storage to current format.
1367
1259
1381
1273
takes_options = ['email']
1382
1274
1383
1275
def run(self, email=False):
1384
try:
1385
b = bzrlib.branch.find_branch('.')
1386
except:
1387
b = None
1388
1389
1276
if email:
1390
print bzrlib.osutils.user_email(b)
1277
print bzrlib.osutils.user_email()
1391
1278
else:
1392
print bzrlib.osutils.username(b)
1279
print bzrlib.osutils.username()
1393
1280
1394
1281
1395
1282
class cmd_selftest(Command):
1396
1283
"""Run internal test suite"""
1397
1284
hidden = True
1398
takes_options = ['verbose']
1399
def run(self, verbose=False):
1285
def run(self):
1400
1286
from bzrlib.selftest import selftest
1401
return int(not selftest(verbose=verbose))
1287
return int(not selftest())
1402
1288
1403
1289
1404
1290
class cmd_version(Command):
1460
1346
1461
1347
1462
1348
class cmd_merge(Command):
1463
"""Perform a three-way merge.
1464
1465
The branch is the branch you will merge from. By default, it will merge
1466
the latest revision. If you specify a revision, that revision will be
1467
merged. If you specify two revisions, the first will be used as a BASE,
1468
and the second one as OTHER. Revision numbers are always relative to the
1469
specified branch.
1470
1471
Examples:
1472
1473
To merge the latest revision from bzr.dev
1474
bzr merge ../bzr.dev
1475
1476
To merge changes up to and including revision 82 from bzr.dev
1477
bzr merge -r 82 ../bzr.dev
1478
1479
To merge the changes introduced by 82, without previous changes:
1480
bzr merge -r 81..82 ../bzr.dev
1481
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
1482
1367
merge refuses to run if there are any uncommitted changes, unless
1483
1368
--force is given.
1484
1369
"""
1485
takes_args = ['branch?']
1486
takes_options = ['revision', 'force', 'merge-type']
1370
takes_args = ['other_spec', 'base_spec?']
1371
takes_options = ['force']
1487
1372
1488
def run(self, branch='.', revision=None, force=False,
1489
merge_type=None):
1373
def run(self, other_spec, base_spec=None, force=False):
1490
1374
from bzrlib.merge import merge
1491
from bzrlib.merge_core import ApplyMerge3
1492
if merge_type is None:
1493
merge_type = ApplyMerge3
1375
merge(parse_spec(other_spec), parse_spec(base_spec),
1376
check_clean=(not force))
1494
1377
1495
if revision is None or len(revision) < 1:
1496
base = (None, None)
1497
other = (branch, -1)
1498
else:
1499
if len(revision) == 1:
1500
other = (branch, revision[0])
1501
base = (None, None)
1502
else:
1503
assert len(revision) == 2
1504
if None in revision:
1505
raise BzrCommandError(
1506
"Merge doesn't permit that revision specifier.")
1507
base = (branch, revision[0])
1508
other = (branch, revision[1])
1509
1510
merge(other, base, check_clean=(not force), merge_type=merge_type)
1511
1378
1512
1379
1513
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):
1514
1396
"""Reverse all changes since the last commit.
1515
1397
1516
Only versioned files are affected. Specify filenames to revert only
1517
those files. By default, any files that are changed will be backed up
1518
first. Backup files have a '~' appended to their name.
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.
1519
1402
"""
1520
takes_options = ['revision', 'no-backup']
1521
takes_args = ['file*']
1522
aliases = ['merge-revert']
1403
takes_options = ['revision']
1523
1404
1524
def run(self, revision=None, no_backup=False, file_list=None):
1405
def run(self, revision=None):
1525
1406
from bzrlib.merge import merge
1526
if file_list is not None:
1527
if len(file_list) == 0:
1528
raise BzrCommandError("No files specified")
1529
1407
if revision is None:
1530
1408
revision = [-1]
1531
1409
elif len(revision) != 1:
1532
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1410
raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1533
1411
merge(('.', revision[0]), parse_spec('.'),
1534
1412
check_clean=False,
1535
ignore_zero=True,
1536
backup_files=not no_backup,
1537
file_list=file_list)
1413
ignore_zero=True)
1538
1414
1539
1415
1540
1416
class cmd_assert_fail(Command):
1556
1432
help.help(topic)
1557
1433
1558
1434
1559
class cmd_shell_complete(Command):
1560
"""Show appropriate completions for context.
1561
1562
For a list of all available commands, say 'bzr shell-complete'."""
1563
takes_args = ['context?']
1564
aliases = ['s-c']
1565
hidden = True
1566
1567
def run(self, context=None):
1568
import shellcomplete
1569
shellcomplete.shellcomplete(context)
1570
1571
1572
class cmd_missing(Command):
1573
"""What is missing in this branch relative to other branch.
1574
"""
1575
takes_args = ['remote?']
1576
aliases = ['mis', 'miss']
1577
# We don't have to add quiet to the list, because
1578
# unknown options are parsed as booleans
1579
takes_options = ['verbose', 'quiet']
1580
1581
def run(self, remote=None, verbose=False, quiet=False):
1582
from bzrlib.branch import find_branch, DivergedBranches
1583
from bzrlib.errors import BzrCommandError
1584
from bzrlib.missing import get_parent, show_missing
1585
1586
if verbose and quiet:
1587
raise BzrCommandError('Cannot pass both quiet and verbose')
1588
1589
b = find_branch('.')
1590
parent = get_parent(b)
1591
if remote is None:
1592
if parent is None:
1593
raise BzrCommandError("No missing location known or specified.")
1594
else:
1595
if not quiet:
1596
print "Using last location: %s" % parent
1597
remote = parent
1598
elif parent is None:
1599
# We only update x-pull if it did not exist, missing should not change the parent
1600
b.controlfile('x-pull', 'wb').write(remote + '\n')
1601
br_remote = find_branch(remote)
1602
1603
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1604
1435
1605
1436
1606
1437
class cmd_plugins(Command):
1635
1466
'no-recurse': None,
1636
1467
'profile': None,
1637
1468
'revision': _parse_revision_str,
1638
'short': None,
1639
1469
'show-ids': None,
1640
1470
'timezone': str,
1641
1471
'verbose': None,
1645
1475
'update': None,
1646
1476
'long': None,
1647
1477
'root': str,
1648
'no-backup': None,
1649
'merge-type': get_merge_type,
1650
1478
}
1651
1479
1652
1480
SHORT_OPTIONS = {
1802
1630
return argdict
1803
1631
1804
1632
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
1805
1704
1806
1705
def run_bzr(argv):
1807
1706
"""Execute a command.
1808
1707
1809
1708
This is similar to main(), but without all the trappings for
1810
1709
logging and error handling.
1811
1812
argv
1813
The command-line arguments, without the program name from argv[0]
1814
1815
Returns a command status or raises an exception.
1816
1817
Special master options: these must come before the command because
1818
they control how the command is interpreted.
1819
1820
--no-plugins
1821
Do not load plugin modules at all
1822
1823
--builtin
1824
Only use builtin commands. (Plugins are still allowed to change
1825
other behaviour.)
1826
1827
--profile
1828
Run under the Python profiler.
1829
1710
"""
1830
1831
1711
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1832
1833
opt_profile = opt_no_plugins = opt_builtin = False
1834
1835
# --no-plugins is handled specially at a very early stage. We need
1836
# to load plugins before doing other command parsing so that they
1837
# can override commands, but this needs to happen first.
1838
1839
for a in argv[:]:
1840
if a == '--profile':
1841
opt_profile = True
1842
elif a == '--no-plugins':
1843
opt_no_plugins = True
1844
elif a == '--builtin':
1845
opt_builtin = True
1846
else:
1847
break
1848
argv.remove(a)
1849
1850
if not opt_no_plugins:
1851
from bzrlib.plugin import load_plugins
1852
load_plugins()
1853
1854
args, opts = parse_args(argv)
1855
1856
if 'help' in opts:
1857
from bzrlib.help import help
1858
if args:
1859
help(args[0])
1860
else:
1861
help()
1862
return 0
1863
1864
if 'version' in opts:
1865
show_version()
1866
return 0
1867
1712
1868
if not args:
1869
print >>sys.stderr, "please try 'bzr help' for help"
1713
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
1730
if 'help' in opts:
1731
from bzrlib.help import help
1732
if args:
1733
help(args[0])
1734
else:
1735
help()
1736
return 0
1737
elif 'version' in opts:
1738
show_version()
1739
return 0
1740
elif args and args[0] == 'builtin':
1741
include_plugins=False
1742
args = args[1:]
1743
cmd = str(args.pop(0))
1744
except IndexError:
1745
import help
1746
help.help()
1870
1747
return 1
1871
1872
cmd = str(args.pop(0))
1873
1874
canonical_cmd, cmd_class = \
1875
get_cmd_class(cmd, plugins_override=not opt_builtin)
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
1756
if 'profile' in opts:
1757
profile = True
1758
del opts['profile']
1876
1759
1877
1760
# check options are reasonable
1878
1761
allowed = cmd_class.takes_options
1887
1770
for k, v in opts.items():
1888
1771
cmdopts[k.replace('-', '_')] = v
1889
1772
1890
if opt_profile:
1773
if profile:
1891
1774
import hotshot, tempfile
1892
1775
pffileno, pfname = tempfile.mkstemp()
1893
1776
try:
1914
1797
1915
1798
def _report_exception(summary, quiet=False):
1916
1799
import traceback
1917
1918
1800
log_error('bzr: ' + summary)
1919
1801
bzrlib.trace.log_exception()
1920
1802
1921
if os.environ.get('BZR_DEBUG'):
1922
traceback.print_exc()
1923
1924
1803
if not quiet:
1925
sys.stderr.write('\n')
1926
1804
tb = sys.exc_info()[2]
1927
1805
exinfo = traceback.extract_tb(tb)
1928
1806
if exinfo:
1938
1816
try:
1939
1817
try:
1940
1818
try:
1941
return run_bzr(argv[1:])
1819
return run_bzr(argv)
1942
1820
finally:
1943
1821
# do this here inside the exception wrappers to catch EPIPE
1944
1822
sys.stdout.flush()
1945
1823
except BzrError, e:
1946
1824
quiet = isinstance(e, (BzrCommandError))
1947
_report_exception('error: ' + str(e), quiet=quiet)
1825
_report_exception('error: ' + e.args[0], quiet=quiet)
1948
1826
if len(e.args) > 1:
1949
1827
for h in e.args[1]:
1950
1828
# some explanation or hints
Loggerhead is a web-based interface for Breezy
Version: 2.0.1