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
"Tags can only be placed on a single revision, "
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
1302
Option('strict',
1057
1303
help='Refuse to push if there are uncommitted changes in'
1058
1304
' the working tree, --no-strict disables the check.'),
1306
help="Don't populate the working tree, even for protocols"
1307
" that support it."),
1060
1309
takes_args = ['location?']
1061
1310
encoding_type = 'replace'
1063
def run(self, location=None, remember=False, overwrite=False,
1312
def run(self, location=None, remember=None, overwrite=False,
1064
1313
create_prefix=False, verbose=False, revision=None,
1065
1314
use_existing_dir=False, directory=None, stacked_on=None,
1066
stacked=False, strict=None):
1315
stacked=False, strict=None, no_tree=False):
1067
1316
from bzrlib.push import _show_push_branch
1069
1318
if directory is None:
1070
1319
directory = '.'
1071
1320
# Get the source branch
1072
1321
(tree, br_from,
1073
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1322
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1074
1323
# Get the tip's revision_id
1075
1324
revision = _get_one_revision('push', revision)
1076
1325
if revision is not None:
1097
1346
# error by the feedback given to them. RBC 20080227.
1098
1347
stacked_on = parent_url
1099
1348
if not stacked_on:
1100
raise errors.BzrCommandError(
1101
"Could not determine branch to refer to.")
1349
raise errors.BzrCommandError(gettext(
1350
"Could not determine branch to refer to."))
1103
1352
# Get the destination location
1104
1353
if location is None:
1105
1354
stored_loc = br_from.get_push_location()
1106
1355
if stored_loc is None:
1107
raise errors.BzrCommandError(
1108
"No push location known or specified.")
1356
parent_loc = br_from.get_parent()
1358
raise errors.BzrCommandError(gettext(
1359
"No push location known or specified. To push to the "
1360
"parent branch (at %s), use 'bzr push :parent'." %
1361
urlutils.unescape_for_display(parent_loc,
1362
self.outf.encoding)))
1364
raise errors.BzrCommandError(gettext(
1365
"No push location known or specified."))
1110
1367
display_url = urlutils.unescape_for_display(stored_loc,
1111
1368
self.outf.encoding)
1112
self.outf.write("Using saved push location: %s\n" % display_url)
1369
note(gettext("Using saved push location: %s") % display_url)
1113
1370
location = stored_loc
1115
1372
_show_push_branch(br_from, revision_id, location, self.outf,
1116
1373
verbose=verbose, overwrite=overwrite, remember=remember,
1117
1374
stacked_on=stacked_on, create_prefix=create_prefix,
1118
use_existing_dir=use_existing_dir)
1375
use_existing_dir=use_existing_dir, no_tree=no_tree)
1121
1378
class cmd_branch(Command):
1185
1450
revision_id = br_from.last_revision()
1186
1451
if to_location is None:
1187
to_location = urlutils.derive_to_location(from_location)
1452
to_location = getattr(br_from, "name", None)
1454
to_location = urlutils.derive_to_location(from_location)
1188
1455
to_transport = transport.get_transport(to_location)
1190
1457
to_transport.mkdir('.')
1191
1458
except errors.FileExists:
1192
if not use_existing_dir:
1193
raise errors.BzrCommandError('Target directory "%s" '
1194
'already exists.' % to_location)
1460
to_dir = controldir.ControlDir.open_from_transport(
1462
except errors.NotBranchError:
1463
if not use_existing_dir:
1464
raise errors.BzrCommandError(gettext('Target directory "%s" '
1465
'already exists.') % to_location)
1197
bzrdir.BzrDir.open_from_transport(to_transport)
1470
to_dir.open_branch()
1198
1471
except errors.NotBranchError:
1201
1474
raise errors.AlreadyBranchError(to_location)
1202
1475
except errors.NoSuchFile:
1203
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1476
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)
1482
# preserve whatever source format we have.
1483
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1484
possible_transports=[to_transport],
1485
accelerator_tree=accelerator_tree,
1486
hardlink=hardlink, stacked=stacked,
1487
force_new_repo=standalone,
1488
create_tree_if_local=not no_tree,
1489
source_branch=br_from)
1490
branch = to_dir.open_branch(
1491
possible_transports=[
1492
br_from.bzrdir.root_transport, to_transport])
1493
except errors.NoSuchRevision:
1494
to_transport.delete_tree('.')
1495
msg = gettext("The branch {0} has no revision {1}.").format(
1496
from_location, revision)
1497
raise errors.BzrCommandError(msg)
1500
to_repo = to_dir.open_repository()
1501
except errors.NoRepositoryPresent:
1502
to_repo = to_dir.create_repository()
1503
to_repo.fetch(br_from.repository, revision_id=revision_id)
1504
branch = br_from.sprout(to_dir, revision_id=revision_id)
1220
1505
_merge_tags_if_possible(br_from, branch)
1221
1506
# If the source branch is stacked, the new branch may
1222
1507
# be stacked whether we asked for that explicitly or not.
1223
1508
# We therefore need a try/except here and not just 'if stacked:'
1225
note('Created new stacked branch referring to %s.' %
1510
note(gettext('Created new stacked branch referring to %s.') %
1226
1511
branch.get_stacked_on_url())
1227
1512
except (errors.NotStacked, errors.UnstackableBranchFormat,
1228
1513
errors.UnstackableRepositoryFormat), e:
1229
note('Branched %d revision(s).' % branch.revno())
1514
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1231
1516
# Bind to the parent
1232
1517
parent_branch = Branch.open(from_location)
1233
1518
branch.bind(parent_branch)
1234
note('New branch bound to %s' % from_location)
1519
note(gettext('New branch bound to %s') % from_location)
1236
1521
# Switch to the new branch
1237
1522
wt, _ = WorkingTree.open_containing('.')
1238
1523
_mod_switch.switch(wt.bzrdir, branch)
1239
note('Switched to branch: %s',
1524
note(gettext('Switched to branch: %s'),
1240
1525
urlutils.unescape_for_display(branch.base, 'utf-8'))
1528
class cmd_branches(Command):
1529
__doc__ = """List the branches available at the current location.
1531
This command will print the names of all the branches at the current
1535
takes_args = ['location?']
1537
Option('recursive', short_name='R',
1538
help='Recursively scan for branches rather than '
1539
'just looking in the specified location.')]
1541
def run(self, location=".", recursive=False):
1543
t = transport.get_transport(location)
1544
if not t.listable():
1545
raise errors.BzrCommandError(
1546
"Can't scan this type of location.")
1547
for b in controldir.ControlDir.find_branches(t):
1548
self.outf.write("%s\n" % urlutils.unescape_for_display(
1549
urlutils.relative_url(t.base, b.base),
1550
self.outf.encoding).rstrip("/"))
1552
dir = controldir.ControlDir.open_containing(location)[0]
1554
active_branch = dir.open_branch(name="")
1555
except errors.NotBranchError:
1556
active_branch = None
1558
for name, branch in iter_sibling_branches(dir):
1561
active = (active_branch is not None and
1562
active_branch.base == branch.base)
1563
names[name] = active
1564
# Only mention the current branch explicitly if it's not
1565
# one of the colocated branches
1566
if not any(names.values()) and active_branch is not None:
1567
self.outf.write("* %s\n" % gettext("(default)"))
1568
for name in sorted(names.keys()):
1569
active = names[name]
1574
self.outf.write("%s %s\n" % (
1575
prefix, name.encode(self.outf.encoding)))
1243
1578
class cmd_checkout(Command):
1244
1579
__doc__ = """Create a new checkout of an existing branch.
1347
1680
class cmd_update(Command):
1348
__doc__ = """Update a tree to have the latest code committed to its branch.
1350
This will perform a merge into the working tree, and may generate
1351
conflicts. If you have any local changes, you will still
1352
need to commit them after the update for the update to be complete.
1354
If you want to discard your local changes, you can just do a
1355
'bzr revert' instead of 'bzr commit' after the update.
1357
If you want to restore a file that has been removed locally, use
1358
'bzr revert' instead of 'bzr update'.
1360
If the tree's branch is bound to a master branch, it will also update
1681
__doc__ = """Update a working tree to a new revision.
1683
This will perform a merge of the destination revision (the tip of the
1684
branch, or the specified revision) into the working tree, and then make
1685
that revision the basis revision for the working tree.
1687
You can use this to visit an older revision, or to update a working tree
1688
that is out of date from its branch.
1690
If there are any uncommitted changes in the tree, they will be carried
1691
across and remain as uncommitted changes after the update. To discard
1692
these changes, use 'bzr revert'. The uncommitted changes may conflict
1693
with the changes brought in by the change in basis revision.
1695
If the tree's branch is bound to a master branch, bzr will also update
1361
1696
the branch from the master.
1698
You cannot update just a single file or directory, because each Bazaar
1699
working tree has just a single basis revision. If you want to restore a
1700
file that has been removed locally, use 'bzr revert' instead of 'bzr
1701
update'. If you want to restore a file to its state in a previous
1702
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1703
out the old content of that file to a new location.
1705
The 'dir' argument, if given, must be the location of the root of a
1706
working tree to update. By default, the working tree that contains the
1707
current working directory is used.
1364
1710
_see_also = ['pull', 'working-trees', 'status-flags']
1365
1711
takes_args = ['dir?']
1366
takes_options = ['revision']
1712
takes_options = ['revision',
1714
help="Show base revision text in conflicts."),
1367
1716
aliases = ['up']
1369
def run(self, dir='.', revision=None):
1718
def run(self, dir=None, revision=None, show_base=None):
1370
1719
if revision is not None and len(revision) != 1:
1371
raise errors.BzrCommandError(
1372
"bzr update --revision takes exactly one revision")
1373
tree = WorkingTree.open_containing(dir)[0]
1720
raise errors.BzrCommandError(gettext(
1721
"bzr update --revision takes exactly one revision"))
1723
tree = WorkingTree.open_containing('.')[0]
1725
tree, relpath = WorkingTree.open_containing(dir)
1728
raise errors.BzrCommandError(gettext(
1729
"bzr update can only update a whole tree, "
1730
"not a file or subdirectory"))
1374
1731
branch = tree.branch
1375
1732
possible_transports = []
1376
1733
master = branch.get_master_branch(
1412
1769
change_reporter,
1413
1770
possible_transports=possible_transports,
1414
1771
revision=revision_id,
1773
show_base=show_base)
1416
1774
except errors.NoSuchRevision, e:
1417
raise errors.BzrCommandError(
1775
raise errors.BzrCommandError(gettext(
1418
1776
"branch has no revision %s\n"
1419
1777
"bzr update --revision only works"
1420
" for a revision in the branch history"
1778
" for a revision in the branch history")
1421
1779
% (e.revision))
1422
1780
revno = tree.branch.revision_id_to_dotted_revno(
1423
1781
_mod_revision.ensure_null(tree.last_revision()))
1424
note('Updated to revision %s of branch %s' %
1425
('.'.join(map(str, revno)), branch_location))
1782
note(gettext('Updated to revision {0} of branch {1}').format(
1783
'.'.join(map(str, revno)), branch_location))
1426
1784
parent_ids = tree.get_parent_ids()
1427
1785
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1428
note('Your local commits will now show as pending merges with '
1429
"'bzr status', and can be committed with 'bzr commit'.")
1786
note(gettext('Your local commits will now show as pending merges with '
1787
"'bzr status', and can be committed with 'bzr commit'."))
1430
1788
if conflicts != 0:
1494
1852
title='Deletion Strategy', value_switches=True, enum_switch=False,
1495
1853
safe='Backup changed files (default).',
1496
1854
keep='Delete from bzr but leave the working copy.',
1855
no_backup='Don\'t backup changed files.',
1497
1856
force='Delete all the specified files, even if they can not be '
1498
'recovered and even if they are non-empty directories.')]
1857
'recovered and even if they are non-empty directories. '
1858
'(deprecated, use no-backup)')]
1499
1859
aliases = ['rm', 'del']
1500
1860
encoding_type = 'replace'
1502
1862
def run(self, file_list, verbose=False, new=False,
1503
1863
file_deletion_strategy='safe'):
1864
if file_deletion_strategy == 'force':
1865
note(gettext("(The --force option is deprecated, rather use --no-backup "
1867
file_deletion_strategy = 'no-backup'
1504
1869
tree, file_list = WorkingTree.open_containing_paths(file_list)
1506
1871
if file_list is not None:
1708
2083
to_transport.ensure_base()
1709
2084
except errors.NoSuchFile:
1710
2085
if not create_prefix:
1711
raise errors.BzrCommandError("Parent directory of %s"
2086
raise errors.BzrCommandError(gettext("Parent directory of %s"
1712
2087
" does not exist."
1713
2088
"\nYou may supply --create-prefix to create all"
1714
" leading parent directories."
2089
" leading parent directories.")
1716
2091
to_transport.create_prefix()
1719
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2094
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1720
2095
except errors.NotBranchError:
1721
2096
# really a NotBzrDir error...
1722
create_branch = bzrdir.BzrDir.create_branch_convenience
2097
create_branch = controldir.ControlDir.create_branch_convenience
2099
force_new_tree = False
2101
force_new_tree = None
1723
2102
branch = create_branch(to_transport.base, format=format,
1724
possible_transports=[to_transport])
2103
possible_transports=[to_transport],
2104
force_new_tree=force_new_tree)
1725
2105
a_bzrdir = branch.bzrdir
1727
2107
from bzrlib.transport.local import LocalTransport
1803
2185
def run(self, location, format=None, no_trees=False):
1804
2186
if format is None:
1805
format = bzrdir.format_registry.make_bzrdir('default')
2187
format = controldir.format_registry.make_bzrdir('default')
1807
2189
if location is None:
1810
2192
to_transport = transport.get_transport(location)
1811
to_transport.ensure_base()
1813
newdir = format.initialize_on_transport(to_transport)
1814
repo = newdir.create_repository(shared=True)
1815
repo.set_make_working_trees(not no_trees)
2194
(repo, newdir, require_stacking, repository_policy) = (
2195
format.initialize_on_transport_ex(to_transport,
2196
create_prefix=True, make_working_trees=not no_trees,
2197
shared_repo=True, force_new_repo=True,
2198
use_existing_dir=True,
2199
repo_format_name=format.repository_format.get_format_string()))
1816
2200
if not is_quiet():
1817
2201
from bzrlib.info import show_bzrdir_info
1818
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2202
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1821
2205
class cmd_diff(Command):
2264
2666
Option('show-diff',
2265
2667
short_name='p',
2266
2668
help='Show changes made in each revision as a patch.'),
2267
Option('include-merges',
2669
Option('include-merged',
2268
2670
help='Show merged revisions like --levels 0 does.'),
2671
Option('include-merges', hidden=True,
2672
help='Historical alias for --include-merged.'),
2673
Option('omit-merges',
2674
help='Do not report commits with more than one parent.'),
2269
2675
Option('exclude-common-ancestry',
2270
2676
help='Display only the revisions that are not part'
2271
' of both ancestries (require -rX..Y)'
2677
' of both ancestries (require -rX..Y).'
2679
Option('signatures',
2680
help='Show digital signature validity.'),
2683
help='Show revisions whose properties match this '
2686
ListOption('match-message',
2687
help='Show revisions whose message matches this '
2690
ListOption('match-committer',
2691
help='Show revisions whose committer matches this '
2694
ListOption('match-author',
2695
help='Show revisions whose authors match this '
2698
ListOption('match-bugs',
2699
help='Show revisions whose bugs match this '
2274
2703
encoding_type = 'replace'
2295
2732
_get_info_for_log_files,
2297
2734
direction = (forward and 'forward') or 'reverse'
2735
if symbol_versioning.deprecated_passed(include_merges):
2736
ui.ui_factory.show_user_warning(
2737
'deprecated_command_option',
2738
deprecated_name='--include-merges',
2739
recommended_name='--include-merged',
2740
deprecated_in_version='2.5',
2741
command=self.invoked_as)
2742
if include_merged is None:
2743
include_merged = include_merges
2745
raise errors.BzrCommandError(gettext(
2746
'{0} and {1} are mutually exclusive').format(
2747
'--include-merges', '--include-merged'))
2748
if include_merged is None:
2749
include_merged = False
2298
2750
if (exclude_common_ancestry
2299
2751
and (revision is None or len(revision) != 2)):
2300
raise errors.BzrCommandError(
2301
'--exclude-common-ancestry requires -r with two revisions')
2752
raise errors.BzrCommandError(gettext(
2753
'--exclude-common-ancestry requires -r with two revisions'))
2303
2755
if levels is None:
2306
raise errors.BzrCommandError(
2307
'--levels and --include-merges are mutually exclusive')
2758
raise errors.BzrCommandError(gettext(
2759
'{0} and {1} are mutually exclusive').format(
2760
'--levels', '--include-merged'))
2309
2762
if change is not None:
2310
2763
if len(change) > 1:
2311
2764
raise errors.RangeInChangeOption()
2312
2765
if revision is not None:
2313
raise errors.BzrCommandError(
2314
'--revision and --change are mutually exclusive')
2766
raise errors.BzrCommandError(gettext(
2767
'{0} and {1} are mutually exclusive').format(
2768
'--revision', '--change'))
2316
2770
revision = change
2693
3176
self.outf.write("%s\n" % pattern)
2695
3178
if not name_pattern_list:
2696
raise errors.BzrCommandError("ignore requires at least one "
2697
"NAME_PATTERN or --default-rules.")
3179
raise errors.BzrCommandError(gettext("ignore requires at least one "
3180
"NAME_PATTERN or --default-rules."))
2698
3181
name_pattern_list = [globbing.normalize_pattern(p)
2699
3182
for p in name_pattern_list]
2700
3183
bad_patterns = ''
3184
bad_patterns_count = 0
2701
3185
for p in name_pattern_list:
2702
3186
if not globbing.Globster.is_pattern_valid(p):
3187
bad_patterns_count += 1
2703
3188
bad_patterns += ('\n %s' % p)
2704
3189
if bad_patterns:
2705
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3190
msg = (ngettext('Invalid ignore pattern found. %s',
3191
'Invalid ignore patterns found. %s',
3192
bad_patterns_count) % bad_patterns)
2706
3193
ui.ui_factory.show_error(msg)
2707
3194
raise errors.InvalidPattern('')
2708
3195
for name_pattern in name_pattern_list:
2709
3196
if (name_pattern[0] == '/' or
2710
3197
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
raise errors.BzrCommandError(
2712
"NAME_PATTERN should not be an absolute path")
3198
raise errors.BzrCommandError(gettext(
3199
"NAME_PATTERN should not be an absolute path"))
2713
3200
tree, relpath = WorkingTree.open_containing(directory)
2714
3201
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
3202
ignored = globbing.Globster(name_pattern_list)
2818
3306
Option('per-file-timestamps',
2819
3307
help='Set modification time of files to that of the last '
2820
3308
'revision in which it was changed.'),
3309
Option('uncommitted',
3310
help='Export the working tree contents rather than that of the '
2822
3313
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2823
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3314
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2824
3316
from bzrlib.export import export
2826
3318
if branch_or_subdir is None:
2827
tree = WorkingTree.open_containing(directory)[0]
3319
branch_or_subdir = directory
3321
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3323
if tree is not None:
3324
self.add_cleanup(tree.lock_read().unlock)
3328
raise errors.BzrCommandError(
3329
gettext("--uncommitted requires a working tree"))
2831
b, subdir = Branch.open_containing(branch_or_subdir)
2834
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3332
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2836
export(rev_tree, dest, format, root, subdir, filtered=filters,
3334
export(export_tree, dest, format, root, subdir, filtered=filters,
2837
3335
per_file_timestamps=per_file_timestamps)
2838
3336
except errors.NoSuchExportFormat, e:
2839
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3337
raise errors.BzrCommandError(
3338
gettext('Unsupported export format: %s') % e.format)
2842
3341
class cmd_cat(Command):
2880
3379
old_file_id = rev_tree.path2id(relpath)
3381
# TODO: Split out this code to something that generically finds the
3382
# best id for a path across one or more trees; it's like
3383
# find_ids_across_trees but restricted to find just one. -- mbp
2882
3385
if name_from_revision:
2883
3386
# Try in revision if requested
2884
3387
if old_file_id is None:
2885
raise errors.BzrCommandError(
2886
"%r is not present in revision %s" % (
3388
raise errors.BzrCommandError(gettext(
3389
"{0!r} is not present in revision {1}").format(
2887
3390
filename, rev_tree.get_revision_id()))
2889
content = rev_tree.get_file_text(old_file_id)
3392
actual_file_id = old_file_id
2891
3394
cur_file_id = tree.path2id(relpath)
2893
if cur_file_id is not None:
2894
# Then try with the actual file id
2896
content = rev_tree.get_file_text(cur_file_id)
2898
except errors.NoSuchId:
2899
# The actual file id didn't exist at that time
2901
if not found and old_file_id is not None:
2902
# Finally try with the old file id
2903
content = rev_tree.get_file_text(old_file_id)
2906
# Can't be found anywhere
2907
raise errors.BzrCommandError(
2908
"%r is not present in revision %s" % (
3395
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3396
actual_file_id = cur_file_id
3397
elif old_file_id is not None:
3398
actual_file_id = old_file_id
3400
raise errors.BzrCommandError(gettext(
3401
"{0!r} is not present in revision {1}").format(
2909
3402
filename, rev_tree.get_revision_id()))
2911
from bzrlib.filters import (
2912
ContentFilterContext,
2913
filtered_output_bytes,
2915
filters = rev_tree._content_filter_stack(relpath)
2916
chunks = content.splitlines(True)
2917
content = filtered_output_bytes(chunks, filters,
2918
ContentFilterContext(relpath, rev_tree))
2920
self.outf.writelines(content)
3404
from bzrlib.filter_tree import ContentFilterTree
3405
filter_tree = ContentFilterTree(rev_tree,
3406
rev_tree._content_filter_stack)
3407
content = filter_tree.get_file_text(actual_file_id)
2923
self.outf.write(content)
3409
content = rev_tree.get_file_text(actual_file_id)
3411
self.outf.write(content)
2926
3414
class cmd_local_time_offset(Command):
2987
3475
to trigger updates to external systems like bug trackers. The --fixes
2988
3476
option can be used to record the association between a revision and
2989
3477
one or more bugs. See ``bzr help bugs`` for details.
2991
A selective commit may fail in some cases where the committed
2992
tree would be invalid. Consider::
2997
bzr commit foo -m "committing foo"
2998
bzr mv foo/bar foo/baz
3001
bzr commit foo/bar -m "committing bar but not baz"
3003
In the example above, the last commit will fail by design. This gives
3004
the user the opportunity to decide whether they want to commit the
3005
rename at the same time, separately first, or not at all. (As a general
3006
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3008
# TODO: Run hooks on tree to-be-committed, and after commit.
3010
# TODO: Strict commit that fails if there are deleted files.
3011
# (what does "deleted files" mean ??)
3013
# TODO: Give better message for -s, --summary, used by tla people
3015
# XXX: verbose currently does nothing
3017
3480
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3018
3481
takes_args = ['selected*']
3050
3513
Option('show-diff', short_name='p',
3051
3514
help='When no message is supplied, show the diff along'
3052
3515
' with the status summary in the message editor.'),
3517
help='When committing to a foreign version control '
3518
'system do not push data that can not be natively '
3054
3521
aliases = ['ci', 'checkin']
3056
3523
def _iter_bug_fix_urls(self, fixes, branch):
3524
default_bugtracker = None
3057
3525
# Configure the properties for bug fixing attributes.
3058
3526
for fixed_bug in fixes:
3059
3527
tokens = fixed_bug.split(':')
3060
if len(tokens) != 2:
3061
raise errors.BzrCommandError(
3528
if len(tokens) == 1:
3529
if default_bugtracker is None:
3530
branch_config = branch.get_config_stack()
3531
default_bugtracker = branch_config.get(
3533
if default_bugtracker is None:
3534
raise errors.BzrCommandError(gettext(
3535
"No tracker specified for bug %s. Use the form "
3536
"'tracker:id' or specify a default bug tracker "
3537
"using the `bugtracker` option.\nSee "
3538
"\"bzr help bugs\" for more information on this "
3539
"feature. Commit refused.") % fixed_bug)
3540
tag = default_bugtracker
3542
elif len(tokens) != 2:
3543
raise errors.BzrCommandError(gettext(
3062
3544
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3063
3545
"See \"bzr help bugs\" for more information on this "
3064
"feature.\nCommit refused." % fixed_bug)
3065
tag, bug_id = tokens
3546
"feature.\nCommit refused.") % fixed_bug)
3548
tag, bug_id = tokens
3067
3550
yield bugtracker.get_bug_url(tag, branch, bug_id)
3068
3551
except errors.UnknownBugTrackerAbbreviation:
3069
raise errors.BzrCommandError(
3070
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3552
raise errors.BzrCommandError(gettext(
3553
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3071
3554
except errors.MalformedBugIdentifier, e:
3072
raise errors.BzrCommandError(
3073
"%s\nCommit refused." % (str(e),))
3555
raise errors.BzrCommandError(gettext(
3556
"%s\nCommit refused.") % (str(e),))
3075
3558
def run(self, message=None, file=None, verbose=False, selected_list=None,
3076
3559
unchanged=False, strict=False, local=False, fixes=None,
3077
author=None, show_diff=False, exclude=None, commit_time=None):
3560
author=None, show_diff=False, exclude=None, commit_time=None,
3078
3562
from bzrlib.errors import (
3079
3563
PointlessCommit,
3080
3564
ConflictsInTree,
3161
3640
# make_commit_message_template_encoded returns user encoding.
3162
3641
# We probably want to be using edit_commit_message instead to
3164
start_message = generate_commit_message_template(commit_obj)
3165
my_message = edit_commit_message_encoded(text,
3166
start_message=start_message)
3167
if my_message is None:
3168
raise errors.BzrCommandError("please specify a commit"
3169
" message with either --message or --file")
3170
if my_message == "":
3171
raise errors.BzrCommandError("empty commit message specified")
3643
my_message = set_commit_message(commit_obj)
3644
if my_message is None:
3645
start_message = generate_commit_message_template(commit_obj)
3646
my_message = edit_commit_message_encoded(text,
3647
start_message=start_message)
3648
if my_message is None:
3649
raise errors.BzrCommandError(gettext("please specify a commit"
3650
" message with either --message or --file"))
3651
if my_message == "":
3652
raise errors.BzrCommandError(gettext("Empty commit message specified."
3653
" Please specify a commit message with either"
3654
" --message or --file or leave a blank message"
3655
" with --message \"\"."))
3172
3656
return my_message
3174
3658
# The API permits a commit with a filter of [] to mean 'select nothing'
3182
3666
reporter=None, verbose=verbose, revprops=properties,
3183
3667
authors=author, timestamp=commit_stamp,
3184
3668
timezone=offset,
3185
exclude=tree.safe_relpath_files(exclude))
3669
exclude=tree.safe_relpath_files(exclude),
3186
3671
except PointlessCommit:
3187
raise errors.BzrCommandError("No changes to commit."
3188
" Use --unchanged to commit anyhow.")
3672
raise errors.BzrCommandError(gettext("No changes to commit."
3673
" Please 'bzr add' the files you want to commit, or use"
3674
" --unchanged to force an empty commit."))
3189
3675
except ConflictsInTree:
3190
raise errors.BzrCommandError('Conflicts detected in working '
3676
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3191
3677
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3193
3679
except StrictCommitFailed:
3194
raise errors.BzrCommandError("Commit refused because there are"
3195
" unknown files in the working tree.")
3680
raise errors.BzrCommandError(gettext("Commit refused because there are"
3681
" unknown files in the working tree."))
3196
3682
except errors.BoundBranchOutOfDate, e:
3197
e.extra_help = ("\n"
3683
e.extra_help = (gettext("\n"
3198
3684
'To commit to master branch, run update and then commit.\n'
3199
3685
'You can also pass --local to commit to continue working '
3274
3760
class cmd_upgrade(Command):
3275
__doc__ = """Upgrade branch storage to current format.
3277
The check command or bzr developers may sometimes advise you to run
3278
this command. When the default format has changed you may also be warned
3279
during other operations to upgrade.
3761
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3763
When the default format has changed after a major new release of
3764
Bazaar, you may be informed during certain operations that you
3765
should upgrade. Upgrading to a newer format may improve performance
3766
or make new features available. It may however limit interoperability
3767
with older repositories or with older versions of Bazaar.
3769
If you wish to upgrade to a particular format rather than the
3770
current default, that can be specified using the --format option.
3771
As a consequence, you can use the upgrade command this way to
3772
"downgrade" to an earlier format, though some conversions are
3773
a one way process (e.g. changing from the 1.x default to the
3774
2.x default) so downgrading is not always possible.
3776
A backup.bzr.~#~ directory is created at the start of the conversion
3777
process (where # is a number). By default, this is left there on
3778
completion. If the conversion fails, delete the new .bzr directory
3779
and rename this one back in its place. Use the --clean option to ask
3780
for the backup.bzr directory to be removed on successful conversion.
3781
Alternatively, you can delete it by hand if everything looks good
3784
If the location given is a shared repository, dependent branches
3785
are also converted provided the repository converts successfully.
3786
If the conversion of a branch fails, remaining branches are still
3789
For more information on upgrades, see the Bazaar Upgrade Guide,
3790
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3282
_see_also = ['check']
3793
_see_also = ['check', 'reconcile', 'formats']
3283
3794
takes_args = ['url?']
3284
3795
takes_options = [
3285
RegistryOption('format',
3286
help='Upgrade to a specific format. See "bzr help'
3287
' formats" for details.',
3288
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3289
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3290
value_switches=True, title='Branch format'),
3796
RegistryOption('format',
3797
help='Upgrade to a specific format. See "bzr help'
3798
' formats" for details.',
3799
lazy_registry=('bzrlib.controldir', 'format_registry'),
3800
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3801
value_switches=True, title='Branch format'),
3803
help='Remove the backup.bzr directory if successful.'),
3805
help="Show what would be done, but don't actually do anything."),
3293
def run(self, url='.', format=None):
3808
def run(self, url='.', format=None, clean=False, dry_run=False):
3294
3809
from bzrlib.upgrade import upgrade
3295
upgrade(url, format)
3810
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3812
if len(exceptions) == 1:
3813
# Compatibility with historical behavior
3298
3819
class cmd_whoami(Command):
3691
4249
The source of the merge can be specified either in the form of a branch,
3692
4250
or in the form of a path to a file containing a merge directive generated
3693
4251
with bzr send. If neither is specified, the default is the upstream branch
3694
or the branch most recently merged using --remember.
3696
When merging a branch, by default the tip will be merged. To pick a different
3697
revision, pass --revision. If you specify two values, the first will be used as
3698
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3699
available revisions, like this is commonly referred to as "cherrypicking".
3701
Revision numbers are always relative to the branch being merged.
3703
By default, bzr will try to merge in all new work from the other
3704
branch, automatically determining an appropriate base. If this
3705
fails, you may need to give an explicit base.
4252
or the branch most recently merged using --remember. The source of the
4253
merge may also be specified in the form of a path to a file in another
4254
branch: in this case, only the modifications to that file are merged into
4255
the current working tree.
4257
When merging from a branch, by default bzr will try to merge in all new
4258
work from the other branch, automatically determining an appropriate base
4259
revision. If this fails, you may need to give an explicit base.
4261
To pick a different ending revision, pass "--revision OTHER". bzr will
4262
try to merge in all new work up to and including revision OTHER.
4264
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4265
through OTHER, excluding BASE but including OTHER, will be merged. If this
4266
causes some revisions to be skipped, i.e. if the destination branch does
4267
not already contain revision BASE, such a merge is commonly referred to as
4268
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4269
cherrypicks. The changes look like a normal commit, and the history of the
4270
changes from the other branch is not stored in the commit.
4272
Revision numbers are always relative to the source branch.
3707
4274
Merge will do its best to combine the changes in two branches, but there
3708
4275
are some kinds of problems only a human can fix. When it encounters those,
3709
4276
it will mark a conflict. A conflict means that you need to fix something,
3710
before you should commit.
4277
before you can commit.
3712
4279
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3714
If there is no default branch set, the first merge will set it. After
3715
that, you can omit the branch to use the default. To change the
3716
default, use --remember. The value will only be saved if the remote
3717
location can be accessed.
4281
If there is no default branch set, the first merge will set it (use
4282
--no-remember to avoid setting it). After that, you can omit the branch
4283
to use the default. To change the default, use --remember. The value will
4284
only be saved if the remote location can be accessed.
3719
4286
The results of the merge are placed into the destination working
3720
4287
directory, where they can be reviewed (with bzr diff), tested, and then
3721
4288
committed to record the result of the merge.
3723
4290
merge refuses to run if there are any uncommitted changes, unless
3724
--force is given. The --force option can also be used to create a
4291
--force is given. If --force is given, then the changes from the source
4292
will be merged with the current working tree, including any uncommitted
4293
changes in the tree. The --force option can also be used to create a
3725
4294
merge revision which has more than two parents.
3727
4296
If one would like to merge changes from the working tree of the other
3851
4424
self.sanity_check_merger(merger)
3852
4425
if (merger.base_rev_id == merger.other_rev_id and
3853
4426
merger.other_rev_id is not None):
3854
note('Nothing to do.')
4427
# check if location is a nonexistent file (and not a branch) to
4428
# disambiguate the 'Nothing to do'
4429
if merger.interesting_files:
4430
if not merger.other_tree.has_filename(
4431
merger.interesting_files[0]):
4432
note(gettext("merger: ") + str(merger))
4433
raise errors.PathsDoNotExist([location])
4434
note(gettext('Nothing to do.'))
4436
if pull and not preview:
3857
4437
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
4438
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3859
4439
if (merger.base_rev_id == tree.last_revision()):
3860
4440
result = tree.pull(merger.other_branch, False,
3861
4441
merger.other_rev_id)
3862
4442
result.report(self.outf)
3864
4444
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
4445
raise errors.BzrCommandError(gettext(
3866
4446
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
4447
" (perhaps you would prefer 'bzr pull')"))
3869
4449
return self._do_preview(merger)
3870
4450
elif interactive:
3968
4548
if other_revision_id is None:
3969
4549
other_revision_id = _mod_revision.ensure_null(
3970
4550
other_branch.last_revision())
3971
# Remember where we merge from
3972
if ((remember or tree.branch.get_submit_branch() is None) and
3973
user_location is not None):
4551
# Remember where we merge from. We need to remember if:
4552
# - user specify a location (and we don't merge from the parent
4554
# - user ask to remember or there is no previous location set to merge
4555
# from and user didn't ask to *not* remember
4556
if (user_location is not None
4558
or (remember is None
4559
and tree.branch.get_submit_branch() is None)))):
3974
4560
tree.branch.set_submit_branch(other_branch.base)
3975
_merge_tags_if_possible(other_branch, tree.branch)
4561
# Merge tags (but don't set them in the master branch yet, the user
4562
# might revert this merge). Commit will propagate them.
4563
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3976
4564
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3977
4565
other_revision_id, base_revision_id, other_branch, base_branch)
3978
4566
if other_path != '':
4319
4911
theirs_only=False,
4320
4912
log_format=None, long=False, short=False, line=False,
4321
4913
show_ids=False, verbose=False, this=False, other=False,
4322
include_merges=False, revision=None, my_revision=None,
4914
include_merged=None, revision=None, my_revision=None,
4916
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4324
4917
from bzrlib.missing import find_unmerged, iter_log_revisions
4325
4918
def message(s):
4326
4919
if not is_quiet():
4327
4920
self.outf.write(s)
4922
if symbol_versioning.deprecated_passed(include_merges):
4923
ui.ui_factory.show_user_warning(
4924
'deprecated_command_option',
4925
deprecated_name='--include-merges',
4926
recommended_name='--include-merged',
4927
deprecated_in_version='2.5',
4928
command=self.invoked_as)
4929
if include_merged is None:
4930
include_merged = include_merges
4932
raise errors.BzrCommandError(gettext(
4933
'{0} and {1} are mutually exclusive').format(
4934
'--include-merges', '--include-merged'))
4935
if include_merged is None:
4936
include_merged = False
4330
4938
mine_only = this
4570
5168
self.add_cleanup(branch.lock_read().unlock)
4571
5169
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4572
5170
self.add_cleanup(tree.lock_read().unlock)
5171
if wt is not None and revision is None:
4574
5172
file_id = wt.path2id(relpath)
4576
5174
file_id = tree.path2id(relpath)
4577
5175
if file_id is None:
4578
5176
raise errors.NotVersionedError(filename)
4579
file_version = tree.inventory[file_id].revision
4580
5177
if wt is not None and revision is None:
4581
5178
# If there is a tree and we're not annotating historical
4582
5179
# versions, annotate the working tree's content.
4583
5180
annotate_file_tree(wt, file_id, self.outf, long, all,
4584
5181
show_ids=show_ids)
4586
annotate_file(branch, file_version, file_id, long, all, self.outf,
5183
annotate_file_tree(tree, file_id, self.outf, long, all,
5184
show_ids=show_ids, branch=branch)
4590
5187
class cmd_re_sign(Command):
4675
5272
location = b.get_old_bound_location()
4676
5273
except errors.UpgradeRequired:
4677
raise errors.BzrCommandError('No location supplied. '
4678
'This format does not remember old locations.')
5274
raise errors.BzrCommandError(gettext('No location supplied. '
5275
'This format does not remember old locations.'))
4680
5277
if location is None:
4681
5278
if b.get_bound_location() is not None:
4682
raise errors.BzrCommandError('Branch is already bound')
5279
raise errors.BzrCommandError(
5280
gettext('Branch is already bound'))
4684
raise errors.BzrCommandError('No location supplied '
4685
'and no previous location known')
5282
raise errors.BzrCommandError(
5283
gettext('No location supplied'
5284
' and no previous location known'))
4686
5285
b_other = Branch.open(location)
4688
5287
b.bind(b_other)
4689
5288
except errors.DivergedBranches:
4690
raise errors.BzrCommandError('These branches have diverged.'
4691
' Try merging, and then bind again.')
5289
raise errors.BzrCommandError(gettext('These branches have diverged.'
5290
' Try merging, and then bind again.'))
4692
5291
if b.get_config().has_explicit_nickname():
4693
5292
b.nick = b_other.nick
4798
5400
end_revision=last_revno)
4801
self.outf.write('Dry-run, pretending to remove'
4802
' the above revisions.\n')
5403
self.outf.write(gettext('Dry-run, pretending to remove'
5404
' the above revisions.\n'))
4804
self.outf.write('The above revision(s) will be removed.\n')
5406
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4807
5409
if not ui.ui_factory.confirm_action(
4808
'Uncommit these revisions',
5410
gettext(u'Uncommit these revisions'),
4809
5411
'bzrlib.builtins.uncommit',
4811
self.outf.write('Canceled\n')
5413
self.outf.write(gettext('Canceled\n'))
4814
5416
mutter('Uncommitting from {%s} to {%s}',
4815
5417
last_rev_id, rev_id)
4816
5418
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4817
revno=revno, local=local)
4818
self.outf.write('You can restore the old tip by running:\n'
4819
' bzr pull . -r revid:%s\n' % last_rev_id)
5419
revno=revno, local=local, keep_tags=keep_tags)
5420
self.outf.write(gettext('You can restore the old tip by running:\n'
5421
' bzr pull . -r revid:%s\n') % last_rev_id)
4822
5424
class cmd_break_lock(Command):
4906
5509
'option leads to global uncontrolled write access to your '
5512
Option('client-timeout', type=float,
5513
help='Override the default idle client timeout (5min).'),
4911
def get_host_and_port(self, port):
4912
"""Return the host and port to run the smart server on.
4914
If 'port' is None, None will be returned for the host and port.
4916
If 'port' has a colon in it, the string before the colon will be
4917
interpreted as the host.
4919
:param port: A string of the port to run the server on.
4920
:return: A tuple of (host, port), where 'host' is a host name or IP,
4921
and port is an integer TCP/IP port.
4924
if port is not None:
4926
host, port = port.split(':')
4930
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5516
def run(self, listen=None, port=None, inet=False, directory=None,
5517
allow_writes=False, protocol=None, client_timeout=None):
4932
5518
from bzrlib import transport
4933
5519
if directory is None:
4934
5520
directory = os.getcwd()
4935
5521
if protocol is None:
4936
5522
protocol = transport.transport_server_registry.get()
4937
host, port = self.get_host_and_port(port)
4938
url = urlutils.local_path_to_url(directory)
5523
url = transport.location_to_url(directory)
4939
5524
if not allow_writes:
4940
5525
url = 'readonly+' + url
4941
t = transport.get_transport(url)
4942
protocol(t, host, port, inet)
5526
t = transport.get_transport_from_url(url)
5527
protocol(t, listen, port, inet, client_timeout)
4945
5530
class cmd_join(Command):
5075
5660
if submit_branch is None:
5076
5661
submit_branch = branch.get_parent()
5077
5662
if submit_branch is None:
5078
raise errors.BzrCommandError('No submit branch specified or known')
5663
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5080
5665
stored_public_branch = branch.get_public_branch()
5081
5666
if public_branch is None:
5082
5667
public_branch = stored_public_branch
5083
5668
elif stored_public_branch is None:
5669
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5084
5670
branch.set_public_branch(public_branch)
5085
5671
if not include_bundle and public_branch is None:
5086
raise errors.BzrCommandError('No public branch specified or'
5672
raise errors.BzrCommandError(gettext('No public branch specified or'
5088
5674
base_revision_id = None
5089
5675
if revision is not None:
5090
5676
if len(revision) > 2:
5091
raise errors.BzrCommandError('bzr merge-directive takes '
5092
'at most two one revision identifiers')
5677
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5678
'at most two one revision identifiers'))
5093
5679
revision_id = revision[-1].as_revision_id(branch)
5094
5680
if len(revision) == 2:
5095
5681
base_revision_id = revision[0].as_revision_id(branch)
5351
5943
self.add_cleanup(branch.lock_write().unlock)
5353
5945
if tag_name is None:
5354
raise errors.BzrCommandError("No tag specified to delete.")
5946
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5355
5947
branch.tags.delete_tag(tag_name)
5356
self.outf.write('Deleted tag %s.\n' % tag_name)
5948
note(gettext('Deleted tag %s.') % tag_name)
5359
5951
if len(revision) != 1:
5360
raise errors.BzrCommandError(
5952
raise errors.BzrCommandError(gettext(
5361
5953
"Tags can only be placed on a single revision, "
5363
5955
revision_id = revision[0].as_revision_id(branch)
5365
5957
revision_id = branch.last_revision()
5366
5958
if tag_name is None:
5367
5959
tag_name = branch.automatic_tag_name(revision_id)
5368
5960
if tag_name is None:
5369
raise errors.BzrCommandError(
5370
"Please specify a tag name.")
5371
if (not force) and branch.tags.has_tag(tag_name):
5961
raise errors.BzrCommandError(gettext(
5962
"Please specify a tag name."))
5964
existing_target = branch.tags.lookup_tag(tag_name)
5965
except errors.NoSuchTag:
5966
existing_target = None
5967
if not force and existing_target not in (None, revision_id):
5372
5968
raise errors.TagAlreadyExists(tag_name)
5373
branch.tags.set_tag(tag_name, revision_id)
5374
self.outf.write('Created tag %s.\n' % tag_name)
5969
if existing_target == revision_id:
5970
note(gettext('Tag %s already exists for that revision.') % tag_name)
5972
branch.tags.set_tag(tag_name, revision_id)
5973
if existing_target is None:
5974
note(gettext('Created tag %s.') % tag_name)
5976
note(gettext('Updated tag %s.') % tag_name)
5377
5979
class cmd_tags(Command):
5409
6006
self.add_cleanup(branch.lock_read().unlock)
5411
graph = branch.repository.get_graph()
5412
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5413
revid1, revid2 = rev1.rev_id, rev2.rev_id
5414
# only show revisions between revid1 and revid2 (inclusive)
5415
tags = [(tag, revid) for tag, revid in tags if
5416
graph.is_between(revid, revid1, revid2)]
5419
elif sort == 'time':
5421
for tag, revid in tags:
5423
revobj = branch.repository.get_revision(revid)
5424
except errors.NoSuchRevision:
5425
timestamp = sys.maxint # place them at the end
5427
timestamp = revobj.timestamp
5428
timestamps[revid] = timestamp
5429
tags.sort(key=lambda x: timestamps[x[1]])
6008
# Restrict to the specified range
6009
tags = self._tags_for_range(branch, revision)
6011
sort = tag_sort_methods.get()
5430
6013
if not show_ids:
5431
6014
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5432
6015
for index, (tag, revid) in enumerate(tags):
5443
6028
for tag, revspec in tags:
5444
6029
self.outf.write('%-20s %s\n' % (tag, revspec))
6031
def _tags_for_range(self, branch, revision):
6033
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6034
revid1, revid2 = rev1.rev_id, rev2.rev_id
6035
# _get_revision_range will always set revid2 if it's not specified.
6036
# If revid1 is None, it means we want to start from the branch
6037
# origin which is always a valid ancestor. If revid1 == revid2, the
6038
# ancestry check is useless.
6039
if revid1 and revid1 != revid2:
6040
# FIXME: We really want to use the same graph than
6041
# branch.iter_merge_sorted_revisions below, but this is not
6042
# easily available -- vila 2011-09-23
6043
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6044
# We don't want to output anything in this case...
6046
# only show revisions between revid1 and revid2 (inclusive)
6047
tagged_revids = branch.tags.get_reverse_tag_dict()
6049
for r in branch.iter_merge_sorted_revisions(
6050
start_revision_id=revid2, stop_revision_id=revid1,
6051
stop_rule='include'):
6052
revid_tags = tagged_revids.get(r[0], None)
6054
found.extend([(tag, r[0]) for tag in revid_tags])
5447
6058
class cmd_reconfigure(Command):
5448
6059
__doc__ = """Reconfigure the type of a bzr directory.
5462
6073
takes_args = ['location?']
5463
6074
takes_options = [
5464
6075
RegistryOption.from_kwargs(
5466
title='Target type',
5467
help='The type to reconfigure the directory to.',
6078
help='The relation between branch and tree.',
5468
6079
value_switches=True, enum_switch=False,
5469
6080
branch='Reconfigure to be an unbound branch with no working tree.',
5470
6081
tree='Reconfigure to be an unbound branch with a working tree.',
5471
6082
checkout='Reconfigure to be a bound branch with a working tree.',
5472
6083
lightweight_checkout='Reconfigure to be a lightweight'
5473
6084
' checkout (with no local history).',
6086
RegistryOption.from_kwargs(
6088
title='Repository type',
6089
help='Location fo the repository.',
6090
value_switches=True, enum_switch=False,
5474
6091
standalone='Reconfigure to be a standalone branch '
5475
6092
'(i.e. stop using shared repository).',
5476
6093
use_shared='Reconfigure to use a shared repository.',
6095
RegistryOption.from_kwargs(
6097
title='Trees in Repository',
6098
help='Whether new branches in the repository have trees.',
6099
value_switches=True, enum_switch=False,
5477
6100
with_trees='Reconfigure repository to create '
5478
6101
'working trees on branches by default.',
5479
6102
with_no_trees='Reconfigure repository to not create '
5506
6129
# At the moment you can use --stacked-on and a different
5507
6130
# reconfiguration shape at the same time; there seems no good reason
5509
if target_type is None:
6132
if (tree_type is None and
6133
repository_type is None and
6134
repository_trees is None):
5510
6135
if stacked_on or unstacked:
5513
raise errors.BzrCommandError('No target configuration '
5515
elif target_type == 'branch':
6138
raise errors.BzrCommandError(gettext('No target configuration '
6140
reconfiguration = None
6141
if tree_type == 'branch':
5516
6142
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5517
elif target_type == 'tree':
6143
elif tree_type == 'tree':
5518
6144
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5519
elif target_type == 'checkout':
6145
elif tree_type == 'checkout':
5520
6146
reconfiguration = reconfigure.Reconfigure.to_checkout(
5521
6147
directory, bind_to)
5522
elif target_type == 'lightweight-checkout':
6148
elif tree_type == 'lightweight-checkout':
5523
6149
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5524
6150
directory, bind_to)
5525
elif target_type == 'use-shared':
6152
reconfiguration.apply(force)
6153
reconfiguration = None
6154
if repository_type == 'use-shared':
5526
6155
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5527
elif target_type == 'standalone':
6156
elif repository_type == 'standalone':
5528
6157
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5529
elif target_type == 'with-trees':
6159
reconfiguration.apply(force)
6160
reconfiguration = None
6161
if repository_trees == 'with-trees':
5530
6162
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5531
6163
directory, True)
5532
elif target_type == 'with-no-trees':
6164
elif repository_trees == 'with-no-trees':
5533
6165
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5534
6166
directory, False)
5535
reconfiguration.apply(force)
6168
reconfiguration.apply(force)
6169
reconfiguration = None
5538
6172
class cmd_switch(Command):
5573
6207
from bzrlib import switch
5574
6208
tree_location = directory
5575
6209
revision = _get_one_revision('switch', revision)
5576
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6210
possible_transports = []
6211
control_dir = controldir.ControlDir.open_containing(tree_location,
6212
possible_transports=possible_transports)[0]
5577
6213
if to_location is None:
5578
6214
if revision is None:
5579
raise errors.BzrCommandError('You must supply either a'
5580
' revision or a location')
6215
raise errors.BzrCommandError(gettext('You must supply either a'
6216
' revision or a location'))
5581
6217
to_location = tree_location
5583
branch = control_dir.open_branch()
6219
branch = control_dir.open_branch(
6220
possible_transports=possible_transports)
5584
6221
had_explicit_nick = branch.get_config().has_explicit_nickname()
5585
6222
except errors.NotBranchError:
5587
6224
had_explicit_nick = False
5588
6225
if create_branch:
5589
6226
if branch is None:
5590
raise errors.BzrCommandError('cannot create branch without'
5592
to_location = directory_service.directories.dereference(
5594
if '/' not in to_location and '\\' not in to_location:
5595
# This path is meant to be relative to the existing branch
5596
this_url = self._get_branch_location(control_dir)
5597
to_location = urlutils.join(this_url, '..', to_location)
6227
raise errors.BzrCommandError(
6228
gettext('cannot create branch without source branch'))
6229
to_location = lookup_new_sibling_branch(control_dir, to_location,
6230
possible_transports=possible_transports)
5598
6231
to_branch = branch.bzrdir.sprout(to_location,
5599
possible_transports=[branch.bzrdir.root_transport],
5600
source_branch=branch).open_branch()
6232
possible_transports=possible_transports,
6233
source_branch=branch).open_branch()
5603
to_branch = Branch.open(to_location)
6236
to_branch = Branch.open(to_location,
6237
possible_transports=possible_transports)
5604
6238
except errors.NotBranchError:
5605
this_url = self._get_branch_location(control_dir)
5606
to_branch = Branch.open(
5607
urlutils.join(this_url, '..', to_location))
6239
to_branch = open_sibling_branch(control_dir, to_location,
6240
possible_transports=possible_transports)
5608
6241
if revision is not None:
5609
6242
revision = revision.as_revision_id(to_branch)
5610
6243
switch.switch(control_dir, to_branch, force, revision_id=revision)
5611
6244
if had_explicit_nick:
5612
6245
branch = control_dir.open_branch() #get the new branch!
5613
6246
branch.nick = to_branch.nick
5614
note('Switched to branch: %s',
6247
note(gettext('Switched to branch: %s'),
5615
6248
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5617
def _get_branch_location(self, control_dir):
5618
"""Return location of branch for this control dir."""
5620
this_branch = control_dir.open_branch()
5621
# This may be a heavy checkout, where we want the master branch
5622
master_location = this_branch.get_bound_location()
5623
if master_location is not None:
5624
return master_location
5625
# If not, use a local sibling
5626
return this_branch.base
5627
except errors.NotBranchError:
5628
format = control_dir.find_branch_format()
5629
if getattr(format, 'get_reference', None) is not None:
5630
return format.get_reference(control_dir)
5632
return control_dir.root_transport.base
5635
6252
class cmd_view(Command):
5726
6343
name = current_view
5729
raise errors.BzrCommandError(
5730
"Both --delete and a file list specified")
6346
raise errors.BzrCommandError(gettext(
6347
"Both --delete and a file list specified"))
5732
raise errors.BzrCommandError(
5733
"Both --delete and --switch specified")
6349
raise errors.BzrCommandError(gettext(
6350
"Both --delete and --switch specified"))
5735
6352
tree.views.set_view_info(None, {})
5736
self.outf.write("Deleted all views.\n")
6353
self.outf.write(gettext("Deleted all views.\n"))
5737
6354
elif name is None:
5738
raise errors.BzrCommandError("No current view to delete")
6355
raise errors.BzrCommandError(gettext("No current view to delete"))
5740
6357
tree.views.delete_view(name)
5741
self.outf.write("Deleted '%s' view.\n" % name)
6358
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5744
raise errors.BzrCommandError(
5745
"Both --switch and a file list specified")
6361
raise errors.BzrCommandError(gettext(
6362
"Both --switch and a file list specified"))
5747
raise errors.BzrCommandError(
5748
"Both --switch and --all specified")
6364
raise errors.BzrCommandError(gettext(
6365
"Both --switch and --all specified"))
5749
6366
elif switch == 'off':
5750
6367
if current_view is None:
5751
raise errors.BzrCommandError("No current view to disable")
6368
raise errors.BzrCommandError(gettext("No current view to disable"))
5752
6369
tree.views.set_view_info(None, view_dict)
5753
self.outf.write("Disabled '%s' view.\n" % (current_view))
6370
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5755
6372
tree.views.set_view_info(switch, view_dict)
5756
6373
view_str = views.view_display_str(tree.views.lookup_view())
5757
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6374
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5760
self.outf.write('Views defined:\n')
6377
self.outf.write(gettext('Views defined:\n'))
5761
6378
for view in sorted(view_dict):
5762
6379
if view == current_view:
5766
6383
view_str = views.view_display_str(view_dict[view])
5767
6384
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5769
self.outf.write('No views defined.\n')
6386
self.outf.write(gettext('No views defined.\n'))
5770
6387
elif file_list:
5771
6388
if name is None:
5772
6389
# No name given and no current view set
5774
6391
elif name == 'off':
5775
raise errors.BzrCommandError(
5776
"Cannot change the 'off' pseudo view")
6392
raise errors.BzrCommandError(gettext(
6393
"Cannot change the 'off' pseudo view"))
5777
6394
tree.views.set_view(name, sorted(file_list))
5778
6395
view_str = views.view_display_str(tree.views.lookup_view())
5779
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6396
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5781
6398
# list the files
5782
6399
if name is None:
5783
6400
# No name given and no current view set
5784
self.outf.write('No current view.\n')
6401
self.outf.write(gettext('No current view.\n'))
5786
6403
view_str = views.view_display_str(tree.views.lookup_view(name))
5787
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6404
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5790
6407
class cmd_hooks(Command):
5824
6441
takes_args = ["location?"]
6443
takes_options = ['directory',
6444
Option('force', help='Remove branch even if it is the active branch.')]
5826
6446
aliases = ["rmbranch"]
5828
def run(self, location=None):
5829
if location is None:
5831
branch = Branch.open_containing(location)[0]
5832
branch.bzrdir.destroy_branch()
6448
def run(self, directory=None, location=None, force=False):
6449
br = open_nearby_branch(near=directory, location=location)
6450
if not force and br.bzrdir.has_workingtree():
6452
active_branch = br.bzrdir.open_branch(name="")
6453
except errors.NotBranchError:
6454
active_branch = None
6455
if (active_branch is not None and
6456
br.control_url == active_branch.control_url):
6457
raise errors.BzrCommandError(
6458
gettext("Branch is active. Use --force to remove it."))
6459
br.bzrdir.destroy_branch(br.name)
5835
6462
class cmd_shelve(Command):
5836
6463
__doc__ = """Temporarily set aside some changes from the current tree.
6022
6663
self.outf.write('%s %s\n' % (path, location))
6666
class cmd_export_pot(Command):
6667
__doc__ = """Export command helps and error messages in po format."""
6670
takes_options = [Option('plugin',
6671
help='Export help text from named command '\
6672
'(defaults to all built in commands).',
6674
Option('include-duplicates',
6675
help='Output multiple copies of the same msgid '
6676
'string if it appears more than once.'),
6679
def run(self, plugin=None, include_duplicates=False):
6680
from bzrlib.export_pot import export_pot
6681
export_pot(self.outf, plugin, include_duplicates)
6025
6684
def _register_lazy_builtins():
6026
6685
# register lazy builtins from other modules; called at startup and should
6027
6686
# be only called once.
6028
6687
for (name, aliases, module_name) in [
6029
6688
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6689
('cmd_config', [], 'bzrlib.config'),
6030
6690
('cmd_dpush', [], 'bzrlib.foreign'),
6031
6691
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6032
6692
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6033
6693
('cmd_conflicts', [], 'bzrlib.conflicts'),
6034
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6694
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6695
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6696
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6036
6698
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
