172
180
: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)
182
return WorkingTree.open_containing_paths(
183
file_list, default_directory='.',
223
188
def _get_view_info_for_change_reporter(tree):
353
336
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
339
def run(self, revision_id=None, revision=None, directory=u'.'):
357
340
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')
341
raise errors.BzrCommandError(gettext('You can only supply one of'
342
' revision_id or --revision'))
360
343
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
344
raise errors.BzrCommandError(gettext('You must supply either'
345
' --revision or a revision_id'))
347
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
349
revisions = b.repository.revisions
366
350
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
351
raise errors.BzrCommandError(gettext('Repository %r does not support '
352
'access to raw revision texts'))
370
354
b.repository.lock_read()
491
478
location_list=['.']
493
480
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
481
d = controldir.ControlDir.open(location)
497
484
working = d.open_workingtree()
498
485
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
486
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
487
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
488
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
489
" of a remote path"))
504
491
if (working.has_changes()):
505
492
raise errors.UncommittedChanges(working)
493
if working.get_shelf_manager().last_shelf() is not None:
494
raise errors.ShelvedChanges(working)
507
496
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
497
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
498
" from a lightweight checkout"))
511
500
d.destroy_workingtree()
503
class cmd_repair_workingtree(Command):
504
__doc__ = """Reset the working tree state file.
506
This is not meant to be used normally, but more as a way to recover from
507
filesystem corruption, etc. This rebuilds the working inventory back to a
508
'known good' state. Any new modifications (adding a file, renaming, etc)
509
will be lost, though modified files will still be detected as such.
511
Most users will want something more like "bzr revert" or "bzr update"
512
unless the state file has become corrupted.
514
By default this attempts to recover the current state by looking at the
515
headers of the state file. If the state file is too corrupted to even do
516
that, you can supply --revision to force the state of the tree.
519
takes_options = ['revision', 'directory',
521
help='Reset the tree even if it doesn\'t appear to be'
526
def run(self, revision=None, directory='.', force=False):
527
tree, _ = WorkingTree.open_containing(directory)
528
self.add_cleanup(tree.lock_tree_write().unlock)
532
except errors.BzrError:
533
pass # There seems to be a real error here, so we'll reset
536
raise errors.BzrCommandError(gettext(
537
'The tree does not appear to be corrupt. You probably'
538
' want "bzr revert" instead. Use "--force" if you are'
539
' sure you want to reset the working tree.'))
543
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
545
tree.reset_state(revision_ids)
546
except errors.BzrError, e:
547
if revision_ids is None:
548
extra = (gettext(', the header appears corrupt, try passing -r -1'
549
' to set the state to the last commit'))
552
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
555
class cmd_revno(Command):
515
556
__doc__ = """Show current revision number.
520
561
_see_also = ['info']
521
562
takes_args = ['location?']
522
563
takes_options = [
523
Option('tree', help='Show revno of working tree'),
564
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
569
def run(self, tree=False, location=u'.', revision=None):
570
if revision is not None and tree:
571
raise errors.BzrCommandError(gettext("--tree and --revision can "
572
"not be used together"))
530
576
wt = WorkingTree.open_containing(location)[0]
577
self.add_cleanup(wt.lock_read().unlock)
532
578
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
579
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
581
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
583
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
584
self.add_cleanup(b.lock_read().unlock)
586
if len(revision) != 1:
587
raise errors.BzrCommandError(gettext(
588
"Tags can only be placed on a single revision, "
590
revid = revision[0].as_revision_id(b)
592
revid = b.last_revision()
594
revno_t = b.revision_id_to_dotted_revno(revid)
595
except errors.NoSuchRevision:
597
revno = ".".join(str(n) for n in revno_t)
546
598
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
599
self.outf.write(revno + '\n')
550
602
class cmd_revision_info(Command):
704
758
takes_args = ['dir+']
762
help='No error if existing, make parent directories as needed.',
705
766
encoding_type = 'replace'
707
def run(self, dir_list):
709
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
715
self.outf.write('added %s\n' % d)
769
def add_file_with_parents(cls, wt, relpath):
770
if wt.path2id(relpath) is not None:
772
cls.add_file_with_parents(wt, osutils.dirname(relpath))
776
def add_file_single(cls, wt, relpath):
779
def run(self, dir_list, parents=False):
781
add_file = self.add_file_with_parents
783
add_file = self.add_file_single
785
wt, relpath = WorkingTree.open_containing(dir)
790
if e.errno != errno.EEXIST:
717
raise errors.NotVersionedError(path=base)
794
add_file(wt, relpath)
796
self.outf.write(gettext('added %s\n') % dir)
720
799
class cmd_relpath(Command):
828
906
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
908
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
909
if names_list is None:
833
911
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)
912
raise errors.BzrCommandError(gettext("missing file argument"))
913
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
914
for file_name in rel_names[0:-1]:
916
raise errors.BzrCommandError(gettext("can not move root of branch"))
917
self.add_cleanup(tree.lock_tree_write().unlock)
838
918
self._run(tree, names_list, rel_names, after)
840
920
def run_auto(self, names_list, after, dry_run):
841
921
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
922
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)
925
raise errors.BzrCommandError(gettext('--after cannot be specified with'
927
work_tree, file_list = WorkingTree.open_containing_paths(
928
names_list, default_directory='.')
929
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
930
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
932
def _run(self, tree, names_list, rel_names, after):
960
1044
takes_options = ['remember', 'overwrite', 'revision',
961
1045
custom_help('verbose',
962
1046
help='Show logs of pulled revisions.'),
1047
custom_help('directory',
964
1048
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1049
'rather than the one containing the working directory.'),
970
1051
help="Perform a local pull in a bound "
971
1052
"branch. Local pulls are not applied to "
972
1053
"the master branch."
1056
help="Show base revision text in conflicts.")
975
1058
takes_args = ['location?']
976
1059
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1061
def run(self, location=None, remember=None, overwrite=False,
979
1062
revision=None, verbose=False,
980
directory=None, local=False):
1063
directory=None, local=False,
981
1065
# FIXME: too much stuff is in the command class
982
1066
revision_id = None
983
1067
mergeable = None
1110
1202
Option('strict',
1111
1203
help='Refuse to push if there are uncommitted changes in'
1112
1204
' the working tree, --no-strict disables the check.'),
1206
help="Don't populate the working tree, even for protocols"
1207
" that support it."),
1114
1209
takes_args = ['location?']
1115
1210
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1212
def run(self, location=None, remember=None, overwrite=False,
1118
1213
create_prefix=False, verbose=False, revision=None,
1119
1214
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1215
stacked=False, strict=None, no_tree=False):
1121
1216
from bzrlib.push import _show_push_branch
1123
1218
if directory is None:
1124
1219
directory = '.'
1125
1220
# Get the source branch
1126
1221
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1222
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1223
# Get the tip's revision_id
1129
1224
revision = _get_one_revision('push', revision)
1130
1225
if revision is not None:
1151
1246
# error by the feedback given to them. RBC 20080227.
1152
1247
stacked_on = parent_url
1153
1248
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1249
raise errors.BzrCommandError(gettext(
1250
"Could not determine branch to refer to."))
1157
1252
# Get the destination location
1158
1253
if location is None:
1159
1254
stored_loc = br_from.get_push_location()
1160
1255
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1256
parent_loc = br_from.get_parent()
1258
raise errors.BzrCommandError(gettext(
1259
"No push location known or specified. To push to the "
1260
"parent branch (at %s), use 'bzr push :parent'." %
1261
urlutils.unescape_for_display(parent_loc,
1262
self.outf.encoding)))
1264
raise errors.BzrCommandError(gettext(
1265
"No push location known or specified."))
1164
1267
display_url = urlutils.unescape_for_display(stored_loc,
1165
1268
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1269
note(gettext("Using saved push location: %s") % display_url)
1167
1270
location = stored_loc
1169
1272
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1273
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1274
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1275
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1278
class cmd_branch(Command):
1214
1321
def run(self, from_location, to_location=None, revision=None,
1215
1322
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1323
use_existing_dir=False, switch=False, bind=False,
1217
1325
from bzrlib import switch as _mod_switch
1218
1326
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1327
if self.invoked_as in ['get', 'clone']:
1328
ui.ui_factory.show_user_warning(
1329
'deprecated_command',
1330
deprecated_name=self.invoked_as,
1331
recommended_name='branch',
1332
deprecated_in_version='2.4')
1333
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1335
if not (hardlink or files_from):
1336
# accelerator_tree is usually slower because you have to read N
1337
# files (no readahead, lots of seeks, etc), but allow the user to
1338
# explicitly request it
1339
accelerator_tree = None
1340
if files_from is not None and files_from != from_location:
1341
accelerator_tree = WorkingTree.open(files_from)
1221
1342
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1343
self.add_cleanup(br_from.lock_read().unlock)
1224
1344
if revision is not None:
1225
1345
revision_id = revision.as_revision_id(br_from)
1230
1350
revision_id = br_from.last_revision()
1231
1351
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1352
to_location = getattr(br_from, "name", None)
1353
if to_location is None:
1354
to_location = urlutils.derive_to_location(from_location)
1233
1355
to_transport = transport.get_transport(to_location)
1235
1357
to_transport.mkdir('.')
1236
1358
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1360
to_dir = controldir.ControlDir.open_from_transport(
1362
except errors.NotBranchError:
1363
if not use_existing_dir:
1364
raise errors.BzrCommandError(gettext('Target directory "%s" '
1365
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1370
to_dir.open_branch()
1243
1371
except errors.NotBranchError:
1246
1374
raise errors.AlreadyBranchError(to_location)
1247
1375
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1376
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)
1382
# preserve whatever source format we have.
1383
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1384
possible_transports=[to_transport],
1385
accelerator_tree=accelerator_tree,
1386
hardlink=hardlink, stacked=stacked,
1387
force_new_repo=standalone,
1388
create_tree_if_local=not no_tree,
1389
source_branch=br_from)
1390
branch = to_dir.open_branch(
1391
possible_transports=[
1392
br_from.bzrdir.root_transport, to_transport])
1393
except errors.NoSuchRevision:
1394
to_transport.delete_tree('.')
1395
msg = gettext("The branch {0} has no revision {1}.").format(
1396
from_location, revision)
1397
raise errors.BzrCommandError(msg)
1399
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1400
_merge_tags_if_possible(br_from, branch)
1266
1401
# If the source branch is stacked, the new branch may
1267
1402
# be stacked whether we asked for that explicitly or not.
1268
1403
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1405
note(gettext('Created new stacked branch referring to %s.') %
1271
1406
branch.get_stacked_on_url())
1272
1407
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1408
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1409
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1411
# Bind to the parent
1277
1412
parent_branch = Branch.open(from_location)
1278
1413
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1414
note(gettext('New branch bound to %s') % from_location)
1281
1416
# Switch to the new branch
1282
1417
wt, _ = WorkingTree.open_containing('.')
1283
1418
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1419
note(gettext('Switched to branch: %s'),
1285
1420
urlutils.unescape_for_display(branch.base, 'utf-8'))
1423
class cmd_branches(Command):
1424
__doc__ = """List the branches available at the current location.
1426
This command will print the names of all the branches at the current
1430
takes_args = ['location?']
1432
Option('recursive', short_name='R',
1433
help='Recursively scan for branches rather than '
1434
'just looking in the specified location.')]
1436
def run(self, location=".", recursive=False):
1438
t = transport.get_transport(location)
1439
if not t.listable():
1440
raise errors.BzrCommandError(
1441
"Can't scan this type of location.")
1442
for b in controldir.ControlDir.find_branches(t):
1443
self.outf.write("%s\n" % urlutils.unescape_for_display(
1444
urlutils.relative_url(t.base, b.base),
1445
self.outf.encoding).rstrip("/"))
1447
dir = controldir.ControlDir.open_containing(location)[0]
1449
active_branch = dir.open_branch(name=None)
1450
except errors.NotBranchError:
1451
active_branch = None
1452
branches = dir.get_branches()
1454
for name, branch in branches.iteritems():
1457
active = (active_branch is not None and
1458
active_branch.base == branch.base)
1459
names[name] = active
1460
# Only mention the current branch explicitly if it's not
1461
# one of the colocated branches
1462
if not any(names.values()) and active_branch is not None:
1463
self.outf.write("* %s\n" % gettext("(default)"))
1464
for name in sorted(names.keys()):
1465
active = names[name]
1470
self.outf.write("%s %s\n" % (
1471
prefix, name.encode(self.outf.encoding)))
1288
1474
class cmd_checkout(Command):
1289
1475
__doc__ = """Create a new checkout of an existing branch.
1389
1578
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
1579
__doc__ = """Update a working tree to a new revision.
1581
This will perform a merge of the destination revision (the tip of the
1582
branch, or the specified revision) into the working tree, and then make
1583
that revision the basis revision for the working tree.
1585
You can use this to visit an older revision, or to update a working tree
1586
that is out of date from its branch.
1588
If there are any uncommitted changes in the tree, they will be carried
1589
across and remain as uncommitted changes after the update. To discard
1590
these changes, use 'bzr revert'. The uncommitted changes may conflict
1591
with the changes brought in by the change in basis revision.
1593
If the tree's branch is bound to a master branch, bzr will also update
1400
1594
the branch from the master.
1596
You cannot update just a single file or directory, because each Bazaar
1597
working tree has just a single basis revision. If you want to restore a
1598
file that has been removed locally, use 'bzr revert' instead of 'bzr
1599
update'. If you want to restore a file to its state in a previous
1600
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1601
out the old content of that file to a new location.
1603
The 'dir' argument, if given, must be the location of the root of a
1604
working tree to update. By default, the working tree that contains the
1605
current working directory is used.
1403
1608
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1609
takes_args = ['dir?']
1405
takes_options = ['revision']
1610
takes_options = ['revision',
1612
help="Show base revision text in conflicts."),
1406
1614
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1616
def run(self, dir=None, revision=None, show_base=None):
1409
1617
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]
1618
raise errors.BzrCommandError(gettext(
1619
"bzr update --revision takes exactly one revision"))
1621
tree = WorkingTree.open_containing('.')[0]
1623
tree, relpath = WorkingTree.open_containing(dir)
1626
raise errors.BzrCommandError(gettext(
1627
"bzr update can only update a whole tree, "
1628
"not a file or subdirectory"))
1413
1629
branch = tree.branch
1414
1630
possible_transports = []
1415
1631
master = branch.get_master_branch(
1416
1632
possible_transports=possible_transports)
1417
1633
if master is not None:
1419
1634
branch_location = master.base
1637
branch_location = tree.branch.base
1421
1638
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1639
self.add_cleanup(tree.unlock)
1424
1640
# get rid of the final '/' and be ready for display
1425
1641
branch_location = urlutils.unescape_for_display(
1451
1667
change_reporter,
1452
1668
possible_transports=possible_transports,
1453
1669
revision=revision_id,
1671
show_base=show_base)
1455
1672
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1673
raise errors.BzrCommandError(gettext(
1457
1674
"branch has no revision %s\n"
1458
1675
"bzr update --revision only works"
1459
" for a revision in the branch history"
1676
" for a revision in the branch history")
1460
1677
% (e.revision))
1461
1678
revno = tree.branch.revision_id_to_dotted_revno(
1462
1679
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1680
note(gettext('Updated to revision {0} of branch {1}').format(
1681
'.'.join(map(str, revno)), branch_location))
1465
1682
parent_ids = tree.get_parent_ids()
1466
1683
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'.")
1684
note(gettext('Your local commits will now show as pending merges with '
1685
"'bzr status', and can be committed with 'bzr commit'."))
1469
1686
if conflicts != 0:
1530
1748
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1749
'The file deletion mode to be used.',
1532
1750
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1751
safe='Backup changed files (default).',
1535
1752
keep='Delete from bzr but leave the working copy.',
1753
no_backup='Don\'t backup changed files.',
1536
1754
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1755
'recovered and even if they are non-empty directories. '
1756
'(deprecated, use no-backup)')]
1538
1757
aliases = ['rm', 'del']
1539
1758
encoding_type = 'replace'
1541
1760
def run(self, file_list, verbose=False, new=False,
1542
1761
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1762
if file_deletion_strategy == 'force':
1763
note(gettext("(The --force option is deprecated, rather use --no-backup "
1765
file_deletion_strategy = 'no-backup'
1767
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1769
if file_list is not None:
1546
1770
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1772
self.add_cleanup(tree.lock_write().unlock)
1550
1773
# Heuristics should probably all move into tree.remove_smart or
1742
1981
to_transport.ensure_base()
1743
1982
except errors.NoSuchFile:
1744
1983
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
1984
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
1985
" does not exist."
1747
1986
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
1987
" leading parent directories.")
1750
1989
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1992
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
1993
except errors.NotBranchError:
1755
1994
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1995
create_branch = controldir.ControlDir.create_branch_convenience
1997
force_new_tree = False
1999
force_new_tree = None
1757
2000
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
2001
possible_transports=[to_transport],
2002
force_new_tree=force_new_tree)
1759
2003
a_bzrdir = branch.bzrdir
1761
2005
from bzrlib.transport.local import LocalTransport
1837
2083
def run(self, location, format=None, no_trees=False):
1838
2084
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2085
format = controldir.format_registry.make_bzrdir('default')
1841
2087
if location is None:
1844
2090
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2092
(repo, newdir, require_stacking, repository_policy) = (
2093
format.initialize_on_transport_ex(to_transport,
2094
create_prefix=True, make_working_trees=not no_trees,
2095
shared_repo=True, force_new_repo=True,
2096
use_existing_dir=True,
2097
repo_format_name=format.repository_format.get_format_string()))
1850
2098
if not is_quiet():
1851
2099
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2100
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2103
class cmd_diff(Command):
1969
2234
elif ':' in prefix:
1970
2235
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2237
raise errors.BzrCommandError(gettext(
1973
2238
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2239
' (eg "old/:new/")'))
1976
2241
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2242
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2243
' one or two revision specifiers'))
1980
2245
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2246
raise errors.BzrCommandError(gettext(
2247
'{0} and {1} are mutually exclusive').format(
2248
'--using', '--format'))
1984
2250
(old_tree, new_tree,
1985
2251
old_branch, new_branch,
1986
2252
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2253
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2254
# GNU diff on Windows uses ANSI encoding for filenames
2255
path_encoding = osutils.get_diff_header_encoding()
1988
2256
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2257
specific_files=specific_files,
1990
2258
external_diff_options=diff_options,
1991
2259
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2260
extra_trees=extra_trees,
2261
path_encoding=path_encoding,
1993
2263
format_cls=format)
2053
2319
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2320
takes_options = ['directory', 'null']
2060
2322
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2323
def run(self, null=False, directory=u'.'):
2324
wt = WorkingTree.open_containing(directory)[0]
2325
self.add_cleanup(wt.lock_read().unlock)
2065
2326
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2327
self.add_cleanup(basis.lock_read().unlock)
2068
2328
basis_inv = basis.inventory
2069
2329
inv = wt.inventory
2070
2330
for file_id in inv:
2071
if file_id in basis_inv:
2331
if basis_inv.has_id(file_id):
2073
2333
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2335
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2336
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2339
self.outf.write(path + '\0')
2297
2565
Option('show-diff',
2298
2566
short_name='p',
2299
2567
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2568
Option('include-merged',
2301
2569
help='Show merged revisions like --levels 0 does.'),
2570
Option('include-merges', hidden=True,
2571
help='Historical alias for --include-merged.'),
2572
Option('omit-merges',
2573
help='Do not report commits with more than one parent.'),
2302
2574
Option('exclude-common-ancestry',
2303
2575
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2576
' of both ancestries (require -rX..Y).'
2578
Option('signatures',
2579
help='Show digital signature validity.'),
2582
help='Show revisions whose properties match this '
2585
ListOption('match-message',
2586
help='Show revisions whose message matches this '
2589
ListOption('match-committer',
2590
help='Show revisions whose committer matches this '
2593
ListOption('match-author',
2594
help='Show revisions whose authors match this '
2597
ListOption('match-bugs',
2598
help='Show revisions whose bugs match this '
2307
2602
encoding_type = 'replace'
2327
2631
_get_info_for_log_files,
2329
2633
direction = (forward and 'forward') or 'reverse'
2634
if symbol_versioning.deprecated_passed(include_merges):
2635
ui.ui_factory.show_user_warning(
2636
'deprecated_command_option',
2637
deprecated_name='--include-merges',
2638
recommended_name='--include-merged',
2639
deprecated_in_version='2.5',
2640
command=self.invoked_as)
2641
if include_merged is None:
2642
include_merged = include_merges
2644
raise errors.BzrCommandError(gettext(
2645
'{0} and {1} are mutually exclusive').format(
2646
'--include-merges', '--include-merged'))
2647
if include_merged is None:
2648
include_merged = False
2330
2649
if (exclude_common_ancestry
2331
2650
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2651
raise errors.BzrCommandError(gettext(
2652
'--exclude-common-ancestry requires -r with two revisions'))
2335
2654
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2657
raise errors.BzrCommandError(gettext(
2658
'{0} and {1} are mutually exclusive').format(
2659
'--levels', '--include-merged'))
2341
2661
if change is not None:
2342
2662
if len(change) > 1:
2343
2663
raise errors.RangeInChangeOption()
2344
2664
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2665
raise errors.BzrCommandError(gettext(
2666
'{0} and {1} are mutually exclusive').format(
2667
'--revision', '--change'))
2348
2669
revision = change
2528
2867
help='Recurse into subdirectories.'),
2529
2868
Option('from-root',
2530
2869
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2870
Option('unknown', short_name='u',
2871
help='Print unknown files.'),
2532
2872
Option('versioned', help='Print versioned files.',
2533
2873
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.'),
2874
Option('ignored', short_name='i',
2875
help='Print ignored files.'),
2876
Option('kind', short_name='k',
2539
2877
help='List entries of a particular kind: file, directory, symlink.',
2543
2883
@display_command
2544
2884
def run(self, revision=None, verbose=False,
2545
2885
recursive=False, from_root=False,
2546
2886
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2887
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2889
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2890
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2892
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2893
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2894
all = not (unknown or versioned or ignored)
2556
2896
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3075
self.outf.write("%s\n" % pattern)
2727
3077
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3078
raise errors.BzrCommandError(gettext("ignore requires at least one "
3079
"NAME_PATTERN or --default-rules."))
2730
3080
name_pattern_list = [globbing.normalize_pattern(p)
2731
3081
for p in name_pattern_list]
3083
bad_patterns_count = 0
3084
for p in name_pattern_list:
3085
if not globbing.Globster.is_pattern_valid(p):
3086
bad_patterns_count += 1
3087
bad_patterns += ('\n %s' % p)
3089
msg = (ngettext('Invalid ignore pattern found. %s',
3090
'Invalid ignore patterns found. %s',
3091
bad_patterns_count) % bad_patterns)
3092
ui.ui_factory.show_error(msg)
3093
raise errors.InvalidPattern('')
2732
3094
for name_pattern in name_pattern_list:
2733
3095
if (name_pattern[0] == '/' or
2734
3096
(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'.')
3097
raise errors.BzrCommandError(gettext(
3098
"NAME_PATTERN should not be an absolute path"))
3099
tree, relpath = WorkingTree.open_containing(directory)
2738
3100
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3101
ignored = globbing.Globster(name_pattern_list)
3103
self.add_cleanup(tree.lock_read().unlock)
2742
3104
for entry in tree.list_files():
2744
3106
if id is not None:
2745
3107
filename = entry[0]
2746
3108
if ignored.match(filename):
2747
3109
matches.append(filename)
2749
3110
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3111
self.outf.write(gettext("Warning: the following files are version "
3112
"controlled and match your ignore pattern:\n%s"
2752
3113
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3114
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3117
class cmd_ignored(Command):
2842
3205
Option('per-file-timestamps',
2843
3206
help='Set modification time of files to that of the last '
2844
3207
'revision in which it was changed.'),
3208
Option('uncommitted',
3209
help='Export the working tree contents rather than that of the '
2846
3212
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3213
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3215
from bzrlib.export import export
2850
3217
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3218
branch_or_subdir = directory
3220
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3222
if tree is not None:
3223
self.add_cleanup(tree.lock_read().unlock)
3227
raise errors.BzrCommandError(
3228
gettext("--uncommitted requires a working tree"))
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3231
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3233
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3234
per_file_timestamps=per_file_timestamps)
2862
3235
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3236
raise errors.BzrCommandError(
3237
gettext('Unsupported export format: %s') % e.format)
2866
3240
class cmd_cat(Command):
2885
3259
@display_command
2886
3260
def run(self, filename, revision=None, name_from_revision=False,
3261
filters=False, directory=None):
2888
3262
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3263
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3264
" one revision specifier"))
2891
3265
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3266
_open_directory_or_containing_tree_or_branch(filename, directory)
3267
self.add_cleanup(branch.lock_read().unlock)
2895
3268
return self._run(tree, branch, relpath, filename, revision,
2896
3269
name_from_revision, filters)
2900
3273
if tree is None:
2901
3274
tree = b.basis_tree()
2902
3275
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3276
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3278
old_file_id = rev_tree.path2id(relpath)
3280
# TODO: Split out this code to something that generically finds the
3281
# best id for a path across one or more trees; it's like
3282
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3284
if name_from_revision:
2909
3285
# Try in revision if requested
2910
3286
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3287
raise errors.BzrCommandError(gettext(
3288
"{0!r} is not present in revision {1}").format(
2913
3289
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3291
actual_file_id = old_file_id
2917
3293
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" % (
3294
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3295
actual_file_id = cur_file_id
3296
elif old_file_id is not None:
3297
actual_file_id = old_file_id
3299
raise errors.BzrCommandError(gettext(
3300
"{0!r} is not present in revision {1}").format(
2935
3301
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)
3303
from bzrlib.filter_tree import ContentFilterTree
3304
filter_tree = ContentFilterTree(rev_tree,
3305
rev_tree._content_filter_stack)
3306
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3308
content = rev_tree.get_file_text(actual_file_id)
3310
self.outf.write(content)
2952
3313
class cmd_local_time_offset(Command):
3013
3374
to trigger updates to external systems like bug trackers. The --fixes
3014
3375
option can be used to record the association between a revision and
3015
3376
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
3379
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3380
takes_args = ['selected*']
3076
3412
Option('show-diff', short_name='p',
3077
3413
help='When no message is supplied, show the diff along'
3078
3414
' with the status summary in the message editor.'),
3416
help='When committing to a foreign version control '
3417
'system do not push data that can not be natively '
3080
3420
aliases = ['ci', 'checkin']
3082
3422
def _iter_bug_fix_urls(self, fixes, branch):
3423
default_bugtracker = None
3083
3424
# Configure the properties for bug fixing attributes.
3084
3425
for fixed_bug in fixes:
3085
3426
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3427
if len(tokens) == 1:
3428
if default_bugtracker is None:
3429
branch_config = branch.get_config()
3430
default_bugtracker = branch_config.get_user_option(
3432
if default_bugtracker is None:
3433
raise errors.BzrCommandError(gettext(
3434
"No tracker specified for bug %s. Use the form "
3435
"'tracker:id' or specify a default bug tracker "
3436
"using the `bugtracker` option.\nSee "
3437
"\"bzr help bugs\" for more information on this "
3438
"feature. Commit refused.") % fixed_bug)
3439
tag = default_bugtracker
3441
elif len(tokens) != 2:
3442
raise errors.BzrCommandError(gettext(
3088
3443
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3444
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3445
"feature.\nCommit refused.") % fixed_bug)
3447
tag, bug_id = tokens
3093
3449
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3450
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3451
raise errors.BzrCommandError(gettext(
3452
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3453
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3454
raise errors.BzrCommandError(gettext(
3455
"%s\nCommit refused.") % (str(e),))
3101
3457
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3458
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3459
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3461
from bzrlib.errors import (
3105
3462
PointlessCommit,
3106
3463
ConflictsInTree,
3184
3539
# make_commit_message_template_encoded returns user encoding.
3185
3540
# 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")
3542
my_message = set_commit_message(commit_obj)
3543
if my_message is None:
3544
start_message = generate_commit_message_template(commit_obj)
3545
my_message = edit_commit_message_encoded(text,
3546
start_message=start_message)
3547
if my_message is None:
3548
raise errors.BzrCommandError(gettext("please specify a commit"
3549
" message with either --message or --file"))
3550
if my_message == "":
3551
raise errors.BzrCommandError(gettext("Empty commit message specified."
3552
" Please specify a commit message with either"
3553
" --message or --file or leave a blank message"
3554
" with --message \"\"."))
3195
3555
return my_message
3197
3557
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3565
reporter=None, verbose=verbose, revprops=properties,
3206
3566
authors=author, timestamp=commit_stamp,
3207
3567
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3568
exclude=tree.safe_relpath_files(exclude),
3209
3570
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3571
raise errors.BzrCommandError(gettext("No changes to commit."
3572
" Please 'bzr add' the files you want to commit, or use"
3573
" --unchanged to force an empty commit."))
3212
3574
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3575
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3576
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3578
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3579
raise errors.BzrCommandError(gettext("Commit refused because there are"
3580
" unknown files in the working tree."))
3219
3581
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3582
e.extra_help = (gettext("\n"
3221
3583
'To commit to master branch, run update and then commit.\n'
3222
3584
'You can also pass --local to commit to continue working '
3297
3659
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.
3660
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3662
When the default format has changed after a major new release of
3663
Bazaar, you may be informed during certain operations that you
3664
should upgrade. Upgrading to a newer format may improve performance
3665
or make new features available. It may however limit interoperability
3666
with older repositories or with older versions of Bazaar.
3668
If you wish to upgrade to a particular format rather than the
3669
current default, that can be specified using the --format option.
3670
As a consequence, you can use the upgrade command this way to
3671
"downgrade" to an earlier format, though some conversions are
3672
a one way process (e.g. changing from the 1.x default to the
3673
2.x default) so downgrading is not always possible.
3675
A backup.bzr.~#~ directory is created at the start of the conversion
3676
process (where # is a number). By default, this is left there on
3677
completion. If the conversion fails, delete the new .bzr directory
3678
and rename this one back in its place. Use the --clean option to ask
3679
for the backup.bzr directory to be removed on successful conversion.
3680
Alternatively, you can delete it by hand if everything looks good
3683
If the location given is a shared repository, dependent branches
3684
are also converted provided the repository converts successfully.
3685
If the conversion of a branch fails, remaining branches are still
3688
For more information on upgrades, see the Bazaar Upgrade Guide,
3689
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3692
_see_also = ['check', 'reconcile', 'formats']
3306
3693
takes_args = ['url?']
3307
3694
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'),
3695
RegistryOption('format',
3696
help='Upgrade to a specific format. See "bzr help'
3697
' formats" for details.',
3698
lazy_registry=('bzrlib.controldir', 'format_registry'),
3699
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3700
value_switches=True, title='Branch format'),
3702
help='Remove the backup.bzr directory if successful.'),
3704
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3707
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3708
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3709
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3711
if len(exceptions) == 1:
3712
# Compatibility with historical behavior
3321
3718
class cmd_whoami(Command):
3340
3738
encoding_type = 'replace'
3342
3740
@display_command
3343
def run(self, email=False, branch=False, name=None):
3741
def run(self, email=False, branch=False, name=None, directory=None):
3344
3742
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()
3743
if directory is None:
3744
# use branch if we're inside one; otherwise global config
3746
c = Branch.open_containing(u'.')[0].get_config_stack()
3747
except errors.NotBranchError:
3748
c = _mod_config.GlobalStack()
3750
c = Branch.open(directory).get_config_stack()
3751
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3753
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3756
self.outf.write(identity + '\n')
3760
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3763
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3765
_mod_config.extract_email_address(name)
3359
3766
except errors.NoEmailInUsername, e:
3360
3767
warning('"%s" does not seem to contain an email address. '
3361
3768
'This is allowed, but not recommended.', name)
3363
3770
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3772
if directory is None:
3773
c = Branch.open_containing(u'.')[0].get_config_stack()
3775
b = Branch.open(directory)
3776
self.add_cleanup(b.lock_write().unlock)
3777
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3779
c = _mod_config.GlobalStack()
3780
c.set('email', name)
3371
3783
class cmd_nick(Command):
3586
4003
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4004
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4006
first=False, list_only=False,
3590
4007
randomize=None, exclude=None, strict=False,
3591
4008
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)
4009
parallel=None, lsprof_tests=False,
4012
# During selftest, disallow proxying, as it can cause severe
4013
# performance penalties and is only needed for thread
4014
# safety. The selftest command is assumed to not use threads
4015
# too heavily. The call should be as early as possible, as
4016
# error reporting for past duplicate imports won't have useful
4018
lazy_import.disallow_proxying()
4020
from bzrlib import tests
3602
4022
if testspecs_list is not None:
3603
4023
pattern = '|'.join(testspecs_list)
3608
4028
from bzrlib.tests import SubUnitBzrRunner
3609
4029
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4030
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4031
"needs to be installed to use --subunit."))
3612
4032
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4033
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4034
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4035
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4036
# following code can be deleted when it's sufficiently deployed
4037
# -- vila/mgz 20100514
4038
if (sys.platform == "win32"
4039
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4041
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4043
self.additional_selftest_args.setdefault(
3620
4044
'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)
4046
raise errors.BzrCommandError(gettext(
4047
"--benchmark is no longer supported from bzr 2.2; "
4048
"use bzr-usertest instead"))
4049
test_suite_factory = None
4051
exclude_pattern = None
3629
test_suite_factory = None
4053
exclude_pattern = '(' + '|'.join(exclude) + ')'
4055
self._disable_fsync()
3631
4056
selftest_kwargs = {"verbose": verbose,
3632
4057
"pattern": pattern,
3633
4058
"stop_on_failure": one,
3635
4060
"test_suite_factory": test_suite_factory,
3636
4061
"lsprof_timed": lsprof_timed,
3637
4062
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4063
"matching_tests_first": first,
3640
4064
"list_only": list_only,
3641
4065
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4066
"exclude_pattern": exclude_pattern,
3643
4067
"strict": strict,
3644
4068
"load_list": load_list,
3645
4069
"debug_flags": debugflag,
3646
4070
"starting_with": starting_with
3648
4072
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4074
# Make deprecation warnings visible, unless -Werror is set
4075
cleanup = symbol_versioning.activate_deprecation_warnings(
4078
result = tests.selftest(**selftest_kwargs)
3650
4081
return int(not result)
4083
def _disable_fsync(self):
4084
"""Change the 'os' functionality to not synchronize."""
4085
self._orig_fsync = getattr(os, 'fsync', None)
4086
if self._orig_fsync is not None:
4087
os.fsync = lambda filedes: None
4088
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4089
if self._orig_fdatasync is not None:
4090
os.fdatasync = lambda filedes: None
3653
4093
class cmd_version(Command):
3654
4094
__doc__ = """Show version of bzr."""
3709
4147
The source of the merge can be specified either in the form of a branch,
3710
4148
or in the form of a path to a file containing a merge directive generated
3711
4149
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.
4150
or the branch most recently merged using --remember. The source of the
4151
merge may also be specified in the form of a path to a file in another
4152
branch: in this case, only the modifications to that file are merged into
4153
the current working tree.
4155
When merging from a branch, by default bzr will try to merge in all new
4156
work from the other branch, automatically determining an appropriate base
4157
revision. If this fails, you may need to give an explicit base.
4159
To pick a different ending revision, pass "--revision OTHER". bzr will
4160
try to merge in all new work up to and including revision OTHER.
4162
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4163
through OTHER, excluding BASE but including OTHER, will be merged. If this
4164
causes some revisions to be skipped, i.e. if the destination branch does
4165
not already contain revision BASE, such a merge is commonly referred to as
4166
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4167
cherrypicks. The changes look like a normal commit, and the history of the
4168
changes from the other branch is not stored in the commit.
4170
Revision numbers are always relative to the source branch.
3725
4172
Merge will do its best to combine the changes in two branches, but there
3726
4173
are some kinds of problems only a human can fix. When it encounters those,
3730
4177
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.
4179
If there is no default branch set, the first merge will set it (use
4180
--no-remember to avoid setting it). After that, you can omit the branch
4181
to use the default. To change the default, use --remember. The value will
4182
only be saved if the remote location can be accessed.
3737
4184
The results of the merge are placed into the destination working
3738
4185
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4186
committed to record the result of the merge.
3741
4188
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
4189
--force is given. If --force is given, then the changes from the source
4190
will be merged with the current working tree, including any uncommitted
4191
changes in the tree. The --force option can also be used to create a
3743
4192
merge revision which has more than two parents.
3745
4194
If one would like to merge changes from the working tree of the other
3873
4322
self.sanity_check_merger(merger)
3874
4323
if (merger.base_rev_id == merger.other_rev_id and
3875
4324
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4325
# check if location is a nonexistent file (and not a branch) to
4326
# disambiguate the 'Nothing to do'
4327
if merger.interesting_files:
4328
if not merger.other_tree.has_filename(
4329
merger.interesting_files[0]):
4330
note(gettext("merger: ") + str(merger))
4331
raise errors.PathsDoNotExist([location])
4332
note(gettext('Nothing to do.'))
4334
if pull and not preview:
3879
4335
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4336
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4337
if (merger.base_rev_id == tree.last_revision()):
3882
4338
result = tree.pull(merger.other_branch, False,
3883
4339
merger.other_rev_id)
3884
4340
result.report(self.outf)
3886
4342
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4343
raise errors.BzrCommandError(gettext(
3888
4344
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4345
" (perhaps you would prefer 'bzr pull')"))
3891
4347
return self._do_preview(merger)
3892
4348
elif interactive:
3988
4446
if other_revision_id is None:
3989
4447
other_revision_id = _mod_revision.ensure_null(
3990
4448
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):
4449
# Remember where we merge from. We need to remember if:
4450
# - user specify a location (and we don't merge from the parent
4452
# - user ask to remember or there is no previous location set to merge
4453
# from and user didn't ask to *not* remember
4454
if (user_location is not None
4456
or (remember is None
4457
and tree.branch.get_submit_branch() is None)))):
3994
4458
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4459
# Merge tags (but don't set them in the master branch yet, the user
4460
# might revert this merge). Commit will propagate them.
4461
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4462
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4463
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4464
if other_path != '':
4340
4808
theirs_only=False,
4341
4809
log_format=None, long=False, short=False, line=False,
4342
4810
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4811
include_merged=None, revision=None, my_revision=None,
4813
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4814
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4815
def message(s):
4346
4816
if not is_quiet():
4347
4817
self.outf.write(s)
4819
if symbol_versioning.deprecated_passed(include_merges):
4820
ui.ui_factory.show_user_warning(
4821
'deprecated_command_option',
4822
deprecated_name='--include-merges',
4823
recommended_name='--include-merged',
4824
deprecated_in_version='2.5',
4825
command=self.invoked_as)
4826
if include_merged is None:
4827
include_merged = include_merges
4829
raise errors.BzrCommandError(gettext(
4830
'{0} and {1} are mutually exclusive').format(
4831
'--include-merges', '--include-merged'))
4832
if include_merged is None:
4833
include_merged = False
4350
4835
mine_only = this
4359
4844
elif theirs_only:
4360
4845
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4847
local_branch = Branch.open_containing(directory)[0]
4848
self.add_cleanup(local_branch.lock_read().unlock)
4366
4850
parent = local_branch.get_parent()
4367
4851
if other_branch is None:
4368
4852
other_branch = parent
4369
4853
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4854
raise errors.BzrCommandError(gettext("No peer location known"
4372
4856
display_url = urlutils.unescape_for_display(parent,
4373
4857
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4858
message(gettext("Using saved parent location: {0}\n").format(
4377
4861
remote_branch = Branch.open(other_branch)
4378
4862
if remote_branch.base == local_branch.base:
4379
4863
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4865
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4867
local_revid_range = _revision_range_to_revid_range(
4385
4868
_get_revision_range(my_revision, local_branch,
4430
4917
if mine_only and not local_extra:
4431
4918
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4919
message(gettext('This branch has no new revisions.\n'))
4433
4920
elif theirs_only and not remote_extra:
4434
4921
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4922
message(gettext('Other branch has no new revisions.\n'))
4436
4923
elif not (mine_only or theirs_only or local_extra or
4438
4925
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4927
message(gettext("Branches are up to date.\n"))
4441
4928
self.cleanup_now()
4442
4929
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)
4930
self.add_cleanup(local_branch.lock_write().unlock)
4445
4931
# handle race conditions - a parent might be set while we run.
4446
4932
if local_branch.get_parent() is None:
4447
4933
local_branch.set_parent(remote_branch.base)
4578
5047
Option('long', help='Show commit date in annotations.'),
4582
5052
encoding_type = 'exact'
4584
5054
@display_command
4585
5055
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5056
show_ids=False, directory=None):
5057
from bzrlib.annotate import (
4588
5060
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5061
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5062
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5063
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5065
self.add_cleanup(branch.lock_read().unlock)
4596
5066
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5067
self.add_cleanup(tree.lock_read().unlock)
5068
if wt is not None and revision is None:
4600
5069
file_id = wt.path2id(relpath)
4602
5071
file_id = tree.path2id(relpath)
4603
5072
if file_id is None:
4604
5073
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5074
if wt is not None and revision is None:
4607
5075
# If there is a tree and we're not annotating historical
4608
5076
# versions, annotate the working tree's content.
4609
5077
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5078
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5080
annotate_file_tree(tree, file_id, self.outf, long, all,
5081
show_ids=show_ids, branch=branch)
4616
5084
class cmd_re_sign(Command):
4620
5088
hidden = True # is this right ?
4621
5089
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5090
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5092
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5093
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')
5094
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5095
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)
5096
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5097
b = WorkingTree.open_containing(directory)[0].branch
5098
self.add_cleanup(b.lock_write().unlock)
4632
5099
return self._run(b, revision_id_list, revision)
4634
5101
def _run(self, b, revision_id_list, revision):
4635
5102
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5103
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5104
if revision_id_list is not None:
4638
5105
b.repository.start_write_group()
4694
5161
_see_also = ['checkouts', 'unbind']
4695
5162
takes_args = ['location?']
5163
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5165
def run(self, location=None, directory=u'.'):
5166
b, relpath = Branch.open_containing(directory)
4700
5167
if location is None:
4702
5169
location = b.get_old_bound_location()
4703
5170
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5171
raise errors.BzrCommandError(gettext('No location supplied. '
5172
'This format does not remember old locations.'))
4707
5174
if location is None:
4708
5175
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5176
raise errors.BzrCommandError(
5177
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5179
raise errors.BzrCommandError(
5180
gettext('No location supplied'
5181
' and no previous location known'))
4713
5182
b_other = Branch.open(location)
4715
5184
b.bind(b_other)
4716
5185
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5186
raise errors.BzrCommandError(gettext('These branches have diverged.'
5187
' Try merging, and then bind again.'))
4719
5188
if b.get_config().has_explicit_nickname():
4720
5189
b.nick = b_other.nick
4784
5254
b = control.open_branch()
4786
5256
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5257
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)
5259
self.add_cleanup(b.lock_write().unlock)
5260
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5263
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5265
from bzrlib.log import log_formatter, show_log
4796
5266
from bzrlib.uncommit import uncommit
4827
5297
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5300
self.outf.write(gettext('Dry-run, pretending to remove'
5301
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5303
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')
5306
if not ui.ui_factory.confirm_action(
5307
gettext(u'Uncommit these revisions'),
5308
'bzrlib.builtins.uncommit',
5310
self.outf.write(gettext('Canceled\n'))
4840
5313
mutter('Uncommitting from {%s} to {%s}',
4841
5314
last_rev_id, rev_id)
4842
5315
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)
5316
revno=revno, local=local, keep_tags=keep_tags)
5317
self.outf.write(gettext('You can restore the old tip by running:\n'
5318
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5321
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5322
__doc__ = """Break a dead lock.
5324
This command breaks a lock on a repository, branch, working directory or
4851
5327
CAUTION: Locks should only be broken when you are sure that the process
4852
5328
holding the lock has been stopped.
4859
5335
bzr break-lock bzr+ssh://example.com/bzr/foo
5336
bzr break-lock --conf ~/.bazaar
4861
5339
takes_args = ['location?']
5342
help='LOCATION is the directory where the config lock is.'),
5344
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5347
def run(self, location=None, config=False, force=False):
4864
5348
if location is None:
4865
5349
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5351
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5353
{'bzrlib.lockdir.break': True})
5355
conf = _mod_config.LockableConfig(file_name=location)
5358
control, relpath = controldir.ControlDir.open_containing(location)
5360
control.break_lock()
5361
except NotImplementedError:
4873
5365
class cmd_wait_until_signalled(Command):
4936
5429
return host, port
4938
5431
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5432
protocol=None, client_timeout=None):
5433
from bzrlib import transport
4941
5434
if directory is None:
4942
5435
directory = os.getcwd()
4943
5436
if protocol is None:
4944
protocol = transport_server_registry.get()
5437
protocol = transport.transport_server_registry.get()
4945
5438
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5439
url = transport.location_to_url(directory)
4947
5440
if not allow_writes:
4948
5441
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5442
t = transport.get_transport_from_url(url)
5444
protocol(t, host, port, inet, client_timeout)
5445
except TypeError, e:
5446
# We use symbol_versioning.deprecated_in just so that people
5447
# grepping can find it here.
5448
# symbol_versioning.deprecated_in((2, 5, 0))
5449
symbol_versioning.warn(
5450
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5451
'Most likely it needs to be updated to support a'
5452
' "timeout" parameter (added in bzr 2.5.0)'
5453
% (e, protocol.__module__, protocol),
5455
protocol(t, host, port, inet)
4953
5458
class cmd_join(Command):
5081
5588
if submit_branch is None:
5082
5589
submit_branch = branch.get_parent()
5083
5590
if submit_branch is None:
5084
raise errors.BzrCommandError('No submit branch specified or known')
5591
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5086
5593
stored_public_branch = branch.get_public_branch()
5087
5594
if public_branch is None:
5088
5595
public_branch = stored_public_branch
5089
5596
elif stored_public_branch is None:
5597
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5090
5598
branch.set_public_branch(public_branch)
5091
5599
if not include_bundle and public_branch is None:
5092
raise errors.BzrCommandError('No public branch specified or'
5600
raise errors.BzrCommandError(gettext('No public branch specified or'
5094
5602
base_revision_id = None
5095
5603
if revision is not None:
5096
5604
if len(revision) > 2:
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5605
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5606
'at most two one revision identifiers'))
5099
5607
revision_id = revision[-1].as_revision_id(branch)
5100
5608
if len(revision) == 2:
5101
5609
base_revision_id = revision[0].as_revision_id(branch)
5359
5870
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5871
self.add_cleanup(branch.lock_write().unlock)
5363
5873
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5874
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5875
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5876
note(gettext('Deleted tag %s.') % tag_name)
5369
5879
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5880
raise errors.BzrCommandError(gettext(
5371
5881
"Tags can only be placed on a single revision, "
5373
5883
revision_id = revision[0].as_revision_id(branch)
5375
5885
revision_id = branch.last_revision()
5376
5886
if tag_name is None:
5377
5887
tag_name = branch.automatic_tag_name(revision_id)
5378
5888
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):
5889
raise errors.BzrCommandError(gettext(
5890
"Please specify a tag name."))
5892
existing_target = branch.tags.lookup_tag(tag_name)
5893
except errors.NoSuchTag:
5894
existing_target = None
5895
if not force and existing_target not in (None, revision_id):
5382
5896
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5897
if existing_target == revision_id:
5898
note(gettext('Tag %s already exists for that revision.') % tag_name)
5900
branch.tags.set_tag(tag_name, revision_id)
5901
if existing_target is None:
5902
note(gettext('Created tag %s.') % tag_name)
5904
note(gettext('Updated tag %s.') % tag_name)
5387
5907
class cmd_tags(Command):
5393
5913
_see_also = ['tag']
5394
5914
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5915
custom_help('directory',
5916
help='Branch whose tags should be displayed.'),
5917
RegistryOption('sort',
5401
5918
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5919
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5925
@display_command
5926
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5927
from bzrlib.tag import tag_sort_methods
5416
5928
branch, relpath = Branch.open_containing(directory)
5418
5930
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5934
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]])
5936
# Restrict to the specified range
5937
tags = self._tags_for_range(branch, revision)
5939
sort = tag_sort_methods.get()
5444
5941
if not show_ids:
5445
5942
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5943
for index, (tag, revid) in enumerate(tags):
5457
5956
for tag, revspec in tags:
5458
5957
self.outf.write('%-20s %s\n' % (tag, revspec))
5959
def _tags_for_range(self, branch, revision):
5961
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5962
revid1, revid2 = rev1.rev_id, rev2.rev_id
5963
# _get_revision_range will always set revid2 if it's not specified.
5964
# If revid1 is None, it means we want to start from the branch
5965
# origin which is always a valid ancestor. If revid1 == revid2, the
5966
# ancestry check is useless.
5967
if revid1 and revid1 != revid2:
5968
# FIXME: We really want to use the same graph than
5969
# branch.iter_merge_sorted_revisions below, but this is not
5970
# easily available -- vila 2011-09-23
5971
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5972
# We don't want to output anything in this case...
5974
# only show revisions between revid1 and revid2 (inclusive)
5975
tagged_revids = branch.tags.get_reverse_tag_dict()
5977
for r in branch.iter_merge_sorted_revisions(
5978
start_revision_id=revid2, stop_revision_id=revid1,
5979
stop_rule='include'):
5980
revid_tags = tagged_revids.get(r[0], None)
5982
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5986
class cmd_reconfigure(Command):
5462
5987
__doc__ = """Reconfigure the type of a bzr directory.
5476
6001
takes_args = ['location?']
5477
6002
takes_options = [
5478
6003
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6006
help='The relation between branch and tree.',
5482
6007
value_switches=True, enum_switch=False,
5483
6008
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6009
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6010
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6011
lightweight_checkout='Reconfigure to be a lightweight'
5487
6012
' checkout (with no local history).',
6014
RegistryOption.from_kwargs(
6016
title='Repository type',
6017
help='Location fo the repository.',
6018
value_switches=True, enum_switch=False,
5488
6019
standalone='Reconfigure to be a standalone branch '
5489
6020
'(i.e. stop using shared repository).',
5490
6021
use_shared='Reconfigure to use a shared repository.',
6023
RegistryOption.from_kwargs(
6025
title='Trees in Repository',
6026
help='Whether new branches in the repository have trees.',
6027
value_switches=True, enum_switch=False,
5491
6028
with_trees='Reconfigure repository to create '
5492
6029
'working trees on branches by default.',
5493
6030
with_no_trees='Reconfigure repository to not create '
5520
6057
# At the moment you can use --stacked-on and a different
5521
6058
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6060
if (tree_type is None and
6061
repository_type is None and
6062
repository_trees is None):
5524
6063
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6066
raise errors.BzrCommandError(gettext('No target configuration '
6068
reconfiguration = None
6069
if tree_type == 'branch':
5530
6070
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6071
elif tree_type == 'tree':
5532
6072
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6073
elif tree_type == 'checkout':
5534
6074
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6075
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6076
elif tree_type == 'lightweight-checkout':
5537
6077
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6078
directory, bind_to)
5539
elif target_type == 'use-shared':
6080
reconfiguration.apply(force)
6081
reconfiguration = None
6082
if repository_type == 'use-shared':
5540
6083
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6084
elif repository_type == 'standalone':
5542
6085
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6087
reconfiguration.apply(force)
6088
reconfiguration = None
6089
if repository_trees == 'with-trees':
5544
6090
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6091
directory, True)
5546
elif target_type == 'with-no-trees':
6092
elif repository_trees == 'with-no-trees':
5547
6093
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6094
directory, False)
5549
reconfiguration.apply(force)
6096
reconfiguration.apply(force)
6097
reconfiguration = None
5552
6100
class cmd_switch(Command):
5600
6149
had_explicit_nick = False
5601
6150
if create_branch:
5602
6151
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
6152
raise errors.BzrCommandError(gettext('cannot create branch without'
5605
6154
to_location = directory_service.directories.dereference(
5607
6156
if '/' not in to_location and '\\' not in to_location:
5608
6157
# This path is meant to be relative to the existing branch
5609
6158
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6159
# Perhaps the target control dir supports colocated branches?
6161
root = controldir.ControlDir.open(this_url,
6162
possible_transports=[control_dir.user_transport])
6163
except errors.NotBranchError:
6166
colocated = root._format.colocated_branches
6168
to_location = urlutils.join_segment_parameters(this_url,
6169
{"branch": urlutils.escape(to_location)})
6171
to_location = urlutils.join(
6172
this_url, '..', urlutils.escape(to_location))
5611
6173
to_branch = branch.bzrdir.sprout(to_location,
5612
6174
possible_transports=[branch.bzrdir.root_transport],
5613
6175
source_branch=branch).open_branch()
6177
# 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))
6179
to_branch = control_dir.open_branch(to_location)
6180
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6182
to_branch = Branch.open(to_location)
6183
except errors.NotBranchError:
6184
this_url = self._get_branch_location(control_dir)
6185
to_branch = Branch.open(
6187
this_url, '..', urlutils.escape(to_location)))
5621
6188
if revision is not None:
5622
6189
revision = revision.as_revision_id(to_branch)
5623
6190
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6191
if had_explicit_nick:
5625
6192
branch = control_dir.open_branch() #get the new branch!
5626
6193
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6194
note(gettext('Switched to branch: %s'),
5628
6195
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
6197
def _get_branch_location(self, control_dir):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6302
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6304
current_view, view_dict = tree.views.get_view_info()
5737
6305
if name is None:
5738
6306
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6309
raise errors.BzrCommandError(gettext(
6310
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6312
raise errors.BzrCommandError(gettext(
6313
"Both --delete and --switch specified"))
5747
6315
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6316
self.outf.write(gettext("Deleted all views.\n"))
5749
6317
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6318
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6320
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6321
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6324
raise errors.BzrCommandError(gettext(
6325
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6327
raise errors.BzrCommandError(gettext(
6328
"Both --switch and --all specified"))
5761
6329
elif switch == 'off':
5762
6330
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6331
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6332
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6333
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6335
tree.views.set_view_info(switch, view_dict)
5768
6336
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6337
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6340
self.outf.write(gettext('Views defined:\n'))
5773
6341
for view in sorted(view_dict):
5774
6342
if view == current_view:
5778
6346
view_str = views.view_display_str(view_dict[view])
5779
6347
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6349
self.outf.write(gettext('No views defined.\n'))
5782
6350
elif file_list:
5783
6351
if name is None:
5784
6352
# No name given and no current view set
5786
6354
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6355
raise errors.BzrCommandError(gettext(
6356
"Cannot change the 'off' pseudo view"))
5789
6357
tree.views.set_view(name, sorted(file_list))
5790
6358
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6359
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6361
# list the files
5794
6362
if name is None:
5795
6363
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6364
self.outf.write(gettext('No current view.\n'))
5798
6366
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6367
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6370
class cmd_hooks(Command):
5883
6464
Option('destroy',
5884
6465
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6467
_see_also = ['unshelve', 'configuration']
5888
6469
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6470
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6472
return self.run_for_list(directory=directory)
5892
6473
from bzrlib.shelf_ui import Shelver
5893
6474
if writer is None:
5894
6475
writer = bzrlib.option.diff_writer_registry.get()
5896
6477
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6478
file_list, message, destroy=destroy, directory=directory)
6032
6616
self.outf.write('%s %s\n' % (path, location))
6619
class cmd_export_pot(Command):
6620
__doc__ = """Export command helps and error messages in po format."""
6623
takes_options = [Option('plugin',
6624
help='Export help text from named command '\
6625
'(defaults to all built in commands).',
6627
Option('include-duplicates',
6628
help='Output multiple copies of the same msgid '
6629
'string if it appears more than once.'),
6632
def run(self, plugin=None, include_duplicates=False):
6633
from bzrlib.export_pot import export_pot
6634
export_pot(self.outf, plugin, include_duplicates)
6035
6637
def _register_lazy_builtins():
6036
6638
# register lazy builtins from other modules; called at startup and should
6037
6639
# be only called once.
6038
6640
for (name, aliases, module_name) in [
6039
6641
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6642
('cmd_config', [], 'bzrlib.config'),
6040
6643
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6644
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6645
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6646
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6647
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6648
('cmd_verify_signatures', [],
6649
'bzrlib.commit_signature_commands'),
6650
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6652
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
