180
172
:return: workingtree, [relative_paths]
182
return WorkingTree.open_containing_paths(
183
file_list, default_directory='.',
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)
188
223
def _get_view_info_for_change_reporter(tree):
336
353
self.outf.write(revtext.decode('utf-8'))
339
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
340
357
if revision_id is not None and revision is not None:
341
raise errors.BzrCommandError(gettext('You can only supply one of'
342
' revision_id or --revision'))
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
343
360
if revision_id is None and revision is None:
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]
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
349
365
revisions = b.repository.revisions
350
366
if revisions is None:
351
raise errors.BzrCommandError(gettext('Repository %r does not support '
352
'access to raw revision texts'))
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
354
370
b.repository.lock_read()
478
491
location_list=['.']
480
493
for location in location_list:
481
d = controldir.ControlDir.open(location)
494
d = bzrdir.BzrDir.open(location)
484
497
working = d.open_workingtree()
485
498
except errors.NoWorkingTree:
486
raise errors.BzrCommandError(gettext("No working tree to remove"))
499
raise errors.BzrCommandError("No working tree to remove")
487
500
except errors.NotLocalUrl:
488
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
489
" of a remote path"))
501
raise errors.BzrCommandError("You cannot remove the working tree"
491
504
if (working.has_changes()):
492
505
raise errors.UncommittedChanges(working)
493
if working.get_shelf_manager().last_shelf() is not None:
494
raise errors.ShelvedChanges(working)
496
507
if working.user_url != working.branch.user_url:
497
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
498
" from a lightweight checkout"))
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
500
511
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))
555
514
class cmd_revno(Command):
556
515
__doc__ = """Show current revision number.
561
520
_see_also = ['info']
562
521
takes_args = ['location?']
563
522
takes_options = [
564
Option('tree', help='Show revno of working tree.'),
523
Option('tree', help='Show revno of working tree'),
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"))
527
def run(self, tree=False, location=u'.'):
576
530
wt = WorkingTree.open_containing(location)[0]
577
self.add_cleanup(wt.lock_read().unlock)
578
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
579
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
581
535
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)
583
542
b = Branch.open_containing(location)[0]
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)
544
self.add_cleanup(b.unlock)
598
546
self.cleanup_now()
599
self.outf.write(revno + '\n')
547
self.outf.write(str(revno) + '\n')
602
550
class cmd_revision_info(Command):
758
704
takes_args = ['dir+']
762
help='No error if existing, make parent directories as needed.',
766
705
encoding_type = 'replace'
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:
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)
794
add_file(wt, relpath)
796
self.outf.write(gettext('added %s\n') % dir)
717
raise errors.NotVersionedError(path=base)
799
720
class cmd_relpath(Command):
906
828
return self.run_auto(names_list, after, dry_run)
908
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
830
raise errors.BzrCommandError('--dry-run requires --auto.')
909
831
if names_list is None:
911
833
if len(names_list) < 2:
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)
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)
918
838
self._run(tree, names_list, rel_names, after)
920
840
def run_auto(self, names_list, after, dry_run):
921
841
if names_list is not None and len(names_list) > 1:
922
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('Only one path may be specified to'
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)
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)
930
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
932
852
def _run(self, tree, names_list, rel_names, after):
1044
960
takes_options = ['remember', 'overwrite', 'revision',
1045
961
custom_help('verbose',
1046
962
help='Show logs of pulled revisions.'),
1047
custom_help('directory',
1048
964
help='Branch to pull into, '
1049
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
1051
970
help="Perform a local pull in a bound "
1052
971
"branch. Local pulls are not applied to "
1053
972
"the master branch."
1056
help="Show base revision text in conflicts.")
1058
975
takes_args = ['location?']
1059
976
encoding_type = 'replace'
1061
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1062
979
revision=None, verbose=False,
1063
directory=None, local=False,
980
directory=None, local=False):
1065
981
# FIXME: too much stuff is in the command class
1066
982
revision_id = None
1067
983
mergeable = None
1200
1110
Option('strict',
1201
1111
help='Refuse to push if there are uncommitted changes in'
1202
1112
' the working tree, --no-strict disables the check.'),
1204
help="Don't populate the working tree, even for protocols"
1205
" that support it."),
1207
1114
takes_args = ['location?']
1208
1115
encoding_type = 'replace'
1210
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1211
1118
create_prefix=False, verbose=False, revision=None,
1212
1119
use_existing_dir=False, directory=None, stacked_on=None,
1213
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1214
1121
from bzrlib.push import _show_push_branch
1216
1123
if directory is None:
1217
1124
directory = '.'
1218
1125
# Get the source branch
1219
1126
(tree, br_from,
1220
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1221
1128
# Get the tip's revision_id
1222
1129
revision = _get_one_revision('push', revision)
1223
1130
if revision is not None:
1244
1151
# error by the feedback given to them. RBC 20080227.
1245
1152
stacked_on = parent_url
1246
1153
if not stacked_on:
1247
raise errors.BzrCommandError(gettext(
1248
"Could not determine branch to refer to."))
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1250
1157
# Get the destination location
1251
1158
if location is None:
1252
1159
stored_loc = br_from.get_push_location()
1253
1160
if stored_loc is None:
1254
parent_loc = br_from.get_parent()
1256
raise errors.BzrCommandError(gettext(
1257
"No push location known or specified. To push to the "
1258
"parent branch (at %s), use 'bzr push :parent'." %
1259
urlutils.unescape_for_display(parent_loc,
1260
self.outf.encoding)))
1262
raise errors.BzrCommandError(gettext(
1263
"No push location known or specified."))
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1265
1164
display_url = urlutils.unescape_for_display(stored_loc,
1266
1165
self.outf.encoding)
1267
note(gettext("Using saved push location: %s") % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1268
1167
location = stored_loc
1270
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1271
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1272
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1273
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1276
1175
class cmd_branch(Command):
1319
1214
def run(self, from_location, to_location=None, revision=None,
1320
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1321
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1323
1217
from bzrlib import switch as _mod_switch
1324
1218
from bzrlib.tag import _merge_tags_if_possible
1325
if self.invoked_as in ['get', 'clone']:
1326
ui.ui_factory.show_user_warning(
1327
'deprecated_command',
1328
deprecated_name=self.invoked_as,
1329
recommended_name='branch',
1330
deprecated_in_version='2.4')
1331
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1333
if not (hardlink or files_from):
1334
# accelerator_tree is usually slower because you have to read N
1335
# files (no readahead, lots of seeks, etc), but allow the user to
1336
# explicitly request it
1337
accelerator_tree = None
1338
if files_from is not None and files_from != from_location:
1339
accelerator_tree = WorkingTree.open(files_from)
1340
1221
revision = _get_one_revision('branch', revision)
1341
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1342
1224
if revision is not None:
1343
1225
revision_id = revision.as_revision_id(br_from)
1348
1230
revision_id = br_from.last_revision()
1349
1231
if to_location is None:
1350
to_location = getattr(br_from, "name", None)
1351
if to_location is None:
1352
to_location = urlutils.derive_to_location(from_location)
1232
to_location = urlutils.derive_to_location(from_location)
1353
1233
to_transport = transport.get_transport(to_location)
1355
1235
to_transport.mkdir('.')
1356
1236
except errors.FileExists:
1358
to_dir = controldir.ControlDir.open_from_transport(
1360
except errors.NotBranchError:
1361
if not use_existing_dir:
1362
raise errors.BzrCommandError(gettext('Target directory "%s" '
1363
'already exists.') % to_location)
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1368
to_dir.open_branch()
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1369
1243
except errors.NotBranchError:
1372
1246
raise errors.AlreadyBranchError(to_location)
1373
1247
except errors.NoSuchFile:
1374
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1380
# preserve whatever source format we have.
1381
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1382
possible_transports=[to_transport],
1383
accelerator_tree=accelerator_tree,
1384
hardlink=hardlink, stacked=stacked,
1385
force_new_repo=standalone,
1386
create_tree_if_local=not no_tree,
1387
source_branch=br_from)
1388
branch = to_dir.open_branch(
1389
possible_transports=[
1390
br_from.bzrdir.root_transport, to_transport])
1391
except errors.NoSuchRevision:
1392
to_transport.delete_tree('.')
1393
msg = gettext("The branch {0} has no revision {1}.").format(
1394
from_location, revision)
1395
raise errors.BzrCommandError(msg)
1397
branch = br_from.sprout(to_dir, revision_id=revision_id)
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)
1398
1265
_merge_tags_if_possible(br_from, branch)
1399
1266
# If the source branch is stacked, the new branch may
1400
1267
# be stacked whether we asked for that explicitly or not.
1401
1268
# We therefore need a try/except here and not just 'if stacked:'
1403
note(gettext('Created new stacked branch referring to %s.') %
1270
note('Created new stacked branch referring to %s.' %
1404
1271
branch.get_stacked_on_url())
1405
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1406
1273
errors.UnstackableRepositoryFormat), e:
1407
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1274
note('Branched %d revision(s).' % branch.revno())
1409
1276
# Bind to the parent
1410
1277
parent_branch = Branch.open(from_location)
1411
1278
branch.bind(parent_branch)
1412
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1414
1281
# Switch to the new branch
1415
1282
wt, _ = WorkingTree.open_containing('.')
1416
1283
_mod_switch.switch(wt.bzrdir, branch)
1417
note(gettext('Switched to branch: %s'),
1284
note('Switched to branch: %s',
1418
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1421
class cmd_branches(Command):
1422
__doc__ = """List the branches available at the current location.
1424
This command will print the names of all the branches at the current
1428
takes_args = ['location?']
1430
Option('recursive', short_name='R',
1431
help='Recursively scan for branches rather than '
1432
'just looking in the specified location.')]
1434
def run(self, location=".", recursive=False):
1436
t = transport.get_transport(location)
1437
if not t.listable():
1438
raise errors.BzrCommandError(
1439
"Can't scan this type of location.")
1440
for b in controldir.ControlDir.find_branches(t):
1441
self.outf.write("%s\n" % urlutils.unescape_for_display(
1442
urlutils.relative_url(t.base, b.base),
1443
self.outf.encoding).rstrip("/"))
1445
dir = controldir.ControlDir.open_containing(location)[0]
1447
active_branch = dir.open_branch(name=None)
1448
except errors.NotBranchError:
1449
active_branch = None
1450
branches = dir.get_branches()
1452
for name, branch in branches.iteritems():
1455
active = (active_branch is not None and
1456
active_branch.base == branch.base)
1457
names[name] = active
1458
# Only mention the current branch explicitly if it's not
1459
# one of the colocated branches
1460
if not any(names.values()) and active_branch is not None:
1461
self.outf.write("* %s\n" % gettext("(default)"))
1462
for name in sorted(names.keys()):
1463
active = names[name]
1468
self.outf.write("%s %s\n" % (
1469
prefix, name.encode(self.outf.encoding)))
1472
1288
class cmd_checkout(Command):
1473
1289
__doc__ = """Create a new checkout of an existing branch.
1576
1389
class cmd_update(Command):
1577
__doc__ = """Update a working tree to a new revision.
1579
This will perform a merge of the destination revision (the tip of the
1580
branch, or the specified revision) into the working tree, and then make
1581
that revision the basis revision for the working tree.
1583
You can use this to visit an older revision, or to update a working tree
1584
that is out of date from its branch.
1586
If there are any uncommitted changes in the tree, they will be carried
1587
across and remain as uncommitted changes after the update. To discard
1588
these changes, use 'bzr revert'. The uncommitted changes may conflict
1589
with the changes brought in by the change in basis revision.
1591
If the tree's branch is bound to a master branch, bzr will also update
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
1592
1400
the branch from the master.
1594
You cannot update just a single file or directory, because each Bazaar
1595
working tree has just a single basis revision. If you want to restore a
1596
file that has been removed locally, use 'bzr revert' instead of 'bzr
1597
update'. If you want to restore a file to its state in a previous
1598
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1599
out the old content of that file to a new location.
1601
The 'dir' argument, if given, must be the location of the root of a
1602
working tree to update. By default, the working tree that contains the
1603
current working directory is used.
1606
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1607
1404
takes_args = ['dir?']
1608
takes_options = ['revision',
1610
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1612
1406
aliases = ['up']
1614
def run(self, dir=None, revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1615
1409
if revision is not None and len(revision) != 1:
1616
raise errors.BzrCommandError(gettext(
1617
"bzr update --revision takes exactly one revision"))
1619
tree = WorkingTree.open_containing('.')[0]
1621
tree, relpath = WorkingTree.open_containing(dir)
1624
raise errors.BzrCommandError(gettext(
1625
"bzr update can only update a whole tree, "
1626
"not a file or subdirectory"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1627
1413
branch = tree.branch
1628
1414
possible_transports = []
1629
1415
master = branch.get_master_branch(
1630
1416
possible_transports=possible_transports)
1631
1417
if master is not None:
1632
1419
branch_location = master.base
1421
tree.lock_tree_write()
1635
1422
branch_location = tree.branch.base
1636
tree.lock_tree_write()
1637
1423
self.add_cleanup(tree.unlock)
1638
1424
# get rid of the final '/' and be ready for display
1639
1425
branch_location = urlutils.unescape_for_display(
1665
1451
change_reporter,
1666
1452
possible_transports=possible_transports,
1667
1453
revision=revision_id,
1669
show_base=show_base)
1670
1455
except errors.NoSuchRevision, e:
1671
raise errors.BzrCommandError(gettext(
1456
raise errors.BzrCommandError(
1672
1457
"branch has no revision %s\n"
1673
1458
"bzr update --revision only works"
1674
" for a revision in the branch history")
1459
" for a revision in the branch history"
1675
1460
% (e.revision))
1676
1461
revno = tree.branch.revision_id_to_dotted_revno(
1677
1462
_mod_revision.ensure_null(tree.last_revision()))
1678
note(gettext('Updated to revision {0} of branch {1}').format(
1679
'.'.join(map(str, revno)), branch_location))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1680
1465
parent_ids = tree.get_parent_ids()
1681
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1682
note(gettext('Your local commits will now show as pending merges with '
1683
"'bzr status', and can be committed with 'bzr commit'."))
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1684
1469
if conflicts != 0:
1746
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1747
1531
'The file deletion mode to be used.',
1748
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1749
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1750
1535
keep='Delete from bzr but leave the working copy.',
1751
no_backup='Don\'t backup changed files.',
1752
1536
force='Delete all the specified files, even if they can not be '
1753
'recovered and even if they are non-empty directories. '
1754
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1755
1538
aliases = ['rm', 'del']
1756
1539
encoding_type = 'replace'
1758
1541
def run(self, file_list, verbose=False, new=False,
1759
1542
file_deletion_strategy='safe'):
1760
if file_deletion_strategy == 'force':
1761
note(gettext("(The --force option is deprecated, rather use --no-backup "
1763
file_deletion_strategy = 'no-backup'
1765
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1767
1545
if file_list is not None:
1768
1546
file_list = [f for f in file_list]
1770
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1771
1550
# Heuristics should probably all move into tree.remove_smart or
1979
1742
to_transport.ensure_base()
1980
1743
except errors.NoSuchFile:
1981
1744
if not create_prefix:
1982
raise errors.BzrCommandError(gettext("Parent directory of %s"
1745
raise errors.BzrCommandError("Parent directory of %s"
1983
1746
" does not exist."
1984
1747
"\nYou may supply --create-prefix to create all"
1985
" leading parent directories.")
1748
" leading parent directories."
1987
1750
to_transport.create_prefix()
1990
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1991
1754
except errors.NotBranchError:
1992
1755
# really a NotBzrDir error...
1993
create_branch = controldir.ControlDir.create_branch_convenience
1995
force_new_tree = False
1997
force_new_tree = None
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1998
1757
branch = create_branch(to_transport.base, format=format,
1999
possible_transports=[to_transport],
2000
force_new_tree=force_new_tree)
1758
possible_transports=[to_transport])
2001
1759
a_bzrdir = branch.bzrdir
2003
1761
from bzrlib.transport.local import LocalTransport
2081
1837
def run(self, location, format=None, no_trees=False):
2082
1838
if format is None:
2083
format = controldir.format_registry.make_bzrdir('default')
1839
format = bzrdir.format_registry.make_bzrdir('default')
2085
1841
if location is None:
2088
1844
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
2090
(repo, newdir, require_stacking, repository_policy) = (
2091
format.initialize_on_transport_ex(to_transport,
2092
create_prefix=True, make_working_trees=not no_trees,
2093
shared_repo=True, force_new_repo=True,
2094
use_existing_dir=True,
2095
repo_format_name=format.repository_format.get_format_string()))
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2096
1850
if not is_quiet():
2097
1851
from bzrlib.info import show_bzrdir_info
2098
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2101
1855
class cmd_diff(Command):
2232
1969
elif ':' in prefix:
2233
1970
old_label, new_label = prefix.split(":")
2235
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2236
1973
'--prefix expects two values separated by a colon'
2237
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2239
1976
if revision and len(revision) > 2:
2240
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2241
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2243
1980
if using is not None and format is not None:
2244
raise errors.BzrCommandError(gettext(
2245
'{0} and {1} are mutually exclusive').format(
2246
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2248
1984
(old_tree, new_tree,
2249
1985
old_branch, new_branch,
2250
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2251
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2252
# GNU diff on Windows uses ANSI encoding for filenames
2253
path_encoding = osutils.get_diff_header_encoding()
2254
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2255
1989
specific_files=specific_files,
2256
1990
external_diff_options=diff_options,
2257
1991
old_label=old_label, new_label=new_label,
2258
extra_trees=extra_trees,
2259
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2261
1993
format_cls=format)
2317
2053
_see_also = ['status', 'ls']
2318
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2320
2060
@display_command
2321
def run(self, null=False, directory=u'.'):
2322
wt = WorkingTree.open_containing(directory)[0]
2323
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2324
2065
basis = wt.basis_tree()
2325
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2326
2068
basis_inv = basis.inventory
2327
2069
inv = wt.inventory
2328
2070
for file_id in inv:
2329
if basis_inv.has_id(file_id):
2071
if file_id in basis_inv:
2331
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2333
2075
path = inv.id2path(file_id)
2334
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2337
2079
self.outf.write(path + '\0')
2563
2297
Option('show-diff',
2564
2298
short_name='p',
2565
2299
help='Show changes made in each revision as a patch.'),
2566
Option('include-merged',
2300
Option('include-merges',
2567
2301
help='Show merged revisions like --levels 0 does.'),
2568
Option('include-merges', hidden=True,
2569
help='Historical alias for --include-merged.'),
2570
Option('omit-merges',
2571
help='Do not report commits with more than one parent.'),
2572
2302
Option('exclude-common-ancestry',
2573
2303
help='Display only the revisions that are not part'
2574
' of both ancestries (require -rX..Y).'
2576
Option('signatures',
2577
help='Show digital signature validity.'),
2580
help='Show revisions whose properties match this '
2583
ListOption('match-message',
2584
help='Show revisions whose message matches this '
2587
ListOption('match-committer',
2588
help='Show revisions whose committer matches this '
2591
ListOption('match-author',
2592
help='Show revisions whose authors match this '
2595
ListOption('match-bugs',
2596
help='Show revisions whose bugs match this '
2304
' of both ancestries (require -rX..Y)'
2600
2307
encoding_type = 'replace'
2629
2327
_get_info_for_log_files,
2631
2329
direction = (forward and 'forward') or 'reverse'
2632
if symbol_versioning.deprecated_passed(include_merges):
2633
ui.ui_factory.show_user_warning(
2634
'deprecated_command_option',
2635
deprecated_name='--include-merges',
2636
recommended_name='--include-merged',
2637
deprecated_in_version='2.5',
2638
command=self.invoked_as)
2639
if include_merged is None:
2640
include_merged = include_merges
2642
raise errors.BzrCommandError(gettext(
2643
'{0} and {1} are mutually exclusive').format(
2644
'--include-merges', '--include-merged'))
2645
if include_merged is None:
2646
include_merged = False
2647
2330
if (exclude_common_ancestry
2648
2331
and (revision is None or len(revision) != 2)):
2649
raise errors.BzrCommandError(gettext(
2650
'--exclude-common-ancestry requires -r with two revisions'))
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2652
2335
if levels is None:
2655
raise errors.BzrCommandError(gettext(
2656
'{0} and {1} are mutually exclusive').format(
2657
'--levels', '--include-merged'))
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2659
2341
if change is not None:
2660
2342
if len(change) > 1:
2661
2343
raise errors.RangeInChangeOption()
2662
2344
if revision is not None:
2663
raise errors.BzrCommandError(gettext(
2664
'{0} and {1} are mutually exclusive').format(
2665
'--revision', '--change'))
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2667
2348
revision = change
2865
2528
help='Recurse into subdirectories.'),
2866
2529
Option('from-root',
2867
2530
help='Print paths relative to the root of the branch.'),
2868
Option('unknown', short_name='u',
2869
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2870
2532
Option('versioned', help='Print versioned files.',
2871
2533
short_name='V'),
2872
Option('ignored', short_name='i',
2873
help='Print ignored files.'),
2874
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2875
2539
help='List entries of a particular kind: file, directory, symlink.',
2881
2543
@display_command
2882
2544
def run(self, revision=None, verbose=False,
2883
2545
recursive=False, from_root=False,
2884
2546
unknown=False, versioned=False, ignored=False,
2885
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2887
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2888
raise errors.BzrCommandError(gettext('invalid kind specified'))
2550
raise errors.BzrCommandError('invalid kind specified')
2890
2552
if verbose and null:
2891
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2892
2554
all = not (unknown or versioned or ignored)
2894
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
3073
2725
self.outf.write("%s\n" % pattern)
3075
2727
if not name_pattern_list:
3076
raise errors.BzrCommandError(gettext("ignore requires at least one "
3077
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3078
2730
name_pattern_list = [globbing.normalize_pattern(p)
3079
2731
for p in name_pattern_list]
3081
bad_patterns_count = 0
3082
for p in name_pattern_list:
3083
if not globbing.Globster.is_pattern_valid(p):
3084
bad_patterns_count += 1
3085
bad_patterns += ('\n %s' % p)
3087
msg = (ngettext('Invalid ignore pattern found. %s',
3088
'Invalid ignore patterns found. %s',
3089
bad_patterns_count) % bad_patterns)
3090
ui.ui_factory.show_error(msg)
3091
raise errors.InvalidPattern('')
3092
2732
for name_pattern in name_pattern_list:
3093
2733
if (name_pattern[0] == '/' or
3094
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3095
raise errors.BzrCommandError(gettext(
3096
"NAME_PATTERN should not be an absolute path"))
3097
tree, relpath = WorkingTree.open_containing(directory)
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3098
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3099
2739
ignored = globbing.Globster(name_pattern_list)
3101
self.add_cleanup(tree.lock_read().unlock)
3102
2742
for entry in tree.list_files():
3104
2744
if id is not None:
3105
2745
filename = entry[0]
3106
2746
if ignored.match(filename):
3107
2747
matches.append(filename)
3108
2749
if len(matches) > 0:
3109
self.outf.write(gettext("Warning: the following files are version "
3110
"controlled and match your ignore pattern:\n%s"
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3111
2752
"\nThese files will continue to be version controlled"
3112
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3115
2756
class cmd_ignored(Command):
3203
2842
Option('per-file-timestamps',
3204
2843
help='Set modification time of files to that of the last '
3205
2844
'revision in which it was changed.'),
3206
Option('uncommitted',
3207
help='Export the working tree contents rather than that of the '
3210
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3211
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2847
root=None, filters=False, per_file_timestamps=False):
3213
2848
from bzrlib.export import export
3215
2850
if branch_or_subdir is None:
3216
branch_or_subdir = directory
3218
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3220
if tree is not None:
3221
self.add_cleanup(tree.lock_read().unlock)
3225
raise errors.BzrCommandError(
3226
gettext("--uncommitted requires a working tree"))
2851
tree = WorkingTree.open_containing(u'.')[0]
3229
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=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(export_tree, dest, format, root, subdir, filtered=filters,
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3232
2861
per_file_timestamps=per_file_timestamps)
3233
2862
except errors.NoSuchExportFormat, e:
3234
raise errors.BzrCommandError(
3235
gettext('Unsupported export format: %s') % e.format)
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3238
2866
class cmd_cat(Command):
3257
2885
@display_command
3258
2886
def run(self, filename, revision=None, name_from_revision=False,
3259
filters=False, directory=None):
3260
2888
if revision is not None and len(revision) != 1:
3261
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3262
" one revision specifier"))
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3263
2891
tree, branch, relpath = \
3264
_open_directory_or_containing_tree_or_branch(filename, directory)
3265
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3266
2895
return self._run(tree, branch, relpath, filename, revision,
3267
2896
name_from_revision, filters)
3271
2900
if tree is None:
3272
2901
tree = b.basis_tree()
3273
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3274
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3276
2906
old_file_id = rev_tree.path2id(relpath)
3278
# TODO: Split out this code to something that generically finds the
3279
# best id for a path across one or more trees; it's like
3280
# find_ids_across_trees but restricted to find just one. -- mbp
3282
2908
if name_from_revision:
3283
2909
# Try in revision if requested
3284
2910
if old_file_id is None:
3285
raise errors.BzrCommandError(gettext(
3286
"{0!r} is not present in revision {1}").format(
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3287
2913
filename, rev_tree.get_revision_id()))
3289
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3291
2917
cur_file_id = tree.path2id(relpath)
3292
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3293
actual_file_id = cur_file_id
3294
elif old_file_id is not None:
3295
actual_file_id = old_file_id
3297
raise errors.BzrCommandError(gettext(
3298
"{0!r} is not present in revision {1}").format(
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" % (
3299
2935
filename, rev_tree.get_revision_id()))
3301
from bzrlib.filter_tree import ContentFilterTree
3302
filter_tree = ContentFilterTree(rev_tree,
3303
rev_tree._content_filter_stack)
3304
content = filter_tree.get_file_text(actual_file_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)
3306
content = rev_tree.get_file_text(actual_file_id)
3308
self.outf.write(content)
2949
self.outf.write(content)
3311
2952
class cmd_local_time_offset(Command):
3372
3013
to trigger updates to external systems like bug trackers. The --fixes
3373
3014
option can be used to record the association between a revision and
3374
3015
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
3377
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3378
3044
takes_args = ['selected*']
3410
3076
Option('show-diff', short_name='p',
3411
3077
help='When no message is supplied, show the diff along'
3412
3078
' with the status summary in the message editor.'),
3414
help='When committing to a foreign version control '
3415
'system do not push data that can not be natively '
3418
3080
aliases = ['ci', 'checkin']
3420
3082
def _iter_bug_fix_urls(self, fixes, branch):
3421
default_bugtracker = None
3422
3083
# Configure the properties for bug fixing attributes.
3423
3084
for fixed_bug in fixes:
3424
3085
tokens = fixed_bug.split(':')
3425
if len(tokens) == 1:
3426
if default_bugtracker is None:
3427
branch_config = branch.get_config()
3428
default_bugtracker = branch_config.get_user_option(
3430
if default_bugtracker is None:
3431
raise errors.BzrCommandError(gettext(
3432
"No tracker specified for bug %s. Use the form "
3433
"'tracker:id' or specify a default bug tracker "
3434
"using the `bugtracker` option.\nSee "
3435
"\"bzr help bugs\" for more information on this "
3436
"feature. Commit refused.") % fixed_bug)
3437
tag = default_bugtracker
3439
elif len(tokens) != 2:
3440
raise errors.BzrCommandError(gettext(
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3441
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3442
3089
"See \"bzr help bugs\" for more information on this "
3443
"feature.\nCommit refused.") % fixed_bug)
3445
tag, bug_id = tokens
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3447
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3448
3094
except errors.UnknownBugTrackerAbbreviation:
3449
raise errors.BzrCommandError(gettext(
3450
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3451
3097
except errors.MalformedBugIdentifier, e:
3452
raise errors.BzrCommandError(gettext(
3453
"%s\nCommit refused.") % (str(e),))
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3455
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3456
3102
unchanged=False, strict=False, local=False, fixes=None,
3457
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3459
3104
from bzrlib.errors import (
3460
3105
PointlessCommit,
3461
3106
ConflictsInTree,
3537
3184
# make_commit_message_template_encoded returns user encoding.
3538
3185
# We probably want to be using edit_commit_message instead to
3540
my_message = set_commit_message(commit_obj)
3541
if my_message is None:
3542
start_message = generate_commit_message_template(commit_obj)
3543
my_message = edit_commit_message_encoded(text,
3544
start_message=start_message)
3545
if my_message is None:
3546
raise errors.BzrCommandError(gettext("please specify a commit"
3547
" message with either --message or --file"))
3548
if my_message == "":
3549
raise errors.BzrCommandError(gettext("Empty commit message specified."
3550
" Please specify a commit message with either"
3551
" --message or --file or leave a blank message"
3552
" with --message \"\"."))
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")
3553
3195
return my_message
3555
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3563
3205
reporter=None, verbose=verbose, revprops=properties,
3564
3206
authors=author, timestamp=commit_stamp,
3565
3207
timezone=offset,
3566
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3568
3209
except PointlessCommit:
3569
raise errors.BzrCommandError(gettext("No changes to commit."
3570
" Please 'bzr add' the files you want to commit, or use"
3571
" --unchanged to force an empty commit."))
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3572
3212
except ConflictsInTree:
3573
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3213
raise errors.BzrCommandError('Conflicts detected in working '
3574
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3576
3216
except StrictCommitFailed:
3577
raise errors.BzrCommandError(gettext("Commit refused because there are"
3578
" unknown files in the working tree."))
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3579
3219
except errors.BoundBranchOutOfDate, e:
3580
e.extra_help = (gettext("\n"
3220
e.extra_help = ("\n"
3581
3221
'To commit to master branch, run update and then commit.\n'
3582
3222
'You can also pass --local to commit to continue working '
3657
3297
class cmd_upgrade(Command):
3658
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3660
When the default format has changed after a major new release of
3661
Bazaar, you may be informed during certain operations that you
3662
should upgrade. Upgrading to a newer format may improve performance
3663
or make new features available. It may however limit interoperability
3664
with older repositories or with older versions of Bazaar.
3666
If you wish to upgrade to a particular format rather than the
3667
current default, that can be specified using the --format option.
3668
As a consequence, you can use the upgrade command this way to
3669
"downgrade" to an earlier format, though some conversions are
3670
a one way process (e.g. changing from the 1.x default to the
3671
2.x default) so downgrading is not always possible.
3673
A backup.bzr.~#~ directory is created at the start of the conversion
3674
process (where # is a number). By default, this is left there on
3675
completion. If the conversion fails, delete the new .bzr directory
3676
and rename this one back in its place. Use the --clean option to ask
3677
for the backup.bzr directory to be removed on successful conversion.
3678
Alternatively, you can delete it by hand if everything looks good
3681
If the location given is a shared repository, dependent branches
3682
are also converted provided the repository converts successfully.
3683
If the conversion of a branch fails, remaining branches are still
3686
For more information on upgrades, see the Bazaar Upgrade Guide,
3687
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
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.
3690
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3691
3306
takes_args = ['url?']
3692
3307
takes_options = [
3693
RegistryOption('format',
3694
help='Upgrade to a specific format. See "bzr help'
3695
' formats" for details.',
3696
lazy_registry=('bzrlib.controldir', 'format_registry'),
3697
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3698
value_switches=True, title='Branch format'),
3700
help='Remove the backup.bzr directory if successful.'),
3702
help="Show what would be done, but don't actually do anything."),
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'),
3705
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3706
3317
from bzrlib.upgrade import upgrade
3707
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3709
if len(exceptions) == 1:
3710
# Compatibility with historical behavior
3318
upgrade(url, format)
3716
3321
class cmd_whoami(Command):
3736
3340
encoding_type = 'replace'
3738
3342
@display_command
3739
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3740
3344
if name is None:
3741
if directory is None:
3742
# use branch if we're inside one; otherwise global config
3744
c = Branch.open_containing(u'.')[0].get_config_stack()
3745
except errors.NotBranchError:
3746
c = _mod_config.GlobalStack()
3748
c = Branch.open(directory).get_config_stack()
3749
identity = c.get('email')
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()
3751
self.outf.write(_mod_config.extract_email_address(identity)
3351
self.outf.write(c.user_email() + '\n')
3754
self.outf.write(identity + '\n')
3353
self.outf.write(c.username() + '\n')
3758
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3761
3356
# display a warning if an email address isn't included in the given name.
3763
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3764
3359
except errors.NoEmailInUsername, e:
3765
3360
warning('"%s" does not seem to contain an email address. '
3766
3361
'This is allowed, but not recommended.', name)
3768
3363
# use global config unless --branch given
3770
if directory is None:
3771
c = Branch.open_containing(u'.')[0].get_config_stack()
3773
c = Branch.open(directory).get_config_stack()
3365
c = Branch.open_containing('.')[0].get_config()
3775
c = _mod_config.GlobalStack()
3776
c.set('email', name)
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3779
3371
class cmd_nick(Command):
3999
3586
def run(self, testspecs_list=None, verbose=False, one=False,
4000
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
4002
3589
first=False, list_only=False,
4003
3590
randomize=None, exclude=None, strict=False,
4004
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
4005
parallel=None, lsprof_tests=False,
4008
# During selftest, disallow proxying, as it can cause severe
4009
# performance penalties and is only needed for thread
4010
# safety. The selftest command is assumed to not use threads
4011
# too heavily. The call should be as early as possible, as
4012
# error reporting for past duplicate imports won't have useful
4014
lazy_import.disallow_proxying()
4016
from bzrlib import tests
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)
4018
3602
if testspecs_list is not None:
4019
3603
pattern = '|'.join(testspecs_list)
4024
3608
from bzrlib.tests import SubUnitBzrRunner
4025
3609
except ImportError:
4026
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4027
"needs to be installed to use --subunit."))
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4028
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4029
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4030
3614
# stdout, which would corrupt the subunit stream.
4031
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4032
# following code can be deleted when it's sufficiently deployed
4033
# -- vila/mgz 20100514
4034
if (sys.platform == "win32"
4035
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4037
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4039
3619
self.additional_selftest_args.setdefault(
4040
3620
'suite_decorators', []).append(parallel)
4042
raise errors.BzrCommandError(gettext(
4043
"--benchmark is no longer supported from bzr 2.2; "
4044
"use bzr-usertest instead"))
4045
test_suite_factory = None
4047
exclude_pattern = None
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)
4049
exclude_pattern = '(' + '|'.join(exclude) + ')'
4051
self._disable_fsync()
3629
test_suite_factory = None
4052
3631
selftest_kwargs = {"verbose": verbose,
4053
3632
"pattern": pattern,
4054
3633
"stop_on_failure": one,
4056
3635
"test_suite_factory": test_suite_factory,
4057
3636
"lsprof_timed": lsprof_timed,
4058
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
4059
3639
"matching_tests_first": first,
4060
3640
"list_only": list_only,
4061
3641
"random_seed": randomize,
4062
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
4063
3643
"strict": strict,
4064
3644
"load_list": load_list,
4065
3645
"debug_flags": debugflag,
4066
3646
"starting_with": starting_with
4068
3648
selftest_kwargs.update(self.additional_selftest_args)
4070
# Make deprecation warnings visible, unless -Werror is set
4071
cleanup = symbol_versioning.activate_deprecation_warnings(
4074
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
4077
3650
return int(not result)
4079
def _disable_fsync(self):
4080
"""Change the 'os' functionality to not synchronize."""
4081
self._orig_fsync = getattr(os, 'fsync', None)
4082
if self._orig_fsync is not None:
4083
os.fsync = lambda filedes: None
4084
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4085
if self._orig_fdatasync is not None:
4086
os.fdatasync = lambda filedes: None
4089
3653
class cmd_version(Command):
4090
3654
__doc__ = """Show version of bzr."""
4143
3709
The source of the merge can be specified either in the form of a branch,
4144
3710
or in the form of a path to a file containing a merge directive generated
4145
3711
with bzr send. If neither is specified, the default is the upstream branch
4146
or the branch most recently merged using --remember. The source of the
4147
merge may also be specified in the form of a path to a file in another
4148
branch: in this case, only the modifications to that file are merged into
4149
the current working tree.
4151
When merging from a branch, by default bzr will try to merge in all new
4152
work from the other branch, automatically determining an appropriate base
4153
revision. If this fails, you may need to give an explicit base.
4155
To pick a different ending revision, pass "--revision OTHER". bzr will
4156
try to merge in all new work up to and including revision OTHER.
4158
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4159
through OTHER, excluding BASE but including OTHER, will be merged. If this
4160
causes some revisions to be skipped, i.e. if the destination branch does
4161
not already contain revision BASE, such a merge is commonly referred to as
4162
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4163
cherrypicks. The changes look like a normal commit, and the history of the
4164
changes from the other branch is not stored in the commit.
4166
Revision numbers are always relative to the source 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.
4168
3725
Merge will do its best to combine the changes in two branches, but there
4169
3726
are some kinds of problems only a human can fix. When it encounters those,
4173
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
4175
If there is no default branch set, the first merge will set it (use
4176
--no-remember to avoid setting it). After that, you can omit the branch
4177
to use the default. To change the default, use --remember. The value will
4178
only be saved if the remote location can be accessed.
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.
4180
3737
The results of the merge are placed into the destination working
4181
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4182
3739
committed to record the result of the merge.
4184
3741
merge refuses to run if there are any uncommitted changes, unless
4185
--force is given. If --force is given, then the changes from the source
4186
will be merged with the current working tree, including any uncommitted
4187
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4188
3743
merge revision which has more than two parents.
4190
3745
If one would like to merge changes from the working tree of the other
4318
3873
self.sanity_check_merger(merger)
4319
3874
if (merger.base_rev_id == merger.other_rev_id and
4320
3875
merger.other_rev_id is not None):
4321
# check if location is a nonexistent file (and not a branch) to
4322
# disambiguate the 'Nothing to do'
4323
if merger.interesting_files:
4324
if not merger.other_tree.has_filename(
4325
merger.interesting_files[0]):
4326
note(gettext("merger: ") + str(merger))
4327
raise errors.PathsDoNotExist([location])
4328
note(gettext('Nothing to do.'))
3876
note('Nothing to do.')
4330
if pull and not preview:
4331
3879
if merger.interesting_files is not None:
4332
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3880
raise errors.BzrCommandError('Cannot pull individual files')
4333
3881
if (merger.base_rev_id == tree.last_revision()):
4334
3882
result = tree.pull(merger.other_branch, False,
4335
3883
merger.other_rev_id)
4336
3884
result.report(self.outf)
4338
3886
if merger.this_basis is None:
4339
raise errors.BzrCommandError(gettext(
3887
raise errors.BzrCommandError(
4340
3888
"This branch has no commits."
4341
" (perhaps you would prefer 'bzr pull')"))
3889
" (perhaps you would prefer 'bzr pull')")
4343
3891
return self._do_preview(merger)
4344
3892
elif interactive:
4442
3988
if other_revision_id is None:
4443
3989
other_revision_id = _mod_revision.ensure_null(
4444
3990
other_branch.last_revision())
4445
# Remember where we merge from. We need to remember if:
4446
# - user specify a location (and we don't merge from the parent
4448
# - user ask to remember or there is no previous location set to merge
4449
# from and user didn't ask to *not* remember
4450
if (user_location is not None
4452
or (remember is None
4453
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4454
3994
tree.branch.set_submit_branch(other_branch.base)
4455
# Merge tags (but don't set them in the master branch yet, the user
4456
# might revert this merge). Commit will propagate them.
4457
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4458
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4459
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4460
3998
if other_path != '':
4804
4340
theirs_only=False,
4805
4341
log_format=None, long=False, short=False, line=False,
4806
4342
show_ids=False, verbose=False, this=False, other=False,
4807
include_merged=None, revision=None, my_revision=None,
4809
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4343
include_merges=False, revision=None, my_revision=None):
4810
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4811
4345
def message(s):
4812
4346
if not is_quiet():
4813
4347
self.outf.write(s)
4815
if symbol_versioning.deprecated_passed(include_merges):
4816
ui.ui_factory.show_user_warning(
4817
'deprecated_command_option',
4818
deprecated_name='--include-merges',
4819
recommended_name='--include-merged',
4820
deprecated_in_version='2.5',
4821
command=self.invoked_as)
4822
if include_merged is None:
4823
include_merged = include_merges
4825
raise errors.BzrCommandError(gettext(
4826
'{0} and {1} are mutually exclusive').format(
4827
'--include-merges', '--include-merged'))
4828
if include_merged is None:
4829
include_merged = False
4831
4350
mine_only = this
4840
4359
elif theirs_only:
4841
4360
restrict = 'remote'
4843
local_branch = Branch.open_containing(directory)[0]
4844
self.add_cleanup(local_branch.lock_read().unlock)
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4846
4366
parent = local_branch.get_parent()
4847
4367
if other_branch is None:
4848
4368
other_branch = parent
4849
4369
if other_branch is None:
4850
raise errors.BzrCommandError(gettext("No peer location known"
4370
raise errors.BzrCommandError("No peer location known"
4852
4372
display_url = urlutils.unescape_for_display(parent,
4853
4373
self.outf.encoding)
4854
message(gettext("Using saved parent location: {0}\n").format(
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4857
4377
remote_branch = Branch.open(other_branch)
4858
4378
if remote_branch.base == local_branch.base:
4859
4379
remote_branch = local_branch
4861
self.add_cleanup(remote_branch.lock_read().unlock)
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4863
4384
local_revid_range = _revision_range_to_revid_range(
4864
4385
_get_revision_range(my_revision, local_branch,
4913
4430
if mine_only and not local_extra:
4914
4431
# We checked local, and found nothing extra
4915
message(gettext('This branch has no new revisions.\n'))
4432
message('This branch is up to date.\n')
4916
4433
elif theirs_only and not remote_extra:
4917
4434
# We checked remote, and found nothing extra
4918
message(gettext('Other branch has no new revisions.\n'))
4435
message('Other branch is up to date.\n')
4919
4436
elif not (mine_only or theirs_only or local_extra or
4921
4438
# We checked both branches, and neither one had extra
4923
message(gettext("Branches are up to date.\n"))
4440
message("Branches are up to date.\n")
4924
4441
self.cleanup_now()
4925
4442
if not status_code and parent is None and other_branch is not None:
4926
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4927
4445
# handle race conditions - a parent might be set while we run.
4928
4446
if local_branch.get_parent() is None:
4929
4447
local_branch.set_parent(remote_branch.base)
5043
4578
Option('long', help='Show commit date in annotations.'),
5048
4582
encoding_type = 'exact'
5050
4584
@display_command
5051
4585
def run(self, filename, all=False, long=False, revision=None,
5052
show_ids=False, directory=None):
5053
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5056
4588
wt, branch, relpath = \
5057
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5058
4590
if wt is not None:
5059
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
5061
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5062
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
5063
self.add_cleanup(tree.lock_read().unlock)
5064
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
5065
4600
file_id = wt.path2id(relpath)
5067
4602
file_id = tree.path2id(relpath)
5068
4603
if file_id is None:
5069
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
5070
4606
if wt is not None and revision is None:
5071
4607
# If there is a tree and we're not annotating historical
5072
4608
# versions, annotate the working tree's content.
5073
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5074
4610
show_ids=show_ids)
5076
annotate_file_tree(tree, file_id, self.outf, long, all,
5077
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5080
4616
class cmd_re_sign(Command):
5084
4620
hidden = True # is this right ?
5085
4621
takes_args = ['revision_id*']
5086
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
5088
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
5089
4625
if revision_id_list is not None and revision is not None:
5090
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5091
4627
if revision_id_list is None and revision is None:
5092
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5093
b = WorkingTree.open_containing(directory)[0].branch
5094
self.add_cleanup(b.lock_write().unlock)
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)
5095
4632
return self._run(b, revision_id_list, revision)
5097
4634
def _run(self, b, revision_id_list, revision):
5098
4635
import bzrlib.gpg as gpg
5099
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5100
4637
if revision_id_list is not None:
5101
4638
b.repository.start_write_group()
5157
4694
_see_also = ['checkouts', 'unbind']
5158
4695
takes_args = ['location?']
5159
takes_options = ['directory']
5161
def run(self, location=None, directory=u'.'):
5162
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5163
4700
if location is None:
5165
4702
location = b.get_old_bound_location()
5166
4703
except errors.UpgradeRequired:
5167
raise errors.BzrCommandError(gettext('No location supplied. '
5168
'This format does not remember old locations.'))
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5170
4707
if location is None:
5171
4708
if b.get_bound_location() is not None:
5172
raise errors.BzrCommandError(gettext('Branch is already bound'))
4709
raise errors.BzrCommandError('Branch is already bound')
5174
raise errors.BzrCommandError(gettext('No location supplied '
5175
'and no previous location known'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5176
4713
b_other = Branch.open(location)
5178
4715
b.bind(b_other)
5179
4716
except errors.DivergedBranches:
5180
raise errors.BzrCommandError(gettext('These branches have diverged.'
5181
' Try merging, and then bind again.'))
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5182
4719
if b.get_config().has_explicit_nickname():
5183
4720
b.nick = b_other.nick
5248
4784
b = control.open_branch()
5250
4786
if tree is not None:
5251
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5253
self.add_cleanup(b.lock_write().unlock)
5254
return self._run(b, tree, dry_run, verbose, revision, force,
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5257
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5259
4795
from bzrlib.log import log_formatter, show_log
5260
4796
from bzrlib.uncommit import uncommit
5291
4827
end_revision=last_revno)
5294
self.outf.write(gettext('Dry-run, pretending to remove'
5295
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5297
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5300
if not ui.ui_factory.confirm_action(
5301
gettext(u'Uncommit these revisions'),
5302
'bzrlib.builtins.uncommit',
5304
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5307
4840
mutter('Uncommitting from {%s} to {%s}',
5308
4841
last_rev_id, rev_id)
5309
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5310
revno=revno, local=local, keep_tags=keep_tags)
5311
self.outf.write(gettext('You can restore the old tip by running:\n'
5312
' bzr pull . -r revid:%s\n') % last_rev_id)
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)
5315
4848
class cmd_break_lock(Command):
5316
__doc__ = """Break a dead lock.
5318
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5321
4851
CAUTION: Locks should only be broken when you are sure that the process
5322
4852
holding the lock has been stopped.
5329
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5330
bzr break-lock --conf ~/.bazaar
5333
4861
takes_args = ['location?']
5336
help='LOCATION is the directory where the config lock is.'),
5338
help='Do not ask for confirmation before breaking the lock.'),
5341
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5342
4864
if location is None:
5343
4865
location = u'.'
5345
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5347
{'bzrlib.lockdir.break': True})
5349
conf = _mod_config.LockableConfig(file_name=location)
5352
control, relpath = controldir.ControlDir.open_containing(location)
5354
control.break_lock()
5355
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5359
4873
class cmd_wait_until_signalled(Command):
5423
4936
return host, port
5425
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5426
protocol=None, client_timeout=None):
5427
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5428
4941
if directory is None:
5429
4942
directory = os.getcwd()
5430
4943
if protocol is None:
5431
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5432
4945
host, port = self.get_host_and_port(port)
5433
url = transport.location_to_url(directory)
4946
url = urlutils.local_path_to_url(directory)
5434
4947
if not allow_writes:
5435
4948
url = 'readonly+' + url
5436
t = transport.get_transport_from_url(url)
5438
protocol(t, host, port, inet, client_timeout)
5439
except TypeError, e:
5440
# We use symbol_versioning.deprecated_in just so that people
5441
# grepping can find it here.
5442
# symbol_versioning.deprecated_in((2, 5, 0))
5443
symbol_versioning.warn(
5444
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5445
'Most likely it needs to be updated to support a'
5446
' "timeout" parameter (added in bzr 2.5.0)'
5447
% (e, protocol.__module__, protocol),
5449
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5452
4953
class cmd_join(Command):
5863
5359
branch, relpath = Branch.open_containing(directory)
5864
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5866
5363
if tag_name is None:
5867
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5364
raise errors.BzrCommandError("No tag specified to delete.")
5868
5365
branch.tags.delete_tag(tag_name)
5869
note(gettext('Deleted tag %s.') % tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5872
5369
if len(revision) != 1:
5873
raise errors.BzrCommandError(gettext(
5370
raise errors.BzrCommandError(
5874
5371
"Tags can only be placed on a single revision, "
5876
5373
revision_id = revision[0].as_revision_id(branch)
5878
5375
revision_id = branch.last_revision()
5879
5376
if tag_name is None:
5880
5377
tag_name = branch.automatic_tag_name(revision_id)
5881
5378
if tag_name is None:
5882
raise errors.BzrCommandError(gettext(
5883
"Please specify a tag name."))
5885
existing_target = branch.tags.lookup_tag(tag_name)
5886
except errors.NoSuchTag:
5887
existing_target = None
5888
if not force and existing_target not in (None, revision_id):
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5889
5382
raise errors.TagAlreadyExists(tag_name)
5890
if existing_target == revision_id:
5891
note(gettext('Tag %s already exists for that revision.') % tag_name)
5893
branch.tags.set_tag(tag_name, revision_id)
5894
if existing_target is None:
5895
note(gettext('Created tag %s.') % tag_name)
5897
note(gettext('Updated tag %s.') % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5900
5387
class cmd_tags(Command):
5906
5393
_see_also = ['tag']
5907
5394
takes_options = [
5908
custom_help('directory',
5909
help='Branch whose tags should be displayed.'),
5910
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5911
5401
'Sort tags by different criteria.', title='Sorting',
5912
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5918
5409
@display_command
5919
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5920
from bzrlib.tag import tag_sort_methods
5921
5416
branch, relpath = Branch.open_containing(directory)
5923
5418
tags = branch.tags.get_tag_dict().items()
5927
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5929
# Restrict to the specified range
5930
tags = self._tags_for_range(branch, revision)
5932
sort = tag_sort_methods.get()
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]])
5934
5444
if not show_ids:
5935
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5936
5446
for index, (tag, revid) in enumerate(tags):
5949
5457
for tag, revspec in tags:
5950
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
5952
def _tags_for_range(self, branch, revision):
5954
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5955
revid1, revid2 = rev1.rev_id, rev2.rev_id
5956
# _get_revision_range will always set revid2 if it's not specified.
5957
# If revid1 is None, it means we want to start from the branch
5958
# origin which is always a valid ancestor. If revid1 == revid2, the
5959
# ancestry check is useless.
5960
if revid1 and revid1 != revid2:
5961
# FIXME: We really want to use the same graph than
5962
# branch.iter_merge_sorted_revisions below, but this is not
5963
# easily available -- vila 2011-09-23
5964
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5965
# We don't want to output anything in this case...
5967
# only show revisions between revid1 and revid2 (inclusive)
5968
tagged_revids = branch.tags.get_reverse_tag_dict()
5970
for r in branch.iter_merge_sorted_revisions(
5971
start_revision_id=revid2, stop_revision_id=revid1,
5972
stop_rule='include'):
5973
revid_tags = tagged_revids.get(r[0], None)
5975
found.extend([(tag, r[0]) for tag in revid_tags])
5979
5461
class cmd_reconfigure(Command):
5980
5462
__doc__ = """Reconfigure the type of a bzr directory.
5994
5476
takes_args = ['location?']
5995
5477
takes_options = [
5996
5478
RegistryOption.from_kwargs(
5999
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6000
5482
value_switches=True, enum_switch=False,
6001
5483
branch='Reconfigure to be an unbound branch with no working tree.',
6002
5484
tree='Reconfigure to be an unbound branch with a working tree.',
6003
5485
checkout='Reconfigure to be a bound branch with a working tree.',
6004
5486
lightweight_checkout='Reconfigure to be a lightweight'
6005
5487
' checkout (with no local history).',
6007
RegistryOption.from_kwargs(
6009
title='Repository type',
6010
help='Location fo the repository.',
6011
value_switches=True, enum_switch=False,
6012
5488
standalone='Reconfigure to be a standalone branch '
6013
5489
'(i.e. stop using shared repository).',
6014
5490
use_shared='Reconfigure to use a shared repository.',
6016
RegistryOption.from_kwargs(
6018
title='Trees in Repository',
6019
help='Whether new branches in the repository have trees.',
6020
value_switches=True, enum_switch=False,
6021
5491
with_trees='Reconfigure repository to create '
6022
5492
'working trees on branches by default.',
6023
5493
with_no_trees='Reconfigure repository to not create '
6050
5520
# At the moment you can use --stacked-on and a different
6051
5521
# reconfiguration shape at the same time; there seems no good reason
6053
if (tree_type is None and
6054
repository_type is None and
6055
repository_trees is None):
5523
if target_type is None:
6056
5524
if stacked_on or unstacked:
6059
raise errors.BzrCommandError(gettext('No target configuration '
6061
reconfiguration = None
6062
if tree_type == 'branch':
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6063
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
6064
elif tree_type == 'tree':
5531
elif target_type == 'tree':
6065
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
6066
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
6067
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
6068
5535
directory, bind_to)
6069
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
6070
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
6071
5538
directory, bind_to)
6073
reconfiguration.apply(force)
6074
reconfiguration = None
6075
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
6076
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
6077
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
6078
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
6080
reconfiguration.apply(force)
6081
reconfiguration = None
6082
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
6083
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6084
5545
directory, True)
6085
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
6086
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6087
5548
directory, False)
6089
reconfiguration.apply(force)
6090
reconfiguration = None
5549
reconfiguration.apply(force)
6093
5552
class cmd_switch(Command):
6142
5600
had_explicit_nick = False
6143
5601
if create_branch:
6144
5602
if branch is None:
6145
raise errors.BzrCommandError(gettext('cannot create branch without'
5603
raise errors.BzrCommandError('cannot create branch without'
6147
5605
to_location = directory_service.directories.dereference(
6149
5607
if '/' not in to_location and '\\' not in to_location:
6150
5608
# This path is meant to be relative to the existing branch
6151
5609
this_url = self._get_branch_location(control_dir)
6152
# Perhaps the target control dir supports colocated branches?
6154
root = controldir.ControlDir.open(this_url,
6155
possible_transports=[control_dir.user_transport])
6156
except errors.NotBranchError:
6159
colocated = root._format.colocated_branches
6161
to_location = urlutils.join_segment_parameters(this_url,
6162
{"branch": urlutils.escape(to_location)})
6164
to_location = urlutils.join(
6165
this_url, '..', urlutils.escape(to_location))
5610
to_location = urlutils.join(this_url, '..', to_location)
6166
5611
to_branch = branch.bzrdir.sprout(to_location,
6167
5612
possible_transports=[branch.bzrdir.root_transport],
6168
5613
source_branch=branch).open_branch()
6170
# Perhaps it's a colocated branch?
6172
to_branch = control_dir.open_branch(to_location)
6173
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6175
to_branch = Branch.open(to_location)
6176
except errors.NotBranchError:
6177
this_url = self._get_branch_location(control_dir)
6178
to_branch = Branch.open(
6180
this_url, '..', urlutils.escape(to_location)))
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))
6181
5621
if revision is not None:
6182
5622
revision = revision.as_revision_id(to_branch)
6183
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6184
5624
if had_explicit_nick:
6185
5625
branch = control_dir.open_branch() #get the new branch!
6186
5626
branch.nick = to_branch.nick
6187
note(gettext('Switched to branch: %s'),
5627
note('Switched to branch: %s',
6188
5628
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
6190
5630
def _get_branch_location(self, control_dir):
6295
tree, file_list = WorkingTree.open_containing_paths(file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
6297
5736
current_view, view_dict = tree.views.get_view_info()
6298
5737
if name is None:
6299
5738
name = current_view
6302
raise errors.BzrCommandError(gettext(
6303
"Both --delete and a file list specified"))
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6305
raise errors.BzrCommandError(gettext(
6306
"Both --delete and --switch specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6308
5747
tree.views.set_view_info(None, {})
6309
self.outf.write(gettext("Deleted all views.\n"))
5748
self.outf.write("Deleted all views.\n")
6310
5749
elif name is None:
6311
raise errors.BzrCommandError(gettext("No current view to delete"))
5750
raise errors.BzrCommandError("No current view to delete")
6313
5752
tree.views.delete_view(name)
6314
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6317
raise errors.BzrCommandError(gettext(
6318
"Both --switch and a file list specified"))
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6320
raise errors.BzrCommandError(gettext(
6321
"Both --switch and --all specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6322
5761
elif switch == 'off':
6323
5762
if current_view is None:
6324
raise errors.BzrCommandError(gettext("No current view to disable"))
5763
raise errors.BzrCommandError("No current view to disable")
6325
5764
tree.views.set_view_info(None, view_dict)
6326
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6328
5767
tree.views.set_view_info(switch, view_dict)
6329
5768
view_str = views.view_display_str(tree.views.lookup_view())
6330
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6333
self.outf.write(gettext('Views defined:\n'))
5772
self.outf.write('Views defined:\n')
6334
5773
for view in sorted(view_dict):
6335
5774
if view == current_view:
6339
5778
view_str = views.view_display_str(view_dict[view])
6340
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6342
self.outf.write(gettext('No views defined.\n'))
5781
self.outf.write('No views defined.\n')
6343
5782
elif file_list:
6344
5783
if name is None:
6345
5784
# No name given and no current view set
6347
5786
elif name == 'off':
6348
raise errors.BzrCommandError(gettext(
6349
"Cannot change the 'off' pseudo view"))
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6350
5789
tree.views.set_view(name, sorted(file_list))
6351
5790
view_str = views.view_display_str(tree.views.lookup_view())
6352
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6354
5793
# list the files
6355
5794
if name is None:
6356
5795
# No name given and no current view set
6357
self.outf.write(gettext('No current view.\n'))
5796
self.outf.write('No current view.\n')
6359
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
6360
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6363
5802
class cmd_hooks(Command):
6457
5883
Option('destroy',
6458
5884
help='Destroy removed changes instead of shelving them.'),
6460
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6462
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6463
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6465
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6466
5892
from bzrlib.shelf_ui import Shelver
6467
5893
if writer is None:
6468
5894
writer = bzrlib.option.diff_writer_registry.get()
6470
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6471
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6609
6032
self.outf.write('%s %s\n' % (path, location))
6612
class cmd_export_pot(Command):
6613
__doc__ = """Export command helps and error messages in po format."""
6616
takes_options = [Option('plugin',
6617
help='Export help text from named command '\
6618
'(defaults to all built in commands).',
6620
Option('include-duplicates',
6621
help='Output multiple copies of the same msgid '
6622
'string if it appears more than once.'),
6625
def run(self, plugin=None, include_duplicates=False):
6626
from bzrlib.export_pot import export_pot
6627
export_pot(self.outf, plugin, include_duplicates)
6630
6035
def _register_lazy_builtins():
6631
6036
# register lazy builtins from other modules; called at startup and should
6632
6037
# be only called once.
6633
6038
for (name, aliases, module_name) in [
6634
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6635
('cmd_config', [], 'bzrlib.config'),
6636
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6637
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6638
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6639
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6640
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6641
('cmd_verify_signatures', [],
6642
'bzrlib.commit_signature_commands'),
6643
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6645
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
