177
172
:return: workingtree, [relative_paths]
179
return WorkingTree.open_containing_paths(
180
file_list, default_directory='.',
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
185
223
def _get_view_info_for_change_reporter(tree):
288
310
def run(self, show_ids=False, file_list=None, revision=None, short=False,
289
versioned=False, no_pending=False, verbose=False,
311
versioned=False, no_pending=False, verbose=False):
291
312
from bzrlib.status import show_tree_status
293
314
if revision and len(revision) > 2:
294
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
295
' one or two revision specifiers'))
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
297
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
318
tree, relfile_list = tree_files(file_list)
298
319
# Avoid asking for specific files when that is not needed.
299
320
if relfile_list == ['']:
300
321
relfile_list = None
333
353
self.outf.write(revtext.decode('utf-8'))
336
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
337
357
if revision_id is not None and revision is not None:
338
raise errors.BzrCommandError(gettext('You can only supply one of'
339
' revision_id or --revision'))
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
340
360
if revision_id is None and revision is None:
341
raise errors.BzrCommandError(gettext('You must supply either'
342
' --revision or a revision_id'))
344
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
346
365
revisions = b.repository.revisions
347
366
if revisions is None:
348
raise errors.BzrCommandError(gettext('Repository %r does not support '
349
'access to raw revision texts'))
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
351
370
b.repository.lock_read()
475
491
location_list=['.']
477
493
for location in location_list:
478
d = controldir.ControlDir.open(location)
494
d = bzrdir.BzrDir.open(location)
481
497
working = d.open_workingtree()
482
498
except errors.NoWorkingTree:
483
raise errors.BzrCommandError(gettext("No working tree to remove"))
499
raise errors.BzrCommandError("No working tree to remove")
484
500
except errors.NotLocalUrl:
485
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
486
" of a remote path"))
501
raise errors.BzrCommandError("You cannot remove the working tree"
488
504
if (working.has_changes()):
489
505
raise errors.UncommittedChanges(working)
490
if working.get_shelf_manager().last_shelf() is not None:
491
raise errors.ShelvedChanges(working)
493
507
if working.user_url != working.branch.user_url:
494
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
495
" from a lightweight checkout"))
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
497
511
d.destroy_workingtree()
500
class cmd_repair_workingtree(Command):
501
__doc__ = """Reset the working tree state file.
503
This is not meant to be used normally, but more as a way to recover from
504
filesystem corruption, etc. This rebuilds the working inventory back to a
505
'known good' state. Any new modifications (adding a file, renaming, etc)
506
will be lost, though modified files will still be detected as such.
508
Most users will want something more like "bzr revert" or "bzr update"
509
unless the state file has become corrupted.
511
By default this attempts to recover the current state by looking at the
512
headers of the state file. If the state file is too corrupted to even do
513
that, you can supply --revision to force the state of the tree.
516
takes_options = ['revision', 'directory',
518
help='Reset the tree even if it doesn\'t appear to be'
523
def run(self, revision=None, directory='.', force=False):
524
tree, _ = WorkingTree.open_containing(directory)
525
self.add_cleanup(tree.lock_tree_write().unlock)
529
except errors.BzrError:
530
pass # There seems to be a real error here, so we'll reset
533
raise errors.BzrCommandError(gettext(
534
'The tree does not appear to be corrupt. You probably'
535
' want "bzr revert" instead. Use "--force" if you are'
536
' sure you want to reset the working tree.'))
540
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
542
tree.reset_state(revision_ids)
543
except errors.BzrError, e:
544
if revision_ids is None:
545
extra = (gettext(', the header appears corrupt, try passing -r -1'
546
' to set the state to the last commit'))
549
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
552
514
class cmd_revno(Command):
553
515
__doc__ = """Show current revision number.
559
521
takes_args = ['location?']
560
522
takes_options = [
561
523
Option('tree', help='Show revno of working tree'),
566
def run(self, tree=False, location=u'.', revision=None):
567
if revision is not None and tree:
568
raise errors.BzrCommandError(gettext("--tree and --revision can "
569
"not be used together"))
527
def run(self, tree=False, location=u'.'):
573
530
wt = WorkingTree.open_containing(location)[0]
574
self.add_cleanup(wt.lock_read().unlock)
575
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
578
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
580
542
b = Branch.open_containing(location)[0]
581
self.add_cleanup(b.lock_read().unlock)
583
if len(revision) != 1:
584
raise errors.BzrCommandError(gettext(
585
"Tags can only be placed on a single revision, "
587
revid = revision[0].as_revision_id(b)
589
revid = b.last_revision()
591
revno_t = b.revision_id_to_dotted_revno(revid)
592
except errors.NoSuchRevision:
594
revno = ".".join(str(n) for n in revno_t)
544
self.add_cleanup(b.unlock)
595
546
self.cleanup_now()
596
self.outf.write(revno + '\n')
547
self.outf.write(str(revno) + '\n')
599
550
class cmd_revision_info(Command):
809
757
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
810
758
if kind and kind not in ['file', 'directory', 'symlink']:
811
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
813
761
revision = _get_one_revision('inventory', revision)
814
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
815
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
816
765
if revision is not None:
817
766
tree = revision.as_tree(work_tree.branch)
819
768
extra_trees = [work_tree]
820
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
879
828
return self.run_auto(names_list, after, dry_run)
881
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
830
raise errors.BzrCommandError('--dry-run requires --auto.')
882
831
if names_list is None:
884
833
if len(names_list) < 2:
885
raise errors.BzrCommandError(gettext("missing file argument"))
886
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
887
for file_name in rel_names[0:-1]:
889
raise errors.BzrCommandError(gettext("can not move root of branch"))
890
self.add_cleanup(tree.lock_tree_write().unlock)
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
891
838
self._run(tree, names_list, rel_names, after)
893
840
def run_auto(self, names_list, after, dry_run):
894
841
if names_list is not None and len(names_list) > 1:
895
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('Only one path may be specified to'
898
raise errors.BzrCommandError(gettext('--after cannot be specified with'
900
work_tree, file_list = WorkingTree.open_containing_paths(
901
names_list, default_directory='.')
902
self.add_cleanup(work_tree.lock_tree_write().unlock)
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
903
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
905
852
def _run(self, tree, names_list, rel_names, after):
999
946
match the remote one, use pull --overwrite. This will work even if the two
1000
947
branches have diverged.
1002
If there is no default location set, the first pull will set it (use
1003
--no-remember to avoid setting it). After that, you can omit the
1004
location to use the default. To change the default, use --remember. The
1005
value will only be saved if the remote location can be accessed.
1007
The --verbose option will display the revisions pulled using the log_format
1008
configuration option. You can use a different format by overriding it with
1009
-Olog_format=<other_format>.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
1011
954
Note: The location can be specified either in the form of a branch,
1012
955
or in the form of a path to a file containing a merge directive generated
1017
960
takes_options = ['remember', 'overwrite', 'revision',
1018
961
custom_help('verbose',
1019
962
help='Show logs of pulled revisions.'),
1020
custom_help('directory',
1021
964
help='Branch to pull into, '
1022
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
1024
970
help="Perform a local pull in a bound "
1025
971
"branch. Local pulls are not applied to "
1026
972
"the master branch."
1029
help="Show base revision text in conflicts.")
1031
975
takes_args = ['location?']
1032
976
encoding_type = 'replace'
1034
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1035
979
revision=None, verbose=False,
1036
directory=None, local=False,
980
directory=None, local=False):
1038
981
# FIXME: too much stuff is in the command class
1039
982
revision_id = None
1040
983
mergeable = None
1066
1008
stored_loc = branch_to.get_parent()
1067
1009
if location is None:
1068
1010
if stored_loc is None:
1069
raise errors.BzrCommandError(gettext("No pull location known or"
1011
raise errors.BzrCommandError("No pull location known or"
1072
1014
display_url = urlutils.unescape_for_display(stored_loc,
1073
1015
self.outf.encoding)
1074
1016
if not is_quiet():
1075
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1076
1018
location = stored_loc
1078
1020
revision = _get_one_revision('pull', revision)
1079
1021
if mergeable is not None:
1080
1022
if revision is not None:
1081
raise errors.BzrCommandError(gettext(
1082
'Cannot use -r with merge directives or bundles'))
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1083
1025
mergeable.install_revisions(branch_to.repository)
1084
1026
base_revision_id, revision_id, verified = \
1085
1027
mergeable.get_merge_request(branch_to.repository)
1139
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1140
1078
After that you will be able to do a push without '--overwrite'.
1142
If there is no default push location set, the first push will set it (use
1143
--no-remember to avoid setting it). After that, you can omit the
1144
location to use the default. To change the default, use --remember. The
1145
value will only be saved if the remote location can be accessed.
1147
The --verbose option will display the revisions pushed using the log_format
1148
configuration option. You can use a different format by overriding it with
1149
-Olog_format=<other_format>.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1152
1086
_see_also = ['pull', 'update', 'working-trees']
1173
1110
Option('strict',
1174
1111
help='Refuse to push if there are uncommitted changes in'
1175
1112
' the working tree, --no-strict disables the check.'),
1177
help="Don't populate the working tree, even for protocols"
1178
" that support it."),
1180
1114
takes_args = ['location?']
1181
1115
encoding_type = 'replace'
1183
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1184
1118
create_prefix=False, verbose=False, revision=None,
1185
1119
use_existing_dir=False, directory=None, stacked_on=None,
1186
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1187
1121
from bzrlib.push import _show_push_branch
1189
1123
if directory is None:
1190
1124
directory = '.'
1191
1125
# Get the source branch
1192
1126
(tree, br_from,
1193
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1194
1128
# Get the tip's revision_id
1195
1129
revision = _get_one_revision('push', revision)
1196
1130
if revision is not None:
1217
1151
# error by the feedback given to them. RBC 20080227.
1218
1152
stacked_on = parent_url
1219
1153
if not stacked_on:
1220
raise errors.BzrCommandError(gettext(
1221
"Could not determine branch to refer to."))
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1223
1157
# Get the destination location
1224
1158
if location is None:
1225
1159
stored_loc = br_from.get_push_location()
1226
1160
if stored_loc is None:
1227
raise errors.BzrCommandError(gettext(
1228
"No push location known or specified."))
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1230
1164
display_url = urlutils.unescape_for_display(stored_loc,
1231
1165
self.outf.encoding)
1232
note(gettext("Using saved push location: %s") % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1233
1167
location = stored_loc
1235
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1236
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1237
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1238
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1241
1175
class cmd_branch(Command):
1284
1214
def run(self, from_location, to_location=None, revision=None,
1285
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1286
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1288
1217
from bzrlib import switch as _mod_switch
1289
1218
from bzrlib.tag import _merge_tags_if_possible
1290
if self.invoked_as in ['get', 'clone']:
1291
ui.ui_factory.show_user_warning(
1292
'deprecated_command',
1293
deprecated_name=self.invoked_as,
1294
recommended_name='branch',
1295
deprecated_in_version='2.4')
1296
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1298
if not (hardlink or files_from):
1299
# accelerator_tree is usually slower because you have to read N
1300
# files (no readahead, lots of seeks, etc), but allow the user to
1301
# explicitly request it
1302
accelerator_tree = None
1303
if files_from is not None and files_from != from_location:
1304
accelerator_tree = WorkingTree.open(files_from)
1305
1221
revision = _get_one_revision('branch', revision)
1306
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1307
1224
if revision is not None:
1308
1225
revision_id = revision.as_revision_id(br_from)
1313
1230
revision_id = br_from.last_revision()
1314
1231
if to_location is None:
1315
to_location = getattr(br_from, "name", None)
1316
if to_location is None:
1317
to_location = urlutils.derive_to_location(from_location)
1232
to_location = urlutils.derive_to_location(from_location)
1318
1233
to_transport = transport.get_transport(to_location)
1320
1235
to_transport.mkdir('.')
1321
1236
except errors.FileExists:
1323
to_dir = controldir.ControlDir.open_from_transport(
1325
except errors.NotBranchError:
1326
if not use_existing_dir:
1327
raise errors.BzrCommandError(gettext('Target directory "%s" '
1328
'already exists.') % to_location)
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1333
to_dir.open_branch()
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1334
1243
except errors.NotBranchError:
1337
1246
raise errors.AlreadyBranchError(to_location)
1338
1247
except errors.NoSuchFile:
1339
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1345
# preserve whatever source format we have.
1346
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1347
possible_transports=[to_transport],
1348
accelerator_tree=accelerator_tree,
1349
hardlink=hardlink, stacked=stacked,
1350
force_new_repo=standalone,
1351
create_tree_if_local=not no_tree,
1352
source_branch=br_from)
1353
branch = to_dir.open_branch()
1354
except errors.NoSuchRevision:
1355
to_transport.delete_tree('.')
1356
msg = gettext("The branch {0} has no revision {1}.").format(
1357
from_location, revision)
1358
raise errors.BzrCommandError(msg)
1360
branch = br_from.sprout(to_dir, revision_id=revision_id)
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1361
1265
_merge_tags_if_possible(br_from, branch)
1362
1266
# If the source branch is stacked, the new branch may
1363
1267
# be stacked whether we asked for that explicitly or not.
1364
1268
# We therefore need a try/except here and not just 'if stacked:'
1366
note(gettext('Created new stacked branch referring to %s.') %
1270
note('Created new stacked branch referring to %s.' %
1367
1271
branch.get_stacked_on_url())
1368
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1369
1273
errors.UnstackableRepositoryFormat), e:
1370
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1274
note('Branched %d revision(s).' % branch.revno())
1372
1276
# Bind to the parent
1373
1277
parent_branch = Branch.open(from_location)
1374
1278
branch.bind(parent_branch)
1375
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1377
1281
# Switch to the new branch
1378
1282
wt, _ = WorkingTree.open_containing('.')
1379
1283
_mod_switch.switch(wt.bzrdir, branch)
1380
note(gettext('Switched to branch: %s'),
1284
note('Switched to branch: %s',
1381
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1384
class cmd_branches(Command):
1385
__doc__ = """List the branches available at the current location.
1387
This command will print the names of all the branches at the current
1391
takes_args = ['location?']
1393
Option('recursive', short_name='R',
1394
help='Recursively scan for branches rather than '
1395
'just looking in the specified location.')]
1397
def run(self, location=".", recursive=False):
1399
t = transport.get_transport(location)
1400
if not t.listable():
1401
raise errors.BzrCommandError(
1402
"Can't scan this type of location.")
1403
for b in controldir.ControlDir.find_branches(t):
1404
self.outf.write("%s\n" % urlutils.unescape_for_display(
1405
urlutils.relative_url(t.base, b.base),
1406
self.outf.encoding).rstrip("/"))
1408
dir = controldir.ControlDir.open_containing(location)[0]
1409
for branch in dir.list_branches():
1410
if branch.name is None:
1411
self.outf.write(gettext(" (default)\n"))
1413
self.outf.write(" %s\n" % branch.name.encode(
1414
self.outf.encoding))
1417
1288
class cmd_checkout(Command):
1418
1289
__doc__ = """Create a new checkout of an existing branch.
1521
1389
class cmd_update(Command):
1522
__doc__ = """Update a working tree to a new revision.
1524
This will perform a merge of the destination revision (the tip of the
1525
branch, or the specified revision) into the working tree, and then make
1526
that revision the basis revision for the working tree.
1528
You can use this to visit an older revision, or to update a working tree
1529
that is out of date from its branch.
1531
If there are any uncommitted changes in the tree, they will be carried
1532
across and remain as uncommitted changes after the update. To discard
1533
these changes, use 'bzr revert'. The uncommitted changes may conflict
1534
with the changes brought in by the change in basis revision.
1536
If the tree's branch is bound to a master branch, bzr will also update
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1537
1400
the branch from the master.
1539
You cannot update just a single file or directory, because each Bazaar
1540
working tree has just a single basis revision. If you want to restore a
1541
file that has been removed locally, use 'bzr revert' instead of 'bzr
1542
update'. If you want to restore a file to its state in a previous
1543
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1544
out the old content of that file to a new location.
1546
The 'dir' argument, if given, must be the location of the root of a
1547
working tree to update. By default, the working tree that contains the
1548
current working directory is used.
1551
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1552
1404
takes_args = ['dir?']
1553
takes_options = ['revision',
1555
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1557
1406
aliases = ['up']
1559
def run(self, dir=None, revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1560
1409
if revision is not None and len(revision) != 1:
1561
raise errors.BzrCommandError(gettext(
1562
"bzr update --revision takes exactly one revision"))
1564
tree = WorkingTree.open_containing('.')[0]
1566
tree, relpath = WorkingTree.open_containing(dir)
1569
raise errors.BzrCommandError(gettext(
1570
"bzr update can only update a whole tree, "
1571
"not a file or subdirectory"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1572
1413
branch = tree.branch
1573
1414
possible_transports = []
1574
1415
master = branch.get_master_branch(
1575
1416
possible_transports=possible_transports)
1576
1417
if master is not None:
1577
1419
branch_location = master.base
1421
tree.lock_tree_write()
1580
1422
branch_location = tree.branch.base
1581
tree.lock_tree_write()
1582
1423
self.add_cleanup(tree.unlock)
1583
1424
# get rid of the final '/' and be ready for display
1584
1425
branch_location = urlutils.unescape_for_display(
1610
1451
change_reporter,
1611
1452
possible_transports=possible_transports,
1612
1453
revision=revision_id,
1614
show_base=show_base)
1615
1455
except errors.NoSuchRevision, e:
1616
raise errors.BzrCommandError(gettext(
1456
raise errors.BzrCommandError(
1617
1457
"branch has no revision %s\n"
1618
1458
"bzr update --revision only works"
1619
" for a revision in the branch history")
1459
" for a revision in the branch history"
1620
1460
% (e.revision))
1621
1461
revno = tree.branch.revision_id_to_dotted_revno(
1622
1462
_mod_revision.ensure_null(tree.last_revision()))
1623
note(gettext('Updated to revision {0} of branch {1}').format(
1624
'.'.join(map(str, revno)), branch_location))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1625
1465
parent_ids = tree.get_parent_ids()
1626
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1627
note(gettext('Your local commits will now show as pending merges with '
1628
"'bzr status', and can be committed with 'bzr commit'."))
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1629
1469
if conflicts != 0:
1673
1513
noise_level = 0
1674
1514
from bzrlib.info import show_bzrdir_info
1675
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1676
1516
verbose=noise_level, outfile=self.outf)
1679
1519
class cmd_remove(Command):
1680
1520
__doc__ = """Remove files or directories.
1682
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1683
delete them if they can easily be recovered using revert otherwise they
1684
will be backed up (adding an extention of the form .~#~). If no options or
1685
parameters are given Bazaar will scan for files that are being tracked by
1686
Bazaar but missing in your tree and stop tracking them for you.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1688
1527
takes_args = ['file*']
1689
1528
takes_options = ['verbose',
1691
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1692
1531
'The file deletion mode to be used.',
1693
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1694
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1695
1535
keep='Delete from bzr but leave the working copy.',
1696
no_backup='Don\'t backup changed files.',
1697
1536
force='Delete all the specified files, even if they can not be '
1698
'recovered and even if they are non-empty directories. '
1699
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1700
1538
aliases = ['rm', 'del']
1701
1539
encoding_type = 'replace'
1703
1541
def run(self, file_list, verbose=False, new=False,
1704
1542
file_deletion_strategy='safe'):
1705
if file_deletion_strategy == 'force':
1706
note(gettext("(The --force option is deprecated, rather use --no-backup "
1708
file_deletion_strategy = 'no-backup'
1710
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1712
1545
if file_list is not None:
1713
1546
file_list = [f for f in file_list]
1715
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1716
1550
# Heuristics should probably all move into tree.remove_smart or
1896
1716
help='Specify a format for this branch. '
1897
1717
'See "help formats".',
1898
1718
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1899
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1719
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1900
1720
value_switches=True,
1901
1721
title="Branch format",
1903
1723
Option('append-revisions-only',
1904
1724
help='Never change revnos or the existing log.'
1905
' Append revisions to it only.'),
1907
'Create a branch without a working tree.')
1725
' Append revisions to it only.')
1909
1727
def run(self, location=None, format=None, append_revisions_only=False,
1910
create_prefix=False, no_tree=False):
1728
create_prefix=False):
1911
1729
if format is None:
1912
format = controldir.format_registry.make_bzrdir('default')
1730
format = bzrdir.format_registry.make_bzrdir('default')
1913
1731
if location is None:
1914
1732
location = u'.'
1924
1742
to_transport.ensure_base()
1925
1743
except errors.NoSuchFile:
1926
1744
if not create_prefix:
1927
raise errors.BzrCommandError(gettext("Parent directory of %s"
1745
raise errors.BzrCommandError("Parent directory of %s"
1928
1746
" does not exist."
1929
1747
"\nYou may supply --create-prefix to create all"
1930
" leading parent directories.")
1748
" leading parent directories."
1932
1750
to_transport.create_prefix()
1935
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1936
1754
except errors.NotBranchError:
1937
1755
# really a NotBzrDir error...
1938
create_branch = controldir.ControlDir.create_branch_convenience
1940
force_new_tree = False
1942
force_new_tree = None
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1943
1757
branch = create_branch(to_transport.base, format=format,
1944
possible_transports=[to_transport],
1945
force_new_tree=force_new_tree)
1758
possible_transports=[to_transport])
1946
1759
a_bzrdir = branch.bzrdir
1948
1761
from bzrlib.transport.local import LocalTransport
2175
1969
elif ':' in prefix:
2176
1970
old_label, new_label = prefix.split(":")
2178
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2179
1973
'--prefix expects two values separated by a colon'
2180
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2182
1976
if revision and len(revision) > 2:
2183
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2184
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2186
1980
if using is not None and format is not None:
2187
raise errors.BzrCommandError(gettext(
2188
'{0} and {1} are mutually exclusive').format(
2189
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2191
1984
(old_tree, new_tree,
2192
1985
old_branch, new_branch,
2193
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2194
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2195
# GNU diff on Windows uses ANSI encoding for filenames
2196
path_encoding = osutils.get_diff_header_encoding()
2197
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2198
1989
specific_files=specific_files,
2199
1990
external_diff_options=diff_options,
2200
1991
old_label=old_label, new_label=new_label,
2201
extra_trees=extra_trees,
2202
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2204
1993
format_cls=format)
2214
2003
# level of effort but possibly much less IO. (Or possibly not,
2215
2004
# if the directories are very large...)
2216
2005
_see_also = ['status', 'ls']
2217
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
2219
2008
@display_command
2220
def run(self, show_ids=False, directory=u'.'):
2221
tree = WorkingTree.open_containing(directory)[0]
2222
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2223
2013
old = tree.basis_tree()
2224
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2225
2016
for path, ie in old.inventory.iter_entries():
2226
2017
if not tree.has_id(ie.file_id):
2227
2018
self.outf.write(path)
2260
2053
_see_also = ['status', 'ls']
2261
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2263
2060
@display_command
2264
def run(self, null=False, directory=u'.'):
2265
wt = WorkingTree.open_containing(directory)[0]
2266
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2267
2065
basis = wt.basis_tree()
2268
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2269
2068
basis_inv = basis.inventory
2270
2069
inv = wt.inventory
2271
2070
for file_id in inv:
2272
if basis_inv.has_id(file_id):
2071
if file_id in basis_inv:
2274
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2276
2075
path = inv.id2path(file_id)
2277
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2280
2079
self.outf.write(path + '\0')
2506
2297
Option('show-diff',
2507
2298
short_name='p',
2508
2299
help='Show changes made in each revision as a patch.'),
2509
Option('include-merged',
2300
Option('include-merges',
2510
2301
help='Show merged revisions like --levels 0 does.'),
2511
Option('include-merges', hidden=True,
2512
help='Historical alias for --include-merged.'),
2513
Option('omit-merges',
2514
help='Do not report commits with more than one parent.'),
2515
2302
Option('exclude-common-ancestry',
2516
2303
help='Display only the revisions that are not part'
2517
2304
' of both ancestries (require -rX..Y)'
2519
Option('signatures',
2520
help='Show digital signature validity'),
2523
help='Show revisions whose properties match this '
2526
ListOption('match-message',
2527
help='Show revisions whose message matches this '
2530
ListOption('match-committer',
2531
help='Show revisions whose committer matches this '
2534
ListOption('match-author',
2535
help='Show revisions whose authors match this '
2538
ListOption('match-bugs',
2539
help='Show revisions whose bugs match this '
2543
2307
encoding_type = 'replace'
2572
2327
_get_info_for_log_files,
2574
2329
direction = (forward and 'forward') or 'reverse'
2575
if symbol_versioning.deprecated_passed(include_merges):
2576
ui.ui_factory.show_user_warning(
2577
'deprecated_command_option',
2578
deprecated_name='--include-merges',
2579
recommended_name='--include-merged',
2580
deprecated_in_version='2.5',
2581
command=self.invoked_as)
2582
if include_merged is None:
2583
include_merged = include_merges
2585
raise errors.BzrCommandError(gettext(
2586
'{0} and {1} are mutually exclusive').format(
2587
'--include-merges', '--include-merged'))
2588
if include_merged is None:
2589
include_merged = False
2590
2330
if (exclude_common_ancestry
2591
2331
and (revision is None or len(revision) != 2)):
2592
raise errors.BzrCommandError(gettext(
2593
'--exclude-common-ancestry requires -r with two revisions'))
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2595
2335
if levels is None:
2598
raise errors.BzrCommandError(gettext(
2599
'{0} and {1} are mutually exclusive').format(
2600
'--levels', '--include-merged'))
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2602
2341
if change is not None:
2603
2342
if len(change) > 1:
2604
2343
raise errors.RangeInChangeOption()
2605
2344
if revision is not None:
2606
raise errors.BzrCommandError(gettext(
2607
'{0} and {1} are mutually exclusive').format(
2608
'--revision', '--change'))
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2610
2348
revision = change
2808
2528
help='Recurse into subdirectories.'),
2809
2529
Option('from-root',
2810
2530
help='Print paths relative to the root of the branch.'),
2811
Option('unknown', short_name='u',
2812
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2813
2532
Option('versioned', help='Print versioned files.',
2814
2533
short_name='V'),
2815
Option('ignored', short_name='i',
2816
help='Print ignored files.'),
2817
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2818
2539
help='List entries of a particular kind: file, directory, symlink.',
2824
2543
@display_command
2825
2544
def run(self, revision=None, verbose=False,
2826
2545
recursive=False, from_root=False,
2827
2546
unknown=False, versioned=False, ignored=False,
2828
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2830
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2831
raise errors.BzrCommandError(gettext('invalid kind specified'))
2550
raise errors.BzrCommandError('invalid kind specified')
2833
2552
if verbose and null:
2834
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2835
2554
all = not (unknown or versioned or ignored)
2837
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
3016
2725
self.outf.write("%s\n" % pattern)
3018
2727
if not name_pattern_list:
3019
raise errors.BzrCommandError(gettext("ignore requires at least one "
3020
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3021
2730
name_pattern_list = [globbing.normalize_pattern(p)
3022
2731
for p in name_pattern_list]
3024
bad_patterns_count = 0
3025
for p in name_pattern_list:
3026
if not globbing.Globster.is_pattern_valid(p):
3027
bad_patterns_count += 1
3028
bad_patterns += ('\n %s' % p)
3030
msg = (ngettext('Invalid ignore pattern found. %s',
3031
'Invalid ignore patterns found. %s',
3032
bad_patterns_count) % bad_patterns)
3033
ui.ui_factory.show_error(msg)
3034
raise errors.InvalidPattern('')
3035
2732
for name_pattern in name_pattern_list:
3036
2733
if (name_pattern[0] == '/' or
3037
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3038
raise errors.BzrCommandError(gettext(
3039
"NAME_PATTERN should not be an absolute path"))
3040
tree, relpath = WorkingTree.open_containing(directory)
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3041
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3042
2739
ignored = globbing.Globster(name_pattern_list)
3044
self.add_cleanup(tree.lock_read().unlock)
3045
2742
for entry in tree.list_files():
3047
2744
if id is not None:
3048
2745
filename = entry[0]
3049
2746
if ignored.match(filename):
3050
2747
matches.append(filename)
3051
2749
if len(matches) > 0:
3052
self.outf.write(gettext("Warning: the following files are version "
3053
"controlled and match your ignore pattern:\n%s"
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3054
2752
"\nThese files will continue to be version controlled"
3055
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3058
2756
class cmd_ignored(Command):
3189
2885
@display_command
3190
2886
def run(self, filename, revision=None, name_from_revision=False,
3191
filters=False, directory=None):
3192
2888
if revision is not None and len(revision) != 1:
3193
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3194
" one revision specifier"))
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3195
2891
tree, branch, relpath = \
3196
_open_directory_or_containing_tree_or_branch(filename, directory)
3197
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3198
2895
return self._run(tree, branch, relpath, filename, revision,
3199
2896
name_from_revision, filters)
3203
2900
if tree is None:
3204
2901
tree = b.basis_tree()
3205
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3206
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3208
2906
old_file_id = rev_tree.path2id(relpath)
3210
# TODO: Split out this code to something that generically finds the
3211
# best id for a path across one or more trees; it's like
3212
# find_ids_across_trees but restricted to find just one. -- mbp
3214
2908
if name_from_revision:
3215
2909
# Try in revision if requested
3216
2910
if old_file_id is None:
3217
raise errors.BzrCommandError(gettext(
3218
"{0!r} is not present in revision {1}").format(
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3219
2913
filename, rev_tree.get_revision_id()))
3221
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3223
2917
cur_file_id = tree.path2id(relpath)
3224
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3225
actual_file_id = cur_file_id
3226
elif old_file_id is not None:
3227
actual_file_id = old_file_id
3229
raise errors.BzrCommandError(gettext(
3230
"{0!r} is not present in revision {1}").format(
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3231
2935
filename, rev_tree.get_revision_id()))
3233
from bzrlib.filter_tree import ContentFilterTree
3234
filter_tree = ContentFilterTree(rev_tree,
3235
rev_tree._content_filter_stack)
3236
content = filter_tree.get_file_text(actual_file_id)
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3238
content = rev_tree.get_file_text(actual_file_id)
3240
self.outf.write(content)
2949
self.outf.write(content)
3243
2952
class cmd_local_time_offset(Command):
3304
3013
to trigger updates to external systems like bug trackers. The --fixes
3305
3014
option can be used to record the association between a revision and
3306
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3309
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3310
3044
takes_args = ['selected*']
3342
3076
Option('show-diff', short_name='p',
3343
3077
help='When no message is supplied, show the diff along'
3344
3078
' with the status summary in the message editor.'),
3346
help='When committing to a foreign version control '
3347
'system do not push data that can not be natively '
3350
3080
aliases = ['ci', 'checkin']
3352
3082
def _iter_bug_fix_urls(self, fixes, branch):
3353
default_bugtracker = None
3354
3083
# Configure the properties for bug fixing attributes.
3355
3084
for fixed_bug in fixes:
3356
3085
tokens = fixed_bug.split(':')
3357
if len(tokens) == 1:
3358
if default_bugtracker is None:
3359
branch_config = branch.get_config()
3360
default_bugtracker = branch_config.get_user_option(
3362
if default_bugtracker is None:
3363
raise errors.BzrCommandError(gettext(
3364
"No tracker specified for bug %s. Use the form "
3365
"'tracker:id' or specify a default bug tracker "
3366
"using the `bugtracker` option.\nSee "
3367
"\"bzr help bugs\" for more information on this "
3368
"feature. Commit refused.") % fixed_bug)
3369
tag = default_bugtracker
3371
elif len(tokens) != 2:
3372
raise errors.BzrCommandError(gettext(
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3373
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3374
3089
"See \"bzr help bugs\" for more information on this "
3375
"feature.\nCommit refused.") % fixed_bug)
3377
tag, bug_id = tokens
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3379
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3380
3094
except errors.UnknownBugTrackerAbbreviation:
3381
raise errors.BzrCommandError(gettext(
3382
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3383
3097
except errors.MalformedBugIdentifier, e:
3384
raise errors.BzrCommandError(gettext(
3385
"%s\nCommit refused.") % (str(e),))
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3387
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3388
3102
unchanged=False, strict=False, local=False, fixes=None,
3389
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3391
3104
from bzrlib.errors import (
3392
3105
PointlessCommit,
3393
3106
ConflictsInTree,
3469
3184
# make_commit_message_template_encoded returns user encoding.
3470
3185
# We probably want to be using edit_commit_message instead to
3472
my_message = set_commit_message(commit_obj)
3473
if my_message is None:
3474
start_message = generate_commit_message_template(commit_obj)
3475
my_message = edit_commit_message_encoded(text,
3476
start_message=start_message)
3477
if my_message is None:
3478
raise errors.BzrCommandError(gettext("please specify a commit"
3479
" message with either --message or --file"))
3480
if my_message == "":
3481
raise errors.BzrCommandError(gettext("Empty commit message specified."
3482
" Please specify a commit message with either"
3483
" --message or --file or leave a blank message"
3484
" with --message \"\"."))
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3485
3195
return my_message
3487
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3495
3205
reporter=None, verbose=verbose, revprops=properties,
3496
3206
authors=author, timestamp=commit_stamp,
3497
3207
timezone=offset,
3498
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3500
3209
except PointlessCommit:
3501
raise errors.BzrCommandError(gettext("No changes to commit."
3502
" Please 'bzr add' the files you want to commit, or use"
3503
" --unchanged to force an empty commit."))
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3504
3212
except ConflictsInTree:
3505
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3213
raise errors.BzrCommandError('Conflicts detected in working '
3506
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3508
3216
except StrictCommitFailed:
3509
raise errors.BzrCommandError(gettext("Commit refused because there are"
3510
" unknown files in the working tree."))
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3511
3219
except errors.BoundBranchOutOfDate, e:
3512
e.extra_help = (gettext("\n"
3220
e.extra_help = ("\n"
3513
3221
'To commit to master branch, run update and then commit.\n'
3514
3222
'You can also pass --local to commit to continue working '
3589
3297
class cmd_upgrade(Command):
3590
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3592
When the default format has changed after a major new release of
3593
Bazaar, you may be informed during certain operations that you
3594
should upgrade. Upgrading to a newer format may improve performance
3595
or make new features available. It may however limit interoperability
3596
with older repositories or with older versions of Bazaar.
3598
If you wish to upgrade to a particular format rather than the
3599
current default, that can be specified using the --format option.
3600
As a consequence, you can use the upgrade command this way to
3601
"downgrade" to an earlier format, though some conversions are
3602
a one way process (e.g. changing from the 1.x default to the
3603
2.x default) so downgrading is not always possible.
3605
A backup.bzr.~#~ directory is created at the start of the conversion
3606
process (where # is a number). By default, this is left there on
3607
completion. If the conversion fails, delete the new .bzr directory
3608
and rename this one back in its place. Use the --clean option to ask
3609
for the backup.bzr directory to be removed on successful conversion.
3610
Alternatively, you can delete it by hand if everything looks good
3613
If the location given is a shared repository, dependent branches
3614
are also converted provided the repository converts successfully.
3615
If the conversion of a branch fails, remaining branches are still
3618
For more information on upgrades, see the Bazaar Upgrade Guide,
3619
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3622
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3623
3306
takes_args = ['url?']
3624
3307
takes_options = [
3625
RegistryOption('format',
3626
help='Upgrade to a specific format. See "bzr help'
3627
' formats" for details.',
3628
lazy_registry=('bzrlib.controldir', 'format_registry'),
3629
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3630
value_switches=True, title='Branch format'),
3632
help='Remove the backup.bzr directory if successful.'),
3634
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3637
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3638
3317
from bzrlib.upgrade import upgrade
3639
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3641
if len(exceptions) == 1:
3642
# Compatibility with historical behavior
3318
upgrade(url, format)
3648
3321
class cmd_whoami(Command):
3668
3340
encoding_type = 'replace'
3670
3342
@display_command
3671
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3672
3344
if name is None:
3673
if directory is None:
3674
# use branch if we're inside one; otherwise global config
3676
c = Branch.open_containing(u'.')[0].get_config()
3677
except errors.NotBranchError:
3678
c = _mod_config.GlobalConfig()
3680
c = Branch.open(directory).get_config()
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3682
3351
self.outf.write(c.user_email() + '\n')
3684
3353
self.outf.write(c.username() + '\n')
3688
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3691
3356
# display a warning if an email address isn't included in the given name.
3693
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3694
3359
except errors.NoEmailInUsername, e:
3695
3360
warning('"%s" does not seem to contain an email address. '
3696
3361
'This is allowed, but not recommended.', name)
3698
3363
# use global config unless --branch given
3700
if directory is None:
3701
c = Branch.open_containing(u'.')[0].get_config()
3703
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3705
c = _mod_config.GlobalConfig()
3367
c = config.GlobalConfig()
3706
3368
c.set_user_option('email', name)
3929
3586
def run(self, testspecs_list=None, verbose=False, one=False,
3930
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3932
3589
first=False, list_only=False,
3933
3590
randomize=None, exclude=None, strict=False,
3934
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3935
parallel=None, lsprof_tests=False,
3937
from bzrlib import tests
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3939
3602
if testspecs_list is not None:
3940
3603
pattern = '|'.join(testspecs_list)
3945
3608
from bzrlib.tests import SubUnitBzrRunner
3946
3609
except ImportError:
3947
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3948
"needs to be installed to use --subunit."))
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3949
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3950
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3951
3614
# stdout, which would corrupt the subunit stream.
3952
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3953
# following code can be deleted when it's sufficiently deployed
3954
# -- vila/mgz 20100514
3955
if (sys.platform == "win32"
3956
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3958
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3960
3619
self.additional_selftest_args.setdefault(
3961
3620
'suite_decorators', []).append(parallel)
3963
raise errors.BzrCommandError(gettext(
3964
"--benchmark is no longer supported from bzr 2.2; "
3965
"use bzr-usertest instead"))
3966
test_suite_factory = None
3968
exclude_pattern = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3970
exclude_pattern = '(' + '|'.join(exclude) + ')'
3972
self._disable_fsync()
3629
test_suite_factory = None
3973
3631
selftest_kwargs = {"verbose": verbose,
3974
3632
"pattern": pattern,
3975
3633
"stop_on_failure": one,
3977
3635
"test_suite_factory": test_suite_factory,
3978
3636
"lsprof_timed": lsprof_timed,
3979
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3980
3639
"matching_tests_first": first,
3981
3640
"list_only": list_only,
3982
3641
"random_seed": randomize,
3983
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
3984
3643
"strict": strict,
3985
3644
"load_list": load_list,
3986
3645
"debug_flags": debugflag,
3987
3646
"starting_with": starting_with
3989
3648
selftest_kwargs.update(self.additional_selftest_args)
3991
# Make deprecation warnings visible, unless -Werror is set
3992
cleanup = symbol_versioning.activate_deprecation_warnings(
3995
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
3998
3650
return int(not result)
4000
def _disable_fsync(self):
4001
"""Change the 'os' functionality to not synchronize."""
4002
self._orig_fsync = getattr(os, 'fsync', None)
4003
if self._orig_fsync is not None:
4004
os.fsync = lambda filedes: None
4005
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4006
if self._orig_fdatasync is not None:
4007
os.fdatasync = lambda filedes: None
4010
3653
class cmd_version(Command):
4011
3654
__doc__ = """Show version of bzr."""
4064
3709
The source of the merge can be specified either in the form of a branch,
4065
3710
or in the form of a path to a file containing a merge directive generated
4066
3711
with bzr send. If neither is specified, the default is the upstream branch
4067
or the branch most recently merged using --remember. The source of the
4068
merge may also be specified in the form of a path to a file in another
4069
branch: in this case, only the modifications to that file are merged into
4070
the current working tree.
4072
When merging from a branch, by default bzr will try to merge in all new
4073
work from the other branch, automatically determining an appropriate base
4074
revision. If this fails, you may need to give an explicit base.
4076
To pick a different ending revision, pass "--revision OTHER". bzr will
4077
try to merge in all new work up to and including revision OTHER.
4079
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4080
through OTHER, excluding BASE but including OTHER, will be merged. If this
4081
causes some revisions to be skipped, i.e. if the destination branch does
4082
not already contain revision BASE, such a merge is commonly referred to as
4083
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4084
cherrypicks. The changes look like a normal commit, and the history of the
4085
changes from the other branch is not stored in the commit.
4087
Revision numbers are always relative to the source branch.
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4089
3725
Merge will do its best to combine the changes in two branches, but there
4090
3726
are some kinds of problems only a human can fix. When it encounters those,
4094
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
4096
If there is no default branch set, the first merge will set it (use
4097
--no-remember to avoid setting it). After that, you can omit the branch
4098
to use the default. To change the default, use --remember. The value will
4099
only be saved if the remote location can be accessed.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4101
3737
The results of the merge are placed into the destination working
4102
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4103
3739
committed to record the result of the merge.
4105
3741
merge refuses to run if there are any uncommitted changes, unless
4106
--force is given. If --force is given, then the changes from the source
4107
will be merged with the current working tree, including any uncommitted
4108
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4109
3743
merge revision which has more than two parents.
4111
3745
If one would like to merge changes from the working tree of the other
4213
3847
mergeable = None
4215
3849
if uncommitted:
4216
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4217
' with bundles or merge directives.'))
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4219
3853
if revision is not None:
4220
raise errors.BzrCommandError(gettext(
4221
'Cannot use -r with merge directives or bundles'))
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4222
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4223
3857
mergeable, None)
4225
3859
if merger is None and uncommitted:
4226
3860
if revision is not None and len(revision) > 0:
4227
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4228
' --revision at the same time.'))
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4229
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
4230
3864
allow_pending = False
4239
3873
self.sanity_check_merger(merger)
4240
3874
if (merger.base_rev_id == merger.other_rev_id and
4241
3875
merger.other_rev_id is not None):
4242
# check if location is a nonexistent file (and not a branch) to
4243
# disambiguate the 'Nothing to do'
4244
if merger.interesting_files:
4245
if not merger.other_tree.has_filename(
4246
merger.interesting_files[0]):
4247
note(gettext("merger: ") + str(merger))
4248
raise errors.PathsDoNotExist([location])
4249
note(gettext('Nothing to do.'))
3876
note('Nothing to do.')
4251
if pull and not preview:
4252
3879
if merger.interesting_files is not None:
4253
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3880
raise errors.BzrCommandError('Cannot pull individual files')
4254
3881
if (merger.base_rev_id == tree.last_revision()):
4255
3882
result = tree.pull(merger.other_branch, False,
4256
3883
merger.other_rev_id)
4257
3884
result.report(self.outf)
4259
3886
if merger.this_basis is None:
4260
raise errors.BzrCommandError(gettext(
3887
raise errors.BzrCommandError(
4261
3888
"This branch has no commits."
4262
" (perhaps you would prefer 'bzr pull')"))
3889
" (perhaps you would prefer 'bzr pull')")
4264
3891
return self._do_preview(merger)
4265
3892
elif interactive:
4363
3988
if other_revision_id is None:
4364
3989
other_revision_id = _mod_revision.ensure_null(
4365
3990
other_branch.last_revision())
4366
# Remember where we merge from. We need to remember if:
4367
# - user specify a location (and we don't merge from the parent
4369
# - user ask to remember or there is no previous location set to merge
4370
# from and user didn't ask to *not* remember
4371
if (user_location is not None
4373
or (remember is None
4374
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4375
3994
tree.branch.set_submit_branch(other_branch.base)
4376
# Merge tags (but don't set them in the master branch yet, the user
4377
# might revert this merge). Commit will propagate them.
4378
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4379
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4380
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4381
3998
if other_path != '':
4725
4340
theirs_only=False,
4726
4341
log_format=None, long=False, short=False, line=False,
4727
4342
show_ids=False, verbose=False, this=False, other=False,
4728
include_merged=None, revision=None, my_revision=None,
4730
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4343
include_merges=False, revision=None, my_revision=None):
4731
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4732
4345
def message(s):
4733
4346
if not is_quiet():
4734
4347
self.outf.write(s)
4736
if symbol_versioning.deprecated_passed(include_merges):
4737
ui.ui_factory.show_user_warning(
4738
'deprecated_command_option',
4739
deprecated_name='--include-merges',
4740
recommended_name='--include-merged',
4741
deprecated_in_version='2.5',
4742
command=self.invoked_as)
4743
if include_merged is None:
4744
include_merged = include_merges
4746
raise errors.BzrCommandError(gettext(
4747
'{0} and {1} are mutually exclusive').format(
4748
'--include-merges', '--include-merged'))
4749
if include_merged is None:
4750
include_merged = False
4752
4350
mine_only = this
4761
4359
elif theirs_only:
4762
4360
restrict = 'remote'
4764
local_branch = Branch.open_containing(directory)[0]
4765
self.add_cleanup(local_branch.lock_read().unlock)
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4767
4366
parent = local_branch.get_parent()
4768
4367
if other_branch is None:
4769
4368
other_branch = parent
4770
4369
if other_branch is None:
4771
raise errors.BzrCommandError(gettext("No peer location known"
4370
raise errors.BzrCommandError("No peer location known"
4773
4372
display_url = urlutils.unescape_for_display(parent,
4774
4373
self.outf.encoding)
4775
message(gettext("Using saved parent location: {0}\n").format(
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4778
4377
remote_branch = Branch.open(other_branch)
4779
4378
if remote_branch.base == local_branch.base:
4780
4379
remote_branch = local_branch
4782
self.add_cleanup(remote_branch.lock_read().unlock)
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4784
4384
local_revid_range = _revision_range_to_revid_range(
4785
4385
_get_revision_range(my_revision, local_branch,
4834
4430
if mine_only and not local_extra:
4835
4431
# We checked local, and found nothing extra
4836
message(gettext('This branch has no new revisions.\n'))
4432
message('This branch is up to date.\n')
4837
4433
elif theirs_only and not remote_extra:
4838
4434
# We checked remote, and found nothing extra
4839
message(gettext('Other branch has no new revisions.\n'))
4435
message('Other branch is up to date.\n')
4840
4436
elif not (mine_only or theirs_only or local_extra or
4842
4438
# We checked both branches, and neither one had extra
4844
message(gettext("Branches are up to date.\n"))
4440
message("Branches are up to date.\n")
4845
4441
self.cleanup_now()
4846
4442
if not status_code and parent is None and other_branch is not None:
4847
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4848
4445
# handle race conditions - a parent might be set while we run.
4849
4446
if local_branch.get_parent() is None:
4850
4447
local_branch.set_parent(remote_branch.base)
4910
4507
@display_command
4911
4508
def run(self, verbose=False):
4912
from bzrlib import plugin
4913
# Don't give writelines a generator as some codecs don't like that
4914
self.outf.writelines(
4915
list(plugin.describe_plugins(show_paths=verbose)))
4509
import bzrlib.plugin
4510
from inspect import getdoc
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4519
doc = d.split('\n')[0]
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4918
4531
class cmd_testament(Command):
4964
4578
Option('long', help='Show commit date in annotations.'),
4969
4582
encoding_type = 'exact'
4971
4584
@display_command
4972
4585
def run(self, filename, all=False, long=False, revision=None,
4973
show_ids=False, directory=None):
4974
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4977
4588
wt, branch, relpath = \
4978
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4979
4590
if wt is not None:
4980
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4982
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4983
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4984
self.add_cleanup(tree.lock_read().unlock)
4985
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
4986
4600
file_id = wt.path2id(relpath)
4988
4602
file_id = tree.path2id(relpath)
4989
4603
if file_id is None:
4990
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4991
4606
if wt is not None and revision is None:
4992
4607
# If there is a tree and we're not annotating historical
4993
4608
# versions, annotate the working tree's content.
4994
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4995
4610
show_ids=show_ids)
4997
annotate_file_tree(tree, file_id, self.outf, long, all,
4998
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5001
4616
class cmd_re_sign(Command):
5005
4620
hidden = True # is this right ?
5006
4621
takes_args = ['revision_id*']
5007
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
5009
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
5010
4625
if revision_id_list is not None and revision is not None:
5011
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5012
4627
if revision_id_list is None and revision is None:
5013
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5014
b = WorkingTree.open_containing(directory)[0].branch
5015
self.add_cleanup(b.lock_write().unlock)
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5016
4632
return self._run(b, revision_id_list, revision)
5018
4634
def _run(self, b, revision_id_list, revision):
5078
4694
_see_also = ['checkouts', 'unbind']
5079
4695
takes_args = ['location?']
5080
takes_options = ['directory']
5082
def run(self, location=None, directory=u'.'):
5083
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5084
4700
if location is None:
5086
4702
location = b.get_old_bound_location()
5087
4703
except errors.UpgradeRequired:
5088
raise errors.BzrCommandError(gettext('No location supplied. '
5089
'This format does not remember old locations.'))
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5091
4707
if location is None:
5092
4708
if b.get_bound_location() is not None:
5093
raise errors.BzrCommandError(gettext('Branch is already bound'))
4709
raise errors.BzrCommandError('Branch is already bound')
5095
raise errors.BzrCommandError(gettext('No location supplied '
5096
'and no previous location known'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5097
4713
b_other = Branch.open(location)
5099
4715
b.bind(b_other)
5100
4716
except errors.DivergedBranches:
5101
raise errors.BzrCommandError(gettext('These branches have diverged.'
5102
' Try merging, and then bind again.'))
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5103
4719
if b.get_config().has_explicit_nickname():
5104
4720
b.nick = b_other.nick
5169
4784
b = control.open_branch()
5171
4786
if tree is not None:
5172
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5174
self.add_cleanup(b.lock_write().unlock)
5175
return self._run(b, tree, dry_run, verbose, revision, force,
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5178
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5180
4795
from bzrlib.log import log_formatter, show_log
5181
4796
from bzrlib.uncommit import uncommit
5212
4827
end_revision=last_revno)
5215
self.outf.write(gettext('Dry-run, pretending to remove'
5216
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5218
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5221
if not ui.ui_factory.confirm_action(
5222
gettext(u'Uncommit these revisions'),
5223
'bzrlib.builtins.uncommit',
5225
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5228
4840
mutter('Uncommitting from {%s} to {%s}',
5229
4841
last_rev_id, rev_id)
5230
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5231
revno=revno, local=local, keep_tags=keep_tags)
5232
self.outf.write(gettext('You can restore the old tip by running:\n'
5233
' bzr pull . -r revid:%s\n') % last_rev_id)
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5236
4848
class cmd_break_lock(Command):
5237
__doc__ = """Break a dead lock.
5239
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5242
4851
CAUTION: Locks should only be broken when you are sure that the process
5243
4852
holding the lock has been stopped.
5250
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5251
bzr break-lock --conf ~/.bazaar
5254
4861
takes_args = ['location?']
5257
help='LOCATION is the directory where the config lock is.'),
5259
help='Do not ask for confirmation before breaking the lock.'),
5262
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5263
4864
if location is None:
5264
4865
location = u'.'
5266
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5268
{'bzrlib.lockdir.break': True})
5270
conf = _mod_config.LockableConfig(file_name=location)
5273
control, relpath = controldir.ControlDir.open_containing(location)
5275
control.break_lock()
5276
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5280
4873
class cmd_wait_until_signalled(Command):
5344
4936
return host, port
5346
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5347
protocol=None, client_timeout=None):
5348
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5349
4941
if directory is None:
5350
4942
directory = os.getcwd()
5351
4943
if protocol is None:
5352
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5353
4945
host, port = self.get_host_and_port(port)
5354
url = transport.location_to_url(directory)
4946
url = urlutils.local_path_to_url(directory)
5355
4947
if not allow_writes:
5356
4948
url = 'readonly+' + url
5357
t = transport.get_transport_from_url(url)
5359
protocol(t, host, port, inet, client_timeout)
5360
except TypeError, e:
5361
# We use symbol_versioning.deprecated_in just so that people
5362
# grepping can find it here.
5363
# symbol_versioning.deprecated_in((2, 5, 0))
5364
symbol_versioning.warn(
5365
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5366
'Most likely it needs to be updated to support a'
5367
' "timeout" parameter (added in bzr 2.5.0)'
5368
% (e, protocol.__module__, protocol),
5370
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5373
4953
class cmd_join(Command):
5784
5359
branch, relpath = Branch.open_containing(directory)
5785
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5787
5363
if tag_name is None:
5788
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5364
raise errors.BzrCommandError("No tag specified to delete.")
5789
5365
branch.tags.delete_tag(tag_name)
5790
note(gettext('Deleted tag %s.') % tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5793
5369
if len(revision) != 1:
5794
raise errors.BzrCommandError(gettext(
5370
raise errors.BzrCommandError(
5795
5371
"Tags can only be placed on a single revision, "
5797
5373
revision_id = revision[0].as_revision_id(branch)
5799
5375
revision_id = branch.last_revision()
5800
5376
if tag_name is None:
5801
5377
tag_name = branch.automatic_tag_name(revision_id)
5802
5378
if tag_name is None:
5803
raise errors.BzrCommandError(gettext(
5804
"Please specify a tag name."))
5806
existing_target = branch.tags.lookup_tag(tag_name)
5807
except errors.NoSuchTag:
5808
existing_target = None
5809
if not force and existing_target not in (None, revision_id):
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5810
5382
raise errors.TagAlreadyExists(tag_name)
5811
if existing_target == revision_id:
5812
note(gettext('Tag %s already exists for that revision.') % tag_name)
5814
branch.tags.set_tag(tag_name, revision_id)
5815
if existing_target is None:
5816
note(gettext('Created tag %s.') % tag_name)
5818
note(gettext('Updated tag %s.') % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5821
5387
class cmd_tags(Command):
5827
5393
_see_also = ['tag']
5828
5394
takes_options = [
5829
custom_help('directory',
5830
help='Branch whose tags should be displayed.'),
5831
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5832
5401
'Sort tags by different criteria.', title='Sorting',
5833
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5839
5409
@display_command
5840
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5841
from bzrlib.tag import tag_sort_methods
5842
5416
branch, relpath = Branch.open_containing(directory)
5844
5418
tags = branch.tags.get_tag_dict().items()
5848
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5850
# Restrict to the specified range
5851
tags = self._tags_for_range(branch, revision)
5853
sort = tag_sort_methods.get()
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5855
5444
if not show_ids:
5856
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5857
5446
for index, (tag, revid) in enumerate(tags):
5870
5457
for tag, revspec in tags:
5871
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
5873
def _tags_for_range(self, branch, revision):
5875
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5876
revid1, revid2 = rev1.rev_id, rev2.rev_id
5877
# _get_revision_range will always set revid2 if it's not specified.
5878
# If revid1 is None, it means we want to start from the branch
5879
# origin which is always a valid ancestor. If revid1 == revid2, the
5880
# ancestry check is useless.
5881
if revid1 and revid1 != revid2:
5882
# FIXME: We really want to use the same graph than
5883
# branch.iter_merge_sorted_revisions below, but this is not
5884
# easily available -- vila 2011-09-23
5885
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5886
# We don't want to output anything in this case...
5888
# only show revisions between revid1 and revid2 (inclusive)
5889
tagged_revids = branch.tags.get_reverse_tag_dict()
5891
for r in branch.iter_merge_sorted_revisions(
5892
start_revision_id=revid2, stop_revision_id=revid1,
5893
stop_rule='include'):
5894
revid_tags = tagged_revids.get(r[0], None)
5896
found.extend([(tag, r[0]) for tag in revid_tags])
5900
5461
class cmd_reconfigure(Command):
5901
5462
__doc__ = """Reconfigure the type of a bzr directory.
5915
5476
takes_args = ['location?']
5916
5477
takes_options = [
5917
5478
RegistryOption.from_kwargs(
5920
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5921
5482
value_switches=True, enum_switch=False,
5922
5483
branch='Reconfigure to be an unbound branch with no working tree.',
5923
5484
tree='Reconfigure to be an unbound branch with a working tree.',
5924
5485
checkout='Reconfigure to be a bound branch with a working tree.',
5925
5486
lightweight_checkout='Reconfigure to be a lightweight'
5926
5487
' checkout (with no local history).',
5928
RegistryOption.from_kwargs(
5930
title='Repository type',
5931
help='Location fo the repository.',
5932
value_switches=True, enum_switch=False,
5933
5488
standalone='Reconfigure to be a standalone branch '
5934
5489
'(i.e. stop using shared repository).',
5935
5490
use_shared='Reconfigure to use a shared repository.',
5937
RegistryOption.from_kwargs(
5939
title='Trees in Repository',
5940
help='Whether new branches in the repository have trees.',
5941
value_switches=True, enum_switch=False,
5942
5491
with_trees='Reconfigure repository to create '
5943
5492
'working trees on branches by default.',
5944
5493
with_no_trees='Reconfigure repository to not create '
5961
def run(self, location=None, bind_to=None, force=False,
5962
tree_type=None, repository_type=None, repository_trees=None,
5963
stacked_on=None, unstacked=None):
5964
directory = controldir.ControlDir.open(location)
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5513
directory = bzrdir.BzrDir.open(location)
5965
5514
if stacked_on and unstacked:
5966
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5967
5516
elif stacked_on is not None:
5968
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5969
5518
elif unstacked:
5971
5520
# At the moment you can use --stacked-on and a different
5972
5521
# reconfiguration shape at the same time; there seems no good reason
5974
if (tree_type is None and
5975
repository_type is None and
5976
repository_trees is None):
5523
if target_type is None:
5977
5524
if stacked_on or unstacked:
5980
raise errors.BzrCommandError(gettext('No target configuration '
5982
reconfiguration = None
5983
if tree_type == 'branch':
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5984
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5985
elif tree_type == 'tree':
5531
elif target_type == 'tree':
5986
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5987
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
5988
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
5989
5535
directory, bind_to)
5990
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
5991
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5992
5538
directory, bind_to)
5994
reconfiguration.apply(force)
5995
reconfiguration = None
5996
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
5997
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5998
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
5999
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
6001
reconfiguration.apply(force)
6002
reconfiguration = None
6003
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
6004
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6005
5545
directory, True)
6006
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
6007
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6008
5548
directory, False)
6010
reconfiguration.apply(force)
6011
reconfiguration = None
5549
reconfiguration.apply(force)
6014
5552
class cmd_switch(Command):
6063
5600
had_explicit_nick = False
6064
5601
if create_branch:
6065
5602
if branch is None:
6066
raise errors.BzrCommandError(gettext('cannot create branch without'
5603
raise errors.BzrCommandError('cannot create branch without'
6068
5605
to_location = directory_service.directories.dereference(
6070
5607
if '/' not in to_location and '\\' not in to_location:
6071
5608
# This path is meant to be relative to the existing branch
6072
5609
this_url = self._get_branch_location(control_dir)
6073
# Perhaps the target control dir supports colocated branches?
6075
root = controldir.ControlDir.open(this_url,
6076
possible_transports=[control_dir.user_transport])
6077
except errors.NotBranchError:
6080
colocated = root._format.colocated_branches
6082
to_location = urlutils.join_segment_parameters(this_url,
6083
{"branch": urlutils.escape(to_location)})
6085
to_location = urlutils.join(
6086
this_url, '..', urlutils.escape(to_location))
5610
to_location = urlutils.join(this_url, '..', to_location)
6087
5611
to_branch = branch.bzrdir.sprout(to_location,
6088
5612
possible_transports=[branch.bzrdir.root_transport],
6089
5613
source_branch=branch).open_branch()
6091
# Perhaps it's a colocated branch?
6093
to_branch = control_dir.open_branch(to_location)
6094
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6096
to_branch = Branch.open(to_location)
6097
except errors.NotBranchError:
6098
this_url = self._get_branch_location(control_dir)
6099
to_branch = Branch.open(
6101
this_url, '..', urlutils.escape(to_location)))
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6102
5621
if revision is not None:
6103
5622
revision = revision.as_revision_id(to_branch)
6104
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6105
5624
if had_explicit_nick:
6106
5625
branch = control_dir.open_branch() #get the new branch!
6107
5626
branch.nick = to_branch.nick
6108
note(gettext('Switched to branch: %s'),
5627
note('Switched to branch: %s',
6109
5628
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
6111
5630
def _get_branch_location(self, control_dir):
6216
tree, file_list = WorkingTree.open_containing_paths(file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
6218
5736
current_view, view_dict = tree.views.get_view_info()
6219
5737
if name is None:
6220
5738
name = current_view
6223
raise errors.BzrCommandError(gettext(
6224
"Both --delete and a file list specified"))
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6226
raise errors.BzrCommandError(gettext(
6227
"Both --delete and --switch specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6229
5747
tree.views.set_view_info(None, {})
6230
self.outf.write(gettext("Deleted all views.\n"))
5748
self.outf.write("Deleted all views.\n")
6231
5749
elif name is None:
6232
raise errors.BzrCommandError(gettext("No current view to delete"))
5750
raise errors.BzrCommandError("No current view to delete")
6234
5752
tree.views.delete_view(name)
6235
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6238
raise errors.BzrCommandError(gettext(
6239
"Both --switch and a file list specified"))
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6241
raise errors.BzrCommandError(gettext(
6242
"Both --switch and --all specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6243
5761
elif switch == 'off':
6244
5762
if current_view is None:
6245
raise errors.BzrCommandError(gettext("No current view to disable"))
5763
raise errors.BzrCommandError("No current view to disable")
6246
5764
tree.views.set_view_info(None, view_dict)
6247
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6249
5767
tree.views.set_view_info(switch, view_dict)
6250
5768
view_str = views.view_display_str(tree.views.lookup_view())
6251
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6254
self.outf.write(gettext('Views defined:\n'))
5772
self.outf.write('Views defined:\n')
6255
5773
for view in sorted(view_dict):
6256
5774
if view == current_view:
6260
5778
view_str = views.view_display_str(view_dict[view])
6261
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6263
self.outf.write(gettext('No views defined.\n'))
5781
self.outf.write('No views defined.\n')
6264
5782
elif file_list:
6265
5783
if name is None:
6266
5784
# No name given and no current view set
6268
5786
elif name == 'off':
6269
raise errors.BzrCommandError(gettext(
6270
"Cannot change the 'off' pseudo view"))
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6271
5789
tree.views.set_view(name, sorted(file_list))
6272
5790
view_str = views.view_display_str(tree.views.lookup_view())
6273
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6275
5793
# list the files
6276
5794
if name is None:
6277
5795
# No name given and no current view set
6278
self.outf.write(gettext('No current view.\n'))
5796
self.outf.write('No current view.\n')
6280
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
6281
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6284
5802
class cmd_hooks(Command):
6378
5883
Option('destroy',
6379
5884
help='Destroy removed changes instead of shelving them.'),
6381
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6383
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6384
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6386
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6387
5892
from bzrlib.shelf_ui import Shelver
6388
5893
if writer is None:
6389
5894
writer = bzrlib.option.diff_writer_registry.get()
6391
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6392
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6473
5975
' deleting them.'),
6474
5976
Option('force', help='Do not prompt before deleting.')]
6475
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6476
force=False, directory=u'.'):
6477
5979
from bzrlib.clean_tree import clean_tree
6478
5980
if not (unknown or ignored or detritus):
6482
clean_tree(directory, unknown=unknown, ignored=ignored,
6483
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6486
5988
class cmd_reference(Command):
6530
6032
self.outf.write('%s %s\n' % (path, location))
6533
class cmd_export_pot(Command):
6534
__doc__ = """Export command helps and error messages in po format."""
6537
takes_options = [Option('plugin',
6538
help='Export help text from named command '\
6539
'(defaults to all built in commands).',
6542
def run(self, plugin=None):
6543
from bzrlib.export_pot import export_pot
6544
export_pot(self.outf, plugin)
6547
6035
def _register_lazy_builtins():
6548
6036
# register lazy builtins from other modules; called at startup and should
6549
6037
# be only called once.
6550
6038
for (name, aliases, module_name) in [
6551
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6552
('cmd_config', [], 'bzrlib.config'),
6553
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6554
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6555
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6556
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6557
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6558
('cmd_verify_signatures', [],
6559
'bzrlib.commit_signature_commands'),
6560
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6562
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
