350
322
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
323
takes_options = ['revision']
352
324
# cat-revision is more for frontends so should be exact
353
325
encoding = 'strict'
355
def print_revision(self, revisions, revid):
356
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
357
record = stream.next()
358
if record.storage_kind == 'absent':
359
raise errors.NoSuchRevision(revisions, revid)
360
revtext = record.get_bytes_as('fulltext')
361
self.outf.write(revtext.decode('utf-8'))
364
def run(self, revision_id=None, revision=None, directory=u'.'):
328
def run(self, revision_id=None, revision=None):
365
329
if revision_id is not None and revision is not None:
366
330
raise errors.BzrCommandError('You can only supply one of'
367
331
' revision_id or --revision')
368
332
if revision_id is None and revision is None:
369
333
raise errors.BzrCommandError('You must supply either'
370
334
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
373
revisions = b.repository.revisions
374
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
378
b.repository.lock_read()
380
# TODO: jam 20060112 should cat-revision always output utf-8?
381
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
384
self.print_revision(revisions, revision_id)
385
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
389
elif revision is not None:
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
394
rev_id = rev.as_revision_id(b)
395
self.print_revision(revisions, rev_id)
397
b.repository.unlock()
335
b = WorkingTree.open_containing(u'.')[0].branch
337
# TODO: jam 20060112 should cat-revision always output utf-8?
338
if revision_id is not None:
339
revision_id = osutils.safe_revision_id(revision_id, warn=False)
341
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
342
except errors.NoSuchRevision:
343
msg = "The repository %s contains no revision %s." % (b.repository.base,
345
raise errors.BzrCommandError(msg)
346
elif revision is not None:
349
raise errors.BzrCommandError('You cannot specify a NULL'
351
rev_id = rev.as_revision_id(b)
352
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
400
355
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
403
358
PATH is a btree index file, it can be any URL. This includes things like
404
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
487
435
To re-create the working tree, use "bzr checkout".
489
437
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
438
takes_args = ['location?']
491
439
takes_options = [
493
441
help='Remove the working tree even if it has '
494
'uncommitted or shelved changes.'),
442
'uncommitted changes.'),
497
def run(self, location_list, force=False):
498
if not location_list:
501
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
505
working = d.open_workingtree()
506
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
508
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
512
if (working.has_changes()):
513
raise errors.UncommittedChanges(working)
514
if working.get_shelf_manager().last_shelf() is not None:
515
raise errors.ShelvedChanges(working)
517
if working.user_url != working.branch.user_url:
518
raise errors.BzrCommandError("You cannot remove the working tree"
519
" from a lightweight checkout")
521
d.destroy_workingtree()
445
def run(self, location='.', force=False):
446
d = bzrdir.BzrDir.open(location)
449
working = d.open_workingtree()
450
except errors.NoWorkingTree:
451
raise errors.BzrCommandError("No working tree to remove")
452
except errors.NotLocalUrl:
453
raise errors.BzrCommandError("You cannot remove the working tree of a "
456
changes = working.changes_from(working.basis_tree())
457
if changes.has_changed():
458
raise errors.UncommittedChanges(working)
460
working_path = working.bzrdir.root_transport.base
461
branch_path = working.branch.bzrdir.root_transport.base
462
if working_path != branch_path:
463
raise errors.BzrCommandError("You cannot remove the working tree from "
464
"a lightweight checkout")
466
d.destroy_workingtree()
524
469
class cmd_revno(Command):
525
__doc__ = """Show current revision number.
470
"""Show current revision number.
527
472
This is equal to the number of revisions on this branch.
540
485
wt = WorkingTree.open_containing(location)[0]
541
self.add_cleanup(wt.lock_read().unlock)
542
487
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
488
raise errors.NoWorkingTree(location)
544
revid = wt.last_revision()
546
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
547
except errors.NoSuchRevision:
549
revno = ".".join(str(n) for n in revno_t)
490
revid = wt.last_revision()
492
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
493
except errors.NoSuchRevision:
495
revno = ".".join(str(n) for n in revno_t)
551
499
b = Branch.open_containing(location)[0]
552
self.add_cleanup(b.lock_read().unlock)
555
506
self.outf.write(str(revno) + '\n')
558
509
class cmd_revision_info(Command):
559
__doc__ = """Show revision number and revision id for a given revision identifier.
510
"""Show revision number and revision id for a given revision identifier.
562
513
takes_args = ['revision_info*']
563
514
takes_options = [
565
custom_help('directory',
566
517
help='Branch to examine, '
567
'rather than the one containing the working directory.'),
518
'rather than the one containing the working directory.',
568
522
Option('tree', help='Show revno of working tree'),
576
530
wt = WorkingTree.open_containing(directory)[0]
578
self.add_cleanup(wt.lock_read().unlock)
579
533
except (errors.NoWorkingTree, errors.NotLocalUrl):
581
535
b = Branch.open_containing(directory)[0]
582
self.add_cleanup(b.lock_read().unlock)
584
if revision is not None:
585
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
586
if revision_info_list is not None:
587
for rev_str in revision_info_list:
588
rev_spec = RevisionSpec.from_string(rev_str)
589
revision_ids.append(rev_spec.as_revision_id(b))
590
# No arguments supplied, default to the last revision
591
if len(revision_ids) == 0:
594
raise errors.NoWorkingTree(directory)
595
revision_ids.append(wt.last_revision())
539
if revision is not None:
540
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
541
if revision_info_list is not None:
542
for rev_str in revision_info_list:
543
rev_spec = RevisionSpec.from_string(rev_str)
544
revision_ids.append(rev_spec.as_revision_id(b))
545
# No arguments supplied, default to the last revision
546
if len(revision_ids) == 0:
549
raise errors.NoWorkingTree(directory)
550
revision_ids.append(wt.last_revision())
552
revision_ids.append(b.last_revision())
556
for revision_id in revision_ids:
558
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
559
revno = '.'.join(str(i) for i in dotted_revno)
560
except errors.NoSuchRevision:
562
maxlen = max(maxlen, len(revno))
563
revinfos.append([revno, revision_id])
597
revision_ids.append(b.last_revision())
601
for revision_id in revision_ids:
603
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
604
revno = '.'.join(str(i) for i in dotted_revno)
605
except errors.NoSuchRevision:
607
maxlen = max(maxlen, len(revno))
608
revinfos.append([revno, revision_id])
611
570
for ri in revinfos:
612
571
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
615
574
class cmd_add(Command):
616
__doc__ = """Add specified files or directories.
575
"""Add specified files or directories.
618
577
In non-recursive mode, all the named items are added, regardless
619
578
of whether they were previously ignored. A warning is given if
684
640
should_print=(not is_quiet()))
687
self.add_cleanup(base_tree.lock_read().unlock)
688
tree, file_list = tree_files_for_add(file_list)
689
added, ignored = tree.smart_add(file_list, not
690
no_recurse, action=action, save=not dry_run)
643
base_tree.lock_read()
645
file_list = self._maybe_expand_globs(file_list)
646
tree, file_list = tree_files_for_add(file_list)
647
added, ignored = tree.smart_add(file_list, not
648
no_recurse, action=action, save=not dry_run)
650
if base_tree is not None:
692
652
if len(ignored) > 0:
694
654
for glob in sorted(ignored.keys()):
695
655
for path in ignored[glob]:
696
656
self.outf.write("ignored %s matching \"%s\"\n"
660
for glob, paths in ignored.items():
661
match_len += len(paths)
662
self.outf.write("ignored %d file(s).\n" % match_len)
663
self.outf.write("If you wish to add ignored files, "
664
"please add them explicitly by name. "
665
"(\"bzr ignored\" gives a list)\n")
700
668
class cmd_mkdir(Command):
701
__doc__ = """Create a new versioned directory.
669
"""Create a new versioned directory.
703
671
This is equivalent to creating the directory and then adding it.
763
726
revision = _get_one_revision('inventory', revision)
764
727
work_tree, file_list = tree_files(file_list)
765
self.add_cleanup(work_tree.lock_read().unlock)
766
if revision is not None:
767
tree = revision.as_tree(work_tree.branch)
769
extra_trees = [work_tree]
770
self.add_cleanup(tree.lock_read().unlock)
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
783
entries = tree.inventory.entries()
728
work_tree.lock_read()
730
if revision is not None:
731
tree = revision.as_tree(work_tree.branch)
733
extra_trees = [work_tree]
739
if file_list is not None:
740
file_ids = tree.paths2ids(file_list, trees=extra_trees,
741
require_versioned=True)
742
# find_ids_across_trees may include some paths that don't
744
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
745
for file_id in file_ids if file_id in tree)
747
entries = tree.inventory.entries()
750
if tree is not work_tree:
786
753
for path, entry in entries:
787
754
if kind and kind != entry.kind:
924
896
dest = osutils.pathjoin(dest_parent, dest_tail)
925
897
mutter("attempting to move %s => %s", src, dest)
926
898
tree.rename_one(src, dest, after=after)
928
self.outf.write("%s => %s\n" % (src, dest))
899
self.outf.write("%s => %s\n" % (src, dest))
931
902
class cmd_pull(Command):
932
__doc__ = """Turn this branch into a mirror of another branch.
903
"""Turn this branch into a mirror of another branch.
934
By default, this command only works on branches that have not diverged.
935
Branches are considered diverged if the destination branch's most recent
936
commit is one that has not been merged (directly or indirectly) into the
905
This command only works on branches that have not diverged. Branches are
906
considered diverged if the destination branch's most recent commit is one
907
that has not been merged (directly or indirectly) into the parent.
939
909
If branches have diverged, you can use 'bzr merge' to integrate the changes
940
910
from one into the other. Once one branch has merged, the other should
941
911
be able to pull it again.
943
If you want to replace your local changes and just want your branch to
944
match the remote one, use pull --overwrite. This will work even if the two
945
branches have diverged.
913
If you want to forget your local changes and just update your branch to
914
match the remote one, use pull --overwrite.
947
916
If there is no default location set, the first pull will set it. After
948
917
that, you can omit the location to use the default. To change the
1023
993
branch_from = Branch.open(location,
1024
994
possible_transports=possible_transports)
1025
self.add_cleanup(branch_from.lock_read().unlock)
1027
996
if branch_to.get_parent() is None or remember:
1028
997
branch_to.set_parent(branch_from.base)
1030
if revision is not None:
1031
revision_id = revision.as_revision_id(branch_from)
1033
if tree_to is not None:
1034
view_info = _get_view_info_for_change_reporter(tree_to)
1035
change_reporter = delta._ChangeReporter(
1036
unversioned_filter=tree_to.is_ignored,
1037
view_info=view_info)
1038
result = tree_to.pull(
1039
branch_from, overwrite, revision_id, change_reporter,
1040
possible_transports=possible_transports, local=local)
1042
result = branch_to.pull(
1043
branch_from, overwrite, revision_id, local=local)
1045
result.report(self.outf)
1046
if verbose and result.old_revid != result.new_revid:
1047
log.show_branch_change(
1048
branch_to, self.outf, result.old_revno,
999
if branch_from is not branch_to:
1000
branch_from.lock_read()
1002
if revision is not None:
1003
revision_id = revision.as_revision_id(branch_from)
1005
branch_to.lock_write()
1007
if tree_to is not None:
1008
view_info = _get_view_info_for_change_reporter(tree_to)
1009
change_reporter = delta._ChangeReporter(
1010
unversioned_filter=tree_to.is_ignored,
1011
view_info=view_info)
1012
result = tree_to.pull(
1013
branch_from, overwrite, revision_id, change_reporter,
1014
possible_transports=possible_transports, local=local)
1016
result = branch_to.pull(
1017
branch_from, overwrite, revision_id, local=local)
1019
result.report(self.outf)
1020
if verbose and result.old_revid != result.new_revid:
1021
log.show_branch_change(
1022
branch_to, self.outf, result.old_revno,
1027
if branch_from is not branch_to:
1028
branch_from.unlock()
1052
1031
class cmd_push(Command):
1053
__doc__ = """Update a mirror of this branch.
1032
"""Update a mirror of this branch.
1055
1034
The target branch will not have its working tree populated because this
1056
1035
is both expensive, and is not supported on remote file systems.
1114
1096
# Get the source branch
1115
1097
(tree, br_from,
1116
1098
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1100
strict = br_from.get_config().get_user_option('push_strict')
1101
if strict is not None:
1102
# FIXME: This should be better supported by config
1104
bools = dict(yes=True, no=False, on=True, off=False,
1105
true=True, false=False)
1107
strict = bools[strict.lower()]
1117
1110
# Get the tip's revision_id
1118
1111
revision = _get_one_revision('push', revision)
1119
1112
if revision is not None:
1120
1113
revision_id = revision.in_history(br_from).rev_id
1122
1115
revision_id = None
1123
if tree is not None and revision_id is None:
1124
tree.check_changed_or_out_of_date(
1125
strict, 'push_strict',
1126
more_error='Use --no-strict to force the push.',
1127
more_warning='Uncommitted changes will not be pushed.')
1116
if (tree is not None and revision_id is None
1117
and (strict is None or strict)): # Default to True:
1118
changes = tree.changes_from(tree.basis_tree())
1119
if changes.has_changed() or len(tree.get_parent_ids()) > 1:
1120
raise errors.UncommittedChanges(
1121
tree, more='Use --no-strict to force the push.')
1122
if tree.last_revision() != tree.branch.last_revision():
1123
# The tree has lost sync with its branch, there is little
1124
# chance that the user is aware of it but he can still force
1125
# the push with --no-strict
1126
raise errors.OutOfDateTree(
1127
tree, more='Use --no-strict to force the push.')
1128
1129
# Get the stacked_on branch, if any
1129
1130
if stacked_on is not None:
1130
1131
stacked_on = urlutils.normalize_url(stacked_on)
1195
1193
' directory exists, but does not already'
1196
1194
' have a control directory. This flag will'
1197
1195
' allow branch to proceed.'),
1199
help="Bind new branch to from location."),
1201
1197
aliases = ['get', 'clone']
1203
1199
def run(self, from_location, to_location=None, revision=None,
1204
1200
hardlink=False, stacked=False, standalone=False, no_tree=False,
1205
use_existing_dir=False, switch=False, bind=False):
1206
from bzrlib import switch as _mod_switch
1201
use_existing_dir=False):
1207
1202
from bzrlib.tag import _merge_tags_if_possible
1208
1204
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1206
if (accelerator_tree is not None and
1207
accelerator_tree.supports_content_filtering()):
1208
accelerator_tree = None
1210
1209
revision = _get_one_revision('branch', revision)
1211
self.add_cleanup(br_from.lock_read().unlock)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1264
# Bind to the parent
1265
parent_branch = Branch.open(from_location)
1266
branch.bind(parent_branch)
1267
note('New branch bound to %s' % from_location)
1269
# Switch to the new branch
1270
wt, _ = WorkingTree.open_containing('.')
1271
_mod_switch.switch(wt.bzrdir, branch)
1272
note('Switched to branch: %s',
1273
urlutils.unescape_for_display(branch.base, 'utf-8'))
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1276
1267
class cmd_checkout(Command):
1277
__doc__ = """Create a new checkout of an existing branch.
1268
"""Create a new checkout of an existing branch.
1279
1270
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1280
1271
the branch found in '.'. This is useful if you have removed the working tree
1354
1345
@display_command
1355
1346
def run(self, dir=u'.'):
1356
1347
tree = WorkingTree.open_containing(dir)[0]
1357
self.add_cleanup(tree.lock_read().unlock)
1358
new_inv = tree.inventory
1359
old_tree = tree.basis_tree()
1360
self.add_cleanup(old_tree.lock_read().unlock)
1361
old_inv = old_tree.inventory
1363
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1364
for f, paths, c, v, p, n, k, e in iterator:
1365
if paths[0] == paths[1]:
1369
renames.append(paths)
1371
for old_name, new_name in renames:
1372
self.outf.write("%s => %s\n" % (old_name, new_name))
1350
new_inv = tree.inventory
1351
old_tree = tree.basis_tree()
1352
old_tree.lock_read()
1354
old_inv = old_tree.inventory
1356
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1357
for f, paths, c, v, p, n, k, e in iterator:
1358
if paths[0] == paths[1]:
1362
renames.append(paths)
1364
for old_name, new_name in renames:
1365
self.outf.write("%s => %s\n" % (old_name, new_name))
1375
1372
class cmd_update(Command):
1376
__doc__ = """Update a tree to have the latest code committed to its branch.
1373
"""Update a tree to have the latest code committed to its branch.
1378
1375
This will perform a merge into the working tree, and may generate
1379
1376
conflicts. If you have any local changes, you will still
1382
1379
If you want to discard your local changes, you can just do a
1383
1380
'bzr revert' instead of 'bzr commit' after the update.
1385
If the tree's branch is bound to a master branch, it will also update
1386
the branch from the master.
1389
1383
_see_also = ['pull', 'working-trees', 'status-flags']
1390
1384
takes_args = ['dir?']
1391
takes_options = ['revision']
1392
1385
aliases = ['up']
1394
def run(self, dir='.', revision=None):
1395
if revision is not None and len(revision) != 1:
1396
raise errors.BzrCommandError(
1397
"bzr update --revision takes exactly one revision")
1387
def run(self, dir='.'):
1398
1388
tree = WorkingTree.open_containing(dir)[0]
1399
branch = tree.branch
1400
1389
possible_transports = []
1401
master = branch.get_master_branch(
1390
master = tree.branch.get_master_branch(
1402
1391
possible_transports=possible_transports)
1403
1392
if master is not None:
1404
branch_location = master.base
1405
1393
tree.lock_write()
1407
branch_location = tree.branch.base
1408
1395
tree.lock_tree_write()
1409
self.add_cleanup(tree.unlock)
1410
# get rid of the final '/' and be ready for display
1411
branch_location = urlutils.unescape_for_display(
1412
branch_location.rstrip('/'),
1414
existing_pending_merges = tree.get_parent_ids()[1:]
1418
# may need to fetch data into a heavyweight checkout
1419
# XXX: this may take some time, maybe we should display a
1421
old_tip = branch.update(possible_transports)
1422
if revision is not None:
1423
revision_id = revision[0].as_revision_id(branch)
1425
revision_id = branch.last_revision()
1426
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1427
revno = branch.revision_id_to_dotted_revno(revision_id)
1428
note("Tree is up to date at revision %s of branch %s" %
1429
('.'.join(map(str, revno)), branch_location))
1431
view_info = _get_view_info_for_change_reporter(tree)
1432
change_reporter = delta._ChangeReporter(
1433
unversioned_filter=tree.is_ignored,
1434
view_info=view_info)
1397
existing_pending_merges = tree.get_parent_ids()[1:]
1398
last_rev = _mod_revision.ensure_null(tree.last_revision())
1399
if last_rev == _mod_revision.ensure_null(
1400
tree.branch.last_revision()):
1401
# may be up to date, check master too.
1402
if master is None or last_rev == _mod_revision.ensure_null(
1403
master.last_revision()):
1404
revno = tree.branch.revision_id_to_revno(last_rev)
1405
note("Tree is up to date at revision %d." % (revno,))
1407
view_info = _get_view_info_for_change_reporter(tree)
1436
1408
conflicts = tree.update(
1438
possible_transports=possible_transports,
1439
revision=revision_id,
1441
except errors.NoSuchRevision, e:
1442
raise errors.BzrCommandError(
1443
"branch has no revision %s\n"
1444
"bzr update --revision only works"
1445
" for a revision in the branch history"
1447
revno = tree.branch.revision_id_to_dotted_revno(
1448
_mod_revision.ensure_null(tree.last_revision()))
1449
note('Updated to revision %s of branch %s' %
1450
('.'.join(map(str, revno)), branch_location))
1451
parent_ids = tree.get_parent_ids()
1452
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1453
note('Your local commits will now show as pending merges with '
1454
"'bzr status', and can be committed with 'bzr commit'.")
1409
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1410
view_info=view_info), possible_transports=possible_transports)
1411
revno = tree.branch.revision_id_to_revno(
1412
_mod_revision.ensure_null(tree.last_revision()))
1413
note('Updated to revision %d.' % (revno,))
1414
if tree.get_parent_ids()[1:] != existing_pending_merges:
1415
note('Your local commits will now show as pending merges with '
1416
"'bzr status', and can be committed with 'bzr commit'.")
1461
1425
class cmd_info(Command):
1462
__doc__ = """Show information about a working tree, branch or repository.
1426
"""Show information about a working tree, branch or repository.
1464
1428
This command will show all known locations and formats associated to the
1465
1429
tree, branch or repository.
1531
1495
if file_list is not None:
1532
1496
file_list = [f for f in file_list]
1534
self.add_cleanup(tree.lock_write().unlock)
1535
# Heuristics should probably all move into tree.remove_smart or
1538
added = tree.changes_from(tree.basis_tree(),
1539
specific_files=file_list).added
1540
file_list = sorted([f[0] for f in added], reverse=True)
1541
if len(file_list) == 0:
1542
raise errors.BzrCommandError('No matching files.')
1543
elif file_list is None:
1544
# missing files show up in iter_changes(basis) as
1545
# versioned-with-no-kind.
1547
for change in tree.iter_changes(tree.basis_tree()):
1548
# Find paths in the working tree that have no kind:
1549
if change[1][1] is not None and change[6][1] is None:
1550
missing.append(change[1][1])
1551
file_list = sorted(missing, reverse=True)
1552
file_deletion_strategy = 'keep'
1553
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1554
keep_files=file_deletion_strategy=='keep',
1555
force=file_deletion_strategy=='force')
1500
# Heuristics should probably all move into tree.remove_smart or
1503
added = tree.changes_from(tree.basis_tree(),
1504
specific_files=file_list).added
1505
file_list = sorted([f[0] for f in added], reverse=True)
1506
if len(file_list) == 0:
1507
raise errors.BzrCommandError('No matching files.')
1508
elif file_list is None:
1509
# missing files show up in iter_changes(basis) as
1510
# versioned-with-no-kind.
1512
for change in tree.iter_changes(tree.basis_tree()):
1513
# Find paths in the working tree that have no kind:
1514
if change[1][1] is not None and change[6][1] is None:
1515
missing.append(change[1][1])
1516
file_list = sorted(missing, reverse=True)
1517
file_deletion_strategy = 'keep'
1518
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1519
keep_files=file_deletion_strategy=='keep',
1520
force=file_deletion_strategy=='force')
1558
1525
class cmd_file_id(Command):
1559
__doc__ = """Print file_id of a particular file or directory.
1526
"""Print file_id of a particular file or directory.
1561
1528
The file_id is assigned when the file is first added and remains the
1562
1529
same through all revisions where the file exists, even when it is
1780
1747
class cmd_init_repository(Command):
1781
__doc__ = """Create a shared repository for branches to share storage space.
1748
"""Create a shared repository to hold branches.
1783
1750
New branches created under the repository directory will store their
1784
revisions in the repository, not in the branch directory. For branches
1785
with shared history, this reduces the amount of storage needed and
1786
speeds up the creation of new branches.
1751
revisions in the repository, not in the branch directory.
1788
If the --no-trees option is given then the branches in the repository
1789
will not have working trees by default. They will still exist as
1790
directories on disk, but they will not have separate copies of the
1791
files at a certain revision. This can be useful for repositories that
1792
store branches which are interacted with through checkouts or remote
1793
branches, such as on a server.
1753
If the --no-trees option is used then the branches in the repository
1754
will not have working trees by default.
1796
Create a shared repository holding just branches::
1757
Create a shared repositories holding just branches::
1798
1759
bzr init-repo --no-trees repo
1799
1760
bzr init repo/trunk
1962
1904
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1963
1905
' one or two revision specifiers')
1965
if using is not None and format is not None:
1966
raise errors.BzrCommandError('--using and --format are mutually '
1969
(old_tree, new_tree,
1970
old_branch, new_branch,
1971
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1972
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1973
# GNU diff on Windows uses ANSI encoding for filenames
1974
path_encoding = osutils.get_diff_header_encoding()
1907
old_tree, new_tree, specific_files, extra_trees = \
1908
_get_trees_to_diff(file_list, revision, old, new,
1975
1910
return show_diff_trees(old_tree, new_tree, sys.stdout,
1976
1911
specific_files=specific_files,
1977
1912
external_diff_options=diff_options,
1978
1913
old_label=old_label, new_label=new_label,
1979
extra_trees=extra_trees,
1980
path_encoding=path_encoding,
1914
extra_trees=extra_trees, using=using)
1985
1917
class cmd_deleted(Command):
1986
__doc__ = """List files deleted in the working tree.
1918
"""List files deleted in the working tree.
1988
1920
# TODO: Show files deleted since a previous revision, or
1989
1921
# between two revisions.
1992
1924
# level of effort but possibly much less IO. (Or possibly not,
1993
1925
# if the directories are very large...)
1994
1926
_see_also = ['status', 'ls']
1995
takes_options = ['directory', 'show-ids']
1927
takes_options = ['show-ids']
1997
1929
@display_command
1998
def run(self, show_ids=False, directory=u'.'):
1999
tree = WorkingTree.open_containing(directory)[0]
2000
self.add_cleanup(tree.lock_read().unlock)
2001
old = tree.basis_tree()
2002
self.add_cleanup(old.lock_read().unlock)
2003
for path, ie in old.inventory.iter_entries():
2004
if not tree.has_id(ie.file_id):
2005
self.outf.write(path)
2007
self.outf.write(' ')
2008
self.outf.write(ie.file_id)
2009
self.outf.write('\n')
1930
def run(self, show_ids=False):
1931
tree = WorkingTree.open_containing(u'.')[0]
1934
old = tree.basis_tree()
1937
for path, ie in old.inventory.iter_entries():
1938
if not tree.has_id(ie.file_id):
1939
self.outf.write(path)
1941
self.outf.write(' ')
1942
self.outf.write(ie.file_id)
1943
self.outf.write('\n')
2012
1950
class cmd_modified(Command):
2013
__doc__ = """List files modified in working tree.
1951
"""List files modified in working tree.
2017
1955
_see_also = ['status', 'ls']
2018
takes_options = ['directory', 'null']
1958
help='Write an ascii NUL (\\0) separator '
1959
'between files rather than a newline.')
2020
1962
@display_command
2021
def run(self, null=False, directory=u'.'):
2022
tree = WorkingTree.open_containing(directory)[0]
1963
def run(self, null=False):
1964
tree = WorkingTree.open_containing(u'.')[0]
2023
1965
td = tree.changes_from(tree.basis_tree())
2024
1966
for path, id, kind, text_modified, meta_modified in td.modified:
2031
1973
class cmd_added(Command):
2032
__doc__ = """List files added in working tree.
1974
"""List files added in working tree.
2036
1978
_see_also = ['status', 'ls']
2037
takes_options = ['directory', 'null']
1981
help='Write an ascii NUL (\\0) separator '
1982
'between files rather than a newline.')
2039
1985
@display_command
2040
def run(self, null=False, directory=u'.'):
2041
wt = WorkingTree.open_containing(directory)[0]
2042
self.add_cleanup(wt.lock_read().unlock)
2043
basis = wt.basis_tree()
2044
self.add_cleanup(basis.lock_read().unlock)
2045
basis_inv = basis.inventory
2048
if file_id in basis_inv:
2050
if inv.is_root(file_id) and len(basis_inv) == 0:
2052
path = inv.id2path(file_id)
2053
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2056
self.outf.write(path + '\0')
2058
self.outf.write(osutils.quotefn(path) + '\n')
1986
def run(self, null=False):
1987
wt = WorkingTree.open_containing(u'.')[0]
1990
basis = wt.basis_tree()
1993
basis_inv = basis.inventory
1996
if file_id in basis_inv:
1998
if inv.is_root(file_id) and len(basis_inv) == 0:
2000
path = inv.id2path(file_id)
2001
if not os.access(osutils.abspath(path), os.F_OK):
2004
self.outf.write(path + '\0')
2006
self.outf.write(osutils.quotefn(path) + '\n')
2061
2013
class cmd_root(Command):
2062
__doc__ = """Show the tree root directory.
2014
"""Show the tree root directory.
2064
2016
The root is the nearest enclosing directory with a .bzr control
2376
2314
diff_type = 'full'
2378
# Build the log formatter
2379
if log_format is None:
2380
log_format = log.log_formatter_registry.get_default(b)
2381
# Make a non-encoding output to include the diffs - bug 328007
2382
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2383
lf = log_format(show_ids=show_ids, to_file=self.outf,
2384
to_exact_file=unencoded_output,
2385
show_timezone=timezone,
2386
delta_format=get_verbosity_level(),
2388
show_advice=levels is None,
2389
author_list_handler=authors)
2391
# Choose the algorithm for doing the logging. It's annoying
2392
# having multiple code paths like this but necessary until
2393
# the underlying repository format is faster at generating
2394
# deltas or can provide everything we need from the indices.
2395
# The default algorithm - match-using-deltas - works for
2396
# multiple files and directories and is faster for small
2397
# amounts of history (200 revisions say). However, it's too
2398
# slow for logging a single file in a repository with deep
2399
# history, i.e. > 10K revisions. In the spirit of "do no
2400
# evil when adding features", we continue to use the
2401
# original algorithm - per-file-graph - for the "single
2402
# file that isn't a directory without showing a delta" case.
2403
partial_history = revision and b.repository._format.supports_chks
2404
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2405
or delta_type or partial_history)
2407
# Build the LogRequest and execute it
2408
if len(file_ids) == 0:
2410
rqst = make_log_request_dict(
2411
direction=direction, specific_fileids=file_ids,
2412
start_revision=rev1, end_revision=rev2, limit=limit,
2413
message_search=message, delta_type=delta_type,
2414
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2415
exclude_common_ancestry=exclude_common_ancestry,
2417
Logger(b, rqst).show(lf)
2318
# Build the log formatter
2319
if log_format is None:
2320
log_format = log.log_formatter_registry.get_default(b)
2321
lf = log_format(show_ids=show_ids, to_file=self.outf,
2322
show_timezone=timezone,
2323
delta_format=get_verbosity_level(),
2325
show_advice=levels is None)
2327
# Choose the algorithm for doing the logging. It's annoying
2328
# having multiple code paths like this but necessary until
2329
# the underlying repository format is faster at generating
2330
# deltas or can provide everything we need from the indices.
2331
# The default algorithm - match-using-deltas - works for
2332
# multiple files and directories and is faster for small
2333
# amounts of history (200 revisions say). However, it's too
2334
# slow for logging a single file in a repository with deep
2335
# history, i.e. > 10K revisions. In the spirit of "do no
2336
# evil when adding features", we continue to use the
2337
# original algorithm - per-file-graph - for the "single
2338
# file that isn't a directory without showing a delta" case.
2339
partial_history = revision and b.repository._format.supports_chks
2340
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2341
or delta_type or partial_history)
2343
# Build the LogRequest and execute it
2344
if len(file_ids) == 0:
2346
rqst = make_log_request_dict(
2347
direction=direction, specific_fileids=file_ids,
2348
start_revision=rev1, end_revision=rev2, limit=limit,
2349
message_search=message, delta_type=delta_type,
2350
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2351
Logger(b, rqst).show(lf)
2420
2356
def _get_revision_range(revisionspec_list, branch, command_name):
2509
2439
help='Recurse into subdirectories.'),
2510
2440
Option('from-root',
2511
2441
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2442
Option('unknown', help='Print unknown files.'),
2514
2443
Option('versioned', help='Print versioned files.',
2515
2444
short_name='V'),
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2445
Option('ignored', help='Print ignored files.'),
2447
help='Write an ascii NUL (\\0) separator '
2448
'between files rather than a newline.'),
2519
2450
help='List entries of a particular kind: file, directory, symlink.',
2525
2454
@display_command
2526
2455
def run(self, revision=None, verbose=False,
2527
2456
recursive=False, from_root=False,
2528
2457
unknown=False, versioned=False, ignored=False,
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
2458
null=False, kind=None, show_ids=False, path=None):
2531
2460
if kind and kind not in ('file', 'directory', 'symlink'):
2532
2461
raise errors.BzrCommandError('invalid kind specified')
2566
2495
view_str = views.view_display_str(view_files)
2567
2496
note("Ignoring files outside view. View is %s" % view_str)
2569
self.add_cleanup(tree.lock_read().unlock)
2570
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2571
from_dir=relpath, recursive=recursive):
2572
# Apply additional masking
2573
if not all and not selection[fc]:
2575
if kind is not None and fkind != kind:
2580
fullpath = osutils.pathjoin(relpath, fp)
2583
views.check_path_in_view(tree, fullpath)
2584
except errors.FileOutsideView:
2500
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2501
from_dir=relpath, recursive=recursive):
2502
# Apply additional masking
2503
if not all and not selection[fc]:
2505
if kind is not None and fkind != kind:
2510
fullpath = osutils.pathjoin(relpath, fp)
2513
views.check_path_in_view(tree, fullpath)
2514
except errors.FileOutsideView:
2589
fp = osutils.pathjoin(prefix, fp)
2590
kindch = entry.kind_character()
2591
outstring = fp + kindch
2592
ui.ui_factory.clear_term()
2594
outstring = '%-8s %s' % (fc, outstring)
2595
if show_ids and fid is not None:
2596
outstring = "%-50s %s" % (outstring, fid)
2597
self.outf.write(outstring + '\n')
2599
self.outf.write(fp + '\0')
2602
self.outf.write(fid)
2603
self.outf.write('\0')
2611
self.outf.write('%-50s %s\n' % (outstring, my_id))
2519
fp = osutils.pathjoin(prefix, fp)
2520
kindch = entry.kind_character()
2521
outstring = fp + kindch
2522
ui.ui_factory.clear_term()
2524
outstring = '%-8s %s' % (fc, outstring)
2525
if show_ids and fid is not None:
2526
outstring = "%-50s %s" % (outstring, fid)
2613
2527
self.outf.write(outstring + '\n')
2529
self.outf.write(fp + '\0')
2532
self.outf.write(fid)
2533
self.outf.write('\0')
2541
self.outf.write('%-50s %s\n' % (outstring, my_id))
2543
self.outf.write(outstring + '\n')
2616
2548
class cmd_unknowns(Command):
2617
__doc__ = """List unknown files.
2549
"""List unknown files.
2621
2553
_see_also = ['ls']
2622
takes_options = ['directory']
2624
2555
@display_command
2625
def run(self, directory=u'.'):
2626
for f in WorkingTree.open_containing(directory)[0].unknowns():
2557
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2627
2558
self.outf.write(osutils.quotefn(f) + '\n')
2630
2561
class cmd_ignore(Command):
2631
__doc__ = """Ignore specified files or patterns.
2562
"""Ignore specified files or patterns.
2633
2564
See ``bzr help patterns`` for details on the syntax of patterns.
2635
If a .bzrignore file does not exist, the ignore command
2636
will create one and add the specified files or patterns to the newly
2637
created file. The ignore command will also automatically add the
2638
.bzrignore file to be versioned. Creating a .bzrignore file without
2639
the use of the ignore command will require an explicit add command.
2641
2566
To remove patterns from the ignore list, edit the .bzrignore file.
2642
2567
After adding, editing or deleting that file either indirectly by
2643
2568
using this command or directly by using an editor, be sure to commit
2646
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2647
the global ignore file can be found in the application data directory as
2648
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2649
Global ignores are not touched by this command. The global ignore file
2650
can be edited directly using an editor.
2652
Patterns prefixed with '!' are exceptions to ignore patterns and take
2653
precedence over regular ignores. Such exceptions are used to specify
2654
files that should be versioned which would otherwise be ignored.
2656
Patterns prefixed with '!!' act as regular ignore patterns, but have
2657
precedence over the '!' exception patterns.
2659
2571
Note: ignore patterns containing shell wildcards must be quoted from
2660
2572
the shell on Unix.
2683
2591
Ignore everything but the "debian" toplevel directory::
2685
2593
bzr ignore "RE:(?!debian/).*"
2687
Ignore everything except the "local" toplevel directory,
2688
but always ignore "*~" autosave files, even under local/::
2691
bzr ignore "!./local"
2695
2596
_see_also = ['status', 'ignored', 'patterns']
2696
2597
takes_args = ['name_pattern*']
2697
takes_options = ['directory',
2698
Option('default-rules',
2699
help='Display the default ignore rules that bzr uses.')
2599
Option('old-default-rules',
2600
help='Write out the ignore rules bzr < 0.9 always used.')
2702
def run(self, name_pattern_list=None, default_rules=None,
2603
def run(self, name_pattern_list=None, old_default_rules=None):
2704
2604
from bzrlib import ignores
2705
if default_rules is not None:
2706
# dump the default rules and exit
2707
for pattern in ignores.USER_DEFAULTS:
2708
self.outf.write("%s\n" % pattern)
2605
if old_default_rules is not None:
2606
# dump the rules and exit
2607
for pattern in ignores.OLD_DEFAULTS:
2710
2610
if not name_pattern_list:
2711
2611
raise errors.BzrCommandError("ignore requires at least one "
2712
"NAME_PATTERN or --default-rules.")
2612
"NAME_PATTERN or --old-default-rules")
2713
2613
name_pattern_list = [globbing.normalize_pattern(p)
2714
2614
for p in name_pattern_list]
2716
for p in name_pattern_list:
2717
if not globbing.Globster.is_pattern_valid(p):
2718
bad_patterns += ('\n %s' % p)
2720
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2721
ui.ui_factory.show_error(msg)
2722
raise errors.InvalidPattern('')
2723
2615
for name_pattern in name_pattern_list:
2724
2616
if (name_pattern[0] == '/' or
2725
2617
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2726
2618
raise errors.BzrCommandError(
2727
2619
"NAME_PATTERN should not be an absolute path")
2728
tree, relpath = WorkingTree.open_containing(directory)
2620
tree, relpath = WorkingTree.open_containing(u'.')
2729
2621
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2730
2622
ignored = globbing.Globster(name_pattern_list)
2732
self.add_cleanup(tree.lock_read().unlock)
2733
2625
for entry in tree.list_files():
2735
2627
if id is not None:
2736
2628
filename = entry[0]
2737
2629
if ignored.match(filename):
2738
matches.append(filename)
2630
matches.append(filename.encode('utf-8'))
2739
2632
if len(matches) > 0:
2740
self.outf.write("Warning: the following files are version controlled and"
2741
" match your ignore pattern:\n%s"
2742
"\nThese files will continue to be version controlled"
2743
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2633
print "Warning: the following files are version controlled and" \
2634
" match your ignore pattern:\n%s" \
2635
"\nThese files will continue to be version controlled" \
2636
" unless you 'bzr remove' them." % ("\n".join(matches),)
2746
2639
class cmd_ignored(Command):
2747
__doc__ = """List ignored files and the patterns that matched them.
2640
"""List ignored files and the patterns that matched them.
2749
2642
List all the ignored files and the ignore pattern that caused the file to
2757
2650
encoding_type = 'replace'
2758
2651
_see_also = ['ignore', 'ls']
2759
takes_options = ['directory']
2761
2653
@display_command
2762
def run(self, directory=u'.'):
2763
tree = WorkingTree.open_containing(directory)[0]
2764
self.add_cleanup(tree.lock_read().unlock)
2765
for path, file_class, kind, file_id, entry in tree.list_files():
2766
if file_class != 'I':
2768
## XXX: Slightly inefficient since this was already calculated
2769
pat = tree.is_ignored(path)
2770
self.outf.write('%-50s %s\n' % (path, pat))
2655
tree = WorkingTree.open_containing(u'.')[0]
2658
for path, file_class, kind, file_id, entry in tree.list_files():
2659
if file_class != 'I':
2661
## XXX: Slightly inefficient since this was already calculated
2662
pat = tree.is_ignored(path)
2663
self.outf.write('%-50s %s\n' % (path, pat))
2773
2668
class cmd_lookup_revision(Command):
2774
__doc__ = """Lookup the revision-id from a revision-number
2669
"""Lookup the revision-id from a revision-number
2777
2672
bzr lookup-revision 33
2780
2675
takes_args = ['revno']
2781
takes_options = ['directory']
2783
2677
@display_command
2784
def run(self, revno, directory=u'.'):
2678
def run(self, revno):
2786
2680
revno = int(revno)
2787
2681
except ValueError:
2788
raise errors.BzrCommandError("not a valid revision-number: %r"
2790
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2791
self.outf.write("%s\n" % revid)
2682
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2684
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2794
2687
class cmd_export(Command):
2795
__doc__ = """Export current or past revision to a destination directory or archive.
2688
"""Export current or past revision to a destination directory or archive.
2797
2690
If no revision is specified this exports the last committed revision.
2876
2765
@display_command
2877
2766
def run(self, filename, revision=None, name_from_revision=False,
2878
filters=False, directory=None):
2879
2768
if revision is not None and len(revision) != 1:
2880
2769
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2881
2770
" one revision specifier")
2882
2771
tree, branch, relpath = \
2883
_open_directory_or_containing_tree_or_branch(filename, directory)
2884
self.add_cleanup(branch.lock_read().unlock)
2885
return self._run(tree, branch, relpath, filename, revision,
2886
name_from_revision, filters)
2772
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2775
return self._run(tree, branch, relpath, filename, revision,
2776
name_from_revision, filters)
2888
2780
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2890
2782
if tree is None:
2891
2783
tree = b.basis_tree()
2892
2784
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2893
self.add_cleanup(rev_tree.lock_read().unlock)
2895
2786
old_file_id = rev_tree.path2id(relpath)
3134
3012
if local and not tree.branch.get_bound_location():
3135
3013
raise errors.LocalRequiresBoundBranch()
3137
if message is not None:
3139
file_exists = osutils.lexists(message)
3140
except UnicodeError:
3141
# The commit message contains unicode characters that can't be
3142
# represented in the filesystem encoding, so that can't be a
3147
'The commit message is a file name: "%(f)s".\n'
3148
'(use --file "%(f)s" to take commit message from that file)'
3150
ui.ui_factory.show_warning(warning_msg)
3152
message = message.replace('\r\n', '\n')
3153
message = message.replace('\r', '\n')
3155
raise errors.BzrCommandError(
3156
"please specify either --message or --file")
3158
3015
def get_message(commit_obj):
3159
3016
"""Callback to get commit message"""
3161
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3163
my_message = f.read()
3166
elif message is not None:
3167
my_message = message
3169
# No message supplied: make one up.
3170
# text is the status of the tree
3171
text = make_commit_message_template_encoded(tree,
3017
my_message = message
3018
if my_message is None and not file:
3019
t = make_commit_message_template_encoded(tree,
3172
3020
selected_list, diff=show_diff,
3173
3021
output_encoding=osutils.get_user_encoding())
3174
# start_message is the template generated from hooks
3175
# XXX: Warning - looks like hooks return unicode,
3176
# make_commit_message_template_encoded returns user encoding.
3177
# We probably want to be using edit_commit_message instead to
3179
3022
start_message = generate_commit_message_template(commit_obj)
3180
my_message = edit_commit_message_encoded(text,
3023
my_message = edit_commit_message_encoded(t,
3181
3024
start_message=start_message)
3182
3025
if my_message is None:
3183
3026
raise errors.BzrCommandError("please specify a commit"
3184
3027
" message with either --message or --file")
3028
elif my_message and file:
3029
raise errors.BzrCommandError(
3030
"please specify either --message or --file")
3032
my_message = codecs.open(file, 'rt',
3033
osutils.get_user_encoding()).read()
3185
3034
if my_message == "":
3186
3035
raise errors.BzrCommandError("empty commit message specified")
3187
3036
return my_message
3189
# The API permits a commit with a filter of [] to mean 'select nothing'
3190
# but the command line should not do that.
3191
if not selected_list:
3192
selected_list = None
3194
3039
tree.commit(message_callback=get_message,
3195
3040
specific_files=selected_list,
3196
3041
allow_pointless=unchanged, strict=strict, local=local,
3197
3042
reporter=None, verbose=verbose, revprops=properties,
3198
authors=author, timestamp=commit_stamp,
3200
3044
exclude=safe_relpath_files(tree, exclude))
3201
3045
except PointlessCommit:
3046
# FIXME: This should really happen before the file is read in;
3047
# perhaps prepare the commit; get the message; then actually commit
3202
3048
raise errors.BzrCommandError("No changes to commit."
3203
3049
" Use --unchanged to commit anyhow.")
3204
3050
except ConflictsInTree:
3584
3418
def run(self, testspecs_list=None, verbose=False, one=False,
3585
3419
transport=None, benchmark=None,
3420
lsprof_timed=None, cache_dir=None,
3587
3421
first=False, list_only=False,
3588
3422
randomize=None, exclude=None, strict=False,
3589
3423
load_list=None, debugflag=None, starting_with=None, subunit=False,
3590
parallel=None, lsprof_tests=False):
3591
3425
from bzrlib.tests import selftest
3426
import bzrlib.benchmarks as benchmarks
3427
from bzrlib.benchmarks import tree_creator
3593
3429
# Make deprecation warnings visible, unless -Werror is set
3594
3430
symbol_versioning.activate_deprecation_warnings(override=False)
3432
if cache_dir is not None:
3433
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3596
3434
if testspecs_list is not None:
3597
3435
pattern = '|'.join(testspecs_list)
3604
3442
raise errors.BzrCommandError("subunit not available. subunit "
3605
3443
"needs to be installed to use --subunit.")
3606
3444
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3607
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3608
# stdout, which would corrupt the subunit stream.
3609
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3610
# following code can be deleted when it's sufficiently deployed
3611
# -- vila/mgz 20100514
3612
if (sys.platform == "win32"
3613
and getattr(sys.stdout, 'fileno', None) is not None):
3615
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3617
3446
self.additional_selftest_args.setdefault(
3618
3447
'suite_decorators', []).append(parallel)
3620
raise errors.BzrCommandError(
3621
"--benchmark is no longer supported from bzr 2.2; "
3622
"use bzr-usertest instead")
3623
test_suite_factory = None
3624
selftest_kwargs = {"verbose": verbose,
3626
"stop_on_failure": one,
3627
"transport": transport,
3628
"test_suite_factory": test_suite_factory,
3629
"lsprof_timed": lsprof_timed,
3630
"lsprof_tests": lsprof_tests,
3631
"matching_tests_first": first,
3632
"list_only": list_only,
3633
"random_seed": randomize,
3634
"exclude_pattern": exclude,
3636
"load_list": load_list,
3637
"debug_flags": debugflag,
3638
"starting_with": starting_with
3640
selftest_kwargs.update(self.additional_selftest_args)
3641
result = selftest(**selftest_kwargs)
3449
test_suite_factory = benchmarks.test_suite
3450
# Unless user explicitly asks for quiet, be verbose in benchmarks
3451
verbose = not is_quiet()
3452
# TODO: should possibly lock the history file...
3453
benchfile = open(".perf_history", "at", buffering=1)
3455
test_suite_factory = None
3458
selftest_kwargs = {"verbose": verbose,
3460
"stop_on_failure": one,
3461
"transport": transport,
3462
"test_suite_factory": test_suite_factory,
3463
"lsprof_timed": lsprof_timed,
3464
"bench_history": benchfile,
3465
"matching_tests_first": first,
3466
"list_only": list_only,
3467
"random_seed": randomize,
3468
"exclude_pattern": exclude,
3470
"load_list": load_list,
3471
"debug_flags": debugflag,
3472
"starting_with": starting_with
3474
selftest_kwargs.update(self.additional_selftest_args)
3475
result = selftest(**selftest_kwargs)
3477
if benchfile is not None:
3642
3479
return int(not result)
3645
3482
class cmd_version(Command):
3646
__doc__ = """Show version of bzr."""
3483
"""Show version of bzr."""
3648
3485
encoding_type = 'replace'
3649
3486
takes_options = [
3809
3636
verified = 'inapplicable'
3810
3637
tree = WorkingTree.open_containing(directory)[0]
3639
# die as quickly as possible if there are uncommitted changes
3813
3641
basis_tree = tree.revision_tree(tree.last_revision())
3814
3642
except errors.NoSuchRevision:
3815
3643
basis_tree = tree.basis_tree()
3817
# die as quickly as possible if there are uncommitted changes
3819
if tree.has_changes():
3645
changes = tree.changes_from(basis_tree)
3646
if changes.has_changed():
3820
3647
raise errors.UncommittedChanges(tree)
3822
3649
view_info = _get_view_info_for_change_reporter(tree)
3823
3650
change_reporter = delta._ChangeReporter(
3824
3651
unversioned_filter=tree.is_ignored, view_info=view_info)
3825
pb = ui.ui_factory.nested_progress_bar()
3826
self.add_cleanup(pb.finished)
3827
self.add_cleanup(tree.lock_write().unlock)
3828
if location is not None:
3830
mergeable = bundle.read_mergeable_from_url(location,
3831
possible_transports=possible_transports)
3832
except errors.NotABundle:
3654
pb = ui.ui_factory.nested_progress_bar()
3655
cleanups.append(pb.finished)
3657
cleanups.append(tree.unlock)
3658
if location is not None:
3660
mergeable = bundle.read_mergeable_from_url(location,
3661
possible_transports=possible_transports)
3662
except errors.NotABundle:
3666
raise errors.BzrCommandError('Cannot use --uncommitted'
3667
' with bundles or merge directives.')
3669
if revision is not None:
3670
raise errors.BzrCommandError(
3671
'Cannot use -r with merge directives or bundles')
3672
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3675
if merger is None and uncommitted:
3676
if revision is not None and len(revision) > 0:
3677
raise errors.BzrCommandError('Cannot use --uncommitted and'
3678
' --revision at the same time.')
3679
merger = self.get_merger_from_uncommitted(tree, location, pb,
3681
allow_pending = False
3684
merger, allow_pending = self._get_merger_from_branch(tree,
3685
location, revision, remember, possible_transports, pb)
3687
merger.merge_type = merge_type
3688
merger.reprocess = reprocess
3689
merger.show_base = show_base
3690
self.sanity_check_merger(merger)
3691
if (merger.base_rev_id == merger.other_rev_id and
3692
merger.other_rev_id is not None):
3693
note('Nothing to do.')
3696
if merger.interesting_files is not None:
3697
raise errors.BzrCommandError('Cannot pull individual files')
3698
if (merger.base_rev_id == tree.last_revision()):
3699
result = tree.pull(merger.other_branch, False,
3700
merger.other_rev_id)
3701
result.report(self.outf)
3703
merger.check_basis(False)
3705
return self._do_preview(merger)
3836
raise errors.BzrCommandError('Cannot use --uncommitted'
3837
' with bundles or merge directives.')
3839
if revision is not None:
3840
raise errors.BzrCommandError(
3841
'Cannot use -r with merge directives or bundles')
3842
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3845
if merger is None and uncommitted:
3846
if revision is not None and len(revision) > 0:
3847
raise errors.BzrCommandError('Cannot use --uncommitted and'
3848
' --revision at the same time.')
3849
merger = self.get_merger_from_uncommitted(tree, location, None)
3850
allow_pending = False
3853
merger, allow_pending = self._get_merger_from_branch(tree,
3854
location, revision, remember, possible_transports, None)
3856
merger.merge_type = merge_type
3857
merger.reprocess = reprocess
3858
merger.show_base = show_base
3859
self.sanity_check_merger(merger)
3860
if (merger.base_rev_id == merger.other_rev_id and
3861
merger.other_rev_id is not None):
3862
note('Nothing to do.')
3865
if merger.interesting_files is not None:
3866
raise errors.BzrCommandError('Cannot pull individual files')
3867
if (merger.base_rev_id == tree.last_revision()):
3868
result = tree.pull(merger.other_branch, False,
3869
merger.other_rev_id)
3870
result.report(self.outf)
3872
if merger.this_basis is None:
3873
raise errors.BzrCommandError(
3874
"This branch has no commits."
3875
" (perhaps you would prefer 'bzr pull')")
3877
return self._do_preview(merger)
3879
return self._do_interactive(merger)
3881
return self._do_merge(merger, change_reporter, allow_pending,
3884
def _get_preview(self, merger):
3707
return self._do_merge(merger, change_reporter, allow_pending,
3710
for cleanup in reversed(cleanups):
3713
def _do_preview(self, merger):
3714
from bzrlib.diff import show_diff_trees
3885
3715
tree_merger = merger.make_merger()
3886
3716
tt = tree_merger.make_preview_transform()
3887
self.add_cleanup(tt.finalize)
3888
result_tree = tt.get_preview_tree()
3891
def _do_preview(self, merger):
3892
from bzrlib.diff import show_diff_trees
3893
result_tree = self._get_preview(merger)
3894
path_encoding = osutils.get_diff_header_encoding()
3895
show_diff_trees(merger.this_tree, result_tree, self.outf,
3896
old_label='', new_label='',
3897
path_encoding=path_encoding)
3718
result_tree = tt.get_preview_tree()
3719
show_diff_trees(merger.this_tree, result_tree, self.outf,
3720
old_label='', new_label='')
3899
3724
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3900
3725
merger.change_reporter = change_reporter
4085
3894
def run(self, file_list=None, merge_type=None, show_base=False,
4086
3895
reprocess=False):
4087
from bzrlib.conflicts import restore
4088
3896
if merge_type is None:
4089
3897
merge_type = _mod_merge.Merge3Merger
4090
3898
tree, file_list = tree_files(file_list)
4091
self.add_cleanup(tree.lock_write().unlock)
4092
parents = tree.get_parent_ids()
4093
if len(parents) != 2:
4094
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4095
" merges. Not cherrypicking or"
4097
repository = tree.branch.repository
4098
interesting_ids = None
4100
conflicts = tree.conflicts()
4101
if file_list is not None:
4102
interesting_ids = set()
4103
for filename in file_list:
4104
file_id = tree.path2id(filename)
4106
raise errors.NotVersionedError(filename)
4107
interesting_ids.add(file_id)
4108
if tree.kind(file_id) != "directory":
3901
parents = tree.get_parent_ids()
3902
if len(parents) != 2:
3903
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3904
" merges. Not cherrypicking or"
3906
repository = tree.branch.repository
3907
interesting_ids = None
3909
conflicts = tree.conflicts()
3910
if file_list is not None:
3911
interesting_ids = set()
3912
for filename in file_list:
3913
file_id = tree.path2id(filename)
3915
raise errors.NotVersionedError(filename)
3916
interesting_ids.add(file_id)
3917
if tree.kind(file_id) != "directory":
4111
for name, ie in tree.inventory.iter_entries(file_id):
4112
interesting_ids.add(ie.file_id)
4113
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4115
# Remerge only supports resolving contents conflicts
4116
allowed_conflicts = ('text conflict', 'contents conflict')
4117
restore_files = [c.path for c in conflicts
4118
if c.typestring in allowed_conflicts]
4119
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4120
tree.set_conflicts(ConflictList(new_conflicts))
4121
if file_list is not None:
4122
restore_files = file_list
4123
for filename in restore_files:
3920
for name, ie in tree.inventory.iter_entries(file_id):
3921
interesting_ids.add(ie.file_id)
3922
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3924
# Remerge only supports resolving contents conflicts
3925
allowed_conflicts = ('text conflict', 'contents conflict')
3926
restore_files = [c.path for c in conflicts
3927
if c.typestring in allowed_conflicts]
3928
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3929
tree.set_conflicts(ConflictList(new_conflicts))
3930
if file_list is not None:
3931
restore_files = file_list
3932
for filename in restore_files:
3934
restore(tree.abspath(filename))
3935
except errors.NotConflicted:
3937
# Disable pending merges, because the file texts we are remerging
3938
# have not had those merges performed. If we use the wrong parents
3939
# list, we imply that the working tree text has seen and rejected
3940
# all the changes from the other tree, when in fact those changes
3941
# have not yet been seen.
3942
pb = ui.ui_factory.nested_progress_bar()
3943
tree.set_parent_ids(parents[:1])
4125
restore(tree.abspath(filename))
4126
except errors.NotConflicted:
4128
# Disable pending merges, because the file texts we are remerging
4129
# have not had those merges performed. If we use the wrong parents
4130
# list, we imply that the working tree text has seen and rejected
4131
# all the changes from the other tree, when in fact those changes
4132
# have not yet been seen.
4133
tree.set_parent_ids(parents[:1])
4135
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4136
merger.interesting_ids = interesting_ids
4137
merger.merge_type = merge_type
4138
merger.show_base = show_base
4139
merger.reprocess = reprocess
4140
conflicts = merger.do_merge()
3945
merger = _mod_merge.Merger.from_revision_ids(pb,
3947
merger.interesting_ids = interesting_ids
3948
merger.merge_type = merge_type
3949
merger.show_base = show_base
3950
merger.reprocess = reprocess
3951
conflicts = merger.do_merge()
3953
tree.set_parent_ids(parents)
4142
tree.set_parent_ids(parents)
4143
3957
if conflicts > 0:
4167
3981
name. If you name a directory, all the contents of that directory will be
4170
If you have newly added files since the target revision, they will be
4171
removed. If the files to be removed have been changed, backups will be
4172
created as above. Directories containing unknown files will not be
3984
Any files that have been newly added since that revision will be deleted,
3985
with a backup kept if appropriate. Directories containing unknown files
3986
will not be deleted.
4175
The working tree contains a list of revisions that have been merged but
4176
not yet committed. These revisions will be included as additional parents
4177
of the next commit. Normally, using revert clears that list as well as
4178
reverting the files. If any files are specified, revert leaves the list
4179
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4180
.`` in the tree root to revert all files but keep the recorded merges,
4181
and ``bzr revert --forget-merges`` to clear the pending merge list without
3988
The working tree contains a list of pending merged revisions, which will
3989
be included as parents in the next commit. Normally, revert clears that
3990
list as well as reverting the files. If any files are specified, revert
3991
leaves the pending merge list alone and reverts only the files. Use "bzr
3992
revert ." in the tree root to revert all files but keep the merge record,
3993
and "bzr revert --forget-merges" to clear the pending merge list without
4182
3994
reverting any files.
4184
Using "bzr revert --forget-merges", it is possible to apply all of the
4185
changes from a branch in a single revision. To do this, perform the merge
4186
as desired. Then doing revert with the "--forget-merges" option will keep
4187
the content of the tree as it was, but it will clear the list of pending
4188
merges. The next commit will then contain all of the changes that are
4189
present in the other branch, but without any other parent revisions.
4190
Because this technique forgets where these changes originated, it may
4191
cause additional conflicts on later merges involving the same source and
4195
3997
_see_also = ['cat', 'export']
4204
4006
def run(self, revision=None, no_backup=False, file_list=None,
4205
4007
forget_merges=None):
4206
4008
tree, file_list = tree_files(file_list)
4207
self.add_cleanup(tree.lock_tree_write().unlock)
4209
tree.set_parent_ids(tree.get_parent_ids()[:1])
4211
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4012
tree.set_parent_ids(tree.get_parent_ids()[:1])
4014
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4214
4019
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4215
4020
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4216
tree.revert(file_list, rev_tree, not no_backup, None,
4217
report_changes=True)
4021
pb = ui.ui_factory.nested_progress_bar()
4023
tree.revert(file_list, rev_tree, not no_backup, pb,
4024
report_changes=True)
4220
4029
class cmd_assert_fail(Command):
4221
__doc__ = """Test reporting of assertion failures"""
4030
"""Test reporting of assertion failures"""
4222
4031
# intended just for use in testing
4375
4174
_get_revision_range(revision,
4376
4175
remote_branch, self.name()))
4378
local_extra, remote_extra = find_unmerged(
4379
local_branch, remote_branch, restrict,
4380
backward=not reverse,
4381
include_merges=include_merges,
4382
local_revid_range=local_revid_range,
4383
remote_revid_range=remote_revid_range)
4385
if log_format is None:
4386
registry = log.log_formatter_registry
4387
log_format = registry.get_default(local_branch)
4388
lf = log_format(to_file=self.outf,
4390
show_timezone='original')
4393
if local_extra and not theirs_only:
4394
message("You have %d extra revision(s):\n" %
4396
for revision in iter_log_revisions(local_extra,
4397
local_branch.repository,
4399
lf.log_revision(revision)
4400
printed_local = True
4403
printed_local = False
4405
if remote_extra and not mine_only:
4406
if printed_local is True:
4408
message("You are missing %d revision(s):\n" %
4410
for revision in iter_log_revisions(remote_extra,
4411
remote_branch.repository,
4413
lf.log_revision(revision)
4416
if mine_only and not local_extra:
4417
# We checked local, and found nothing extra
4418
message('This branch is up to date.\n')
4419
elif theirs_only and not remote_extra:
4420
# We checked remote, and found nothing extra
4421
message('Other branch is up to date.\n')
4422
elif not (mine_only or theirs_only or local_extra or
4424
# We checked both branches, and neither one had extra
4426
message("Branches are up to date.\n")
4177
local_branch.lock_read()
4179
remote_branch.lock_read()
4181
local_extra, remote_extra = find_unmerged(
4182
local_branch, remote_branch, restrict,
4183
backward=not reverse,
4184
include_merges=include_merges,
4185
local_revid_range=local_revid_range,
4186
remote_revid_range=remote_revid_range)
4188
if log_format is None:
4189
registry = log.log_formatter_registry
4190
log_format = registry.get_default(local_branch)
4191
lf = log_format(to_file=self.outf,
4193
show_timezone='original')
4196
if local_extra and not theirs_only:
4197
message("You have %d extra revision(s):\n" %
4199
for revision in iter_log_revisions(local_extra,
4200
local_branch.repository,
4202
lf.log_revision(revision)
4203
printed_local = True
4206
printed_local = False
4208
if remote_extra and not mine_only:
4209
if printed_local is True:
4211
message("You are missing %d revision(s):\n" %
4213
for revision in iter_log_revisions(remote_extra,
4214
remote_branch.repository,
4216
lf.log_revision(revision)
4219
if mine_only and not local_extra:
4220
# We checked local, and found nothing extra
4221
message('This branch is up to date.\n')
4222
elif theirs_only and not remote_extra:
4223
# We checked remote, and found nothing extra
4224
message('Other branch is up to date.\n')
4225
elif not (mine_only or theirs_only or local_extra or
4227
# We checked both branches, and neither one had extra
4229
message("Branches are up to date.\n")
4231
remote_branch.unlock()
4233
local_branch.unlock()
4428
4234
if not status_code and parent is None and other_branch is not None:
4429
self.add_cleanup(local_branch.lock_write().unlock)
4430
# handle race conditions - a parent might be set while we run.
4431
if local_branch.get_parent() is None:
4432
local_branch.set_parent(remote_branch.base)
4235
local_branch.lock_write()
4237
# handle race conditions - a parent might be set while we run.
4238
if local_branch.get_parent() is None:
4239
local_branch.set_parent(remote_branch.base)
4241
local_branch.unlock()
4433
4242
return status_code
4436
4245
class cmd_pack(Command):
4437
__doc__ = """Compress the data within a repository.
4439
This operation compresses the data within a bazaar repository. As
4440
bazaar supports automatic packing of repository, this operation is
4441
normally not required to be done manually.
4443
During the pack operation, bazaar takes a backup of existing repository
4444
data, i.e. pack files. This backup is eventually removed by bazaar
4445
automatically when it is safe to do so. To save disk space by removing
4446
the backed up pack files, the --clean-obsolete-packs option may be
4449
Warning: If you use --clean-obsolete-packs and your machine crashes
4450
during or immediately after repacking, you may be left with a state
4451
where the deletion has been written to disk but the new packs have not
4452
been. In this case the repository may be unusable.
4246
"""Compress the data within a repository."""
4455
4248
_see_also = ['repositories']
4456
4249
takes_args = ['branch_or_repo?']
4458
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4461
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4251
def run(self, branch_or_repo='.'):
4462
4252
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4464
4254
branch = dir.open_branch()
4465
4255
repository = branch.repository
4466
4256
except errors.NotBranchError:
4467
4257
repository = dir.open_repository()
4468
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4471
4261
class cmd_plugins(Command):
4472
__doc__ = """List the installed plugins.
4262
"""List the installed plugins.
4474
4264
This command displays the list of installed plugins including
4475
4265
version of plugin and a short description of each.
4562
4355
Option('long', help='Show commit date in annotations.'),
4567
4359
encoding_type = 'exact'
4569
4361
@display_command
4570
4362
def run(self, filename, all=False, long=False, revision=None,
4571
show_ids=False, directory=None):
4572
4364
from bzrlib.annotate import annotate_file, annotate_file_tree
4573
4365
wt, branch, relpath = \
4574
_open_directory_or_containing_tree_or_branch(filename, directory)
4576
self.add_cleanup(wt.lock_read().unlock)
4578
self.add_cleanup(branch.lock_read().unlock)
4579
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4580
self.add_cleanup(tree.lock_read().unlock)
4582
file_id = wt.path2id(relpath)
4584
file_id = tree.path2id(relpath)
4586
raise errors.NotVersionedError(filename)
4587
file_version = tree.inventory[file_id].revision
4588
if wt is not None and revision is None:
4589
# If there is a tree and we're not annotating historical
4590
# versions, annotate the working tree's content.
4591
annotate_file_tree(wt, file_id, self.outf, long, all,
4594
annotate_file(branch, file_version, file_id, long, all, self.outf,
4366
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4372
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4374
file_id = wt.path2id(relpath)
4376
file_id = tree.path2id(relpath)
4378
raise errors.NotVersionedError(filename)
4379
file_version = tree.inventory[file_id].revision
4380
if wt is not None and revision is None:
4381
# If there is a tree and we're not annotating historical
4382
# versions, annotate the working tree's content.
4383
annotate_file_tree(wt, file_id, self.outf, long, all,
4386
annotate_file(branch, file_version, file_id, long, all, self.outf,
4598
4395
class cmd_re_sign(Command):
4599
__doc__ = """Create a digital signature for an existing revision."""
4396
"""Create a digital signature for an existing revision."""
4600
4397
# TODO be able to replace existing ones.
4602
4399
hidden = True # is this right ?
4603
4400
takes_args = ['revision_id*']
4604
takes_options = ['directory', 'revision']
4401
takes_options = ['revision']
4606
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4403
def run(self, revision_id_list=None, revision=None):
4607
4404
if revision_id_list is not None and revision is not None:
4608
4405
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4609
4406
if revision_id_list is None and revision is None:
4610
4407
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4611
b = WorkingTree.open_containing(directory)[0].branch
4612
self.add_cleanup(b.lock_write().unlock)
4613
return self._run(b, revision_id_list, revision)
4408
b = WorkingTree.open_containing(u'.')[0].branch
4411
return self._run(b, revision_id_list, revision)
4615
4415
def _run(self, b, revision_id_list, revision):
4616
4416
import bzrlib.gpg as gpg
4806
4609
end_revision=last_revno)
4809
self.outf.write('Dry-run, pretending to remove'
4810
' the above revisions.\n')
4612
print 'Dry-run, pretending to remove the above revisions.'
4614
val = raw_input('Press <enter> to continue')
4812
self.outf.write('The above revision(s) will be removed.\n')
4815
if not ui.ui_factory.get_boolean('Are you sure'):
4816
self.outf.write('Canceled')
4616
print 'The above revision(s) will be removed.'
4618
val = raw_input('Are you sure [y/N]? ')
4619
if val.lower() not in ('y', 'yes'):
4819
4623
mutter('Uncommitting from {%s} to {%s}',
4820
4624
last_rev_id, rev_id)
4821
4625
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4822
4626
revno=revno, local=local)
4823
self.outf.write('You can restore the old tip by running:\n'
4824
' bzr pull . -r revid:%s\n' % last_rev_id)
4627
note('You can restore the old tip by running:\n'
4628
' bzr pull . -r revid:%s', last_rev_id)
4827
4631
class cmd_break_lock(Command):
4828
__doc__ = """Break a dead lock on a repository, branch or working directory.
4632
"""Break a dead lock on a repository, branch or working directory.
4830
4634
CAUTION: Locks should only be broken when you are sure that the process
4831
4635
holding the lock has been stopped.
4833
You can get information on what locks are open via the 'bzr info
4834
[location]' command.
4637
You can get information on what locks are open via the 'bzr info' command.
4838
bzr break-lock bzr+ssh://example.com/bzr/foo
4840
4642
takes_args = ['location?']
5114
4911
directly from the merge directive, without retrieving data from a
5117
`bzr send` creates a compact data set that, when applied using bzr
5118
merge, has the same effect as merging from the source branch.
5120
By default the merge directive is self-contained and can be applied to any
5121
branch containing submit_branch in its ancestory without needing access to
5124
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5125
revisions, but only a structured request to merge from the
5126
public_location. In that case the public_branch is needed and it must be
5127
up-to-date and accessible to the recipient. The public_branch is always
5128
included if known, so that people can check it later.
5130
The submit branch defaults to the parent of the source branch, but can be
5131
overridden. Both submit branch and public branch will be remembered in
5132
branch.conf the first time they are used for a particular branch. The
5133
source branch defaults to that containing the working directory, but can
5134
be changed using --from.
5136
In order to calculate those changes, bzr must analyse the submit branch.
5137
Therefore it is most efficient for the submit branch to be a local mirror.
5138
If a public location is known for the submit_branch, that location is used
5139
in the merge directive.
5141
The default behaviour is to send the merge directive by mail, unless -o is
5142
given, in which case it is sent to a file.
4914
If --no-bundle is specified, then public_branch is needed (and must be
4915
up-to-date), so that the receiver can perform the merge using the
4916
public_branch. The public_branch is always included if known, so that
4917
people can check it later.
4919
The submit branch defaults to the parent, but can be overridden. Both
4920
submit branch and public branch will be remembered if supplied.
4922
If a public_branch is known for the submit_branch, that public submit
4923
branch is used in the merge instructions. This means that a local mirror
4924
can be used as your actual submit branch, once you have set public_branch
5144
4927
Mail is sent using your preferred mail program. This should be transparent
5145
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4928
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5146
4929
If the preferred client can't be found (or used), your editor will be used.
5148
4931
To use a specific mail program, set the mail_client configuration option.
5149
4932
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5150
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5151
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5152
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4933
specific clients are "claws", "evolution", "kmail", "mutt", and
4934
"thunderbird"; generic options are "default", "editor", "emacsclient",
4935
"mapi", and "xdg-email". Plugins may also add supported clients.
5155
4937
If mail is being sent, a to address is required. This can be supplied
5156
4938
either on the commandline, by setting the submit_to configuration
5307
5085
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5308
5086
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5310
If no tag name is specified it will be determined through the
5311
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5312
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5316
5089
_see_also = ['commit', 'tags']
5317
takes_args = ['tag_name?']
5090
takes_args = ['tag_name']
5318
5091
takes_options = [
5319
5092
Option('delete',
5320
5093
help='Delete this tag rather than placing it.',
5322
custom_help('directory',
5323
help='Branch in which to place the tag.'),
5096
help='Branch in which to place the tag.',
5324
5100
Option('force',
5325
5101
help='Replace existing tags.',
5330
def run(self, tag_name=None,
5106
def run(self, tag_name,
5336
5112
branch, relpath = Branch.open_containing(directory)
5337
self.add_cleanup(branch.lock_write().unlock)
5339
if tag_name is None:
5340
raise errors.BzrCommandError("No tag specified to delete.")
5341
branch.tags.delete_tag(tag_name)
5342
self.outf.write('Deleted tag %s.\n' % tag_name)
5345
if len(revision) != 1:
5346
raise errors.BzrCommandError(
5347
"Tags can only be placed on a single revision, "
5349
revision_id = revision[0].as_revision_id(branch)
5116
branch.tags.delete_tag(tag_name)
5117
self.outf.write('Deleted tag %s.\n' % tag_name)
5351
revision_id = branch.last_revision()
5352
if tag_name is None:
5353
tag_name = branch.automatic_tag_name(revision_id)
5354
if tag_name is None:
5355
raise errors.BzrCommandError(
5356
"Please specify a tag name.")
5357
if (not force) and branch.tags.has_tag(tag_name):
5358
raise errors.TagAlreadyExists(tag_name)
5359
branch.tags.set_tag(tag_name, revision_id)
5360
self.outf.write('Created tag %s.\n' % tag_name)
5120
if len(revision) != 1:
5121
raise errors.BzrCommandError(
5122
"Tags can only be placed on a single revision, "
5124
revision_id = revision[0].as_revision_id(branch)
5126
revision_id = branch.last_revision()
5127
if (not force) and branch.tags.has_tag(tag_name):
5128
raise errors.TagAlreadyExists(tag_name)
5129
branch.tags.set_tag(tag_name, revision_id)
5130
self.outf.write('Created tag %s.\n' % tag_name)
5363
5135
class cmd_tags(Command):
5364
__doc__ = """List tags.
5366
5138
This command shows a table of tag names and the revisions they reference.
5369
5141
_see_also = ['tag']
5370
5142
takes_options = [
5371
custom_help('directory',
5372
help='Branch whose tags should be displayed.'),
5144
help='Branch whose tags should be displayed.',
5373
5148
RegistryOption.from_kwargs('sort',
5374
5149
'Sort tags by different criteria.', title='Sorting',
5375
5150
alpha='Sort tags lexicographically (default).',
5395
self.add_cleanup(branch.lock_read().unlock)
5397
graph = branch.repository.get_graph()
5398
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5399
revid1, revid2 = rev1.rev_id, rev2.rev_id
5400
# only show revisions between revid1 and revid2 (inclusive)
5401
tags = [(tag, revid) for tag, revid in tags if
5402
graph.is_between(revid, revid1, revid2)]
5405
elif sort == 'time':
5407
for tag, revid in tags:
5409
revobj = branch.repository.get_revision(revid)
5410
except errors.NoSuchRevision:
5411
timestamp = sys.maxint # place them at the end
5413
timestamp = revobj.timestamp
5414
timestamps[revid] = timestamp
5415
tags.sort(key=lambda x: timestamps[x[1]])
5417
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5418
for index, (tag, revid) in enumerate(tags):
5420
revno = branch.revision_id_to_dotted_revno(revid)
5421
if isinstance(revno, tuple):
5422
revno = '.'.join(map(str, revno))
5423
except errors.NoSuchRevision:
5424
# Bad tag data/merges can lead to tagged revisions
5425
# which are not in this branch. Fail gracefully ...
5427
tags[index] = (tag, revno)
5173
graph = branch.repository.get_graph()
5174
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5175
revid1, revid2 = rev1.rev_id, rev2.rev_id
5176
# only show revisions between revid1 and revid2 (inclusive)
5177
tags = [(tag, revid) for tag, revid in tags if
5178
graph.is_between(revid, revid1, revid2)]
5181
elif sort == 'time':
5183
for tag, revid in tags:
5185
revobj = branch.repository.get_revision(revid)
5186
except errors.NoSuchRevision:
5187
timestamp = sys.maxint # place them at the end
5189
timestamp = revobj.timestamp
5190
timestamps[revid] = timestamp
5191
tags.sort(key=lambda x: timestamps[x[1]])
5193
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5194
for index, (tag, revid) in enumerate(tags):
5196
revno = branch.revision_id_to_dotted_revno(revid)
5197
if isinstance(revno, tuple):
5198
revno = '.'.join(map(str, revno))
5199
except errors.NoSuchRevision:
5200
# Bad tag data/merges can lead to tagged revisions
5201
# which are not in this branch. Fail gracefully ...
5203
tags[index] = (tag, revno)
5429
5206
for tag, revspec in tags:
5430
5207
self.outf.write('%-20s %s\n' % (tag, revspec))
5433
5210
class cmd_reconfigure(Command):
5434
__doc__ = """Reconfigure the type of a bzr directory.
5211
"""Reconfigure the type of a bzr directory.
5436
5213
A target configuration must be specified.
5468
5245
Option('bind-to', help='Branch to bind checkout to.', type=str),
5469
5246
Option('force',
5470
help='Perform reconfiguration even if local changes'
5472
Option('stacked-on',
5473
help='Reconfigure a branch to be stacked on another branch.',
5477
help='Reconfigure a branch to be unstacked. This '
5478
'may require copying substantial data into it.',
5247
help='Perform reconfiguration even if local changes'
5482
def run(self, location=None, target_type=None, bind_to=None, force=False,
5251
def run(self, location=None, target_type=None, bind_to=None, force=False):
5485
5252
directory = bzrdir.BzrDir.open(location)
5486
if stacked_on and unstacked:
5487
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5488
elif stacked_on is not None:
5489
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5491
reconfigure.ReconfigureUnstacked().apply(directory)
5492
# At the moment you can use --stacked-on and a different
5493
# reconfiguration shape at the same time; there seems no good reason
5495
5253
if target_type is None:
5496
if stacked_on or unstacked:
5499
raise errors.BzrCommandError('No target configuration '
5254
raise errors.BzrCommandError('No target configuration specified')
5501
5255
elif target_type == 'branch':
5502
5256
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5503
5257
elif target_type == 'tree':
5540
5294
/path/to/newbranch.
5542
5296
Bound branches use the nickname of its master branch unless it is set
5543
locally, in which case switching will update the local nickname to be
5297
locally, in which case switching will update the the local nickname to be
5544
5298
that of the master.
5547
takes_args = ['to_location?']
5548
takes_options = ['directory',
5550
help='Switch even if local commits will be lost.'),
5552
Option('create-branch', short_name='b',
5553
help='Create the target branch from this one before'
5554
' switching to it.'),
5301
takes_args = ['to_location']
5302
takes_options = [Option('force',
5303
help='Switch even if local commits will be lost.')
5557
def run(self, to_location=None, force=False, create_branch=False,
5558
revision=None, directory=u'.'):
5306
def run(self, to_location, force=False):
5559
5307
from bzrlib import switch
5560
tree_location = directory
5561
revision = _get_one_revision('switch', revision)
5562
5309
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5563
if to_location is None:
5564
if revision is None:
5565
raise errors.BzrCommandError('You must supply either a'
5566
' revision or a location')
5567
to_location = tree_location
5569
5311
branch = control_dir.open_branch()
5570
5312
had_explicit_nick = branch.get_config().has_explicit_nickname()
5571
5313
except errors.NotBranchError:
5573
5314
had_explicit_nick = False
5576
raise errors.BzrCommandError('cannot create branch without'
5578
to_location = directory_service.directories.dereference(
5580
if '/' not in to_location and '\\' not in to_location:
5581
# This path is meant to be relative to the existing branch
5582
this_url = self._get_branch_location(control_dir)
5583
to_location = urlutils.join(this_url, '..', to_location)
5584
to_branch = branch.bzrdir.sprout(to_location,
5585
possible_transports=[branch.bzrdir.root_transport],
5586
source_branch=branch).open_branch()
5589
to_branch = Branch.open(to_location)
5590
except errors.NotBranchError:
5591
this_url = self._get_branch_location(control_dir)
5592
to_branch = Branch.open(
5593
urlutils.join(this_url, '..', to_location))
5594
if revision is not None:
5595
revision = revision.as_revision_id(to_branch)
5596
switch.switch(control_dir, to_branch, force, revision_id=revision)
5316
to_branch = Branch.open(to_location)
5317
except errors.NotBranchError:
5318
this_url = self._get_branch_location(control_dir)
5319
to_branch = Branch.open(
5320
urlutils.join(this_url, '..', to_location))
5321
switch.switch(control_dir, to_branch, force)
5597
5322
if had_explicit_nick:
5598
5323
branch = control_dir.open_branch() #get the new branch!
5599
5324
branch.nick = to_branch.nick
5860
5559
_see_also = ['unshelve']
5862
5561
def run(self, revision=None, all=False, file_list=None, message=None,
5863
writer=None, list=False, destroy=False, directory=u'.'):
5562
writer=None, list=False, destroy=False):
5865
5564
return self.run_for_list()
5866
5565
from bzrlib.shelf_ui import Shelver
5867
5566
if writer is None:
5868
5567
writer = bzrlib.option.diff_writer_registry.get()
5870
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5871
file_list, message, destroy=destroy, directory=directory)
5569
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5570
message, destroy=destroy).run()
5876
5571
except errors.UserAbort:
5879
5574
def run_for_list(self):
5880
5575
tree = WorkingTree.open_containing('.')[0]
5881
self.add_cleanup(tree.lock_read().unlock)
5882
manager = tree.get_shelf_manager()
5883
shelves = manager.active_shelves()
5884
if len(shelves) == 0:
5885
note('No shelved changes.')
5887
for shelf_id in reversed(shelves):
5888
message = manager.get_metadata(shelf_id).get('message')
5890
message = '<no message>'
5891
self.outf.write('%3d: %s\n' % (shelf_id, message))
5578
manager = tree.get_shelf_manager()
5579
shelves = manager.active_shelves()
5580
if len(shelves) == 0:
5581
note('No shelved changes.')
5583
for shelf_id in reversed(shelves):
5584
message = manager.get_metadata(shelf_id).get('message')
5586
message = '<no message>'
5587
self.outf.write('%3d: %s\n' % (shelf_id, message))
5895
5593
class cmd_unshelve(Command):
5896
__doc__ = """Restore shelved changes.
5594
"""Restore shelved changes.
5898
5596
By default, the most recently shelved changes are restored. However if you
5899
5597
specify a shelf by id those changes will be restored instead. This works
5903
5601
takes_args = ['shelf_id?']
5904
5602
takes_options = [
5906
5603
RegistryOption.from_kwargs(
5907
5604
'action', help="The action to perform.",
5908
5605
enum_switch=False, value_switches=True,
5909
5606
apply="Apply changes and remove from the shelf.",
5910
5607
dry_run="Show changes, but do not apply or remove them.",
5911
preview="Instead of unshelving the changes, show the diff that "
5912
"would result from unshelving.",
5913
delete_only="Delete changes without applying them.",
5914
keep="Apply changes but don't delete them.",
5608
delete_only="Delete changes without applying them."
5917
5611
_see_also = ['shelve']
5919
def run(self, shelf_id=None, action='apply', directory=u'.'):
5613
def run(self, shelf_id=None, action='apply'):
5920
5614
from bzrlib.shelf_ui import Unshelver
5921
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5925
unshelver.tree.unlock()
5615
Unshelver.from_args(shelf_id, action).run()
5928
5618
class cmd_clean_tree(Command):
5929
__doc__ = """Remove unwanted files from working tree.
5619
"""Remove unwanted files from working tree.
5931
5621
By default, only unknown files, not ignored files, are deleted. Versioned
5932
5622
files are never deleted.
5950
5639
' deleting them.'),
5951
5640
Option('force', help='Do not prompt before deleting.')]
5952
5641
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5953
force=False, directory=u'.'):
5954
5643
from bzrlib.clean_tree import clean_tree
5955
5644
if not (unknown or ignored or detritus):
5959
clean_tree(directory, unknown=unknown, ignored=ignored,
5960
detritus=detritus, dry_run=dry_run, no_prompt=force)
5648
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5649
dry_run=dry_run, no_prompt=force)
5963
5652
class cmd_reference(Command):
5964
__doc__ = """list, view and set branch locations for nested trees.
5653
"""list, view and set branch locations for nested trees.
5966
5655
If no arguments are provided, lists the branch locations for nested trees.
5967
5656
If one argument is provided, display the branch location for that tree.
6007
5696
self.outf.write('%s %s\n' % (path, location))
6010
def _register_lazy_builtins():
6011
# register lazy builtins from other modules; called at startup and should
6012
# be only called once.
6013
for (name, aliases, module_name) in [
6014
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6015
('cmd_dpush', [], 'bzrlib.foreign'),
6016
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6017
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6018
('cmd_conflicts', [], 'bzrlib.conflicts'),
6019
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6021
builtin_command_registry.register_lazy(name, aliases, module_name)
5699
# these get imported and then picked up by the scan for cmd_*
5700
# TODO: Some more consistent way to split command definitions across files;
5701
# we do need to load at least some information about them to know of
5702
# aliases. ideally we would avoid loading the implementation until the
5703
# details were needed.
5704
from bzrlib.cmd_version_info import cmd_version_info
5705
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5706
from bzrlib.bundle.commands import (
5709
from bzrlib.foreign import cmd_dpush
5710
from bzrlib.sign_my_commits import cmd_sign_my_commits
5711
from bzrlib.weave_commands import cmd_versionedfile_list, \
5712
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
