130
def get_merge_type(typestring):
131
"""Attempt to find the merge class/factory associated with a string."""
132
from merge import merge_types
134
return merge_types[typestring][0]
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)
144
def get_merge_type(typestring):
145
"""Attempt to find the merge class/factory associated with a string."""
146
from merge import merge_types
148
return merge_types[typestring][0]
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)
159
126
def _get_cmd_dict(plugins_override=True):
256
220
class ExternalCommand(Command):
257
221
"""Class to wrap external commands.
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.
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
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
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
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.
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.
273
235
def find_command(cls, cmd):
553
class cmd_mv(Command):
554
"""Move or rename a file.
557
bzr mv OLDNAME NEWNAME
558
bzr mv SOURCE... DESTINATION
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.
564
Files cannot be moved between branches.
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])
572
rel_names = [b.relpath(x) for x in names_list]
574
if os.path.isdir(names_list[-1]):
575
# move into existing directory
576
b.move(rel_names[:-1], rel_names[-1])
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])
586
516
class cmd_pull(Command):
654
584
takes_args = ['from_location', 'to_location?']
655
585
takes_options = ['revision']
656
aliases = ['get', 'clone']
658
587
def run(self, from_location, to_location=None, revision=None):
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
666
595
cache_root = tempfile.mkdtemp()
597
if revision is not None:
598
if len(revision) > 1:
599
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
669
601
revision = [None]
670
elif len(revision) > 1:
671
raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')
675
604
br_from = find_cached_branch(from_location, cache_root)
889
812
b = find_branch('.')
814
# TODO: Make show_diff support taking 2 arguments
891
816
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])
900
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
902
show_diff(b, None, specific_files=file_list,
903
external_diff_options=diff_options)
817
if len(revision) != 1:
818
raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')
819
base_rev = revision[0]
821
show_diff(b, base_rev, specific_files=file_list,
822
external_diff_options=diff_options)
1457
1345
class cmd_merge(Command):
1458
"""Perform a three-way merge.
1460
The branch is the branch you will merge from. By default, it will merge
1461
the latest revision. If you specify a revision, that revision will be
1462
merged. If you specify two revisions, the first will be used as a BASE,
1463
and the second one as OTHER. Revision numbers are always relative to the
1468
To merge the latest revision from bzr.dev
1469
bzr merge ../bzr.dev
1471
To merge changes up to and including revision 82 from bzr.dev
1472
bzr merge -r 82 ../bzr.dev
1474
To merge the changes introduced by 82, without previous changes:
1475
bzr merge -r 81..82 ../bzr.dev
1346
"""Perform a three-way merge of trees.
1348
The SPEC parameters are working tree or revision specifiers. Working trees
1349
are specified using standard paths or urls. No component of a directory
1350
path may begin with '@'.
1352
Working tree examples: '.', '..', 'foo@', but NOT 'foo/@bar'
1354
Revisions are specified using a dirname/@revno pair, where dirname is the
1355
branch directory and revno is the revision within that branch. If no revno
1356
is specified, the latest revision is used.
1358
Revision examples: './@127', 'foo/@', '../@1'
1360
The OTHER_SPEC parameter is required. If the BASE_SPEC parameter is
1361
not supplied, the common ancestor of OTHER_SPEC the current branch is used
1477
1364
merge refuses to run if there are any uncommitted changes, unless
1478
1365
--force is given.
1480
takes_args = ['branch?']
1481
takes_options = ['revision', 'force', 'merge-type']
1367
takes_args = ['other_spec', 'base_spec?']
1368
takes_options = ['force']
1483
def run(self, branch='.', revision=None, force=False,
1370
def run(self, other_spec, base_spec=None, force=False):
1485
1371
from bzrlib.merge import merge
1486
from bzrlib.merge_core import ApplyMerge3
1487
if merge_type is None:
1488
merge_type = ApplyMerge3
1372
merge(parse_spec(other_spec), parse_spec(base_spec),
1373
check_clean=(not force))
1490
if revision is None or len(revision) < 1:
1492
other = (branch, -1)
1494
if len(revision) == 1:
1495
other = (branch, revision[0])
1498
assert len(revision) == 2
1499
if None in revision:
1500
raise BzrCommandError(
1501
"Merge doesn't permit that revision specifier.")
1502
base = (branch, revision[0])
1503
other = (branch, revision[1])
1505
merge(other, base, check_clean=(not force), merge_type=merge_type)
1508
1377
class cmd_revert(Command):
1378
"""Restore selected files from a previous revision.
1380
takes_args = ['file+']
1381
def run(self, file_list):
1382
from bzrlib.branch import find_branch
1387
b = find_branch(file_list[0])
1389
b.revert([b.relpath(f) for f in file_list])
1392
class cmd_merge_revert(Command):
1509
1393
"""Reverse all changes since the last commit.
1511
Only versioned files are affected. Specify filenames to revert only
1512
those files. By default, any files that are changed will be backed up
1513
first. Backup files have a '~' appended to their name.
1395
Only versioned files are affected.
1397
TODO: Store backups of any files that will be reverted, so
1398
that the revert can be undone.
1515
takes_options = ['revision', 'no-backup']
1516
takes_args = ['file*']
1517
aliases = ['merge-revert']
1400
takes_options = ['revision']
1519
def run(self, revision=None, no_backup=False, file_list=None):
1402
def run(self, revision=None):
1520
1403
from bzrlib.merge import merge
1521
if file_list is not None:
1522
if len(file_list) == 0:
1523
raise BzrCommandError("No files specified")
1524
1404
if revision is None:
1526
1406
elif len(revision) != 1:
1527
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1407
raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1528
1408
merge(('.', revision[0]), parse_spec('.'),
1529
1409
check_clean=False,
1531
backup_files=not no_backup,
1532
file_list=file_list)
1535
1413
class cmd_assert_fail(Command):
1556
class cmd_missing(Command):
1557
"""What is missing in this branch relative to other branch.
1559
takes_args = ['remote?']
1560
aliases = ['mis', 'miss']
1561
# We don't have to add quiet to the list, because
1562
# unknown options are parsed as booleans
1563
takes_options = ['verbose', 'quiet']
1565
def run(self, remote=None, verbose=False, quiet=False):
1566
from bzrlib.branch import find_branch, DivergedBranches
1567
from bzrlib.errors import BzrCommandError
1568
from bzrlib.missing import get_parent, show_missing
1570
if verbose and quiet:
1571
raise BzrCommandError('Cannot pass both quiet and verbose')
1573
b = find_branch('.')
1574
parent = get_parent(b)
1577
raise BzrCommandError("No missing location known or specified.")
1580
print "Using last location: %s" % parent
1582
elif parent is None:
1583
# We only update x-pull if it did not exist, missing should not change the parent
1584
b.controlfile('x-pull', 'wb').write(remote + '\n')
1585
br_remote = find_branch(remote)
1587
return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1590
1434
class cmd_plugins(Command):
1591
1435
"""List plugins"""
1630
def _parse_master_args(argv):
1631
"""Parse the arguments that always go with the original command.
1632
These are things like bzr --no-plugins, etc.
1634
There are now 2 types of option flags. Ones that come *before* the command,
1635
and ones that come *after* the command.
1636
Ones coming *before* the command are applied against all possible commands.
1637
And are generally applied before plugins are loaded.
1639
The current list are:
1640
--builtin Allow plugins to load, but don't let them override builtin commands,
1641
they will still be allowed if they do not override a builtin.
1642
--no-plugins Don't load any plugins. This lets you get back to official source
1644
--profile Enable the hotspot profile before running the command.
1645
For backwards compatibility, this is also a non-master option.
1646
--version Spit out the version of bzr that is running and exit.
1647
This is also a non-master option.
1648
--help Run help and exit, also a non-master option (I think that should stay, though)
1650
>>> argv, opts = _parse_master_args(['bzr', '--test'])
1651
Traceback (most recent call last):
1653
BzrCommandError: Invalid master option: 'test'
1654
>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])
1657
>>> print opts['version']
1659
>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])
1661
['command', '--more-options']
1662
>>> print opts['profile']
1664
>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])
1667
>>> print opts['no-plugins']
1669
>>> print opts['profile']
1671
>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])
1673
['command', '--profile']
1674
>>> print opts['profile']
1677
master_opts = {'builtin':False,
1684
# This is the point where we could hook into argv[0] to determine
1685
# what front-end is supposed to be run
1686
# For now, we are just ignoring it.
1687
cmd_name = argv.pop(0)
1689
if arg[:2] != '--': # at the first non-option, we return the rest
1691
arg = arg[2:] # Remove '--'
1692
if arg not in master_opts:
1693
# We could say that this is not an error, that we should
1694
# just let it be handled by the main section instead
1695
raise BzrCommandError('Invalid master option: %r' % arg)
1696
argv.pop(0) # We are consuming this entry
1697
master_opts[arg] = True
1698
return argv, master_opts
1790
1702
def run_bzr(argv):
1791
1703
"""Execute a command.
1793
1705
This is similar to main(), but without all the trappings for
1794
1706
logging and error handling.
1797
The command-line arguments, without the program name from argv[0]
1799
Returns a command status or raises an exception.
1801
Special master options: these must come before the command because
1802
they control how the command is interpreted.
1805
Do not load plugin modules at all
1808
Only use builtin commands. (Plugins are still allowed to change
1812
Run under the Python profiler.
1815
1708
argv = [a.decode(bzrlib.user_encoding) for a in argv]
1817
opt_profile = opt_no_plugins = opt_builtin = False
1819
# --no-plugins is handled specially at a very early stage. We need
1820
# to load plugins before doing other command parsing so that they
1821
# can override commands, but this needs to happen first.
1824
if a == '--profile':
1826
elif a == '--no-plugins':
1827
opt_no_plugins = True
1828
elif a == '--builtin':
1834
if not opt_no_plugins:
1835
from bzrlib.plugin import load_plugins
1838
args, opts = parse_args(argv)
1841
from bzrlib.help import help
1848
if 'version' in opts:
1853
print >>sys.stderr, "please try 'bzr help' for help"
1711
# some options like --builtin and --no-plugins have special effects
1712
argv, master_opts = _parse_master_args(argv)
1713
if not master_opts['no-plugins']:
1714
from bzrlib.plugin import load_plugins
1717
args, opts = parse_args(argv)
1719
if master_opts['help']:
1720
from bzrlib.help import help
1728
from bzrlib.help import help
1734
elif 'version' in opts:
1737
elif args and args[0] == 'builtin':
1738
include_plugins=False
1740
cmd = str(args.pop(0))
1856
cmd = str(args.pop(0))
1858
canonical_cmd, cmd_class = \
1859
get_cmd_class(cmd, plugins_override=not opt_builtin)
1747
plugins_override = not (master_opts['builtin'])
1748
canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)
1750
profile = master_opts['profile']
1751
# For backwards compatibility, I would rather stick with --profile being a
1752
# master/global option
1753
if 'profile' in opts:
1861
1757
# check options are reasonable
1862
1758
allowed = cmd_class.takes_options