172
177
:return: workingtree, [relative_paths]
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)
179
return WorkingTree.open_containing_paths(
180
file_list, default_directory='.',
223
185
def _get_view_info_for_change_reporter(tree):
310
288
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
289
versioned=False, no_pending=False, verbose=False,
312
291
from bzrlib.status import show_tree_status
314
293
if revision and len(revision) > 2:
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
294
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
295
' one or two revision specifiers'))
318
tree, relfile_list = tree_files(file_list)
297
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
298
# Avoid asking for specific files when that is not needed.
320
299
if relfile_list == ['']:
321
300
relfile_list = None
353
333
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
336
def run(self, revision_id=None, revision=None, directory=u'.'):
357
337
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
338
raise errors.BzrCommandError(gettext('You can only supply one of'
339
' revision_id or --revision'))
360
340
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
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]
365
346
revisions = b.repository.revisions
366
347
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
348
raise errors.BzrCommandError(gettext('Repository %r does not support '
349
'access to raw revision texts'))
370
351
b.repository.lock_read()
491
475
location_list=['.']
493
477
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
478
d = controldir.ControlDir.open(location)
497
481
working = d.open_workingtree()
498
482
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
483
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
484
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
485
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
486
" of a remote path"))
504
488
if (working.has_changes()):
505
489
raise errors.UncommittedChanges(working)
490
if working.get_shelf_manager().last_shelf() is not None:
491
raise errors.ShelvedChanges(working)
507
493
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
494
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
495
" from a lightweight checkout"))
511
497
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))
514
552
class cmd_revno(Command):
515
553
__doc__ = """Show current revision number.
520
558
_see_also = ['info']
521
559
takes_args = ['location?']
522
560
takes_options = [
523
Option('tree', help='Show revno of working tree'),
561
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
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"))
530
573
wt = WorkingTree.open_containing(location)[0]
574
self.add_cleanup(wt.lock_read().unlock)
532
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
576
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
578
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)
542
580
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
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)
546
595
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
596
self.outf.write(revno + '\n')
550
599
class cmd_revision_info(Command):
757
814
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
815
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
816
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
818
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
819
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
820
self.add_cleanup(work_tree.lock_read().unlock)
765
821
if revision is not None:
766
822
tree = revision.as_tree(work_tree.branch)
768
824
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
825
self.add_cleanup(tree.lock_read().unlock)
828
884
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
886
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
887
if names_list is None:
833
889
if len(names_list) < 2:
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)
890
raise errors.BzrCommandError(gettext("missing file argument"))
891
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
892
for file_name in rel_names[0:-1]:
894
raise errors.BzrCommandError(gettext("can not move root of branch"))
895
self.add_cleanup(tree.lock_tree_write().unlock)
838
896
self._run(tree, names_list, rel_names, after)
840
898
def run_auto(self, names_list, after, dry_run):
841
899
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
900
raise errors.BzrCommandError(gettext('Only one path may be specified to'
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
raise errors.BzrCommandError(gettext('--after cannot be specified with'
905
work_tree, file_list = WorkingTree.open_containing_paths(
906
names_list, default_directory='.')
907
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
908
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
910
def _run(self, tree, names_list, rel_names, after):
946
1004
match the remote one, use pull --overwrite. This will work even if the two
947
1005
branches have diverged.
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.
1007
If there is no default location set, the first pull will set it (use
1008
--no-remember to avoid setting it). After that, you can omit the
1009
location to use the default. To change the default, use --remember. The
1010
value will only be saved if the remote location can be accessed.
1012
The --verbose option will display the revisions pulled using the log_format
1013
configuration option. You can use a different format by overriding it with
1014
-Olog_format=<other_format>.
954
1016
Note: The location can be specified either in the form of a branch,
955
1017
or in the form of a path to a file containing a merge directive generated
960
1022
takes_options = ['remember', 'overwrite', 'revision',
961
1023
custom_help('verbose',
962
1024
help='Show logs of pulled revisions.'),
1025
custom_help('directory',
964
1026
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1027
'rather than the one containing the working directory.'),
970
1029
help="Perform a local pull in a bound "
971
1030
"branch. Local pulls are not applied to "
972
1031
"the master branch."
1034
help="Show base revision text in conflicts.")
975
1036
takes_args = ['location?']
976
1037
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1039
def run(self, location=None, remember=None, overwrite=False,
979
1040
revision=None, verbose=False,
980
directory=None, local=False):
1041
directory=None, local=False,
981
1043
# FIXME: too much stuff is in the command class
982
1044
revision_id = None
983
1045
mergeable = None
1077
1144
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1145
After that you will be able to do a push without '--overwrite'.
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.
1147
If there is no default push location set, the first push will set it (use
1148
--no-remember to avoid setting it). After that, you can omit the
1149
location to use the default. To change the default, use --remember. The
1150
value will only be saved if the remote location can be accessed.
1152
The --verbose option will display the revisions pushed using the log_format
1153
configuration option. You can use a different format by overriding it with
1154
-Olog_format=<other_format>.
1086
1157
_see_also = ['pull', 'update', 'working-trees']
1110
1178
Option('strict',
1111
1179
help='Refuse to push if there are uncommitted changes in'
1112
1180
' the working tree, --no-strict disables the check.'),
1182
help="Don't populate the working tree, even for protocols"
1183
" that support it."),
1114
1185
takes_args = ['location?']
1115
1186
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1188
def run(self, location=None, remember=None, overwrite=False,
1118
1189
create_prefix=False, verbose=False, revision=None,
1119
1190
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1191
stacked=False, strict=None, no_tree=False):
1121
1192
from bzrlib.push import _show_push_branch
1123
1194
if directory is None:
1124
1195
directory = '.'
1125
1196
# Get the source branch
1126
1197
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1198
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1199
# Get the tip's revision_id
1129
1200
revision = _get_one_revision('push', revision)
1130
1201
if revision is not None:
1151
1222
# error by the feedback given to them. RBC 20080227.
1152
1223
stacked_on = parent_url
1153
1224
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1225
raise errors.BzrCommandError(gettext(
1226
"Could not determine branch to refer to."))
1157
1228
# Get the destination location
1158
1229
if location is None:
1159
1230
stored_loc = br_from.get_push_location()
1160
1231
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1232
raise errors.BzrCommandError(gettext(
1233
"No push location known or specified."))
1164
1235
display_url = urlutils.unescape_for_display(stored_loc,
1165
1236
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1237
note(gettext("Using saved push location: %s") % display_url)
1167
1238
location = stored_loc
1169
1240
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1241
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1242
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1243
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1246
class cmd_branch(Command):
1214
1289
def run(self, from_location, to_location=None, revision=None,
1215
1290
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1291
use_existing_dir=False, switch=False, bind=False,
1217
1293
from bzrlib import switch as _mod_switch
1218
1294
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1295
if self.invoked_as in ['get', 'clone']:
1296
ui.ui_factory.show_user_warning(
1297
'deprecated_command',
1298
deprecated_name=self.invoked_as,
1299
recommended_name='branch',
1300
deprecated_in_version='2.4')
1301
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1303
if not (hardlink or files_from):
1304
# accelerator_tree is usually slower because you have to read N
1305
# files (no readahead, lots of seeks, etc), but allow the user to
1306
# explicitly request it
1307
accelerator_tree = None
1308
if files_from is not None and files_from != from_location:
1309
accelerator_tree = WorkingTree.open(files_from)
1221
1310
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1311
self.add_cleanup(br_from.lock_read().unlock)
1224
1312
if revision is not None:
1225
1313
revision_id = revision.as_revision_id(br_from)
1230
1318
revision_id = br_from.last_revision()
1231
1319
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1320
to_location = getattr(br_from, "name", None)
1321
if to_location is None:
1322
to_location = urlutils.derive_to_location(from_location)
1233
1323
to_transport = transport.get_transport(to_location)
1235
1325
to_transport.mkdir('.')
1236
1326
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1328
to_dir = controldir.ControlDir.open_from_transport(
1330
except errors.NotBranchError:
1331
if not use_existing_dir:
1332
raise errors.BzrCommandError(gettext('Target directory "%s" '
1333
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1338
to_dir.open_branch()
1243
1339
except errors.NotBranchError:
1246
1342
raise errors.AlreadyBranchError(to_location)
1247
1343
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1344
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
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)
1350
# preserve whatever source format we have.
1351
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1352
possible_transports=[to_transport],
1353
accelerator_tree=accelerator_tree,
1354
hardlink=hardlink, stacked=stacked,
1355
force_new_repo=standalone,
1356
create_tree_if_local=not no_tree,
1357
source_branch=br_from)
1358
branch = to_dir.open_branch(
1359
possible_transports=[
1360
br_from.bzrdir.root_transport, to_transport])
1361
except errors.NoSuchRevision:
1362
to_transport.delete_tree('.')
1363
msg = gettext("The branch {0} has no revision {1}.").format(
1364
from_location, revision)
1365
raise errors.BzrCommandError(msg)
1367
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1368
_merge_tags_if_possible(br_from, branch)
1266
1369
# If the source branch is stacked, the new branch may
1267
1370
# be stacked whether we asked for that explicitly or not.
1268
1371
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1373
note(gettext('Created new stacked branch referring to %s.') %
1271
1374
branch.get_stacked_on_url())
1272
1375
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1376
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1377
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1379
# Bind to the parent
1277
1380
parent_branch = Branch.open(from_location)
1278
1381
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1382
note(gettext('New branch bound to %s') % from_location)
1281
1384
# Switch to the new branch
1282
1385
wt, _ = WorkingTree.open_containing('.')
1283
1386
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1387
note(gettext('Switched to branch: %s'),
1285
1388
urlutils.unescape_for_display(branch.base, 'utf-8'))
1391
class cmd_branches(Command):
1392
__doc__ = """List the branches available at the current location.
1394
This command will print the names of all the branches at the current
1398
takes_args = ['location?']
1400
Option('recursive', short_name='R',
1401
help='Recursively scan for branches rather than '
1402
'just looking in the specified location.')]
1404
def run(self, location=".", recursive=False):
1406
t = transport.get_transport(location)
1407
if not t.listable():
1408
raise errors.BzrCommandError(
1409
"Can't scan this type of location.")
1410
for b in controldir.ControlDir.find_branches(t):
1411
self.outf.write("%s\n" % urlutils.unescape_for_display(
1412
urlutils.relative_url(t.base, b.base),
1413
self.outf.encoding).rstrip("/"))
1415
dir = controldir.ControlDir.open_containing(location)[0]
1416
for branch in dir.list_branches():
1417
if branch.name is None:
1418
self.outf.write(gettext(" (default)\n"))
1420
self.outf.write(" %s\n" % branch.name.encode(
1421
self.outf.encoding))
1288
1424
class cmd_checkout(Command):
1289
1425
__doc__ = """Create a new checkout of an existing branch.
1389
1528
class cmd_update(Command):
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
1529
__doc__ = """Update a working tree to a new revision.
1531
This will perform a merge of the destination revision (the tip of the
1532
branch, or the specified revision) into the working tree, and then make
1533
that revision the basis revision for the working tree.
1535
You can use this to visit an older revision, or to update a working tree
1536
that is out of date from its branch.
1538
If there are any uncommitted changes in the tree, they will be carried
1539
across and remain as uncommitted changes after the update. To discard
1540
these changes, use 'bzr revert'. The uncommitted changes may conflict
1541
with the changes brought in by the change in basis revision.
1543
If the tree's branch is bound to a master branch, bzr will also update
1400
1544
the branch from the master.
1546
You cannot update just a single file or directory, because each Bazaar
1547
working tree has just a single basis revision. If you want to restore a
1548
file that has been removed locally, use 'bzr revert' instead of 'bzr
1549
update'. If you want to restore a file to its state in a previous
1550
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1551
out the old content of that file to a new location.
1553
The 'dir' argument, if given, must be the location of the root of a
1554
working tree to update. By default, the working tree that contains the
1555
current working directory is used.
1403
1558
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1559
takes_args = ['dir?']
1405
takes_options = ['revision']
1560
takes_options = ['revision',
1562
help="Show base revision text in conflicts."),
1406
1564
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1566
def run(self, dir=None, revision=None, show_base=None):
1409
1567
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1568
raise errors.BzrCommandError(gettext(
1569
"bzr update --revision takes exactly one revision"))
1571
tree = WorkingTree.open_containing('.')[0]
1573
tree, relpath = WorkingTree.open_containing(dir)
1576
raise errors.BzrCommandError(gettext(
1577
"bzr update can only update a whole tree, "
1578
"not a file or subdirectory"))
1413
1579
branch = tree.branch
1414
1580
possible_transports = []
1415
1581
master = branch.get_master_branch(
1416
1582
possible_transports=possible_transports)
1417
1583
if master is not None:
1419
1584
branch_location = master.base
1587
branch_location = tree.branch.base
1421
1588
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1589
self.add_cleanup(tree.unlock)
1424
1590
# get rid of the final '/' and be ready for display
1425
1591
branch_location = urlutils.unescape_for_display(
1451
1617
change_reporter,
1452
1618
possible_transports=possible_transports,
1453
1619
revision=revision_id,
1621
show_base=show_base)
1455
1622
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1623
raise errors.BzrCommandError(gettext(
1457
1624
"branch has no revision %s\n"
1458
1625
"bzr update --revision only works"
1459
" for a revision in the branch history"
1626
" for a revision in the branch history")
1460
1627
% (e.revision))
1461
1628
revno = tree.branch.revision_id_to_dotted_revno(
1462
1629
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1630
note(gettext('Updated to revision {0} of branch {1}').format(
1631
'.'.join(map(str, revno)), branch_location))
1465
1632
parent_ids = tree.get_parent_ids()
1466
1633
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1634
note(gettext('Your local commits will now show as pending merges with '
1635
"'bzr status', and can be committed with 'bzr commit'."))
1469
1636
if conflicts != 0:
1513
1680
noise_level = 0
1514
1681
from bzrlib.info import show_bzrdir_info
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1682
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1516
1683
verbose=noise_level, outfile=self.outf)
1519
1686
class cmd_remove(Command):
1520
1687
__doc__ = """Remove files or directories.
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.
1689
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1690
delete them if they can easily be recovered using revert otherwise they
1691
will be backed up (adding an extention of the form .~#~). If no options or
1692
parameters are given Bazaar will scan for files that are being tracked by
1693
Bazaar but missing in your tree and stop tracking them for you.
1527
1695
takes_args = ['file*']
1528
1696
takes_options = ['verbose',
1530
1698
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1699
'The file deletion mode to be used.',
1532
1700
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1701
safe='Backup changed files (default).',
1535
1702
keep='Delete from bzr but leave the working copy.',
1703
no_backup='Don\'t backup changed files.',
1536
1704
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1705
'recovered and even if they are non-empty directories. '
1706
'(deprecated, use no-backup)')]
1538
1707
aliases = ['rm', 'del']
1539
1708
encoding_type = 'replace'
1541
1710
def run(self, file_list, verbose=False, new=False,
1542
1711
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1712
if file_deletion_strategy == 'force':
1713
note(gettext("(The --force option is deprecated, rather use --no-backup "
1715
file_deletion_strategy = 'no-backup'
1717
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1719
if file_list is not None:
1546
1720
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1722
self.add_cleanup(tree.lock_write().unlock)
1550
1723
# Heuristics should probably all move into tree.remove_smart or
1716
1903
help='Specify a format for this branch. '
1717
1904
'See "help formats".',
1718
1905
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1719
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1906
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1720
1907
value_switches=True,
1721
1908
title="Branch format",
1723
1910
Option('append-revisions-only',
1724
1911
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1912
' Append revisions to it only.'),
1914
'Create a branch without a working tree.')
1727
1916
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1917
create_prefix=False, no_tree=False):
1729
1918
if format is None:
1730
format = bzrdir.format_registry.make_bzrdir('default')
1919
format = controldir.format_registry.make_bzrdir('default')
1731
1920
if location is None:
1732
1921
location = u'.'
1742
1931
to_transport.ensure_base()
1743
1932
except errors.NoSuchFile:
1744
1933
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
1934
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
1935
" does not exist."
1747
1936
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
1937
" leading parent directories.")
1750
1939
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1942
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
1943
except errors.NotBranchError:
1755
1944
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1945
create_branch = controldir.ControlDir.create_branch_convenience
1947
force_new_tree = False
1949
force_new_tree = None
1757
1950
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1951
possible_transports=[to_transport],
1952
force_new_tree=force_new_tree)
1759
1953
a_bzrdir = branch.bzrdir
1761
1955
from bzrlib.transport.local import LocalTransport
1969
2182
elif ':' in prefix:
1970
2183
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2185
raise errors.BzrCommandError(gettext(
1973
2186
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2187
' (eg "old/:new/")'))
1976
2189
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2190
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2191
' one or two revision specifiers'))
1980
2193
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2194
raise errors.BzrCommandError(gettext(
2195
'{0} and {1} are mutually exclusive').format(
2196
'--using', '--format'))
1984
2198
(old_tree, new_tree,
1985
2199
old_branch, new_branch,
1986
2200
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2201
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2202
# GNU diff on Windows uses ANSI encoding for filenames
2203
path_encoding = osutils.get_diff_header_encoding()
1988
2204
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2205
specific_files=specific_files,
1990
2206
external_diff_options=diff_options,
1991
2207
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2208
extra_trees=extra_trees,
2209
path_encoding=path_encoding,
1993
2211
format_cls=format)
2003
2221
# level of effort but possibly much less IO. (Or possibly not,
2004
2222
# if the directories are very large...)
2005
2223
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2224
takes_options = ['directory', 'show-ids']
2008
2226
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2227
def run(self, show_ids=False, directory=u'.'):
2228
tree = WorkingTree.open_containing(directory)[0]
2229
self.add_cleanup(tree.lock_read().unlock)
2013
2230
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2231
self.add_cleanup(old.lock_read().unlock)
2016
2232
for path, ie in old.inventory.iter_entries():
2017
2233
if not tree.has_id(ie.file_id):
2018
2234
self.outf.write(path)
2053
2267
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2268
takes_options = ['directory', 'null']
2060
2270
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2271
def run(self, null=False, directory=u'.'):
2272
wt = WorkingTree.open_containing(directory)[0]
2273
self.add_cleanup(wt.lock_read().unlock)
2065
2274
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2275
self.add_cleanup(basis.lock_read().unlock)
2068
2276
basis_inv = basis.inventory
2069
2277
inv = wt.inventory
2070
2278
for file_id in inv:
2071
if file_id in basis_inv:
2279
if basis_inv.has_id(file_id):
2073
2281
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2283
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2284
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2287
self.outf.write(path + '\0')
2297
2513
Option('show-diff',
2298
2514
short_name='p',
2299
2515
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2516
Option('include-merged',
2301
2517
help='Show merged revisions like --levels 0 does.'),
2518
Option('include-merges', hidden=True,
2519
help='Historical alias for --include-merged.'),
2520
Option('omit-merges',
2521
help='Do not report commits with more than one parent.'),
2302
2522
Option('exclude-common-ancestry',
2303
2523
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2524
' of both ancestries (require -rX..Y).'
2526
Option('signatures',
2527
help='Show digital signature validity.'),
2530
help='Show revisions whose properties match this '
2533
ListOption('match-message',
2534
help='Show revisions whose message matches this '
2537
ListOption('match-committer',
2538
help='Show revisions whose committer matches this '
2541
ListOption('match-author',
2542
help='Show revisions whose authors match this '
2545
ListOption('match-bugs',
2546
help='Show revisions whose bugs match this '
2307
2550
encoding_type = 'replace'
2327
2579
_get_info_for_log_files,
2329
2581
direction = (forward and 'forward') or 'reverse'
2582
if symbol_versioning.deprecated_passed(include_merges):
2583
ui.ui_factory.show_user_warning(
2584
'deprecated_command_option',
2585
deprecated_name='--include-merges',
2586
recommended_name='--include-merged',
2587
deprecated_in_version='2.5',
2588
command=self.invoked_as)
2589
if include_merged is None:
2590
include_merged = include_merges
2592
raise errors.BzrCommandError(gettext(
2593
'{0} and {1} are mutually exclusive').format(
2594
'--include-merges', '--include-merged'))
2595
if include_merged is None:
2596
include_merged = False
2330
2597
if (exclude_common_ancestry
2331
2598
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2599
raise errors.BzrCommandError(gettext(
2600
'--exclude-common-ancestry requires -r with two revisions'))
2335
2602
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2605
raise errors.BzrCommandError(gettext(
2606
'{0} and {1} are mutually exclusive').format(
2607
'--levels', '--include-merged'))
2341
2609
if change is not None:
2342
2610
if len(change) > 1:
2343
2611
raise errors.RangeInChangeOption()
2344
2612
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2613
raise errors.BzrCommandError(gettext(
2614
'{0} and {1} are mutually exclusive').format(
2615
'--revision', '--change'))
2348
2617
revision = change
2528
2815
help='Recurse into subdirectories.'),
2529
2816
Option('from-root',
2530
2817
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2818
Option('unknown', short_name='u',
2819
help='Print unknown files.'),
2532
2820
Option('versioned', help='Print versioned files.',
2533
2821
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2822
Option('ignored', short_name='i',
2823
help='Print ignored files.'),
2824
Option('kind', short_name='k',
2539
2825
help='List entries of a particular kind: file, directory, symlink.',
2543
2831
@display_command
2544
2832
def run(self, revision=None, verbose=False,
2545
2833
recursive=False, from_root=False,
2546
2834
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2835
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2837
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2838
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2840
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2841
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2842
all = not (unknown or versioned or ignored)
2556
2844
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3023
self.outf.write("%s\n" % pattern)
2727
3025
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3026
raise errors.BzrCommandError(gettext("ignore requires at least one "
3027
"NAME_PATTERN or --default-rules."))
2730
3028
name_pattern_list = [globbing.normalize_pattern(p)
2731
3029
for p in name_pattern_list]
3031
bad_patterns_count = 0
3032
for p in name_pattern_list:
3033
if not globbing.Globster.is_pattern_valid(p):
3034
bad_patterns_count += 1
3035
bad_patterns += ('\n %s' % p)
3037
msg = (ngettext('Invalid ignore pattern found. %s',
3038
'Invalid ignore patterns found. %s',
3039
bad_patterns_count) % bad_patterns)
3040
ui.ui_factory.show_error(msg)
3041
raise errors.InvalidPattern('')
2732
3042
for name_pattern in name_pattern_list:
2733
3043
if (name_pattern[0] == '/' or
2734
3044
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3045
raise errors.BzrCommandError(gettext(
3046
"NAME_PATTERN should not be an absolute path"))
3047
tree, relpath = WorkingTree.open_containing(directory)
2738
3048
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3049
ignored = globbing.Globster(name_pattern_list)
3051
self.add_cleanup(tree.lock_read().unlock)
2742
3052
for entry in tree.list_files():
2744
3054
if id is not None:
2745
3055
filename = entry[0]
2746
3056
if ignored.match(filename):
2747
3057
matches.append(filename)
2749
3058
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3059
self.outf.write(gettext("Warning: the following files are version "
3060
"controlled and match your ignore pattern:\n%s"
2752
3061
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3062
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3065
class cmd_ignored(Command):
2842
3153
Option('per-file-timestamps',
2843
3154
help='Set modification time of files to that of the last '
2844
3155
'revision in which it was changed.'),
3156
Option('uncommitted',
3157
help='Export the working tree contents rather than that of the '
2846
3160
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3161
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3163
from bzrlib.export import export
2850
3165
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3166
branch_or_subdir = directory
3168
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3170
if tree is not None:
3171
self.add_cleanup(tree.lock_read().unlock)
3175
raise errors.BzrCommandError(
3176
gettext("--uncommitted requires a working tree"))
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3179
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3181
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3182
per_file_timestamps=per_file_timestamps)
2862
3183
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3184
raise errors.BzrCommandError(
3185
gettext('Unsupported export format: %s') % e.format)
2866
3188
class cmd_cat(Command):
2885
3207
@display_command
2886
3208
def run(self, filename, revision=None, name_from_revision=False,
3209
filters=False, directory=None):
2888
3210
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3211
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3212
" one revision specifier"))
2891
3213
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3214
_open_directory_or_containing_tree_or_branch(filename, directory)
3215
self.add_cleanup(branch.lock_read().unlock)
2895
3216
return self._run(tree, branch, relpath, filename, revision,
2896
3217
name_from_revision, filters)
2900
3221
if tree is None:
2901
3222
tree = b.basis_tree()
2902
3223
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3224
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3226
old_file_id = rev_tree.path2id(relpath)
3228
# TODO: Split out this code to something that generically finds the
3229
# best id for a path across one or more trees; it's like
3230
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3232
if name_from_revision:
2909
3233
# Try in revision if requested
2910
3234
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3235
raise errors.BzrCommandError(gettext(
3236
"{0!r} is not present in revision {1}").format(
2913
3237
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3239
actual_file_id = old_file_id
2917
3241
cur_file_id = tree.path2id(relpath)
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" % (
3242
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3243
actual_file_id = cur_file_id
3244
elif old_file_id is not None:
3245
actual_file_id = old_file_id
3247
raise errors.BzrCommandError(gettext(
3248
"{0!r} is not present in revision {1}").format(
2935
3249
filename, rev_tree.get_revision_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)
3251
from bzrlib.filter_tree import ContentFilterTree
3252
filter_tree = ContentFilterTree(rev_tree,
3253
rev_tree._content_filter_stack)
3254
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3256
content = rev_tree.get_file_text(actual_file_id)
3258
self.outf.write(content)
2952
3261
class cmd_local_time_offset(Command):
3013
3322
to trigger updates to external systems like bug trackers. The --fixes
3014
3323
option can be used to record the association between a revision and
3015
3324
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
3043
3327
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3328
takes_args = ['selected*']
3076
3360
Option('show-diff', short_name='p',
3077
3361
help='When no message is supplied, show the diff along'
3078
3362
' with the status summary in the message editor.'),
3364
help='When committing to a foreign version control '
3365
'system do not push data that can not be natively '
3080
3368
aliases = ['ci', 'checkin']
3082
3370
def _iter_bug_fix_urls(self, fixes, branch):
3371
default_bugtracker = None
3083
3372
# Configure the properties for bug fixing attributes.
3084
3373
for fixed_bug in fixes:
3085
3374
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3375
if len(tokens) == 1:
3376
if default_bugtracker is None:
3377
branch_config = branch.get_config()
3378
default_bugtracker = branch_config.get_user_option(
3380
if default_bugtracker is None:
3381
raise errors.BzrCommandError(gettext(
3382
"No tracker specified for bug %s. Use the form "
3383
"'tracker:id' or specify a default bug tracker "
3384
"using the `bugtracker` option.\nSee "
3385
"\"bzr help bugs\" for more information on this "
3386
"feature. Commit refused.") % fixed_bug)
3387
tag = default_bugtracker
3389
elif len(tokens) != 2:
3390
raise errors.BzrCommandError(gettext(
3088
3391
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3392
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3393
"feature.\nCommit refused.") % fixed_bug)
3395
tag, bug_id = tokens
3093
3397
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3398
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3399
raise errors.BzrCommandError(gettext(
3400
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3401
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3402
raise errors.BzrCommandError(gettext(
3403
"%s\nCommit refused.") % (str(e),))
3101
3405
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3406
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3407
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3409
from bzrlib.errors import (
3105
3410
PointlessCommit,
3106
3411
ConflictsInTree,
3184
3487
# make_commit_message_template_encoded returns user encoding.
3185
3488
# We probably want to be using edit_commit_message instead to
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")
3490
my_message = set_commit_message(commit_obj)
3491
if my_message is None:
3492
start_message = generate_commit_message_template(commit_obj)
3493
my_message = edit_commit_message_encoded(text,
3494
start_message=start_message)
3495
if my_message is None:
3496
raise errors.BzrCommandError(gettext("please specify a commit"
3497
" message with either --message or --file"))
3498
if my_message == "":
3499
raise errors.BzrCommandError(gettext("Empty commit message specified."
3500
" Please specify a commit message with either"
3501
" --message or --file or leave a blank message"
3502
" with --message \"\"."))
3195
3503
return my_message
3197
3505
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3513
reporter=None, verbose=verbose, revprops=properties,
3206
3514
authors=author, timestamp=commit_stamp,
3207
3515
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3516
exclude=tree.safe_relpath_files(exclude),
3209
3518
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3519
raise errors.BzrCommandError(gettext("No changes to commit."
3520
" Please 'bzr add' the files you want to commit, or use"
3521
" --unchanged to force an empty commit."))
3212
3522
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3523
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3524
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3526
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3527
raise errors.BzrCommandError(gettext("Commit refused because there are"
3528
" unknown files in the working tree."))
3219
3529
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3530
e.extra_help = (gettext("\n"
3221
3531
'To commit to master branch, run update and then commit.\n'
3222
3532
'You can also pass --local to commit to continue working '
3297
3607
class cmd_upgrade(Command):
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.
3608
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3610
When the default format has changed after a major new release of
3611
Bazaar, you may be informed during certain operations that you
3612
should upgrade. Upgrading to a newer format may improve performance
3613
or make new features available. It may however limit interoperability
3614
with older repositories or with older versions of Bazaar.
3616
If you wish to upgrade to a particular format rather than the
3617
current default, that can be specified using the --format option.
3618
As a consequence, you can use the upgrade command this way to
3619
"downgrade" to an earlier format, though some conversions are
3620
a one way process (e.g. changing from the 1.x default to the
3621
2.x default) so downgrading is not always possible.
3623
A backup.bzr.~#~ directory is created at the start of the conversion
3624
process (where # is a number). By default, this is left there on
3625
completion. If the conversion fails, delete the new .bzr directory
3626
and rename this one back in its place. Use the --clean option to ask
3627
for the backup.bzr directory to be removed on successful conversion.
3628
Alternatively, you can delete it by hand if everything looks good
3631
If the location given is a shared repository, dependent branches
3632
are also converted provided the repository converts successfully.
3633
If the conversion of a branch fails, remaining branches are still
3636
For more information on upgrades, see the Bazaar Upgrade Guide,
3637
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3640
_see_also = ['check', 'reconcile', 'formats']
3306
3641
takes_args = ['url?']
3307
3642
takes_options = [
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'),
3643
RegistryOption('format',
3644
help='Upgrade to a specific format. See "bzr help'
3645
' formats" for details.',
3646
lazy_registry=('bzrlib.controldir', 'format_registry'),
3647
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3648
value_switches=True, title='Branch format'),
3650
help='Remove the backup.bzr directory if successful.'),
3652
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3655
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3656
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3657
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3659
if len(exceptions) == 1:
3660
# Compatibility with historical behavior
3321
3666
class cmd_whoami(Command):
3340
3686
encoding_type = 'replace'
3342
3688
@display_command
3343
def run(self, email=False, branch=False, name=None):
3689
def run(self, email=False, branch=False, name=None, directory=None):
3344
3690
if name is None:
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()
3691
if directory is None:
3692
# use branch if we're inside one; otherwise global config
3694
c = Branch.open_containing(u'.')[0].get_config()
3695
except errors.NotBranchError:
3696
c = _mod_config.GlobalConfig()
3698
c = Branch.open(directory).get_config()
3351
3700
self.outf.write(c.user_email() + '\n')
3353
3702
self.outf.write(c.username() + '\n')
3706
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3709
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3711
_mod_config.extract_email_address(name)
3359
3712
except errors.NoEmailInUsername, e:
3360
3713
warning('"%s" does not seem to contain an email address. '
3361
3714
'This is allowed, but not recommended.', name)
3363
3716
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3718
if directory is None:
3719
c = Branch.open_containing(u'.')[0].get_config()
3721
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3723
c = _mod_config.GlobalConfig()
3368
3724
c.set_user_option('email', name)
3586
3947
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3948
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3950
first=False, list_only=False,
3590
3951
randomize=None, exclude=None, strict=False,
3591
3952
load_list=None, debugflag=None, starting_with=None, subunit=False,
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)
3953
parallel=None, lsprof_tests=False,
3955
from bzrlib import tests
3602
3957
if testspecs_list is not None:
3603
3958
pattern = '|'.join(testspecs_list)
3608
3963
from bzrlib.tests import SubUnitBzrRunner
3609
3964
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3965
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3966
"needs to be installed to use --subunit."))
3612
3967
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3968
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3969
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3970
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3971
# following code can be deleted when it's sufficiently deployed
3972
# -- vila/mgz 20100514
3973
if (sys.platform == "win32"
3974
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3976
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3978
self.additional_selftest_args.setdefault(
3620
3979
'suite_decorators', []).append(parallel)
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)
3981
raise errors.BzrCommandError(gettext(
3982
"--benchmark is no longer supported from bzr 2.2; "
3983
"use bzr-usertest instead"))
3984
test_suite_factory = None
3986
exclude_pattern = None
3629
test_suite_factory = None
3988
exclude_pattern = '(' + '|'.join(exclude) + ')'
3990
self._disable_fsync()
3631
3991
selftest_kwargs = {"verbose": verbose,
3632
3992
"pattern": pattern,
3633
3993
"stop_on_failure": one,
3635
3995
"test_suite_factory": test_suite_factory,
3636
3996
"lsprof_timed": lsprof_timed,
3637
3997
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3998
"matching_tests_first": first,
3640
3999
"list_only": list_only,
3641
4000
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4001
"exclude_pattern": exclude_pattern,
3643
4002
"strict": strict,
3644
4003
"load_list": load_list,
3645
4004
"debug_flags": debugflag,
3646
4005
"starting_with": starting_with
3648
4007
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4009
# Make deprecation warnings visible, unless -Werror is set
4010
cleanup = symbol_versioning.activate_deprecation_warnings(
4013
result = tests.selftest(**selftest_kwargs)
3650
4016
return int(not result)
4018
def _disable_fsync(self):
4019
"""Change the 'os' functionality to not synchronize."""
4020
self._orig_fsync = getattr(os, 'fsync', None)
4021
if self._orig_fsync is not None:
4022
os.fsync = lambda filedes: None
4023
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4024
if self._orig_fdatasync is not None:
4025
os.fdatasync = lambda filedes: None
3653
4028
class cmd_version(Command):
3654
4029
__doc__ = """Show version of bzr."""
3709
4082
The source of the merge can be specified either in the form of a branch,
3710
4083
or in the form of a path to a file containing a merge directive generated
3711
4084
with bzr send. If neither is specified, the default is the upstream 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.
4085
or the branch most recently merged using --remember. The source of the
4086
merge may also be specified in the form of a path to a file in another
4087
branch: in this case, only the modifications to that file are merged into
4088
the current working tree.
4090
When merging from a branch, by default bzr will try to merge in all new
4091
work from the other branch, automatically determining an appropriate base
4092
revision. If this fails, you may need to give an explicit base.
4094
To pick a different ending revision, pass "--revision OTHER". bzr will
4095
try to merge in all new work up to and including revision OTHER.
4097
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4098
through OTHER, excluding BASE but including OTHER, will be merged. If this
4099
causes some revisions to be skipped, i.e. if the destination branch does
4100
not already contain revision BASE, such a merge is commonly referred to as
4101
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4102
cherrypicks. The changes look like a normal commit, and the history of the
4103
changes from the other branch is not stored in the commit.
4105
Revision numbers are always relative to the source branch.
3725
4107
Merge will do its best to combine the changes in two branches, but there
3726
4108
are some kinds of problems only a human can fix. When it encounters those,
3730
4112
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
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.
4114
If there is no default branch set, the first merge will set it (use
4115
--no-remember to avoid setting it). After that, you can omit the branch
4116
to use the default. To change the default, use --remember. The value will
4117
only be saved if the remote location can be accessed.
3737
4119
The results of the merge are placed into the destination working
3738
4120
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4121
committed to record the result of the merge.
3741
4123
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4124
--force is given. If --force is given, then the changes from the source
4125
will be merged with the current working tree, including any uncommitted
4126
changes in the tree. The --force option can also be used to create a
3743
4127
merge revision which has more than two parents.
3745
4129
If one would like to merge changes from the working tree of the other
3847
4231
mergeable = None
3849
4233
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4234
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4235
' with bundles or merge directives.'))
3853
4237
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4238
raise errors.BzrCommandError(gettext(
4239
'Cannot use -r with merge directives or bundles'))
3856
4240
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4241
mergeable, None)
3859
4243
if merger is None and uncommitted:
3860
4244
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4245
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4246
' --revision at the same time.'))
3863
4247
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4248
allow_pending = False
3873
4257
self.sanity_check_merger(merger)
3874
4258
if (merger.base_rev_id == merger.other_rev_id and
3875
4259
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4260
# check if location is a nonexistent file (and not a branch) to
4261
# disambiguate the 'Nothing to do'
4262
if merger.interesting_files:
4263
if not merger.other_tree.has_filename(
4264
merger.interesting_files[0]):
4265
note(gettext("merger: ") + str(merger))
4266
raise errors.PathsDoNotExist([location])
4267
note(gettext('Nothing to do.'))
4269
if pull and not preview:
3879
4270
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4271
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4272
if (merger.base_rev_id == tree.last_revision()):
3882
4273
result = tree.pull(merger.other_branch, False,
3883
4274
merger.other_rev_id)
3884
4275
result.report(self.outf)
3886
4277
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4278
raise errors.BzrCommandError(gettext(
3888
4279
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4280
" (perhaps you would prefer 'bzr pull')"))
3891
4282
return self._do_preview(merger)
3892
4283
elif interactive:
3988
4381
if other_revision_id is None:
3989
4382
other_revision_id = _mod_revision.ensure_null(
3990
4383
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4384
# Remember where we merge from. We need to remember if:
4385
# - user specify a location (and we don't merge from the parent
4387
# - user ask to remember or there is no previous location set to merge
4388
# from and user didn't ask to *not* remember
4389
if (user_location is not None
4391
or (remember is None
4392
and tree.branch.get_submit_branch() is None)))):
3994
4393
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4394
# Merge tags (but don't set them in the master branch yet, the user
4395
# might revert this merge). Commit will propagate them.
4396
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4397
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4398
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4399
if other_path != '':
4340
4743
theirs_only=False,
4341
4744
log_format=None, long=False, short=False, line=False,
4342
4745
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4746
include_merged=None, revision=None, my_revision=None,
4748
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4749
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4750
def message(s):
4346
4751
if not is_quiet():
4347
4752
self.outf.write(s)
4754
if symbol_versioning.deprecated_passed(include_merges):
4755
ui.ui_factory.show_user_warning(
4756
'deprecated_command_option',
4757
deprecated_name='--include-merges',
4758
recommended_name='--include-merged',
4759
deprecated_in_version='2.5',
4760
command=self.invoked_as)
4761
if include_merged is None:
4762
include_merged = include_merges
4764
raise errors.BzrCommandError(gettext(
4765
'{0} and {1} are mutually exclusive').format(
4766
'--include-merges', '--include-merged'))
4767
if include_merged is None:
4768
include_merged = False
4350
4770
mine_only = this
4359
4779
elif theirs_only:
4360
4780
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4782
local_branch = Branch.open_containing(directory)[0]
4783
self.add_cleanup(local_branch.lock_read().unlock)
4366
4785
parent = local_branch.get_parent()
4367
4786
if other_branch is None:
4368
4787
other_branch = parent
4369
4788
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4789
raise errors.BzrCommandError(gettext("No peer location known"
4372
4791
display_url = urlutils.unescape_for_display(parent,
4373
4792
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4793
message(gettext("Using saved parent location: {0}\n").format(
4377
4796
remote_branch = Branch.open(other_branch)
4378
4797
if remote_branch.base == local_branch.base:
4379
4798
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4800
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4802
local_revid_range = _revision_range_to_revid_range(
4385
4803
_get_revision_range(my_revision, local_branch,
4430
4852
if mine_only and not local_extra:
4431
4853
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4854
message(gettext('This branch has no new revisions.\n'))
4433
4855
elif theirs_only and not remote_extra:
4434
4856
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4857
message(gettext('Other branch has no new revisions.\n'))
4436
4858
elif not (mine_only or theirs_only or local_extra or
4438
4860
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4862
message(gettext("Branches are up to date.\n"))
4441
4863
self.cleanup_now()
4442
4864
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4865
self.add_cleanup(local_branch.lock_write().unlock)
4445
4866
# handle race conditions - a parent might be set while we run.
4446
4867
if local_branch.get_parent() is None:
4447
4868
local_branch.set_parent(remote_branch.base)
4507
4928
@display_command
4508
4929
def run(self, verbose=False):
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")
4930
from bzrlib import plugin
4931
# Don't give writelines a generator as some codecs don't like that
4932
self.outf.writelines(
4933
list(plugin.describe_plugins(show_paths=verbose)))
4531
4936
class cmd_testament(Command):
4578
4982
Option('long', help='Show commit date in annotations.'),
4582
4987
encoding_type = 'exact'
4584
4989
@display_command
4585
4990
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4991
show_ids=False, directory=None):
4992
from bzrlib.annotate import (
4588
4995
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4996
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4997
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4998
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5000
self.add_cleanup(branch.lock_read().unlock)
4596
5001
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5002
self.add_cleanup(tree.lock_read().unlock)
5003
if wt is not None and revision is None:
4600
5004
file_id = wt.path2id(relpath)
4602
5006
file_id = tree.path2id(relpath)
4603
5007
if file_id is None:
4604
5008
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5009
if wt is not None and revision is None:
4607
5010
# If there is a tree and we're not annotating historical
4608
5011
# versions, annotate the working tree's content.
4609
5012
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5013
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5015
annotate_file_tree(tree, file_id, self.outf, long, all,
5016
show_ids=show_ids, branch=branch)
4616
5019
class cmd_re_sign(Command):
4620
5023
hidden = True # is this right ?
4621
5024
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5025
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5027
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5028
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5029
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5030
if revision_id_list is None and revision is None:
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)
5031
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5032
b = WorkingTree.open_containing(directory)[0].branch
5033
self.add_cleanup(b.lock_write().unlock)
4632
5034
return self._run(b, revision_id_list, revision)
4634
5036
def _run(self, b, revision_id_list, revision):
4694
5096
_see_also = ['checkouts', 'unbind']
4695
5097
takes_args = ['location?']
5098
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5100
def run(self, location=None, directory=u'.'):
5101
b, relpath = Branch.open_containing(directory)
4700
5102
if location is None:
4702
5104
location = b.get_old_bound_location()
4703
5105
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5106
raise errors.BzrCommandError(gettext('No location supplied. '
5107
'This format does not remember old locations.'))
4707
5109
if location is None:
4708
5110
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5111
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5113
raise errors.BzrCommandError(gettext('No location supplied '
5114
'and no previous location known'))
4713
5115
b_other = Branch.open(location)
4715
5117
b.bind(b_other)
4716
5118
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5119
raise errors.BzrCommandError(gettext('These branches have diverged.'
5120
' Try merging, and then bind again.'))
4719
5121
if b.get_config().has_explicit_nickname():
4720
5122
b.nick = b_other.nick
4784
5187
b = control.open_branch()
4786
5189
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5190
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5192
self.add_cleanup(b.lock_write().unlock)
5193
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5196
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5198
from bzrlib.log import log_formatter, show_log
4796
5199
from bzrlib.uncommit import uncommit
4827
5230
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5233
self.outf.write(gettext('Dry-run, pretending to remove'
5234
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5236
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5239
if not ui.ui_factory.confirm_action(
5240
gettext(u'Uncommit these revisions'),
5241
'bzrlib.builtins.uncommit',
5243
self.outf.write(gettext('Canceled\n'))
4840
5246
mutter('Uncommitting from {%s} to {%s}',
4841
5247
last_rev_id, rev_id)
4842
5248
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
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)
5249
revno=revno, local=local, keep_tags=keep_tags)
5250
self.outf.write(gettext('You can restore the old tip by running:\n'
5251
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5254
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5255
__doc__ = """Break a dead lock.
5257
This command breaks a lock on a repository, branch, working directory or
4851
5260
CAUTION: Locks should only be broken when you are sure that the process
4852
5261
holding the lock has been stopped.
4859
5268
bzr break-lock bzr+ssh://example.com/bzr/foo
5269
bzr break-lock --conf ~/.bazaar
4861
5272
takes_args = ['location?']
5275
help='LOCATION is the directory where the config lock is.'),
5277
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5280
def run(self, location=None, config=False, force=False):
4864
5281
if location is None:
4865
5282
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5284
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5286
{'bzrlib.lockdir.break': True})
5288
conf = _mod_config.LockableConfig(file_name=location)
5291
control, relpath = controldir.ControlDir.open_containing(location)
5293
control.break_lock()
5294
except NotImplementedError:
4873
5298
class cmd_wait_until_signalled(Command):
4936
5362
return host, port
4938
5364
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5365
protocol=None, client_timeout=None):
5366
from bzrlib import transport
4941
5367
if directory is None:
4942
5368
directory = os.getcwd()
4943
5369
if protocol is None:
4944
protocol = transport_server_registry.get()
5370
protocol = transport.transport_server_registry.get()
4945
5371
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5372
url = transport.location_to_url(directory)
4947
5373
if not allow_writes:
4948
5374
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5375
t = transport.get_transport_from_url(url)
5377
protocol(t, host, port, inet, client_timeout)
5378
except TypeError, e:
5379
# We use symbol_versioning.deprecated_in just so that people
5380
# grepping can find it here.
5381
# symbol_versioning.deprecated_in((2, 5, 0))
5382
symbol_versioning.warn(
5383
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5384
'Most likely it needs to be updated to support a'
5385
' "timeout" parameter (added in bzr 2.5.0)'
5386
% (e, protocol.__module__, protocol),
5388
protocol(t, host, port, inet)
4953
5391
class cmd_join(Command):
5359
5802
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5803
self.add_cleanup(branch.lock_write().unlock)
5363
5805
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5806
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5807
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5808
note(gettext('Deleted tag %s.') % tag_name)
5369
5811
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5812
raise errors.BzrCommandError(gettext(
5371
5813
"Tags can only be placed on a single revision, "
5373
5815
revision_id = revision[0].as_revision_id(branch)
5375
5817
revision_id = branch.last_revision()
5376
5818
if tag_name is None:
5377
5819
tag_name = branch.automatic_tag_name(revision_id)
5378
5820
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5821
raise errors.BzrCommandError(gettext(
5822
"Please specify a tag name."))
5824
existing_target = branch.tags.lookup_tag(tag_name)
5825
except errors.NoSuchTag:
5826
existing_target = None
5827
if not force and existing_target not in (None, revision_id):
5382
5828
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5829
if existing_target == revision_id:
5830
note(gettext('Tag %s already exists for that revision.') % tag_name)
5832
branch.tags.set_tag(tag_name, revision_id)
5833
if existing_target is None:
5834
note(gettext('Created tag %s.') % tag_name)
5836
note(gettext('Updated tag %s.') % tag_name)
5387
5839
class cmd_tags(Command):
5393
5845
_see_also = ['tag']
5394
5846
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5847
custom_help('directory',
5848
help='Branch whose tags should be displayed.'),
5849
RegistryOption('sort',
5401
5850
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5851
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5857
@display_command
5858
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5859
from bzrlib.tag import tag_sort_methods
5416
5860
branch, relpath = Branch.open_containing(directory)
5418
5862
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5866
self.add_cleanup(branch.lock_read().unlock)
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]])
5868
# Restrict to the specified range
5869
tags = self._tags_for_range(branch, revision)
5871
sort = tag_sort_methods.get()
5444
5873
if not show_ids:
5445
5874
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5875
for index, (tag, revid) in enumerate(tags):
5457
5888
for tag, revspec in tags:
5458
5889
self.outf.write('%-20s %s\n' % (tag, revspec))
5891
def _tags_for_range(self, branch, revision):
5893
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5894
revid1, revid2 = rev1.rev_id, rev2.rev_id
5895
# _get_revision_range will always set revid2 if it's not specified.
5896
# If revid1 is None, it means we want to start from the branch
5897
# origin which is always a valid ancestor. If revid1 == revid2, the
5898
# ancestry check is useless.
5899
if revid1 and revid1 != revid2:
5900
# FIXME: We really want to use the same graph than
5901
# branch.iter_merge_sorted_revisions below, but this is not
5902
# easily available -- vila 2011-09-23
5903
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5904
# We don't want to output anything in this case...
5906
# only show revisions between revid1 and revid2 (inclusive)
5907
tagged_revids = branch.tags.get_reverse_tag_dict()
5909
for r in branch.iter_merge_sorted_revisions(
5910
start_revision_id=revid2, stop_revision_id=revid1,
5911
stop_rule='include'):
5912
revid_tags = tagged_revids.get(r[0], None)
5914
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5918
class cmd_reconfigure(Command):
5462
5919
__doc__ = """Reconfigure the type of a bzr directory.
5476
5933
takes_args = ['location?']
5477
5934
takes_options = [
5478
5935
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5938
help='The relation between branch and tree.',
5482
5939
value_switches=True, enum_switch=False,
5483
5940
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5941
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5942
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5943
lightweight_checkout='Reconfigure to be a lightweight'
5487
5944
' checkout (with no local history).',
5946
RegistryOption.from_kwargs(
5948
title='Repository type',
5949
help='Location fo the repository.',
5950
value_switches=True, enum_switch=False,
5488
5951
standalone='Reconfigure to be a standalone branch '
5489
5952
'(i.e. stop using shared repository).',
5490
5953
use_shared='Reconfigure to use a shared repository.',
5955
RegistryOption.from_kwargs(
5957
title='Trees in Repository',
5958
help='Whether new branches in the repository have trees.',
5959
value_switches=True, enum_switch=False,
5491
5960
with_trees='Reconfigure repository to create '
5492
5961
'working trees on branches by default.',
5493
5962
with_no_trees='Reconfigure repository to not create '
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5513
directory = bzrdir.BzrDir.open(location)
5979
def run(self, location=None, bind_to=None, force=False,
5980
tree_type=None, repository_type=None, repository_trees=None,
5981
stacked_on=None, unstacked=None):
5982
directory = controldir.ControlDir.open(location)
5514
5983
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5984
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
5985
elif stacked_on is not None:
5517
5986
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
5987
elif unstacked:
5520
5989
# At the moment you can use --stacked-on and a different
5521
5990
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
5992
if (tree_type is None and
5993
repository_type is None and
5994
repository_trees is None):
5524
5995
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5998
raise errors.BzrCommandError(gettext('No target configuration '
6000
reconfiguration = None
6001
if tree_type == 'branch':
5530
6002
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6003
elif tree_type == 'tree':
5532
6004
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6005
elif tree_type == 'checkout':
5534
6006
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6007
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6008
elif tree_type == 'lightweight-checkout':
5537
6009
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6010
directory, bind_to)
5539
elif target_type == 'use-shared':
6012
reconfiguration.apply(force)
6013
reconfiguration = None
6014
if repository_type == 'use-shared':
5540
6015
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6016
elif repository_type == 'standalone':
5542
6017
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6019
reconfiguration.apply(force)
6020
reconfiguration = None
6021
if repository_trees == 'with-trees':
5544
6022
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6023
directory, True)
5546
elif target_type == 'with-no-trees':
6024
elif repository_trees == 'with-no-trees':
5547
6025
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6026
directory, False)
5549
reconfiguration.apply(force)
6028
reconfiguration.apply(force)
6029
reconfiguration = None
5552
6032
class cmd_switch(Command):
5600
6081
had_explicit_nick = False
5601
6082
if create_branch:
5602
6083
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
6084
raise errors.BzrCommandError(gettext('cannot create branch without'
5605
6086
to_location = directory_service.directories.dereference(
5607
6088
if '/' not in to_location and '\\' not in to_location:
5608
6089
# This path is meant to be relative to the existing branch
5609
6090
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6091
# Perhaps the target control dir supports colocated branches?
6093
root = controldir.ControlDir.open(this_url,
6094
possible_transports=[control_dir.user_transport])
6095
except errors.NotBranchError:
6098
colocated = root._format.colocated_branches
6100
to_location = urlutils.join_segment_parameters(this_url,
6101
{"branch": urlutils.escape(to_location)})
6103
to_location = urlutils.join(
6104
this_url, '..', urlutils.escape(to_location))
5611
6105
to_branch = branch.bzrdir.sprout(to_location,
5612
6106
possible_transports=[branch.bzrdir.root_transport],
5613
6107
source_branch=branch).open_branch()
6109
# Perhaps it's a colocated branch?
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))
6111
to_branch = control_dir.open_branch(to_location)
6112
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6114
to_branch = Branch.open(to_location)
6115
except errors.NotBranchError:
6116
this_url = self._get_branch_location(control_dir)
6117
to_branch = Branch.open(
6119
this_url, '..', urlutils.escape(to_location)))
5621
6120
if revision is not None:
5622
6121
revision = revision.as_revision_id(to_branch)
5623
6122
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6123
if had_explicit_nick:
5625
6124
branch = control_dir.open_branch() #get the new branch!
5626
6125
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6126
note(gettext('Switched to branch: %s'),
5628
6127
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
6129
def _get_branch_location(self, control_dir):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6234
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6236
current_view, view_dict = tree.views.get_view_info()
5737
6237
if name is None:
5738
6238
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6241
raise errors.BzrCommandError(gettext(
6242
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6244
raise errors.BzrCommandError(gettext(
6245
"Both --delete and --switch specified"))
5747
6247
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6248
self.outf.write(gettext("Deleted all views.\n"))
5749
6249
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6250
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6252
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6253
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6256
raise errors.BzrCommandError(gettext(
6257
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6259
raise errors.BzrCommandError(gettext(
6260
"Both --switch and --all specified"))
5761
6261
elif switch == 'off':
5762
6262
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6263
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6264
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6265
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6267
tree.views.set_view_info(switch, view_dict)
5768
6268
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6269
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6272
self.outf.write(gettext('Views defined:\n'))
5773
6273
for view in sorted(view_dict):
5774
6274
if view == current_view:
5778
6278
view_str = views.view_display_str(view_dict[view])
5779
6279
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6281
self.outf.write(gettext('No views defined.\n'))
5782
6282
elif file_list:
5783
6283
if name is None:
5784
6284
# No name given and no current view set
5786
6286
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6287
raise errors.BzrCommandError(gettext(
6288
"Cannot change the 'off' pseudo view"))
5789
6289
tree.views.set_view(name, sorted(file_list))
5790
6290
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6291
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6293
# list the files
5794
6294
if name is None:
5795
6295
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6296
self.outf.write(gettext('No current view.\n'))
5798
6298
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6299
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6302
class cmd_hooks(Command):
5883
6396
Option('destroy',
5884
6397
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6399
_see_also = ['unshelve', 'configuration']
5888
6401
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6402
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6404
return self.run_for_list(directory=directory)
5892
6405
from bzrlib.shelf_ui import Shelver
5893
6406
if writer is None:
5894
6407
writer = bzrlib.option.diff_writer_registry.get()
5896
6409
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6410
file_list, message, destroy=destroy, directory=directory)
5975
6491
' deleting them.'),
5976
6492
Option('force', help='Do not prompt before deleting.')]
5977
6493
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6494
force=False, directory=u'.'):
5979
6495
from bzrlib.clean_tree import clean_tree
5980
6496
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6500
clean_tree(directory, unknown=unknown, ignored=ignored,
6501
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6504
class cmd_reference(Command):
6032
6548
self.outf.write('%s %s\n' % (path, location))
6551
class cmd_export_pot(Command):
6552
__doc__ = """Export command helps and error messages in po format."""
6555
takes_options = [Option('plugin',
6556
help='Export help text from named command '\
6557
'(defaults to all built in commands).',
6560
def run(self, plugin=None):
6561
from bzrlib.export_pot import export_pot
6562
export_pot(self.outf, plugin)
6035
6565
def _register_lazy_builtins():
6036
6566
# register lazy builtins from other modules; called at startup and should
6037
6567
# be only called once.
6038
6568
for (name, aliases, module_name) in [
6039
6569
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6570
('cmd_config', [], 'bzrlib.config'),
6040
6571
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6572
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6573
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6574
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6575
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6576
('cmd_verify_signatures', [],
6577
'bzrlib.commit_signature_commands'),
6578
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6580
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
