172
177
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
179
return WorkingTree.open_containing_paths(
180
file_list, default_directory='.',
223
185
def _get_view_info_for_change_reporter(tree):
310
288
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
289
versioned=False, no_pending=False, verbose=False,
312
291
from bzrlib.status import show_tree_status
314
293
if revision and len(revision) > 2:
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
294
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
295
' one or two revision specifiers'))
318
tree, relfile_list = tree_files(file_list)
297
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
298
# Avoid asking for specific files when that is not needed.
320
299
if relfile_list == ['']:
321
300
relfile_list = None
353
333
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
336
def run(self, revision_id=None, revision=None, directory=u'.'):
357
337
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
338
raise errors.BzrCommandError(gettext('You can only supply one of'
339
' revision_id or --revision'))
360
340
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
341
raise errors.BzrCommandError(gettext('You must supply either'
342
' --revision or a revision_id'))
344
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
346
revisions = b.repository.revisions
366
347
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
348
raise errors.BzrCommandError(gettext('Repository %r does not support '
349
'access to raw revision texts'))
370
351
b.repository.lock_read()
491
475
location_list=['.']
493
477
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
478
d = controldir.ControlDir.open(location)
497
481
working = d.open_workingtree()
498
482
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
483
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
484
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
485
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
486
" of a remote path"))
504
488
if (working.has_changes()):
505
489
raise errors.UncommittedChanges(working)
490
if working.get_shelf_manager().last_shelf() is not None:
491
raise errors.ShelvedChanges(working)
507
493
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
494
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
495
" from a lightweight checkout"))
511
497
d.destroy_workingtree()
500
class cmd_repair_workingtree(Command):
501
__doc__ = """Reset the working tree state file.
503
This is not meant to be used normally, but more as a way to recover from
504
filesystem corruption, etc. This rebuilds the working inventory back to a
505
'known good' state. Any new modifications (adding a file, renaming, etc)
506
will be lost, though modified files will still be detected as such.
508
Most users will want something more like "bzr revert" or "bzr update"
509
unless the state file has become corrupted.
511
By default this attempts to recover the current state by looking at the
512
headers of the state file. If the state file is too corrupted to even do
513
that, you can supply --revision to force the state of the tree.
516
takes_options = ['revision', 'directory',
518
help='Reset the tree even if it doesn\'t appear to be'
523
def run(self, revision=None, directory='.', force=False):
524
tree, _ = WorkingTree.open_containing(directory)
525
self.add_cleanup(tree.lock_tree_write().unlock)
529
except errors.BzrError:
530
pass # There seems to be a real error here, so we'll reset
533
raise errors.BzrCommandError(gettext(
534
'The tree does not appear to be corrupt. You probably'
535
' want "bzr revert" instead. Use "--force" if you are'
536
' sure you want to reset the working tree.'))
540
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
542
tree.reset_state(revision_ids)
543
except errors.BzrError, e:
544
if revision_ids is None:
545
extra = (gettext(', the header appears corrupt, try passing -r -1'
546
' to set the state to the last commit'))
549
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
552
class cmd_revno(Command):
515
553
__doc__ = """Show current revision number.
520
558
_see_also = ['info']
521
559
takes_args = ['location?']
522
560
takes_options = [
523
Option('tree', help='Show revno of working tree'),
561
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
566
def run(self, tree=False, location=u'.', revision=None):
567
if revision is not None and tree:
568
raise errors.BzrCommandError(gettext("--tree and --revision can "
569
"not be used together"))
530
573
wt = WorkingTree.open_containing(location)[0]
574
self.add_cleanup(wt.lock_read().unlock)
532
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
576
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
578
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
580
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
581
self.add_cleanup(b.lock_read().unlock)
583
if len(revision) != 1:
584
raise errors.BzrCommandError(gettext(
585
"Tags can only be placed on a single revision, "
587
revid = revision[0].as_revision_id(b)
589
revid = b.last_revision()
591
revno_t = b.revision_id_to_dotted_revno(revid)
592
except errors.NoSuchRevision:
594
revno = ".".join(str(n) for n in revno_t)
546
595
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
596
self.outf.write(revno + '\n')
550
599
class cmd_revision_info(Command):
757
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
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):
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)
1230
1313
revision_id = br_from.last_revision()
1231
1314
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1315
to_location = getattr(br_from, "name", None)
1316
if to_location is None:
1317
to_location = urlutils.derive_to_location(from_location)
1233
1318
to_transport = transport.get_transport(to_location)
1235
1320
to_transport.mkdir('.')
1236
1321
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1323
to_dir = controldir.ControlDir.open_from_transport(
1325
except errors.NotBranchError:
1326
if not use_existing_dir:
1327
raise errors.BzrCommandError(gettext('Target directory "%s" '
1328
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1333
to_dir.open_branch()
1243
1334
except errors.NotBranchError:
1246
1337
raise errors.AlreadyBranchError(to_location)
1247
1338
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1339
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)
1345
# preserve whatever source format we have.
1346
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1347
possible_transports=[to_transport],
1348
accelerator_tree=accelerator_tree,
1349
hardlink=hardlink, stacked=stacked,
1350
force_new_repo=standalone,
1351
create_tree_if_local=not no_tree,
1352
source_branch=br_from)
1353
branch = to_dir.open_branch(
1354
possible_transports=[
1355
br_from.bzrdir.root_transport, to_transport])
1356
except errors.NoSuchRevision:
1357
to_transport.delete_tree('.')
1358
msg = gettext("The branch {0} has no revision {1}.").format(
1359
from_location, revision)
1360
raise errors.BzrCommandError(msg)
1362
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1363
_merge_tags_if_possible(br_from, branch)
1266
1364
# If the source branch is stacked, the new branch may
1267
1365
# be stacked whether we asked for that explicitly or not.
1268
1366
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1368
note(gettext('Created new stacked branch referring to %s.') %
1271
1369
branch.get_stacked_on_url())
1272
1370
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1371
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1372
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1374
# Bind to the parent
1277
1375
parent_branch = Branch.open(from_location)
1278
1376
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1377
note(gettext('New branch bound to %s') % from_location)
1281
1379
# Switch to the new branch
1282
1380
wt, _ = WorkingTree.open_containing('.')
1283
1381
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1382
note(gettext('Switched to branch: %s'),
1285
1383
urlutils.unescape_for_display(branch.base, 'utf-8'))
1386
class cmd_branches(Command):
1387
__doc__ = """List the branches available at the current location.
1389
This command will print the names of all the branches at the current
1393
takes_args = ['location?']
1395
Option('recursive', short_name='R',
1396
help='Recursively scan for branches rather than '
1397
'just looking in the specified location.')]
1399
def run(self, location=".", recursive=False):
1401
t = transport.get_transport(location)
1402
if not t.listable():
1403
raise errors.BzrCommandError(
1404
"Can't scan this type of location.")
1405
for b in controldir.ControlDir.find_branches(t):
1406
self.outf.write("%s\n" % urlutils.unescape_for_display(
1407
urlutils.relative_url(t.base, b.base),
1408
self.outf.encoding).rstrip("/"))
1410
dir = controldir.ControlDir.open_containing(location)[0]
1411
for branch in dir.list_branches():
1412
if branch.name is None:
1413
self.outf.write(gettext(" (default)\n"))
1415
self.outf.write(" %s\n" % branch.name.encode(
1416
self.outf.encoding))
1288
1419
class cmd_checkout(Command):
1289
1420
__doc__ = """Create a new checkout of an existing branch.
1389
1523
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
1524
__doc__ = """Update a working tree to a new revision.
1526
This will perform a merge of the destination revision (the tip of the
1527
branch, or the specified revision) into the working tree, and then make
1528
that revision the basis revision for the working tree.
1530
You can use this to visit an older revision, or to update a working tree
1531
that is out of date from its branch.
1533
If there are any uncommitted changes in the tree, they will be carried
1534
across and remain as uncommitted changes after the update. To discard
1535
these changes, use 'bzr revert'. The uncommitted changes may conflict
1536
with the changes brought in by the change in basis revision.
1538
If the tree's branch is bound to a master branch, bzr will also update
1400
1539
the branch from the master.
1541
You cannot update just a single file or directory, because each Bazaar
1542
working tree has just a single basis revision. If you want to restore a
1543
file that has been removed locally, use 'bzr revert' instead of 'bzr
1544
update'. If you want to restore a file to its state in a previous
1545
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1546
out the old content of that file to a new location.
1548
The 'dir' argument, if given, must be the location of the root of a
1549
working tree to update. By default, the working tree that contains the
1550
current working directory is used.
1403
1553
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1554
takes_args = ['dir?']
1405
takes_options = ['revision']
1555
takes_options = ['revision',
1557
help="Show base revision text in conflicts."),
1406
1559
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1561
def run(self, dir=None, revision=None, show_base=None):
1409
1562
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]
1563
raise errors.BzrCommandError(gettext(
1564
"bzr update --revision takes exactly one revision"))
1566
tree = WorkingTree.open_containing('.')[0]
1568
tree, relpath = WorkingTree.open_containing(dir)
1571
raise errors.BzrCommandError(gettext(
1572
"bzr update can only update a whole tree, "
1573
"not a file or subdirectory"))
1413
1574
branch = tree.branch
1414
1575
possible_transports = []
1415
1576
master = branch.get_master_branch(
1416
1577
possible_transports=possible_transports)
1417
1578
if master is not None:
1419
1579
branch_location = master.base
1582
branch_location = tree.branch.base
1421
1583
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1584
self.add_cleanup(tree.unlock)
1424
1585
# get rid of the final '/' and be ready for display
1425
1586
branch_location = urlutils.unescape_for_display(
1451
1612
change_reporter,
1452
1613
possible_transports=possible_transports,
1453
1614
revision=revision_id,
1616
show_base=show_base)
1455
1617
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1618
raise errors.BzrCommandError(gettext(
1457
1619
"branch has no revision %s\n"
1458
1620
"bzr update --revision only works"
1459
" for a revision in the branch history"
1621
" for a revision in the branch history")
1460
1622
% (e.revision))
1461
1623
revno = tree.branch.revision_id_to_dotted_revno(
1462
1624
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1625
note(gettext('Updated to revision {0} of branch {1}').format(
1626
'.'.join(map(str, revno)), branch_location))
1465
1627
parent_ids = tree.get_parent_ids()
1466
1628
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'.")
1629
note(gettext('Your local commits will now show as pending merges with '
1630
"'bzr status', and can be committed with 'bzr commit'."))
1469
1631
if conflicts != 0:
1513
1675
noise_level = 0
1514
1676
from bzrlib.info import show_bzrdir_info
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1677
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1516
1678
verbose=noise_level, outfile=self.outf)
1519
1681
class cmd_remove(Command):
1520
1682
__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.
1684
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1685
delete them if they can easily be recovered using revert otherwise they
1686
will be backed up (adding an extention of the form .~#~). If no options or
1687
parameters are given Bazaar will scan for files that are being tracked by
1688
Bazaar but missing in your tree and stop tracking them for you.
1527
1690
takes_args = ['file*']
1528
1691
takes_options = ['verbose',
1530
1693
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1694
'The file deletion mode to be used.',
1532
1695
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1696
safe='Backup changed files (default).',
1535
1697
keep='Delete from bzr but leave the working copy.',
1698
no_backup='Don\'t backup changed files.',
1536
1699
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1700
'recovered and even if they are non-empty directories. '
1701
'(deprecated, use no-backup)')]
1538
1702
aliases = ['rm', 'del']
1539
1703
encoding_type = 'replace'
1541
1705
def run(self, file_list, verbose=False, new=False,
1542
1706
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1707
if file_deletion_strategy == 'force':
1708
note(gettext("(The --force option is deprecated, rather use --no-backup "
1710
file_deletion_strategy = 'no-backup'
1712
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1714
if file_list is not None:
1546
1715
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1717
self.add_cleanup(tree.lock_write().unlock)
1550
1718
# Heuristics should probably all move into tree.remove_smart or
1716
1898
help='Specify a format for this branch. '
1717
1899
'See "help formats".',
1718
1900
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1719
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1901
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1720
1902
value_switches=True,
1721
1903
title="Branch format",
1723
1905
Option('append-revisions-only',
1724
1906
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1907
' Append revisions to it only.'),
1909
'Create a branch without a working tree.')
1727
1911
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1912
create_prefix=False, no_tree=False):
1729
1913
if format is None:
1730
format = bzrdir.format_registry.make_bzrdir('default')
1914
format = controldir.format_registry.make_bzrdir('default')
1731
1915
if location is None:
1732
1916
location = u'.'
1742
1926
to_transport.ensure_base()
1743
1927
except errors.NoSuchFile:
1744
1928
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
1929
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
1930
" does not exist."
1747
1931
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
1932
" leading parent directories.")
1750
1934
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1937
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
1938
except errors.NotBranchError:
1755
1939
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1940
create_branch = controldir.ControlDir.create_branch_convenience
1942
force_new_tree = False
1944
force_new_tree = None
1757
1945
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1946
possible_transports=[to_transport],
1947
force_new_tree=force_new_tree)
1759
1948
a_bzrdir = branch.bzrdir
1761
1950
from bzrlib.transport.local import LocalTransport
1969
2177
elif ':' in prefix:
1970
2178
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2180
raise errors.BzrCommandError(gettext(
1973
2181
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2182
' (eg "old/:new/")'))
1976
2184
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2185
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2186
' one or two revision specifiers'))
1980
2188
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2189
raise errors.BzrCommandError(gettext(
2190
'{0} and {1} are mutually exclusive').format(
2191
'--using', '--format'))
1984
2193
(old_tree, new_tree,
1985
2194
old_branch, new_branch,
1986
2195
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2196
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2197
# GNU diff on Windows uses ANSI encoding for filenames
2198
path_encoding = osutils.get_diff_header_encoding()
1988
2199
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2200
specific_files=specific_files,
1990
2201
external_diff_options=diff_options,
1991
2202
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2203
extra_trees=extra_trees,
2204
path_encoding=path_encoding,
1993
2206
format_cls=format)
2003
2216
# level of effort but possibly much less IO. (Or possibly not,
2004
2217
# if the directories are very large...)
2005
2218
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2219
takes_options = ['directory', 'show-ids']
2008
2221
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2222
def run(self, show_ids=False, directory=u'.'):
2223
tree = WorkingTree.open_containing(directory)[0]
2224
self.add_cleanup(tree.lock_read().unlock)
2013
2225
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2226
self.add_cleanup(old.lock_read().unlock)
2016
2227
for path, ie in old.inventory.iter_entries():
2017
2228
if not tree.has_id(ie.file_id):
2018
2229
self.outf.write(path)
2053
2262
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2263
takes_options = ['directory', 'null']
2060
2265
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2266
def run(self, null=False, directory=u'.'):
2267
wt = WorkingTree.open_containing(directory)[0]
2268
self.add_cleanup(wt.lock_read().unlock)
2065
2269
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2270
self.add_cleanup(basis.lock_read().unlock)
2068
2271
basis_inv = basis.inventory
2069
2272
inv = wt.inventory
2070
2273
for file_id in inv:
2071
if file_id in basis_inv:
2274
if basis_inv.has_id(file_id):
2073
2276
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2278
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2279
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2282
self.outf.write(path + '\0')
2297
2508
Option('show-diff',
2298
2509
short_name='p',
2299
2510
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2511
Option('include-merged',
2301
2512
help='Show merged revisions like --levels 0 does.'),
2513
Option('include-merges', hidden=True,
2514
help='Historical alias for --include-merged.'),
2515
Option('omit-merges',
2516
help='Do not report commits with more than one parent.'),
2302
2517
Option('exclude-common-ancestry',
2303
2518
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2519
' of both ancestries (require -rX..Y).'
2521
Option('signatures',
2522
help='Show digital signature validity.'),
2525
help='Show revisions whose properties match this '
2528
ListOption('match-message',
2529
help='Show revisions whose message matches this '
2532
ListOption('match-committer',
2533
help='Show revisions whose committer matches this '
2536
ListOption('match-author',
2537
help='Show revisions whose authors match this '
2540
ListOption('match-bugs',
2541
help='Show revisions whose bugs match this '
2307
2545
encoding_type = 'replace'
2327
2574
_get_info_for_log_files,
2329
2576
direction = (forward and 'forward') or 'reverse'
2577
if symbol_versioning.deprecated_passed(include_merges):
2578
ui.ui_factory.show_user_warning(
2579
'deprecated_command_option',
2580
deprecated_name='--include-merges',
2581
recommended_name='--include-merged',
2582
deprecated_in_version='2.5',
2583
command=self.invoked_as)
2584
if include_merged is None:
2585
include_merged = include_merges
2587
raise errors.BzrCommandError(gettext(
2588
'{0} and {1} are mutually exclusive').format(
2589
'--include-merges', '--include-merged'))
2590
if include_merged is None:
2591
include_merged = False
2330
2592
if (exclude_common_ancestry
2331
2593
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2594
raise errors.BzrCommandError(gettext(
2595
'--exclude-common-ancestry requires -r with two revisions'))
2335
2597
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2600
raise errors.BzrCommandError(gettext(
2601
'{0} and {1} are mutually exclusive').format(
2602
'--levels', '--include-merged'))
2341
2604
if change is not None:
2342
2605
if len(change) > 1:
2343
2606
raise errors.RangeInChangeOption()
2344
2607
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2608
raise errors.BzrCommandError(gettext(
2609
'{0} and {1} are mutually exclusive').format(
2610
'--revision', '--change'))
2348
2612
revision = change
2528
2810
help='Recurse into subdirectories.'),
2529
2811
Option('from-root',
2530
2812
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2813
Option('unknown', short_name='u',
2814
help='Print unknown files.'),
2532
2815
Option('versioned', help='Print versioned files.',
2533
2816
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.'),
2817
Option('ignored', short_name='i',
2818
help='Print ignored files.'),
2819
Option('kind', short_name='k',
2539
2820
help='List entries of a particular kind: file, directory, symlink.',
2543
2826
@display_command
2544
2827
def run(self, revision=None, verbose=False,
2545
2828
recursive=False, from_root=False,
2546
2829
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2830
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2832
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2833
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2835
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2836
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2837
all = not (unknown or versioned or ignored)
2556
2839
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3018
self.outf.write("%s\n" % pattern)
2727
3020
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3021
raise errors.BzrCommandError(gettext("ignore requires at least one "
3022
"NAME_PATTERN or --default-rules."))
2730
3023
name_pattern_list = [globbing.normalize_pattern(p)
2731
3024
for p in name_pattern_list]
3026
bad_patterns_count = 0
3027
for p in name_pattern_list:
3028
if not globbing.Globster.is_pattern_valid(p):
3029
bad_patterns_count += 1
3030
bad_patterns += ('\n %s' % p)
3032
msg = (ngettext('Invalid ignore pattern found. %s',
3033
'Invalid ignore patterns found. %s',
3034
bad_patterns_count) % bad_patterns)
3035
ui.ui_factory.show_error(msg)
3036
raise errors.InvalidPattern('')
2732
3037
for name_pattern in name_pattern_list:
2733
3038
if (name_pattern[0] == '/' or
2734
3039
(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'.')
3040
raise errors.BzrCommandError(gettext(
3041
"NAME_PATTERN should not be an absolute path"))
3042
tree, relpath = WorkingTree.open_containing(directory)
2738
3043
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3044
ignored = globbing.Globster(name_pattern_list)
3046
self.add_cleanup(tree.lock_read().unlock)
2742
3047
for entry in tree.list_files():
2744
3049
if id is not None:
2745
3050
filename = entry[0]
2746
3051
if ignored.match(filename):
2747
3052
matches.append(filename)
2749
3053
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3054
self.outf.write(gettext("Warning: the following files are version "
3055
"controlled and match your ignore pattern:\n%s"
2752
3056
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3057
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3060
class cmd_ignored(Command):
2885
3191
@display_command
2886
3192
def run(self, filename, revision=None, name_from_revision=False,
3193
filters=False, directory=None):
2888
3194
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3195
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3196
" one revision specifier"))
2891
3197
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3198
_open_directory_or_containing_tree_or_branch(filename, directory)
3199
self.add_cleanup(branch.lock_read().unlock)
2895
3200
return self._run(tree, branch, relpath, filename, revision,
2896
3201
name_from_revision, filters)
2900
3205
if tree is None:
2901
3206
tree = b.basis_tree()
2902
3207
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3208
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3210
old_file_id = rev_tree.path2id(relpath)
3212
# TODO: Split out this code to something that generically finds the
3213
# best id for a path across one or more trees; it's like
3214
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3216
if name_from_revision:
2909
3217
# Try in revision if requested
2910
3218
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3219
raise errors.BzrCommandError(gettext(
3220
"{0!r} is not present in revision {1}").format(
2913
3221
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3223
actual_file_id = old_file_id
2917
3225
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" % (
3226
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3227
actual_file_id = cur_file_id
3228
elif old_file_id is not None:
3229
actual_file_id = old_file_id
3231
raise errors.BzrCommandError(gettext(
3232
"{0!r} is not present in revision {1}").format(
2935
3233
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)
3235
from bzrlib.filter_tree import ContentFilterTree
3236
filter_tree = ContentFilterTree(rev_tree,
3237
rev_tree._content_filter_stack)
3238
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3240
content = rev_tree.get_file_text(actual_file_id)
3242
self.outf.write(content)
2952
3245
class cmd_local_time_offset(Command):
3013
3306
to trigger updates to external systems like bug trackers. The --fixes
3014
3307
option can be used to record the association between a revision and
3015
3308
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
3311
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3312
takes_args = ['selected*']
3076
3344
Option('show-diff', short_name='p',
3077
3345
help='When no message is supplied, show the diff along'
3078
3346
' with the status summary in the message editor.'),
3348
help='When committing to a foreign version control '
3349
'system do not push data that can not be natively '
3080
3352
aliases = ['ci', 'checkin']
3082
3354
def _iter_bug_fix_urls(self, fixes, branch):
3355
default_bugtracker = None
3083
3356
# Configure the properties for bug fixing attributes.
3084
3357
for fixed_bug in fixes:
3085
3358
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3359
if len(tokens) == 1:
3360
if default_bugtracker is None:
3361
branch_config = branch.get_config()
3362
default_bugtracker = branch_config.get_user_option(
3364
if default_bugtracker is None:
3365
raise errors.BzrCommandError(gettext(
3366
"No tracker specified for bug %s. Use the form "
3367
"'tracker:id' or specify a default bug tracker "
3368
"using the `bugtracker` option.\nSee "
3369
"\"bzr help bugs\" for more information on this "
3370
"feature. Commit refused.") % fixed_bug)
3371
tag = default_bugtracker
3373
elif len(tokens) != 2:
3374
raise errors.BzrCommandError(gettext(
3088
3375
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3376
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3377
"feature.\nCommit refused.") % fixed_bug)
3379
tag, bug_id = tokens
3093
3381
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3382
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3383
raise errors.BzrCommandError(gettext(
3384
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3385
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3386
raise errors.BzrCommandError(gettext(
3387
"%s\nCommit refused.") % (str(e),))
3101
3389
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3390
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3391
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3393
from bzrlib.errors import (
3105
3394
PointlessCommit,
3106
3395
ConflictsInTree,
3184
3471
# make_commit_message_template_encoded returns user encoding.
3185
3472
# 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")
3474
my_message = set_commit_message(commit_obj)
3475
if my_message is None:
3476
start_message = generate_commit_message_template(commit_obj)
3477
my_message = edit_commit_message_encoded(text,
3478
start_message=start_message)
3479
if my_message is None:
3480
raise errors.BzrCommandError(gettext("please specify a commit"
3481
" message with either --message or --file"))
3482
if my_message == "":
3483
raise errors.BzrCommandError(gettext("Empty commit message specified."
3484
" Please specify a commit message with either"
3485
" --message or --file or leave a blank message"
3486
" with --message \"\"."))
3195
3487
return my_message
3197
3489
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3497
reporter=None, verbose=verbose, revprops=properties,
3206
3498
authors=author, timestamp=commit_stamp,
3207
3499
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3500
exclude=tree.safe_relpath_files(exclude),
3209
3502
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3503
raise errors.BzrCommandError(gettext("No changes to commit."
3504
" Please 'bzr add' the files you want to commit, or use"
3505
" --unchanged to force an empty commit."))
3212
3506
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3507
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3508
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3510
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3511
raise errors.BzrCommandError(gettext("Commit refused because there are"
3512
" unknown files in the working tree."))
3219
3513
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3514
e.extra_help = (gettext("\n"
3221
3515
'To commit to master branch, run update and then commit.\n'
3222
3516
'You can also pass --local to commit to continue working '
3297
3591
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.
3592
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3594
When the default format has changed after a major new release of
3595
Bazaar, you may be informed during certain operations that you
3596
should upgrade. Upgrading to a newer format may improve performance
3597
or make new features available. It may however limit interoperability
3598
with older repositories or with older versions of Bazaar.
3600
If you wish to upgrade to a particular format rather than the
3601
current default, that can be specified using the --format option.
3602
As a consequence, you can use the upgrade command this way to
3603
"downgrade" to an earlier format, though some conversions are
3604
a one way process (e.g. changing from the 1.x default to the
3605
2.x default) so downgrading is not always possible.
3607
A backup.bzr.~#~ directory is created at the start of the conversion
3608
process (where # is a number). By default, this is left there on
3609
completion. If the conversion fails, delete the new .bzr directory
3610
and rename this one back in its place. Use the --clean option to ask
3611
for the backup.bzr directory to be removed on successful conversion.
3612
Alternatively, you can delete it by hand if everything looks good
3615
If the location given is a shared repository, dependent branches
3616
are also converted provided the repository converts successfully.
3617
If the conversion of a branch fails, remaining branches are still
3620
For more information on upgrades, see the Bazaar Upgrade Guide,
3621
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3624
_see_also = ['check', 'reconcile', 'formats']
3306
3625
takes_args = ['url?']
3307
3626
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'),
3627
RegistryOption('format',
3628
help='Upgrade to a specific format. See "bzr help'
3629
' formats" for details.',
3630
lazy_registry=('bzrlib.controldir', 'format_registry'),
3631
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3632
value_switches=True, title='Branch format'),
3634
help='Remove the backup.bzr directory if successful.'),
3636
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3639
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3640
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3641
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3643
if len(exceptions) == 1:
3644
# Compatibility with historical behavior
3321
3650
class cmd_whoami(Command):
3340
3670
encoding_type = 'replace'
3342
3672
@display_command
3343
def run(self, email=False, branch=False, name=None):
3673
def run(self, email=False, branch=False, name=None, directory=None):
3344
3674
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()
3675
if directory is None:
3676
# use branch if we're inside one; otherwise global config
3678
c = Branch.open_containing(u'.')[0].get_config()
3679
except errors.NotBranchError:
3680
c = _mod_config.GlobalConfig()
3682
c = Branch.open(directory).get_config()
3351
3684
self.outf.write(c.user_email() + '\n')
3353
3686
self.outf.write(c.username() + '\n')
3690
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3693
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3695
_mod_config.extract_email_address(name)
3359
3696
except errors.NoEmailInUsername, e:
3360
3697
warning('"%s" does not seem to contain an email address. '
3361
3698
'This is allowed, but not recommended.', name)
3363
3700
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3702
if directory is None:
3703
c = Branch.open_containing(u'.')[0].get_config()
3705
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3707
c = _mod_config.GlobalConfig()
3368
3708
c.set_user_option('email', name)
3586
3931
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3932
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3934
first=False, list_only=False,
3590
3935
randomize=None, exclude=None, strict=False,
3591
3936
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)
3937
parallel=None, lsprof_tests=False,
3939
from bzrlib import tests
3602
3941
if testspecs_list is not None:
3603
3942
pattern = '|'.join(testspecs_list)
3608
3947
from bzrlib.tests import SubUnitBzrRunner
3609
3948
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3949
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3950
"needs to be installed to use --subunit."))
3612
3951
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3952
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3953
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3954
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3955
# following code can be deleted when it's sufficiently deployed
3956
# -- vila/mgz 20100514
3957
if (sys.platform == "win32"
3958
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3960
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3962
self.additional_selftest_args.setdefault(
3620
3963
'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)
3965
raise errors.BzrCommandError(gettext(
3966
"--benchmark is no longer supported from bzr 2.2; "
3967
"use bzr-usertest instead"))
3968
test_suite_factory = None
3970
exclude_pattern = None
3629
test_suite_factory = None
3972
exclude_pattern = '(' + '|'.join(exclude) + ')'
3974
self._disable_fsync()
3631
3975
selftest_kwargs = {"verbose": verbose,
3632
3976
"pattern": pattern,
3633
3977
"stop_on_failure": one,
3635
3979
"test_suite_factory": test_suite_factory,
3636
3980
"lsprof_timed": lsprof_timed,
3637
3981
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3982
"matching_tests_first": first,
3640
3983
"list_only": list_only,
3641
3984
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3985
"exclude_pattern": exclude_pattern,
3643
3986
"strict": strict,
3644
3987
"load_list": load_list,
3645
3988
"debug_flags": debugflag,
3646
3989
"starting_with": starting_with
3648
3991
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3993
# Make deprecation warnings visible, unless -Werror is set
3994
cleanup = symbol_versioning.activate_deprecation_warnings(
3997
result = tests.selftest(**selftest_kwargs)
3650
4000
return int(not result)
4002
def _disable_fsync(self):
4003
"""Change the 'os' functionality to not synchronize."""
4004
self._orig_fsync = getattr(os, 'fsync', None)
4005
if self._orig_fsync is not None:
4006
os.fsync = lambda filedes: None
4007
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4008
if self._orig_fdatasync is not None:
4009
os.fdatasync = lambda filedes: None
3653
4012
class cmd_version(Command):
3654
4013
__doc__ = """Show version of bzr."""
3709
4066
The source of the merge can be specified either in the form of a branch,
3710
4067
or in the form of a path to a file containing a merge directive generated
3711
4068
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.
4069
or the branch most recently merged using --remember. The source of the
4070
merge may also be specified in the form of a path to a file in another
4071
branch: in this case, only the modifications to that file are merged into
4072
the current working tree.
4074
When merging from a branch, by default bzr will try to merge in all new
4075
work from the other branch, automatically determining an appropriate base
4076
revision. If this fails, you may need to give an explicit base.
4078
To pick a different ending revision, pass "--revision OTHER". bzr will
4079
try to merge in all new work up to and including revision OTHER.
4081
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4082
through OTHER, excluding BASE but including OTHER, will be merged. If this
4083
causes some revisions to be skipped, i.e. if the destination branch does
4084
not already contain revision BASE, such a merge is commonly referred to as
4085
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4086
cherrypicks. The changes look like a normal commit, and the history of the
4087
changes from the other branch is not stored in the commit.
4089
Revision numbers are always relative to the source branch.
3725
4091
Merge will do its best to combine the changes in two branches, but there
3726
4092
are some kinds of problems only a human can fix. When it encounters those,
3730
4096
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.
4098
If there is no default branch set, the first merge will set it (use
4099
--no-remember to avoid setting it). After that, you can omit the branch
4100
to use the default. To change the default, use --remember. The value will
4101
only be saved if the remote location can be accessed.
3737
4103
The results of the merge are placed into the destination working
3738
4104
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4105
committed to record the result of the merge.
3741
4107
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
4108
--force is given. If --force is given, then the changes from the source
4109
will be merged with the current working tree, including any uncommitted
4110
changes in the tree. The --force option can also be used to create a
3743
4111
merge revision which has more than two parents.
3745
4113
If one would like to merge changes from the working tree of the other
3847
4215
mergeable = None
3849
4217
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4218
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4219
' with bundles or merge directives.'))
3853
4221
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4222
raise errors.BzrCommandError(gettext(
4223
'Cannot use -r with merge directives or bundles'))
3856
4224
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4225
mergeable, None)
3859
4227
if merger is None and uncommitted:
3860
4228
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4229
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4230
' --revision at the same time.'))
3863
4231
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4232
allow_pending = False
3873
4241
self.sanity_check_merger(merger)
3874
4242
if (merger.base_rev_id == merger.other_rev_id and
3875
4243
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4244
# check if location is a nonexistent file (and not a branch) to
4245
# disambiguate the 'Nothing to do'
4246
if merger.interesting_files:
4247
if not merger.other_tree.has_filename(
4248
merger.interesting_files[0]):
4249
note(gettext("merger: ") + str(merger))
4250
raise errors.PathsDoNotExist([location])
4251
note(gettext('Nothing to do.'))
4253
if pull and not preview:
3879
4254
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4255
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4256
if (merger.base_rev_id == tree.last_revision()):
3882
4257
result = tree.pull(merger.other_branch, False,
3883
4258
merger.other_rev_id)
3884
4259
result.report(self.outf)
3886
4261
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4262
raise errors.BzrCommandError(gettext(
3888
4263
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4264
" (perhaps you would prefer 'bzr pull')"))
3891
4266
return self._do_preview(merger)
3892
4267
elif interactive:
3988
4365
if other_revision_id is None:
3989
4366
other_revision_id = _mod_revision.ensure_null(
3990
4367
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):
4368
# Remember where we merge from. We need to remember if:
4369
# - user specify a location (and we don't merge from the parent
4371
# - user ask to remember or there is no previous location set to merge
4372
# from and user didn't ask to *not* remember
4373
if (user_location is not None
4375
or (remember is None
4376
and tree.branch.get_submit_branch() is None)))):
3994
4377
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4378
# Merge tags (but don't set them in the master branch yet, the user
4379
# might revert this merge). Commit will propagate them.
4380
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4381
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4382
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4383
if other_path != '':
4340
4727
theirs_only=False,
4341
4728
log_format=None, long=False, short=False, line=False,
4342
4729
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4730
include_merged=None, revision=None, my_revision=None,
4732
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4733
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4734
def message(s):
4346
4735
if not is_quiet():
4347
4736
self.outf.write(s)
4738
if symbol_versioning.deprecated_passed(include_merges):
4739
ui.ui_factory.show_user_warning(
4740
'deprecated_command_option',
4741
deprecated_name='--include-merges',
4742
recommended_name='--include-merged',
4743
deprecated_in_version='2.5',
4744
command=self.invoked_as)
4745
if include_merged is None:
4746
include_merged = include_merges
4748
raise errors.BzrCommandError(gettext(
4749
'{0} and {1} are mutually exclusive').format(
4750
'--include-merges', '--include-merged'))
4751
if include_merged is None:
4752
include_merged = False
4350
4754
mine_only = this
4359
4763
elif theirs_only:
4360
4764
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4766
local_branch = Branch.open_containing(directory)[0]
4767
self.add_cleanup(local_branch.lock_read().unlock)
4366
4769
parent = local_branch.get_parent()
4367
4770
if other_branch is None:
4368
4771
other_branch = parent
4369
4772
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4773
raise errors.BzrCommandError(gettext("No peer location known"
4372
4775
display_url = urlutils.unescape_for_display(parent,
4373
4776
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4777
message(gettext("Using saved parent location: {0}\n").format(
4377
4780
remote_branch = Branch.open(other_branch)
4378
4781
if remote_branch.base == local_branch.base:
4379
4782
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4784
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4786
local_revid_range = _revision_range_to_revid_range(
4385
4787
_get_revision_range(my_revision, local_branch,
4430
4836
if mine_only and not local_extra:
4431
4837
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4838
message(gettext('This branch has no new revisions.\n'))
4433
4839
elif theirs_only and not remote_extra:
4434
4840
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4841
message(gettext('Other branch has no new revisions.\n'))
4436
4842
elif not (mine_only or theirs_only or local_extra or
4438
4844
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4846
message(gettext("Branches are up to date.\n"))
4441
4847
self.cleanup_now()
4442
4848
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)
4849
self.add_cleanup(local_branch.lock_write().unlock)
4445
4850
# handle race conditions - a parent might be set while we run.
4446
4851
if local_branch.get_parent() is None:
4447
4852
local_branch.set_parent(remote_branch.base)
4507
4912
@display_command
4508
4913
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")
4914
from bzrlib import plugin
4915
# Don't give writelines a generator as some codecs don't like that
4916
self.outf.writelines(
4917
list(plugin.describe_plugins(show_paths=verbose)))
4531
4920
class cmd_testament(Command):
4578
4966
Option('long', help='Show commit date in annotations.'),
4582
4971
encoding_type = 'exact'
4584
4973
@display_command
4585
4974
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4975
show_ids=False, directory=None):
4976
from bzrlib.annotate import (
4588
4979
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4980
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4981
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4982
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4984
self.add_cleanup(branch.lock_read().unlock)
4596
4985
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4986
self.add_cleanup(tree.lock_read().unlock)
4987
if wt is not None and revision is None:
4600
4988
file_id = wt.path2id(relpath)
4602
4990
file_id = tree.path2id(relpath)
4603
4991
if file_id is None:
4604
4992
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4993
if wt is not None and revision is None:
4607
4994
# If there is a tree and we're not annotating historical
4608
4995
# versions, annotate the working tree's content.
4609
4996
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4997
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4999
annotate_file_tree(tree, file_id, self.outf, long, all,
5000
show_ids=show_ids, branch=branch)
4616
5003
class cmd_re_sign(Command):
4620
5007
hidden = True # is this right ?
4621
5008
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5009
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5011
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5012
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')
5013
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5014
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)
5015
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5016
b = WorkingTree.open_containing(directory)[0].branch
5017
self.add_cleanup(b.lock_write().unlock)
4632
5018
return self._run(b, revision_id_list, revision)
4634
5020
def _run(self, b, revision_id_list, revision):
4694
5080
_see_also = ['checkouts', 'unbind']
4695
5081
takes_args = ['location?']
5082
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5084
def run(self, location=None, directory=u'.'):
5085
b, relpath = Branch.open_containing(directory)
4700
5086
if location is None:
4702
5088
location = b.get_old_bound_location()
4703
5089
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5090
raise errors.BzrCommandError(gettext('No location supplied. '
5091
'This format does not remember old locations.'))
4707
5093
if location is None:
4708
5094
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5095
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5097
raise errors.BzrCommandError(gettext('No location supplied '
5098
'and no previous location known'))
4713
5099
b_other = Branch.open(location)
4715
5101
b.bind(b_other)
4716
5102
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5103
raise errors.BzrCommandError(gettext('These branches have diverged.'
5104
' Try merging, and then bind again.'))
4719
5105
if b.get_config().has_explicit_nickname():
4720
5106
b.nick = b_other.nick
4784
5171
b = control.open_branch()
4786
5173
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5174
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)
5176
self.add_cleanup(b.lock_write().unlock)
5177
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5180
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5182
from bzrlib.log import log_formatter, show_log
4796
5183
from bzrlib.uncommit import uncommit
4827
5214
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5217
self.outf.write(gettext('Dry-run, pretending to remove'
5218
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5220
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')
5223
if not ui.ui_factory.confirm_action(
5224
gettext(u'Uncommit these revisions'),
5225
'bzrlib.builtins.uncommit',
5227
self.outf.write(gettext('Canceled\n'))
4840
5230
mutter('Uncommitting from {%s} to {%s}',
4841
5231
last_rev_id, rev_id)
4842
5232
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)
5233
revno=revno, local=local, keep_tags=keep_tags)
5234
self.outf.write(gettext('You can restore the old tip by running:\n'
5235
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5238
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5239
__doc__ = """Break a dead lock.
5241
This command breaks a lock on a repository, branch, working directory or
4851
5244
CAUTION: Locks should only be broken when you are sure that the process
4852
5245
holding the lock has been stopped.
4859
5252
bzr break-lock bzr+ssh://example.com/bzr/foo
5253
bzr break-lock --conf ~/.bazaar
4861
5256
takes_args = ['location?']
5259
help='LOCATION is the directory where the config lock is.'),
5261
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5264
def run(self, location=None, config=False, force=False):
4864
5265
if location is None:
4865
5266
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5268
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5270
{'bzrlib.lockdir.break': True})
5272
conf = _mod_config.LockableConfig(file_name=location)
5275
control, relpath = controldir.ControlDir.open_containing(location)
5277
control.break_lock()
5278
except NotImplementedError:
4873
5282
class cmd_wait_until_signalled(Command):
4936
5346
return host, port
4938
5348
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5349
protocol=None, client_timeout=None):
5350
from bzrlib import transport
4941
5351
if directory is None:
4942
5352
directory = os.getcwd()
4943
5353
if protocol is None:
4944
protocol = transport_server_registry.get()
5354
protocol = transport.transport_server_registry.get()
4945
5355
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5356
url = transport.location_to_url(directory)
4947
5357
if not allow_writes:
4948
5358
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5359
t = transport.get_transport_from_url(url)
5361
protocol(t, host, port, inet, client_timeout)
5362
except TypeError, e:
5363
# We use symbol_versioning.deprecated_in just so that people
5364
# grepping can find it here.
5365
# symbol_versioning.deprecated_in((2, 5, 0))
5366
symbol_versioning.warn(
5367
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5368
'Most likely it needs to be updated to support a'
5369
' "timeout" parameter (added in bzr 2.5.0)'
5370
% (e, protocol.__module__, protocol),
5372
protocol(t, host, port, inet)
4953
5375
class cmd_join(Command):
5359
5786
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5787
self.add_cleanup(branch.lock_write().unlock)
5363
5789
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5790
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5791
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5792
note(gettext('Deleted tag %s.') % tag_name)
5369
5795
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5796
raise errors.BzrCommandError(gettext(
5371
5797
"Tags can only be placed on a single revision, "
5373
5799
revision_id = revision[0].as_revision_id(branch)
5375
5801
revision_id = branch.last_revision()
5376
5802
if tag_name is None:
5377
5803
tag_name = branch.automatic_tag_name(revision_id)
5378
5804
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):
5805
raise errors.BzrCommandError(gettext(
5806
"Please specify a tag name."))
5808
existing_target = branch.tags.lookup_tag(tag_name)
5809
except errors.NoSuchTag:
5810
existing_target = None
5811
if not force and existing_target not in (None, revision_id):
5382
5812
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5813
if existing_target == revision_id:
5814
note(gettext('Tag %s already exists for that revision.') % tag_name)
5816
branch.tags.set_tag(tag_name, revision_id)
5817
if existing_target is None:
5818
note(gettext('Created tag %s.') % tag_name)
5820
note(gettext('Updated tag %s.') % tag_name)
5387
5823
class cmd_tags(Command):
5393
5829
_see_also = ['tag']
5394
5830
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5831
custom_help('directory',
5832
help='Branch whose tags should be displayed.'),
5833
RegistryOption('sort',
5401
5834
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5835
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5841
@display_command
5842
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5843
from bzrlib.tag import tag_sort_methods
5416
5844
branch, relpath = Branch.open_containing(directory)
5418
5846
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5850
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]])
5852
# Restrict to the specified range
5853
tags = self._tags_for_range(branch, revision)
5855
sort = tag_sort_methods.get()
5444
5857
if not show_ids:
5445
5858
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5859
for index, (tag, revid) in enumerate(tags):
5457
5872
for tag, revspec in tags:
5458
5873
self.outf.write('%-20s %s\n' % (tag, revspec))
5875
def _tags_for_range(self, branch, revision):
5877
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5878
revid1, revid2 = rev1.rev_id, rev2.rev_id
5879
# _get_revision_range will always set revid2 if it's not specified.
5880
# If revid1 is None, it means we want to start from the branch
5881
# origin which is always a valid ancestor. If revid1 == revid2, the
5882
# ancestry check is useless.
5883
if revid1 and revid1 != revid2:
5884
# FIXME: We really want to use the same graph than
5885
# branch.iter_merge_sorted_revisions below, but this is not
5886
# easily available -- vila 2011-09-23
5887
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5888
# We don't want to output anything in this case...
5890
# only show revisions between revid1 and revid2 (inclusive)
5891
tagged_revids = branch.tags.get_reverse_tag_dict()
5893
for r in branch.iter_merge_sorted_revisions(
5894
start_revision_id=revid2, stop_revision_id=revid1,
5895
stop_rule='include'):
5896
revid_tags = tagged_revids.get(r[0], None)
5898
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5902
class cmd_reconfigure(Command):
5462
5903
__doc__ = """Reconfigure the type of a bzr directory.
5476
5917
takes_args = ['location?']
5477
5918
takes_options = [
5478
5919
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5922
help='The relation between branch and tree.',
5482
5923
value_switches=True, enum_switch=False,
5483
5924
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5925
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5926
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5927
lightweight_checkout='Reconfigure to be a lightweight'
5487
5928
' checkout (with no local history).',
5930
RegistryOption.from_kwargs(
5932
title='Repository type',
5933
help='Location fo the repository.',
5934
value_switches=True, enum_switch=False,
5488
5935
standalone='Reconfigure to be a standalone branch '
5489
5936
'(i.e. stop using shared repository).',
5490
5937
use_shared='Reconfigure to use a shared repository.',
5939
RegistryOption.from_kwargs(
5941
title='Trees in Repository',
5942
help='Whether new branches in the repository have trees.',
5943
value_switches=True, enum_switch=False,
5491
5944
with_trees='Reconfigure repository to create '
5492
5945
'working trees on branches by default.',
5493
5946
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)
5963
def run(self, location=None, bind_to=None, force=False,
5964
tree_type=None, repository_type=None, repository_trees=None,
5965
stacked_on=None, unstacked=None):
5966
directory = controldir.ControlDir.open(location)
5514
5967
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5968
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
5969
elif stacked_on is not None:
5517
5970
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
5971
elif unstacked:
5520
5973
# At the moment you can use --stacked-on and a different
5521
5974
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
5976
if (tree_type is None and
5977
repository_type is None and
5978
repository_trees is None):
5524
5979
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5982
raise errors.BzrCommandError(gettext('No target configuration '
5984
reconfiguration = None
5985
if tree_type == 'branch':
5530
5986
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
5987
elif tree_type == 'tree':
5532
5988
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
5989
elif tree_type == 'checkout':
5534
5990
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
5991
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
5992
elif tree_type == 'lightweight-checkout':
5537
5993
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
5994
directory, bind_to)
5539
elif target_type == 'use-shared':
5996
reconfiguration.apply(force)
5997
reconfiguration = None
5998
if repository_type == 'use-shared':
5540
5999
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6000
elif repository_type == 'standalone':
5542
6001
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6003
reconfiguration.apply(force)
6004
reconfiguration = None
6005
if repository_trees == 'with-trees':
5544
6006
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6007
directory, True)
5546
elif target_type == 'with-no-trees':
6008
elif repository_trees == 'with-no-trees':
5547
6009
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6010
directory, False)
5549
reconfiguration.apply(force)
6012
reconfiguration.apply(force)
6013
reconfiguration = None
5552
6016
class cmd_switch(Command):
5600
6065
had_explicit_nick = False
5601
6066
if create_branch:
5602
6067
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
6068
raise errors.BzrCommandError(gettext('cannot create branch without'
5605
6070
to_location = directory_service.directories.dereference(
5607
6072
if '/' not in to_location and '\\' not in to_location:
5608
6073
# This path is meant to be relative to the existing branch
5609
6074
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6075
# Perhaps the target control dir supports colocated branches?
6077
root = controldir.ControlDir.open(this_url,
6078
possible_transports=[control_dir.user_transport])
6079
except errors.NotBranchError:
6082
colocated = root._format.colocated_branches
6084
to_location = urlutils.join_segment_parameters(this_url,
6085
{"branch": urlutils.escape(to_location)})
6087
to_location = urlutils.join(
6088
this_url, '..', urlutils.escape(to_location))
5611
6089
to_branch = branch.bzrdir.sprout(to_location,
5612
6090
possible_transports=[branch.bzrdir.root_transport],
5613
6091
source_branch=branch).open_branch()
6093
# Perhaps it's a colocated branch?
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6095
to_branch = control_dir.open_branch(to_location)
6096
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6098
to_branch = Branch.open(to_location)
6099
except errors.NotBranchError:
6100
this_url = self._get_branch_location(control_dir)
6101
to_branch = Branch.open(
6103
this_url, '..', urlutils.escape(to_location)))
5621
6104
if revision is not None:
5622
6105
revision = revision.as_revision_id(to_branch)
5623
6106
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6107
if had_explicit_nick:
5625
6108
branch = control_dir.open_branch() #get the new branch!
5626
6109
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6110
note(gettext('Switched to branch: %s'),
5628
6111
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
6113
def _get_branch_location(self, control_dir):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6218
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6220
current_view, view_dict = tree.views.get_view_info()
5737
6221
if name is None:
5738
6222
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6225
raise errors.BzrCommandError(gettext(
6226
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6228
raise errors.BzrCommandError(gettext(
6229
"Both --delete and --switch specified"))
5747
6231
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6232
self.outf.write(gettext("Deleted all views.\n"))
5749
6233
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6234
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6236
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6237
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6240
raise errors.BzrCommandError(gettext(
6241
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6243
raise errors.BzrCommandError(gettext(
6244
"Both --switch and --all specified"))
5761
6245
elif switch == 'off':
5762
6246
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6247
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6248
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6249
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6251
tree.views.set_view_info(switch, view_dict)
5768
6252
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6253
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6256
self.outf.write(gettext('Views defined:\n'))
5773
6257
for view in sorted(view_dict):
5774
6258
if view == current_view:
5778
6262
view_str = views.view_display_str(view_dict[view])
5779
6263
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6265
self.outf.write(gettext('No views defined.\n'))
5782
6266
elif file_list:
5783
6267
if name is None:
5784
6268
# No name given and no current view set
5786
6270
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6271
raise errors.BzrCommandError(gettext(
6272
"Cannot change the 'off' pseudo view"))
5789
6273
tree.views.set_view(name, sorted(file_list))
5790
6274
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6275
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6277
# list the files
5794
6278
if name is None:
5795
6279
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6280
self.outf.write(gettext('No current view.\n'))
5798
6282
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6283
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6286
class cmd_hooks(Command):
5883
6380
Option('destroy',
5884
6381
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6383
_see_also = ['unshelve', 'configuration']
5888
6385
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6386
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6388
return self.run_for_list(directory=directory)
5892
6389
from bzrlib.shelf_ui import Shelver
5893
6390
if writer is None:
5894
6391
writer = bzrlib.option.diff_writer_registry.get()
5896
6393
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6394
file_list, message, destroy=destroy, directory=directory)
5975
6475
' deleting them.'),
5976
6476
Option('force', help='Do not prompt before deleting.')]
5977
6477
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6478
force=False, directory=u'.'):
5979
6479
from bzrlib.clean_tree import clean_tree
5980
6480
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6484
clean_tree(directory, unknown=unknown, ignored=ignored,
6485
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6488
class cmd_reference(Command):
6032
6532
self.outf.write('%s %s\n' % (path, location))
6535
class cmd_export_pot(Command):
6536
__doc__ = """Export command helps and error messages in po format."""
6539
takes_options = [Option('plugin',
6540
help='Export help text from named command '\
6541
'(defaults to all built in commands).',
6544
def run(self, plugin=None):
6545
from bzrlib.export_pot import export_pot
6546
export_pot(self.outf, plugin)
6035
6549
def _register_lazy_builtins():
6036
6550
# register lazy builtins from other modules; called at startup and should
6037
6551
# be only called once.
6038
6552
for (name, aliases, module_name) in [
6039
6553
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6554
('cmd_config', [], 'bzrlib.config'),
6040
6555
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6556
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6557
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6558
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6559
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6560
('cmd_verify_signatures', [],
6561
'bzrlib.commit_signature_commands'),
6562
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6564
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
