To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/commands.py
- browse files at revision 897
- compare with another revision
- download diff
- download tarball
- view history from revision 897
- Committer: Martin Pool
- Date: 2005-07-11 06:13:18 UTC
- mfrom: (unknown (missing))
- Revision ID: mbp@sourcefrog.net-20050711061318-80557a9f045b1f38
- merge john's revision-naming code
- files removed:
- bzrlib/delta.py
- contrib/emacs
- 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
56
51
assert cmd.startswith("cmd_")
57
52
return cmd[4:].replace('_','-')
58
53
59
60
54
def _parse_revision_str(revstr):
61
"""This handles a revision string -> revno.
62
63
This always returns a list. The list will have one element for
55
"""This handles a revision string -> revno.
64
56
65
57
It supports integers directly, but everything else it
66
58
defers for passing to Branch.get_revision_info()
127
119
return revs
128
120
129
121
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
122
145
123
def _get_cmd_dict(plugins_override=True):
146
124
d = {}
219
197
assert isinstance(arguments, dict)
220
198
cmdargs = options.copy()
221
199
cmdargs.update(arguments)
222
if self.__doc__ == Command.__doc__:
223
from warnings import warn
224
warn("No help message set for %r" % self)
200
assert self.__doc__ != Command.__doc__, \
201
("No help message set for %r" % self)
225
202
self.status = self.run(**cmdargs)
226
if self.status is None:
227
self.status = 0
228
203
229
204
230
205
def run(self):
242
217
class ExternalCommand(Command):
243
218
"""Class to wrap external commands.
244
219
245
We cheat a little here, when get_cmd_class() calls us we actually
246
give it back an object we construct that has the appropriate path,
247
help, options etc for the specified command.
248
249
When run_bzr() tries to instantiate that 'class' it gets caught by
250
the __call__ method, which we override to call the Command.__init__
251
method. That then calls our run method which is pretty straight
252
forward.
253
254
The only wrinkle is that we have to map bzr's dictionary of options
255
and arguments back into command line options and arguments for the
256
script.
220
We cheat a little here, when get_cmd_class() calls us we actually give it back
221
an object we construct that has the appropriate path, help, options etc for the
222
specified command.
223
224
When run_bzr() tries to instantiate that 'class' it gets caught by the __call__
225
method, which we override to call the Command.__init__ method. That then calls
226
our run method which is pretty straight forward.
227
228
The only wrinkle is that we have to map bzr's dictionary of options and arguments
229
back into command line options and arguments for the script.
257
230
"""
258
231
259
232
def find_command(cls, cmd):
356
329
directory is shown. Otherwise, only the status of the specified
357
330
files or directories is reported. If a directory is given, status
358
331
is reported for everything inside that directory.
359
360
If a revision is specified, the changes since that revision are shown.
361
332
"""
362
333
takes_args = ['file*']
363
takes_options = ['all', 'show-ids', 'revision']
334
takes_options = ['all', 'show-ids']
364
335
aliases = ['st', 'stat']
365
336
366
337
def run(self, all=False, show_ids=False, file_list=None):
373
344
file_list = None
374
345
else:
375
346
b = find_branch('.')
376
377
from bzrlib.status import show_status
378
show_status(b, show_unchanged=all, show_ids=show_ids,
379
specific_files=file_list)
347
import status
348
status.show_status(b, show_unchanged=all, show_ids=show_ids,
349
specific_files=file_list)
380
350
381
351
382
352
class cmd_cat_revision(Command):
433
403
whether already versioned or not, are searched for files or
434
404
subdirectories that are neither versioned or ignored, and these
435
405
are added. This search proceeds recursively into versioned
436
directories. If no names are given '.' is assumed.
406
directories.
437
407
438
Therefore simply saying 'bzr add' will version all files that
408
Therefore simply saying 'bzr add .' will version all files that
439
409
are currently unknown.
440
410
441
411
TODO: Perhaps adding a file whose directly is not versioned should
442
412
recursively add that parent, rather than giving an error?
443
413
"""
444
takes_args = ['file*']
414
takes_args = ['file+']
445
415
takes_options = ['verbose', 'no-recurse']
446
416
447
417
def run(self, file_list, verbose=False, no_recurse=False):
510
480
def run(self, source_list, dest):
511
481
b = find_branch('.')
512
482
513
# TODO: glob expansion on windows?
514
483
b.move([b.relpath(s) for s in source_list], b.relpath(dest))
515
484
516
485
536
505
537
506
538
507
539
class cmd_mv(Command):
540
"""Move or rename a file.
541
542
usage:
543
bzr mv OLDNAME NEWNAME
544
bzr mv SOURCE... DESTINATION
545
546
If the last argument is a versioned directory, all the other names
547
are moved into it. Otherwise, there must be exactly two arguments
548
and the file is changed to a new name, which must not already exist.
549
550
Files cannot be moved between branches.
551
"""
552
takes_args = ['names*']
553
def run(self, names_list):
554
if len(names_list) < 2:
555
raise BzrCommandError("missing file argument")
556
b = find_branch(names_list[0])
557
558
rel_names = [b.relpath(x) for x in names_list]
559
560
if os.path.isdir(names_list[-1]):
561
# move into existing directory
562
b.move(rel_names[:-1], rel_names[-1])
563
else:
564
if len(names_list) != 2:
565
raise BzrCommandError('to mv multiple files the destination '
566
'must be a versioned directory')
567
b.move(rel_names[0], rel_names[1])
568
569
570
508
571
509
572
510
class cmd_pull(Command):
639
577
"""
640
578
takes_args = ['from_location', 'to_location?']
641
579
takes_options = ['revision']
642
aliases = ['get', 'clone']
643
580
644
581
def run(self, from_location, to_location=None, revision=None):
645
582
import errno
646
583
from bzrlib.merge import merge
647
from bzrlib.branch import DivergedBranches, \
584
from bzrlib.branch import DivergedBranches, NoSuchRevision, \
648
585
find_cached_branch, Branch
649
586
from shutil import rmtree
650
587
from meta_store import CachedStore
651
588
import tempfile
652
589
cache_root = tempfile.mkdtemp()
653
590
654
if revision is None:
655
revision = [None]
656
elif len(revision) > 1:
657
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
658
591
if revision is not None:
592
if len(revision) > 1:
593
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
659
594
try:
660
595
try:
661
596
br_from = find_cached_branch(from_location, cache_root)
682
617
raise
683
618
br_to = Branch(to_location, init=True)
684
619
685
br_to.set_root_id(br_from.get_root_id())
686
687
if revision:
688
if revision[0] is None:
689
revno = br_from.revno()
690
else:
691
revno, rev_id = br_from.get_revision_info(revision[0])
692
try:
693
br_to.update_revisions(br_from, stop_revision=revno)
694
except bzrlib.errors.NoSuchRevision:
695
rmtree(to_location)
696
msg = "The branch %s has no revision %d." % (from_location,
697
revno)
698
raise BzrCommandError(msg)
699
620
revno = br_to.lookup_revision(revision[0])
621
try:
622
br_to.update_revisions(br_from, stop_revision=revno)
623
except NoSuchRevision:
624
rmtree(to_location)
625
msg = "The branch %s has no revision %d." % (from_location,
626
revno)
627
raise BzrCommandError(msg)
700
628
merge((to_location, -1), (to_location, 0), this_dir=to_location,
701
629
check_clean=False, ignore_zero=True)
702
630
from_location = pull_loc(br_from)
912
840
"""List files modified in working tree."""
913
841
hidden = True
914
842
def run(self):
915
from bzrlib.delta import compare_trees
843
from bzrlib.diff import compare_trees
916
844
917
845
b = find_branch('.')
918
846
td = compare_trees(b.basis_tree(), b.working_tree())
959
887
-r revision requests a specific revision, -r :end or -r begin: are
960
888
also valid.
961
889
962
--message allows you to give a regular expression, which will be evaluated
963
so that only matching entries will be displayed.
964
965
890
TODO: Make --revision support uuid: and hash: [future tag:] notation.
966
891
967
892
"""
968
893
969
894
takes_args = ['filename?']
970
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
895
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long']
971
896
972
897
def run(self, filename=None, timezone='original',
973
898
verbose=False,
974
899
show_ids=False,
975
900
forward=False,
976
901
revision=None,
977
message=None,
978
902
long=False):
979
903
from bzrlib.branch import find_branch
980
904
from bzrlib.log import log_formatter, show_log
1030
954
verbose=verbose,
1031
955
direction=direction,
1032
956
start_revision=rev1,
1033
end_revision=rev2,
1034
search=message)
957
end_revision=rev2)
1035
958
1036
959
1037
960
1238
1161
1239
1162
class cmd_commit(Command):
1240
1163
"""Commit changes into a new revision.
1241
1242
If no arguments are given, the entire tree is committed.
1243
1164
1244
1165
If selected files are specified, only changes to those files are
1245
committed. If a directory is specified then the directory and everything
1246
within it is committed.
1166
committed. If a directory is specified then its contents are also
1167
committed.
1247
1168
1248
1169
A selected-file commit may fail in some cases where the committed
1249
1170
tree would be invalid, such as trying to commit a file in a
1257
1178
takes_options = ['message', 'file', 'verbose', 'unchanged']
1258
1179
aliases = ['ci', 'checkin']
1259
1180
1260
# TODO: Give better message for -s, --summary, used by tla people
1261
1262
1181
def run(self, message=None, file=None, verbose=True, selected_list=None,
1263
1182
unchanged=False):
1264
1183
from bzrlib.errors import PointlessCommit
1266
1185
1267
1186
## Warning: shadows builtin file()
1268
1187
if not message and not file:
1269
# FIXME: Ugly; change status code to send to a provided function?
1270
1271
1188
import cStringIO
1272
1189
stdout = sys.stdout
1273
1190
catcher = cStringIO.StringIO()
1288
1205
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1289
1206
1290
1207
b = find_branch('.')
1291
if selected_list:
1292
selected_list = [b.relpath(s) for s in selected_list]
1293
1208
1294
1209
try:
1295
1210
b.commit(message, verbose=verbose,
1296
1211
specific_files=selected_list,
1319
1234
1320
1235
1321
1236
1322
class cmd_scan_cache(Command):
1323
hidden = True
1324
def run(self):
1325
from bzrlib.hashcache import HashCache
1326
import os
1327
1328
c = HashCache('.')
1329
c.read()
1330
c.scan()
1331
1332
print '%6d stats' % c.stat_count
1333
print '%6d in hashcache' % len(c._cache)
1334
print '%6d files removed from cache' % c.removed_count
1335
print '%6d hashes updated' % c.update_count
1336
print '%6d files changed too recently to cache' % c.danger_count
1337
1338
if c.needs_write:
1339
c.write()
1340
1341
1342
1343
1237
class cmd_upgrade(Command):
1344
1238
"""Upgrade branch storage to current format.
1345
1239
1368
1262
class cmd_selftest(Command):
1369
1263
"""Run internal test suite"""
1370
1264
hidden = True
1371
takes_options = ['verbose']
1372
def run(self, verbose=False):
1265
def run(self):
1373
1266
from bzrlib.selftest import selftest
1374
return int(not selftest(verbose=verbose))
1267
return int(not selftest())
1375
1268
1376
1269
1377
1270
class cmd_version(Command):
1455
1348
--force is given.
1456
1349
"""
1457
1350
takes_args = ['other_spec', 'base_spec?']
1458
takes_options = ['force', 'merge-type']
1351
takes_options = ['force']
1459
1352
1460
def run(self, other_spec, base_spec=None, force=False, merge_type=None):
1353
def run(self, other_spec, base_spec=None, force=False):
1461
1354
from bzrlib.merge import merge
1462
from bzrlib.merge_core import ApplyMerge3
1463
if merge_type is None:
1464
merge_type = ApplyMerge3
1465
1355
merge(parse_spec(other_spec), parse_spec(base_spec),
1466
check_clean=(not force), merge_type=merge_type)
1356
check_clean=(not force))
1357
1467
1358
1468
1359
1469
1360
class cmd_revert(Command):
1361
"""Restore selected files from a previous revision.
1362
"""
1363
takes_args = ['file+']
1364
def run(self, file_list):
1365
from bzrlib.branch import find_branch
1366
1367
if not file_list:
1368
file_list = ['.']
1369
1370
b = find_branch(file_list[0])
1371
1372
b.revert([b.relpath(f) for f in file_list])
1373
1374
1375
class cmd_merge_revert(Command):
1470
1376
"""Reverse all changes since the last commit.
1471
1377
1472
Only versioned files are affected. Specify filenames to revert only
1473
those files. By default, any files that are changed will be backed up
1474
first. Backup files have a '~' appended to their name.
1378
Only versioned files are affected.
1379
1380
TODO: Store backups of any files that will be reverted, so
1381
that the revert can be undone.
1475
1382
"""
1476
takes_options = ['revision', 'no-backup']
1477
takes_args = ['file*']
1478
aliases = ['merge-revert']
1383
takes_options = ['revision']
1479
1384
1480
def run(self, revision=None, no_backup=False, file_list=None):
1385
def run(self, revision=None):
1481
1386
from bzrlib.merge import merge
1482
if file_list is not None:
1483
if len(file_list) == 0:
1484
raise BzrCommandError("No files specified")
1485
1387
if revision is None:
1486
revision = [-1]
1388
revision = -1
1487
1389
elif len(revision) != 1:
1488
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1390
raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1489
1391
merge(('.', revision[0]), parse_spec('.'),
1490
1392
check_clean=False,
1491
ignore_zero=True,
1492
backup_files=not no_backup,
1493
file_list=file_list)
1393
ignore_zero=True)
1494
1394
1495
1395
1496
1396
class cmd_assert_fail(Command):
1519
1419
hidden = True
1520
1420
def run(self):
1521
1421
import bzrlib.plugin
1522
from inspect import getdoc
1523
1422
from pprint import pprint
1524
for plugin in bzrlib.plugin.all_plugins:
1525
print plugin.__path__[0]
1526
d = getdoc(plugin)
1527
if d:
1528
print '\t', d.split('\n')[0]
1529
1530
#pprint(bzrlib.plugin.all_plugins)
1423
pprint(bzrlib.plugin.all_plugins)
1531
1424
1532
1425
1533
1426
1555
1448
'update': None,
1556
1449
'long': None,
1557
1450
'root': str,
1558
'no-backup': None,
1559
'merge-type': get_merge_type,
1560
1451
}
1561
1452
1562
1453
SHORT_OPTIONS = {
1712
1603
return argdict
1713
1604
1714
1605
1606
def _parse_master_args(argv):
1607
"""Parse the arguments that always go with the original command.
1608
These are things like bzr --no-plugins, etc.
1609
1610
There are now 2 types of option flags. Ones that come *before* the command,
1611
and ones that come *after* the command.
1612
Ones coming *before* the command are applied against all possible commands.
1613
And are generally applied before plugins are loaded.
1614
1615
The current list are:
1616
--builtin Allow plugins to load, but don't let them override builtin commands,
1617
they will still be allowed if they do not override a builtin.
1618
--no-plugins Don't load any plugins. This lets you get back to official source
1619
behavior.
1620
--profile Enable the hotspot profile before running the command.
1621
For backwards compatibility, this is also a non-master option.
1622
--version Spit out the version of bzr that is running and exit.
1623
This is also a non-master option.
1624
--help Run help and exit, also a non-master option (I think that should stay, though)
1625
1626
>>> argv, opts = _parse_master_args(['bzr', '--test'])
1627
Traceback (most recent call last):
1628
...
1629
BzrCommandError: Invalid master option: 'test'
1630
>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1631
>>> print argv
1632
['command']
1633
>>> print opts['version']
1634
True
1635
>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1636
>>> print argv
1637
['command', '--more-options']
1638
>>> print opts['profile']
1639
True
1640
>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1641
>>> print argv
1642
['command']
1643
>>> print opts['no-plugins']
1644
True
1645
>>> print opts['profile']
1646
False
1647
>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1648
>>> print argv
1649
['command', '--profile']
1650
>>> print opts['profile']
1651
False
1652
"""
1653
master_opts = {'builtin':False,
1654
'no-plugins':False,
1655
'version':False,
1656
'profile':False,
1657
'help':False
1658
}
1659
1660
# This is the point where we could hook into argv[0] to determine
1661
# what front-end is supposed to be run
1662
# For now, we are just ignoring it.
1663
cmd_name = argv.pop(0)
1664
for arg in argv[:]:
1665
if arg[:2] != '--': # at the first non-option, we return the rest
1666
break
1667
arg = arg[2:] # Remove '--'
1668
if arg not in master_opts:
1669
# We could say that this is not an error, that we should
1670
# just let it be handled by the main section instead
1671
raise BzrCommandError('Invalid master option: %r' % arg)
1672
argv.pop(0) # We are consuming this entry
1673
master_opts[arg] = True
1674
return argv, master_opts
1675
1676
1715
1677
1716
1678
def run_bzr(argv):
1717
1679
"""Execute a command.
1718
1680
1719
1681
This is similar to main(), but without all the trappings for
1720
1682
logging and error handling.
1721
1722
argv
1723
The command-line arguments, without the program name from argv[0]
1724
1725
Returns a command status or raises an exception.
1726
1727
Special master options: these must come before the command because
1728
they control how the command is interpreted.
1729
1730
--no-plugins
1731
Do not load plugin modules at all
1732
1733
--builtin
1734
Only use builtin commands. (Plugins are still allowed to change
1735
other behaviour.)
1736
1737
--profile
1738
Run under the Python profiler.
1739
1683
"""
1740
1741
1684
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1742
1743
opt_profile = opt_no_plugins = opt_builtin = False
1744
1745
# --no-plugins is handled specially at a very early stage. We need
1746
# to load plugins before doing other command parsing so that they
1747
# can override commands, but this needs to happen first.
1748
1749
for a in argv[:]:
1750
if a == '--profile':
1751
opt_profile = True
1752
elif a == '--no-plugins':
1753
opt_no_plugins = True
1754
elif a == '--builtin':
1755
opt_builtin = True
1756
else:
1757
break
1758
argv.remove(a)
1759
1760
if not opt_no_plugins:
1761
from bzrlib.plugin import load_plugins
1762
load_plugins()
1763
1764
args, opts = parse_args(argv)
1765
1766
if 'help' in opts:
1767
from bzrlib.help import help
1768
if args:
1769
help(args[0])
1770
else:
1771
help()
1772
return 0
1773
1774
if 'version' in opts:
1775
show_version()
1776
return 0
1777
1685
1778
if not args:
1779
print >>sys.stderr, "please try 'bzr help' for help"
1686
try:
1687
# some options like --builtin and --no-plugins have special effects
1688
argv, master_opts = _parse_master_args(argv)
1689
if not master_opts['no-plugins']:
1690
from bzrlib.plugin import load_plugins
1691
load_plugins()
1692
1693
args, opts = parse_args(argv)
1694
1695
if master_opts['help']:
1696
from bzrlib.help import help
1697
if argv:
1698
help(argv[0])
1699
else:
1700
help()
1701
return 0
1702
1703
if 'help' in opts:
1704
from bzrlib.help import help
1705
if args:
1706
help(args[0])
1707
else:
1708
help()
1709
return 0
1710
elif 'version' in opts:
1711
show_version()
1712
return 0
1713
elif args and args[0] == 'builtin':
1714
include_plugins=False
1715
args = args[1:]
1716
cmd = str(args.pop(0))
1717
except IndexError:
1718
import help
1719
help.help()
1780
1720
return 1
1781
1782
cmd = str(args.pop(0))
1783
1784
canonical_cmd, cmd_class = \
1785
get_cmd_class(cmd, plugins_override=not opt_builtin)
1721
1722
1723
plugins_override = not (master_opts['builtin'])
1724
canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1725
1726
profile = master_opts['profile']
1727
# For backwards compatibility, I would rather stick with --profile being a
1728
# master/global option
1729
if 'profile' in opts:
1730
profile = True
1731
del opts['profile']
1786
1732
1787
1733
# check options are reasonable
1788
1734
allowed = cmd_class.takes_options
1797
1743
for k, v in opts.items():
1798
1744
cmdopts[k.replace('-', '_')] = v
1799
1745
1800
if opt_profile:
1746
if profile:
1801
1747
import hotshot, tempfile
1802
1748
pffileno, pfname = tempfile.mkstemp()
1803
1749
try:
1824
1770
1825
1771
def _report_exception(summary, quiet=False):
1826
1772
import traceback
1827
1828
1773
log_error('bzr: ' + summary)
1829
1774
bzrlib.trace.log_exception()
1830
1775
1831
if os.environ.get('BZR_DEBUG'):
1832
traceback.print_exc()
1833
1834
1776
if not quiet:
1835
sys.stderr.write('\n')
1836
1777
tb = sys.exc_info()[2]
1837
1778
exinfo = traceback.extract_tb(tb)
1838
1779
if exinfo:
1848
1789
try:
1849
1790
try:
1850
1791
try:
1851
return run_bzr(argv[1:])
1792
return run_bzr(argv)
1852
1793
finally:
1853
1794
# do this here inside the exception wrappers to catch EPIPE
1854
1795
sys.stdout.flush()
1855
1796
except BzrError, e:
1856
1797
quiet = isinstance(e, (BzrCommandError))
1857
_report_exception('error: ' + str(e), quiet=quiet)
1798
_report_exception('error: ' + e.args[0], quiet=quiet)
1858
1799
if len(e.args) > 1:
1859
1800
for h in e.args[1]:
1860
1801
# some explanation or hints
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0