72
78
_parse_revision_str,
74
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
this_branch = control_dir.open_branch(
90
possible_transports=possible_transports)
91
# This may be a heavy checkout, where we want the master branch
92
master_location = this_branch.get_bound_location()
93
if master_location is not None:
94
return master_location
95
# If not, use a local sibling
96
return this_branch.base
97
except errors.NotBranchError:
98
format = control_dir.find_branch_format()
99
if getattr(format, 'get_reference', None) is not None:
100
return format.get_reference(control_dir)
102
return control_dir.root_transport.base
105
def _is_colocated(control_dir, possible_transports=None):
106
"""Check if the branch in control_dir is colocated.
108
:param control_dir: Control directory
109
:return: Boolean indicating whether
111
# This path is meant to be relative to the existing branch
112
this_url = _get_branch_location(control_dir,
113
possible_transports=possible_transports)
114
# Perhaps the target control dir supports colocated branches?
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
135
:param control_dir: Control directory relative to which to look up
137
:param location: Name of the new branch
138
:return: Full location to the new branch
140
location = directory_service.directories.dereference(location)
141
if '/' not in location and '\\' not in location:
142
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
145
return urlutils.join_segment_parameters(this_url,
146
{"branch": urlutils.escape(location)})
148
return urlutils.join(this_url, '..', urlutils.escape(location))
152
def lookup_sibling_branch(control_dir, location, possible_transports=None):
153
"""Lookup sibling branch.
155
:param control_dir: Control directory relative to which to lookup the
157
:param location: Location to look up
158
:return: branch to open
161
# Perhaps it's a colocated branch?
162
return control_dir.open_branch(location,
163
possible_transports=possible_transports)
164
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
166
return Branch.open(location)
167
except errors.NotBranchError:
168
this_url = _get_branch_location(control_dir)
171
this_url, '..', urlutils.escape(location)))
77
174
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
471
582
raise errors.ShelvedChanges(working)
473
584
if working.user_url != working.branch.user_url:
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
585
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
586
" from a lightweight checkout"))
477
588
d.destroy_workingtree()
591
class cmd_repair_workingtree(Command):
592
__doc__ = """Reset the working tree state file.
594
This is not meant to be used normally, but more as a way to recover from
595
filesystem corruption, etc. This rebuilds the working inventory back to a
596
'known good' state. Any new modifications (adding a file, renaming, etc)
597
will be lost, though modified files will still be detected as such.
599
Most users will want something more like "bzr revert" or "bzr update"
600
unless the state file has become corrupted.
602
By default this attempts to recover the current state by looking at the
603
headers of the state file. If the state file is too corrupted to even do
604
that, you can supply --revision to force the state of the tree.
607
takes_options = ['revision', 'directory',
609
help='Reset the tree even if it doesn\'t appear to be'
614
def run(self, revision=None, directory='.', force=False):
615
tree, _ = WorkingTree.open_containing(directory)
616
self.add_cleanup(tree.lock_tree_write().unlock)
620
except errors.BzrError:
621
pass # There seems to be a real error here, so we'll reset
624
raise errors.BzrCommandError(gettext(
625
'The tree does not appear to be corrupt. You probably'
626
' want "bzr revert" instead. Use "--force" if you are'
627
' sure you want to reset the working tree.'))
631
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
633
tree.reset_state(revision_ids)
634
except errors.BzrError, e:
635
if revision_ids is None:
636
extra = (gettext(', the header appears corrupt, try passing -r -1'
637
' to set the state to the last commit'))
640
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
480
643
class cmd_revno(Command):
481
644
__doc__ = """Show current revision number.
486
649
_see_also = ['info']
487
650
takes_args = ['location?']
488
651
takes_options = [
489
Option('tree', help='Show revno of working tree'),
652
Option('tree', help='Show revno of working tree.'),
493
def run(self, tree=False, location=u'.'):
657
def run(self, tree=False, location=u'.', revision=None):
658
if revision is not None and tree:
659
raise errors.BzrCommandError(gettext("--tree and --revision can "
660
"not be used together"))
496
664
wt = WorkingTree.open_containing(location)[0]
497
665
self.add_cleanup(wt.lock_read().unlock)
498
666
except (errors.NoWorkingTree, errors.NotLocalUrl):
499
667
raise errors.NoWorkingTree(location)
500
669
revid = wt.last_revision()
502
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
503
except errors.NoSuchRevision:
505
revno = ".".join(str(n) for n in revno_t)
507
671
b = Branch.open_containing(location)[0]
508
672
self.add_cleanup(b.lock_read().unlock)
674
if len(revision) != 1:
675
raise errors.BzrCommandError(gettext(
676
"Tags can only be placed on a single revision, "
678
revid = revision[0].as_revision_id(b)
680
revid = b.last_revision()
682
revno_t = b.revision_id_to_dotted_revno(revid)
683
except errors.NoSuchRevision:
685
revno = ".".join(str(n) for n in revno_t)
510
686
self.cleanup_now()
511
self.outf.write(str(revno) + '\n')
687
self.outf.write(revno + '\n')
514
690
class cmd_revision_info(Command):
662
846
takes_args = ['dir+']
850
help='No error if existing, make parent directories as needed.',
663
854
encoding_type = 'replace'
665
def run(self, dir_list):
667
wt, dd = WorkingTree.open_containing(d)
668
base = os.path.dirname(dd)
669
id = wt.path2id(base)
673
self.outf.write('added %s\n' % d)
857
def add_file_with_parents(cls, wt, relpath):
858
if wt.path2id(relpath) is not None:
860
cls.add_file_with_parents(wt, osutils.dirname(relpath))
864
def add_file_single(cls, wt, relpath):
867
def run(self, dir_list, parents=False):
869
add_file = self.add_file_with_parents
871
add_file = self.add_file_single
873
wt, relpath = WorkingTree.open_containing(dir)
878
if e.errno != errno.EEXIST:
675
raise errors.NotVersionedError(path=base)
882
add_file(wt, relpath)
884
self.outf.write(gettext('added %s\n') % dir)
678
887
class cmd_relpath(Command):
784
994
return self.run_auto(names_list, after, dry_run)
786
raise errors.BzrCommandError('--dry-run requires --auto.')
996
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
787
997
if names_list is None:
789
999
if len(names_list) < 2:
790
raise errors.BzrCommandError("missing file argument")
1000
raise errors.BzrCommandError(gettext("missing file argument"))
791
1001
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1002
for file_name in rel_names[0:-1]:
1004
raise errors.BzrCommandError(gettext("can not move root of branch"))
792
1005
self.add_cleanup(tree.lock_tree_write().unlock)
793
1006
self._run(tree, names_list, rel_names, after)
795
1008
def run_auto(self, names_list, after, dry_run):
796
1009
if names_list is not None and len(names_list) > 1:
797
raise errors.BzrCommandError('Only one path may be specified to'
1010
raise errors.BzrCommandError(gettext('Only one path may be specified to'
800
raise errors.BzrCommandError('--after cannot be specified with'
1013
raise errors.BzrCommandError(gettext('--after cannot be specified with'
802
1015
work_tree, file_list = WorkingTree.open_containing_paths(
803
1016
names_list, default_directory='.')
804
1017
self.add_cleanup(work_tree.lock_tree_write().unlock)
1056
1288
Option('strict',
1057
1289
help='Refuse to push if there are uncommitted changes in'
1058
1290
' the working tree, --no-strict disables the check.'),
1292
help="Don't populate the working tree, even for protocols"
1293
" that support it."),
1060
1295
takes_args = ['location?']
1061
1296
encoding_type = 'replace'
1063
def run(self, location=None, remember=False, overwrite=False,
1298
def run(self, location=None, remember=None, overwrite=False,
1064
1299
create_prefix=False, verbose=False, revision=None,
1065
1300
use_existing_dir=False, directory=None, stacked_on=None,
1066
stacked=False, strict=None):
1301
stacked=False, strict=None, no_tree=False):
1067
1302
from bzrlib.push import _show_push_branch
1069
1304
if directory is None:
1070
1305
directory = '.'
1071
1306
# Get the source branch
1072
1307
(tree, br_from,
1073
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1308
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1074
1309
# Get the tip's revision_id
1075
1310
revision = _get_one_revision('push', revision)
1076
1311
if revision is not None:
1097
1332
# error by the feedback given to them. RBC 20080227.
1098
1333
stacked_on = parent_url
1099
1334
if not stacked_on:
1100
raise errors.BzrCommandError(
1101
"Could not determine branch to refer to.")
1335
raise errors.BzrCommandError(gettext(
1336
"Could not determine branch to refer to."))
1103
1338
# Get the destination location
1104
1339
if location is None:
1105
1340
stored_loc = br_from.get_push_location()
1106
1341
if stored_loc is None:
1107
raise errors.BzrCommandError(
1108
"No push location known or specified.")
1342
parent_loc = br_from.get_parent()
1344
raise errors.BzrCommandError(gettext(
1345
"No push location known or specified. To push to the "
1346
"parent branch (at %s), use 'bzr push :parent'." %
1347
urlutils.unescape_for_display(parent_loc,
1348
self.outf.encoding)))
1350
raise errors.BzrCommandError(gettext(
1351
"No push location known or specified."))
1110
1353
display_url = urlutils.unescape_for_display(stored_loc,
1111
1354
self.outf.encoding)
1112
self.outf.write("Using saved push location: %s\n" % display_url)
1355
note(gettext("Using saved push location: %s") % display_url)
1113
1356
location = stored_loc
1115
1358
_show_push_branch(br_from, revision_id, location, self.outf,
1116
1359
verbose=verbose, overwrite=overwrite, remember=remember,
1117
1360
stacked_on=stacked_on, create_prefix=create_prefix,
1118
use_existing_dir=use_existing_dir)
1361
use_existing_dir=use_existing_dir, no_tree=no_tree)
1121
1364
class cmd_branch(Command):
1185
1436
revision_id = br_from.last_revision()
1186
1437
if to_location is None:
1187
to_location = urlutils.derive_to_location(from_location)
1438
to_location = getattr(br_from, "name", None)
1440
to_location = urlutils.derive_to_location(from_location)
1188
1441
to_transport = transport.get_transport(to_location)
1190
1443
to_transport.mkdir('.')
1191
1444
except errors.FileExists:
1192
if not use_existing_dir:
1193
raise errors.BzrCommandError('Target directory "%s" '
1194
'already exists.' % to_location)
1446
to_dir = controldir.ControlDir.open_from_transport(
1448
except errors.NotBranchError:
1449
if not use_existing_dir:
1450
raise errors.BzrCommandError(gettext('Target directory "%s" '
1451
'already exists.') % to_location)
1197
bzrdir.BzrDir.open_from_transport(to_transport)
1456
to_dir.open_branch()
1198
1457
except errors.NotBranchError:
1201
1460
raise errors.AlreadyBranchError(to_location)
1202
1461
except errors.NoSuchFile:
1203
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1462
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1206
# preserve whatever source format we have.
1207
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1208
possible_transports=[to_transport],
1209
accelerator_tree=accelerator_tree,
1210
hardlink=hardlink, stacked=stacked,
1211
force_new_repo=standalone,
1212
create_tree_if_local=not no_tree,
1213
source_branch=br_from)
1214
branch = dir.open_branch()
1215
except errors.NoSuchRevision:
1216
to_transport.delete_tree('.')
1217
msg = "The branch %s has no revision %s." % (from_location,
1219
raise errors.BzrCommandError(msg)
1468
# preserve whatever source format we have.
1469
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1470
possible_transports=[to_transport],
1471
accelerator_tree=accelerator_tree,
1472
hardlink=hardlink, stacked=stacked,
1473
force_new_repo=standalone,
1474
create_tree_if_local=not no_tree,
1475
source_branch=br_from)
1476
branch = to_dir.open_branch(
1477
possible_transports=[
1478
br_from.bzrdir.root_transport, to_transport])
1479
except errors.NoSuchRevision:
1480
to_transport.delete_tree('.')
1481
msg = gettext("The branch {0} has no revision {1}.").format(
1482
from_location, revision)
1483
raise errors.BzrCommandError(msg)
1486
to_repo = to_dir.open_repository()
1487
except errors.NoRepositoryPresent:
1488
to_repo = to_dir.create_repository()
1489
to_repo.fetch(br_from.repository, revision_id=revision_id)
1490
branch = br_from.sprout(to_dir, revision_id=revision_id)
1220
1491
_merge_tags_if_possible(br_from, branch)
1221
1492
# If the source branch is stacked, the new branch may
1222
1493
# be stacked whether we asked for that explicitly or not.
1223
1494
# We therefore need a try/except here and not just 'if stacked:'
1225
note('Created new stacked branch referring to %s.' %
1496
note(gettext('Created new stacked branch referring to %s.') %
1226
1497
branch.get_stacked_on_url())
1227
1498
except (errors.NotStacked, errors.UnstackableBranchFormat,
1228
1499
errors.UnstackableRepositoryFormat), e:
1229
note('Branched %d revision(s).' % branch.revno())
1500
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1231
1502
# Bind to the parent
1232
1503
parent_branch = Branch.open(from_location)
1233
1504
branch.bind(parent_branch)
1234
note('New branch bound to %s' % from_location)
1505
note(gettext('New branch bound to %s') % from_location)
1236
1507
# Switch to the new branch
1237
1508
wt, _ = WorkingTree.open_containing('.')
1238
1509
_mod_switch.switch(wt.bzrdir, branch)
1239
note('Switched to branch: %s',
1510
note(gettext('Switched to branch: %s'),
1240
1511
urlutils.unescape_for_display(branch.base, 'utf-8'))
1514
class cmd_branches(Command):
1515
__doc__ = """List the branches available at the current location.
1517
This command will print the names of all the branches at the current
1521
takes_args = ['location?']
1523
Option('recursive', short_name='R',
1524
help='Recursively scan for branches rather than '
1525
'just looking in the specified location.')]
1527
def run(self, location=".", recursive=False):
1529
t = transport.get_transport(location)
1530
if not t.listable():
1531
raise errors.BzrCommandError(
1532
"Can't scan this type of location.")
1533
for b in controldir.ControlDir.find_branches(t):
1534
self.outf.write("%s\n" % urlutils.unescape_for_display(
1535
urlutils.relative_url(t.base, b.base),
1536
self.outf.encoding).rstrip("/"))
1538
dir = controldir.ControlDir.open_containing(location)[0]
1540
active_branch = dir.open_branch(name="")
1541
except errors.NotBranchError:
1542
active_branch = None
1543
branches = dir.get_branches()
1545
for name, branch in branches.iteritems():
1548
active = (active_branch is not None and
1549
active_branch.base == branch.base)
1550
names[name] = active
1551
# Only mention the current branch explicitly if it's not
1552
# one of the colocated branches
1553
if not any(names.values()) and active_branch is not None:
1554
self.outf.write("* %s\n" % gettext("(default)"))
1555
for name in sorted(names.keys()):
1556
active = names[name]
1561
self.outf.write("%s %s\n" % (
1562
prefix, name.encode(self.outf.encoding)))
1243
1565
class cmd_checkout(Command):
1244
1566
__doc__ = """Create a new checkout of an existing branch.
1347
1669
class cmd_update(Command):
1348
__doc__ = """Update a tree to have the latest code committed to its branch.
1350
This will perform a merge into the working tree, and may generate
1351
conflicts. If you have any local changes, you will still
1352
need to commit them after the update for the update to be complete.
1354
If you want to discard your local changes, you can just do a
1355
'bzr revert' instead of 'bzr commit' after the update.
1357
If you want to restore a file that has been removed locally, use
1358
'bzr revert' instead of 'bzr update'.
1360
If the tree's branch is bound to a master branch, it will also update
1670
__doc__ = """Update a working tree to a new revision.
1672
This will perform a merge of the destination revision (the tip of the
1673
branch, or the specified revision) into the working tree, and then make
1674
that revision the basis revision for the working tree.
1676
You can use this to visit an older revision, or to update a working tree
1677
that is out of date from its branch.
1679
If there are any uncommitted changes in the tree, they will be carried
1680
across and remain as uncommitted changes after the update. To discard
1681
these changes, use 'bzr revert'. The uncommitted changes may conflict
1682
with the changes brought in by the change in basis revision.
1684
If the tree's branch is bound to a master branch, bzr will also update
1361
1685
the branch from the master.
1687
You cannot update just a single file or directory, because each Bazaar
1688
working tree has just a single basis revision. If you want to restore a
1689
file that has been removed locally, use 'bzr revert' instead of 'bzr
1690
update'. If you want to restore a file to its state in a previous
1691
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1692
out the old content of that file to a new location.
1694
The 'dir' argument, if given, must be the location of the root of a
1695
working tree to update. By default, the working tree that contains the
1696
current working directory is used.
1364
1699
_see_also = ['pull', 'working-trees', 'status-flags']
1365
1700
takes_args = ['dir?']
1366
takes_options = ['revision']
1701
takes_options = ['revision',
1703
help="Show base revision text in conflicts."),
1367
1705
aliases = ['up']
1369
def run(self, dir='.', revision=None):
1707
def run(self, dir=None, revision=None, show_base=None):
1370
1708
if revision is not None and len(revision) != 1:
1371
raise errors.BzrCommandError(
1372
"bzr update --revision takes exactly one revision")
1373
tree = WorkingTree.open_containing(dir)[0]
1709
raise errors.BzrCommandError(gettext(
1710
"bzr update --revision takes exactly one revision"))
1712
tree = WorkingTree.open_containing('.')[0]
1714
tree, relpath = WorkingTree.open_containing(dir)
1717
raise errors.BzrCommandError(gettext(
1718
"bzr update can only update a whole tree, "
1719
"not a file or subdirectory"))
1374
1720
branch = tree.branch
1375
1721
possible_transports = []
1376
1722
master = branch.get_master_branch(
1412
1758
change_reporter,
1413
1759
possible_transports=possible_transports,
1414
1760
revision=revision_id,
1762
show_base=show_base)
1416
1763
except errors.NoSuchRevision, e:
1417
raise errors.BzrCommandError(
1764
raise errors.BzrCommandError(gettext(
1418
1765
"branch has no revision %s\n"
1419
1766
"bzr update --revision only works"
1420
" for a revision in the branch history"
1767
" for a revision in the branch history")
1421
1768
% (e.revision))
1422
1769
revno = tree.branch.revision_id_to_dotted_revno(
1423
1770
_mod_revision.ensure_null(tree.last_revision()))
1424
note('Updated to revision %s of branch %s' %
1425
('.'.join(map(str, revno)), branch_location))
1771
note(gettext('Updated to revision {0} of branch {1}').format(
1772
'.'.join(map(str, revno)), branch_location))
1426
1773
parent_ids = tree.get_parent_ids()
1427
1774
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1428
note('Your local commits will now show as pending merges with '
1429
"'bzr status', and can be committed with 'bzr commit'.")
1775
note(gettext('Your local commits will now show as pending merges with '
1776
"'bzr status', and can be committed with 'bzr commit'."))
1430
1777
if conflicts != 0:
1494
1841
title='Deletion Strategy', value_switches=True, enum_switch=False,
1495
1842
safe='Backup changed files (default).',
1496
1843
keep='Delete from bzr but leave the working copy.',
1844
no_backup='Don\'t backup changed files.',
1497
1845
force='Delete all the specified files, even if they can not be '
1498
'recovered and even if they are non-empty directories.')]
1846
'recovered and even if they are non-empty directories. '
1847
'(deprecated, use no-backup)')]
1499
1848
aliases = ['rm', 'del']
1500
1849
encoding_type = 'replace'
1502
1851
def run(self, file_list, verbose=False, new=False,
1503
1852
file_deletion_strategy='safe'):
1853
if file_deletion_strategy == 'force':
1854
note(gettext("(The --force option is deprecated, rather use --no-backup "
1856
file_deletion_strategy = 'no-backup'
1504
1858
tree, file_list = WorkingTree.open_containing_paths(file_list)
1506
1860
if file_list is not None:
1708
2072
to_transport.ensure_base()
1709
2073
except errors.NoSuchFile:
1710
2074
if not create_prefix:
1711
raise errors.BzrCommandError("Parent directory of %s"
2075
raise errors.BzrCommandError(gettext("Parent directory of %s"
1712
2076
" does not exist."
1713
2077
"\nYou may supply --create-prefix to create all"
1714
" leading parent directories."
2078
" leading parent directories.")
1716
2080
to_transport.create_prefix()
1719
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2083
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1720
2084
except errors.NotBranchError:
1721
2085
# really a NotBzrDir error...
1722
create_branch = bzrdir.BzrDir.create_branch_convenience
2086
create_branch = controldir.ControlDir.create_branch_convenience
2088
force_new_tree = False
2090
force_new_tree = None
1723
2091
branch = create_branch(to_transport.base, format=format,
1724
possible_transports=[to_transport])
2092
possible_transports=[to_transport],
2093
force_new_tree=force_new_tree)
1725
2094
a_bzrdir = branch.bzrdir
1727
2096
from bzrlib.transport.local import LocalTransport
1803
2174
def run(self, location, format=None, no_trees=False):
1804
2175
if format is None:
1805
format = bzrdir.format_registry.make_bzrdir('default')
2176
format = controldir.format_registry.make_bzrdir('default')
1807
2178
if location is None:
1810
2181
to_transport = transport.get_transport(location)
1811
to_transport.ensure_base()
1813
newdir = format.initialize_on_transport(to_transport)
1814
repo = newdir.create_repository(shared=True)
1815
repo.set_make_working_trees(not no_trees)
2183
(repo, newdir, require_stacking, repository_policy) = (
2184
format.initialize_on_transport_ex(to_transport,
2185
create_prefix=True, make_working_trees=not no_trees,
2186
shared_repo=True, force_new_repo=True,
2187
use_existing_dir=True,
2188
repo_format_name=format.repository_format.get_format_string()))
1816
2189
if not is_quiet():
1817
2190
from bzrlib.info import show_bzrdir_info
1818
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2191
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1821
2194
class cmd_diff(Command):
2264
2656
Option('show-diff',
2265
2657
short_name='p',
2266
2658
help='Show changes made in each revision as a patch.'),
2267
Option('include-merges',
2659
Option('include-merged',
2268
2660
help='Show merged revisions like --levels 0 does.'),
2661
Option('include-merges', hidden=True,
2662
help='Historical alias for --include-merged.'),
2663
Option('omit-merges',
2664
help='Do not report commits with more than one parent.'),
2269
2665
Option('exclude-common-ancestry',
2270
2666
help='Display only the revisions that are not part'
2271
' of both ancestries (require -rX..Y)'
2667
' of both ancestries (require -rX..Y).'
2669
Option('signatures',
2670
help='Show digital signature validity.'),
2673
help='Show revisions whose properties match this '
2676
ListOption('match-message',
2677
help='Show revisions whose message matches this '
2680
ListOption('match-committer',
2681
help='Show revisions whose committer matches this '
2684
ListOption('match-author',
2685
help='Show revisions whose authors match this '
2688
ListOption('match-bugs',
2689
help='Show revisions whose bugs match this '
2274
2693
encoding_type = 'replace'
2295
2722
_get_info_for_log_files,
2297
2724
direction = (forward and 'forward') or 'reverse'
2725
if symbol_versioning.deprecated_passed(include_merges):
2726
ui.ui_factory.show_user_warning(
2727
'deprecated_command_option',
2728
deprecated_name='--include-merges',
2729
recommended_name='--include-merged',
2730
deprecated_in_version='2.5',
2731
command=self.invoked_as)
2732
if include_merged is None:
2733
include_merged = include_merges
2735
raise errors.BzrCommandError(gettext(
2736
'{0} and {1} are mutually exclusive').format(
2737
'--include-merges', '--include-merged'))
2738
if include_merged is None:
2739
include_merged = False
2298
2740
if (exclude_common_ancestry
2299
2741
and (revision is None or len(revision) != 2)):
2300
raise errors.BzrCommandError(
2301
'--exclude-common-ancestry requires -r with two revisions')
2742
raise errors.BzrCommandError(gettext(
2743
'--exclude-common-ancestry requires -r with two revisions'))
2303
2745
if levels is None:
2306
raise errors.BzrCommandError(
2307
'--levels and --include-merges are mutually exclusive')
2748
raise errors.BzrCommandError(gettext(
2749
'{0} and {1} are mutually exclusive').format(
2750
'--levels', '--include-merged'))
2309
2752
if change is not None:
2310
2753
if len(change) > 1:
2311
2754
raise errors.RangeInChangeOption()
2312
2755
if revision is not None:
2313
raise errors.BzrCommandError(
2314
'--revision and --change are mutually exclusive')
2756
raise errors.BzrCommandError(gettext(
2757
'{0} and {1} are mutually exclusive').format(
2758
'--revision', '--change'))
2316
2760
revision = change
2693
3166
self.outf.write("%s\n" % pattern)
2695
3168
if not name_pattern_list:
2696
raise errors.BzrCommandError("ignore requires at least one "
2697
"NAME_PATTERN or --default-rules.")
3169
raise errors.BzrCommandError(gettext("ignore requires at least one "
3170
"NAME_PATTERN or --default-rules."))
2698
3171
name_pattern_list = [globbing.normalize_pattern(p)
2699
3172
for p in name_pattern_list]
2700
3173
bad_patterns = ''
3174
bad_patterns_count = 0
2701
3175
for p in name_pattern_list:
2702
3176
if not globbing.Globster.is_pattern_valid(p):
3177
bad_patterns_count += 1
2703
3178
bad_patterns += ('\n %s' % p)
2704
3179
if bad_patterns:
2705
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3180
msg = (ngettext('Invalid ignore pattern found. %s',
3181
'Invalid ignore patterns found. %s',
3182
bad_patterns_count) % bad_patterns)
2706
3183
ui.ui_factory.show_error(msg)
2707
3184
raise errors.InvalidPattern('')
2708
3185
for name_pattern in name_pattern_list:
2709
3186
if (name_pattern[0] == '/' or
2710
3187
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
raise errors.BzrCommandError(
2712
"NAME_PATTERN should not be an absolute path")
3188
raise errors.BzrCommandError(gettext(
3189
"NAME_PATTERN should not be an absolute path"))
2713
3190
tree, relpath = WorkingTree.open_containing(directory)
2714
3191
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
3192
ignored = globbing.Globster(name_pattern_list)
2818
3296
Option('per-file-timestamps',
2819
3297
help='Set modification time of files to that of the last '
2820
3298
'revision in which it was changed.'),
3299
Option('uncommitted',
3300
help='Export the working tree contents rather than that of the '
2822
3303
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2823
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3304
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2824
3306
from bzrlib.export import export
2826
3308
if branch_or_subdir is None:
2827
tree = WorkingTree.open_containing(directory)[0]
3309
branch_or_subdir = directory
3311
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3313
if tree is not None:
3314
self.add_cleanup(tree.lock_read().unlock)
3318
raise errors.BzrCommandError(
3319
gettext("--uncommitted requires a working tree"))
2831
b, subdir = Branch.open_containing(branch_or_subdir)
2834
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3322
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2836
export(rev_tree, dest, format, root, subdir, filtered=filters,
3324
export(export_tree, dest, format, root, subdir, filtered=filters,
2837
3325
per_file_timestamps=per_file_timestamps)
2838
3326
except errors.NoSuchExportFormat, e:
2839
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3327
raise errors.BzrCommandError(
3328
gettext('Unsupported export format: %s') % e.format)
2842
3331
class cmd_cat(Command):
2880
3369
old_file_id = rev_tree.path2id(relpath)
3371
# TODO: Split out this code to something that generically finds the
3372
# best id for a path across one or more trees; it's like
3373
# find_ids_across_trees but restricted to find just one. -- mbp
2882
3375
if name_from_revision:
2883
3376
# Try in revision if requested
2884
3377
if old_file_id is None:
2885
raise errors.BzrCommandError(
2886
"%r is not present in revision %s" % (
3378
raise errors.BzrCommandError(gettext(
3379
"{0!r} is not present in revision {1}").format(
2887
3380
filename, rev_tree.get_revision_id()))
2889
content = rev_tree.get_file_text(old_file_id)
3382
actual_file_id = old_file_id
2891
3384
cur_file_id = tree.path2id(relpath)
2893
if cur_file_id is not None:
2894
# Then try with the actual file id
2896
content = rev_tree.get_file_text(cur_file_id)
2898
except errors.NoSuchId:
2899
# The actual file id didn't exist at that time
2901
if not found and old_file_id is not None:
2902
# Finally try with the old file id
2903
content = rev_tree.get_file_text(old_file_id)
2906
# Can't be found anywhere
2907
raise errors.BzrCommandError(
2908
"%r is not present in revision %s" % (
3385
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3386
actual_file_id = cur_file_id
3387
elif old_file_id is not None:
3388
actual_file_id = old_file_id
3390
raise errors.BzrCommandError(gettext(
3391
"{0!r} is not present in revision {1}").format(
2909
3392
filename, rev_tree.get_revision_id()))
2911
from bzrlib.filters import (
2912
ContentFilterContext,
2913
filtered_output_bytes,
2915
filters = rev_tree._content_filter_stack(relpath)
2916
chunks = content.splitlines(True)
2917
content = filtered_output_bytes(chunks, filters,
2918
ContentFilterContext(relpath, rev_tree))
2920
self.outf.writelines(content)
3394
from bzrlib.filter_tree import ContentFilterTree
3395
filter_tree = ContentFilterTree(rev_tree,
3396
rev_tree._content_filter_stack)
3397
content = filter_tree.get_file_text(actual_file_id)
2923
self.outf.write(content)
3399
content = rev_tree.get_file_text(actual_file_id)
3401
self.outf.write(content)
2926
3404
class cmd_local_time_offset(Command):
2987
3465
to trigger updates to external systems like bug trackers. The --fixes
2988
3466
option can be used to record the association between a revision and
2989
3467
one or more bugs. See ``bzr help bugs`` for details.
2991
A selective commit may fail in some cases where the committed
2992
tree would be invalid. Consider::
2997
bzr commit foo -m "committing foo"
2998
bzr mv foo/bar foo/baz
3001
bzr commit foo/bar -m "committing bar but not baz"
3003
In the example above, the last commit will fail by design. This gives
3004
the user the opportunity to decide whether they want to commit the
3005
rename at the same time, separately first, or not at all. (As a general
3006
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3008
# TODO: Run hooks on tree to-be-committed, and after commit.
3010
# TODO: Strict commit that fails if there are deleted files.
3011
# (what does "deleted files" mean ??)
3013
# TODO: Give better message for -s, --summary, used by tla people
3015
# XXX: verbose currently does nothing
3017
3470
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3018
3471
takes_args = ['selected*']
3050
3503
Option('show-diff', short_name='p',
3051
3504
help='When no message is supplied, show the diff along'
3052
3505
' with the status summary in the message editor.'),
3507
help='When committing to a foreign version control '
3508
'system do not push data that can not be natively '
3054
3511
aliases = ['ci', 'checkin']
3056
3513
def _iter_bug_fix_urls(self, fixes, branch):
3514
default_bugtracker = None
3057
3515
# Configure the properties for bug fixing attributes.
3058
3516
for fixed_bug in fixes:
3059
3517
tokens = fixed_bug.split(':')
3060
if len(tokens) != 2:
3061
raise errors.BzrCommandError(
3518
if len(tokens) == 1:
3519
if default_bugtracker is None:
3520
branch_config = branch.get_config()
3521
default_bugtracker = branch_config.get_user_option(
3523
if default_bugtracker is None:
3524
raise errors.BzrCommandError(gettext(
3525
"No tracker specified for bug %s. Use the form "
3526
"'tracker:id' or specify a default bug tracker "
3527
"using the `bugtracker` option.\nSee "
3528
"\"bzr help bugs\" for more information on this "
3529
"feature. Commit refused.") % fixed_bug)
3530
tag = default_bugtracker
3532
elif len(tokens) != 2:
3533
raise errors.BzrCommandError(gettext(
3062
3534
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3063
3535
"See \"bzr help bugs\" for more information on this "
3064
"feature.\nCommit refused." % fixed_bug)
3065
tag, bug_id = tokens
3536
"feature.\nCommit refused.") % fixed_bug)
3538
tag, bug_id = tokens
3067
3540
yield bugtracker.get_bug_url(tag, branch, bug_id)
3068
3541
except errors.UnknownBugTrackerAbbreviation:
3069
raise errors.BzrCommandError(
3070
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3542
raise errors.BzrCommandError(gettext(
3543
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3071
3544
except errors.MalformedBugIdentifier, e:
3072
raise errors.BzrCommandError(
3073
"%s\nCommit refused." % (str(e),))
3545
raise errors.BzrCommandError(gettext(
3546
"%s\nCommit refused.") % (str(e),))
3075
3548
def run(self, message=None, file=None, verbose=False, selected_list=None,
3076
3549
unchanged=False, strict=False, local=False, fixes=None,
3077
author=None, show_diff=False, exclude=None, commit_time=None):
3550
author=None, show_diff=False, exclude=None, commit_time=None,
3078
3552
from bzrlib.errors import (
3079
3553
PointlessCommit,
3080
3554
ConflictsInTree,
3161
3630
# make_commit_message_template_encoded returns user encoding.
3162
3631
# We probably want to be using edit_commit_message instead to
3164
start_message = generate_commit_message_template(commit_obj)
3165
my_message = edit_commit_message_encoded(text,
3166
start_message=start_message)
3167
if my_message is None:
3168
raise errors.BzrCommandError("please specify a commit"
3169
" message with either --message or --file")
3170
if my_message == "":
3171
raise errors.BzrCommandError("empty commit message specified")
3633
my_message = set_commit_message(commit_obj)
3634
if my_message is None:
3635
start_message = generate_commit_message_template(commit_obj)
3636
my_message = edit_commit_message_encoded(text,
3637
start_message=start_message)
3638
if my_message is None:
3639
raise errors.BzrCommandError(gettext("please specify a commit"
3640
" message with either --message or --file"))
3641
if my_message == "":
3642
raise errors.BzrCommandError(gettext("Empty commit message specified."
3643
" Please specify a commit message with either"
3644
" --message or --file or leave a blank message"
3645
" with --message \"\"."))
3172
3646
return my_message
3174
3648
# The API permits a commit with a filter of [] to mean 'select nothing'
3182
3656
reporter=None, verbose=verbose, revprops=properties,
3183
3657
authors=author, timestamp=commit_stamp,
3184
3658
timezone=offset,
3185
exclude=tree.safe_relpath_files(exclude))
3659
exclude=tree.safe_relpath_files(exclude),
3186
3661
except PointlessCommit:
3187
raise errors.BzrCommandError("No changes to commit."
3188
" Use --unchanged to commit anyhow.")
3662
raise errors.BzrCommandError(gettext("No changes to commit."
3663
" Please 'bzr add' the files you want to commit, or use"
3664
" --unchanged to force an empty commit."))
3189
3665
except ConflictsInTree:
3190
raise errors.BzrCommandError('Conflicts detected in working '
3666
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3191
3667
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3193
3669
except StrictCommitFailed:
3194
raise errors.BzrCommandError("Commit refused because there are"
3195
" unknown files in the working tree.")
3670
raise errors.BzrCommandError(gettext("Commit refused because there are"
3671
" unknown files in the working tree."))
3196
3672
except errors.BoundBranchOutOfDate, e:
3197
e.extra_help = ("\n"
3673
e.extra_help = (gettext("\n"
3198
3674
'To commit to master branch, run update and then commit.\n'
3199
3675
'You can also pass --local to commit to continue working '
3274
3750
class cmd_upgrade(Command):
3275
__doc__ = """Upgrade branch storage to current format.
3277
The check command or bzr developers may sometimes advise you to run
3278
this command. When the default format has changed you may also be warned
3279
during other operations to upgrade.
3751
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3753
When the default format has changed after a major new release of
3754
Bazaar, you may be informed during certain operations that you
3755
should upgrade. Upgrading to a newer format may improve performance
3756
or make new features available. It may however limit interoperability
3757
with older repositories or with older versions of Bazaar.
3759
If you wish to upgrade to a particular format rather than the
3760
current default, that can be specified using the --format option.
3761
As a consequence, you can use the upgrade command this way to
3762
"downgrade" to an earlier format, though some conversions are
3763
a one way process (e.g. changing from the 1.x default to the
3764
2.x default) so downgrading is not always possible.
3766
A backup.bzr.~#~ directory is created at the start of the conversion
3767
process (where # is a number). By default, this is left there on
3768
completion. If the conversion fails, delete the new .bzr directory
3769
and rename this one back in its place. Use the --clean option to ask
3770
for the backup.bzr directory to be removed on successful conversion.
3771
Alternatively, you can delete it by hand if everything looks good
3774
If the location given is a shared repository, dependent branches
3775
are also converted provided the repository converts successfully.
3776
If the conversion of a branch fails, remaining branches are still
3779
For more information on upgrades, see the Bazaar Upgrade Guide,
3780
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3282
_see_also = ['check']
3783
_see_also = ['check', 'reconcile', 'formats']
3283
3784
takes_args = ['url?']
3284
3785
takes_options = [
3285
RegistryOption('format',
3286
help='Upgrade to a specific format. See "bzr help'
3287
' formats" for details.',
3288
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3289
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3290
value_switches=True, title='Branch format'),
3786
RegistryOption('format',
3787
help='Upgrade to a specific format. See "bzr help'
3788
' formats" for details.',
3789
lazy_registry=('bzrlib.controldir', 'format_registry'),
3790
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3791
value_switches=True, title='Branch format'),
3793
help='Remove the backup.bzr directory if successful.'),
3795
help="Show what would be done, but don't actually do anything."),
3293
def run(self, url='.', format=None):
3798
def run(self, url='.', format=None, clean=False, dry_run=False):
3294
3799
from bzrlib.upgrade import upgrade
3295
upgrade(url, format)
3800
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3802
if len(exceptions) == 1:
3803
# Compatibility with historical behavior
3298
3809
class cmd_whoami(Command):
3691
4237
The source of the merge can be specified either in the form of a branch,
3692
4238
or in the form of a path to a file containing a merge directive generated
3693
4239
with bzr send. If neither is specified, the default is the upstream branch
3694
or the branch most recently merged using --remember.
3696
When merging a branch, by default the tip will be merged. To pick a different
3697
revision, pass --revision. If you specify two values, the first will be used as
3698
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3699
available revisions, like this is commonly referred to as "cherrypicking".
3701
Revision numbers are always relative to the branch being merged.
3703
By default, bzr will try to merge in all new work from the other
3704
branch, automatically determining an appropriate base. If this
3705
fails, you may need to give an explicit base.
4240
or the branch most recently merged using --remember. The source of the
4241
merge may also be specified in the form of a path to a file in another
4242
branch: in this case, only the modifications to that file are merged into
4243
the current working tree.
4245
When merging from a branch, by default bzr will try to merge in all new
4246
work from the other branch, automatically determining an appropriate base
4247
revision. If this fails, you may need to give an explicit base.
4249
To pick a different ending revision, pass "--revision OTHER". bzr will
4250
try to merge in all new work up to and including revision OTHER.
4252
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4253
through OTHER, excluding BASE but including OTHER, will be merged. If this
4254
causes some revisions to be skipped, i.e. if the destination branch does
4255
not already contain revision BASE, such a merge is commonly referred to as
4256
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4257
cherrypicks. The changes look like a normal commit, and the history of the
4258
changes from the other branch is not stored in the commit.
4260
Revision numbers are always relative to the source branch.
3707
4262
Merge will do its best to combine the changes in two branches, but there
3708
4263
are some kinds of problems only a human can fix. When it encounters those,
3709
4264
it will mark a conflict. A conflict means that you need to fix something,
3710
before you should commit.
4265
before you can commit.
3712
4267
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3714
If there is no default branch set, the first merge will set it. After
3715
that, you can omit the branch to use the default. To change the
3716
default, use --remember. The value will only be saved if the remote
3717
location can be accessed.
4269
If there is no default branch set, the first merge will set it (use
4270
--no-remember to avoid setting it). After that, you can omit the branch
4271
to use the default. To change the default, use --remember. The value will
4272
only be saved if the remote location can be accessed.
3719
4274
The results of the merge are placed into the destination working
3720
4275
directory, where they can be reviewed (with bzr diff), tested, and then
3721
4276
committed to record the result of the merge.
3723
4278
merge refuses to run if there are any uncommitted changes, unless
3724
--force is given. The --force option can also be used to create a
4279
--force is given. If --force is given, then the changes from the source
4280
will be merged with the current working tree, including any uncommitted
4281
changes in the tree. The --force option can also be used to create a
3725
4282
merge revision which has more than two parents.
3727
4284
If one would like to merge changes from the working tree of the other
3851
4412
self.sanity_check_merger(merger)
3852
4413
if (merger.base_rev_id == merger.other_rev_id and
3853
4414
merger.other_rev_id is not None):
3854
note('Nothing to do.')
4415
# check if location is a nonexistent file (and not a branch) to
4416
# disambiguate the 'Nothing to do'
4417
if merger.interesting_files:
4418
if not merger.other_tree.has_filename(
4419
merger.interesting_files[0]):
4420
note(gettext("merger: ") + str(merger))
4421
raise errors.PathsDoNotExist([location])
4422
note(gettext('Nothing to do.'))
4424
if pull and not preview:
3857
4425
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
4426
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3859
4427
if (merger.base_rev_id == tree.last_revision()):
3860
4428
result = tree.pull(merger.other_branch, False,
3861
4429
merger.other_rev_id)
3862
4430
result.report(self.outf)
3864
4432
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
4433
raise errors.BzrCommandError(gettext(
3866
4434
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
4435
" (perhaps you would prefer 'bzr pull')"))
3869
4437
return self._do_preview(merger)
3870
4438
elif interactive:
3968
4536
if other_revision_id is None:
3969
4537
other_revision_id = _mod_revision.ensure_null(
3970
4538
other_branch.last_revision())
3971
# Remember where we merge from
3972
if ((remember or tree.branch.get_submit_branch() is None) and
3973
user_location is not None):
4539
# Remember where we merge from. We need to remember if:
4540
# - user specify a location (and we don't merge from the parent
4542
# - user ask to remember or there is no previous location set to merge
4543
# from and user didn't ask to *not* remember
4544
if (user_location is not None
4546
or (remember is None
4547
and tree.branch.get_submit_branch() is None)))):
3974
4548
tree.branch.set_submit_branch(other_branch.base)
3975
_merge_tags_if_possible(other_branch, tree.branch)
4549
# Merge tags (but don't set them in the master branch yet, the user
4550
# might revert this merge). Commit will propagate them.
4551
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3976
4552
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3977
4553
other_revision_id, base_revision_id, other_branch, base_branch)
3978
4554
if other_path != '':
4319
4898
theirs_only=False,
4320
4899
log_format=None, long=False, short=False, line=False,
4321
4900
show_ids=False, verbose=False, this=False, other=False,
4322
include_merges=False, revision=None, my_revision=None,
4901
include_merged=None, revision=None, my_revision=None,
4903
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4324
4904
from bzrlib.missing import find_unmerged, iter_log_revisions
4325
4905
def message(s):
4326
4906
if not is_quiet():
4327
4907
self.outf.write(s)
4909
if symbol_versioning.deprecated_passed(include_merges):
4910
ui.ui_factory.show_user_warning(
4911
'deprecated_command_option',
4912
deprecated_name='--include-merges',
4913
recommended_name='--include-merged',
4914
deprecated_in_version='2.5',
4915
command=self.invoked_as)
4916
if include_merged is None:
4917
include_merged = include_merges
4919
raise errors.BzrCommandError(gettext(
4920
'{0} and {1} are mutually exclusive').format(
4921
'--include-merges', '--include-merged'))
4922
if include_merged is None:
4923
include_merged = False
4330
4925
mine_only = this
4570
5155
self.add_cleanup(branch.lock_read().unlock)
4571
5156
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4572
5157
self.add_cleanup(tree.lock_read().unlock)
5158
if wt is not None and revision is None:
4574
5159
file_id = wt.path2id(relpath)
4576
5161
file_id = tree.path2id(relpath)
4577
5162
if file_id is None:
4578
5163
raise errors.NotVersionedError(filename)
4579
file_version = tree.inventory[file_id].revision
4580
5164
if wt is not None and revision is None:
4581
5165
# If there is a tree and we're not annotating historical
4582
5166
# versions, annotate the working tree's content.
4583
5167
annotate_file_tree(wt, file_id, self.outf, long, all,
4584
5168
show_ids=show_ids)
4586
annotate_file(branch, file_version, file_id, long, all, self.outf,
5170
annotate_file_tree(tree, file_id, self.outf, long, all,
5171
show_ids=show_ids, branch=branch)
4590
5174
class cmd_re_sign(Command):
4675
5259
location = b.get_old_bound_location()
4676
5260
except errors.UpgradeRequired:
4677
raise errors.BzrCommandError('No location supplied. '
4678
'This format does not remember old locations.')
5261
raise errors.BzrCommandError(gettext('No location supplied. '
5262
'This format does not remember old locations.'))
4680
5264
if location is None:
4681
5265
if b.get_bound_location() is not None:
4682
raise errors.BzrCommandError('Branch is already bound')
5266
raise errors.BzrCommandError(gettext('Branch is already bound'))
4684
raise errors.BzrCommandError('No location supplied '
4685
'and no previous location known')
5268
raise errors.BzrCommandError(gettext('No location supplied '
5269
'and no previous location known'))
4686
5270
b_other = Branch.open(location)
4688
5272
b.bind(b_other)
4689
5273
except errors.DivergedBranches:
4690
raise errors.BzrCommandError('These branches have diverged.'
4691
' Try merging, and then bind again.')
5274
raise errors.BzrCommandError(gettext('These branches have diverged.'
5275
' Try merging, and then bind again.'))
4692
5276
if b.get_config().has_explicit_nickname():
4693
5277
b.nick = b_other.nick
4798
5385
end_revision=last_revno)
4801
self.outf.write('Dry-run, pretending to remove'
4802
' the above revisions.\n')
5388
self.outf.write(gettext('Dry-run, pretending to remove'
5389
' the above revisions.\n'))
4804
self.outf.write('The above revision(s) will be removed.\n')
5391
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4807
5394
if not ui.ui_factory.confirm_action(
4808
'Uncommit these revisions',
5395
gettext(u'Uncommit these revisions'),
4809
5396
'bzrlib.builtins.uncommit',
4811
self.outf.write('Canceled\n')
5398
self.outf.write(gettext('Canceled\n'))
4814
5401
mutter('Uncommitting from {%s} to {%s}',
4815
5402
last_rev_id, rev_id)
4816
5403
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4817
revno=revno, local=local)
4818
self.outf.write('You can restore the old tip by running:\n'
4819
' bzr pull . -r revid:%s\n' % last_rev_id)
5404
revno=revno, local=local, keep_tags=keep_tags)
5405
self.outf.write(gettext('You can restore the old tip by running:\n'
5406
' bzr pull . -r revid:%s\n') % last_rev_id)
4822
5409
class cmd_break_lock(Command):
4928
5517
return host, port
4930
5519
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5520
protocol=None, client_timeout=None):
4932
5521
from bzrlib import transport
4933
5522
if directory is None:
4934
5523
directory = os.getcwd()
4935
5524
if protocol is None:
4936
5525
protocol = transport.transport_server_registry.get()
4937
5526
host, port = self.get_host_and_port(port)
4938
url = urlutils.local_path_to_url(directory)
5527
url = transport.location_to_url(directory)
4939
5528
if not allow_writes:
4940
5529
url = 'readonly+' + url
4941
t = transport.get_transport(url)
4942
protocol(t, host, port, inet)
5530
t = transport.get_transport_from_url(url)
5532
protocol(t, host, port, inet, client_timeout)
5533
except TypeError, e:
5534
# We use symbol_versioning.deprecated_in just so that people
5535
# grepping can find it here.
5536
# symbol_versioning.deprecated_in((2, 5, 0))
5537
symbol_versioning.warn(
5538
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5539
'Most likely it needs to be updated to support a'
5540
' "timeout" parameter (added in bzr 2.5.0)'
5541
% (e, protocol.__module__, protocol),
5543
protocol(t, host, port, inet)
4945
5546
class cmd_join(Command):
5351
5958
self.add_cleanup(branch.lock_write().unlock)
5353
5960
if tag_name is None:
5354
raise errors.BzrCommandError("No tag specified to delete.")
5961
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5355
5962
branch.tags.delete_tag(tag_name)
5356
self.outf.write('Deleted tag %s.\n' % tag_name)
5963
note(gettext('Deleted tag %s.') % tag_name)
5359
5966
if len(revision) != 1:
5360
raise errors.BzrCommandError(
5967
raise errors.BzrCommandError(gettext(
5361
5968
"Tags can only be placed on a single revision, "
5363
5970
revision_id = revision[0].as_revision_id(branch)
5365
5972
revision_id = branch.last_revision()
5366
5973
if tag_name is None:
5367
5974
tag_name = branch.automatic_tag_name(revision_id)
5368
5975
if tag_name is None:
5369
raise errors.BzrCommandError(
5370
"Please specify a tag name.")
5371
if (not force) and branch.tags.has_tag(tag_name):
5976
raise errors.BzrCommandError(gettext(
5977
"Please specify a tag name."))
5979
existing_target = branch.tags.lookup_tag(tag_name)
5980
except errors.NoSuchTag:
5981
existing_target = None
5982
if not force and existing_target not in (None, revision_id):
5372
5983
raise errors.TagAlreadyExists(tag_name)
5373
branch.tags.set_tag(tag_name, revision_id)
5374
self.outf.write('Created tag %s.\n' % tag_name)
5984
if existing_target == revision_id:
5985
note(gettext('Tag %s already exists for that revision.') % tag_name)
5987
branch.tags.set_tag(tag_name, revision_id)
5988
if existing_target is None:
5989
note(gettext('Created tag %s.') % tag_name)
5991
note(gettext('Updated tag %s.') % tag_name)
5377
5994
class cmd_tags(Command):
5409
6021
self.add_cleanup(branch.lock_read().unlock)
5411
graph = branch.repository.get_graph()
5412
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5413
revid1, revid2 = rev1.rev_id, rev2.rev_id
5414
# only show revisions between revid1 and revid2 (inclusive)
5415
tags = [(tag, revid) for tag, revid in tags if
5416
graph.is_between(revid, revid1, revid2)]
5419
elif sort == 'time':
5421
for tag, revid in tags:
5423
revobj = branch.repository.get_revision(revid)
5424
except errors.NoSuchRevision:
5425
timestamp = sys.maxint # place them at the end
5427
timestamp = revobj.timestamp
5428
timestamps[revid] = timestamp
5429
tags.sort(key=lambda x: timestamps[x[1]])
6023
# Restrict to the specified range
6024
tags = self._tags_for_range(branch, revision)
6026
sort = tag_sort_methods.get()
5430
6028
if not show_ids:
5431
6029
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5432
6030
for index, (tag, revid) in enumerate(tags):
5443
6043
for tag, revspec in tags:
5444
6044
self.outf.write('%-20s %s\n' % (tag, revspec))
6046
def _tags_for_range(self, branch, revision):
6048
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6049
revid1, revid2 = rev1.rev_id, rev2.rev_id
6050
# _get_revision_range will always set revid2 if it's not specified.
6051
# If revid1 is None, it means we want to start from the branch
6052
# origin which is always a valid ancestor. If revid1 == revid2, the
6053
# ancestry check is useless.
6054
if revid1 and revid1 != revid2:
6055
# FIXME: We really want to use the same graph than
6056
# branch.iter_merge_sorted_revisions below, but this is not
6057
# easily available -- vila 2011-09-23
6058
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6059
# We don't want to output anything in this case...
6061
# only show revisions between revid1 and revid2 (inclusive)
6062
tagged_revids = branch.tags.get_reverse_tag_dict()
6064
for r in branch.iter_merge_sorted_revisions(
6065
start_revision_id=revid2, stop_revision_id=revid1,
6066
stop_rule='include'):
6067
revid_tags = tagged_revids.get(r[0], None)
6069
found.extend([(tag, r[0]) for tag in revid_tags])
5447
6073
class cmd_reconfigure(Command):
5448
6074
__doc__ = """Reconfigure the type of a bzr directory.
5462
6088
takes_args = ['location?']
5463
6089
takes_options = [
5464
6090
RegistryOption.from_kwargs(
5466
title='Target type',
5467
help='The type to reconfigure the directory to.',
6093
help='The relation between branch and tree.',
5468
6094
value_switches=True, enum_switch=False,
5469
6095
branch='Reconfigure to be an unbound branch with no working tree.',
5470
6096
tree='Reconfigure to be an unbound branch with a working tree.',
5471
6097
checkout='Reconfigure to be a bound branch with a working tree.',
5472
6098
lightweight_checkout='Reconfigure to be a lightweight'
5473
6099
' checkout (with no local history).',
6101
RegistryOption.from_kwargs(
6103
title='Repository type',
6104
help='Location fo the repository.',
6105
value_switches=True, enum_switch=False,
5474
6106
standalone='Reconfigure to be a standalone branch '
5475
6107
'(i.e. stop using shared repository).',
5476
6108
use_shared='Reconfigure to use a shared repository.',
6110
RegistryOption.from_kwargs(
6112
title='Trees in Repository',
6113
help='Whether new branches in the repository have trees.',
6114
value_switches=True, enum_switch=False,
5477
6115
with_trees='Reconfigure repository to create '
5478
6116
'working trees on branches by default.',
5479
6117
with_no_trees='Reconfigure repository to not create '
5506
6144
# At the moment you can use --stacked-on and a different
5507
6145
# reconfiguration shape at the same time; there seems no good reason
5509
if target_type is None:
6147
if (tree_type is None and
6148
repository_type is None and
6149
repository_trees is None):
5510
6150
if stacked_on or unstacked:
5513
raise errors.BzrCommandError('No target configuration '
5515
elif target_type == 'branch':
6153
raise errors.BzrCommandError(gettext('No target configuration '
6155
reconfiguration = None
6156
if tree_type == 'branch':
5516
6157
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5517
elif target_type == 'tree':
6158
elif tree_type == 'tree':
5518
6159
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5519
elif target_type == 'checkout':
6160
elif tree_type == 'checkout':
5520
6161
reconfiguration = reconfigure.Reconfigure.to_checkout(
5521
6162
directory, bind_to)
5522
elif target_type == 'lightweight-checkout':
6163
elif tree_type == 'lightweight-checkout':
5523
6164
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5524
6165
directory, bind_to)
5525
elif target_type == 'use-shared':
6167
reconfiguration.apply(force)
6168
reconfiguration = None
6169
if repository_type == 'use-shared':
5526
6170
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5527
elif target_type == 'standalone':
6171
elif repository_type == 'standalone':
5528
6172
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5529
elif target_type == 'with-trees':
6174
reconfiguration.apply(force)
6175
reconfiguration = None
6176
if repository_trees == 'with-trees':
5530
6177
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5531
6178
directory, True)
5532
elif target_type == 'with-no-trees':
6179
elif repository_trees == 'with-no-trees':
5533
6180
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5534
6181
directory, False)
5535
reconfiguration.apply(force)
6183
reconfiguration.apply(force)
6184
reconfiguration = None
5538
6187
class cmd_switch(Command):
5573
6222
from bzrlib import switch
5574
6223
tree_location = directory
5575
6224
revision = _get_one_revision('switch', revision)
5576
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6225
possible_transports = []
6226
control_dir = controldir.ControlDir.open_containing(tree_location,
6227
possible_transports=possible_transports)[0]
5577
6228
if to_location is None:
5578
6229
if revision is None:
5579
raise errors.BzrCommandError('You must supply either a'
5580
' revision or a location')
6230
raise errors.BzrCommandError(gettext('You must supply either a'
6231
' revision or a location'))
5581
6232
to_location = tree_location
5583
branch = control_dir.open_branch()
6234
branch = control_dir.open_branch(
6235
possible_transports=possible_transports)
5584
6236
had_explicit_nick = branch.get_config().has_explicit_nickname()
5585
6237
except errors.NotBranchError:
5587
6239
had_explicit_nick = False
5588
6240
if create_branch:
5589
6241
if branch is None:
5590
raise errors.BzrCommandError('cannot create branch without'
5592
to_location = directory_service.directories.dereference(
5594
if '/' not in to_location and '\\' not in to_location:
5595
# This path is meant to be relative to the existing branch
5596
this_url = self._get_branch_location(control_dir)
5597
to_location = urlutils.join(this_url, '..', to_location)
6242
raise errors.BzrCommandError(
6243
gettext('cannot create branch without source branch'))
6244
to_location = lookup_new_sibling_branch(control_dir, to_location,
6245
possible_transports=possible_transports)
5598
6246
to_branch = branch.bzrdir.sprout(to_location,
5599
possible_transports=[branch.bzrdir.root_transport],
5600
source_branch=branch).open_branch()
6247
possible_transports=possible_transports,
6248
source_branch=branch).open_branch()
5603
to_branch = Branch.open(to_location)
5604
except errors.NotBranchError:
5605
this_url = self._get_branch_location(control_dir)
5606
to_branch = Branch.open(
5607
urlutils.join(this_url, '..', to_location))
6250
to_branch = lookup_sibling_branch(control_dir, to_location)
5608
6251
if revision is not None:
5609
6252
revision = revision.as_revision_id(to_branch)
5610
6253
switch.switch(control_dir, to_branch, force, revision_id=revision)
5611
6254
if had_explicit_nick:
5612
6255
branch = control_dir.open_branch() #get the new branch!
5613
6256
branch.nick = to_branch.nick
5614
note('Switched to branch: %s',
6257
note(gettext('Switched to branch: %s'),
5615
6258
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5617
def _get_branch_location(self, control_dir):
5618
"""Return location of branch for this control dir."""
5620
this_branch = control_dir.open_branch()
5621
# This may be a heavy checkout, where we want the master branch
5622
master_location = this_branch.get_bound_location()
5623
if master_location is not None:
5624
return master_location
5625
# If not, use a local sibling
5626
return this_branch.base
5627
except errors.NotBranchError:
5628
format = control_dir.find_branch_format()
5629
if getattr(format, 'get_reference', None) is not None:
5630
return format.get_reference(control_dir)
5632
return control_dir.root_transport.base
5635
6262
class cmd_view(Command):
5726
6353
name = current_view
5729
raise errors.BzrCommandError(
5730
"Both --delete and a file list specified")
6356
raise errors.BzrCommandError(gettext(
6357
"Both --delete and a file list specified"))
5732
raise errors.BzrCommandError(
5733
"Both --delete and --switch specified")
6359
raise errors.BzrCommandError(gettext(
6360
"Both --delete and --switch specified"))
5735
6362
tree.views.set_view_info(None, {})
5736
self.outf.write("Deleted all views.\n")
6363
self.outf.write(gettext("Deleted all views.\n"))
5737
6364
elif name is None:
5738
raise errors.BzrCommandError("No current view to delete")
6365
raise errors.BzrCommandError(gettext("No current view to delete"))
5740
6367
tree.views.delete_view(name)
5741
self.outf.write("Deleted '%s' view.\n" % name)
6368
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5744
raise errors.BzrCommandError(
5745
"Both --switch and a file list specified")
6371
raise errors.BzrCommandError(gettext(
6372
"Both --switch and a file list specified"))
5747
raise errors.BzrCommandError(
5748
"Both --switch and --all specified")
6374
raise errors.BzrCommandError(gettext(
6375
"Both --switch and --all specified"))
5749
6376
elif switch == 'off':
5750
6377
if current_view is None:
5751
raise errors.BzrCommandError("No current view to disable")
6378
raise errors.BzrCommandError(gettext("No current view to disable"))
5752
6379
tree.views.set_view_info(None, view_dict)
5753
self.outf.write("Disabled '%s' view.\n" % (current_view))
6380
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5755
6382
tree.views.set_view_info(switch, view_dict)
5756
6383
view_str = views.view_display_str(tree.views.lookup_view())
5757
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6384
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5760
self.outf.write('Views defined:\n')
6387
self.outf.write(gettext('Views defined:\n'))
5761
6388
for view in sorted(view_dict):
5762
6389
if view == current_view:
5766
6393
view_str = views.view_display_str(view_dict[view])
5767
6394
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5769
self.outf.write('No views defined.\n')
6396
self.outf.write(gettext('No views defined.\n'))
5770
6397
elif file_list:
5771
6398
if name is None:
5772
6399
# No name given and no current view set
5774
6401
elif name == 'off':
5775
raise errors.BzrCommandError(
5776
"Cannot change the 'off' pseudo view")
6402
raise errors.BzrCommandError(gettext(
6403
"Cannot change the 'off' pseudo view"))
5777
6404
tree.views.set_view(name, sorted(file_list))
5778
6405
view_str = views.view_display_str(tree.views.lookup_view())
5779
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6406
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5781
6408
# list the files
5782
6409
if name is None:
5783
6410
# No name given and no current view set
5784
self.outf.write('No current view.\n')
6411
self.outf.write(gettext('No current view.\n'))
5786
6413
view_str = views.view_display_str(tree.views.lookup_view(name))
5787
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6414
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5790
6417
class cmd_hooks(Command):
6022
6663
self.outf.write('%s %s\n' % (path, location))
6666
class cmd_export_pot(Command):
6667
__doc__ = """Export command helps and error messages in po format."""
6670
takes_options = [Option('plugin',
6671
help='Export help text from named command '\
6672
'(defaults to all built in commands).',
6674
Option('include-duplicates',
6675
help='Output multiple copies of the same msgid '
6676
'string if it appears more than once.'),
6679
def run(self, plugin=None, include_duplicates=False):
6680
from bzrlib.export_pot import export_pot
6681
export_pot(self.outf, plugin, include_duplicates)
6025
6684
def _register_lazy_builtins():
6026
6685
# register lazy builtins from other modules; called at startup and should
6027
6686
# be only called once.
6028
6687
for (name, aliases, module_name) in [
6029
6688
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6689
('cmd_config', [], 'bzrlib.config'),
6030
6690
('cmd_dpush', [], 'bzrlib.foreign'),
6031
6691
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6032
6692
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6033
6693
('cmd_conflicts', [], 'bzrlib.conflicts'),
6034
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6694
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6695
('cmd_verify_signatures', [],
6696
'bzrlib.commit_signature_commands'),
6697
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6036
6699
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
