73
78
_parse_revision_str,
75
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
79
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
target = control_dir.get_branch_reference()
90
except errors.NotBranchError:
91
return control_dir.root_transport.base
92
if target is not None:
94
this_branch = control_dir.open_branch(
95
possible_transports=possible_transports)
96
# This may be a heavy checkout, where we want the master branch
97
master_location = this_branch.get_bound_location()
98
if master_location is not None:
99
return master_location
100
# If not, use a local sibling
101
return this_branch.base
104
def _is_colocated(control_dir, possible_transports=None):
105
"""Check if the branch in control_dir is colocated.
107
:param control_dir: Control directory
108
:return: Tuple with boolean indicating whether the branch is colocated
109
and the full URL to the actual branch
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 to find sibling branches from
136
:param location: Name of the new branch
137
:return: Full location to the new branch
139
location = directory_service.directories.dereference(location)
140
if '/' not in location and '\\' not in location:
141
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
144
return urlutils.join_segment_parameters(this_url,
145
{"branch": urlutils.escape(location)})
147
return urlutils.join(this_url, '..', urlutils.escape(location))
151
def open_sibling_branch(control_dir, location, possible_transports=None):
152
"""Open a branch, possibly a sibling of another.
154
:param control_dir: Control directory relative to which to lookup the
156
:param location: Location to look up
157
:return: branch to open
160
# Perhaps it's a colocated branch?
161
return control_dir.open_branch(location,
162
possible_transports=possible_transports)
163
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
164
this_url = _get_branch_location(control_dir)
167
this_url, '..', urlutils.escape(location)))
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
"""Open a nearby branch.
173
:param near: Optional location of container from which to open branch
174
:param location: Location of the branch
175
:return: Branch instance
181
return Branch.open(location,
182
possible_transports=possible_transports)
183
except errors.NotBranchError:
185
cdir = controldir.ControlDir.open(near,
186
possible_transports=possible_transports)
187
return open_sibling_branch(cdir, location,
188
possible_transports=possible_transports)
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
"""Iterate over the siblings of a branch.
194
:param control_dir: Control directory for which to look up the siblings
195
:return: Iterator over tuples with branch name and branch object
199
reference = control_dir.get_branch_reference()
200
except errors.NotBranchError:
201
# There is no active branch, just return the colocated branches.
202
for name, branch in control_dir.get_branches().iteritems():
205
if reference is not None:
206
ref_branch = Branch.open(reference,
207
possible_transports=possible_transports)
210
if ref_branch is None or ref_branch.name:
211
if ref_branch is not None:
212
control_dir = ref_branch.bzrdir
213
for name, branch in control_dir.get_branches().iteritems():
216
repo = ref_branch.bzrdir.find_repository()
217
for branch in repo.find_branches(using=True):
218
name = urlutils.relative_url(repo.user_url,
219
branch.user_url).rstrip("/")
85
223
def tree_files_for_add(file_list):
150
# XXX: Bad function name; should possibly also be a class method of
151
# WorkingTree rather than a function.
152
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
153
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
155
"""Convert command-line paths to a WorkingTree and relative paths.
157
Deprecated: use WorkingTree.open_containing_paths instead.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
return WorkingTree.open_containing_paths(
175
file_list, default_directory='.',
180
288
def _get_view_info_for_change_reporter(tree):
181
289
"""Get the view information from a tree for change reporting."""
472
594
raise errors.ShelvedChanges(working)
474
596
if working.user_url != working.branch.user_url:
475
raise errors.BzrCommandError("You cannot remove the working tree"
476
" from a lightweight checkout")
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
478
600
d.destroy_workingtree()
603
class cmd_repair_workingtree(Command):
604
__doc__ = """Reset the working tree state file.
606
This is not meant to be used normally, but more as a way to recover from
607
filesystem corruption, etc. This rebuilds the working inventory back to a
608
'known good' state. Any new modifications (adding a file, renaming, etc)
609
will be lost, though modified files will still be detected as such.
611
Most users will want something more like "bzr revert" or "bzr update"
612
unless the state file has become corrupted.
614
By default this attempts to recover the current state by looking at the
615
headers of the state file. If the state file is too corrupted to even do
616
that, you can supply --revision to force the state of the tree.
619
takes_options = ['revision', 'directory',
621
help='Reset the tree even if it doesn\'t appear to be'
626
def run(self, revision=None, directory='.', force=False):
627
tree, _ = WorkingTree.open_containing(directory)
628
self.add_cleanup(tree.lock_tree_write().unlock)
632
except errors.BzrError:
633
pass # There seems to be a real error here, so we'll reset
636
raise errors.BzrCommandError(gettext(
637
'The tree does not appear to be corrupt. You probably'
638
' want "bzr revert" instead. Use "--force" if you are'
639
' sure you want to reset the working tree.'))
643
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
645
tree.reset_state(revision_ids)
646
except errors.BzrError, e:
647
if revision_ids is None:
648
extra = (gettext(', the header appears corrupt, try passing -r -1'
649
' to set the state to the last commit'))
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
481
655
class cmd_revno(Command):
482
656
__doc__ = """Show current revision number.
487
661
_see_also = ['info']
488
662
takes_args = ['location?']
489
663
takes_options = [
490
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
494
def run(self, tree=False, location=u'.'):
669
def run(self, tree=False, location=u'.', revision=None):
670
if revision is not None and tree:
671
raise errors.BzrCommandError(gettext("--tree and --revision can "
672
"not be used together"))
497
676
wt = WorkingTree.open_containing(location)[0]
498
677
self.add_cleanup(wt.lock_read().unlock)
499
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
500
679
raise errors.NoWorkingTree(location)
501
681
revid = wt.last_revision()
503
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
504
except errors.NoSuchRevision:
506
revno = ".".join(str(n) for n in revno_t)
508
683
b = Branch.open_containing(location)[0]
509
684
self.add_cleanup(b.lock_read().unlock)
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Revision numbers only make sense for single "
689
"revisions, not ranges"))
690
revid = revision[0].as_revision_id(b)
692
revid = b.last_revision()
694
revno_t = b.revision_id_to_dotted_revno(revid)
695
except errors.NoSuchRevision:
697
revno = ".".join(str(n) for n in revno_t)
511
698
self.cleanup_now()
512
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
515
702
class cmd_revision_info(Command):
663
859
takes_args = ['dir+']
863
help='No error if existing, make parent directories as needed.',
664
867
encoding_type = 'replace'
666
def run(self, dir_list):
668
wt, dd = WorkingTree.open_containing(d)
669
base = os.path.dirname(dd)
670
id = wt.path2id(base)
674
self.outf.write('added %s\n' % d)
870
def add_file_with_parents(cls, wt, relpath):
871
if wt.path2id(relpath) is not None:
873
cls.add_file_with_parents(wt, osutils.dirname(relpath))
877
def add_file_single(cls, wt, relpath):
880
def run(self, dir_list, parents=False):
882
add_file = self.add_file_with_parents
884
add_file = self.add_file_single
886
wt, relpath = WorkingTree.open_containing(dir)
891
if e.errno != errno.EEXIST:
676
raise errors.NotVersionedError(path=base)
895
add_file(wt, relpath)
897
self.outf.write(gettext('added %s\n') % dir)
679
900
class cmd_relpath(Command):
785
1007
return self.run_auto(names_list, after, dry_run)
787
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
788
1010
if names_list is None:
790
1012
if len(names_list) < 2:
791
raise errors.BzrCommandError("missing file argument")
1013
raise errors.BzrCommandError(gettext("missing file argument"))
792
1014
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1015
for file_name in rel_names[0:-1]:
1017
raise errors.BzrCommandError(gettext("can not move root of branch"))
793
1018
self.add_cleanup(tree.lock_tree_write().unlock)
794
1019
self._run(tree, names_list, rel_names, after)
796
1021
def run_auto(self, names_list, after, dry_run):
797
1022
if names_list is not None and len(names_list) > 1:
798
raise errors.BzrCommandError('Only one path may be specified to'
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
801
raise errors.BzrCommandError('--after cannot be specified with'
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
803
1028
work_tree, file_list = WorkingTree.open_containing_paths(
804
1029
names_list, default_directory='.')
805
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
1057
1310
Option('strict',
1058
1311
help='Refuse to push if there are uncommitted changes in'
1059
1312
' the working tree, --no-strict disables the check.'),
1314
help="Don't populate the working tree, even for protocols"
1315
" that support it."),
1316
Option('overwrite-tags',
1317
help="Overwrite tags only."),
1061
1319
takes_args = ['location?']
1062
1320
encoding_type = 'replace'
1064
def run(self, location=None, remember=False, overwrite=False,
1322
def run(self, location=None, remember=None, overwrite=False,
1065
1323
create_prefix=False, verbose=False, revision=None,
1066
1324
use_existing_dir=False, directory=None, stacked_on=None,
1067
stacked=False, strict=None):
1325
stacked=False, strict=None, no_tree=False,
1326
overwrite_tags=False):
1068
1327
from bzrlib.push import _show_push_branch
1330
overwrite = ["history", "tags"]
1331
elif overwrite_tags:
1332
overwrite = ["tags"]
1070
1336
if directory is None:
1071
1337
directory = '.'
1072
1338
# Get the source branch
1073
1339
(tree, br_from,
1074
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1340
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1075
1341
# Get the tip's revision_id
1076
1342
revision = _get_one_revision('push', revision)
1077
1343
if revision is not None:
1098
1364
# error by the feedback given to them. RBC 20080227.
1099
1365
stacked_on = parent_url
1100
1366
if not stacked_on:
1101
raise errors.BzrCommandError(
1102
"Could not determine branch to refer to.")
1367
raise errors.BzrCommandError(gettext(
1368
"Could not determine branch to refer to."))
1104
1370
# Get the destination location
1105
1371
if location is None:
1106
1372
stored_loc = br_from.get_push_location()
1107
1373
if stored_loc is None:
1108
raise errors.BzrCommandError(
1109
"No push location known or specified.")
1374
parent_loc = br_from.get_parent()
1376
raise errors.BzrCommandError(gettext(
1377
"No push location known or specified. To push to the "
1378
"parent branch (at %s), use 'bzr push :parent'." %
1379
urlutils.unescape_for_display(parent_loc,
1380
self.outf.encoding)))
1382
raise errors.BzrCommandError(gettext(
1383
"No push location known or specified."))
1111
1385
display_url = urlutils.unescape_for_display(stored_loc,
1112
1386
self.outf.encoding)
1113
self.outf.write("Using saved push location: %s\n" % display_url)
1387
note(gettext("Using saved push location: %s") % display_url)
1114
1388
location = stored_loc
1116
1390
_show_push_branch(br_from, revision_id, location, self.outf,
1117
1391
verbose=verbose, overwrite=overwrite, remember=remember,
1118
1392
stacked_on=stacked_on, create_prefix=create_prefix,
1119
use_existing_dir=use_existing_dir)
1393
use_existing_dir=use_existing_dir, no_tree=no_tree)
1122
1396
class cmd_branch(Command):
1186
1468
revision_id = br_from.last_revision()
1187
1469
if to_location is None:
1188
to_location = urlutils.derive_to_location(from_location)
1470
to_location = getattr(br_from, "name", None)
1472
to_location = urlutils.derive_to_location(from_location)
1189
1473
to_transport = transport.get_transport(to_location)
1191
1475
to_transport.mkdir('.')
1192
1476
except errors.FileExists:
1193
if not use_existing_dir:
1194
raise errors.BzrCommandError('Target directory "%s" '
1195
'already exists.' % to_location)
1478
to_dir = controldir.ControlDir.open_from_transport(
1480
except errors.NotBranchError:
1481
if not use_existing_dir:
1482
raise errors.BzrCommandError(gettext('Target directory "%s" '
1483
'already exists.') % to_location)
1198
bzrdir.BzrDir.open_from_transport(to_transport)
1488
to_dir.open_branch()
1199
1489
except errors.NotBranchError:
1202
1492
raise errors.AlreadyBranchError(to_location)
1203
1493
except errors.NoSuchFile:
1204
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1494
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1207
# preserve whatever source format we have.
1208
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1209
possible_transports=[to_transport],
1210
accelerator_tree=accelerator_tree,
1211
hardlink=hardlink, stacked=stacked,
1212
force_new_repo=standalone,
1213
create_tree_if_local=not no_tree,
1214
source_branch=br_from)
1215
branch = dir.open_branch()
1216
except errors.NoSuchRevision:
1217
to_transport.delete_tree('.')
1218
msg = "The branch %s has no revision %s." % (from_location,
1220
raise errors.BzrCommandError(msg)
1500
# preserve whatever source format we have.
1501
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1502
possible_transports=[to_transport],
1503
accelerator_tree=accelerator_tree,
1504
hardlink=hardlink, stacked=stacked,
1505
force_new_repo=standalone,
1506
create_tree_if_local=not no_tree,
1507
source_branch=br_from)
1508
branch = to_dir.open_branch(
1509
possible_transports=[
1510
br_from.bzrdir.root_transport, to_transport])
1511
except errors.NoSuchRevision:
1512
to_transport.delete_tree('.')
1513
msg = gettext("The branch {0} has no revision {1}.").format(
1514
from_location, revision)
1515
raise errors.BzrCommandError(msg)
1518
to_repo = to_dir.open_repository()
1519
except errors.NoRepositoryPresent:
1520
to_repo = to_dir.create_repository()
1521
to_repo.fetch(br_from.repository, revision_id=revision_id)
1522
branch = br_from.sprout(to_dir, revision_id=revision_id)
1221
1523
_merge_tags_if_possible(br_from, branch)
1222
1524
# If the source branch is stacked, the new branch may
1223
1525
# be stacked whether we asked for that explicitly or not.
1224
1526
# We therefore need a try/except here and not just 'if stacked:'
1226
note('Created new stacked branch referring to %s.' %
1528
note(gettext('Created new stacked branch referring to %s.') %
1227
1529
branch.get_stacked_on_url())
1228
1530
except (errors.NotStacked, errors.UnstackableBranchFormat,
1229
1531
errors.UnstackableRepositoryFormat), e:
1230
note('Branched %d revision(s).' % branch.revno())
1532
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1232
1534
# Bind to the parent
1233
1535
parent_branch = Branch.open(from_location)
1234
1536
branch.bind(parent_branch)
1235
note('New branch bound to %s' % from_location)
1537
note(gettext('New branch bound to %s') % from_location)
1237
1539
# Switch to the new branch
1238
1540
wt, _ = WorkingTree.open_containing('.')
1239
1541
_mod_switch.switch(wt.bzrdir, branch)
1240
note('Switched to branch: %s',
1542
note(gettext('Switched to branch: %s'),
1241
1543
urlutils.unescape_for_display(branch.base, 'utf-8'))
1546
class cmd_branches(Command):
1547
__doc__ = """List the branches available at the current location.
1549
This command will print the names of all the branches at the current
1553
takes_args = ['location?']
1555
Option('recursive', short_name='R',
1556
help='Recursively scan for branches rather than '
1557
'just looking in the specified location.')]
1559
def run(self, location=".", recursive=False):
1561
t = transport.get_transport(location)
1562
if not t.listable():
1563
raise errors.BzrCommandError(
1564
"Can't scan this type of location.")
1565
for b in controldir.ControlDir.find_branches(t):
1566
self.outf.write("%s\n" % urlutils.unescape_for_display(
1567
urlutils.relative_url(t.base, b.base),
1568
self.outf.encoding).rstrip("/"))
1570
dir = controldir.ControlDir.open_containing(location)[0]
1572
active_branch = dir.open_branch(name="")
1573
except errors.NotBranchError:
1574
active_branch = None
1576
for name, branch in iter_sibling_branches(dir):
1579
active = (active_branch is not None and
1580
active_branch.base == branch.base)
1581
names[name] = active
1582
# Only mention the current branch explicitly if it's not
1583
# one of the colocated branches
1584
if not any(names.values()) and active_branch is not None:
1585
self.outf.write("* %s\n" % gettext("(default)"))
1586
for name in sorted(names.keys()):
1587
active = names[name]
1592
self.outf.write("%s %s\n" % (
1593
prefix, name.encode(self.outf.encoding)))
1244
1596
class cmd_checkout(Command):
1245
1597
__doc__ = """Create a new checkout of an existing branch.
1348
1698
class cmd_update(Command):
1349
__doc__ = """Update a tree to have the latest code committed to its branch.
1351
This will perform a merge into the working tree, and may generate
1352
conflicts. If you have any local changes, you will still
1353
need to commit them after the update for the update to be complete.
1355
If you want to discard your local changes, you can just do a
1356
'bzr revert' instead of 'bzr commit' after the update.
1358
If the tree's branch is bound to a master branch, it will also update
1699
__doc__ = """Update a working tree to a new revision.
1701
This will perform a merge of the destination revision (the tip of the
1702
branch, or the specified revision) into the working tree, and then make
1703
that revision the basis revision for the working tree.
1705
You can use this to visit an older revision, or to update a working tree
1706
that is out of date from its branch.
1708
If there are any uncommitted changes in the tree, they will be carried
1709
across and remain as uncommitted changes after the update. To discard
1710
these changes, use 'bzr revert'. The uncommitted changes may conflict
1711
with the changes brought in by the change in basis revision.
1713
If the tree's branch is bound to a master branch, bzr will also update
1359
1714
the branch from the master.
1716
You cannot update just a single file or directory, because each Bazaar
1717
working tree has just a single basis revision. If you want to restore a
1718
file that has been removed locally, use 'bzr revert' instead of 'bzr
1719
update'. If you want to restore a file to its state in a previous
1720
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1721
out the old content of that file to a new location.
1723
The 'dir' argument, if given, must be the location of the root of a
1724
working tree to update. By default, the working tree that contains the
1725
current working directory is used.
1362
1728
_see_also = ['pull', 'working-trees', 'status-flags']
1363
1729
takes_args = ['dir?']
1364
takes_options = ['revision']
1730
takes_options = ['revision',
1732
help="Show base revision text in conflicts."),
1365
1734
aliases = ['up']
1367
def run(self, dir='.', revision=None):
1736
def run(self, dir=None, revision=None, show_base=None):
1368
1737
if revision is not None and len(revision) != 1:
1369
raise errors.BzrCommandError(
1370
"bzr update --revision takes exactly one revision")
1371
tree = WorkingTree.open_containing(dir)[0]
1738
raise errors.BzrCommandError(gettext(
1739
"bzr update --revision takes exactly one revision"))
1741
tree = WorkingTree.open_containing('.')[0]
1743
tree, relpath = WorkingTree.open_containing(dir)
1746
raise errors.BzrCommandError(gettext(
1747
"bzr update can only update a whole tree, "
1748
"not a file or subdirectory"))
1372
1749
branch = tree.branch
1373
1750
possible_transports = []
1374
1751
master = branch.get_master_branch(
1410
1787
change_reporter,
1411
1788
possible_transports=possible_transports,
1412
1789
revision=revision_id,
1791
show_base=show_base)
1414
1792
except errors.NoSuchRevision, e:
1415
raise errors.BzrCommandError(
1793
raise errors.BzrCommandError(gettext(
1416
1794
"branch has no revision %s\n"
1417
1795
"bzr update --revision only works"
1418
" for a revision in the branch history"
1796
" for a revision in the branch history")
1419
1797
% (e.revision))
1420
1798
revno = tree.branch.revision_id_to_dotted_revno(
1421
1799
_mod_revision.ensure_null(tree.last_revision()))
1422
note('Updated to revision %s of branch %s' %
1423
('.'.join(map(str, revno)), branch_location))
1800
note(gettext('Updated to revision {0} of branch {1}').format(
1801
'.'.join(map(str, revno)), branch_location))
1424
1802
parent_ids = tree.get_parent_ids()
1425
1803
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1426
note('Your local commits will now show as pending merges with '
1427
"'bzr status', and can be committed with 'bzr commit'.")
1804
note(gettext('Your local commits will now show as pending merges with '
1805
"'bzr status', and can be committed with 'bzr commit'."))
1428
1806
if conflicts != 0:
1489
1868
RegistryOption.from_kwargs('file-deletion-strategy',
1490
1869
'The file deletion mode to be used.',
1491
1870
title='Deletion Strategy', value_switches=True, enum_switch=False,
1492
safe='Only delete files if they can be'
1493
' safely recovered (default).',
1871
safe='Backup changed files (default).',
1494
1872
keep='Delete from bzr but leave the working copy.',
1495
force='Delete all the specified files, even if they can not be '
1496
'recovered and even if they are non-empty directories.')]
1873
no_backup='Don\'t backup changed files.'),
1497
1875
aliases = ['rm', 'del']
1498
1876
encoding_type = 'replace'
1500
1878
def run(self, file_list, verbose=False, new=False,
1501
1879
file_deletion_strategy='safe'):
1502
1881
tree, file_list = WorkingTree.open_containing_paths(file_list)
1504
1883
if file_list is not None:
1700
2095
to_transport.ensure_base()
1701
2096
except errors.NoSuchFile:
1702
2097
if not create_prefix:
1703
raise errors.BzrCommandError("Parent directory of %s"
2098
raise errors.BzrCommandError(gettext("Parent directory of %s"
1704
2099
" does not exist."
1705
2100
"\nYou may supply --create-prefix to create all"
1706
" leading parent directories."
2101
" leading parent directories.")
1708
2103
to_transport.create_prefix()
1711
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2106
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1712
2107
except errors.NotBranchError:
1713
2108
# really a NotBzrDir error...
1714
create_branch = bzrdir.BzrDir.create_branch_convenience
2109
create_branch = controldir.ControlDir.create_branch_convenience
2111
force_new_tree = False
2113
force_new_tree = None
1715
2114
branch = create_branch(to_transport.base, format=format,
1716
possible_transports=[to_transport])
2115
possible_transports=[to_transport],
2116
force_new_tree=force_new_tree)
1717
2117
a_bzrdir = branch.bzrdir
1719
2119
from bzrlib.transport.local import LocalTransport
1795
2197
def run(self, location, format=None, no_trees=False):
1796
2198
if format is None:
1797
format = bzrdir.format_registry.make_bzrdir('default')
2199
format = controldir.format_registry.make_bzrdir('default')
1799
2201
if location is None:
1802
2204
to_transport = transport.get_transport(location)
1803
to_transport.ensure_base()
1805
newdir = format.initialize_on_transport(to_transport)
1806
repo = newdir.create_repository(shared=True)
1807
repo.set_make_working_trees(not no_trees)
2206
(repo, newdir, require_stacking, repository_policy) = (
2207
format.initialize_on_transport_ex(to_transport,
2208
create_prefix=True, make_working_trees=not no_trees,
2209
shared_repo=True, force_new_repo=True,
2210
use_existing_dir=True,
2211
repo_format_name=format.repository_format.get_format_string()))
1808
2212
if not is_quiet():
1809
2213
from bzrlib.info import show_bzrdir_info
1810
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2214
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1813
2217
class cmd_diff(Command):
2256
2683
Option('show-diff',
2257
2684
short_name='p',
2258
2685
help='Show changes made in each revision as a patch.'),
2259
Option('include-merges',
2686
Option('include-merged',
2260
2687
help='Show merged revisions like --levels 0 does.'),
2688
Option('include-merges', hidden=True,
2689
help='Historical alias for --include-merged.'),
2690
Option('omit-merges',
2691
help='Do not report commits with more than one parent.'),
2261
2692
Option('exclude-common-ancestry',
2262
2693
help='Display only the revisions that are not part'
2263
' of both ancestries (require -rX..Y)'
2694
' of both ancestries (require -rX..Y).'
2696
Option('signatures',
2697
help='Show digital signature validity.'),
2700
help='Show revisions whose properties match this '
2703
ListOption('match-message',
2704
help='Show revisions whose message matches this '
2707
ListOption('match-committer',
2708
help='Show revisions whose committer matches this '
2711
ListOption('match-author',
2712
help='Show revisions whose authors match this '
2715
ListOption('match-bugs',
2716
help='Show revisions whose bugs match this '
2266
2720
encoding_type = 'replace'
2287
2749
_get_info_for_log_files,
2289
2751
direction = (forward and 'forward') or 'reverse'
2752
if symbol_versioning.deprecated_passed(include_merges):
2753
ui.ui_factory.show_user_warning(
2754
'deprecated_command_option',
2755
deprecated_name='--include-merges',
2756
recommended_name='--include-merged',
2757
deprecated_in_version='2.5',
2758
command=self.invoked_as)
2759
if include_merged is None:
2760
include_merged = include_merges
2762
raise errors.BzrCommandError(gettext(
2763
'{0} and {1} are mutually exclusive').format(
2764
'--include-merges', '--include-merged'))
2765
if include_merged is None:
2766
include_merged = False
2290
2767
if (exclude_common_ancestry
2291
2768
and (revision is None or len(revision) != 2)):
2292
raise errors.BzrCommandError(
2293
'--exclude-common-ancestry requires -r with two revisions')
2769
raise errors.BzrCommandError(gettext(
2770
'--exclude-common-ancestry requires -r with two revisions'))
2295
2772
if levels is None:
2298
raise errors.BzrCommandError(
2299
'--levels and --include-merges are mutually exclusive')
2775
raise errors.BzrCommandError(gettext(
2776
'{0} and {1} are mutually exclusive').format(
2777
'--levels', '--include-merged'))
2301
2779
if change is not None:
2302
2780
if len(change) > 1:
2303
2781
raise errors.RangeInChangeOption()
2304
2782
if revision is not None:
2305
raise errors.BzrCommandError(
2306
'--revision and --change are mutually exclusive')
2783
raise errors.BzrCommandError(gettext(
2784
'{0} and {1} are mutually exclusive').format(
2785
'--revision', '--change'))
2308
2787
revision = change
2685
3193
self.outf.write("%s\n" % pattern)
2687
3195
if not name_pattern_list:
2688
raise errors.BzrCommandError("ignore requires at least one "
2689
"NAME_PATTERN or --default-rules.")
3196
raise errors.BzrCommandError(gettext("ignore requires at least one "
3197
"NAME_PATTERN or --default-rules."))
2690
3198
name_pattern_list = [globbing.normalize_pattern(p)
2691
3199
for p in name_pattern_list]
2692
3200
bad_patterns = ''
3201
bad_patterns_count = 0
2693
3202
for p in name_pattern_list:
2694
3203
if not globbing.Globster.is_pattern_valid(p):
3204
bad_patterns_count += 1
2695
3205
bad_patterns += ('\n %s' % p)
2696
3206
if bad_patterns:
2697
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3207
msg = (ngettext('Invalid ignore pattern found. %s',
3208
'Invalid ignore patterns found. %s',
3209
bad_patterns_count) % bad_patterns)
2698
3210
ui.ui_factory.show_error(msg)
2699
3211
raise errors.InvalidPattern('')
2700
3212
for name_pattern in name_pattern_list:
2701
3213
if (name_pattern[0] == '/' or
2702
3214
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2703
raise errors.BzrCommandError(
2704
"NAME_PATTERN should not be an absolute path")
3215
raise errors.BzrCommandError(gettext(
3216
"NAME_PATTERN should not be an absolute path"))
2705
3217
tree, relpath = WorkingTree.open_containing(directory)
2706
3218
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2707
3219
ignored = globbing.Globster(name_pattern_list)
2810
3323
Option('per-file-timestamps',
2811
3324
help='Set modification time of files to that of the last '
2812
3325
'revision in which it was changed.'),
3326
Option('uncommitted',
3327
help='Export the working tree contents rather than that of the '
2814
3330
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2815
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3331
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2816
3333
from bzrlib.export import export
2818
3335
if branch_or_subdir is None:
2819
tree = WorkingTree.open_containing(directory)[0]
3336
branch_or_subdir = directory
3338
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3340
if tree is not None:
3341
self.add_cleanup(tree.lock_read().unlock)
3345
raise errors.BzrCommandError(
3346
gettext("--uncommitted requires a working tree"))
2823
b, subdir = Branch.open_containing(branch_or_subdir)
2826
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3349
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2828
export(rev_tree, dest, format, root, subdir, filtered=filters,
3351
export(export_tree, dest, format, root, subdir, filtered=filters,
2829
3352
per_file_timestamps=per_file_timestamps)
2830
3353
except errors.NoSuchExportFormat, e:
2831
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
raise errors.BzrCommandError(
3355
gettext('Unsupported export format: %s') % e.format)
2834
3358
class cmd_cat(Command):
2872
3396
old_file_id = rev_tree.path2id(relpath)
3398
# TODO: Split out this code to something that generically finds the
3399
# best id for a path across one or more trees; it's like
3400
# find_ids_across_trees but restricted to find just one. -- mbp
2874
3402
if name_from_revision:
2875
3403
# Try in revision if requested
2876
3404
if old_file_id is None:
2877
raise errors.BzrCommandError(
2878
"%r is not present in revision %s" % (
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
2879
3407
filename, rev_tree.get_revision_id()))
2881
content = rev_tree.get_file_text(old_file_id)
3409
actual_file_id = old_file_id
2883
3411
cur_file_id = tree.path2id(relpath)
2885
if cur_file_id is not None:
2886
# Then try with the actual file id
2888
content = rev_tree.get_file_text(cur_file_id)
2890
except errors.NoSuchId:
2891
# The actual file id didn't exist at that time
2893
if not found and old_file_id is not None:
2894
# Finally try with the old file id
2895
content = rev_tree.get_file_text(old_file_id)
2898
# Can't be found anywhere
2899
raise errors.BzrCommandError(
2900
"%r is not present in revision %s" % (
3412
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3413
actual_file_id = cur_file_id
3414
elif old_file_id is not None:
3415
actual_file_id = old_file_id
3417
raise errors.BzrCommandError(gettext(
3418
"{0!r} is not present in revision {1}").format(
2901
3419
filename, rev_tree.get_revision_id()))
2903
from bzrlib.filters import (
2904
ContentFilterContext,
2905
filtered_output_bytes,
2907
filters = rev_tree._content_filter_stack(relpath)
2908
chunks = content.splitlines(True)
2909
content = filtered_output_bytes(chunks, filters,
2910
ContentFilterContext(relpath, rev_tree))
2912
self.outf.writelines(content)
3421
from bzrlib.filter_tree import ContentFilterTree
3422
filter_tree = ContentFilterTree(rev_tree,
3423
rev_tree._content_filter_stack)
3424
content = filter_tree.get_file_text(actual_file_id)
2915
self.outf.write(content)
3426
content = rev_tree.get_file_text(actual_file_id)
3428
self.outf.write(content)
2918
3431
class cmd_local_time_offset(Command):
2979
3492
to trigger updates to external systems like bug trackers. The --fixes
2980
3493
option can be used to record the association between a revision and
2981
3494
one or more bugs. See ``bzr help bugs`` for details.
2983
A selective commit may fail in some cases where the committed
2984
tree would be invalid. Consider::
2989
bzr commit foo -m "committing foo"
2990
bzr mv foo/bar foo/baz
2993
bzr commit foo/bar -m "committing bar but not baz"
2995
In the example above, the last commit will fail by design. This gives
2996
the user the opportunity to decide whether they want to commit the
2997
rename at the same time, separately first, or not at all. (As a general
2998
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3000
# TODO: Run hooks on tree to-be-committed, and after commit.
3002
# TODO: Strict commit that fails if there are deleted files.
3003
# (what does "deleted files" mean ??)
3005
# TODO: Give better message for -s, --summary, used by tla people
3007
# XXX: verbose currently does nothing
3009
3497
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3010
3498
takes_args = ['selected*']
3042
3530
Option('show-diff', short_name='p',
3043
3531
help='When no message is supplied, show the diff along'
3044
3532
' with the status summary in the message editor.'),
3534
help='When committing to a foreign version control '
3535
'system do not push data that can not be natively '
3046
3538
aliases = ['ci', 'checkin']
3048
3540
def _iter_bug_fix_urls(self, fixes, branch):
3541
default_bugtracker = None
3049
3542
# Configure the properties for bug fixing attributes.
3050
3543
for fixed_bug in fixes:
3051
3544
tokens = fixed_bug.split(':')
3052
if len(tokens) != 2:
3053
raise errors.BzrCommandError(
3545
if len(tokens) == 1:
3546
if default_bugtracker is None:
3547
branch_config = branch.get_config_stack()
3548
default_bugtracker = branch_config.get(
3550
if default_bugtracker is None:
3551
raise errors.BzrCommandError(gettext(
3552
"No tracker specified for bug %s. Use the form "
3553
"'tracker:id' or specify a default bug tracker "
3554
"using the `bugtracker` option.\nSee "
3555
"\"bzr help bugs\" for more information on this "
3556
"feature. Commit refused.") % fixed_bug)
3557
tag = default_bugtracker
3559
elif len(tokens) != 2:
3560
raise errors.BzrCommandError(gettext(
3054
3561
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3055
3562
"See \"bzr help bugs\" for more information on this "
3056
"feature.\nCommit refused." % fixed_bug)
3057
tag, bug_id = tokens
3563
"feature.\nCommit refused.") % fixed_bug)
3565
tag, bug_id = tokens
3059
3567
yield bugtracker.get_bug_url(tag, branch, bug_id)
3060
3568
except errors.UnknownBugTrackerAbbreviation:
3061
raise errors.BzrCommandError(
3062
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3569
raise errors.BzrCommandError(gettext(
3570
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3063
3571
except errors.MalformedBugIdentifier, e:
3064
raise errors.BzrCommandError(
3065
"%s\nCommit refused." % (str(e),))
3572
raise errors.BzrCommandError(gettext(
3573
"%s\nCommit refused.") % (str(e),))
3067
3575
def run(self, message=None, file=None, verbose=False, selected_list=None,
3068
3576
unchanged=False, strict=False, local=False, fixes=None,
3069
author=None, show_diff=False, exclude=None, commit_time=None):
3577
author=None, show_diff=False, exclude=None, commit_time=None,
3070
3579
from bzrlib.errors import (
3071
3580
PointlessCommit,
3072
3581
ConflictsInTree,
3153
3657
# make_commit_message_template_encoded returns user encoding.
3154
3658
# We probably want to be using edit_commit_message instead to
3156
start_message = generate_commit_message_template(commit_obj)
3157
my_message = edit_commit_message_encoded(text,
3158
start_message=start_message)
3159
if my_message is None:
3160
raise errors.BzrCommandError("please specify a commit"
3161
" message with either --message or --file")
3162
if my_message == "":
3163
raise errors.BzrCommandError("empty commit message specified")
3660
my_message = set_commit_message(commit_obj)
3661
if my_message is None:
3662
start_message = generate_commit_message_template(commit_obj)
3663
my_message = edit_commit_message_encoded(text,
3664
start_message=start_message)
3665
if my_message is None:
3666
raise errors.BzrCommandError(gettext("please specify a commit"
3667
" message with either --message or --file"))
3668
if my_message == "":
3669
raise errors.BzrCommandError(gettext("Empty commit message specified."
3670
" Please specify a commit message with either"
3671
" --message or --file or leave a blank message"
3672
" with --message \"\"."))
3164
3673
return my_message
3166
3675
# The API permits a commit with a filter of [] to mean 'select nothing'
3174
3683
reporter=None, verbose=verbose, revprops=properties,
3175
3684
authors=author, timestamp=commit_stamp,
3176
3685
timezone=offset,
3177
exclude=tree.safe_relpath_files(exclude))
3686
exclude=tree.safe_relpath_files(exclude),
3178
3688
except PointlessCommit:
3179
raise errors.BzrCommandError("No changes to commit."
3180
" Use --unchanged to commit anyhow.")
3689
raise errors.BzrCommandError(gettext("No changes to commit."
3690
" Please 'bzr add' the files you want to commit, or use"
3691
" --unchanged to force an empty commit."))
3181
3692
except ConflictsInTree:
3182
raise errors.BzrCommandError('Conflicts detected in working '
3693
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3183
3694
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3185
3696
except StrictCommitFailed:
3186
raise errors.BzrCommandError("Commit refused because there are"
3187
" unknown files in the working tree.")
3697
raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
" unknown files in the working tree."))
3188
3699
except errors.BoundBranchOutOfDate, e:
3189
e.extra_help = ("\n"
3700
e.extra_help = (gettext("\n"
3190
3701
'To commit to master branch, run update and then commit.\n'
3191
3702
'You can also pass --local to commit to continue working '
3266
3777
class cmd_upgrade(Command):
3267
__doc__ = """Upgrade branch storage to current format.
3269
The check command or bzr developers may sometimes advise you to run
3270
this command. When the default format has changed you may also be warned
3271
during other operations to upgrade.
3778
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3780
When the default format has changed after a major new release of
3781
Bazaar, you may be informed during certain operations that you
3782
should upgrade. Upgrading to a newer format may improve performance
3783
or make new features available. It may however limit interoperability
3784
with older repositories or with older versions of Bazaar.
3786
If you wish to upgrade to a particular format rather than the
3787
current default, that can be specified using the --format option.
3788
As a consequence, you can use the upgrade command this way to
3789
"downgrade" to an earlier format, though some conversions are
3790
a one way process (e.g. changing from the 1.x default to the
3791
2.x default) so downgrading is not always possible.
3793
A backup.bzr.~#~ directory is created at the start of the conversion
3794
process (where # is a number). By default, this is left there on
3795
completion. If the conversion fails, delete the new .bzr directory
3796
and rename this one back in its place. Use the --clean option to ask
3797
for the backup.bzr directory to be removed on successful conversion.
3798
Alternatively, you can delete it by hand if everything looks good
3801
If the location given is a shared repository, dependent branches
3802
are also converted provided the repository converts successfully.
3803
If the conversion of a branch fails, remaining branches are still
3806
For more information on upgrades, see the Bazaar Upgrade Guide,
3807
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3274
_see_also = ['check']
3810
_see_also = ['check', 'reconcile', 'formats']
3275
3811
takes_args = ['url?']
3276
3812
takes_options = [
3277
RegistryOption('format',
3278
help='Upgrade to a specific format. See "bzr help'
3279
' formats" for details.',
3280
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3281
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3282
value_switches=True, title='Branch format'),
3813
RegistryOption('format',
3814
help='Upgrade to a specific format. See "bzr help'
3815
' formats" for details.',
3816
lazy_registry=('bzrlib.controldir', 'format_registry'),
3817
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3818
value_switches=True, title='Branch format'),
3820
help='Remove the backup.bzr directory if successful.'),
3822
help="Show what would be done, but don't actually do anything."),
3285
def run(self, url='.', format=None):
3825
def run(self, url='.', format=None, clean=False, dry_run=False):
3286
3826
from bzrlib.upgrade import upgrade
3287
upgrade(url, format)
3827
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3829
if len(exceptions) == 1:
3830
# Compatibility with historical behavior
3290
3836
class cmd_whoami(Command):
3315
3861
if directory is None:
3316
3862
# use branch if we're inside one; otherwise global config
3318
c = Branch.open_containing(u'.')[0].get_config()
3864
c = Branch.open_containing(u'.')[0].get_config_stack()
3319
3865
except errors.NotBranchError:
3320
c = config.GlobalConfig()
3866
c = _mod_config.GlobalStack()
3322
c = Branch.open(directory).get_config()
3868
c = Branch.open(directory).get_config_stack()
3869
identity = c.get('email')
3324
self.outf.write(c.user_email() + '\n')
3871
self.outf.write(_mod_config.extract_email_address(identity)
3326
self.outf.write(c.username() + '\n')
3874
self.outf.write(identity + '\n')
3878
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3329
3881
# display a warning if an email address isn't included in the given name.
3331
config.extract_email_address(name)
3883
_mod_config.extract_email_address(name)
3332
3884
except errors.NoEmailInUsername, e:
3333
3885
warning('"%s" does not seem to contain an email address. '
3334
3886
'This is allowed, but not recommended.', name)
3564
4125
first=False, list_only=False,
3565
4126
randomize=None, exclude=None, strict=False,
3566
4127
load_list=None, debugflag=None, starting_with=None, subunit=False,
3567
parallel=None, lsprof_tests=False):
3568
from bzrlib.tests import selftest
3570
# Make deprecation warnings visible, unless -Werror is set
3571
symbol_versioning.activate_deprecation_warnings(override=False)
4128
parallel=None, lsprof_tests=False,
4131
# During selftest, disallow proxying, as it can cause severe
4132
# performance penalties and is only needed for thread
4133
# safety. The selftest command is assumed to not use threads
4134
# too heavily. The call should be as early as possible, as
4135
# error reporting for past duplicate imports won't have useful
4137
lazy_import.disallow_proxying()
4139
from bzrlib import tests
3573
4141
if testspecs_list is not None:
3574
4142
pattern = '|'.join(testspecs_list)
3608
4182
"matching_tests_first": first,
3609
4183
"list_only": list_only,
3610
4184
"random_seed": randomize,
3611
"exclude_pattern": exclude,
4185
"exclude_pattern": exclude_pattern,
3612
4186
"strict": strict,
3613
4187
"load_list": load_list,
3614
4188
"debug_flags": debugflag,
3615
4189
"starting_with": starting_with
3617
4191
selftest_kwargs.update(self.additional_selftest_args)
3618
result = selftest(**selftest_kwargs)
4193
# Make deprecation warnings visible, unless -Werror is set
4194
cleanup = symbol_versioning.activate_deprecation_warnings(
4197
result = tests.selftest(**selftest_kwargs)
3619
4200
return int(not result)
4202
def _disable_fsync(self):
4203
"""Change the 'os' functionality to not synchronize."""
4204
self._orig_fsync = getattr(os, 'fsync', None)
4205
if self._orig_fsync is not None:
4206
os.fsync = lambda filedes: None
4207
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4208
if self._orig_fdatasync is not None:
4209
os.fdatasync = lambda filedes: None
3622
4212
class cmd_version(Command):
3623
4213
__doc__ = """Show version of bzr."""
3676
4266
The source of the merge can be specified either in the form of a branch,
3677
4267
or in the form of a path to a file containing a merge directive generated
3678
4268
with bzr send. If neither is specified, the default is the upstream branch
3679
or the branch most recently merged using --remember.
3681
When merging a branch, by default the tip will be merged. To pick a different
3682
revision, pass --revision. If you specify two values, the first will be used as
3683
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3684
available revisions, like this is commonly referred to as "cherrypicking".
3686
Revision numbers are always relative to the branch being merged.
3688
By default, bzr will try to merge in all new work from the other
3689
branch, automatically determining an appropriate base. If this
3690
fails, you may need to give an explicit base.
4269
or the branch most recently merged using --remember. The source of the
4270
merge may also be specified in the form of a path to a file in another
4271
branch: in this case, only the modifications to that file are merged into
4272
the current working tree.
4274
When merging from a branch, by default bzr will try to merge in all new
4275
work from the other branch, automatically determining an appropriate base
4276
revision. If this fails, you may need to give an explicit base.
4278
To pick a different ending revision, pass "--revision OTHER". bzr will
4279
try to merge in all new work up to and including revision OTHER.
4281
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4282
through OTHER, excluding BASE but including OTHER, will be merged. If this
4283
causes some revisions to be skipped, i.e. if the destination branch does
4284
not already contain revision BASE, such a merge is commonly referred to as
4285
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4286
cherrypicks. The changes look like a normal commit, and the history of the
4287
changes from the other branch is not stored in the commit.
4289
Revision numbers are always relative to the source branch.
3692
4291
Merge will do its best to combine the changes in two branches, but there
3693
4292
are some kinds of problems only a human can fix. When it encounters those,
3694
4293
it will mark a conflict. A conflict means that you need to fix something,
3695
before you should commit.
4294
before you can commit.
3697
4296
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3699
If there is no default branch set, the first merge will set it. After
3700
that, you can omit the branch to use the default. To change the
3701
default, use --remember. The value will only be saved if the remote
3702
location can be accessed.
4298
If there is no default branch set, the first merge will set it (use
4299
--no-remember to avoid setting it). After that, you can omit the branch
4300
to use the default. To change the default, use --remember. The value will
4301
only be saved if the remote location can be accessed.
3704
4303
The results of the merge are placed into the destination working
3705
4304
directory, where they can be reviewed (with bzr diff), tested, and then
3706
4305
committed to record the result of the merge.
3708
4307
merge refuses to run if there are any uncommitted changes, unless
3709
--force is given. The --force option can also be used to create a
4308
--force is given. If --force is given, then the changes from the source
4309
will be merged with the current working tree, including any uncommitted
4310
changes in the tree. The --force option can also be used to create a
3710
4311
merge revision which has more than two parents.
3712
4313
If one would like to merge changes from the working tree of the other
3836
4441
self.sanity_check_merger(merger)
3837
4442
if (merger.base_rev_id == merger.other_rev_id and
3838
4443
merger.other_rev_id is not None):
3839
note('Nothing to do.')
4444
# check if location is a nonexistent file (and not a branch) to
4445
# disambiguate the 'Nothing to do'
4446
if merger.interesting_files:
4447
if not merger.other_tree.has_filename(
4448
merger.interesting_files[0]):
4449
note(gettext("merger: ") + str(merger))
4450
raise errors.PathsDoNotExist([location])
4451
note(gettext('Nothing to do.'))
4453
if pull and not preview:
3842
4454
if merger.interesting_files is not None:
3843
raise errors.BzrCommandError('Cannot pull individual files')
4455
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3844
4456
if (merger.base_rev_id == tree.last_revision()):
3845
4457
result = tree.pull(merger.other_branch, False,
3846
4458
merger.other_rev_id)
3847
4459
result.report(self.outf)
3849
4461
if merger.this_basis is None:
3850
raise errors.BzrCommandError(
4462
raise errors.BzrCommandError(gettext(
3851
4463
"This branch has no commits."
3852
" (perhaps you would prefer 'bzr pull')")
4464
" (perhaps you would prefer 'bzr pull')"))
3854
4466
return self._do_preview(merger)
3855
4467
elif interactive:
3953
4565
if other_revision_id is None:
3954
4566
other_revision_id = _mod_revision.ensure_null(
3955
4567
other_branch.last_revision())
3956
# Remember where we merge from
3957
if ((remember or tree.branch.get_submit_branch() is None) and
3958
user_location is not None):
4568
# Remember where we merge from. We need to remember if:
4569
# - user specify a location (and we don't merge from the parent
4571
# - user ask to remember or there is no previous location set to merge
4572
# from and user didn't ask to *not* remember
4573
if (user_location is not None
4575
or (remember is None
4576
and tree.branch.get_submit_branch() is None)))):
3959
4577
tree.branch.set_submit_branch(other_branch.base)
3960
_merge_tags_if_possible(other_branch, tree.branch)
4578
# Merge tags (but don't set them in the master branch yet, the user
4579
# might revert this merge). Commit will propagate them.
4580
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3961
4581
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3962
4582
other_revision_id, base_revision_id, other_branch, base_branch)
3963
4583
if other_path != '':
4126
4747
class cmd_revert(Command):
4127
__doc__ = """Revert files to a previous revision.
4749
Set files in the working tree back to the contents of a previous revision.
4129
4751
Giving a list of files will revert only those files. Otherwise, all files
4130
4752
will be reverted. If the revision is not specified with '--revision', the
4131
last committed revision is used.
4753
working tree basis revision is used. A revert operation affects only the
4754
working tree, not any revision history like the branch and repository or
4755
the working tree basis revision.
4133
4757
To remove only some changes, without reverting to a prior version, use
4134
merge instead. For example, "merge . --revision -2..-3" will remove the
4135
changes introduced by -2, without affecting the changes introduced by -1.
4136
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4758
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4759
will remove the changes introduced by the second last commit (-2), without
4760
affecting the changes introduced by the last commit (-1). To remove
4761
certain changes on a hunk-by-hunk basis, see the shelve command.
4762
To update the branch to a specific revision or the latest revision and
4763
update the working tree accordingly while preserving local changes, see the
4138
By default, any files that have been manually changed will be backed up
4139
first. (Files changed only by merge are not backed up.) Backup files have
4140
'.~#~' appended to their name, where # is a number.
4766
Uncommitted changes to files that are reverted will be discarded.
4767
Howver, by default, any files that have been manually changed will be
4768
backed up first. (Files changed only by merge are not backed up.) Backup
4769
files have '.~#~' appended to their name, where # is a number.
4142
4771
When you provide files, you can use their current pathname or the pathname
4143
4772
from the target revision. So you can use revert to "undelete" a file by
4304
4935
theirs_only=False,
4305
4936
log_format=None, long=False, short=False, line=False,
4306
4937
show_ids=False, verbose=False, this=False, other=False,
4307
include_merges=False, revision=None, my_revision=None,
4938
include_merged=None, revision=None, my_revision=None,
4940
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4309
4941
from bzrlib.missing import find_unmerged, iter_log_revisions
4310
4942
def message(s):
4311
4943
if not is_quiet():
4312
4944
self.outf.write(s)
4946
if symbol_versioning.deprecated_passed(include_merges):
4947
ui.ui_factory.show_user_warning(
4948
'deprecated_command_option',
4949
deprecated_name='--include-merges',
4950
recommended_name='--include-merged',
4951
deprecated_in_version='2.5',
4952
command=self.invoked_as)
4953
if include_merged is None:
4954
include_merged = include_merges
4956
raise errors.BzrCommandError(gettext(
4957
'{0} and {1} are mutually exclusive').format(
4958
'--include-merges', '--include-merged'))
4959
if include_merged is None:
4960
include_merged = False
4315
4962
mine_only = this
4382
5035
if remote_extra and not mine_only:
4383
5036
if printed_local is True:
4384
5037
message("\n\n\n")
4385
message("You are missing %d revision(s):\n" %
5038
message(ngettext("You are missing %d revision:\n",
5039
"You are missing %d revisions:\n",
5040
len(remote_extra)) %
4386
5041
len(remote_extra))
5042
if remote_branch.supports_tags():
5043
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4387
5044
for revision in iter_log_revisions(remote_extra,
4388
5045
remote_branch.repository,
4390
5048
lf.log_revision(revision)
4391
5049
status_code = 1
4393
5051
if mine_only and not local_extra:
4394
5052
# We checked local, and found nothing extra
4395
message('This branch is up to date.\n')
5053
message(gettext('This branch has no new revisions.\n'))
4396
5054
elif theirs_only and not remote_extra:
4397
5055
# We checked remote, and found nothing extra
4398
message('Other branch is up to date.\n')
5056
message(gettext('Other branch has no new revisions.\n'))
4399
5057
elif not (mine_only or theirs_only or local_extra or
4401
5059
# We checked both branches, and neither one had extra
4403
message("Branches are up to date.\n")
5061
message(gettext("Branches are up to date.\n"))
4404
5062
self.cleanup_now()
4405
5063
if not status_code and parent is None and other_branch is not None:
4406
5064
self.add_cleanup(local_branch.lock_write().unlock)
4555
5200
self.add_cleanup(branch.lock_read().unlock)
4556
5201
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4557
5202
self.add_cleanup(tree.lock_read().unlock)
5203
if wt is not None and revision is None:
4559
5204
file_id = wt.path2id(relpath)
4561
5206
file_id = tree.path2id(relpath)
4562
5207
if file_id is None:
4563
5208
raise errors.NotVersionedError(filename)
4564
file_version = tree.inventory[file_id].revision
4565
5209
if wt is not None and revision is None:
4566
5210
# If there is a tree and we're not annotating historical
4567
5211
# versions, annotate the working tree's content.
4568
5212
annotate_file_tree(wt, file_id, self.outf, long, all,
4569
5213
show_ids=show_ids)
4571
annotate_file(branch, file_version, file_id, long, all, self.outf,
5215
annotate_file_tree(tree, file_id, self.outf, long, all,
5216
show_ids=show_ids, branch=branch)
4575
5219
class cmd_re_sign(Command):
4660
5304
location = b.get_old_bound_location()
4661
5305
except errors.UpgradeRequired:
4662
raise errors.BzrCommandError('No location supplied. '
4663
'This format does not remember old locations.')
5306
raise errors.BzrCommandError(gettext('No location supplied. '
5307
'This format does not remember old locations.'))
4665
5309
if location is None:
4666
5310
if b.get_bound_location() is not None:
4667
raise errors.BzrCommandError('Branch is already bound')
5311
raise errors.BzrCommandError(
5312
gettext('Branch is already bound'))
4669
raise errors.BzrCommandError('No location supplied '
4670
'and no previous location known')
5314
raise errors.BzrCommandError(
5315
gettext('No location supplied'
5316
' and no previous location known'))
4671
5317
b_other = Branch.open(location)
4673
5319
b.bind(b_other)
4674
5320
except errors.DivergedBranches:
4675
raise errors.BzrCommandError('These branches have diverged.'
4676
' Try merging, and then bind again.')
5321
raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
' Try merging, and then bind again.'))
4677
5323
if b.get_config().has_explicit_nickname():
4678
5324
b.nick = b_other.nick
4783
5432
end_revision=last_revno)
4786
self.outf.write('Dry-run, pretending to remove'
4787
' the above revisions.\n')
5435
self.outf.write(gettext('Dry-run, pretending to remove'
5436
' the above revisions.\n'))
4789
self.outf.write('The above revision(s) will be removed.\n')
5438
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4792
if not ui.ui_factory.get_boolean('Are you sure'):
4793
self.outf.write('Canceled')
5441
if not ui.ui_factory.confirm_action(
5442
gettext(u'Uncommit these revisions'),
5443
'bzrlib.builtins.uncommit',
5445
self.outf.write(gettext('Canceled\n'))
4796
5448
mutter('Uncommitting from {%s} to {%s}',
4797
5449
last_rev_id, rev_id)
4798
5450
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4799
revno=revno, local=local)
4800
self.outf.write('You can restore the old tip by running:\n'
4801
' bzr pull . -r revid:%s\n' % last_rev_id)
5451
revno=revno, local=local, keep_tags=keep_tags)
5452
self.outf.write(gettext('You can restore the old tip by running:\n'
5453
' bzr pull . -r revid:%s\n') % last_rev_id)
4804
5456
class cmd_break_lock(Command):
4805
__doc__ = """Break a dead lock on a repository, branch or working directory.
5457
__doc__ = """Break a dead lock.
5459
This command breaks a lock on a repository, branch, working directory or
4807
5462
CAUTION: Locks should only be broken when you are sure that the process
4808
5463
holding the lock has been stopped.
4869
5541
'option leads to global uncontrolled write access to your '
5544
Option('client-timeout', type=float,
5545
help='Override the default idle client timeout (5min).'),
4874
def get_host_and_port(self, port):
4875
"""Return the host and port to run the smart server on.
4877
If 'port' is None, None will be returned for the host and port.
4879
If 'port' has a colon in it, the string before the colon will be
4880
interpreted as the host.
4882
:param port: A string of the port to run the server on.
4883
:return: A tuple of (host, port), where 'host' is a host name or IP,
4884
and port is an integer TCP/IP port.
4887
if port is not None:
4889
host, port = port.split(':')
4893
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5548
def run(self, listen=None, port=None, inet=False, directory=None,
5549
allow_writes=False, protocol=None, client_timeout=None):
4895
5550
from bzrlib import transport
4896
5551
if directory is None:
4897
5552
directory = os.getcwd()
4898
5553
if protocol is None:
4899
5554
protocol = transport.transport_server_registry.get()
4900
host, port = self.get_host_and_port(port)
4901
url = urlutils.local_path_to_url(directory)
5555
url = transport.location_to_url(directory)
4902
5556
if not allow_writes:
4903
5557
url = 'readonly+' + url
4904
t = transport.get_transport(url)
4905
protocol(t, host, port, inet)
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
4908
5562
class cmd_join(Command):
5038
5692
if submit_branch is None:
5039
5693
submit_branch = branch.get_parent()
5040
5694
if submit_branch is None:
5041
raise errors.BzrCommandError('No submit branch specified or known')
5695
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5043
5697
stored_public_branch = branch.get_public_branch()
5044
5698
if public_branch is None:
5045
5699
public_branch = stored_public_branch
5046
5700
elif stored_public_branch is None:
5701
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5047
5702
branch.set_public_branch(public_branch)
5048
5703
if not include_bundle and public_branch is None:
5049
raise errors.BzrCommandError('No public branch specified or'
5704
raise errors.BzrCommandError(gettext('No public branch specified or'
5051
5706
base_revision_id = None
5052
5707
if revision is not None:
5053
5708
if len(revision) > 2:
5054
raise errors.BzrCommandError('bzr merge-directive takes '
5055
'at most two one revision identifiers')
5709
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5710
'at most two one revision identifiers'))
5056
5711
revision_id = revision[-1].as_revision_id(branch)
5057
5712
if len(revision) == 2:
5058
5713
base_revision_id = revision[0].as_revision_id(branch)
5314
5975
self.add_cleanup(branch.lock_write().unlock)
5316
5977
if tag_name is None:
5317
raise errors.BzrCommandError("No tag specified to delete.")
5978
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5318
5979
branch.tags.delete_tag(tag_name)
5319
self.outf.write('Deleted tag %s.\n' % tag_name)
5980
note(gettext('Deleted tag %s.') % tag_name)
5322
5983
if len(revision) != 1:
5323
raise errors.BzrCommandError(
5984
raise errors.BzrCommandError(gettext(
5324
5985
"Tags can only be placed on a single revision, "
5326
5987
revision_id = revision[0].as_revision_id(branch)
5328
5989
revision_id = branch.last_revision()
5329
5990
if tag_name is None:
5330
5991
tag_name = branch.automatic_tag_name(revision_id)
5331
5992
if tag_name is None:
5332
raise errors.BzrCommandError(
5333
"Please specify a tag name.")
5334
if (not force) and branch.tags.has_tag(tag_name):
5993
raise errors.BzrCommandError(gettext(
5994
"Please specify a tag name."))
5996
existing_target = branch.tags.lookup_tag(tag_name)
5997
except errors.NoSuchTag:
5998
existing_target = None
5999
if not force and existing_target not in (None, revision_id):
5335
6000
raise errors.TagAlreadyExists(tag_name)
5336
branch.tags.set_tag(tag_name, revision_id)
5337
self.outf.write('Created tag %s.\n' % tag_name)
6001
if existing_target == revision_id:
6002
note(gettext('Tag %s already exists for that revision.') % tag_name)
6004
branch.tags.set_tag(tag_name, revision_id)
6005
if existing_target is None:
6006
note(gettext('Created tag %s.') % tag_name)
6008
note(gettext('Updated tag %s.') % tag_name)
5340
6011
class cmd_tags(Command):
5372
6038
self.add_cleanup(branch.lock_read().unlock)
5374
graph = branch.repository.get_graph()
5375
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5376
revid1, revid2 = rev1.rev_id, rev2.rev_id
5377
# only show revisions between revid1 and revid2 (inclusive)
5378
tags = [(tag, revid) for tag, revid in tags if
5379
graph.is_between(revid, revid1, revid2)]
5382
elif sort == 'time':
5384
for tag, revid in tags:
5386
revobj = branch.repository.get_revision(revid)
5387
except errors.NoSuchRevision:
5388
timestamp = sys.maxint # place them at the end
5390
timestamp = revobj.timestamp
5391
timestamps[revid] = timestamp
5392
tags.sort(key=lambda x: timestamps[x[1]])
6040
# Restrict to the specified range
6041
tags = self._tags_for_range(branch, revision)
6043
sort = tag_sort_methods.get()
5393
6045
if not show_ids:
5394
6046
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5395
6047
for index, (tag, revid) in enumerate(tags):
5406
6060
for tag, revspec in tags:
5407
6061
self.outf.write('%-20s %s\n' % (tag, revspec))
6063
def _tags_for_range(self, branch, revision):
6065
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6066
revid1, revid2 = rev1.rev_id, rev2.rev_id
6067
# _get_revision_range will always set revid2 if it's not specified.
6068
# If revid1 is None, it means we want to start from the branch
6069
# origin which is always a valid ancestor. If revid1 == revid2, the
6070
# ancestry check is useless.
6071
if revid1 and revid1 != revid2:
6072
# FIXME: We really want to use the same graph than
6073
# branch.iter_merge_sorted_revisions below, but this is not
6074
# easily available -- vila 2011-09-23
6075
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6076
# We don't want to output anything in this case...
6078
# only show revisions between revid1 and revid2 (inclusive)
6079
tagged_revids = branch.tags.get_reverse_tag_dict()
6081
for r in branch.iter_merge_sorted_revisions(
6082
start_revision_id=revid2, stop_revision_id=revid1,
6083
stop_rule='include'):
6084
revid_tags = tagged_revids.get(r[0], None)
6086
found.extend([(tag, r[0]) for tag in revid_tags])
5410
6090
class cmd_reconfigure(Command):
5411
6091
__doc__ = """Reconfigure the type of a bzr directory.
5425
6105
takes_args = ['location?']
5426
6106
takes_options = [
5427
6107
RegistryOption.from_kwargs(
5429
title='Target type',
5430
help='The type to reconfigure the directory to.',
6110
help='The relation between branch and tree.',
5431
6111
value_switches=True, enum_switch=False,
5432
6112
branch='Reconfigure to be an unbound branch with no working tree.',
5433
6113
tree='Reconfigure to be an unbound branch with a working tree.',
5434
6114
checkout='Reconfigure to be a bound branch with a working tree.',
5435
6115
lightweight_checkout='Reconfigure to be a lightweight'
5436
6116
' checkout (with no local history).',
6118
RegistryOption.from_kwargs(
6120
title='Repository type',
6121
help='Location fo the repository.',
6122
value_switches=True, enum_switch=False,
5437
6123
standalone='Reconfigure to be a standalone branch '
5438
6124
'(i.e. stop using shared repository).',
5439
6125
use_shared='Reconfigure to use a shared repository.',
6127
RegistryOption.from_kwargs(
6129
title='Trees in Repository',
6130
help='Whether new branches in the repository have trees.',
6131
value_switches=True, enum_switch=False,
5440
6132
with_trees='Reconfigure repository to create '
5441
6133
'working trees on branches by default.',
5442
6134
with_no_trees='Reconfigure repository to not create '
5469
6161
# At the moment you can use --stacked-on and a different
5470
6162
# reconfiguration shape at the same time; there seems no good reason
5472
if target_type is None:
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
5473
6167
if stacked_on or unstacked:
5476
raise errors.BzrCommandError('No target configuration '
5478
elif target_type == 'branch':
6170
raise errors.BzrCommandError(gettext('No target configuration '
6172
reconfiguration = None
6173
if tree_type == 'branch':
5479
6174
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5480
elif target_type == 'tree':
6175
elif tree_type == 'tree':
5481
6176
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5482
elif target_type == 'checkout':
6177
elif tree_type == 'checkout':
5483
6178
reconfiguration = reconfigure.Reconfigure.to_checkout(
5484
6179
directory, bind_to)
5485
elif target_type == 'lightweight-checkout':
6180
elif tree_type == 'lightweight-checkout':
5486
6181
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5487
6182
directory, bind_to)
5488
elif target_type == 'use-shared':
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
5489
6187
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5490
elif target_type == 'standalone':
6188
elif repository_type == 'standalone':
5491
6189
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5492
elif target_type == 'with-trees':
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
5493
6194
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5494
6195
directory, True)
5495
elif target_type == 'with-no-trees':
6196
elif repository_trees == 'with-no-trees':
5496
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5497
6198
directory, False)
5498
reconfiguration.apply(force)
6200
reconfiguration.apply(force)
6201
reconfiguration = None
5501
6204
class cmd_switch(Command):
5529
6232
Option('create-branch', short_name='b',
5530
6233
help='Create the target branch from this one before'
5531
6234
' switching to it.'),
6236
help='Store and restore uncommitted changes in the'
5534
6240
def run(self, to_location=None, force=False, create_branch=False,
5535
revision=None, directory=u'.'):
6241
revision=None, directory=u'.', store=False):
5536
6242
from bzrlib import switch
5537
6243
tree_location = directory
5538
6244
revision = _get_one_revision('switch', revision)
5539
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6245
possible_transports = []
6246
control_dir = controldir.ControlDir.open_containing(tree_location,
6247
possible_transports=possible_transports)[0]
5540
6248
if to_location is None:
5541
6249
if revision is None:
5542
raise errors.BzrCommandError('You must supply either a'
5543
' revision or a location')
6250
raise errors.BzrCommandError(gettext('You must supply either a'
6251
' revision or a location'))
5544
6252
to_location = tree_location
5546
branch = control_dir.open_branch()
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
5547
6256
had_explicit_nick = branch.get_config().has_explicit_nickname()
5548
6257
except errors.NotBranchError:
5550
6259
had_explicit_nick = False
5551
6260
if create_branch:
5552
6261
if branch is None:
5553
raise errors.BzrCommandError('cannot create branch without'
5555
to_location = directory_service.directories.dereference(
5557
if '/' not in to_location and '\\' not in to_location:
5558
# This path is meant to be relative to the existing branch
5559
this_url = self._get_branch_location(control_dir)
5560
to_location = urlutils.join(this_url, '..', to_location)
6262
raise errors.BzrCommandError(
6263
gettext('cannot create branch without source branch'))
6264
to_location = lookup_new_sibling_branch(control_dir, to_location,
6265
possible_transports=possible_transports)
5561
6266
to_branch = branch.bzrdir.sprout(to_location,
5562
possible_transports=[branch.bzrdir.root_transport],
5563
source_branch=branch).open_branch()
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
5566
to_branch = Branch.open(to_location)
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
5567
6273
except errors.NotBranchError:
5568
this_url = self._get_branch_location(control_dir)
5569
to_branch = Branch.open(
5570
urlutils.join(this_url, '..', to_location))
6274
to_branch = open_sibling_branch(control_dir, to_location,
6275
possible_transports=possible_transports)
5571
6276
if revision is not None:
5572
6277
revision = revision.as_revision_id(to_branch)
5573
switch.switch(control_dir, to_branch, force, revision_id=revision)
6278
switch.switch(control_dir, to_branch, force, revision_id=revision,
6279
store_uncommitted=store)
5574
6280
if had_explicit_nick:
5575
6281
branch = control_dir.open_branch() #get the new branch!
5576
6282
branch.nick = to_branch.nick
5577
note('Switched to branch: %s',
6283
note(gettext('Switched to branch: %s'),
5578
6284
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5580
def _get_branch_location(self, control_dir):
5581
"""Return location of branch for this control dir."""
5583
this_branch = control_dir.open_branch()
5584
# This may be a heavy checkout, where we want the master branch
5585
master_location = this_branch.get_bound_location()
5586
if master_location is not None:
5587
return master_location
5588
# If not, use a local sibling
5589
return this_branch.base
5590
except errors.NotBranchError:
5591
format = control_dir.find_branch_format()
5592
if getattr(format, 'get_reference', None) is not None:
5593
return format.get_reference(control_dir)
5595
return control_dir.root_transport.base
5598
6288
class cmd_view(Command):
5689
6379
name = current_view
5692
raise errors.BzrCommandError(
5693
"Both --delete and a file list specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
5695
raise errors.BzrCommandError(
5696
"Both --delete and --switch specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
5698
6388
tree.views.set_view_info(None, {})
5699
self.outf.write("Deleted all views.\n")
6389
self.outf.write(gettext("Deleted all views.\n"))
5700
6390
elif name is None:
5701
raise errors.BzrCommandError("No current view to delete")
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
5703
6393
tree.views.delete_view(name)
5704
self.outf.write("Deleted '%s' view.\n" % name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5707
raise errors.BzrCommandError(
5708
"Both --switch and a file list specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
5710
raise errors.BzrCommandError(
5711
"Both --switch and --all specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
5712
6402
elif switch == 'off':
5713
6403
if current_view is None:
5714
raise errors.BzrCommandError("No current view to disable")
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
5715
6405
tree.views.set_view_info(None, view_dict)
5716
self.outf.write("Disabled '%s' view.\n" % (current_view))
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5718
6408
tree.views.set_view_info(switch, view_dict)
5719
6409
view_str = views.view_display_str(tree.views.lookup_view())
5720
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6410
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5723
self.outf.write('Views defined:\n')
6413
self.outf.write(gettext('Views defined:\n'))
5724
6414
for view in sorted(view_dict):
5725
6415
if view == current_view:
5729
6419
view_str = views.view_display_str(view_dict[view])
5730
6420
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5732
self.outf.write('No views defined.\n')
6422
self.outf.write(gettext('No views defined.\n'))
5733
6423
elif file_list:
5734
6424
if name is None:
5735
6425
# No name given and no current view set
5737
6427
elif name == 'off':
5738
raise errors.BzrCommandError(
5739
"Cannot change the 'off' pseudo view")
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
5740
6430
tree.views.set_view(name, sorted(file_list))
5741
6431
view_str = views.view_display_str(tree.views.lookup_view())
5742
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6432
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5744
6434
# list the files
5745
6435
if name is None:
5746
6436
# No name given and no current view set
5747
self.outf.write('No current view.\n')
6437
self.outf.write(gettext('No current view.\n'))
5749
6439
view_str = views.view_display_str(tree.views.lookup_view(name))
5750
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6440
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5753
6443
class cmd_hooks(Command):
5787
6477
takes_args = ["location?"]
6479
takes_options = ['directory',
6480
Option('force', help='Remove branch even if it is the active branch.')]
5789
6482
aliases = ["rmbranch"]
5791
def run(self, location=None):
5792
if location is None:
5794
branch = Branch.open_containing(location)[0]
5795
branch.bzrdir.destroy_branch()
6484
def run(self, directory=None, location=None, force=False):
6485
br = open_nearby_branch(near=directory, location=location)
6486
if not force and br.bzrdir.has_workingtree():
6488
active_branch = br.bzrdir.open_branch(name="")
6489
except errors.NotBranchError:
6490
active_branch = None
6491
if (active_branch is not None and
6492
br.control_url == active_branch.control_url):
6493
raise errors.BzrCommandError(
6494
gettext("Branch is active. Use --force to remove it."))
6495
br.bzrdir.destroy_branch(br.name)
5798
6498
class cmd_shelve(Command):
5799
6499
__doc__ = """Temporarily set aside some changes from the current tree.
5985
6699
self.outf.write('%s %s\n' % (path, location))
6702
class cmd_export_pot(Command):
6703
__doc__ = """Export command helps and error messages in po format."""
6706
takes_options = [Option('plugin',
6707
help='Export help text from named command '\
6708
'(defaults to all built in commands).',
6710
Option('include-duplicates',
6711
help='Output multiple copies of the same msgid '
6712
'string if it appears more than once.'),
6715
def run(self, plugin=None, include_duplicates=False):
6716
from bzrlib.export_pot import export_pot
6717
export_pot(self.outf, plugin, include_duplicates)
5988
6720
def _register_lazy_builtins():
5989
6721
# register lazy builtins from other modules; called at startup and should
5990
6722
# be only called once.
5991
6723
for (name, aliases, module_name) in [
5992
6724
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6725
('cmd_config', [], 'bzrlib.config'),
5993
6726
('cmd_dpush', [], 'bzrlib.foreign'),
5994
6727
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5995
6728
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5996
6729
('cmd_conflicts', [], 'bzrlib.conflicts'),
5997
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6730
('cmd_ping', [], 'bzrlib.smart.ping'),
6731
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6732
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6733
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
5999
6735
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
