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