72
78
_parse_revision_str,
74
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
77
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
80
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("/")
84
223
def tree_files_for_add(file_list):
149
# XXX: Bad function name; should possibly also be a class method of
150
# WorkingTree rather than a function.
151
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
152
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
154
"""Convert command-line paths to a WorkingTree and relative paths.
156
Deprecated: use WorkingTree.open_containing_paths instead.
158
This is typically used for command-line processors that take one or
159
more filenames, and infer the workingtree that contains them.
161
The filenames given are not required to exist.
163
:param file_list: Filenames to convert.
165
:param default_branch: Fallback tree path to use if file_list is empty or
168
:param apply_view: if True and a view is set, apply it or check that
169
specified files are within it
171
:return: workingtree, [relative_paths]
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
179
288
def _get_view_info_for_change_reporter(tree):
180
289
"""Get the view information from a tree for change reporting."""
471
594
raise errors.ShelvedChanges(working)
473
596
if working.user_url != working.branch.user_url:
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
477
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))
480
655
class cmd_revno(Command):
481
656
__doc__ = """Show current revision number.
486
661
_see_also = ['info']
487
662
takes_args = ['location?']
488
663
takes_options = [
489
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
493
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"))
496
676
wt = WorkingTree.open_containing(location)[0]
497
677
self.add_cleanup(wt.lock_read().unlock)
498
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
499
679
raise errors.NoWorkingTree(location)
500
681
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
683
b = Branch.open_containing(location)[0]
508
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)
510
698
self.cleanup_now()
511
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
514
702
class cmd_revision_info(Command):
662
859
takes_args = ['dir+']
863
help='No error if existing, make parent directories as needed.',
663
867
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)
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:
675
raise errors.NotVersionedError(path=base)
895
add_file(wt, relpath)
897
self.outf.write(gettext('added %s\n') % dir)
678
900
class cmd_relpath(Command):
784
1007
return self.run_auto(names_list, after, dry_run)
786
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
787
1010
if names_list is None:
789
1012
if len(names_list) < 2:
790
raise errors.BzrCommandError("missing file argument")
1013
raise errors.BzrCommandError(gettext("missing file argument"))
791
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"))
792
1018
self.add_cleanup(tree.lock_tree_write().unlock)
793
1019
self._run(tree, names_list, rel_names, after)
795
1021
def run_auto(self, names_list, after, dry_run):
796
1022
if names_list is not None and len(names_list) > 1:
797
raise errors.BzrCommandError('Only one path may be specified to'
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
800
raise errors.BzrCommandError('--after cannot be specified with'
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
802
1028
work_tree, file_list = WorkingTree.open_containing_paths(
803
1029
names_list, default_directory='.')
804
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
1056
1310
Option('strict',
1057
1311
help='Refuse to push if there are uncommitted changes in'
1058
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."),
1060
1319
takes_args = ['location?']
1061
1320
encoding_type = 'replace'
1063
def run(self, location=None, remember=False, overwrite=False,
1322
def run(self, location=None, remember=None, overwrite=False,
1064
1323
create_prefix=False, verbose=False, revision=None,
1065
1324
use_existing_dir=False, directory=None, stacked_on=None,
1066
stacked=False, strict=None):
1325
stacked=False, strict=None, no_tree=False,
1326
overwrite_tags=False):
1067
1327
from bzrlib.push import _show_push_branch
1330
overwrite = ["history", "tags"]
1331
elif overwrite_tags:
1332
overwrite = ["tags"]
1069
1336
if directory is None:
1070
1337
directory = '.'
1071
1338
# Get the source branch
1072
1339
(tree, br_from,
1073
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1340
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1074
1341
# Get the tip's revision_id
1075
1342
revision = _get_one_revision('push', revision)
1076
1343
if revision is not None:
1097
1364
# error by the feedback given to them. RBC 20080227.
1098
1365
stacked_on = parent_url
1099
1366
if not stacked_on:
1100
raise errors.BzrCommandError(
1101
"Could not determine branch to refer to.")
1367
raise errors.BzrCommandError(gettext(
1368
"Could not determine branch to refer to."))
1103
1370
# Get the destination location
1104
1371
if location is None:
1105
1372
stored_loc = br_from.get_push_location()
1106
1373
if stored_loc is None:
1107
raise errors.BzrCommandError(
1108
"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."))
1110
1385
display_url = urlutils.unescape_for_display(stored_loc,
1111
1386
self.outf.encoding)
1112
self.outf.write("Using saved push location: %s\n" % display_url)
1387
note(gettext("Using saved push location: %s") % display_url)
1113
1388
location = stored_loc
1115
1390
_show_push_branch(br_from, revision_id, location, self.outf,
1116
1391
verbose=verbose, overwrite=overwrite, remember=remember,
1117
1392
stacked_on=stacked_on, create_prefix=create_prefix,
1118
use_existing_dir=use_existing_dir)
1393
use_existing_dir=use_existing_dir, no_tree=no_tree)
1121
1396
class cmd_branch(Command):
1185
1468
revision_id = br_from.last_revision()
1186
1469
if to_location is None:
1187
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)
1188
1473
to_transport = transport.get_transport(to_location)
1190
1475
to_transport.mkdir('.')
1191
1476
except errors.FileExists:
1192
if not use_existing_dir:
1193
raise errors.BzrCommandError('Target directory "%s" '
1194
'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)
1197
bzrdir.BzrDir.open_from_transport(to_transport)
1488
to_dir.open_branch()
1198
1489
except errors.NotBranchError:
1201
1492
raise errors.AlreadyBranchError(to_location)
1202
1493
except errors.NoSuchFile:
1203
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1494
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)
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)
1220
1523
_merge_tags_if_possible(br_from, branch)
1221
1524
# If the source branch is stacked, the new branch may
1222
1525
# be stacked whether we asked for that explicitly or not.
1223
1526
# We therefore need a try/except here and not just 'if stacked:'
1225
note('Created new stacked branch referring to %s.' %
1528
note(gettext('Created new stacked branch referring to %s.') %
1226
1529
branch.get_stacked_on_url())
1227
1530
except (errors.NotStacked, errors.UnstackableBranchFormat,
1228
1531
errors.UnstackableRepositoryFormat), e:
1229
note('Branched %d revision(s).' % branch.revno())
1532
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1231
1534
# Bind to the parent
1232
1535
parent_branch = Branch.open(from_location)
1233
1536
branch.bind(parent_branch)
1234
note('New branch bound to %s' % from_location)
1537
note(gettext('New branch bound to %s') % from_location)
1236
1539
# Switch to the new branch
1237
1540
wt, _ = WorkingTree.open_containing('.')
1238
1541
_mod_switch.switch(wt.bzrdir, branch)
1239
note('Switched to branch: %s',
1542
note(gettext('Switched to branch: %s'),
1240
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)))
1243
1596
class cmd_checkout(Command):
1244
1597
__doc__ = """Create a new checkout of an existing branch.
1347
1698
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 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
1358
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.
1361
1728
_see_also = ['pull', 'working-trees', 'status-flags']
1362
1729
takes_args = ['dir?']
1363
takes_options = ['revision']
1730
takes_options = ['revision',
1732
help="Show base revision text in conflicts."),
1364
1734
aliases = ['up']
1366
def run(self, dir='.', revision=None):
1736
def run(self, dir=None, revision=None, show_base=None):
1367
1737
if revision is not None and len(revision) != 1:
1368
raise errors.BzrCommandError(
1369
"bzr update --revision takes exactly one revision")
1370
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"))
1371
1749
branch = tree.branch
1372
1750
possible_transports = []
1373
1751
master = branch.get_master_branch(
1409
1787
change_reporter,
1410
1788
possible_transports=possible_transports,
1411
1789
revision=revision_id,
1791
show_base=show_base)
1413
1792
except errors.NoSuchRevision, e:
1414
raise errors.BzrCommandError(
1793
raise errors.BzrCommandError(gettext(
1415
1794
"branch has no revision %s\n"
1416
1795
"bzr update --revision only works"
1417
" for a revision in the branch history"
1796
" for a revision in the branch history")
1418
1797
% (e.revision))
1419
1798
revno = tree.branch.revision_id_to_dotted_revno(
1420
1799
_mod_revision.ensure_null(tree.last_revision()))
1421
note('Updated to revision %s of branch %s' %
1422
('.'.join(map(str, revno)), branch_location))
1800
note(gettext('Updated to revision {0} of branch {1}').format(
1801
'.'.join(map(str, revno)), branch_location))
1423
1802
parent_ids = tree.get_parent_ids()
1424
1803
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1425
note('Your local commits will now show as pending merges with '
1426
"'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'."))
1427
1806
if conflicts != 0:
1705
2095
to_transport.ensure_base()
1706
2096
except errors.NoSuchFile:
1707
2097
if not create_prefix:
1708
raise errors.BzrCommandError("Parent directory of %s"
2098
raise errors.BzrCommandError(gettext("Parent directory of %s"
1709
2099
" does not exist."
1710
2100
"\nYou may supply --create-prefix to create all"
1711
" leading parent directories."
2101
" leading parent directories.")
1713
2103
to_transport.create_prefix()
1716
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2106
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1717
2107
except errors.NotBranchError:
1718
2108
# really a NotBzrDir error...
1719
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
1720
2114
branch = create_branch(to_transport.base, format=format,
1721
possible_transports=[to_transport])
2115
possible_transports=[to_transport],
2116
force_new_tree=force_new_tree)
1722
2117
a_bzrdir = branch.bzrdir
1724
2119
from bzrlib.transport.local import LocalTransport
1800
2197
def run(self, location, format=None, no_trees=False):
1801
2198
if format is None:
1802
format = bzrdir.format_registry.make_bzrdir('default')
2199
format = controldir.format_registry.make_bzrdir('default')
1804
2201
if location is None:
1807
2204
to_transport = transport.get_transport(location)
1808
to_transport.ensure_base()
1810
newdir = format.initialize_on_transport(to_transport)
1811
repo = newdir.create_repository(shared=True)
1812
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()))
1813
2212
if not is_quiet():
1814
2213
from bzrlib.info import show_bzrdir_info
1815
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2214
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1818
2217
class cmd_diff(Command):
2261
2683
Option('show-diff',
2262
2684
short_name='p',
2263
2685
help='Show changes made in each revision as a patch.'),
2264
Option('include-merges',
2686
Option('include-merged',
2265
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.'),
2266
2692
Option('exclude-common-ancestry',
2267
2693
help='Display only the revisions that are not part'
2268
' 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 '
2271
2720
encoding_type = 'replace'
2292
2749
_get_info_for_log_files,
2294
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
2295
2767
if (exclude_common_ancestry
2296
2768
and (revision is None or len(revision) != 2)):
2297
raise errors.BzrCommandError(
2298
'--exclude-common-ancestry requires -r with two revisions')
2769
raise errors.BzrCommandError(gettext(
2770
'--exclude-common-ancestry requires -r with two revisions'))
2300
2772
if levels is None:
2303
raise errors.BzrCommandError(
2304
'--levels and --include-merges are mutually exclusive')
2775
raise errors.BzrCommandError(gettext(
2776
'{0} and {1} are mutually exclusive').format(
2777
'--levels', '--include-merged'))
2306
2779
if change is not None:
2307
2780
if len(change) > 1:
2308
2781
raise errors.RangeInChangeOption()
2309
2782
if revision is not None:
2310
raise errors.BzrCommandError(
2311
'--revision and --change are mutually exclusive')
2783
raise errors.BzrCommandError(gettext(
2784
'{0} and {1} are mutually exclusive').format(
2785
'--revision', '--change'))
2313
2787
revision = change
2690
3193
self.outf.write("%s\n" % pattern)
2692
3195
if not name_pattern_list:
2693
raise errors.BzrCommandError("ignore requires at least one "
2694
"NAME_PATTERN or --default-rules.")
3196
raise errors.BzrCommandError(gettext("ignore requires at least one "
3197
"NAME_PATTERN or --default-rules."))
2695
3198
name_pattern_list = [globbing.normalize_pattern(p)
2696
3199
for p in name_pattern_list]
2697
3200
bad_patterns = ''
3201
bad_patterns_count = 0
2698
3202
for p in name_pattern_list:
2699
3203
if not globbing.Globster.is_pattern_valid(p):
3204
bad_patterns_count += 1
2700
3205
bad_patterns += ('\n %s' % p)
2701
3206
if bad_patterns:
2702
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)
2703
3210
ui.ui_factory.show_error(msg)
2704
3211
raise errors.InvalidPattern('')
2705
3212
for name_pattern in name_pattern_list:
2706
3213
if (name_pattern[0] == '/' or
2707
3214
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2708
raise errors.BzrCommandError(
2709
"NAME_PATTERN should not be an absolute path")
3215
raise errors.BzrCommandError(gettext(
3216
"NAME_PATTERN should not be an absolute path"))
2710
3217
tree, relpath = WorkingTree.open_containing(directory)
2711
3218
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2712
3219
ignored = globbing.Globster(name_pattern_list)
2815
3323
Option('per-file-timestamps',
2816
3324
help='Set modification time of files to that of the last '
2817
3325
'revision in which it was changed.'),
3326
Option('uncommitted',
3327
help='Export the working tree contents rather than that of the '
2819
3330
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2820
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3331
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2821
3333
from bzrlib.export import export
2823
3335
if branch_or_subdir is None:
2824
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"))
2828
b, subdir = Branch.open_containing(branch_or_subdir)
2831
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)
2833
export(rev_tree, dest, format, root, subdir, filtered=filters,
3351
export(export_tree, dest, format, root, subdir, filtered=filters,
2834
3352
per_file_timestamps=per_file_timestamps)
2835
3353
except errors.NoSuchExportFormat, e:
2836
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
raise errors.BzrCommandError(
3355
gettext('Unsupported export format: %s') % e.format)
2839
3358
class cmd_cat(Command):
2877
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
2879
3402
if name_from_revision:
2880
3403
# Try in revision if requested
2881
3404
if old_file_id is None:
2882
raise errors.BzrCommandError(
2883
"%r is not present in revision %s" % (
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
2884
3407
filename, rev_tree.get_revision_id()))
2886
content = rev_tree.get_file_text(old_file_id)
3409
actual_file_id = old_file_id
2888
3411
cur_file_id = tree.path2id(relpath)
2890
if cur_file_id is not None:
2891
# Then try with the actual file id
2893
content = rev_tree.get_file_text(cur_file_id)
2895
except errors.NoSuchId:
2896
# The actual file id didn't exist at that time
2898
if not found and old_file_id is not None:
2899
# Finally try with the old file id
2900
content = rev_tree.get_file_text(old_file_id)
2903
# Can't be found anywhere
2904
raise errors.BzrCommandError(
2905
"%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(
2906
3419
filename, rev_tree.get_revision_id()))
2908
from bzrlib.filters import (
2909
ContentFilterContext,
2910
filtered_output_bytes,
2912
filters = rev_tree._content_filter_stack(relpath)
2913
chunks = content.splitlines(True)
2914
content = filtered_output_bytes(chunks, filters,
2915
ContentFilterContext(relpath, rev_tree))
2917
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)
2920
self.outf.write(content)
3426
content = rev_tree.get_file_text(actual_file_id)
3428
self.outf.write(content)
2923
3431
class cmd_local_time_offset(Command):
2984
3492
to trigger updates to external systems like bug trackers. The --fixes
2985
3493
option can be used to record the association between a revision and
2986
3494
one or more bugs. See ``bzr help bugs`` for details.
2988
A selective commit may fail in some cases where the committed
2989
tree would be invalid. Consider::
2994
bzr commit foo -m "committing foo"
2995
bzr mv foo/bar foo/baz
2998
bzr commit foo/bar -m "committing bar but not baz"
3000
In the example above, the last commit will fail by design. This gives
3001
the user the opportunity to decide whether they want to commit the
3002
rename at the same time, separately first, or not at all. (As a general
3003
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3005
# TODO: Run hooks on tree to-be-committed, and after commit.
3007
# TODO: Strict commit that fails if there are deleted files.
3008
# (what does "deleted files" mean ??)
3010
# TODO: Give better message for -s, --summary, used by tla people
3012
# XXX: verbose currently does nothing
3014
3497
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3015
3498
takes_args = ['selected*']
3047
3530
Option('show-diff', short_name='p',
3048
3531
help='When no message is supplied, show the diff along'
3049
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 '
3051
3538
aliases = ['ci', 'checkin']
3053
3540
def _iter_bug_fix_urls(self, fixes, branch):
3541
default_bugtracker = None
3054
3542
# Configure the properties for bug fixing attributes.
3055
3543
for fixed_bug in fixes:
3056
3544
tokens = fixed_bug.split(':')
3057
if len(tokens) != 2:
3058
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(
3059
3561
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3060
3562
"See \"bzr help bugs\" for more information on this "
3061
"feature.\nCommit refused." % fixed_bug)
3062
tag, bug_id = tokens
3563
"feature.\nCommit refused.") % fixed_bug)
3565
tag, bug_id = tokens
3064
3567
yield bugtracker.get_bug_url(tag, branch, bug_id)
3065
3568
except errors.UnknownBugTrackerAbbreviation:
3066
raise errors.BzrCommandError(
3067
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3569
raise errors.BzrCommandError(gettext(
3570
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3068
3571
except errors.MalformedBugIdentifier, e:
3069
raise errors.BzrCommandError(
3070
"%s\nCommit refused." % (str(e),))
3572
raise errors.BzrCommandError(gettext(
3573
"%s\nCommit refused.") % (str(e),))
3072
3575
def run(self, message=None, file=None, verbose=False, selected_list=None,
3073
3576
unchanged=False, strict=False, local=False, fixes=None,
3074
author=None, show_diff=False, exclude=None, commit_time=None):
3577
author=None, show_diff=False, exclude=None, commit_time=None,
3075
3579
from bzrlib.errors import (
3076
3580
PointlessCommit,
3077
3581
ConflictsInTree,
3158
3657
# make_commit_message_template_encoded returns user encoding.
3159
3658
# We probably want to be using edit_commit_message instead to
3161
start_message = generate_commit_message_template(commit_obj)
3162
my_message = edit_commit_message_encoded(text,
3163
start_message=start_message)
3164
if my_message is None:
3165
raise errors.BzrCommandError("please specify a commit"
3166
" message with either --message or --file")
3167
if my_message == "":
3168
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 \"\"."))
3169
3673
return my_message
3171
3675
# The API permits a commit with a filter of [] to mean 'select nothing'
3179
3683
reporter=None, verbose=verbose, revprops=properties,
3180
3684
authors=author, timestamp=commit_stamp,
3181
3685
timezone=offset,
3182
exclude=tree.safe_relpath_files(exclude))
3686
exclude=tree.safe_relpath_files(exclude),
3183
3688
except PointlessCommit:
3184
raise errors.BzrCommandError("No changes to commit."
3185
" 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."))
3186
3692
except ConflictsInTree:
3187
raise errors.BzrCommandError('Conflicts detected in working '
3693
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3188
3694
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3190
3696
except StrictCommitFailed:
3191
raise errors.BzrCommandError("Commit refused because there are"
3192
" unknown files in the working tree.")
3697
raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
" unknown files in the working tree."))
3193
3699
except errors.BoundBranchOutOfDate, e:
3194
e.extra_help = ("\n"
3700
e.extra_help = (gettext("\n"
3195
3701
'To commit to master branch, run update and then commit.\n'
3196
3702
'You can also pass --local to commit to continue working '
3271
3777
class cmd_upgrade(Command):
3272
__doc__ = """Upgrade branch storage to current format.
3274
The check command or bzr developers may sometimes advise you to run
3275
this command. When the default format has changed you may also be warned
3276
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/.
3279
_see_also = ['check']
3810
_see_also = ['check', 'reconcile', 'formats']
3280
3811
takes_args = ['url?']
3281
3812
takes_options = [
3282
RegistryOption('format',
3283
help='Upgrade to a specific format. See "bzr help'
3284
' formats" for details.',
3285
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3286
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3287
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."),
3290
def run(self, url='.', format=None):
3825
def run(self, url='.', format=None, clean=False, dry_run=False):
3291
3826
from bzrlib.upgrade import upgrade
3292
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
3295
3836
class cmd_whoami(Command):
3685
4266
The source of the merge can be specified either in the form of a branch,
3686
4267
or in the form of a path to a file containing a merge directive generated
3687
4268
with bzr send. If neither is specified, the default is the upstream branch
3688
or the branch most recently merged using --remember.
3690
When merging a branch, by default the tip will be merged. To pick a different
3691
revision, pass --revision. If you specify two values, the first will be used as
3692
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3693
available revisions, like this is commonly referred to as "cherrypicking".
3695
Revision numbers are always relative to the branch being merged.
3697
By default, bzr will try to merge in all new work from the other
3698
branch, automatically determining an appropriate base. If this
3699
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.
3701
4291
Merge will do its best to combine the changes in two branches, but there
3702
4292
are some kinds of problems only a human can fix. When it encounters those,
3703
4293
it will mark a conflict. A conflict means that you need to fix something,
3704
before you should commit.
4294
before you can commit.
3706
4296
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3708
If there is no default branch set, the first merge will set it. After
3709
that, you can omit the branch to use the default. To change the
3710
default, use --remember. The value will only be saved if the remote
3711
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.
3713
4303
The results of the merge are placed into the destination working
3714
4304
directory, where they can be reviewed (with bzr diff), tested, and then
3715
4305
committed to record the result of the merge.
3717
4307
merge refuses to run if there are any uncommitted changes, unless
3718
--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
3719
4311
merge revision which has more than two parents.
3721
4313
If one would like to merge changes from the working tree of the other
3845
4441
self.sanity_check_merger(merger)
3846
4442
if (merger.base_rev_id == merger.other_rev_id and
3847
4443
merger.other_rev_id is not None):
3848
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:
3851
4454
if merger.interesting_files is not None:
3852
raise errors.BzrCommandError('Cannot pull individual files')
4455
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3853
4456
if (merger.base_rev_id == tree.last_revision()):
3854
4457
result = tree.pull(merger.other_branch, False,
3855
4458
merger.other_rev_id)
3856
4459
result.report(self.outf)
3858
4461
if merger.this_basis is None:
3859
raise errors.BzrCommandError(
4462
raise errors.BzrCommandError(gettext(
3860
4463
"This branch has no commits."
3861
" (perhaps you would prefer 'bzr pull')")
4464
" (perhaps you would prefer 'bzr pull')"))
3863
4466
return self._do_preview(merger)
3864
4467
elif interactive:
3962
4565
if other_revision_id is None:
3963
4566
other_revision_id = _mod_revision.ensure_null(
3964
4567
other_branch.last_revision())
3965
# Remember where we merge from
3966
if ((remember or tree.branch.get_submit_branch() is None) and
3967
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)))):
3968
4577
tree.branch.set_submit_branch(other_branch.base)
3969
_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)
3970
4581
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3971
4582
other_revision_id, base_revision_id, other_branch, base_branch)
3972
4583
if other_path != '':
4135
4747
class cmd_revert(Command):
4136
__doc__ = """Revert files to a previous revision.
4749
Set files in the working tree back to the contents of a previous revision.
4138
4751
Giving a list of files will revert only those files. Otherwise, all files
4139
4752
will be reverted. If the revision is not specified with '--revision', the
4140
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.
4142
4757
To remove only some changes, without reverting to a prior version, use
4143
merge instead. For example, "merge . --revision -2..-3" will remove the
4144
changes introduced by -2, without affecting the changes introduced by -1.
4145
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
4147
By default, any files that have been manually changed will be backed up
4148
first. (Files changed only by merge are not backed up.) Backup files have
4149
'.~#~' 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.
4151
4771
When you provide files, you can use their current pathname or the pathname
4152
4772
from the target revision. So you can use revert to "undelete" a file by
4313
4935
theirs_only=False,
4314
4936
log_format=None, long=False, short=False, line=False,
4315
4937
show_ids=False, verbose=False, this=False, other=False,
4316
include_merges=False, revision=None, my_revision=None,
4938
include_merged=None, revision=None, my_revision=None,
4940
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4318
4941
from bzrlib.missing import find_unmerged, iter_log_revisions
4319
4942
def message(s):
4320
4943
if not is_quiet():
4321
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
4324
4962
mine_only = this
4391
5035
if remote_extra and not mine_only:
4392
5036
if printed_local is True:
4393
5037
message("\n\n\n")
4394
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)) %
4395
5041
len(remote_extra))
5042
if remote_branch.supports_tags():
5043
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4396
5044
for revision in iter_log_revisions(remote_extra,
4397
5045
remote_branch.repository,
4399
5048
lf.log_revision(revision)
4400
5049
status_code = 1
4402
5051
if mine_only and not local_extra:
4403
5052
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
5053
message(gettext('This branch has no new revisions.\n'))
4405
5054
elif theirs_only and not remote_extra:
4406
5055
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
5056
message(gettext('Other branch has no new revisions.\n'))
4408
5057
elif not (mine_only or theirs_only or local_extra or
4410
5059
# We checked both branches, and neither one had extra
4412
message("Branches are up to date.\n")
5061
message(gettext("Branches are up to date.\n"))
4413
5062
self.cleanup_now()
4414
5063
if not status_code and parent is None and other_branch is not None:
4415
5064
self.add_cleanup(local_branch.lock_write().unlock)
4564
5200
self.add_cleanup(branch.lock_read().unlock)
4565
5201
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
5202
self.add_cleanup(tree.lock_read().unlock)
5203
if wt is not None and revision is None:
4568
5204
file_id = wt.path2id(relpath)
4570
5206
file_id = tree.path2id(relpath)
4571
5207
if file_id is None:
4572
5208
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
5209
if wt is not None and revision is None:
4575
5210
# If there is a tree and we're not annotating historical
4576
5211
# versions, annotate the working tree's content.
4577
5212
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
5213
show_ids=show_ids)
4580
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)
4584
5219
class cmd_re_sign(Command):
4669
5304
location = b.get_old_bound_location()
4670
5305
except errors.UpgradeRequired:
4671
raise errors.BzrCommandError('No location supplied. '
4672
'This format does not remember old locations.')
5306
raise errors.BzrCommandError(gettext('No location supplied. '
5307
'This format does not remember old locations.'))
4674
5309
if location is None:
4675
5310
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
5311
raise errors.BzrCommandError(
5312
gettext('Branch is already bound'))
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
5314
raise errors.BzrCommandError(
5315
gettext('No location supplied'
5316
' and no previous location known'))
4680
5317
b_other = Branch.open(location)
4682
5319
b.bind(b_other)
4683
5320
except errors.DivergedBranches:
4684
raise errors.BzrCommandError('These branches have diverged.'
4685
' Try merging, and then bind again.')
5321
raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
' Try merging, and then bind again.'))
4686
5323
if b.get_config().has_explicit_nickname():
4687
5324
b.nick = b_other.nick
4792
5432
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
5435
self.outf.write(gettext('Dry-run, pretending to remove'
5436
' the above revisions.\n'))
4798
self.outf.write('The above revision(s) will be removed.\n')
5438
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
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'))
4805
5448
mutter('Uncommitting from {%s} to {%s}',
4806
5449
last_rev_id, rev_id)
4807
5450
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' 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)
4813
5456
class cmd_break_lock(Command):
4891
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).'),
4896
def get_host_and_port(self, port):
4897
"""Return the host and port to run the smart server on.
4899
If 'port' is None, None will be returned for the host and port.
4901
If 'port' has a colon in it, the string before the colon will be
4902
interpreted as the host.
4904
:param port: A string of the port to run the server on.
4905
:return: A tuple of (host, port), where 'host' is a host name or IP,
4906
and port is an integer TCP/IP port.
4909
if port is not None:
4911
host, port = port.split(':')
4915
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):
4917
5550
from bzrlib import transport
4918
5551
if directory is None:
4919
5552
directory = os.getcwd()
4920
5553
if protocol is None:
4921
5554
protocol = transport.transport_server_registry.get()
4922
host, port = self.get_host_and_port(port)
4923
url = urlutils.local_path_to_url(directory)
5555
url = transport.location_to_url(directory)
4924
5556
if not allow_writes:
4925
5557
url = 'readonly+' + url
4926
t = transport.get_transport(url)
4927
protocol(t, host, port, inet)
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
4930
5562
class cmd_join(Command):
5060
5692
if submit_branch is None:
5061
5693
submit_branch = branch.get_parent()
5062
5694
if submit_branch is None:
5063
raise errors.BzrCommandError('No submit branch specified or known')
5695
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5065
5697
stored_public_branch = branch.get_public_branch()
5066
5698
if public_branch is None:
5067
5699
public_branch = stored_public_branch
5068
5700
elif stored_public_branch is None:
5701
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5069
5702
branch.set_public_branch(public_branch)
5070
5703
if not include_bundle and public_branch is None:
5071
raise errors.BzrCommandError('No public branch specified or'
5704
raise errors.BzrCommandError(gettext('No public branch specified or'
5073
5706
base_revision_id = None
5074
5707
if revision is not None:
5075
5708
if len(revision) > 2:
5076
raise errors.BzrCommandError('bzr merge-directive takes '
5077
'at most two one revision identifiers')
5709
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5710
'at most two one revision identifiers'))
5078
5711
revision_id = revision[-1].as_revision_id(branch)
5079
5712
if len(revision) == 2:
5080
5713
base_revision_id = revision[0].as_revision_id(branch)
5336
5975
self.add_cleanup(branch.lock_write().unlock)
5338
5977
if tag_name is None:
5339
raise errors.BzrCommandError("No tag specified to delete.")
5978
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5340
5979
branch.tags.delete_tag(tag_name)
5341
self.outf.write('Deleted tag %s.\n' % tag_name)
5980
note(gettext('Deleted tag %s.') % tag_name)
5344
5983
if len(revision) != 1:
5345
raise errors.BzrCommandError(
5984
raise errors.BzrCommandError(gettext(
5346
5985
"Tags can only be placed on a single revision, "
5348
5987
revision_id = revision[0].as_revision_id(branch)
5350
5989
revision_id = branch.last_revision()
5351
5990
if tag_name is None:
5352
5991
tag_name = branch.automatic_tag_name(revision_id)
5353
5992
if tag_name is None:
5354
raise errors.BzrCommandError(
5355
"Please specify a tag name.")
5356
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):
5357
6000
raise errors.TagAlreadyExists(tag_name)
5358
branch.tags.set_tag(tag_name, revision_id)
5359
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)
5362
6011
class cmd_tags(Command):
5394
6038
self.add_cleanup(branch.lock_read().unlock)
5396
graph = branch.repository.get_graph()
5397
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5398
revid1, revid2 = rev1.rev_id, rev2.rev_id
5399
# only show revisions between revid1 and revid2 (inclusive)
5400
tags = [(tag, revid) for tag, revid in tags if
5401
graph.is_between(revid, revid1, revid2)]
5404
elif sort == 'time':
5406
for tag, revid in tags:
5408
revobj = branch.repository.get_revision(revid)
5409
except errors.NoSuchRevision:
5410
timestamp = sys.maxint # place them at the end
5412
timestamp = revobj.timestamp
5413
timestamps[revid] = timestamp
5414
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()
5415
6045
if not show_ids:
5416
6046
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5417
6047
for index, (tag, revid) in enumerate(tags):
5428
6060
for tag, revspec in tags:
5429
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])
5432
6090
class cmd_reconfigure(Command):
5433
6091
__doc__ = """Reconfigure the type of a bzr directory.
5447
6105
takes_args = ['location?']
5448
6106
takes_options = [
5449
6107
RegistryOption.from_kwargs(
5451
title='Target type',
5452
help='The type to reconfigure the directory to.',
6110
help='The relation between branch and tree.',
5453
6111
value_switches=True, enum_switch=False,
5454
6112
branch='Reconfigure to be an unbound branch with no working tree.',
5455
6113
tree='Reconfigure to be an unbound branch with a working tree.',
5456
6114
checkout='Reconfigure to be a bound branch with a working tree.',
5457
6115
lightweight_checkout='Reconfigure to be a lightweight'
5458
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,
5459
6123
standalone='Reconfigure to be a standalone branch '
5460
6124
'(i.e. stop using shared repository).',
5461
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,
5462
6132
with_trees='Reconfigure repository to create '
5463
6133
'working trees on branches by default.',
5464
6134
with_no_trees='Reconfigure repository to not create '
5491
6161
# At the moment you can use --stacked-on and a different
5492
6162
# reconfiguration shape at the same time; there seems no good reason
5494
if target_type is None:
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
5495
6167
if stacked_on or unstacked:
5498
raise errors.BzrCommandError('No target configuration '
5500
elif target_type == 'branch':
6170
raise errors.BzrCommandError(gettext('No target configuration '
6172
reconfiguration = None
6173
if tree_type == 'branch':
5501
6174
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5502
elif target_type == 'tree':
6175
elif tree_type == 'tree':
5503
6176
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5504
elif target_type == 'checkout':
6177
elif tree_type == 'checkout':
5505
6178
reconfiguration = reconfigure.Reconfigure.to_checkout(
5506
6179
directory, bind_to)
5507
elif target_type == 'lightweight-checkout':
6180
elif tree_type == 'lightweight-checkout':
5508
6181
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5509
6182
directory, bind_to)
5510
elif target_type == 'use-shared':
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
5511
6187
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5512
elif target_type == 'standalone':
6188
elif repository_type == 'standalone':
5513
6189
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5514
elif target_type == 'with-trees':
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
5515
6194
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5516
6195
directory, True)
5517
elif target_type == 'with-no-trees':
6196
elif repository_trees == 'with-no-trees':
5518
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5519
6198
directory, False)
5520
reconfiguration.apply(force)
6200
reconfiguration.apply(force)
6201
reconfiguration = None
5523
6204
class cmd_switch(Command):
5551
6232
Option('create-branch', short_name='b',
5552
6233
help='Create the target branch from this one before'
5553
6234
' switching to it.'),
6236
help='Store and restore uncommitted changes in the'
5556
6240
def run(self, to_location=None, force=False, create_branch=False,
5557
revision=None, directory=u'.'):
6241
revision=None, directory=u'.', store=False):
5558
6242
from bzrlib import switch
5559
6243
tree_location = directory
5560
6244
revision = _get_one_revision('switch', revision)
5561
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]
5562
6248
if to_location is None:
5563
6249
if revision is None:
5564
raise errors.BzrCommandError('You must supply either a'
5565
' revision or a location')
6250
raise errors.BzrCommandError(gettext('You must supply either a'
6251
' revision or a location'))
5566
6252
to_location = tree_location
5568
branch = control_dir.open_branch()
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
5569
6256
had_explicit_nick = branch.get_config().has_explicit_nickname()
5570
6257
except errors.NotBranchError:
5572
6259
had_explicit_nick = False
5573
6260
if create_branch:
5574
6261
if branch is None:
5575
raise errors.BzrCommandError('cannot create branch without'
5577
to_location = directory_service.directories.dereference(
5579
if '/' not in to_location and '\\' not in to_location:
5580
# This path is meant to be relative to the existing branch
5581
this_url = self._get_branch_location(control_dir)
5582
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)
5583
6266
to_branch = branch.bzrdir.sprout(to_location,
5584
possible_transports=[branch.bzrdir.root_transport],
5585
source_branch=branch).open_branch()
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
5588
to_branch = Branch.open(to_location)
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
5589
6273
except errors.NotBranchError:
5590
this_url = self._get_branch_location(control_dir)
5591
to_branch = Branch.open(
5592
urlutils.join(this_url, '..', to_location))
6274
to_branch = open_sibling_branch(control_dir, to_location,
6275
possible_transports=possible_transports)
5593
6276
if revision is not None:
5594
6277
revision = revision.as_revision_id(to_branch)
5595
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)
5596
6280
if had_explicit_nick:
5597
6281
branch = control_dir.open_branch() #get the new branch!
5598
6282
branch.nick = to_branch.nick
5599
note('Switched to branch: %s',
6283
note(gettext('Switched to branch: %s'),
5600
6284
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5602
def _get_branch_location(self, control_dir):
5603
"""Return location of branch for this control dir."""
5605
this_branch = control_dir.open_branch()
5606
# This may be a heavy checkout, where we want the master branch
5607
master_location = this_branch.get_bound_location()
5608
if master_location is not None:
5609
return master_location
5610
# If not, use a local sibling
5611
return this_branch.base
5612
except errors.NotBranchError:
5613
format = control_dir.find_branch_format()
5614
if getattr(format, 'get_reference', None) is not None:
5615
return format.get_reference(control_dir)
5617
return control_dir.root_transport.base
5620
6288
class cmd_view(Command):
5711
6379
name = current_view
5714
raise errors.BzrCommandError(
5715
"Both --delete and a file list specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
5717
raise errors.BzrCommandError(
5718
"Both --delete and --switch specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
5720
6388
tree.views.set_view_info(None, {})
5721
self.outf.write("Deleted all views.\n")
6389
self.outf.write(gettext("Deleted all views.\n"))
5722
6390
elif name is None:
5723
raise errors.BzrCommandError("No current view to delete")
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
5725
6393
tree.views.delete_view(name)
5726
self.outf.write("Deleted '%s' view.\n" % name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5729
raise errors.BzrCommandError(
5730
"Both --switch and a file list specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
5732
raise errors.BzrCommandError(
5733
"Both --switch and --all specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
5734
6402
elif switch == 'off':
5735
6403
if current_view is None:
5736
raise errors.BzrCommandError("No current view to disable")
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
5737
6405
tree.views.set_view_info(None, view_dict)
5738
self.outf.write("Disabled '%s' view.\n" % (current_view))
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5740
6408
tree.views.set_view_info(switch, view_dict)
5741
6409
view_str = views.view_display_str(tree.views.lookup_view())
5742
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))
5745
self.outf.write('Views defined:\n')
6413
self.outf.write(gettext('Views defined:\n'))
5746
6414
for view in sorted(view_dict):
5747
6415
if view == current_view:
5751
6419
view_str = views.view_display_str(view_dict[view])
5752
6420
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5754
self.outf.write('No views defined.\n')
6422
self.outf.write(gettext('No views defined.\n'))
5755
6423
elif file_list:
5756
6424
if name is None:
5757
6425
# No name given and no current view set
5759
6427
elif name == 'off':
5760
raise errors.BzrCommandError(
5761
"Cannot change the 'off' pseudo view")
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
5762
6430
tree.views.set_view(name, sorted(file_list))
5763
6431
view_str = views.view_display_str(tree.views.lookup_view())
5764
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))
5766
6434
# list the files
5767
6435
if name is None:
5768
6436
# No name given and no current view set
5769
self.outf.write('No current view.\n')
6437
self.outf.write(gettext('No current view.\n'))
5771
6439
view_str = views.view_display_str(tree.views.lookup_view(name))
5772
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))
5775
6443
class cmd_hooks(Command):
5809
6477
takes_args = ["location?"]
6479
takes_options = ['directory',
6480
Option('force', help='Remove branch even if it is the active branch.')]
5811
6482
aliases = ["rmbranch"]
5813
def run(self, location=None):
5814
if location is None:
5816
branch = Branch.open_containing(location)[0]
5817
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)
5820
6498
class cmd_shelve(Command):
5821
6499
__doc__ = """Temporarily set aside some changes from the current tree.
6007
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)
6010
6720
def _register_lazy_builtins():
6011
6721
# register lazy builtins from other modules; called at startup and should
6012
6722
# be only called once.
6013
6723
for (name, aliases, module_name) in [
6014
6724
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6725
('cmd_config', [], 'bzrlib.config'),
6015
6726
('cmd_dpush', [], 'bzrlib.foreign'),
6016
6727
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6017
6728
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6018
6729
('cmd_conflicts', [], 'bzrlib.conflicts'),
6019
('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'),
6021
6735
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
