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.
521
559
takes_args = ['location?']
522
560
takes_options = [
523
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
809
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
810
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
811
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
813
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)
814
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
815
self.add_cleanup(work_tree.lock_read().unlock)
765
816
if revision is not None:
766
817
tree = revision.as_tree(work_tree.branch)
768
819
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
820
self.add_cleanup(tree.lock_read().unlock)
828
879
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
881
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
882
if names_list is None:
833
884
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)
885
raise errors.BzrCommandError(gettext("missing file argument"))
886
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
887
self.add_cleanup(tree.lock_tree_write().unlock)
838
888
self._run(tree, names_list, rel_names, after)
840
890
def run_auto(self, names_list, after, dry_run):
841
891
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
892
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)
895
raise errors.BzrCommandError(gettext('--after cannot be specified with'
897
work_tree, file_list = WorkingTree.open_containing_paths(
898
names_list, default_directory='.')
899
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
900
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
902
def _run(self, tree, names_list, rel_names, after):
946
996
match the remote one, use pull --overwrite. This will work even if the two
947
997
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.
999
If there is no default location set, the first pull will set it (use
1000
--no-remember to avoid setting it). After that, you can omit the
1001
location to use the default. To change the default, use --remember. The
1002
value will only be saved if the remote location can be accessed.
1004
The --verbose option will display the revisions pulled using the log_format
1005
configuration option. You can use a different format by overriding it with
1006
-Olog_format=<other_format>.
954
1008
Note: The location can be specified either in the form of a branch,
955
1009
or in the form of a path to a file containing a merge directive generated
960
1014
takes_options = ['remember', 'overwrite', 'revision',
961
1015
custom_help('verbose',
962
1016
help='Show logs of pulled revisions.'),
1017
custom_help('directory',
964
1018
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1019
'rather than the one containing the working directory.'),
970
1021
help="Perform a local pull in a bound "
971
1022
"branch. Local pulls are not applied to "
972
1023
"the master branch."
1026
help="Show base revision text in conflicts.")
975
1028
takes_args = ['location?']
976
1029
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1031
def run(self, location=None, remember=None, overwrite=False,
979
1032
revision=None, verbose=False,
980
directory=None, local=False):
1033
directory=None, local=False,
981
1035
# FIXME: too much stuff is in the command class
982
1036
revision_id = None
983
1037
mergeable = None
1008
1063
stored_loc = branch_to.get_parent()
1009
1064
if location is None:
1010
1065
if stored_loc is None:
1011
raise errors.BzrCommandError("No pull location known or"
1066
raise errors.BzrCommandError(gettext("No pull location known or"
1014
1069
display_url = urlutils.unescape_for_display(stored_loc,
1015
1070
self.outf.encoding)
1016
1071
if not is_quiet():
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1072
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1018
1073
location = stored_loc
1020
1075
revision = _get_one_revision('pull', revision)
1021
1076
if mergeable is not None:
1022
1077
if revision is not None:
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1078
raise errors.BzrCommandError(gettext(
1079
'Cannot use -r with merge directives or bundles'))
1025
1080
mergeable.install_revisions(branch_to.repository)
1026
1081
base_revision_id, revision_id, verified = \
1027
1082
mergeable.get_merge_request(branch_to.repository)
1077
1136
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1137
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.
1139
If there is no default push location set, the first push will set it (use
1140
--no-remember to avoid setting it). After that, you can omit the
1141
location to use the default. To change the default, use --remember. The
1142
value will only be saved if the remote location can be accessed.
1144
The --verbose option will display the revisions pushed using the log_format
1145
configuration option. You can use a different format by overriding it with
1146
-Olog_format=<other_format>.
1086
1149
_see_also = ['pull', 'update', 'working-trees']
1110
1170
Option('strict',
1111
1171
help='Refuse to push if there are uncommitted changes in'
1112
1172
' the working tree, --no-strict disables the check.'),
1174
help="Don't populate the working tree, even for protocols"
1175
" that support it."),
1114
1177
takes_args = ['location?']
1115
1178
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1180
def run(self, location=None, remember=None, overwrite=False,
1118
1181
create_prefix=False, verbose=False, revision=None,
1119
1182
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1183
stacked=False, strict=None, no_tree=False):
1121
1184
from bzrlib.push import _show_push_branch
1123
1186
if directory is None:
1124
1187
directory = '.'
1125
1188
# Get the source branch
1126
1189
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1190
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1191
# Get the tip's revision_id
1129
1192
revision = _get_one_revision('push', revision)
1130
1193
if revision is not None:
1151
1214
# error by the feedback given to them. RBC 20080227.
1152
1215
stacked_on = parent_url
1153
1216
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1217
raise errors.BzrCommandError(gettext(
1218
"Could not determine branch to refer to."))
1157
1220
# Get the destination location
1158
1221
if location is None:
1159
1222
stored_loc = br_from.get_push_location()
1160
1223
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1224
raise errors.BzrCommandError(gettext(
1225
"No push location known or specified."))
1164
1227
display_url = urlutils.unescape_for_display(stored_loc,
1165
1228
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1229
note(gettext("Using saved push location: %s") % display_url)
1167
1230
location = stored_loc
1169
1232
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1233
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1234
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1235
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1238
class cmd_branch(Command):
1185
1248
To retrieve the branch as of a particular revision, supply the --revision
1186
1249
parameter, as in "branch foo/bar -r 5".
1251
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1254
_see_also = ['checkout']
1190
1255
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1256
takes_options = ['revision',
1257
Option('hardlink', help='Hard-link working tree files where possible.'),
1258
Option('files-from', type=str,
1259
help="Get file contents from this tree."),
1193
1260
Option('no-tree',
1194
1261
help="Create a branch without a working-tree."),
1195
1262
Option('switch',
1214
1281
def run(self, from_location, to_location=None, revision=None,
1215
1282
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1283
use_existing_dir=False, switch=False, bind=False,
1217
1285
from bzrlib import switch as _mod_switch
1218
1286
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1287
if self.invoked_as in ['get', 'clone']:
1288
ui.ui_factory.show_user_warning(
1289
'deprecated_command',
1290
deprecated_name=self.invoked_as,
1291
recommended_name='branch',
1292
deprecated_in_version='2.4')
1293
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1295
if not (hardlink or files_from):
1296
# accelerator_tree is usually slower because you have to read N
1297
# files (no readahead, lots of seeks, etc), but allow the user to
1298
# explicitly request it
1299
accelerator_tree = None
1300
if files_from is not None and files_from != from_location:
1301
accelerator_tree = WorkingTree.open(files_from)
1221
1302
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1303
self.add_cleanup(br_from.lock_read().unlock)
1224
1304
if revision is not None:
1225
1305
revision_id = revision.as_revision_id(br_from)
1235
1315
to_transport.mkdir('.')
1236
1316
except errors.FileExists:
1237
1317
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1318
raise errors.BzrCommandError(gettext('Target directory "%s" '
1319
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1322
to_dir = controldir.ControlDir.open_from_transport(
1243
1324
except errors.NotBranchError:
1246
raise errors.AlreadyBranchError(to_location)
1328
to_dir.open_branch()
1329
except errors.NotBranchError:
1332
raise errors.AlreadyBranchError(to_location)
1247
1333
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1334
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)
1340
# preserve whatever source format we have.
1341
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1342
possible_transports=[to_transport],
1343
accelerator_tree=accelerator_tree,
1344
hardlink=hardlink, stacked=stacked,
1345
force_new_repo=standalone,
1346
create_tree_if_local=not no_tree,
1347
source_branch=br_from)
1348
branch = to_dir.open_branch()
1349
except errors.NoSuchRevision:
1350
to_transport.delete_tree('.')
1351
msg = gettext("The branch {0} has no revision {1}.").format(
1352
from_location, revision)
1353
raise errors.BzrCommandError(msg)
1355
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1356
_merge_tags_if_possible(br_from, branch)
1266
1357
# If the source branch is stacked, the new branch may
1267
1358
# be stacked whether we asked for that explicitly or not.
1268
1359
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1361
note(gettext('Created new stacked branch referring to %s.') %
1271
1362
branch.get_stacked_on_url())
1272
1363
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1364
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1365
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1367
# Bind to the parent
1277
1368
parent_branch = Branch.open(from_location)
1278
1369
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1370
note(gettext('New branch bound to %s') % from_location)
1281
1372
# Switch to the new branch
1282
1373
wt, _ = WorkingTree.open_containing('.')
1283
1374
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1375
note(gettext('Switched to branch: %s'),
1285
1376
urlutils.unescape_for_display(branch.base, 'utf-8'))
1379
class cmd_branches(Command):
1380
__doc__ = """List the branches available at the current location.
1382
This command will print the names of all the branches at the current
1386
takes_args = ['location?']
1388
Option('recursive', short_name='R',
1389
help='Recursively scan for branches rather than '
1390
'just looking in the specified location.')]
1392
def run(self, location=".", recursive=False):
1394
t = transport.get_transport(location)
1395
if not t.listable():
1396
raise errors.BzrCommandError(
1397
"Can't scan this type of location.")
1398
for b in controldir.ControlDir.find_branches(t):
1399
self.outf.write("%s\n" % urlutils.unescape_for_display(
1400
urlutils.relative_url(t.base, b.base),
1401
self.outf.encoding).rstrip("/"))
1403
dir = controldir.ControlDir.open_containing(location)[0]
1404
for branch in dir.list_branches():
1405
if branch.name is None:
1406
self.outf.write(gettext(" (default)\n"))
1408
self.outf.write(" %s\n" % branch.name.encode(
1409
self.outf.encoding))
1288
1412
class cmd_checkout(Command):
1289
1413
__doc__ = """Create a new checkout of an existing branch.
1389
1516
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
1517
__doc__ = """Update a working tree to a new revision.
1519
This will perform a merge of the destination revision (the tip of the
1520
branch, or the specified revision) into the working tree, and then make
1521
that revision the basis revision for the working tree.
1523
You can use this to visit an older revision, or to update a working tree
1524
that is out of date from its branch.
1526
If there are any uncommitted changes in the tree, they will be carried
1527
across and remain as uncommitted changes after the update. To discard
1528
these changes, use 'bzr revert'. The uncommitted changes may conflict
1529
with the changes brought in by the change in basis revision.
1531
If the tree's branch is bound to a master branch, bzr will also update
1400
1532
the branch from the master.
1534
You cannot update just a single file or directory, because each Bazaar
1535
working tree has just a single basis revision. If you want to restore a
1536
file that has been removed locally, use 'bzr revert' instead of 'bzr
1537
update'. If you want to restore a file to its state in a previous
1538
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1539
out the old content of that file to a new location.
1541
The 'dir' argument, if given, must be the location of the root of a
1542
working tree to update. By default, the working tree that contains the
1543
current working directory is used.
1403
1546
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1547
takes_args = ['dir?']
1405
takes_options = ['revision']
1548
takes_options = ['revision',
1550
help="Show base revision text in conflicts."),
1406
1552
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1554
def run(self, dir=None, revision=None, show_base=None):
1409
1555
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]
1556
raise errors.BzrCommandError(gettext(
1557
"bzr update --revision takes exactly one revision"))
1559
tree = WorkingTree.open_containing('.')[0]
1561
tree, relpath = WorkingTree.open_containing(dir)
1564
raise errors.BzrCommandError(gettext(
1565
"bzr update can only update a whole tree, "
1566
"not a file or subdirectory"))
1413
1567
branch = tree.branch
1414
1568
possible_transports = []
1415
1569
master = branch.get_master_branch(
1416
1570
possible_transports=possible_transports)
1417
1571
if master is not None:
1419
1572
branch_location = master.base
1575
branch_location = tree.branch.base
1421
1576
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1577
self.add_cleanup(tree.unlock)
1424
1578
# get rid of the final '/' and be ready for display
1425
1579
branch_location = urlutils.unescape_for_display(
1451
1605
change_reporter,
1452
1606
possible_transports=possible_transports,
1453
1607
revision=revision_id,
1609
show_base=show_base)
1455
1610
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1611
raise errors.BzrCommandError(gettext(
1457
1612
"branch has no revision %s\n"
1458
1613
"bzr update --revision only works"
1459
" for a revision in the branch history"
1614
" for a revision in the branch history")
1460
1615
% (e.revision))
1461
1616
revno = tree.branch.revision_id_to_dotted_revno(
1462
1617
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1618
note(gettext('Updated to revision {0} of branch {1}').format(
1619
'.'.join(map(str, revno)), branch_location))
1465
1620
parent_ids = tree.get_parent_ids()
1466
1621
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'.")
1622
note(gettext('Your local commits will now show as pending merges with '
1623
"'bzr status', and can be committed with 'bzr commit'."))
1469
1624
if conflicts != 0:
1513
1668
noise_level = 0
1514
1669
from bzrlib.info import show_bzrdir_info
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1670
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1516
1671
verbose=noise_level, outfile=self.outf)
1519
1674
class cmd_remove(Command):
1520
1675
__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.
1677
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1678
delete them if they can easily be recovered using revert otherwise they
1679
will be backed up (adding an extention of the form .~#~). If no options or
1680
parameters are given Bazaar will scan for files that are being tracked by
1681
Bazaar but missing in your tree and stop tracking them for you.
1527
1683
takes_args = ['file*']
1528
1684
takes_options = ['verbose',
1530
1686
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1687
'The file deletion mode to be used.',
1532
1688
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1689
safe='Backup changed files (default).',
1535
1690
keep='Delete from bzr but leave the working copy.',
1691
no_backup='Don\'t backup changed files.',
1536
1692
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1693
'recovered and even if they are non-empty directories. '
1694
'(deprecated, use no-backup)')]
1538
1695
aliases = ['rm', 'del']
1539
1696
encoding_type = 'replace'
1541
1698
def run(self, file_list, verbose=False, new=False,
1542
1699
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1700
if file_deletion_strategy == 'force':
1701
note(gettext("(The --force option is deprecated, rather use --no-backup "
1703
file_deletion_strategy = 'no-backup'
1705
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1707
if file_list is not None:
1546
1708
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1710
self.add_cleanup(tree.lock_write().unlock)
1550
1711
# Heuristics should probably all move into tree.remove_smart or
1716
1891
help='Specify a format for this branch. '
1717
1892
'See "help formats".',
1718
1893
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1719
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1894
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1720
1895
value_switches=True,
1721
1896
title="Branch format",
1723
1898
Option('append-revisions-only',
1724
1899
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1900
' Append revisions to it only.'),
1902
'Create a branch without a working tree.')
1727
1904
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1905
create_prefix=False, no_tree=False):
1729
1906
if format is None:
1730
format = bzrdir.format_registry.make_bzrdir('default')
1907
format = controldir.format_registry.make_bzrdir('default')
1731
1908
if location is None:
1732
1909
location = u'.'
1742
1919
to_transport.ensure_base()
1743
1920
except errors.NoSuchFile:
1744
1921
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
1922
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
1923
" does not exist."
1747
1924
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
1925
" leading parent directories.")
1750
1927
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1930
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
1931
except errors.NotBranchError:
1755
1932
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1933
create_branch = controldir.ControlDir.create_branch_convenience
1935
force_new_tree = False
1937
force_new_tree = None
1757
1938
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1939
possible_transports=[to_transport],
1940
force_new_tree=force_new_tree)
1759
1941
a_bzrdir = branch.bzrdir
1761
1943
from bzrlib.transport.local import LocalTransport
1969
2170
elif ':' in prefix:
1970
2171
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2173
raise errors.BzrCommandError(gettext(
1973
2174
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2175
' (eg "old/:new/")'))
1976
2177
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2178
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2179
' one or two revision specifiers'))
1980
2181
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2182
raise errors.BzrCommandError(gettext(
2183
'{0} and {1} are mutually exclusive').format(
2184
'--using', '--format'))
1984
2186
(old_tree, new_tree,
1985
2187
old_branch, new_branch,
1986
2188
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2189
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2190
# GNU diff on Windows uses ANSI encoding for filenames
2191
path_encoding = osutils.get_diff_header_encoding()
1988
2192
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2193
specific_files=specific_files,
1990
2194
external_diff_options=diff_options,
1991
2195
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2196
extra_trees=extra_trees,
2197
path_encoding=path_encoding,
1993
2199
format_cls=format)
2003
2209
# level of effort but possibly much less IO. (Or possibly not,
2004
2210
# if the directories are very large...)
2005
2211
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2212
takes_options = ['directory', 'show-ids']
2008
2214
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2215
def run(self, show_ids=False, directory=u'.'):
2216
tree = WorkingTree.open_containing(directory)[0]
2217
self.add_cleanup(tree.lock_read().unlock)
2013
2218
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2219
self.add_cleanup(old.lock_read().unlock)
2016
2220
for path, ie in old.inventory.iter_entries():
2017
2221
if not tree.has_id(ie.file_id):
2018
2222
self.outf.write(path)
2053
2255
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2256
takes_options = ['directory', 'null']
2060
2258
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2259
def run(self, null=False, directory=u'.'):
2260
wt = WorkingTree.open_containing(directory)[0]
2261
self.add_cleanup(wt.lock_read().unlock)
2065
2262
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2263
self.add_cleanup(basis.lock_read().unlock)
2068
2264
basis_inv = basis.inventory
2069
2265
inv = wt.inventory
2070
2266
for file_id in inv:
2071
if file_id in basis_inv:
2267
if basis_inv.has_id(file_id):
2073
2269
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2271
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2272
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2275
self.outf.write(path + '\0')
2297
2501
Option('show-diff',
2298
2502
short_name='p',
2299
2503
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2504
Option('include-merged',
2301
2505
help='Show merged revisions like --levels 0 does.'),
2506
Option('include-merges', hidden=True,
2507
help='Historical alias for --include-merged.'),
2508
Option('omit-merges',
2509
help='Do not report commits with more than one parent.'),
2302
2510
Option('exclude-common-ancestry',
2303
2511
help='Display only the revisions that are not part'
2304
2512
' of both ancestries (require -rX..Y)'
2514
Option('signatures',
2515
help='Show digital signature validity'),
2518
help='Show revisions whose properties match this '
2521
ListOption('match-message',
2522
help='Show revisions whose message matches this '
2525
ListOption('match-committer',
2526
help='Show revisions whose committer matches this '
2529
ListOption('match-author',
2530
help='Show revisions whose authors match this '
2533
ListOption('match-bugs',
2534
help='Show revisions whose bugs match this '
2307
2538
encoding_type = 'replace'
2327
2567
_get_info_for_log_files,
2329
2569
direction = (forward and 'forward') or 'reverse'
2570
if symbol_versioning.deprecated_passed(include_merges):
2571
ui.ui_factory.show_user_warning(
2572
'deprecated_command_option',
2573
deprecated_name='--include-merges',
2574
recommended_name='--include-merged',
2575
deprecated_in_version='2.5',
2576
command=self.invoked_as)
2577
if include_merged is None:
2578
include_merged = include_merges
2580
raise errors.BzrCommandError(gettext(
2581
'{0} and {1} are mutually exclusive').format(
2582
'--include-merges', '--include-merged'))
2583
if include_merged is None:
2584
include_merged = False
2330
2585
if (exclude_common_ancestry
2331
2586
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2587
raise errors.BzrCommandError(gettext(
2588
'--exclude-common-ancestry requires -r with two revisions'))
2335
2590
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2593
raise errors.BzrCommandError(gettext(
2594
'{0} and {1} are mutually exclusive').format(
2595
'--levels', '--include-merged'))
2341
2597
if change is not None:
2342
2598
if len(change) > 1:
2343
2599
raise errors.RangeInChangeOption()
2344
2600
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2601
raise errors.BzrCommandError(gettext(
2602
'{0} and {1} are mutually exclusive').format(
2603
'--revision', '--change'))
2348
2605
revision = change
2528
2803
help='Recurse into subdirectories.'),
2529
2804
Option('from-root',
2530
2805
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2806
Option('unknown', short_name='u',
2807
help='Print unknown files.'),
2532
2808
Option('versioned', help='Print versioned files.',
2533
2809
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.'),
2810
Option('ignored', short_name='i',
2811
help='Print ignored files.'),
2812
Option('kind', short_name='k',
2539
2813
help='List entries of a particular kind: file, directory, symlink.',
2543
2819
@display_command
2544
2820
def run(self, revision=None, verbose=False,
2545
2821
recursive=False, from_root=False,
2546
2822
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2823
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2825
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2826
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2828
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2829
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2830
all = not (unknown or versioned or ignored)
2556
2832
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3011
self.outf.write("%s\n" % pattern)
2727
3013
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3014
raise errors.BzrCommandError(gettext("ignore requires at least one "
3015
"NAME_PATTERN or --default-rules."))
2730
3016
name_pattern_list = [globbing.normalize_pattern(p)
2731
3017
for p in name_pattern_list]
3019
bad_patterns_count = 0
3020
for p in name_pattern_list:
3021
if not globbing.Globster.is_pattern_valid(p):
3022
bad_patterns_count += 1
3023
bad_patterns += ('\n %s' % p)
3025
msg = (ngettext('Invalid ignore pattern found. %s',
3026
'Invalid ignore patterns found. %s',
3027
bad_patterns_count) % bad_patterns)
3028
ui.ui_factory.show_error(msg)
3029
raise errors.InvalidPattern('')
2732
3030
for name_pattern in name_pattern_list:
2733
3031
if (name_pattern[0] == '/' or
2734
3032
(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'.')
3033
raise errors.BzrCommandError(gettext(
3034
"NAME_PATTERN should not be an absolute path"))
3035
tree, relpath = WorkingTree.open_containing(directory)
2738
3036
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3037
ignored = globbing.Globster(name_pattern_list)
3039
self.add_cleanup(tree.lock_read().unlock)
2742
3040
for entry in tree.list_files():
2744
3042
if id is not None:
2745
3043
filename = entry[0]
2746
3044
if ignored.match(filename):
2747
3045
matches.append(filename)
2749
3046
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3047
self.outf.write(gettext("Warning: the following files are version "
3048
"controlled and match your ignore pattern:\n%s"
2752
3049
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3050
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3053
class cmd_ignored(Command):
2885
3184
@display_command
2886
3185
def run(self, filename, revision=None, name_from_revision=False,
3186
filters=False, directory=None):
2888
3187
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3188
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3189
" one revision specifier"))
2891
3190
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3191
_open_directory_or_containing_tree_or_branch(filename, directory)
3192
self.add_cleanup(branch.lock_read().unlock)
2895
3193
return self._run(tree, branch, relpath, filename, revision,
2896
3194
name_from_revision, filters)
2900
3198
if tree is None:
2901
3199
tree = b.basis_tree()
2902
3200
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3201
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3203
old_file_id = rev_tree.path2id(relpath)
3205
# TODO: Split out this code to something that generically finds the
3206
# best id for a path across one or more trees; it's like
3207
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3209
if name_from_revision:
2909
3210
# Try in revision if requested
2910
3211
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3212
raise errors.BzrCommandError(gettext(
3213
"{0!r} is not present in revision {1}").format(
2913
3214
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3216
actual_file_id = old_file_id
2917
3218
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" % (
3219
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3220
actual_file_id = cur_file_id
3221
elif old_file_id is not None:
3222
actual_file_id = old_file_id
3224
raise errors.BzrCommandError(gettext(
3225
"{0!r} is not present in revision {1}").format(
2935
3226
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)
3228
from bzrlib.filter_tree import ContentFilterTree
3229
filter_tree = ContentFilterTree(rev_tree,
3230
rev_tree._content_filter_stack)
3231
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3233
content = rev_tree.get_file_text(actual_file_id)
3235
self.outf.write(content)
2952
3238
class cmd_local_time_offset(Command):
3013
3299
to trigger updates to external systems like bug trackers. The --fixes
3014
3300
option can be used to record the association between a revision and
3015
3301
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
3304
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3305
takes_args = ['selected*']
3076
3337
Option('show-diff', short_name='p',
3077
3338
help='When no message is supplied, show the diff along'
3078
3339
' with the status summary in the message editor.'),
3341
help='When committing to a foreign version control '
3342
'system do not push data that can not be natively '
3080
3345
aliases = ['ci', 'checkin']
3082
3347
def _iter_bug_fix_urls(self, fixes, branch):
3348
default_bugtracker = None
3083
3349
# Configure the properties for bug fixing attributes.
3084
3350
for fixed_bug in fixes:
3085
3351
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3352
if len(tokens) == 1:
3353
if default_bugtracker is None:
3354
branch_config = branch.get_config()
3355
default_bugtracker = branch_config.get_user_option(
3357
if default_bugtracker is None:
3358
raise errors.BzrCommandError(gettext(
3359
"No tracker specified for bug %s. Use the form "
3360
"'tracker:id' or specify a default bug tracker "
3361
"using the `bugtracker` option.\nSee "
3362
"\"bzr help bugs\" for more information on this "
3363
"feature. Commit refused.") % fixed_bug)
3364
tag = default_bugtracker
3366
elif len(tokens) != 2:
3367
raise errors.BzrCommandError(gettext(
3088
3368
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3369
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3370
"feature.\nCommit refused.") % fixed_bug)
3372
tag, bug_id = tokens
3093
3374
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3375
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3376
raise errors.BzrCommandError(gettext(
3377
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3378
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3379
raise errors.BzrCommandError(gettext(
3380
"%s\nCommit refused.") % (str(e),))
3101
3382
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3383
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3384
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3386
from bzrlib.errors import (
3105
3387
PointlessCommit,
3106
3388
ConflictsInTree,
3118
3401
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
3402
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3403
raise errors.BzrCommandError(gettext(
3404
"Could not parse --commit-time: " + str(e)))
3129
3406
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3408
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3409
if selected_list == ['']:
3133
3410
# workaround - commit of root of tree should be exactly the same
3134
3411
# as just default commit in that tree, and succeed even though
3184
3464
# make_commit_message_template_encoded returns user encoding.
3185
3465
# 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")
3467
my_message = set_commit_message(commit_obj)
3468
if my_message is None:
3469
start_message = generate_commit_message_template(commit_obj)
3470
my_message = edit_commit_message_encoded(text,
3471
start_message=start_message)
3472
if my_message is None:
3473
raise errors.BzrCommandError(gettext("please specify a commit"
3474
" message with either --message or --file"))
3475
if my_message == "":
3476
raise errors.BzrCommandError(gettext("Empty commit message specified."
3477
" Please specify a commit message with either"
3478
" --message or --file or leave a blank message"
3479
" with --message \"\"."))
3195
3480
return my_message
3197
3482
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3490
reporter=None, verbose=verbose, revprops=properties,
3206
3491
authors=author, timestamp=commit_stamp,
3207
3492
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3493
exclude=tree.safe_relpath_files(exclude),
3209
3495
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3496
raise errors.BzrCommandError(gettext("No changes to commit."
3497
" Please 'bzr add' the files you want to commit, or use"
3498
" --unchanged to force an empty commit."))
3212
3499
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3500
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3501
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3503
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3504
raise errors.BzrCommandError(gettext("Commit refused because there are"
3505
" unknown files in the working tree."))
3219
3506
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3507
e.extra_help = (gettext("\n"
3221
3508
'To commit to master branch, run update and then commit.\n'
3222
3509
'You can also pass --local to commit to continue working '
3297
3584
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.
3585
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3587
When the default format has changed after a major new release of
3588
Bazaar, you may be informed during certain operations that you
3589
should upgrade. Upgrading to a newer format may improve performance
3590
or make new features available. It may however limit interoperability
3591
with older repositories or with older versions of Bazaar.
3593
If you wish to upgrade to a particular format rather than the
3594
current default, that can be specified using the --format option.
3595
As a consequence, you can use the upgrade command this way to
3596
"downgrade" to an earlier format, though some conversions are
3597
a one way process (e.g. changing from the 1.x default to the
3598
2.x default) so downgrading is not always possible.
3600
A backup.bzr.~#~ directory is created at the start of the conversion
3601
process (where # is a number). By default, this is left there on
3602
completion. If the conversion fails, delete the new .bzr directory
3603
and rename this one back in its place. Use the --clean option to ask
3604
for the backup.bzr directory to be removed on successful conversion.
3605
Alternatively, you can delete it by hand if everything looks good
3608
If the location given is a shared repository, dependent branches
3609
are also converted provided the repository converts successfully.
3610
If the conversion of a branch fails, remaining branches are still
3613
For more information on upgrades, see the Bazaar Upgrade Guide,
3614
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3617
_see_also = ['check', 'reconcile', 'formats']
3306
3618
takes_args = ['url?']
3307
3619
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'),
3620
RegistryOption('format',
3621
help='Upgrade to a specific format. See "bzr help'
3622
' formats" for details.',
3623
lazy_registry=('bzrlib.controldir', 'format_registry'),
3624
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3625
value_switches=True, title='Branch format'),
3627
help='Remove the backup.bzr directory if successful.'),
3629
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3632
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3633
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3634
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3636
if len(exceptions) == 1:
3637
# Compatibility with historical behavior
3321
3643
class cmd_whoami(Command):
3340
3663
encoding_type = 'replace'
3342
3665
@display_command
3343
def run(self, email=False, branch=False, name=None):
3666
def run(self, email=False, branch=False, name=None, directory=None):
3344
3667
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()
3668
if directory is None:
3669
# use branch if we're inside one; otherwise global config
3671
c = Branch.open_containing(u'.')[0].get_config()
3672
except errors.NotBranchError:
3673
c = _mod_config.GlobalConfig()
3675
c = Branch.open(directory).get_config()
3351
3677
self.outf.write(c.user_email() + '\n')
3353
3679
self.outf.write(c.username() + '\n')
3683
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3686
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3688
_mod_config.extract_email_address(name)
3359
3689
except errors.NoEmailInUsername, e:
3360
3690
warning('"%s" does not seem to contain an email address. '
3361
3691
'This is allowed, but not recommended.', name)
3363
3693
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3695
if directory is None:
3696
c = Branch.open_containing(u'.')[0].get_config()
3698
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3700
c = _mod_config.GlobalConfig()
3368
3701
c.set_user_option('email', name)
3433
3767
def remove_alias(self, alias_name):
3434
3768
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3769
raise errors.BzrCommandError(gettext(
3770
'bzr alias --remove expects an alias to remove.'))
3437
3771
# If alias is not found, print something like:
3438
3772
# unalias: foo: not found
3439
c = config.GlobalConfig()
3773
c = _mod_config.GlobalConfig()
3440
3774
c.unset_alias(alias_name)
3442
3776
@display_command
3443
3777
def print_aliases(self):
3444
3778
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3779
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3780
for key, value in sorted(aliases.iteritems()):
3447
3781
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3586
3924
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3925
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3927
first=False, list_only=False,
3590
3928
randomize=None, exclude=None, strict=False,
3591
3929
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)
3930
parallel=None, lsprof_tests=False,
3932
from bzrlib import tests
3602
3934
if testspecs_list is not None:
3603
3935
pattern = '|'.join(testspecs_list)
3608
3940
from bzrlib.tests import SubUnitBzrRunner
3609
3941
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3942
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3943
"needs to be installed to use --subunit."))
3612
3944
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3945
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3946
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3947
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3948
# following code can be deleted when it's sufficiently deployed
3949
# -- vila/mgz 20100514
3950
if (sys.platform == "win32"
3951
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3953
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3955
self.additional_selftest_args.setdefault(
3620
3956
'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)
3958
raise errors.BzrCommandError(gettext(
3959
"--benchmark is no longer supported from bzr 2.2; "
3960
"use bzr-usertest instead"))
3961
test_suite_factory = None
3963
exclude_pattern = None
3629
test_suite_factory = None
3965
exclude_pattern = '(' + '|'.join(exclude) + ')'
3967
self._disable_fsync()
3631
3968
selftest_kwargs = {"verbose": verbose,
3632
3969
"pattern": pattern,
3633
3970
"stop_on_failure": one,
3635
3972
"test_suite_factory": test_suite_factory,
3636
3973
"lsprof_timed": lsprof_timed,
3637
3974
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3975
"matching_tests_first": first,
3640
3976
"list_only": list_only,
3641
3977
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3978
"exclude_pattern": exclude_pattern,
3643
3979
"strict": strict,
3644
3980
"load_list": load_list,
3645
3981
"debug_flags": debugflag,
3646
3982
"starting_with": starting_with
3648
3984
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3986
# Make deprecation warnings visible, unless -Werror is set
3987
cleanup = symbol_versioning.activate_deprecation_warnings(
3990
result = tests.selftest(**selftest_kwargs)
3650
3993
return int(not result)
3995
def _disable_fsync(self):
3996
"""Change the 'os' functionality to not synchronize."""
3997
self._orig_fsync = getattr(os, 'fsync', None)
3998
if self._orig_fsync is not None:
3999
os.fsync = lambda filedes: None
4000
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4001
if self._orig_fdatasync is not None:
4002
os.fdatasync = lambda filedes: None
3653
4005
class cmd_version(Command):
3654
4006
__doc__ = """Show version of bzr."""
3709
4059
The source of the merge can be specified either in the form of a branch,
3710
4060
or in the form of a path to a file containing a merge directive generated
3711
4061
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.
4062
or the branch most recently merged using --remember. The source of the
4063
merge may also be specified in the form of a path to a file in another
4064
branch: in this case, only the modifications to that file are merged into
4065
the current working tree.
4067
When merging from a branch, by default bzr will try to merge in all new
4068
work from the other branch, automatically determining an appropriate base
4069
revision. If this fails, you may need to give an explicit base.
4071
To pick a different ending revision, pass "--revision OTHER". bzr will
4072
try to merge in all new work up to and including revision OTHER.
4074
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4075
through OTHER, excluding BASE but including OTHER, will be merged. If this
4076
causes some revisions to be skipped, i.e. if the destination branch does
4077
not already contain revision BASE, such a merge is commonly referred to as
4078
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4079
cherrypicks. The changes look like a normal commit, and the history of the
4080
changes from the other branch is not stored in the commit.
4082
Revision numbers are always relative to the source branch.
3725
4084
Merge will do its best to combine the changes in two branches, but there
3726
4085
are some kinds of problems only a human can fix. When it encounters those,
3730
4089
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.
4091
If there is no default branch set, the first merge will set it (use
4092
--no-remember to avoid setting it). After that, you can omit the branch
4093
to use the default. To change the default, use --remember. The value will
4094
only be saved if the remote location can be accessed.
3737
4096
The results of the merge are placed into the destination working
3738
4097
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4098
committed to record the result of the merge.
3741
4100
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
4101
--force is given. If --force is given, then the changes from the source
4102
will be merged with the current working tree, including any uncommitted
4103
changes in the tree. The --force option can also be used to create a
3743
4104
merge revision which has more than two parents.
3745
4106
If one would like to merge changes from the working tree of the other
3847
4208
mergeable = None
3849
4210
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4211
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4212
' with bundles or merge directives.'))
3853
4214
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4215
raise errors.BzrCommandError(gettext(
4216
'Cannot use -r with merge directives or bundles'))
3856
4217
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4218
mergeable, None)
3859
4220
if merger is None and uncommitted:
3860
4221
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4222
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4223
' --revision at the same time.'))
3863
4224
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4225
allow_pending = False
3873
4234
self.sanity_check_merger(merger)
3874
4235
if (merger.base_rev_id == merger.other_rev_id and
3875
4236
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4237
# check if location is a nonexistent file (and not a branch) to
4238
# disambiguate the 'Nothing to do'
4239
if merger.interesting_files:
4240
if not merger.other_tree.has_filename(
4241
merger.interesting_files[0]):
4242
note(gettext("merger: ") + str(merger))
4243
raise errors.PathsDoNotExist([location])
4244
note(gettext('Nothing to do.'))
4246
if pull and not preview:
3879
4247
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4248
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4249
if (merger.base_rev_id == tree.last_revision()):
3882
4250
result = tree.pull(merger.other_branch, False,
3883
4251
merger.other_rev_id)
3884
4252
result.report(self.outf)
3886
4254
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4255
raise errors.BzrCommandError(gettext(
3888
4256
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4257
" (perhaps you would prefer 'bzr pull')"))
3891
4259
return self._do_preview(merger)
3892
4260
elif interactive:
3988
4358
if other_revision_id is None:
3989
4359
other_revision_id = _mod_revision.ensure_null(
3990
4360
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):
4361
# Remember where we merge from. We need to remember if:
4362
# - user specify a location (and we don't merge from the parent
4364
# - user ask to remember or there is no previous location set to merge
4365
# from and user didn't ask to *not* remember
4366
if (user_location is not None
4368
or (remember is None
4369
and tree.branch.get_submit_branch() is None)))):
3994
4370
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4371
# Merge tags (but don't set them in the master branch yet, the user
4372
# might revert this merge). Commit will propagate them.
4373
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4374
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4375
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4376
if other_path != '':
4340
4720
theirs_only=False,
4341
4721
log_format=None, long=False, short=False, line=False,
4342
4722
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4723
include_merged=None, revision=None, my_revision=None,
4725
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4726
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4727
def message(s):
4346
4728
if not is_quiet():
4347
4729
self.outf.write(s)
4731
if symbol_versioning.deprecated_passed(include_merges):
4732
ui.ui_factory.show_user_warning(
4733
'deprecated_command_option',
4734
deprecated_name='--include-merges',
4735
recommended_name='--include-merged',
4736
deprecated_in_version='2.5',
4737
command=self.invoked_as)
4738
if include_merged is None:
4739
include_merged = include_merges
4741
raise errors.BzrCommandError(gettext(
4742
'{0} and {1} are mutually exclusive').format(
4743
'--include-merges', '--include-merged'))
4744
if include_merged is None:
4745
include_merged = False
4350
4747
mine_only = this
4359
4756
elif theirs_only:
4360
4757
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4759
local_branch = Branch.open_containing(directory)[0]
4760
self.add_cleanup(local_branch.lock_read().unlock)
4366
4762
parent = local_branch.get_parent()
4367
4763
if other_branch is None:
4368
4764
other_branch = parent
4369
4765
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4766
raise errors.BzrCommandError(gettext("No peer location known"
4372
4768
display_url = urlutils.unescape_for_display(parent,
4373
4769
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4770
message(gettext("Using saved parent location: {0}\n").format(
4377
4773
remote_branch = Branch.open(other_branch)
4378
4774
if remote_branch.base == local_branch.base:
4379
4775
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4777
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4779
local_revid_range = _revision_range_to_revid_range(
4385
4780
_get_revision_range(my_revision, local_branch,
4430
4829
if mine_only and not local_extra:
4431
4830
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4831
message(gettext('This branch has no new revisions.\n'))
4433
4832
elif theirs_only and not remote_extra:
4434
4833
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4834
message(gettext('Other branch has no new revisions.\n'))
4436
4835
elif not (mine_only or theirs_only or local_extra or
4438
4837
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4839
message(gettext("Branches are up to date.\n"))
4441
4840
self.cleanup_now()
4442
4841
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)
4842
self.add_cleanup(local_branch.lock_write().unlock)
4445
4843
# handle race conditions - a parent might be set while we run.
4446
4844
if local_branch.get_parent() is None:
4447
4845
local_branch.set_parent(remote_branch.base)
4507
4905
@display_command
4508
4906
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")
4907
from bzrlib import plugin
4908
# Don't give writelines a generator as some codecs don't like that
4909
self.outf.writelines(
4910
list(plugin.describe_plugins(show_paths=verbose)))
4531
4913
class cmd_testament(Command):
4578
4959
Option('long', help='Show commit date in annotations.'),
4582
4964
encoding_type = 'exact'
4584
4966
@display_command
4585
4967
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4968
show_ids=False, directory=None):
4969
from bzrlib.annotate import (
4588
4972
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4973
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4974
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4975
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4977
self.add_cleanup(branch.lock_read().unlock)
4596
4978
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4979
self.add_cleanup(tree.lock_read().unlock)
4980
if wt is not None and revision is None:
4600
4981
file_id = wt.path2id(relpath)
4602
4983
file_id = tree.path2id(relpath)
4603
4984
if file_id is None:
4604
4985
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4986
if wt is not None and revision is None:
4607
4987
# If there is a tree and we're not annotating historical
4608
4988
# versions, annotate the working tree's content.
4609
4989
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4990
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4992
annotate_file_tree(tree, file_id, self.outf, long, all,
4993
show_ids=show_ids, branch=branch)
4616
4996
class cmd_re_sign(Command):
4620
5000
hidden = True # is this right ?
4621
5001
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5002
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5004
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5005
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')
5006
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5007
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)
5008
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5009
b = WorkingTree.open_containing(directory)[0].branch
5010
self.add_cleanup(b.lock_write().unlock)
4632
5011
return self._run(b, revision_id_list, revision)
4634
5013
def _run(self, b, revision_id_list, revision):
4694
5073
_see_also = ['checkouts', 'unbind']
4695
5074
takes_args = ['location?']
5075
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5077
def run(self, location=None, directory=u'.'):
5078
b, relpath = Branch.open_containing(directory)
4700
5079
if location is None:
4702
5081
location = b.get_old_bound_location()
4703
5082
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5083
raise errors.BzrCommandError(gettext('No location supplied. '
5084
'This format does not remember old locations.'))
4707
5086
if location is None:
4708
5087
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5088
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5090
raise errors.BzrCommandError(gettext('No location supplied '
5091
'and no previous location known'))
4713
5092
b_other = Branch.open(location)
4715
5094
b.bind(b_other)
4716
5095
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5096
raise errors.BzrCommandError(gettext('These branches have diverged.'
5097
' Try merging, and then bind again.'))
4719
5098
if b.get_config().has_explicit_nickname():
4720
5099
b.nick = b_other.nick
4784
5164
b = control.open_branch()
4786
5166
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5167
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)
5169
self.add_cleanup(b.lock_write().unlock)
5170
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5173
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5175
from bzrlib.log import log_formatter, show_log
4796
5176
from bzrlib.uncommit import uncommit
4827
5207
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5210
self.outf.write(gettext('Dry-run, pretending to remove'
5211
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5213
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')
5216
if not ui.ui_factory.confirm_action(
5217
gettext(u'Uncommit these revisions'),
5218
'bzrlib.builtins.uncommit',
5220
self.outf.write(gettext('Canceled\n'))
4840
5223
mutter('Uncommitting from {%s} to {%s}',
4841
5224
last_rev_id, rev_id)
4842
5225
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)
5226
revno=revno, local=local, keep_tags=keep_tags)
5227
self.outf.write(gettext('You can restore the old tip by running:\n'
5228
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5231
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5232
__doc__ = """Break a dead lock.
5234
This command breaks a lock on a repository, branch, working directory or
4851
5237
CAUTION: Locks should only be broken when you are sure that the process
4852
5238
holding the lock has been stopped.
4859
5245
bzr break-lock bzr+ssh://example.com/bzr/foo
5246
bzr break-lock --conf ~/.bazaar
4861
5249
takes_args = ['location?']
5252
help='LOCATION is the directory where the config lock is.'),
5254
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5257
def run(self, location=None, config=False, force=False):
4864
5258
if location is None:
4865
5259
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5261
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5263
{'bzrlib.lockdir.break': True})
5265
conf = _mod_config.LockableConfig(file_name=location)
5268
control, relpath = controldir.ControlDir.open_containing(location)
5270
control.break_lock()
5271
except NotImplementedError:
4873
5275
class cmd_wait_until_signalled(Command):
4936
5339
return host, port
4938
5341
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5342
protocol=None, client_timeout=None):
5343
from bzrlib import transport
4941
5344
if directory is None:
4942
5345
directory = os.getcwd()
4943
5346
if protocol is None:
4944
protocol = transport_server_registry.get()
5347
protocol = transport.transport_server_registry.get()
4945
5348
host, port = self.get_host_and_port(port)
4946
5349
url = urlutils.local_path_to_url(directory)
4947
5350
if not allow_writes:
4948
5351
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5352
t = transport.get_transport(url)
5354
protocol(t, host, port, inet, client_timeout)
5355
except TypeError, e:
5356
# We use symbol_versioning.deprecated_in just so that people
5357
# grepping can find it here.
5358
# symbol_versioning.deprecated_in((2, 5, 0))
5359
symbol_versioning.warn(
5360
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5361
'Most likely it needs to be updated to support a'
5362
' "timeout" parameter (added in bzr 2.5.0)'
5363
% (e, protocol.__module__, protocol),
5365
protocol(t, host, port, inet)
4953
5368
class cmd_join(Command):
5359
5779
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5780
self.add_cleanup(branch.lock_write().unlock)
5363
5782
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5783
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5784
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5785
note(gettext('Deleted tag %s.') % tag_name)
5369
5788
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5789
raise errors.BzrCommandError(gettext(
5371
5790
"Tags can only be placed on a single revision, "
5373
5792
revision_id = revision[0].as_revision_id(branch)
5375
5794
revision_id = branch.last_revision()
5376
5795
if tag_name is None:
5377
5796
tag_name = branch.automatic_tag_name(revision_id)
5378
5797
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):
5798
raise errors.BzrCommandError(gettext(
5799
"Please specify a tag name."))
5801
existing_target = branch.tags.lookup_tag(tag_name)
5802
except errors.NoSuchTag:
5803
existing_target = None
5804
if not force and existing_target not in (None, revision_id):
5382
5805
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5806
if existing_target == revision_id:
5807
note(gettext('Tag %s already exists for that revision.') % tag_name)
5809
branch.tags.set_tag(tag_name, revision_id)
5810
if existing_target is None:
5811
note(gettext('Created tag %s.') % tag_name)
5813
note(gettext('Updated tag %s.') % tag_name)
5387
5816
class cmd_tags(Command):
5393
5822
_see_also = ['tag']
5394
5823
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5824
custom_help('directory',
5825
help='Branch whose tags should be displayed.'),
5826
RegistryOption('sort',
5401
5827
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5828
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5834
@display_command
5835
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5836
from bzrlib.tag import tag_sort_methods
5416
5837
branch, relpath = Branch.open_containing(directory)
5418
5839
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5843
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]])
5845
# Restrict to the specified range
5846
tags = self._tags_for_range(branch, revision)
5848
sort = tag_sort_methods.get()
5444
5850
if not show_ids:
5445
5851
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5852
for index, (tag, revid) in enumerate(tags):
5457
5865
for tag, revspec in tags:
5458
5866
self.outf.write('%-20s %s\n' % (tag, revspec))
5868
def _tags_for_range(self, branch, revision):
5870
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5871
revid1, revid2 = rev1.rev_id, rev2.rev_id
5872
# _get_revision_range will always set revid2 if it's not specified.
5873
# If revid1 is None, it means we want to start from the branch
5874
# origin which is always a valid ancestor. If revid1 == revid2, the
5875
# ancestry check is useless.
5876
if revid1 and revid1 != revid2:
5877
# FIXME: We really want to use the same graph than
5878
# branch.iter_merge_sorted_revisions below, but this is not
5879
# easily available -- vila 2011-09-23
5880
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5881
# We don't want to output anything in this case...
5883
# only show revisions between revid1 and revid2 (inclusive)
5884
tagged_revids = branch.tags.get_reverse_tag_dict()
5886
for r in branch.iter_merge_sorted_revisions(
5887
start_revision_id=revid2, stop_revision_id=revid1,
5888
stop_rule='include'):
5889
revid_tags = tagged_revids.get(r[0], None)
5891
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5895
class cmd_reconfigure(Command):
5462
5896
__doc__ = """Reconfigure the type of a bzr directory.
5476
5910
takes_args = ['location?']
5477
5911
takes_options = [
5478
5912
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5915
help='The relation between branch and tree.',
5482
5916
value_switches=True, enum_switch=False,
5483
5917
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5918
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5919
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5920
lightweight_checkout='Reconfigure to be a lightweight'
5487
5921
' checkout (with no local history).',
5923
RegistryOption.from_kwargs(
5925
title='Repository type',
5926
help='Location fo the repository.',
5927
value_switches=True, enum_switch=False,
5488
5928
standalone='Reconfigure to be a standalone branch '
5489
5929
'(i.e. stop using shared repository).',
5490
5930
use_shared='Reconfigure to use a shared repository.',
5932
RegistryOption.from_kwargs(
5934
title='Trees in Repository',
5935
help='Whether new branches in the repository have trees.',
5936
value_switches=True, enum_switch=False,
5491
5937
with_trees='Reconfigure repository to create '
5492
5938
'working trees on branches by default.',
5493
5939
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)
5956
def run(self, location=None, bind_to=None, force=False,
5957
tree_type=None, repository_type=None, repository_trees=None,
5958
stacked_on=None, unstacked=None):
5959
directory = controldir.ControlDir.open(location)
5514
5960
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5961
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
5962
elif stacked_on is not None:
5517
5963
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
5964
elif unstacked:
5520
5966
# At the moment you can use --stacked-on and a different
5521
5967
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
5969
if (tree_type is None and
5970
repository_type is None and
5971
repository_trees is None):
5524
5972
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5975
raise errors.BzrCommandError(gettext('No target configuration '
5977
reconfiguration = None
5978
if tree_type == 'branch':
5530
5979
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
5980
elif tree_type == 'tree':
5532
5981
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
5982
elif tree_type == 'checkout':
5534
5983
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
5984
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
5985
elif tree_type == 'lightweight-checkout':
5537
5986
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
5987
directory, bind_to)
5539
elif target_type == 'use-shared':
5989
reconfiguration.apply(force)
5990
reconfiguration = None
5991
if repository_type == 'use-shared':
5540
5992
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
5993
elif repository_type == 'standalone':
5542
5994
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
5996
reconfiguration.apply(force)
5997
reconfiguration = None
5998
if repository_trees == 'with-trees':
5544
5999
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6000
directory, True)
5546
elif target_type == 'with-no-trees':
6001
elif repository_trees == 'with-no-trees':
5547
6002
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6003
directory, False)
5549
reconfiguration.apply(force)
6005
reconfiguration.apply(force)
6006
reconfiguration = None
5552
6009
class cmd_switch(Command):
5584
6042
def run(self, to_location=None, force=False, create_branch=False,
6043
revision=None, directory=u'.'):
5586
6044
from bzrlib import switch
6045
tree_location = directory
5588
6046
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6047
control_dir = controldir.ControlDir.open_containing(tree_location)[0]
5590
6048
if to_location is None:
5591
6049
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6050
raise errors.BzrCommandError(gettext('You must supply either a'
6051
' revision or a location'))
6052
to_location = tree_location
5596
6054
branch = control_dir.open_branch()
5597
6055
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
6193
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6195
current_view, view_dict = tree.views.get_view_info()
5737
6196
if name is None:
5738
6197
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6200
raise errors.BzrCommandError(gettext(
6201
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6203
raise errors.BzrCommandError(gettext(
6204
"Both --delete and --switch specified"))
5747
6206
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6207
self.outf.write(gettext("Deleted all views.\n"))
5749
6208
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6209
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6211
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6212
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6215
raise errors.BzrCommandError(gettext(
6216
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6218
raise errors.BzrCommandError(gettext(
6219
"Both --switch and --all specified"))
5761
6220
elif switch == 'off':
5762
6221
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6222
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6223
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6224
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6226
tree.views.set_view_info(switch, view_dict)
5768
6227
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6228
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6231
self.outf.write(gettext('Views defined:\n'))
5773
6232
for view in sorted(view_dict):
5774
6233
if view == current_view:
5778
6237
view_str = views.view_display_str(view_dict[view])
5779
6238
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6240
self.outf.write(gettext('No views defined.\n'))
5782
6241
elif file_list:
5783
6242
if name is None:
5784
6243
# No name given and no current view set
5786
6245
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6246
raise errors.BzrCommandError(gettext(
6247
"Cannot change the 'off' pseudo view"))
5789
6248
tree.views.set_view(name, sorted(file_list))
5790
6249
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6250
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6252
# list the files
5794
6253
if name is None:
5795
6254
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6255
self.outf.write(gettext('No current view.\n'))
5798
6257
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6258
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6261
class cmd_hooks(Command):
5883
6355
Option('destroy',
5884
6356
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6358
_see_also = ['unshelve', 'configuration']
5888
6360
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6361
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6363
return self.run_for_list(directory=directory)
5892
6364
from bzrlib.shelf_ui import Shelver
5893
6365
if writer is None:
5894
6366
writer = bzrlib.option.diff_writer_registry.get()
5896
6368
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6369
file_list, message, destroy=destroy, directory=directory)
5975
6450
' deleting them.'),
5976
6451
Option('force', help='Do not prompt before deleting.')]
5977
6452
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6453
force=False, directory=u'.'):
5979
6454
from bzrlib.clean_tree import clean_tree
5980
6455
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6459
clean_tree(directory, unknown=unknown, ignored=ignored,
6460
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6463
class cmd_reference(Command):
6032
6507
self.outf.write('%s %s\n' % (path, location))
6510
class cmd_export_pot(Command):
6511
__doc__ = """Export command helps and error messages in po format."""
6514
takes_options = [Option('plugin',
6515
help='Export help text from named command '\
6516
'(defaults to all built in commands).',
6519
def run(self, plugin=None):
6520
from bzrlib.export_pot import export_pot
6521
export_pot(self.outf, plugin)
6035
6524
def _register_lazy_builtins():
6036
6525
# register lazy builtins from other modules; called at startup and should
6037
6526
# be only called once.
6038
6527
for (name, aliases, module_name) in [
6039
6528
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6529
('cmd_config', [], 'bzrlib.config'),
6040
6530
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6531
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6532
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6533
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6534
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6535
('cmd_verify_signatures', [],
6536
'bzrlib.commit_signature_commands'),
6537
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6539
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
