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):
757
836
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
837
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
838
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
840
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
841
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
842
self.add_cleanup(work_tree.lock_read().unlock)
765
843
if revision is not None:
766
844
tree = revision.as_tree(work_tree.branch)
768
846
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
847
self.add_cleanup(tree.lock_read().unlock)
852
self.add_cleanup(tree.lock_read().unlock)
775
853
if file_list is not None:
776
854
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
855
require_versioned=True)
778
856
# find_ids_across_trees may include some paths that don't
779
857
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
858
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
783
entries = tree.inventory.entries()
860
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
862
for path, entry in sorted(entries):
787
863
if kind and kind != entry.kind:
790
868
self.outf.write('%-50s %s\n' % (path, entry.file_id))
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
1200
Option('strict',
1111
1201
help='Refuse to push if there are uncommitted changes in'
1112
1202
' the working tree, --no-strict disables the check.'),
1204
help="Don't populate the working tree, even for protocols"
1205
" that support it."),
1114
1207
takes_args = ['location?']
1115
1208
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1210
def run(self, location=None, remember=None, overwrite=False,
1118
1211
create_prefix=False, verbose=False, revision=None,
1119
1212
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1213
stacked=False, strict=None, no_tree=False):
1121
1214
from bzrlib.push import _show_push_branch
1123
1216
if directory is None:
1124
1217
directory = '.'
1125
1218
# Get the source branch
1126
1219
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1220
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1221
# Get the tip's revision_id
1129
1222
revision = _get_one_revision('push', revision)
1130
1223
if revision is not None:
1151
1244
# error by the feedback given to them. RBC 20080227.
1152
1245
stacked_on = parent_url
1153
1246
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1247
raise errors.BzrCommandError(gettext(
1248
"Could not determine branch to refer to."))
1157
1250
# Get the destination location
1158
1251
if location is None:
1159
1252
stored_loc = br_from.get_push_location()
1160
1253
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
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."))
1164
1265
display_url = urlutils.unescape_for_display(stored_loc,
1165
1266
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1267
note(gettext("Using saved push location: %s") % display_url)
1167
1268
location = stored_loc
1169
1270
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1271
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1272
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1273
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1276
class cmd_branch(Command):
1214
1319
def run(self, from_location, to_location=None, revision=None,
1215
1320
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1321
use_existing_dir=False, switch=False, bind=False,
1217
1323
from bzrlib import switch as _mod_switch
1218
1324
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
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(
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)
1221
1340
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1341
self.add_cleanup(br_from.lock_read().unlock)
1224
1342
if revision is not None:
1225
1343
revision_id = revision.as_revision_id(br_from)
1230
1348
revision_id = br_from.last_revision()
1231
1349
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1350
to_location = getattr(br_from, "name", None)
1351
if to_location is None:
1352
to_location = urlutils.derive_to_location(from_location)
1233
1353
to_transport = transport.get_transport(to_location)
1235
1355
to_transport.mkdir('.')
1236
1356
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
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)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1368
to_dir.open_branch()
1243
1369
except errors.NotBranchError:
1246
1372
raise errors.AlreadyBranchError(to_location)
1247
1373
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1374
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)
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)
1265
1398
_merge_tags_if_possible(br_from, branch)
1266
1399
# If the source branch is stacked, the new branch may
1267
1400
# be stacked whether we asked for that explicitly or not.
1268
1401
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1403
note(gettext('Created new stacked branch referring to %s.') %
1271
1404
branch.get_stacked_on_url())
1272
1405
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1406
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1407
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1409
# Bind to the parent
1277
1410
parent_branch = Branch.open(from_location)
1278
1411
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1412
note(gettext('New branch bound to %s') % from_location)
1281
1414
# Switch to the new branch
1282
1415
wt, _ = WorkingTree.open_containing('.')
1283
1416
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1417
note(gettext('Switched to branch: %s'),
1285
1418
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)))
1288
1472
class cmd_checkout(Command):
1289
1473
__doc__ = """Create a new checkout of an existing branch.
1389
1576
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
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
1400
1592
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.
1403
1606
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1607
takes_args = ['dir?']
1405
takes_options = ['revision']
1608
takes_options = ['revision',
1610
help="Show base revision text in conflicts."),
1406
1612
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1614
def run(self, dir=None, revision=None, show_base=None):
1409
1615
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]
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"))
1413
1627
branch = tree.branch
1414
1628
possible_transports = []
1415
1629
master = branch.get_master_branch(
1416
1630
possible_transports=possible_transports)
1417
1631
if master is not None:
1419
1632
branch_location = master.base
1635
branch_location = tree.branch.base
1421
1636
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1637
self.add_cleanup(tree.unlock)
1424
1638
# get rid of the final '/' and be ready for display
1425
1639
branch_location = urlutils.unescape_for_display(
1451
1665
change_reporter,
1452
1666
possible_transports=possible_transports,
1453
1667
revision=revision_id,
1669
show_base=show_base)
1455
1670
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1671
raise errors.BzrCommandError(gettext(
1457
1672
"branch has no revision %s\n"
1458
1673
"bzr update --revision only works"
1459
" for a revision in the branch history"
1674
" for a revision in the branch history")
1460
1675
% (e.revision))
1461
1676
revno = tree.branch.revision_id_to_dotted_revno(
1462
1677
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1678
note(gettext('Updated to revision {0} of branch {1}').format(
1679
'.'.join(map(str, revno)), branch_location))
1465
1680
parent_ids = tree.get_parent_ids()
1466
1681
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'.")
1682
note(gettext('Your local commits will now show as pending merges with '
1683
"'bzr status', and can be committed with 'bzr commit'."))
1469
1684
if conflicts != 0:
1530
1746
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1747
'The file deletion mode to be used.',
1532
1748
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1749
safe='Backup changed files (default).',
1535
1750
keep='Delete from bzr but leave the working copy.',
1751
no_backup='Don\'t backup changed files.',
1536
1752
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1753
'recovered and even if they are non-empty directories. '
1754
'(deprecated, use no-backup)')]
1538
1755
aliases = ['rm', 'del']
1539
1756
encoding_type = 'replace'
1541
1758
def run(self, file_list, verbose=False, new=False,
1542
1759
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
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)
1545
1767
if file_list is not None:
1546
1768
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1770
self.add_cleanup(tree.lock_write().unlock)
1550
1771
# Heuristics should probably all move into tree.remove_smart or
1742
1979
to_transport.ensure_base()
1743
1980
except errors.NoSuchFile:
1744
1981
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
1982
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
1983
" does not exist."
1747
1984
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
1985
" leading parent directories.")
1750
1987
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1990
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
1991
except errors.NotBranchError:
1755
1992
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1993
create_branch = controldir.ControlDir.create_branch_convenience
1995
force_new_tree = False
1997
force_new_tree = None
1757
1998
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1999
possible_transports=[to_transport],
2000
force_new_tree=force_new_tree)
1759
2001
a_bzrdir = branch.bzrdir
1761
2003
from bzrlib.transport.local import LocalTransport
1837
2081
def run(self, location, format=None, no_trees=False):
1838
2082
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2083
format = controldir.format_registry.make_bzrdir('default')
1841
2085
if location is None:
1844
2088
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)
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()))
1850
2096
if not is_quiet():
1851
2097
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2098
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2101
class cmd_diff(Command):
1969
2232
elif ':' in prefix:
1970
2233
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2235
raise errors.BzrCommandError(gettext(
1973
2236
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2237
' (eg "old/:new/")'))
1976
2239
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2240
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2241
' one or two revision specifiers'))
1980
2243
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2244
raise errors.BzrCommandError(gettext(
2245
'{0} and {1} are mutually exclusive').format(
2246
'--using', '--format'))
1984
2248
(old_tree, new_tree,
1985
2249
old_branch, new_branch,
1986
2250
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2251
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()
1988
2254
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2255
specific_files=specific_files,
1990
2256
external_diff_options=diff_options,
1991
2257
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2258
extra_trees=extra_trees,
2259
path_encoding=path_encoding,
1993
2261
format_cls=format)
2053
2317
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2318
takes_options = ['directory', 'null']
2060
2320
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2321
def run(self, null=False, directory=u'.'):
2322
wt = WorkingTree.open_containing(directory)[0]
2323
self.add_cleanup(wt.lock_read().unlock)
2065
2324
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2071
if file_id in basis_inv:
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2325
self.add_cleanup(basis.lock_read().unlock)
2326
root_id = wt.get_root_id()
2327
for file_id in wt.all_file_ids():
2328
if basis.has_id(file_id):
2330
if root_id == file_id:
2332
path = wt.id2path(file_id)
2333
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2336
self.outf.write(path + '\0')
2297
2562
Option('show-diff',
2298
2563
short_name='p',
2299
2564
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2565
Option('include-merged',
2301
2566
help='Show merged revisions like --levels 0 does.'),
2567
Option('include-merges', hidden=True,
2568
help='Historical alias for --include-merged.'),
2569
Option('omit-merges',
2570
help='Do not report commits with more than one parent.'),
2302
2571
Option('exclude-common-ancestry',
2303
2572
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2573
' of both ancestries (require -rX..Y).'
2575
Option('signatures',
2576
help='Show digital signature validity.'),
2579
help='Show revisions whose properties match this '
2582
ListOption('match-message',
2583
help='Show revisions whose message matches this '
2586
ListOption('match-committer',
2587
help='Show revisions whose committer matches this '
2590
ListOption('match-author',
2591
help='Show revisions whose authors match this '
2594
ListOption('match-bugs',
2595
help='Show revisions whose bugs match this '
2307
2599
encoding_type = 'replace'
2327
2628
_get_info_for_log_files,
2329
2630
direction = (forward and 'forward') or 'reverse'
2631
if symbol_versioning.deprecated_passed(include_merges):
2632
ui.ui_factory.show_user_warning(
2633
'deprecated_command_option',
2634
deprecated_name='--include-merges',
2635
recommended_name='--include-merged',
2636
deprecated_in_version='2.5',
2637
command=self.invoked_as)
2638
if include_merged is None:
2639
include_merged = include_merges
2641
raise errors.BzrCommandError(gettext(
2642
'{0} and {1} are mutually exclusive').format(
2643
'--include-merges', '--include-merged'))
2644
if include_merged is None:
2645
include_merged = False
2330
2646
if (exclude_common_ancestry
2331
2647
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2648
raise errors.BzrCommandError(gettext(
2649
'--exclude-common-ancestry requires -r with two revisions'))
2335
2651
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2654
raise errors.BzrCommandError(gettext(
2655
'{0} and {1} are mutually exclusive').format(
2656
'--levels', '--include-merged'))
2341
2658
if change is not None:
2342
2659
if len(change) > 1:
2343
2660
raise errors.RangeInChangeOption()
2344
2661
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2662
raise errors.BzrCommandError(gettext(
2663
'{0} and {1} are mutually exclusive').format(
2664
'--revision', '--change'))
2348
2666
revision = change
2528
2864
help='Recurse into subdirectories.'),
2529
2865
Option('from-root',
2530
2866
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2867
Option('unknown', short_name='u',
2868
help='Print unknown files.'),
2532
2869
Option('versioned', help='Print versioned files.',
2533
2870
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.'),
2871
Option('ignored', short_name='i',
2872
help='Print ignored files.'),
2873
Option('kind', short_name='k',
2539
2874
help='List entries of a particular kind: file, directory, symlink.',
2543
2880
@display_command
2544
2881
def run(self, revision=None, verbose=False,
2545
2882
recursive=False, from_root=False,
2546
2883
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2884
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2886
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2887
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2889
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2890
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2891
all = not (unknown or versioned or ignored)
2556
2893
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3072
self.outf.write("%s\n" % pattern)
2727
3074
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3075
raise errors.BzrCommandError(gettext("ignore requires at least one "
3076
"NAME_PATTERN or --default-rules."))
2730
3077
name_pattern_list = [globbing.normalize_pattern(p)
2731
3078
for p in name_pattern_list]
3080
bad_patterns_count = 0
3081
for p in name_pattern_list:
3082
if not globbing.Globster.is_pattern_valid(p):
3083
bad_patterns_count += 1
3084
bad_patterns += ('\n %s' % p)
3086
msg = (ngettext('Invalid ignore pattern found. %s',
3087
'Invalid ignore patterns found. %s',
3088
bad_patterns_count) % bad_patterns)
3089
ui.ui_factory.show_error(msg)
3090
raise errors.InvalidPattern('')
2732
3091
for name_pattern in name_pattern_list:
2733
3092
if (name_pattern[0] == '/' or
2734
3093
(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'.')
3094
raise errors.BzrCommandError(gettext(
3095
"NAME_PATTERN should not be an absolute path"))
3096
tree, relpath = WorkingTree.open_containing(directory)
2738
3097
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3098
ignored = globbing.Globster(name_pattern_list)
3100
self.add_cleanup(tree.lock_read().unlock)
2742
3101
for entry in tree.list_files():
2744
3103
if id is not None:
2745
3104
filename = entry[0]
2746
3105
if ignored.match(filename):
2747
3106
matches.append(filename)
2749
3107
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3108
self.outf.write(gettext("Warning: the following files are version "
3109
"controlled and match your ignore pattern:\n%s"
2752
3110
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3111
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3114
class cmd_ignored(Command):
2842
3202
Option('per-file-timestamps',
2843
3203
help='Set modification time of files to that of the last '
2844
3204
'revision in which it was changed.'),
3205
Option('uncommitted',
3206
help='Export the working tree contents rather than that of the '
2846
3209
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3210
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3212
from bzrlib.export import export
2850
3214
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3215
branch_or_subdir = directory
3217
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3219
if tree is not None:
3220
self.add_cleanup(tree.lock_read().unlock)
3224
raise errors.BzrCommandError(
3225
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)
3228
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3230
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3231
per_file_timestamps=per_file_timestamps)
2862
3232
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3233
raise errors.BzrCommandError(
3234
gettext('Unsupported export format: %s') % e.format)
2866
3237
class cmd_cat(Command):
2885
3256
@display_command
2886
3257
def run(self, filename, revision=None, name_from_revision=False,
3258
filters=False, directory=None):
2888
3259
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3260
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3261
" one revision specifier"))
2891
3262
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3263
_open_directory_or_containing_tree_or_branch(filename, directory)
3264
self.add_cleanup(branch.lock_read().unlock)
2895
3265
return self._run(tree, branch, relpath, filename, revision,
2896
3266
name_from_revision, filters)
2900
3270
if tree is None:
2901
3271
tree = b.basis_tree()
2902
3272
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3273
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3275
old_file_id = rev_tree.path2id(relpath)
3277
# TODO: Split out this code to something that generically finds the
3278
# best id for a path across one or more trees; it's like
3279
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3281
if name_from_revision:
2909
3282
# Try in revision if requested
2910
3283
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3284
raise errors.BzrCommandError(gettext(
3285
"{0!r} is not present in revision {1}").format(
2913
3286
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3288
actual_file_id = old_file_id
2917
3290
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" % (
3291
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3292
actual_file_id = cur_file_id
3293
elif old_file_id is not None:
3294
actual_file_id = old_file_id
3296
raise errors.BzrCommandError(gettext(
3297
"{0!r} is not present in revision {1}").format(
2935
3298
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)
3300
from bzrlib.filter_tree import ContentFilterTree
3301
filter_tree = ContentFilterTree(rev_tree,
3302
rev_tree._content_filter_stack)
3303
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3305
content = rev_tree.get_file_text(actual_file_id)
3307
self.outf.write(content)
2952
3310
class cmd_local_time_offset(Command):
3013
3371
to trigger updates to external systems like bug trackers. The --fixes
3014
3372
option can be used to record the association between a revision and
3015
3373
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
3376
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3377
takes_args = ['selected*']
3076
3409
Option('show-diff', short_name='p',
3077
3410
help='When no message is supplied, show the diff along'
3078
3411
' with the status summary in the message editor.'),
3413
help='When committing to a foreign version control '
3414
'system do not push data that can not be natively '
3080
3417
aliases = ['ci', 'checkin']
3082
3419
def _iter_bug_fix_urls(self, fixes, branch):
3420
default_bugtracker = None
3083
3421
# Configure the properties for bug fixing attributes.
3084
3422
for fixed_bug in fixes:
3085
3423
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3424
if len(tokens) == 1:
3425
if default_bugtracker is None:
3426
branch_config = branch.get_config()
3427
default_bugtracker = branch_config.get_user_option(
3429
if default_bugtracker is None:
3430
raise errors.BzrCommandError(gettext(
3431
"No tracker specified for bug %s. Use the form "
3432
"'tracker:id' or specify a default bug tracker "
3433
"using the `bugtracker` option.\nSee "
3434
"\"bzr help bugs\" for more information on this "
3435
"feature. Commit refused.") % fixed_bug)
3436
tag = default_bugtracker
3438
elif len(tokens) != 2:
3439
raise errors.BzrCommandError(gettext(
3088
3440
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3441
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3442
"feature.\nCommit refused.") % fixed_bug)
3444
tag, bug_id = tokens
3093
3446
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3447
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3448
raise errors.BzrCommandError(gettext(
3449
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3450
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3451
raise errors.BzrCommandError(gettext(
3452
"%s\nCommit refused.") % (str(e),))
3101
3454
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3455
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3456
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3458
from bzrlib.errors import (
3105
3459
PointlessCommit,
3106
3460
ConflictsInTree,
3184
3536
# make_commit_message_template_encoded returns user encoding.
3185
3537
# 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")
3539
my_message = set_commit_message(commit_obj)
3540
if my_message is None:
3541
start_message = generate_commit_message_template(commit_obj)
3542
my_message = edit_commit_message_encoded(text,
3543
start_message=start_message)
3544
if my_message is None:
3545
raise errors.BzrCommandError(gettext("please specify a commit"
3546
" message with either --message or --file"))
3547
if my_message == "":
3548
raise errors.BzrCommandError(gettext("Empty commit message specified."
3549
" Please specify a commit message with either"
3550
" --message or --file or leave a blank message"
3551
" with --message \"\"."))
3195
3552
return my_message
3197
3554
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3562
reporter=None, verbose=verbose, revprops=properties,
3206
3563
authors=author, timestamp=commit_stamp,
3207
3564
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3565
exclude=tree.safe_relpath_files(exclude),
3209
3567
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3568
raise errors.BzrCommandError(gettext("No changes to commit."
3569
" Please 'bzr add' the files you want to commit, or use"
3570
" --unchanged to force an empty commit."))
3212
3571
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3572
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3573
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3575
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3576
raise errors.BzrCommandError(gettext("Commit refused because there are"
3577
" unknown files in the working tree."))
3219
3578
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3579
e.extra_help = (gettext("\n"
3221
3580
'To commit to master branch, run update and then commit.\n'
3222
3581
'You can also pass --local to commit to continue working '
3297
3656
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.
3657
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3659
When the default format has changed after a major new release of
3660
Bazaar, you may be informed during certain operations that you
3661
should upgrade. Upgrading to a newer format may improve performance
3662
or make new features available. It may however limit interoperability
3663
with older repositories or with older versions of Bazaar.
3665
If you wish to upgrade to a particular format rather than the
3666
current default, that can be specified using the --format option.
3667
As a consequence, you can use the upgrade command this way to
3668
"downgrade" to an earlier format, though some conversions are
3669
a one way process (e.g. changing from the 1.x default to the
3670
2.x default) so downgrading is not always possible.
3672
A backup.bzr.~#~ directory is created at the start of the conversion
3673
process (where # is a number). By default, this is left there on
3674
completion. If the conversion fails, delete the new .bzr directory
3675
and rename this one back in its place. Use the --clean option to ask
3676
for the backup.bzr directory to be removed on successful conversion.
3677
Alternatively, you can delete it by hand if everything looks good
3680
If the location given is a shared repository, dependent branches
3681
are also converted provided the repository converts successfully.
3682
If the conversion of a branch fails, remaining branches are still
3685
For more information on upgrades, see the Bazaar Upgrade Guide,
3686
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3689
_see_also = ['check', 'reconcile', 'formats']
3306
3690
takes_args = ['url?']
3307
3691
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'),
3692
RegistryOption('format',
3693
help='Upgrade to a specific format. See "bzr help'
3694
' formats" for details.',
3695
lazy_registry=('bzrlib.controldir', 'format_registry'),
3696
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3697
value_switches=True, title='Branch format'),
3699
help='Remove the backup.bzr directory if successful.'),
3701
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3704
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3705
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3706
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3708
if len(exceptions) == 1:
3709
# Compatibility with historical behavior
3321
3715
class cmd_whoami(Command):
3340
3735
encoding_type = 'replace'
3342
3737
@display_command
3343
def run(self, email=False, branch=False, name=None):
3738
def run(self, email=False, branch=False, name=None, directory=None):
3344
3739
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()
3740
if directory is None:
3741
# use branch if we're inside one; otherwise global config
3743
c = Branch.open_containing(u'.')[0].get_config_stack()
3744
except errors.NotBranchError:
3745
c = _mod_config.GlobalStack()
3747
c = Branch.open(directory).get_config_stack()
3748
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3750
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3753
self.outf.write(identity + '\n')
3757
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3760
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3762
_mod_config.extract_email_address(name)
3359
3763
except errors.NoEmailInUsername, e:
3360
3764
warning('"%s" does not seem to contain an email address. '
3361
3765
'This is allowed, but not recommended.', name)
3363
3767
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3769
if directory is None:
3770
c = Branch.open_containing(u'.')[0].get_config_stack()
3772
c = Branch.open(directory).get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3774
c = _mod_config.GlobalStack()
3775
c.set('email', name)
3371
3778
class cmd_nick(Command):
3586
3998
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3999
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4001
first=False, list_only=False,
3590
4002
randomize=None, exclude=None, strict=False,
3591
4003
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)
4004
parallel=None, lsprof_tests=False,
4007
# During selftest, disallow proxying, as it can cause severe
4008
# performance penalties and is only needed for thread
4009
# safety. The selftest command is assumed to not use threads
4010
# too heavily. The call should be as early as possible, as
4011
# error reporting for past duplicate imports won't have useful
4013
lazy_import.disallow_proxying()
4015
from bzrlib import tests
3602
4017
if testspecs_list is not None:
3603
4018
pattern = '|'.join(testspecs_list)
3608
4023
from bzrlib.tests import SubUnitBzrRunner
3609
4024
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4025
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4026
"needs to be installed to use --subunit."))
3612
4027
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4028
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4029
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4030
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4031
# following code can be deleted when it's sufficiently deployed
4032
# -- vila/mgz 20100514
4033
if (sys.platform == "win32"
4034
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4036
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4038
self.additional_selftest_args.setdefault(
3620
4039
'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)
4041
raise errors.BzrCommandError(gettext(
4042
"--benchmark is no longer supported from bzr 2.2; "
4043
"use bzr-usertest instead"))
4044
test_suite_factory = None
4046
exclude_pattern = None
3629
test_suite_factory = None
4048
exclude_pattern = '(' + '|'.join(exclude) + ')'
4050
self._disable_fsync()
3631
4051
selftest_kwargs = {"verbose": verbose,
3632
4052
"pattern": pattern,
3633
4053
"stop_on_failure": one,
3635
4055
"test_suite_factory": test_suite_factory,
3636
4056
"lsprof_timed": lsprof_timed,
3637
4057
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4058
"matching_tests_first": first,
3640
4059
"list_only": list_only,
3641
4060
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4061
"exclude_pattern": exclude_pattern,
3643
4062
"strict": strict,
3644
4063
"load_list": load_list,
3645
4064
"debug_flags": debugflag,
3646
4065
"starting_with": starting_with
3648
4067
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4069
# Make deprecation warnings visible, unless -Werror is set
4070
cleanup = symbol_versioning.activate_deprecation_warnings(
4073
result = tests.selftest(**selftest_kwargs)
3650
4076
return int(not result)
4078
def _disable_fsync(self):
4079
"""Change the 'os' functionality to not synchronize."""
4080
self._orig_fsync = getattr(os, 'fsync', None)
4081
if self._orig_fsync is not None:
4082
os.fsync = lambda filedes: None
4083
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4084
if self._orig_fdatasync is not None:
4085
os.fdatasync = lambda filedes: None
3653
4088
class cmd_version(Command):
3654
4089
__doc__ = """Show version of bzr."""
3709
4142
The source of the merge can be specified either in the form of a branch,
3710
4143
or in the form of a path to a file containing a merge directive generated
3711
4144
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.
4145
or the branch most recently merged using --remember. The source of the
4146
merge may also be specified in the form of a path to a file in another
4147
branch: in this case, only the modifications to that file are merged into
4148
the current working tree.
4150
When merging from a branch, by default bzr will try to merge in all new
4151
work from the other branch, automatically determining an appropriate base
4152
revision. If this fails, you may need to give an explicit base.
4154
To pick a different ending revision, pass "--revision OTHER". bzr will
4155
try to merge in all new work up to and including revision OTHER.
4157
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4158
through OTHER, excluding BASE but including OTHER, will be merged. If this
4159
causes some revisions to be skipped, i.e. if the destination branch does
4160
not already contain revision BASE, such a merge is commonly referred to as
4161
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4162
cherrypicks. The changes look like a normal commit, and the history of the
4163
changes from the other branch is not stored in the commit.
4165
Revision numbers are always relative to the source branch.
3725
4167
Merge will do its best to combine the changes in two branches, but there
3726
4168
are some kinds of problems only a human can fix. When it encounters those,
3730
4172
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.
4174
If there is no default branch set, the first merge will set it (use
4175
--no-remember to avoid setting it). After that, you can omit the branch
4176
to use the default. To change the default, use --remember. The value will
4177
only be saved if the remote location can be accessed.
3737
4179
The results of the merge are placed into the destination working
3738
4180
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4181
committed to record the result of the merge.
3741
4183
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
4184
--force is given. If --force is given, then the changes from the source
4185
will be merged with the current working tree, including any uncommitted
4186
changes in the tree. The --force option can also be used to create a
3743
4187
merge revision which has more than two parents.
3745
4189
If one would like to merge changes from the working tree of the other
3873
4317
self.sanity_check_merger(merger)
3874
4318
if (merger.base_rev_id == merger.other_rev_id and
3875
4319
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4320
# check if location is a nonexistent file (and not a branch) to
4321
# disambiguate the 'Nothing to do'
4322
if merger.interesting_files:
4323
if not merger.other_tree.has_filename(
4324
merger.interesting_files[0]):
4325
note(gettext("merger: ") + str(merger))
4326
raise errors.PathsDoNotExist([location])
4327
note(gettext('Nothing to do.'))
4329
if pull and not preview:
3879
4330
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4331
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4332
if (merger.base_rev_id == tree.last_revision()):
3882
4333
result = tree.pull(merger.other_branch, False,
3883
4334
merger.other_rev_id)
3884
4335
result.report(self.outf)
3886
4337
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4338
raise errors.BzrCommandError(gettext(
3888
4339
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4340
" (perhaps you would prefer 'bzr pull')"))
3891
4342
return self._do_preview(merger)
3892
4343
elif interactive:
3988
4441
if other_revision_id is None:
3989
4442
other_revision_id = _mod_revision.ensure_null(
3990
4443
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):
4444
# Remember where we merge from. We need to remember if:
4445
# - user specify a location (and we don't merge from the parent
4447
# - user ask to remember or there is no previous location set to merge
4448
# from and user didn't ask to *not* remember
4449
if (user_location is not None
4451
or (remember is None
4452
and tree.branch.get_submit_branch() is None)))):
3994
4453
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4454
# Merge tags (but don't set them in the master branch yet, the user
4455
# might revert this merge). Commit will propagate them.
4456
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4457
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4458
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4459
if other_path != '':
4340
4803
theirs_only=False,
4341
4804
log_format=None, long=False, short=False, line=False,
4342
4805
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4806
include_merged=None, revision=None, my_revision=None,
4808
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4809
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4810
def message(s):
4346
4811
if not is_quiet():
4347
4812
self.outf.write(s)
4814
if symbol_versioning.deprecated_passed(include_merges):
4815
ui.ui_factory.show_user_warning(
4816
'deprecated_command_option',
4817
deprecated_name='--include-merges',
4818
recommended_name='--include-merged',
4819
deprecated_in_version='2.5',
4820
command=self.invoked_as)
4821
if include_merged is None:
4822
include_merged = include_merges
4824
raise errors.BzrCommandError(gettext(
4825
'{0} and {1} are mutually exclusive').format(
4826
'--include-merges', '--include-merged'))
4827
if include_merged is None:
4828
include_merged = False
4350
4830
mine_only = this
4359
4839
elif theirs_only:
4360
4840
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4842
local_branch = Branch.open_containing(directory)[0]
4843
self.add_cleanup(local_branch.lock_read().unlock)
4366
4845
parent = local_branch.get_parent()
4367
4846
if other_branch is None:
4368
4847
other_branch = parent
4369
4848
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4849
raise errors.BzrCommandError(gettext("No peer location known"
4372
4851
display_url = urlutils.unescape_for_display(parent,
4373
4852
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4853
message(gettext("Using saved parent location: {0}\n").format(
4377
4856
remote_branch = Branch.open(other_branch)
4378
4857
if remote_branch.base == local_branch.base:
4379
4858
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4860
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4862
local_revid_range = _revision_range_to_revid_range(
4385
4863
_get_revision_range(my_revision, local_branch,
4430
4912
if mine_only and not local_extra:
4431
4913
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4914
message(gettext('This branch has no new revisions.\n'))
4433
4915
elif theirs_only and not remote_extra:
4434
4916
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4917
message(gettext('Other branch has no new revisions.\n'))
4436
4918
elif not (mine_only or theirs_only or local_extra or
4438
4920
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4922
message(gettext("Branches are up to date.\n"))
4441
4923
self.cleanup_now()
4442
4924
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)
4925
self.add_cleanup(local_branch.lock_write().unlock)
4445
4926
# handle race conditions - a parent might be set while we run.
4446
4927
if local_branch.get_parent() is None:
4447
4928
local_branch.set_parent(remote_branch.base)
4578
5042
Option('long', help='Show commit date in annotations.'),
4582
5047
encoding_type = 'exact'
4584
5049
@display_command
4585
5050
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5051
show_ids=False, directory=None):
5052
from bzrlib.annotate import (
4588
5055
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5056
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5057
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5058
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5060
self.add_cleanup(branch.lock_read().unlock)
4596
5061
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5062
self.add_cleanup(tree.lock_read().unlock)
5063
if wt is not None and revision is None:
4600
5064
file_id = wt.path2id(relpath)
4602
5066
file_id = tree.path2id(relpath)
4603
5067
if file_id is None:
4604
5068
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5069
if wt is not None and revision is None:
4607
5070
# If there is a tree and we're not annotating historical
4608
5071
# versions, annotate the working tree's content.
4609
5072
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5073
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5075
annotate_file_tree(tree, file_id, self.outf, long, all,
5076
show_ids=show_ids, branch=branch)
4616
5079
class cmd_re_sign(Command):
4620
5083
hidden = True # is this right ?
4621
5084
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5085
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5087
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5088
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')
5089
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5090
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)
5091
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5092
b = WorkingTree.open_containing(directory)[0].branch
5093
self.add_cleanup(b.lock_write().unlock)
4632
5094
return self._run(b, revision_id_list, revision)
4634
5096
def _run(self, b, revision_id_list, revision):
4635
5097
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5098
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5099
if revision_id_list is not None:
4638
5100
b.repository.start_write_group()
4694
5156
_see_also = ['checkouts', 'unbind']
4695
5157
takes_args = ['location?']
5158
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5160
def run(self, location=None, directory=u'.'):
5161
b, relpath = Branch.open_containing(directory)
4700
5162
if location is None:
4702
5164
location = b.get_old_bound_location()
4703
5165
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5166
raise errors.BzrCommandError(gettext('No location supplied. '
5167
'This format does not remember old locations.'))
4707
5169
if location is None:
4708
5170
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5171
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5173
raise errors.BzrCommandError(gettext('No location supplied '
5174
'and no previous location known'))
4713
5175
b_other = Branch.open(location)
4715
5177
b.bind(b_other)
4716
5178
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5179
raise errors.BzrCommandError(gettext('These branches have diverged.'
5180
' Try merging, and then bind again.'))
4719
5181
if b.get_config().has_explicit_nickname():
4720
5182
b.nick = b_other.nick
4784
5247
b = control.open_branch()
4786
5249
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5250
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)
5252
self.add_cleanup(b.lock_write().unlock)
5253
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5256
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5258
from bzrlib.log import log_formatter, show_log
4796
5259
from bzrlib.uncommit import uncommit
4827
5290
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5293
self.outf.write(gettext('Dry-run, pretending to remove'
5294
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5296
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')
5299
if not ui.ui_factory.confirm_action(
5300
gettext(u'Uncommit these revisions'),
5301
'bzrlib.builtins.uncommit',
5303
self.outf.write(gettext('Canceled\n'))
4840
5306
mutter('Uncommitting from {%s} to {%s}',
4841
5307
last_rev_id, rev_id)
4842
5308
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)
5309
revno=revno, local=local, keep_tags=keep_tags)
5310
self.outf.write(gettext('You can restore the old tip by running:\n'
5311
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5314
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5315
__doc__ = """Break a dead lock.
5317
This command breaks a lock on a repository, branch, working directory or
4851
5320
CAUTION: Locks should only be broken when you are sure that the process
4852
5321
holding the lock has been stopped.
4859
5328
bzr break-lock bzr+ssh://example.com/bzr/foo
5329
bzr break-lock --conf ~/.bazaar
4861
5332
takes_args = ['location?']
5335
help='LOCATION is the directory where the config lock is.'),
5337
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5340
def run(self, location=None, config=False, force=False):
4864
5341
if location is None:
4865
5342
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5344
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5346
{'bzrlib.lockdir.break': True})
5348
conf = _mod_config.LockableConfig(file_name=location)
5351
control, relpath = controldir.ControlDir.open_containing(location)
5353
control.break_lock()
5354
except NotImplementedError:
4873
5358
class cmd_wait_until_signalled(Command):
4936
5422
return host, port
4938
5424
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5425
protocol=None, client_timeout=None):
5426
from bzrlib import transport
4941
5427
if directory is None:
4942
5428
directory = os.getcwd()
4943
5429
if protocol is None:
4944
protocol = transport_server_registry.get()
5430
protocol = transport.transport_server_registry.get()
4945
5431
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5432
url = transport.location_to_url(directory)
4947
5433
if not allow_writes:
4948
5434
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5435
t = transport.get_transport_from_url(url)
5437
protocol(t, host, port, inet, client_timeout)
5438
except TypeError, e:
5439
# We use symbol_versioning.deprecated_in just so that people
5440
# grepping can find it here.
5441
# symbol_versioning.deprecated_in((2, 5, 0))
5442
symbol_versioning.warn(
5443
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5444
'Most likely it needs to be updated to support a'
5445
' "timeout" parameter (added in bzr 2.5.0)'
5446
% (e, protocol.__module__, protocol),
5448
protocol(t, host, port, inet)
4953
5451
class cmd_join(Command):
5359
5862
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5863
self.add_cleanup(branch.lock_write().unlock)
5363
5865
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5866
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5867
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5868
note(gettext('Deleted tag %s.') % tag_name)
5369
5871
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5872
raise errors.BzrCommandError(gettext(
5371
5873
"Tags can only be placed on a single revision, "
5373
5875
revision_id = revision[0].as_revision_id(branch)
5375
5877
revision_id = branch.last_revision()
5376
5878
if tag_name is None:
5377
5879
tag_name = branch.automatic_tag_name(revision_id)
5378
5880
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):
5881
raise errors.BzrCommandError(gettext(
5882
"Please specify a tag name."))
5884
existing_target = branch.tags.lookup_tag(tag_name)
5885
except errors.NoSuchTag:
5886
existing_target = None
5887
if not force and existing_target not in (None, revision_id):
5382
5888
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5889
if existing_target == revision_id:
5890
note(gettext('Tag %s already exists for that revision.') % tag_name)
5892
branch.tags.set_tag(tag_name, revision_id)
5893
if existing_target is None:
5894
note(gettext('Created tag %s.') % tag_name)
5896
note(gettext('Updated tag %s.') % tag_name)
5387
5899
class cmd_tags(Command):
5393
5905
_see_also = ['tag']
5394
5906
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5907
custom_help('directory',
5908
help='Branch whose tags should be displayed.'),
5909
RegistryOption('sort',
5401
5910
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5911
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5917
@display_command
5918
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5919
from bzrlib.tag import tag_sort_methods
5416
5920
branch, relpath = Branch.open_containing(directory)
5418
5922
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5926
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]])
5928
# Restrict to the specified range
5929
tags = self._tags_for_range(branch, revision)
5931
sort = tag_sort_methods.get()
5444
5933
if not show_ids:
5445
5934
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5935
for index, (tag, revid) in enumerate(tags):
5457
5948
for tag, revspec in tags:
5458
5949
self.outf.write('%-20s %s\n' % (tag, revspec))
5951
def _tags_for_range(self, branch, revision):
5953
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5954
revid1, revid2 = rev1.rev_id, rev2.rev_id
5955
# _get_revision_range will always set revid2 if it's not specified.
5956
# If revid1 is None, it means we want to start from the branch
5957
# origin which is always a valid ancestor. If revid1 == revid2, the
5958
# ancestry check is useless.
5959
if revid1 and revid1 != revid2:
5960
# FIXME: We really want to use the same graph than
5961
# branch.iter_merge_sorted_revisions below, but this is not
5962
# easily available -- vila 2011-09-23
5963
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5964
# We don't want to output anything in this case...
5966
# only show revisions between revid1 and revid2 (inclusive)
5967
tagged_revids = branch.tags.get_reverse_tag_dict()
5969
for r in branch.iter_merge_sorted_revisions(
5970
start_revision_id=revid2, stop_revision_id=revid1,
5971
stop_rule='include'):
5972
revid_tags = tagged_revids.get(r[0], None)
5974
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5978
class cmd_reconfigure(Command):
5462
5979
__doc__ = """Reconfigure the type of a bzr directory.
5476
5993
takes_args = ['location?']
5477
5994
takes_options = [
5478
5995
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5998
help='The relation between branch and tree.',
5482
5999
value_switches=True, enum_switch=False,
5483
6000
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6001
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6002
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6003
lightweight_checkout='Reconfigure to be a lightweight'
5487
6004
' checkout (with no local history).',
6006
RegistryOption.from_kwargs(
6008
title='Repository type',
6009
help='Location fo the repository.',
6010
value_switches=True, enum_switch=False,
5488
6011
standalone='Reconfigure to be a standalone branch '
5489
6012
'(i.e. stop using shared repository).',
5490
6013
use_shared='Reconfigure to use a shared repository.',
6015
RegistryOption.from_kwargs(
6017
title='Trees in Repository',
6018
help='Whether new branches in the repository have trees.',
6019
value_switches=True, enum_switch=False,
5491
6020
with_trees='Reconfigure repository to create '
5492
6021
'working trees on branches by default.',
5493
6022
with_no_trees='Reconfigure repository to not create '
5520
6049
# At the moment you can use --stacked-on and a different
5521
6050
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6052
if (tree_type is None and
6053
repository_type is None and
6054
repository_trees is None):
5524
6055
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6058
raise errors.BzrCommandError(gettext('No target configuration '
6060
reconfiguration = None
6061
if tree_type == 'branch':
5530
6062
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6063
elif tree_type == 'tree':
5532
6064
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6065
elif tree_type == 'checkout':
5534
6066
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6067
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6068
elif tree_type == 'lightweight-checkout':
5537
6069
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6070
directory, bind_to)
5539
elif target_type == 'use-shared':
6072
reconfiguration.apply(force)
6073
reconfiguration = None
6074
if repository_type == 'use-shared':
5540
6075
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6076
elif repository_type == 'standalone':
5542
6077
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6079
reconfiguration.apply(force)
6080
reconfiguration = None
6081
if repository_trees == 'with-trees':
5544
6082
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6083
directory, True)
5546
elif target_type == 'with-no-trees':
6084
elif repository_trees == 'with-no-trees':
5547
6085
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6086
directory, False)
5549
reconfiguration.apply(force)
6088
reconfiguration.apply(force)
6089
reconfiguration = None
5552
6092
class cmd_switch(Command):
5600
6141
had_explicit_nick = False
5601
6142
if create_branch:
5602
6143
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
6144
raise errors.BzrCommandError(gettext('cannot create branch without'
5605
6146
to_location = directory_service.directories.dereference(
5607
6148
if '/' not in to_location and '\\' not in to_location:
5608
6149
# This path is meant to be relative to the existing branch
5609
6150
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6151
# Perhaps the target control dir supports colocated branches?
6153
root = controldir.ControlDir.open(this_url,
6154
possible_transports=[control_dir.user_transport])
6155
except errors.NotBranchError:
6158
colocated = root._format.colocated_branches
6160
to_location = urlutils.join_segment_parameters(this_url,
6161
{"branch": urlutils.escape(to_location)})
6163
to_location = urlutils.join(
6164
this_url, '..', urlutils.escape(to_location))
5611
6165
to_branch = branch.bzrdir.sprout(to_location,
5612
6166
possible_transports=[branch.bzrdir.root_transport],
5613
6167
source_branch=branch).open_branch()
6169
# 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))
6171
to_branch = control_dir.open_branch(to_location)
6172
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6174
to_branch = Branch.open(to_location)
6175
except errors.NotBranchError:
6176
this_url = self._get_branch_location(control_dir)
6177
to_branch = Branch.open(
6179
this_url, '..', urlutils.escape(to_location)))
5621
6180
if revision is not None:
5622
6181
revision = revision.as_revision_id(to_branch)
5623
6182
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6183
if had_explicit_nick:
5625
6184
branch = control_dir.open_branch() #get the new branch!
5626
6185
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6186
note(gettext('Switched to branch: %s'),
5628
6187
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
6189
def _get_branch_location(self, control_dir):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6294
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6296
current_view, view_dict = tree.views.get_view_info()
5737
6297
if name is None:
5738
6298
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6301
raise errors.BzrCommandError(gettext(
6302
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6304
raise errors.BzrCommandError(gettext(
6305
"Both --delete and --switch specified"))
5747
6307
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6308
self.outf.write(gettext("Deleted all views.\n"))
5749
6309
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6310
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6312
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6313
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6316
raise errors.BzrCommandError(gettext(
6317
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6319
raise errors.BzrCommandError(gettext(
6320
"Both --switch and --all specified"))
5761
6321
elif switch == 'off':
5762
6322
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6323
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6324
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6325
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6327
tree.views.set_view_info(switch, view_dict)
5768
6328
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6329
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6332
self.outf.write(gettext('Views defined:\n'))
5773
6333
for view in sorted(view_dict):
5774
6334
if view == current_view:
5778
6338
view_str = views.view_display_str(view_dict[view])
5779
6339
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6341
self.outf.write(gettext('No views defined.\n'))
5782
6342
elif file_list:
5783
6343
if name is None:
5784
6344
# No name given and no current view set
5786
6346
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6347
raise errors.BzrCommandError(gettext(
6348
"Cannot change the 'off' pseudo view"))
5789
6349
tree.views.set_view(name, sorted(file_list))
5790
6350
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6351
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6353
# list the files
5794
6354
if name is None:
5795
6355
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6356
self.outf.write(gettext('No current view.\n'))
5798
6358
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6359
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6362
class cmd_hooks(Command):
5883
6456
Option('destroy',
5884
6457
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6459
_see_also = ['unshelve', 'configuration']
5888
6461
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6462
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6464
return self.run_for_list(directory=directory)
5892
6465
from bzrlib.shelf_ui import Shelver
5893
6466
if writer is None:
5894
6467
writer = bzrlib.option.diff_writer_registry.get()
5896
6469
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6470
file_list, message, destroy=destroy, directory=directory)
6032
6608
self.outf.write('%s %s\n' % (path, location))
6611
class cmd_export_pot(Command):
6612
__doc__ = """Export command helps and error messages in po format."""
6615
takes_options = [Option('plugin',
6616
help='Export help text from named command '\
6617
'(defaults to all built in commands).',
6619
Option('include-duplicates',
6620
help='Output multiple copies of the same msgid '
6621
'string if it appears more than once.'),
6624
def run(self, plugin=None, include_duplicates=False):
6625
from bzrlib.export_pot import export_pot
6626
export_pot(self.outf, plugin, include_duplicates)
6035
6629
def _register_lazy_builtins():
6036
6630
# register lazy builtins from other modules; called at startup and should
6037
6631
# be only called once.
6038
6632
for (name, aliases, module_name) in [
6039
6633
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6634
('cmd_config', [], 'bzrlib.config'),
6040
6635
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6636
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6637
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6638
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6639
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6640
('cmd_verify_signatures', [],
6641
'bzrlib.commit_signature_commands'),
6642
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6644
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
