322
362
' --revision or a revision_id')
323
363
b = WorkingTree.open_containing(u'.')[0].branch
325
# TODO: jam 20060112 should cat-revision always output utf-8?
326
if revision_id is not None:
327
revision_id = osutils.safe_revision_id(revision_id, warn=False)
329
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
330
except errors.NoSuchRevision:
331
msg = "The repository %s contains no revision %s." % (b.repository.base,
333
raise errors.BzrCommandError(msg)
334
elif revision is not None:
337
raise errors.BzrCommandError('You cannot specify a NULL'
339
rev_id = rev.as_revision_id(b)
340
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
370
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
343
392
class cmd_dump_btree(Command):
344
"""Dump the contents of a btree index file to stdout.
393
__doc__ = """Dump the contents of a btree index file to stdout.
346
395
PATH is a btree index file, it can be any URL. This includes things like
347
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
423
479
To re-create the working tree, use "bzr checkout".
425
481
_see_also = ['checkout', 'working-trees']
426
takes_args = ['location?']
482
takes_args = ['location*']
427
483
takes_options = [
429
485
help='Remove the working tree even if it has '
430
486
'uncommitted changes.'),
433
def run(self, location='.', force=False):
434
d = bzrdir.BzrDir.open(location)
437
working = d.open_workingtree()
438
except errors.NoWorkingTree:
439
raise errors.BzrCommandError("No working tree to remove")
440
except errors.NotLocalUrl:
441
raise errors.BzrCommandError("You cannot remove the working tree of a "
444
changes = working.changes_from(working.basis_tree())
445
if changes.has_changed():
446
raise errors.UncommittedChanges(working)
448
working_path = working.bzrdir.root_transport.base
449
branch_path = working.branch.bzrdir.root_transport.base
450
if working_path != branch_path:
451
raise errors.BzrCommandError("You cannot remove the working tree from "
452
"a lightweight checkout")
454
d.destroy_workingtree()
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
457
514
class cmd_revno(Command):
458
"""Show current revision number.
515
__doc__ = """Show current revision number.
460
517
This is equal to the number of revisions on this branch.
463
520
_see_also = ['info']
464
521
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
467
def run(self, location=u'.'):
468
self.outf.write(str(Branch.open_containing(location)[0].revno()))
469
self.outf.write('\n')
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
547
self.outf.write(str(revno) + '\n')
472
550
class cmd_revision_info(Command):
473
"""Show revision number and revision id for a given revision identifier.
551
__doc__ = """Show revision number and revision id for a given revision identifier.
476
554
takes_args = ['revision_info*']
563
Option('tree', help='Show revno of working tree'),
488
def run(self, revision=None, directory=u'.', revision_info_list=[]):
567
def run(self, revision=None, directory=u'.', tree=False,
568
revision_info_list=[]):
571
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
491
581
if revision is not None:
492
revs.extend(revision)
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
493
583
if revision_info_list is not None:
494
for rev in revision_info_list:
495
revs.append(RevisionSpec.from_string(rev))
497
b = Branch.open_containing(directory)[0]
500
revs.append(RevisionSpec.from_string('-1'))
503
revision_id = rev.as_revision_id(b)
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
594
revision_ids.append(b.last_revision())
598
for revision_id in revision_ids:
505
revno = '%4d' % (b.revision_id_to_revno(revision_id))
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
506
602
except errors.NoSuchRevision:
507
dotted_map = b.get_revision_id_to_revno_map()
508
revno = '.'.join(str(i) for i in dotted_map[revision_id])
509
print '%s %s' % (revno, revision_id)
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
512
612
class cmd_add(Command):
513
"""Add specified files or directories.
613
__doc__ = """Add specified files or directories.
515
615
In non-recursive mode, all the named items are added, regardless
516
616
of whether they were previously ignored. A warning is given if
581
684
base_tree.lock_read()
583
file_list = self._maybe_expand_globs(file_list)
584
tree, file_list = tree_files_for_add(file_list)
585
added, ignored = tree.smart_add(file_list, not
586
no_recurse, action=action, save=not dry_run)
588
if base_tree is not None:
685
self.add_cleanup(base_tree.unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
590
690
if len(ignored) > 0:
592
692
for glob in sorted(ignored.keys()):
593
693
for path in ignored[glob]:
594
694
self.outf.write("ignored %s matching \"%s\"\n"
598
for glob, paths in ignored.items():
599
match_len += len(paths)
600
self.outf.write("ignored %d file(s).\n" % match_len)
601
self.outf.write("If you wish to add some of these files,"
602
" please add them by name.\n")
605
698
class cmd_mkdir(Command):
606
"""Create a new versioned directory.
699
__doc__ = """Create a new versioned directory.
608
701
This is equivalent to creating the directory and then adding it.
663
761
revision = _get_one_revision('inventory', revision)
664
762
work_tree, file_list = tree_files(file_list)
665
763
work_tree.lock_read()
667
if revision is not None:
668
tree = revision.as_tree(work_tree.branch)
670
extra_trees = [work_tree]
676
if file_list is not None:
677
file_ids = tree.paths2ids(file_list, trees=extra_trees,
678
require_versioned=True)
679
# find_ids_across_trees may include some paths that don't
681
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
682
for file_id in file_ids if file_id in tree)
684
entries = tree.inventory.entries()
687
if tree is not work_tree:
764
self.add_cleanup(work_tree.unlock)
765
if revision is not None:
766
tree = revision.as_tree(work_tree.branch)
768
extra_trees = [work_tree]
770
self.add_cleanup(tree.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()
690
786
for path, entry in entries:
691
787
if kind and kind != entry.kind:
721
817
takes_args = ['names*']
722
818
takes_options = [Option("after", help="Move only the bzr identifier"
723
819
" of the file, because the file has already been moved."),
820
Option('auto', help='Automatically guess renames.'),
821
Option('dry-run', help='Avoid making changes when guessing renames.'),
725
823
aliases = ['move', 'rename']
726
824
encoding_type = 'replace'
728
def run(self, names_list, after=False):
826
def run(self, names_list, after=False, auto=False, dry_run=False):
828
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
729
831
if names_list is None:
732
833
if len(names_list) < 2:
733
834
raise errors.BzrCommandError("missing file argument")
734
835
tree, rel_names = tree_files(names_list, canonicalize=False)
737
self._run(tree, names_list, rel_names, after)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
840
def run_auto(self, names_list, after, dry_run):
841
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
741
852
def _run(self, tree, names_list, rel_names, after):
742
853
into_existing = osutils.isdir(names_list[-1])
814
926
dest = osutils.pathjoin(dest_parent, dest_tail)
815
927
mutter("attempting to move %s => %s", src, dest)
816
928
tree.rename_one(src, dest, after=after)
817
self.outf.write("%s => %s\n" % (src, dest))
930
self.outf.write("%s => %s\n" % (src, dest))
820
933
class cmd_pull(Command):
821
"""Turn this branch into a mirror of another branch.
934
__doc__ = """Turn this branch into a mirror of another branch.
823
This command only works on branches that have not diverged. Branches are
824
considered diverged if the destination branch's most recent commit is one
825
that has not been merged (directly or indirectly) into the parent.
936
By default, this command only works on branches that have not diverged.
937
Branches are considered diverged if the destination branch's most recent
938
commit is one that has not been merged (directly or indirectly) into the
827
941
If branches have diverged, you can use 'bzr merge' to integrate the changes
828
942
from one into the other. Once one branch has merged, the other should
829
943
be able to pull it again.
831
If you want to forget your local changes and just update your branch to
832
match the remote one, use pull --overwrite.
945
If you want to replace your local changes and just want your branch to
946
match the remote one, use pull --overwrite. This will work even if the two
947
branches have diverged.
834
949
If there is no default location set, the first pull will set it. After
835
950
that, you can omit the location to use the default. To change the
909
1038
if revision is not None:
910
1039
revision_id = revision.as_revision_id(branch_from)
912
branch_to.lock_write()
914
if tree_to is not None:
915
view_info = _get_view_info_for_change_reporter(tree_to)
916
change_reporter = delta._ChangeReporter(
917
unversioned_filter=tree_to.is_ignored, view_info=view_info)
918
result = tree_to.pull(branch_from, overwrite, revision_id,
920
possible_transports=possible_transports)
922
result = branch_to.pull(branch_from, overwrite, revision_id)
1041
if tree_to is not None:
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1043
change_reporter = delta._ChangeReporter(
1044
unversioned_filter=tree_to.is_ignored,
1045
view_info=view_info)
1046
result = tree_to.pull(
1047
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1050
result = branch_to.pull(
1051
branch_from, overwrite, revision_id, local=local)
924
result.report(self.outf)
925
if verbose and result.old_revid != result.new_revid:
926
log.show_branch_change(branch_to, self.outf, result.old_revno,
1053
result.report(self.outf)
1054
if verbose and result.old_revid != result.new_revid:
1055
log.show_branch_change(
1056
branch_to, self.outf, result.old_revno,
932
1060
class cmd_push(Command):
933
"""Update a mirror of this branch.
1061
__doc__ = """Update a mirror of this branch.
935
1063
The target branch will not have its working tree populated because this
936
1064
is both expensive, and is not supported on remote file systems.
986
1117
def run(self, location=None, remember=False, overwrite=False,
987
1118
create_prefix=False, verbose=False, revision=None,
988
1119
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
990
1121
from bzrlib.push import _show_push_branch
992
# Get the source branch and revision_id
993
1123
if directory is None:
995
br_from = Branch.open_containing(directory)[0]
1125
# Get the source branch
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1128
# Get the tip's revision_id
996
1129
revision = _get_one_revision('push', revision)
997
1130
if revision is not None:
998
1131
revision_id = revision.in_history(br_from).rev_id
1000
revision_id = br_from.last_revision()
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1002
1139
# Get the stacked_on branch, if any
1003
1140
if stacked_on is not None:
1004
1141
stacked_on = urlutils.normalize_url(stacked_on)
1055
1192
help='Hard-link working tree files where possible.'),
1056
1193
Option('no-tree',
1057
1194
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1058
1198
Option('stacked',
1059
1199
help='Create a stacked branch referring to the source branch. '
1060
1200
'The new branch will depend on the availability of the source '
1061
1201
'branch for all operations.'),
1062
1202
Option('standalone',
1063
1203
help='Do not use a shared repository, even if available.'),
1204
Option('use-existing-dir',
1205
help='By default branch will fail if the target'
1206
' directory exists, but does not already'
1207
' have a control directory. This flag will'
1208
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1065
1212
aliases = ['get', 'clone']
1067
1214
def run(self, from_location, to_location=None, revision=None,
1068
hardlink=False, stacked=False, standalone=False, no_tree=False):
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1069
1218
from bzrlib.tag import _merge_tags_if_possible
1071
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1073
1221
revision = _get_one_revision('branch', revision)
1074
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1076
if revision is not None:
1077
revision_id = revision.as_revision_id(br_from)
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1079
# FIXME - wt.last_revision, fallback to branch, fall back to
1080
# None or perhaps NULL_REVISION to mean copy nothing
1082
revision_id = br_from.last_revision()
1083
if to_location is None:
1084
to_location = urlutils.derive_to_location(from_location)
1085
to_transport = transport.get_transport(to_location)
1087
to_transport.mkdir('.')
1088
except errors.FileExists:
1089
raise errors.BzrCommandError('Target directory "%s" already'
1090
' exists.' % to_location)
1091
except errors.NoSuchFile:
1092
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1095
# preserve whatever source format we have.
1096
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1097
possible_transports=[to_transport],
1098
accelerator_tree=accelerator_tree,
1099
hardlink=hardlink, stacked=stacked,
1100
force_new_repo=standalone,
1101
create_tree_if_local=not no_tree,
1102
source_branch=br_from)
1103
branch = dir.open_branch()
1104
except errors.NoSuchRevision:
1105
to_transport.delete_tree('.')
1106
msg = "The branch %s has no revision %s." % (from_location,
1108
raise errors.BzrCommandError(msg)
1109
_merge_tags_if_possible(br_from, branch)
1110
# If the source branch is stacked, the new branch may
1111
# be stacked whether we asked for that explicitly or not.
1112
# We therefore need a try/except here and not just 'if stacked:'
1114
note('Created new stacked branch referring to %s.' %
1115
branch.get_stacked_on_url())
1116
except (errors.NotStacked, errors.UnstackableBranchFormat,
1117
errors.UnstackableRepositoryFormat), e:
1118
note('Branched %d revision(s).' % branch.revno())
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1123
1288
class cmd_checkout(Command):
1124
"""Create a new checkout of an existing branch.
1289
__doc__ = """Create a new checkout of an existing branch.
1126
1291
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1127
1292
the branch found in '.'. This is useful if you have removed the working tree
1202
1367
def run(self, dir=u'.'):
1203
1368
tree = WorkingTree.open_containing(dir)[0]
1204
1369
tree.lock_read()
1206
new_inv = tree.inventory
1207
old_tree = tree.basis_tree()
1208
old_tree.lock_read()
1210
old_inv = old_tree.inventory
1212
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1213
for f, paths, c, v, p, n, k, e in iterator:
1214
if paths[0] == paths[1]:
1218
renames.append(paths)
1220
for old_name, new_name in renames:
1221
self.outf.write("%s => %s\n" % (old_name, new_name))
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1383
renames.append(paths)
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1228
1389
class cmd_update(Command):
1229
"""Update a tree to have the latest code committed to its branch.
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1231
1392
This will perform a merge into the working tree, and may generate
1232
1393
conflicts. If you have any local changes, you will still
1235
1396
If you want to discard your local changes, you can just do a
1236
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1239
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1240
1404
takes_args = ['dir?']
1405
takes_options = ['revision']
1241
1406
aliases = ['up']
1243
def run(self, dir='.'):
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1244
1412
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1245
1414
possible_transports = []
1246
master = tree.branch.get_master_branch(
1415
master = branch.get_master_branch(
1247
1416
possible_transports=possible_transports)
1248
1417
if master is not None:
1249
1418
tree.lock_write()
1419
branch_location = master.base
1251
1421
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1253
existing_pending_merges = tree.get_parent_ids()[1:]
1254
last_rev = _mod_revision.ensure_null(tree.last_revision())
1255
if last_rev == _mod_revision.ensure_null(
1256
tree.branch.last_revision()):
1257
# may be up to date, check master too.
1258
if master is None or last_rev == _mod_revision.ensure_null(
1259
master.last_revision()):
1260
revno = tree.branch.revision_id_to_revno(last_rev)
1261
note("Tree is up to date at revision %d." % (revno,))
1263
view_info = _get_view_info_for_change_reporter(tree)
1264
1450
conflicts = tree.update(
1265
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1266
view_info=view_info), possible_transports=possible_transports)
1267
revno = tree.branch.revision_id_to_revno(
1268
_mod_revision.ensure_null(tree.last_revision()))
1269
note('Updated to revision %d.' % (revno,))
1270
if tree.get_parent_ids()[1:] != existing_pending_merges:
1271
note('Your local commits will now show as pending merges with '
1272
"'bzr status', and can be committed with 'bzr commit'.")
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1281
1475
class cmd_info(Command):
1282
"""Show information about a working tree, branch or repository.
1476
__doc__ = """Show information about a working tree, branch or repository.
1284
1478
This command will show all known locations and formats associated to the
1285
1479
tree, branch or repository.
1352
1546
file_list = [f for f in file_list]
1354
1548
tree.lock_write()
1356
# Heuristics should probably all move into tree.remove_smart or
1359
added = tree.changes_from(tree.basis_tree(),
1360
specific_files=file_list).added
1361
file_list = sorted([f[0] for f in added], reverse=True)
1362
if len(file_list) == 0:
1363
raise errors.BzrCommandError('No matching files.')
1364
elif file_list is None:
1365
# missing files show up in iter_changes(basis) as
1366
# versioned-with-no-kind.
1368
for change in tree.iter_changes(tree.basis_tree()):
1369
# Find paths in the working tree that have no kind:
1370
if change[1][1] is not None and change[6][1] is None:
1371
missing.append(change[1][1])
1372
file_list = sorted(missing, reverse=True)
1373
file_deletion_strategy = 'keep'
1374
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1375
keep_files=file_deletion_strategy=='keep',
1376
force=file_deletion_strategy=='force')
1549
self.add_cleanup(tree.unlock)
1550
# Heuristics should probably all move into tree.remove_smart or
1553
added = tree.changes_from(tree.basis_tree(),
1554
specific_files=file_list).added
1555
file_list = sorted([f[0] for f in added], reverse=True)
1556
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1558
elif file_list is None:
1559
# missing files show up in iter_changes(basis) as
1560
# versioned-with-no-kind.
1562
for change in tree.iter_changes(tree.basis_tree()):
1563
# Find paths in the working tree that have no kind:
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1566
file_list = sorted(missing, reverse=True)
1567
file_deletion_strategy = 'keep'
1568
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1381
1573
class cmd_file_id(Command):
1382
"""Print file_id of a particular file or directory.
1574
__doc__ = """Print file_id of a particular file or directory.
1384
1576
The file_id is assigned when the file is first added and remains the
1385
1577
same through all revisions where the file exists, even when it is
1760
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1761
1978
' one or two revision specifiers')
1763
old_tree, new_tree, specific_files, extra_trees = \
1764
_get_trees_to_diff(file_list, revision, old, new,
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1984
(old_tree, new_tree,
1985
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1766
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1767
1989
specific_files=specific_files,
1768
1990
external_diff_options=diff_options,
1769
1991
old_label=old_label, new_label=new_label,
1770
extra_trees=extra_trees, using=using)
1992
extra_trees=extra_trees, using=using,
1773
1996
class cmd_deleted(Command):
1774
"""List files deleted in the working tree.
1997
__doc__ = """List files deleted in the working tree.
1776
1999
# TODO: Show files deleted since a previous revision, or
1777
2000
# between two revisions.
2020
2229
:Tips & tricks:
2022
2231
GUI tools and IDEs are often better at exploring history than command
2023
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2024
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2025
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2027
Web interfaces are often better at exploring history than command line
2028
tools, particularly for branches on servers. You may prefer Loggerhead
2029
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2031
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2035
top = log -r-10.. --short --forward
2036
show = log -v -p -n1 --long
2241
top = log -l10 --line
2038
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2039
2245
will show the last 10 mainline revisions. To see the details of a
2040
2246
particular revision X, ``bzr show -rX``.
2042
As many GUI tools and Web interfaces do, you may prefer viewing
2043
history collapsed initially. If you are interested in looking deeper
2044
into a particular merge X, use ``bzr log -n0 -rX``. If you like
2045
working this way, you may wish to either:
2047
* change your default log format to short (or line)
2048
* add this alias: log = log -n1
2248
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2050
2251
``bzr log -v`` on a branch with lots of history is currently
2051
2252
very slow. A fix for this issue is currently under development.
2147
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2148
2379
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2152
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2153
if log_format is None:
2154
log_format = log.log_formatter_registry.get_default(b)
2156
lf = log_format(show_ids=show_ids, to_file=self.outf,
2157
show_timezone=timezone,
2158
delta_format=get_verbosity_level(),
2165
direction=direction,
2166
start_revision=rev1,
2170
show_diff=show_diff)
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2393
diff_type = 'partial'
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2435
Logger(b, rqst).show(lf)
2175
2438
def _get_revision_range(revisionspec_list, branch, command_name):
2176
2439
"""Take the input of a revision option and turn it into a revision range.
2178
2441
It returns RevisionInfo objects which can be used to obtain the rev_id's
2179
of the desired revisons. It does some user input validations.
2442
of the desired revisions. It does some user input validations.
2181
2444
if revisionspec_list is None:
2311
2583
apply_view = True
2312
2584
view_str = views.view_display_str(view_files)
2313
note("ignoring files outside view: %s" % view_str)
2585
note("Ignoring files outside view. View is %s" % view_str)
2315
2587
tree.lock_read()
2317
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2318
if fp.startswith(relpath):
2319
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2320
if non_recursive and '/' in fp:
2322
if not all and not selection[fc]:
2324
if kind is not None and fkind != kind:
2328
views.check_path_in_view(tree, fp)
2329
except errors.FileOutsideView:
2331
kindch = entry.kind_character()
2332
outstring = fp + kindch
2334
outstring = '%-8s %s' % (fc, outstring)
2335
if show_ids and fid is not None:
2336
outstring = "%-50s %s" % (outstring, fid)
2337
self.outf.write(outstring + '\n')
2339
self.outf.write(fp + '\0')
2342
self.outf.write(fid)
2343
self.outf.write('\0')
2351
self.outf.write('%-50s %s\n' % (outstring, my_id))
2353
self.outf.write(outstring + '\n')
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2594
if kind is not None and fkind != kind:
2599
fullpath = osutils.pathjoin(relpath, fp)
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2608
fp = osutils.pathjoin(prefix, fp)
2609
kindch = entry.kind_character()
2610
outstring = fp + kindch
2611
ui.ui_factory.clear_term()
2613
outstring = '%-8s %s' % (fc, outstring)
2614
if show_ids and fid is not None:
2615
outstring = "%-50s %s" % (outstring, fid)
2616
self.outf.write(outstring + '\n')
2618
self.outf.write(fp + '\0')
2621
self.outf.write(fid)
2622
self.outf.write('\0')
2630
self.outf.write('%-50s %s\n' % (outstring, my_id))
2632
self.outf.write(outstring + '\n')
2358
2635
class cmd_unknowns(Command):
2359
"""List unknown files.
2636
__doc__ = """List unknown files.
2371
2648
class cmd_ignore(Command):
2372
"""Ignore specified files or patterns.
2649
__doc__ = """Ignore specified files or patterns.
2374
2651
See ``bzr help patterns`` for details on the syntax of patterns.
2653
If a .bzrignore file does not exist, the ignore command
2654
will create one and add the specified files or patterns to the newly
2655
created file. The ignore command will also automatically add the
2656
.bzrignore file to be versioned. Creating a .bzrignore file without
2657
the use of the ignore command will require an explicit add command.
2376
2659
To remove patterns from the ignore list, edit the .bzrignore file.
2377
2660
After adding, editing or deleting that file either indirectly by
2378
2661
using this command or directly by using an editor, be sure to commit
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2381
2677
Note: ignore patterns containing shell wildcards must be quoted from
2382
2678
the shell on Unix.
2401
2701
Ignore everything but the "debian" toplevel directory::
2403
2703
bzr ignore "RE:(?!debian/).*"
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2709
bzr ignore "!./local"
2406
2713
_see_also = ['status', 'ignored', 'patterns']
2407
2714
takes_args = ['name_pattern*']
2408
2715
takes_options = [
2409
Option('old-default-rules',
2410
help='Write out the ignore rules bzr < 0.9 always used.')
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2413
def run(self, name_pattern_list=None, old_default_rules=None):
2720
def run(self, name_pattern_list=None, default_rules=None):
2414
2721
from bzrlib import ignores
2415
if old_default_rules is not None:
2416
# dump the rules and exit
2417
for pattern in ignores.OLD_DEFAULTS:
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
2420
2727
if not name_pattern_list:
2421
2728
raise errors.BzrCommandError("ignore requires at least one "
2422
"NAME_PATTERN or --old-default-rules")
2729
"NAME_PATTERN or --default-rules.")
2423
2730
name_pattern_list = [globbing.normalize_pattern(p)
2424
2731
for p in name_pattern_list]
2425
2732
for name_pattern in name_pattern_list:
2632
2942
chunks = content.splitlines(True)
2633
2943
content = filtered_output_bytes(chunks, filters,
2634
2944
ContentFilterContext(relpath, rev_tree))
2635
2946
self.outf.writelines(content)
2637
2949
self.outf.write(content)
2640
2952
class cmd_local_time_offset(Command):
2641
"""Show the offset in seconds from GMT to local time."""
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2643
2955
@display_command
2645
print osutils.local_time_offset()
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2649
2961
class cmd_commit(Command):
2650
"""Commit changes into a new revision.
2652
If no arguments are given, the entire tree is committed.
2654
If selected files are specified, only changes to those files are
2655
committed. If a directory is specified then the directory and everything
2656
within it is committed.
2658
When excludes are given, they take precedence over selected files.
2659
For example, too commit only changes within foo, but not changes within
2662
bzr commit foo -x foo/bar
2664
If author of the change is not the same person as the committer, you can
2665
specify the author's name using the --author option. The name should be
2666
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2667
If there is more than one author of the change you can specify the option
2668
multiple times, once for each author.
2670
A selected-file commit may fail in some cases where the committed
2671
tree would be invalid. Consider::
2676
bzr commit foo -m "committing foo"
2677
bzr mv foo/bar foo/baz
2680
bzr commit foo/bar -m "committing bar but not baz"
2682
In the example above, the last commit will fail by design. This gives
2683
the user the opportunity to decide whether they want to commit the
2684
rename at the same time, separately first, or not at all. (As a general
2685
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2687
Note: A selected-file commit after a merge is not yet supported.
2962
__doc__ = """Commit changes into a new revision.
2964
An explanatory message needs to be given for each commit. This is
2965
often done by using the --message option (getting the message from the
2966
command line) or by using the --file option (getting the message from
2967
a file). If neither of these options is given, an editor is opened for
2968
the user to enter the message. To see the changed files in the
2969
boilerplate text loaded into the editor, use the --show-diff option.
2971
By default, the entire tree is committed and the person doing the
2972
commit is assumed to be the author. These defaults can be overridden
2977
If selected files are specified, only changes to those files are
2978
committed. If a directory is specified then the directory and
2979
everything within it is committed.
2981
When excludes are given, they take precedence over selected files.
2982
For example, to commit only changes within foo, but not changes
2985
bzr commit foo -x foo/bar
2987
A selective commit after a merge is not yet supported.
2991
If the author of the change is not the same person as the committer,
2992
you can specify the author's name using the --author option. The
2993
name should be in the same format as a committer-id, e.g.
2994
"John Doe <jdoe@example.com>". If there is more than one author of
2995
the change you can specify the option multiple times, once for each
3000
A common mistake is to forget to add a new file or directory before
3001
running the commit command. The --strict option checks for unknown
3002
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3008
If you accidentially commit the wrong changes or make a spelling
3009
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3012
Hooks can also be configured to run after a commit. This allows you
3013
to trigger updates to external systems like bug trackers. The --fixes
3014
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2689
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
2789
3145
if local and not tree.branch.get_bound_location():
2790
3146
raise errors.LocalRequiresBoundBranch()
3148
if message is not None:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3161
ui.ui_factory.show_warning(warning_msg)
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
2792
3169
def get_message(commit_obj):
2793
3170
"""Callback to get commit message"""
2794
my_message = message
2795
if my_message is None and not file:
2796
t = make_commit_message_template_encoded(tree,
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
2797
3180
selected_list, diff=show_diff,
2798
3181
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
2799
3187
start_message = generate_commit_message_template(commit_obj)
2800
my_message = edit_commit_message_encoded(t,
3188
my_message = edit_commit_message_encoded(text,
2801
3189
start_message=start_message)
2802
3190
if my_message is None:
2803
3191
raise errors.BzrCommandError("please specify a commit"
2804
3192
" message with either --message or --file")
2805
elif my_message and file:
2806
raise errors.BzrCommandError(
2807
"please specify either --message or --file")
2809
my_message = codecs.open(file, 'rt',
2810
osutils.get_user_encoding()).read()
2811
3193
if my_message == "":
2812
3194
raise errors.BzrCommandError("empty commit message specified")
2813
3195
return my_message
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3198
# but the command line should not do that.
3199
if not selected_list:
3200
selected_list = None
2816
3202
tree.commit(message_callback=get_message,
2817
3203
specific_files=selected_list,
2818
3204
allow_pointless=unchanged, strict=strict, local=local,
2819
3205
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
2821
3208
exclude=safe_relpath_files(tree, exclude))
2822
3209
except PointlessCommit:
2823
# FIXME: This should really happen before the file is read in;
2824
# perhaps prepare the commit; get the message; then actually commit
2825
raise errors.BzrCommandError("no changes to commit."
2826
" use --unchanged to commit anyhow")
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
2827
3212
except ConflictsInTree:
2828
3213
raise errors.BzrCommandError('Conflicts detected in working '
2829
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2847
3233
The working tree and branch checks will only give output if a problem is
2848
3234
detected. The output fields of the repository check are:
2850
revisions: This is just the number of revisions checked. It doesn't
2852
versionedfiles: This is just the number of versionedfiles checked. It
2853
doesn't indicate a problem.
2854
unreferenced ancestors: Texts that are ancestors of other texts, but
2855
are not properly referenced by the revision ancestry. This is a
2856
subtle problem that Bazaar can work around.
2857
unique file texts: This is the total number of unique file contents
2858
seen in the checked revisions. It does not indicate a problem.
2859
repeated file texts: This is the total number of repeated texts seen
2860
in the checked revisions. Texts can be repeated when their file
2861
entries are modified, but the file contents are not. It does not
3237
This is just the number of revisions checked. It doesn't
3241
This is just the number of versionedfiles checked. It
3242
doesn't indicate a problem.
3244
unreferenced ancestors
3245
Texts that are ancestors of other texts, but
3246
are not properly referenced by the revision ancestry. This is a
3247
subtle problem that Bazaar can work around.
3250
This is the total number of unique file contents
3251
seen in the checked revisions. It does not indicate a problem.
3254
This is the total number of repeated texts seen
3255
in the checked revisions. Texts can be repeated when their file
3256
entries are modified, but the file contents are not. It does not
2864
3259
If no restrictions are specified, all Bazaar data that is found at the given
2865
3260
location will be checked.
3214
3610
raise errors.BzrCommandError("subunit not available. subunit "
3215
3611
"needs to be installed to use --subunit.")
3216
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
self.additional_selftest_args.setdefault(
3620
'suite_decorators', []).append(parallel)
3218
3622
test_suite_factory = benchmarks.test_suite
3219
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3220
3624
verbose = not is_quiet()
3221
3625
# TODO: should possibly lock the history file...
3222
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3224
3629
test_suite_factory = None
3225
3630
benchfile = None
3227
selftest_kwargs = {"verbose": verbose,
3229
"stop_on_failure": one,
3230
"transport": transport,
3231
"test_suite_factory": test_suite_factory,
3232
"lsprof_timed": lsprof_timed,
3233
"bench_history": benchfile,
3234
"matching_tests_first": first,
3235
"list_only": list_only,
3236
"random_seed": randomize,
3237
"exclude_pattern": exclude,
3239
"load_list": load_list,
3240
"debug_flags": debugflag,
3241
"starting_with": starting_with
3243
selftest_kwargs.update(self.additional_selftest_args)
3244
result = selftest(**selftest_kwargs)
3246
if benchfile is not None:
3249
note('tests passed')
3251
note('tests failed')
3631
selftest_kwargs = {"verbose": verbose,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3252
3650
return int(not result)
3255
3653
class cmd_version(Command):
3256
"""Show version of bzr."""
3654
__doc__ = """Show version of bzr."""
3258
3656
encoding_type = 'replace'
3259
3657
takes_options = [
3409
3822
verified = 'inapplicable'
3410
3823
tree = WorkingTree.open_containing(directory)[0]
3412
# die as quickly as possible if there are uncommitted changes
3414
3826
basis_tree = tree.revision_tree(tree.last_revision())
3415
3827
except errors.NoSuchRevision:
3416
3828
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3418
changes = tree.changes_from(basis_tree)
3419
if changes.has_changed():
3832
if tree.has_changes():
3420
3833
raise errors.UncommittedChanges(tree)
3422
3835
view_info = _get_view_info_for_change_reporter(tree)
3423
3836
change_reporter = delta._ChangeReporter(
3424
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3427
pb = ui.ui_factory.nested_progress_bar()
3428
cleanups.append(pb.finished)
3430
cleanups.append(tree.unlock)
3431
if location is not None:
3433
mergeable = bundle.read_mergeable_from_url(location,
3434
possible_transports=possible_transports)
3435
except errors.NotABundle:
3439
raise errors.BzrCommandError('Cannot use --uncommitted'
3440
' with bundles or merge directives.')
3442
if revision is not None:
3443
raise errors.BzrCommandError(
3444
'Cannot use -r with merge directives or bundles')
3445
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3448
if merger is None and uncommitted:
3449
if revision is not None and len(revision) > 0:
3450
raise errors.BzrCommandError('Cannot use --uncommitted and'
3451
' --revision at the same time.')
3452
location = self._select_branch_location(tree, location)[0]
3453
other_tree, other_path = WorkingTree.open_containing(location)
3454
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3456
allow_pending = False
3457
if other_path != '':
3458
merger.interesting_files = [other_path]
3461
merger, allow_pending = self._get_merger_from_branch(tree,
3462
location, revision, remember, possible_transports, pb)
3464
merger.merge_type = merge_type
3465
merger.reprocess = reprocess
3466
merger.show_base = show_base
3467
self.sanity_check_merger(merger)
3468
if (merger.base_rev_id == merger.other_rev_id and
3469
merger.other_rev_id is not None):
3470
note('Nothing to do.')
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3473
if merger.interesting_files is not None:
3474
raise errors.BzrCommandError('Cannot pull individual files')
3475
if (merger.base_rev_id == tree.last_revision()):
3476
result = tree.pull(merger.other_branch, False,
3477
merger.other_rev_id)
3478
result.report(self.outf)
3480
merger.check_basis(False)
3482
return self._do_preview(merger)
3484
return self._do_merge(merger, change_reporter, allow_pending,
3487
for cleanup in reversed(cleanups):
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3891
return self._do_preview(merger)
3893
return self._do_interactive(merger)
3895
return self._do_merge(merger, change_reporter, allow_pending,
3898
def _get_preview(self, merger):
3899
tree_merger = merger.make_merger()
3900
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3902
result_tree = tt.get_preview_tree()
3490
3905
def _do_preview(self, merger):
3491
3906
from bzrlib.diff import show_diff_trees
3492
tree_merger = merger.make_merger()
3493
tt = tree_merger.make_preview_transform()
3495
result_tree = tt.get_preview_tree()
3496
show_diff_trees(merger.this_tree, result_tree, self.outf,
3497
old_label='', new_label='')
3907
result_tree = self._get_preview(merger)
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3501
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3502
3912
merger.change_reporter = change_reporter
3655
4097
def run(self, file_list=None, merge_type=None, show_base=False,
3656
4098
reprocess=False):
4099
from bzrlib.conflicts import restore
3657
4100
if merge_type is None:
3658
4101
merge_type = _mod_merge.Merge3Merger
3659
4102
tree, file_list = tree_files(file_list)
3660
4103
tree.lock_write()
3662
parents = tree.get_parent_ids()
3663
if len(parents) != 2:
3664
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3665
" merges. Not cherrypicking or"
3667
repository = tree.branch.repository
3668
interesting_ids = None
3670
conflicts = tree.conflicts()
3671
if file_list is not None:
3672
interesting_ids = set()
3673
for filename in file_list:
3674
file_id = tree.path2id(filename)
3676
raise errors.NotVersionedError(filename)
3677
interesting_ids.add(file_id)
3678
if tree.kind(file_id) != "directory":
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4110
repository = tree.branch.repository
4111
interesting_ids = None
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
3681
for name, ie in tree.inventory.iter_entries(file_id):
3682
interesting_ids.add(ie.file_id)
3683
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3685
# Remerge only supports resolving contents conflicts
3686
allowed_conflicts = ('text conflict', 'contents conflict')
3687
restore_files = [c.path for c in conflicts
3688
if c.typestring in allowed_conflicts]
3689
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3690
tree.set_conflicts(ConflictList(new_conflicts))
3691
if file_list is not None:
3692
restore_files = file_list
3693
for filename in restore_files:
3695
restore(tree.abspath(filename))
3696
except errors.NotConflicted:
3698
# Disable pending merges, because the file texts we are remerging
3699
# have not had those merges performed. If we use the wrong parents
3700
# list, we imply that the working tree text has seen and rejected
3701
# all the changes from the other tree, when in fact those changes
3702
# have not yet been seen.
3703
pb = ui.ui_factory.nested_progress_bar()
3704
tree.set_parent_ids(parents[:1])
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
3706
merger = _mod_merge.Merger.from_revision_ids(pb,
3708
merger.interesting_ids = interesting_ids
3709
merger.merge_type = merge_type
3710
merger.show_base = show_base
3711
merger.reprocess = reprocess
3712
conflicts = merger.do_merge()
3714
tree.set_parent_ids(parents)
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
4155
tree.set_parent_ids(parents)
3718
4156
if conflicts > 0:
3742
4180
name. If you name a directory, all the contents of that directory will be
3745
Any files that have been newly added since that revision will be deleted,
3746
with a backup kept if appropriate. Directories containing unknown files
3747
will not be deleted.
4183
If you have newly added files since the target revision, they will be
4184
removed. If the files to be removed have been changed, backups will be
4185
created as above. Directories containing unknown files will not be
3749
The working tree contains a list of pending merged revisions, which will
3750
be included as parents in the next commit. Normally, revert clears that
3751
list as well as reverting the files. If any files are specified, revert
3752
leaves the pending merge list alone and reverts only the files. Use "bzr
3753
revert ." in the tree root to revert all files but keep the merge record,
3754
and "bzr revert --forget-merges" to clear the pending merge list without
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
3755
4195
reverting any files.
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
3758
4208
_see_also = ['cat', 'export']
3767
4217
def run(self, revision=None, no_backup=False, file_list=None,
3768
4218
forget_merges=None):
3769
4219
tree, file_list = tree_files(file_list)
3773
tree.set_parent_ids(tree.get_parent_ids()[:1])
3775
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4225
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3780
4228
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3781
4229
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
3782
pb = ui.ui_factory.nested_progress_bar()
3784
tree.revert(file_list, rev_tree, not no_backup, pb,
3785
report_changes=True)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
3790
4234
class cmd_assert_fail(Command):
3791
"""Test reporting of assertion failures"""
4235
__doc__ = """Test reporting of assertion failures"""
3792
4236
# intended just for use in testing
3934
4389
_get_revision_range(revision,
3935
4390
remote_branch, self.name()))
3937
local_branch.lock_read()
3939
remote_branch.lock_read()
3941
local_extra, remote_extra = find_unmerged(
3942
local_branch, remote_branch, restrict,
3943
backward=not reverse,
3944
include_merges=include_merges,
3945
local_revid_range=local_revid_range,
3946
remote_revid_range=remote_revid_range)
3948
if log_format is None:
3949
registry = log.log_formatter_registry
3950
log_format = registry.get_default(local_branch)
3951
lf = log_format(to_file=self.outf,
3953
show_timezone='original')
3956
if local_extra and not theirs_only:
3957
message("You have %d extra revision(s):\n" %
3959
for revision in iter_log_revisions(local_extra,
3960
local_branch.repository,
3962
lf.log_revision(revision)
3963
printed_local = True
3966
printed_local = False
3968
if remote_extra and not mine_only:
3969
if printed_local is True:
3971
message("You are missing %d revision(s):\n" %
3973
for revision in iter_log_revisions(remote_extra,
3974
remote_branch.repository,
3976
lf.log_revision(revision)
3979
if mine_only and not local_extra:
3980
# We checked local, and found nothing extra
3981
message('This branch is up to date.\n')
3982
elif theirs_only and not remote_extra:
3983
# We checked remote, and found nothing extra
3984
message('Other branch is up to date.\n')
3985
elif not (mine_only or theirs_only or local_extra or
3987
# We checked both branches, and neither one had extra
3989
message("Branches are up to date.\n")
3991
remote_branch.unlock()
3993
local_branch.unlock()
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4404
show_timezone='original')
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4413
lf.log_revision(revision)
4414
printed_local = True
4417
printed_local = False
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4422
message("You are missing %d revision(s):\n" %
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4427
lf.log_revision(revision)
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4438
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
3994
4442
if not status_code and parent is None and other_branch is not None:
3995
4443
local_branch.lock_write()
3997
# handle race conditions - a parent might be set while we run.
3998
if local_branch.get_parent() is None:
3999
local_branch.set_parent(remote_branch.base)
4001
local_branch.unlock()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
4002
4448
return status_code
4005
4451
class cmd_pack(Command):
4006
"""Compress the data within a repository."""
4452
__doc__ = """Compress the data within a repository.
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4008
4470
_see_also = ['repositories']
4009
4471
takes_args = ['branch_or_repo?']
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4011
def run(self, branch_or_repo='.'):
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4012
4477
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4014
4479
branch = dir.open_branch()
4015
4480
repository = branch.repository
4016
4481
except errors.NotBranchError:
4017
4482
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4021
4486
class cmd_plugins(Command):
4022
"""List the installed plugins.
4487
__doc__ = """List the installed plugins.
4024
4489
This command displays the list of installed plugins including
4025
4490
version of plugin and a short description of each.
4126
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4127
4590
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4130
4594
branch.lock_read()
4132
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4134
file_id = wt.path2id(relpath)
4136
file_id = tree.path2id(relpath)
4138
raise errors.NotVersionedError(filename)
4139
file_version = tree.inventory[file_id].revision
4140
if wt is not None and revision is None:
4141
# If there is a tree and we're not annotating historical
4142
# versions, annotate the working tree's content.
4143
annotate_file_tree(wt, file_id, self.outf, long, all,
4146
annotate_file(branch, file_version, file_id, long, all, self.outf,
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4600
file_id = wt.path2id(relpath)
4602
file_id = tree.path2id(relpath)
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4155
4616
class cmd_re_sign(Command):
4156
"""Create a digital signature for an existing revision."""
4617
__doc__ = """Create a digital signature for an existing revision."""
4157
4618
# TODO be able to replace existing ones.
4159
4620
hidden = True # is this right ?
4369
4827
end_revision=last_revno)
4372
print 'Dry-run, pretending to remove the above revisions.'
4374
val = raw_input('Press <enter> to continue')
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4376
print 'The above revision(s) will be removed.'
4378
val = raw_input('Are you sure [y/N]? ')
4379
if val.lower() not in ('y', 'yes'):
4833
self.outf.write('The above revision(s) will be removed.\n')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4383
4840
mutter('Uncommitting from {%s} to {%s}',
4384
4841
last_rev_id, rev_id)
4385
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4386
4843
revno=revno, local=local)
4387
note('You can restore the old tip by running:\n'
4388
' bzr pull . -r revid:%s', last_rev_id)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4391
4848
class cmd_break_lock(Command):
4392
"""Break a dead lock on a repository, branch or working directory.
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4394
4851
CAUTION: Locks should only be broken when you are sure that the process
4395
4852
holding the lock has been stopped.
4397
You can get information on what locks are open via the 'bzr info' command.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4402
4861
takes_args = ['location?']
4445
4908
Option('allow-writes',
4446
4909
help='By default the server is a readonly server. Supplying '
4447
4910
'--allow-writes enables write access to the contents of '
4448
'the served directory and below.'
4911
'the served directory and below. Note that ``bzr serve`` '
4912
'does not perform authentication, so unless some form of '
4913
'external authentication is arranged supplying this '
4914
'option leads to global uncontrolled write access to your '
4452
def run_smart_server(self, smart_server):
4453
"""Run 'smart_server' forever, with no UI output at all."""
4454
# For the duration of this server, no UI output is permitted. note
4455
# that this may cause problems with blackbox tests. This should be
4456
# changed with care though, as we dont want to use bandwidth sending
4457
# progress over stderr to smart server clients!
4458
from bzrlib import lockdir
4459
old_factory = ui.ui_factory
4460
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4462
ui.ui_factory = ui.SilentUIFactory()
4463
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4464
smart_server.serve()
4466
ui.ui_factory = old_factory
4467
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4469
4919
def get_host_and_port(self, port):
4470
4920
"""Return the host and port to run the smart server on.
4472
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4473
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4922
If 'port' is None, None will be returned for the host and port.
4475
4924
If 'port' has a colon in it, the string before the colon will be
4476
4925
interpreted as the host.
4479
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4480
4929
and port is an integer TCP/IP port.
4482
from bzrlib.smart import medium
4483
host = medium.BZR_DEFAULT_INTERFACE
4485
port = medium.BZR_DEFAULT_PORT
4932
if port is not None:
4487
4933
if ':' in port:
4488
4934
host, port = port.split(':')
4489
4935
port = int(port)
4490
4936
return host, port
4492
def get_smart_server(self, transport, inet, port):
4493
"""Construct a smart server.
4495
:param transport: The base transport from which branches will be
4497
:param inet: If True, serve over stdin and stdout. Used for running
4499
:param port: The port to listen on. By default, it's `
4500
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4502
:return: A smart server.
4504
from bzrlib.smart import medium, server
4506
smart_server = medium.SmartServerPipeStreamMedium(
4507
sys.stdin, sys.stdout, transport)
4509
host, port = self.get_host_and_port(port)
4510
smart_server = server.SmartTCPServer(
4511
transport, host=host, port=port)
4512
note('listening on port: %s' % smart_server.port)
4515
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4516
from bzrlib.transport import get_transport
4517
from bzrlib.transport.chroot import ChrootServer
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
4518
4941
if directory is None:
4519
4942
directory = os.getcwd()
4943
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4520
4946
url = urlutils.local_path_to_url(directory)
4521
4947
if not allow_writes:
4522
4948
url = 'readonly+' + url
4523
chroot_server = ChrootServer(get_transport(url))
4524
chroot_server.setUp()
4525
t = get_transport(chroot_server.get_url())
4526
smart_server = self.get_smart_server(t, inet, port)
4527
self.run_smart_server(smart_server)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4530
4953
class cmd_join(Command):
4531
"""Combine a subtree into its containing tree.
4954
__doc__ = """Combine a tree into its containing tree.
4533
This command is for experimental use only. It requires the target tree
4534
to be in dirstate-with-subtree format, which cannot be converted into
4956
This command requires the target tree to be in a rich-root format.
4537
4958
The TREE argument should be an independent tree, inside another tree, but
4538
4959
not part of it. (Such trees can be produced by "bzr split", but also by
4720
5134
directly from the merge directive, without retrieving data from a
4723
If --no-bundle is specified, then public_branch is needed (and must be
4724
up-to-date), so that the receiver can perform the merge using the
4725
public_branch. The public_branch is always included if known, so that
4726
people can check it later.
4728
The submit branch defaults to the parent, but can be overridden. Both
4729
submit branch and public branch will be remembered if supplied.
4731
If a public_branch is known for the submit_branch, that public submit
4732
branch is used in the merge instructions. This means that a local mirror
4733
can be used as your actual submit branch, once you have set public_branch
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
4736
5164
Mail is sent using your preferred mail program. This should be transparent
4737
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4777
5210
short_name='f',
4779
5212
Option('output', short_name='o',
4780
help='Write merge directive to this file; '
5213
help='Write merge directive to this file or directory; '
4781
5214
'use - for stdout.',
5217
help='Refuse to send if there are uncommitted changes in'
5218
' the working tree, --no-strict disables the check.'),
4783
5219
Option('mail-to', help='Mail the request to this address.',
4787
5223
Option('body', help='Body for the email.', type=unicode),
4788
RegistryOption.from_kwargs('format',
4789
'Use the specified output format.',
4790
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4791
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5224
RegistryOption('format',
5225
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
4794
5229
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4795
5230
no_patch=False, revision=None, remember=False, output=None,
4796
format='4', mail_to=None, message=None, body=None, **kwargs):
4797
return self._run(submit_branch, revision, public_branch, remember,
4798
format, no_bundle, no_patch, output,
4799
kwargs.get('from', '.'), mail_to, message, body)
4801
def _run(self, submit_branch, revision, public_branch, remember, format,
4802
no_bundle, no_patch, output, from_, mail_to, message, body):
4803
from bzrlib.revision import NULL_REVISION
4804
branch = Branch.open_containing(from_)[0]
4806
outfile = cStringIO.StringIO()
4810
outfile = open(output, 'wb')
4811
# we may need to write data into branch's repository to calculate
4816
config = branch.get_config()
4818
mail_to = config.get_user_option('submit_to')
4819
mail_client = config.get_mail_client()
4820
if (not getattr(mail_client, 'supports_body', False)
4821
and body is not None):
4822
raise errors.BzrCommandError(
4823
'Mail client "%s" does not support specifying body' %
4824
mail_client.__class__.__name__)
4825
if remember and submit_branch is None:
4826
raise errors.BzrCommandError(
4827
'--remember requires a branch to be specified.')
4828
stored_submit_branch = branch.get_submit_branch()
4829
remembered_submit_branch = None
4830
if submit_branch is None:
4831
submit_branch = stored_submit_branch
4832
remembered_submit_branch = "submit"
4834
if stored_submit_branch is None or remember:
4835
branch.set_submit_branch(submit_branch)
4836
if submit_branch is None:
4837
submit_branch = branch.get_parent()
4838
remembered_submit_branch = "parent"
4839
if submit_branch is None:
4840
raise errors.BzrCommandError('No submit branch known or'
4842
if remembered_submit_branch is not None:
4843
note('Using saved %s location "%s" to determine what '
4844
'changes to submit.', remembered_submit_branch,
4848
submit_config = Branch.open(submit_branch).get_config()
4849
mail_to = submit_config.get_user_option("child_submit_to")
4851
stored_public_branch = branch.get_public_branch()
4852
if public_branch is None:
4853
public_branch = stored_public_branch
4854
elif stored_public_branch is None or remember:
4855
branch.set_public_branch(public_branch)
4856
if no_bundle and public_branch is None:
4857
raise errors.BzrCommandError('No public branch specified or'
4859
base_revision_id = None
4861
if revision is not None:
4862
if len(revision) > 2:
4863
raise errors.BzrCommandError('bzr send takes '
4864
'at most two one revision identifiers')
4865
revision_id = revision[-1].as_revision_id(branch)
4866
if len(revision) == 2:
4867
base_revision_id = revision[0].as_revision_id(branch)
4868
if revision_id is None:
4869
revision_id = branch.last_revision()
4870
if revision_id == NULL_REVISION:
4871
raise errors.BzrCommandError('No revisions to submit.')
4873
directive = merge_directive.MergeDirective2.from_objects(
4874
branch.repository, revision_id, time.time(),
4875
osutils.local_time_offset(), submit_branch,
4876
public_branch=public_branch, include_patch=not no_patch,
4877
include_bundle=not no_bundle, message=message,
4878
base_revision_id=base_revision_id)
4879
elif format == '0.9':
4882
patch_type = 'bundle'
4884
raise errors.BzrCommandError('Format 0.9 does not'
4885
' permit bundle with no patch')
4891
directive = merge_directive.MergeDirective.from_objects(
4892
branch.repository, revision_id, time.time(),
4893
osutils.local_time_offset(), submit_branch,
4894
public_branch=public_branch, patch_type=patch_type,
4897
outfile.writelines(directive.to_lines())
4899
subject = '[MERGE] '
4900
if message is not None:
4903
revision = branch.repository.get_revision(revision_id)
4904
subject += revision.get_summary()
4905
basename = directive.get_disk_name(branch)
4906
mail_client.compose_merge_request(mail_to, subject,
5231
format=None, mail_to=None, message=None, body=None,
5232
strict=None, **kwargs):
5233
from bzrlib.send import send
5234
return send(submit_branch, revision, public_branch, remember,
5235
format, no_bundle, no_patch, output,
5236
kwargs.get('from', '.'), mail_to, message, body,
4915
5241
class cmd_bundle_revisions(cmd_send):
4917
"""Create a merge-directive for submitting changes.
5242
__doc__ = """Create a merge-directive for submitting changes.
4919
5244
A merge directive provides many things needed for requesting merges:
4975
5302
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4976
5303
no_patch=False, revision=None, remember=False, output=None,
4977
format='4', **kwargs):
5304
format=None, strict=None, **kwargs):
4978
5305
if output is None:
4980
return self._run(submit_branch, revision, public_branch, remember,
5307
from bzrlib.send import send
5308
return send(submit_branch, revision, public_branch, remember,
4981
5309
format, no_bundle, no_patch, output,
4982
kwargs.get('from', '.'), None, None, None)
5310
kwargs.get('from', '.'), None, None, None,
5311
self.outf, strict=strict)
4985
5314
class cmd_tag(Command):
4986
"""Create, remove or modify a tag naming a revision.
5315
__doc__ = """Create, remove or modify a tag naming a revision.
4988
5317
Tags give human-meaningful names to revisions. Commands that take a -r
4989
5318
(--revision) option can be given -rtag:X, where X is any previously
5025
5359
branch, relpath = Branch.open_containing(directory)
5026
5360
branch.lock_write()
5029
branch.tags.delete_tag(tag_name)
5030
self.outf.write('Deleted tag %s.\n' % tag_name)
5361
self.add_cleanup(branch.unlock)
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5369
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5371
"Tags can only be placed on a single revision, "
5373
revision_id = revision[0].as_revision_id(branch)
5033
if len(revision) != 1:
5034
raise errors.BzrCommandError(
5035
"Tags can only be placed on a single revision, "
5037
revision_id = revision[0].as_revision_id(branch)
5039
revision_id = branch.last_revision()
5040
if (not force) and branch.tags.has_tag(tag_name):
5041
raise errors.TagAlreadyExists(tag_name)
5042
branch.tags.set_tag(tag_name, revision_id)
5043
self.outf.write('Created tag %s.\n' % tag_name)
5375
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5382
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5048
5387
class cmd_tags(Command):
5388
__doc__ = """List tags.
5051
5390
This command shows a table of tag names and the revisions they reference.
5106
5443
tags.sort(key=lambda x: timestamps[x[1]])
5107
5444
if not show_ids:
5108
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5109
revno_map = branch.get_revision_id_to_revno_map()
5110
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5111
for tag, revid in tags ]
5446
for index, (tag, revid) in enumerate(tags):
5448
revno = branch.revision_id_to_dotted_revno(revid)
5449
if isinstance(revno, tuple):
5450
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5452
# Bad tag data/merges can lead to tagged revisions
5453
# which are not in this branch. Fail gracefully ...
5455
tags[index] = (tag, revno)
5112
5457
for tag, revspec in tags:
5113
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
5116
5461
class cmd_reconfigure(Command):
5117
"""Reconfigure the type of a bzr directory.
5462
__doc__ = """Reconfigure the type of a bzr directory.
5119
5464
A target configuration must be specified.
5151
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
5152
5497
Option('force',
5153
help='Perform reconfiguration even if local changes'
5498
help='Perform reconfiguration even if local changes'
5500
Option('stacked-on',
5501
help='Reconfigure a branch to be stacked on another branch.',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
5157
def run(self, location=None, target_type=None, bind_to=None, force=False):
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5158
5513
directory = bzrdir.BzrDir.open(location)
5514
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5516
elif stacked_on is not None:
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5519
reconfigure.ReconfigureUnstacked().apply(directory)
5520
# At the moment you can use --stacked-on and a different
5521
# reconfiguration shape at the same time; there seems no good reason
5159
5523
if target_type is None:
5160
raise errors.BzrCommandError('No target configuration specified')
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5161
5529
elif target_type == 'branch':
5162
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5163
5531
elif target_type == 'tree':
5200
5568
/path/to/newbranch.
5202
5570
Bound branches use the nickname of its master branch unless it is set
5203
locally, in which case switching will update the the local nickname to be
5571
locally, in which case switching will update the local nickname to be
5204
5572
that of the master.
5207
takes_args = ['to_location']
5575
takes_args = ['to_location?']
5208
5576
takes_options = [Option('force',
5209
help='Switch even if local commits will be lost.')
5577
help='Switch even if local commits will be lost.'),
5579
Option('create-branch', short_name='b',
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
5212
def run(self, to_location, force=False):
5584
def run(self, to_location=None, force=False, create_branch=False,
5213
5586
from bzrlib import switch
5214
5587
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5215
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5216
branch = control_dir.open_branch()
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5218
to_branch = Branch.open(to_location)
5596
branch = control_dir.open_branch()
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5219
5598
except errors.NotBranchError:
5220
this_branch = control_dir.open_branch()
5221
# This may be a heavy checkout, where we want the master branch
5222
this_url = this_branch.get_bound_location()
5223
# If not, use a local sibling
5224
if this_url is None:
5225
this_url = this_branch.base
5226
to_branch = Branch.open(
5227
urlutils.join(this_url, '..', to_location))
5228
switch.switch(control_dir, to_branch, force)
5229
if branch.get_config().has_explicit_nickname():
5600
had_explicit_nick = False
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
if had_explicit_nick:
5230
5625
branch = control_dir.open_branch() #get the new branch!
5231
5626
branch.nick = to_branch.nick
5232
5627
note('Switched to branch: %s',
5233
5628
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5236
5648
class cmd_view(Command):
5237
"""Manage filtered views.
5649
__doc__ = """Manage filtered views.
5239
5651
Views provide a mask over the tree so that users can focus on
5240
5652
a subset of a tree when doing their work. After creating a view,
5456
5893
if writer is None:
5457
5894
writer = bzrlib.option.diff_writer_registry.get()
5459
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5460
message, destroy=destroy).run()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5461
5902
except errors.UserAbort:
5464
5905
def run_for_list(self):
5465
5906
tree = WorkingTree.open_containing('.')[0]
5466
5907
tree.lock_read()
5468
manager = tree.get_shelf_manager()
5469
shelves = manager.active_shelves()
5470
if len(shelves) == 0:
5471
note('No shelved changes.')
5473
for shelf_id in reversed(shelves):
5474
message = manager.get_metadata(shelf_id).get('message')
5476
message = '<no message>'
5477
self.outf.write('%3d: %s\n' % (shelf_id, message))
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5483
5922
class cmd_unshelve(Command):
5484
"""Restore shelved changes.
5923
__doc__ = """Restore shelved changes.
5486
5925
By default, the most recently shelved changes are restored. However if you
5487
5926
specify a shelf by id those changes will be restored instead. This works
5539
5985
dry_run=dry_run, no_prompt=force)
5542
def _create_prefix(cur_transport):
5543
needed = [cur_transport]
5544
# Recurse upwards until we can create a directory successfully
5546
new_transport = cur_transport.clone('..')
5547
if new_transport.base == cur_transport.base:
5548
raise errors.BzrCommandError(
5549
"Failed to create path prefix for %s."
5550
% cur_transport.base)
5552
new_transport.mkdir('.')
5553
except errors.NoSuchFile:
5554
needed.append(new_transport)
5555
cur_transport = new_transport
5988
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5991
If no arguments are provided, lists the branch locations for nested trees.
5992
If one argument is provided, display the branch location for that tree.
5993
If two arguments are provided, set the branch location for that tree.
5998
takes_args = ['path?', 'location?']
6000
def run(self, path=None, location=None):
6002
if path is not None:
6004
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6006
if path is not None:
6009
tree = branch.basis_tree()
6011
info = branch._get_all_reference_info().iteritems()
6012
self._display_reference_info(tree, branch, info)
5558
# Now we only need to create child directories
5560
cur_transport = needed.pop()
5561
cur_transport.ensure_base()
5564
# these get imported and then picked up by the scan for cmd_*
5565
# TODO: Some more consistent way to split command definitions across files;
5566
# we do need to load at least some information about them to know of
5567
# aliases. ideally we would avoid loading the implementation until the
5568
# details were needed.
5569
from bzrlib.cmd_version_info import cmd_version_info
5570
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5571
from bzrlib.bundle.commands import (
5574
from bzrlib.sign_my_commits import cmd_sign_my_commits
5575
from bzrlib.weave_commands import cmd_versionedfile_list, \
5576
cmd_weave_plan_merge, cmd_weave_merge_text
6014
file_id = tree.path2id(path)
6016
raise errors.NotVersionedError(path)
6017
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6019
self._display_reference_info(tree, branch, info)
6021
branch.set_reference_info(file_id, path, location)
6023
def _display_reference_info(self, tree, branch, info):
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6030
ref_list.append((path, location))
6031
for path, location in sorted(ref_list):
6032
self.outf.write('%s %s\n' % (path, location))
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
