323
362
' --revision or a revision_id')
324
363
b = WorkingTree.open_containing(u'.')[0].branch
326
# TODO: jam 20060112 should cat-revision always output utf-8?
327
if revision_id is not None:
328
revision_id = osutils.safe_revision_id(revision_id, warn=False)
330
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
331
except errors.NoSuchRevision:
332
msg = "The repository %s contains no revision %s." % (b.repository.base,
334
raise errors.BzrCommandError(msg)
335
elif revision is not None:
338
raise errors.BzrCommandError('You cannot specify a NULL'
340
rev_id = rev.as_revision_id(b)
341
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()
344
392
class cmd_dump_btree(Command):
345
"""Dump the contents of a btree index file to stdout.
393
__doc__ = """Dump the contents of a btree index file to stdout.
347
395
PATH is a btree index file, it can be any URL. This includes things like
348
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
424
479
To re-create the working tree, use "bzr checkout".
426
481
_see_also = ['checkout', 'working-trees']
427
takes_args = ['location?']
482
takes_args = ['location*']
428
483
takes_options = [
430
485
help='Remove the working tree even if it has '
431
486
'uncommitted changes.'),
434
def run(self, location='.', force=False):
435
d = bzrdir.BzrDir.open(location)
438
working = d.open_workingtree()
439
except errors.NoWorkingTree:
440
raise errors.BzrCommandError("No working tree to remove")
441
except errors.NotLocalUrl:
442
raise errors.BzrCommandError("You cannot remove the working tree of a "
445
changes = working.changes_from(working.basis_tree())
446
if changes.has_changed():
447
raise errors.UncommittedChanges(working)
449
working_path = working.bzrdir.root_transport.base
450
branch_path = working.branch.bzrdir.root_transport.base
451
if working_path != branch_path:
452
raise errors.BzrCommandError("You cannot remove the working tree from "
453
"a lightweight checkout")
455
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
working_path = working.bzrdir.root_transport.base
508
branch_path = working.branch.bzrdir.root_transport.base
509
if working_path != branch_path:
510
raise errors.BzrCommandError("You cannot remove the working tree"
511
" from a lightweight checkout")
513
d.destroy_workingtree()
458
516
class cmd_revno(Command):
459
"""Show current revision number.
517
__doc__ = """Show current revision number.
461
519
This is equal to the number of revisions on this branch.
464
522
_see_also = ['info']
465
523
takes_args = ['location?']
525
Option('tree', help='Show revno of working tree'),
468
def run(self, location=u'.'):
469
self.outf.write(str(Branch.open_containing(location)[0].revno()))
470
self.outf.write('\n')
529
def run(self, tree=False, location=u'.'):
532
wt = WorkingTree.open_containing(location)[0]
534
except (errors.NoWorkingTree, errors.NotLocalUrl):
535
raise errors.NoWorkingTree(location)
536
self.add_cleanup(wt.unlock)
537
revid = wt.last_revision()
539
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
540
except errors.NoSuchRevision:
542
revno = ".".join(str(n) for n in revno_t)
544
b = Branch.open_containing(location)[0]
546
self.add_cleanup(b.unlock)
549
self.outf.write(str(revno) + '\n')
473
552
class cmd_revision_info(Command):
474
"""Show revision number and revision id for a given revision identifier.
553
__doc__ = """Show revision number and revision id for a given revision identifier.
477
556
takes_args = ['revision_info*']
565
Option('tree', help='Show revno of working tree'),
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
569
def run(self, revision=None, directory=u'.', tree=False,
570
revision_info_list=[]):
573
wt = WorkingTree.open_containing(directory)[0]
576
self.add_cleanup(wt.unlock)
577
except (errors.NoWorkingTree, errors.NotLocalUrl):
579
b = Branch.open_containing(directory)[0]
581
self.add_cleanup(b.unlock)
492
583
if revision is not None:
493
revs.extend(revision)
584
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
494
585
if revision_info_list is not None:
495
for rev in revision_info_list:
496
revs.append(RevisionSpec.from_string(rev))
498
b = Branch.open_containing(directory)[0]
501
revs.append(RevisionSpec.from_string('-1'))
504
revision_id = rev.as_revision_id(b)
586
for rev_str in revision_info_list:
587
rev_spec = RevisionSpec.from_string(rev_str)
588
revision_ids.append(rev_spec.as_revision_id(b))
589
# No arguments supplied, default to the last revision
590
if len(revision_ids) == 0:
593
raise errors.NoWorkingTree(directory)
594
revision_ids.append(wt.last_revision())
596
revision_ids.append(b.last_revision())
600
for revision_id in revision_ids:
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
602
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
603
revno = '.'.join(str(i) for i in dotted_revno)
507
604
except errors.NoSuchRevision:
508
dotted_map = b.get_revision_id_to_revno_map()
509
revno = '.'.join(str(i) for i in dotted_map[revision_id])
510
print '%s %s' % (revno, revision_id)
606
maxlen = max(maxlen, len(revno))
607
revinfos.append([revno, revision_id])
611
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
513
614
class cmd_add(Command):
514
"""Add specified files or directories.
615
__doc__ = """Add specified files or directories.
516
617
In non-recursive mode, all the named items are added, regardless
517
618
of whether they were previously ignored. A warning is given if
582
686
base_tree.lock_read()
584
file_list = self._maybe_expand_globs(file_list)
585
tree, file_list = tree_files_for_add(file_list)
586
added, ignored = tree.smart_add(file_list, not
587
no_recurse, action=action, save=not dry_run)
589
if base_tree is not None:
687
self.add_cleanup(base_tree.unlock)
688
tree, file_list = tree_files_for_add(file_list)
689
added, ignored = tree.smart_add(file_list, not
690
no_recurse, action=action, save=not dry_run)
591
692
if len(ignored) > 0:
593
694
for glob in sorted(ignored.keys()):
594
695
for path in ignored[glob]:
595
696
self.outf.write("ignored %s matching \"%s\"\n"
599
for glob, paths in ignored.items():
600
match_len += len(paths)
601
self.outf.write("ignored %d file(s).\n" % match_len)
602
self.outf.write("If you wish to add some of these files,"
603
" please add them by name.\n")
606
700
class cmd_mkdir(Command):
607
"""Create a new versioned directory.
701
__doc__ = """Create a new versioned directory.
609
703
This is equivalent to creating the directory and then adding it.
664
763
revision = _get_one_revision('inventory', revision)
665
764
work_tree, file_list = tree_files(file_list)
666
765
work_tree.lock_read()
668
if revision is not None:
669
tree = revision.as_tree(work_tree.branch)
671
extra_trees = [work_tree]
677
if file_list is not None:
678
file_ids = tree.paths2ids(file_list, trees=extra_trees,
679
require_versioned=True)
680
# find_ids_across_trees may include some paths that don't
682
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
683
for file_id in file_ids if file_id in tree)
685
entries = tree.inventory.entries()
688
if tree is not work_tree:
766
self.add_cleanup(work_tree.unlock)
767
if revision is not None:
768
tree = revision.as_tree(work_tree.branch)
770
extra_trees = [work_tree]
772
self.add_cleanup(tree.unlock)
777
if file_list is not None:
778
file_ids = tree.paths2ids(file_list, trees=extra_trees,
779
require_versioned=True)
780
# find_ids_across_trees may include some paths that don't
782
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
783
for file_id in file_ids if file_id in tree)
785
entries = tree.inventory.entries()
691
788
for path, entry in entries:
692
789
if kind and kind != entry.kind:
722
819
takes_args = ['names*']
723
820
takes_options = [Option("after", help="Move only the bzr identifier"
724
821
" of the file, because the file has already been moved."),
822
Option('auto', help='Automatically guess renames.'),
823
Option('dry-run', help='Avoid making changes when guessing renames.'),
726
825
aliases = ['move', 'rename']
727
826
encoding_type = 'replace'
729
def run(self, names_list, after=False):
828
def run(self, names_list, after=False, auto=False, dry_run=False):
830
return self.run_auto(names_list, after, dry_run)
832
raise errors.BzrCommandError('--dry-run requires --auto.')
730
833
if names_list is None:
733
835
if len(names_list) < 2:
734
836
raise errors.BzrCommandError("missing file argument")
735
837
tree, rel_names = tree_files(names_list, canonicalize=False)
738
self._run(tree, names_list, rel_names, after)
838
tree.lock_tree_write()
839
self.add_cleanup(tree.unlock)
840
self._run(tree, names_list, rel_names, after)
842
def run_auto(self, names_list, after, dry_run):
843
if names_list is not None and len(names_list) > 1:
844
raise errors.BzrCommandError('Only one path may be specified to'
847
raise errors.BzrCommandError('--after cannot be specified with'
849
work_tree, file_list = tree_files(names_list, default_branch='.')
850
work_tree.lock_tree_write()
851
self.add_cleanup(work_tree.unlock)
852
rename_map.RenameMap.guess_renames(work_tree, dry_run)
742
854
def _run(self, tree, names_list, rel_names, after):
743
855
into_existing = osutils.isdir(names_list[-1])
815
928
dest = osutils.pathjoin(dest_parent, dest_tail)
816
929
mutter("attempting to move %s => %s", src, dest)
817
930
tree.rename_one(src, dest, after=after)
818
self.outf.write("%s => %s\n" % (src, dest))
932
self.outf.write("%s => %s\n" % (src, dest))
821
935
class cmd_pull(Command):
822
"""Turn this branch into a mirror of another branch.
936
__doc__ = """Turn this branch into a mirror of another branch.
824
This command only works on branches that have not diverged. Branches are
825
considered diverged if the destination branch's most recent commit is one
826
that has not been merged (directly or indirectly) into the parent.
938
By default, this command only works on branches that have not diverged.
939
Branches are considered diverged if the destination branch's most recent
940
commit is one that has not been merged (directly or indirectly) into the
828
943
If branches have diverged, you can use 'bzr merge' to integrate the changes
829
944
from one into the other. Once one branch has merged, the other should
830
945
be able to pull it again.
832
If you want to forget your local changes and just update your branch to
833
match the remote one, use pull --overwrite.
947
If you want to replace your local changes and just want your branch to
948
match the remote one, use pull --overwrite. This will work even if the two
949
branches have diverged.
835
951
If there is no default location set, the first pull will set it. After
836
952
that, you can omit the location to use the default. To change the
910
1040
if revision is not None:
911
1041
revision_id = revision.as_revision_id(branch_from)
913
branch_to.lock_write()
915
if tree_to is not None:
916
view_info = _get_view_info_for_change_reporter(tree_to)
917
change_reporter = delta._ChangeReporter(
918
unversioned_filter=tree_to.is_ignored, view_info=view_info)
919
result = tree_to.pull(branch_from, overwrite, revision_id,
921
possible_transports=possible_transports)
923
result = branch_to.pull(branch_from, overwrite, revision_id)
1043
if tree_to is not None:
1044
view_info = _get_view_info_for_change_reporter(tree_to)
1045
change_reporter = delta._ChangeReporter(
1046
unversioned_filter=tree_to.is_ignored,
1047
view_info=view_info)
1048
result = tree_to.pull(
1049
branch_from, overwrite, revision_id, change_reporter,
1050
possible_transports=possible_transports, local=local)
1052
result = branch_to.pull(
1053
branch_from, overwrite, revision_id, local=local)
925
result.report(self.outf)
926
if verbose and result.old_revid != result.new_revid:
927
log.show_branch_change(branch_to, self.outf, result.old_revno,
1055
result.report(self.outf)
1056
if verbose and result.old_revid != result.new_revid:
1057
log.show_branch_change(
1058
branch_to, self.outf, result.old_revno,
933
1062
class cmd_push(Command):
934
"""Update a mirror of this branch.
1063
__doc__ = """Update a mirror of this branch.
936
1065
The target branch will not have its working tree populated because this
937
1066
is both expensive, and is not supported on remote file systems.
987
1119
def run(self, location=None, remember=False, overwrite=False,
988
1120
create_prefix=False, verbose=False, revision=None,
989
1121
use_existing_dir=False, directory=None, stacked_on=None,
1122
stacked=False, strict=None):
991
1123
from bzrlib.push import _show_push_branch
993
# Get the source branch and revision_id
994
1125
if directory is None:
996
br_from = Branch.open_containing(directory)[0]
1127
# Get the source branch
1129
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1130
# Get the tip's revision_id
997
1131
revision = _get_one_revision('push', revision)
998
1132
if revision is not None:
999
1133
revision_id = revision.in_history(br_from).rev_id
1001
revision_id = br_from.last_revision()
1136
if tree is not None and revision_id is None:
1137
tree.warn_if_changed_or_out_of_date(
1138
strict, 'push_strict', 'Use --no-strict to force the push.')
1003
1139
# Get the stacked_on branch, if any
1004
1140
if stacked_on is not None:
1005
1141
stacked_on = urlutils.normalize_url(stacked_on)
1056
1192
help='Hard-link working tree files where possible.'),
1057
1193
Option('no-tree',
1058
1194
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1059
1198
Option('stacked',
1060
1199
help='Create a stacked branch referring to the source branch. '
1061
1200
'The new branch will depend on the availability of the source '
1062
1201
'branch for all operations.'),
1063
1202
Option('standalone',
1064
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."),
1066
1212
aliases = ['get', 'clone']
1068
1214
def run(self, from_location, to_location=None, revision=None,
1069
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
1070
1218
from bzrlib.tag import _merge_tags_if_possible
1072
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1074
1221
revision = _get_one_revision('branch', revision)
1075
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)
1077
if revision is not None:
1078
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)
1080
# FIXME - wt.last_revision, fallback to branch, fall back to
1081
# None or perhaps NULL_REVISION to mean copy nothing
1083
revision_id = br_from.last_revision()
1084
if to_location is None:
1085
to_location = urlutils.derive_to_location(from_location)
1086
to_transport = transport.get_transport(to_location)
1088
to_transport.mkdir('.')
1089
except errors.FileExists:
1090
raise errors.BzrCommandError('Target directory "%s" already'
1091
' exists.' % to_location)
1092
except errors.NoSuchFile:
1093
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1096
# preserve whatever source format we have.
1097
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1098
possible_transports=[to_transport],
1099
accelerator_tree=accelerator_tree,
1100
hardlink=hardlink, stacked=stacked,
1101
force_new_repo=standalone,
1102
create_tree_if_local=not no_tree,
1103
source_branch=br_from)
1104
branch = dir.open_branch()
1105
except errors.NoSuchRevision:
1106
to_transport.delete_tree('.')
1107
msg = "The branch %s has no revision %s." % (from_location,
1109
raise errors.BzrCommandError(msg)
1110
_merge_tags_if_possible(br_from, branch)
1111
# If the source branch is stacked, the new branch may
1112
# be stacked whether we asked for that explicitly or not.
1113
# We therefore need a try/except here and not just 'if stacked:'
1115
note('Created new stacked branch referring to %s.' %
1116
branch.get_stacked_on_url())
1117
except (errors.NotStacked, errors.UnstackableBranchFormat,
1118
errors.UnstackableRepositoryFormat), e:
1119
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'))
1124
1288
class cmd_checkout(Command):
1125
"""Create a new checkout of an existing branch.
1289
__doc__ = """Create a new checkout of an existing branch.
1127
1291
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1128
1292
the branch found in '.'. This is useful if you have removed the working tree
1203
1367
def run(self, dir=u'.'):
1204
1368
tree = WorkingTree.open_containing(dir)[0]
1205
1369
tree.lock_read()
1207
new_inv = tree.inventory
1208
old_tree = tree.basis_tree()
1209
old_tree.lock_read()
1211
old_inv = old_tree.inventory
1213
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1214
for f, paths, c, v, p, n, k, e in iterator:
1215
if paths[0] == paths[1]:
1219
renames.append(paths)
1221
for old_name, new_name in renames:
1222
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))
1229
1389
class cmd_update(Command):
1230
"""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.
1232
1392
This will perform a merge into the working tree, and may generate
1233
1393
conflicts. If you have any local changes, you will still
1236
1396
If you want to discard your local changes, you can just do a
1237
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.
1240
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1241
1404
takes_args = ['dir?']
1405
takes_options = ['revision']
1242
1406
aliases = ['up']
1244
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")
1245
1412
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1246
1414
possible_transports = []
1247
master = tree.branch.get_master_branch(
1415
master = branch.get_master_branch(
1248
1416
possible_transports=possible_transports)
1249
1417
if master is not None:
1250
1418
tree.lock_write()
1419
branch_location = master.base
1252
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)
1254
existing_pending_merges = tree.get_parent_ids()[1:]
1255
last_rev = _mod_revision.ensure_null(tree.last_revision())
1256
if last_rev == _mod_revision.ensure_null(
1257
tree.branch.last_revision()):
1258
# may be up to date, check master too.
1259
if master is None or last_rev == _mod_revision.ensure_null(
1260
master.last_revision()):
1261
revno = tree.branch.revision_id_to_revno(last_rev)
1262
note("Tree is up to date at revision %d." % (revno,))
1264
view_info = _get_view_info_for_change_reporter(tree)
1265
1450
conflicts = tree.update(
1266
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1267
view_info=view_info), possible_transports=possible_transports)
1268
revno = tree.branch.revision_id_to_revno(
1269
_mod_revision.ensure_null(tree.last_revision()))
1270
note('Updated to revision %d.' % (revno,))
1271
if tree.get_parent_ids()[1:] != existing_pending_merges:
1272
note('Your local commits will now show as pending merges with '
1273
"'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'.")
1282
1475
class cmd_info(Command):
1283
"""Show information about a working tree, branch or repository.
1476
__doc__ = """Show information about a working tree, branch or repository.
1285
1478
This command will show all known locations and formats associated to the
1286
1479
tree, branch or repository.
1353
1546
file_list = [f for f in file_list]
1355
1548
tree.lock_write()
1357
# Heuristics should probably all move into tree.remove_smart or
1360
added = tree.changes_from(tree.basis_tree(),
1361
specific_files=file_list).added
1362
file_list = sorted([f[0] for f in added], reverse=True)
1363
if len(file_list) == 0:
1364
raise errors.BzrCommandError('No matching files.')
1365
elif file_list is None:
1366
# missing files show up in iter_changes(basis) as
1367
# versioned-with-no-kind.
1369
for change in tree.iter_changes(tree.basis_tree()):
1370
# Find paths in the working tree that have no kind:
1371
if change[1][1] is not None and change[6][1] is None:
1372
missing.append(change[1][1])
1373
file_list = sorted(missing, reverse=True)
1374
file_deletion_strategy = 'keep'
1375
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1376
keep_files=file_deletion_strategy=='keep',
1377
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')
1382
1573
class cmd_file_id(Command):
1383
"""Print file_id of a particular file or directory.
1574
__doc__ = """Print file_id of a particular file or directory.
1385
1576
The file_id is assigned when the file is first added and remains the
1386
1577
same through all revisions where the file exists, even when it is
1761
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1762
1978
' one or two revision specifiers')
1764
old_tree, new_tree, specific_files, extra_trees = \
1765
_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)
1767
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1768
1989
specific_files=specific_files,
1769
1990
external_diff_options=diff_options,
1770
1991
old_label=old_label, new_label=new_label,
1771
extra_trees=extra_trees, using=using)
1992
extra_trees=extra_trees, using=using,
1774
1996
class cmd_deleted(Command):
1775
"""List files deleted in the working tree.
1997
__doc__ = """List files deleted in the working tree.
1777
1999
# TODO: Show files deleted since a previous revision, or
1778
2000
# between two revisions.
2016
2229
:Tips & tricks:
2018
2231
GUI tools and IDEs are often better at exploring history than command
2019
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2020
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2021
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2023
Web interfaces are often better at exploring history than command line
2024
tools, particularly for branches on servers. You may prefer Loggerhead
2025
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>.
2027
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2031
2241
top = log -l10 --line
2032
show = log -v -p -n1 --long
2034
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2035
2245
will show the last 10 mainline revisions. To see the details of a
2036
2246
particular revision X, ``bzr show -rX``.
2038
As many GUI tools and Web interfaces do, you may prefer viewing
2039
history collapsed initially. If you are interested in looking deeper
2040
into a particular merge X, use ``bzr log -n0 -rX``. If you like
2041
working this way, you may wish to either:
2043
* change your default log format to short (or line)
2044
* 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``.
2046
2251
``bzr log -v`` on a branch with lots of history is currently
2047
2252
very slow. A fix for this issue is currently under development.
2168
2385
diff_type = 'full'
2172
# Build the log formatter
2173
if log_format is None:
2174
log_format = log.log_formatter_registry.get_default(b)
2175
lf = log_format(show_ids=show_ids, to_file=self.outf,
2176
show_timezone=timezone,
2177
delta_format=get_verbosity_level(),
2180
# Choose the algorithm for doing the logging. It's annoying
2181
# having multiple code paths like this but necessary until
2182
# the underlying repository format is faster at generating
2183
# deltas or can provide everything we need from the indices.
2184
# The default algorithm - match-using-deltas - works for
2185
# multiple files and directories and is faster for small
2186
# amounts of history (200 revisions say). However, it's too
2187
# slow for logging a single file in a repository with deep
2188
# history, i.e. > 10K revisions. In the spirit of "do no
2189
# evil when adding features", we continue to use the
2190
# original algorithm - per-file-graph - for the "single
2191
# file that isn't a directory without showing a delta" case.
2192
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2195
# Build the LogRequest and execute it
2196
if len(file_ids) == 0:
2198
rqst = make_log_request_dict(
2199
direction=direction, specific_fileids=file_ids,
2200
start_revision=rev1, end_revision=rev2, limit=limit,
2201
message_search=message, delta_type=delta_type,
2202
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2203
Logger(b, rqst).show(lf)
2387
# Build the log formatter
2388
if log_format is None:
2389
log_format = log.log_formatter_registry.get_default(b)
2390
# Make a non-encoding output to include the diffs - bug 328007
2391
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2392
lf = log_format(show_ids=show_ids, to_file=self.outf,
2393
to_exact_file=unencoded_output,
2394
show_timezone=timezone,
2395
delta_format=get_verbosity_level(),
2397
show_advice=levels is None)
2399
# Choose the algorithm for doing the logging. It's annoying
2400
# having multiple code paths like this but necessary until
2401
# the underlying repository format is faster at generating
2402
# deltas or can provide everything we need from the indices.
2403
# The default algorithm - match-using-deltas - works for
2404
# multiple files and directories and is faster for small
2405
# amounts of history (200 revisions say). However, it's too
2406
# slow for logging a single file in a repository with deep
2407
# history, i.e. > 10K revisions. In the spirit of "do no
2408
# evil when adding features", we continue to use the
2409
# original algorithm - per-file-graph - for the "single
2410
# file that isn't a directory without showing a delta" case.
2411
partial_history = revision and b.repository._format.supports_chks
2412
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2413
or delta_type or partial_history)
2415
# Build the LogRequest and execute it
2416
if len(file_ids) == 0:
2418
rqst = make_log_request_dict(
2419
direction=direction, specific_fileids=file_ids,
2420
start_revision=rev1, end_revision=rev2, limit=limit,
2421
message_search=message, delta_type=delta_type,
2422
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2423
Logger(b, rqst).show(lf)
2208
2426
def _get_revision_range(revisionspec_list, branch, command_name):
2344
2571
apply_view = True
2345
2572
view_str = views.view_display_str(view_files)
2346
note("ignoring files outside view: %s" % view_str)
2573
note("Ignoring files outside view. View is %s" % view_str)
2348
2575
tree.lock_read()
2350
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2351
if fp.startswith(relpath):
2352
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2353
if non_recursive and '/' in fp:
2355
if not all and not selection[fc]:
2357
if kind is not None and fkind != kind:
2361
views.check_path_in_view(tree, fp)
2362
except errors.FileOutsideView:
2364
kindch = entry.kind_character()
2365
outstring = fp + kindch
2367
outstring = '%-8s %s' % (fc, outstring)
2368
if show_ids and fid is not None:
2369
outstring = "%-50s %s" % (outstring, fid)
2370
self.outf.write(outstring + '\n')
2372
self.outf.write(fp + '\0')
2375
self.outf.write(fid)
2376
self.outf.write('\0')
2384
self.outf.write('%-50s %s\n' % (outstring, my_id))
2386
self.outf.write(outstring + '\n')
2576
self.add_cleanup(tree.unlock)
2577
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2578
from_dir=relpath, recursive=recursive):
2579
# Apply additional masking
2580
if not all and not selection[fc]:
2582
if kind is not None and fkind != kind:
2587
fullpath = osutils.pathjoin(relpath, fp)
2590
views.check_path_in_view(tree, fullpath)
2591
except errors.FileOutsideView:
2596
fp = osutils.pathjoin(prefix, fp)
2597
kindch = entry.kind_character()
2598
outstring = fp + kindch
2599
ui.ui_factory.clear_term()
2601
outstring = '%-8s %s' % (fc, outstring)
2602
if show_ids and fid is not None:
2603
outstring = "%-50s %s" % (outstring, fid)
2604
self.outf.write(outstring + '\n')
2606
self.outf.write(fp + '\0')
2609
self.outf.write(fid)
2610
self.outf.write('\0')
2618
self.outf.write('%-50s %s\n' % (outstring, my_id))
2620
self.outf.write(outstring + '\n')
2391
2623
class cmd_unknowns(Command):
2392
"""List unknown files.
2624
__doc__ = """List unknown files.
2404
2636
class cmd_ignore(Command):
2405
"""Ignore specified files or patterns.
2637
__doc__ = """Ignore specified files or patterns.
2407
2639
See ``bzr help patterns`` for details on the syntax of patterns.
2641
If a .bzrignore file does not exist, the ignore command
2642
will create one and add the specified files or patterns to the newly
2643
created file. The ignore command will also automatically add the
2644
.bzrignore file to be versioned. Creating a .bzrignore file without
2645
the use of the ignore command will require an explicit add command.
2409
2647
To remove patterns from the ignore list, edit the .bzrignore file.
2410
2648
After adding, editing or deleting that file either indirectly by
2411
2649
using this command or directly by using an editor, be sure to commit
2652
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2653
the global ignore file can be found in the application data directory as
2654
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2655
Global ignores are not touched by this command. The global ignore file
2656
can be edited directly using an editor.
2658
Patterns prefixed with '!' are exceptions to ignore patterns and take
2659
precedence over regular ignores. Such exceptions are used to specify
2660
files that should be versioned which would otherwise be ignored.
2662
Patterns prefixed with '!!' act as regular ignore patterns, but have
2663
precedence over the '!' exception patterns.
2414
2665
Note: ignore patterns containing shell wildcards must be quoted from
2415
2666
the shell on Unix.
2434
2689
Ignore everything but the "debian" toplevel directory::
2436
2691
bzr ignore "RE:(?!debian/).*"
2693
Ignore everything except the "local" toplevel directory,
2694
but always ignore "*~" autosave files, even under local/::
2697
bzr ignore "!./local"
2439
2701
_see_also = ['status', 'ignored', 'patterns']
2440
2702
takes_args = ['name_pattern*']
2441
2703
takes_options = [
2442
Option('old-default-rules',
2443
help='Write out the ignore rules bzr < 0.9 always used.')
2704
Option('default-rules',
2705
help='Display the default ignore rules that bzr uses.')
2446
def run(self, name_pattern_list=None, old_default_rules=None):
2708
def run(self, name_pattern_list=None, default_rules=None):
2447
2709
from bzrlib import ignores
2448
if old_default_rules is not None:
2449
# dump the rules and exit
2450
for pattern in ignores.OLD_DEFAULTS:
2710
if default_rules is not None:
2711
# dump the default rules and exit
2712
for pattern in ignores.USER_DEFAULTS:
2713
self.outf.write("%s\n" % pattern)
2453
2715
if not name_pattern_list:
2454
2716
raise errors.BzrCommandError("ignore requires at least one "
2455
"NAME_PATTERN or --old-default-rules")
2717
"NAME_PATTERN or --default-rules.")
2456
2718
name_pattern_list = [globbing.normalize_pattern(p)
2457
2719
for p in name_pattern_list]
2458
2720
for name_pattern in name_pattern_list:
2665
2930
chunks = content.splitlines(True)
2666
2931
content = filtered_output_bytes(chunks, filters,
2667
2932
ContentFilterContext(relpath, rev_tree))
2668
2934
self.outf.writelines(content)
2670
2937
self.outf.write(content)
2673
2940
class cmd_local_time_offset(Command):
2674
"""Show the offset in seconds from GMT to local time."""
2941
__doc__ = """Show the offset in seconds from GMT to local time."""
2676
2943
@display_command
2678
print osutils.local_time_offset()
2945
self.outf.write("%s\n" % osutils.local_time_offset())
2682
2949
class cmd_commit(Command):
2683
"""Commit changes into a new revision.
2685
If no arguments are given, the entire tree is committed.
2687
If selected files are specified, only changes to those files are
2688
committed. If a directory is specified then the directory and everything
2689
within it is committed.
2691
When excludes are given, they take precedence over selected files.
2692
For example, too commit only changes within foo, but not changes within
2695
bzr commit foo -x foo/bar
2697
If author of the change is not the same person as the committer, you can
2698
specify the author's name using the --author option. The name should be
2699
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2700
If there is more than one author of the change you can specify the option
2701
multiple times, once for each author.
2703
A selected-file commit may fail in some cases where the committed
2704
tree would be invalid. Consider::
2709
bzr commit foo -m "committing foo"
2710
bzr mv foo/bar foo/baz
2713
bzr commit foo/bar -m "committing bar but not baz"
2715
In the example above, the last commit will fail by design. This gives
2716
the user the opportunity to decide whether they want to commit the
2717
rename at the same time, separately first, or not at all. (As a general
2718
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2720
Note: A selected-file commit after a merge is not yet supported.
2950
__doc__ = """Commit changes into a new revision.
2952
An explanatory message needs to be given for each commit. This is
2953
often done by using the --message option (getting the message from the
2954
command line) or by using the --file option (getting the message from
2955
a file). If neither of these options is given, an editor is opened for
2956
the user to enter the message. To see the changed files in the
2957
boilerplate text loaded into the editor, use the --show-diff option.
2959
By default, the entire tree is committed and the person doing the
2960
commit is assumed to be the author. These defaults can be overridden
2965
If selected files are specified, only changes to those files are
2966
committed. If a directory is specified then the directory and
2967
everything within it is committed.
2969
When excludes are given, they take precedence over selected files.
2970
For example, to commit only changes within foo, but not changes
2973
bzr commit foo -x foo/bar
2975
A selective commit after a merge is not yet supported.
2979
If the author of the change is not the same person as the committer,
2980
you can specify the author's name using the --author option. The
2981
name should be in the same format as a committer-id, e.g.
2982
"John Doe <jdoe@example.com>". If there is more than one author of
2983
the change you can specify the option multiple times, once for each
2988
A common mistake is to forget to add a new file or directory before
2989
running the commit command. The --strict option checks for unknown
2990
files and aborts the commit if any are found. More advanced pre-commit
2991
checks can be implemented by defining hooks. See ``bzr help hooks``
2996
If you accidentially commit the wrong changes or make a spelling
2997
mistake in the commit message say, you can use the uncommit command
2998
to undo it. See ``bzr help uncommit`` for details.
3000
Hooks can also be configured to run after a commit. This allows you
3001
to trigger updates to external systems like bug trackers. The --fixes
3002
option can be used to record the association between a revision and
3003
one or more bugs. See ``bzr help bugs`` for details.
3005
A selective commit may fail in some cases where the committed
3006
tree would be invalid. Consider::
3011
bzr commit foo -m "committing foo"
3012
bzr mv foo/bar foo/baz
3015
bzr commit foo/bar -m "committing bar but not baz"
3017
In the example above, the last commit will fail by design. This gives
3018
the user the opportunity to decide whether they want to commit the
3019
rename at the same time, separately first, or not at all. (As a general
3020
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2722
3022
# TODO: Run hooks on tree to-be-committed, and after commit.
2822
3133
if local and not tree.branch.get_bound_location():
2823
3134
raise errors.LocalRequiresBoundBranch()
3136
if message is not None:
3138
file_exists = osutils.lexists(message)
3139
except UnicodeError:
3140
# The commit message contains unicode characters that can't be
3141
# represented in the filesystem encoding, so that can't be a
3146
'The commit message is a file name: "%(f)s".\n'
3147
'(use --file "%(f)s" to take commit message from that file)'
3149
ui.ui_factory.show_warning(warning_msg)
3151
message = message.replace('\r\n', '\n')
3152
message = message.replace('\r', '\n')
3154
raise errors.BzrCommandError(
3155
"please specify either --message or --file")
2825
3157
def get_message(commit_obj):
2826
3158
"""Callback to get commit message"""
2827
my_message = message
2828
if my_message is None and not file:
2829
t = make_commit_message_template_encoded(tree,
3160
my_message = codecs.open(
3161
file, 'rt', osutils.get_user_encoding()).read()
3162
elif message is not None:
3163
my_message = message
3165
# No message supplied: make one up.
3166
# text is the status of the tree
3167
text = make_commit_message_template_encoded(tree,
2830
3168
selected_list, diff=show_diff,
2831
3169
output_encoding=osutils.get_user_encoding())
3170
# start_message is the template generated from hooks
3171
# XXX: Warning - looks like hooks return unicode,
3172
# make_commit_message_template_encoded returns user encoding.
3173
# We probably want to be using edit_commit_message instead to
2832
3175
start_message = generate_commit_message_template(commit_obj)
2833
my_message = edit_commit_message_encoded(t,
3176
my_message = edit_commit_message_encoded(text,
2834
3177
start_message=start_message)
2835
3178
if my_message is None:
2836
3179
raise errors.BzrCommandError("please specify a commit"
2837
3180
" message with either --message or --file")
2838
elif my_message and file:
2839
raise errors.BzrCommandError(
2840
"please specify either --message or --file")
2842
my_message = codecs.open(file, 'rt',
2843
osutils.get_user_encoding()).read()
2844
3181
if my_message == "":
2845
3182
raise errors.BzrCommandError("empty commit message specified")
2846
3183
return my_message
3185
# The API permits a commit with a filter of [] to mean 'select nothing'
3186
# but the command line should not do that.
3187
if not selected_list:
3188
selected_list = None
2849
3190
tree.commit(message_callback=get_message,
2850
3191
specific_files=selected_list,
2851
3192
allow_pointless=unchanged, strict=strict, local=local,
2852
3193
reporter=None, verbose=verbose, revprops=properties,
3194
authors=author, timestamp=commit_stamp,
2854
3196
exclude=safe_relpath_files(tree, exclude))
2855
3197
except PointlessCommit:
2856
# FIXME: This should really happen before the file is read in;
2857
# perhaps prepare the commit; get the message; then actually commit
2858
raise errors.BzrCommandError("no changes to commit."
2859
" use --unchanged to commit anyhow")
3198
raise errors.BzrCommandError("No changes to commit."
3199
" Use --unchanged to commit anyhow.")
2860
3200
except ConflictsInTree:
2861
3201
raise errors.BzrCommandError('Conflicts detected in working '
2862
3202
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2880
3221
The working tree and branch checks will only give output if a problem is
2881
3222
detected. The output fields of the repository check are:
2883
revisions: This is just the number of revisions checked. It doesn't
2885
versionedfiles: This is just the number of versionedfiles checked. It
2886
doesn't indicate a problem.
2887
unreferenced ancestors: Texts that are ancestors of other texts, but
2888
are not properly referenced by the revision ancestry. This is a
2889
subtle problem that Bazaar can work around.
2890
unique file texts: This is the total number of unique file contents
2891
seen in the checked revisions. It does not indicate a problem.
2892
repeated file texts: This is the total number of repeated texts seen
2893
in the checked revisions. Texts can be repeated when their file
2894
entries are modified, but the file contents are not. It does not
3225
This is just the number of revisions checked. It doesn't
3229
This is just the number of versionedfiles checked. It
3230
doesn't indicate a problem.
3232
unreferenced ancestors
3233
Texts that are ancestors of other texts, but
3234
are not properly referenced by the revision ancestry. This is a
3235
subtle problem that Bazaar can work around.
3238
This is the total number of unique file contents
3239
seen in the checked revisions. It does not indicate a problem.
3242
This is the total number of repeated texts seen
3243
in the checked revisions. Texts can be repeated when their file
3244
entries are modified, but the file contents are not. It does not
2897
3247
If no restrictions are specified, all Bazaar data that is found at the given
2898
3248
location will be checked.
3247
3598
raise errors.BzrCommandError("subunit not available. subunit "
3248
3599
"needs to be installed to use --subunit.")
3249
3600
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3601
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3602
# stdout, which would corrupt the subunit stream.
3603
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3605
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3607
self.additional_selftest_args.setdefault(
3608
'suite_decorators', []).append(parallel)
3251
3610
test_suite_factory = benchmarks.test_suite
3252
3611
# Unless user explicitly asks for quiet, be verbose in benchmarks
3253
3612
verbose = not is_quiet()
3254
3613
# TODO: should possibly lock the history file...
3255
3614
benchfile = open(".perf_history", "at", buffering=1)
3615
self.add_cleanup(benchfile.close)
3257
3617
test_suite_factory = None
3258
3618
benchfile = None
3260
selftest_kwargs = {"verbose": verbose,
3262
"stop_on_failure": one,
3263
"transport": transport,
3264
"test_suite_factory": test_suite_factory,
3265
"lsprof_timed": lsprof_timed,
3266
"bench_history": benchfile,
3267
"matching_tests_first": first,
3268
"list_only": list_only,
3269
"random_seed": randomize,
3270
"exclude_pattern": exclude,
3272
"load_list": load_list,
3273
"debug_flags": debugflag,
3274
"starting_with": starting_with
3276
selftest_kwargs.update(self.additional_selftest_args)
3277
result = selftest(**selftest_kwargs)
3279
if benchfile is not None:
3282
note('tests passed')
3284
note('tests failed')
3619
selftest_kwargs = {"verbose": verbose,
3621
"stop_on_failure": one,
3622
"transport": transport,
3623
"test_suite_factory": test_suite_factory,
3624
"lsprof_timed": lsprof_timed,
3625
"lsprof_tests": lsprof_tests,
3626
"bench_history": benchfile,
3627
"matching_tests_first": first,
3628
"list_only": list_only,
3629
"random_seed": randomize,
3630
"exclude_pattern": exclude,
3632
"load_list": load_list,
3633
"debug_flags": debugflag,
3634
"starting_with": starting_with
3636
selftest_kwargs.update(self.additional_selftest_args)
3637
result = selftest(**selftest_kwargs)
3285
3638
return int(not result)
3288
3641
class cmd_version(Command):
3289
"""Show version of bzr."""
3642
__doc__ = """Show version of bzr."""
3291
3644
encoding_type = 'replace'
3292
3645
takes_options = [
3442
3810
verified = 'inapplicable'
3443
3811
tree = WorkingTree.open_containing(directory)[0]
3445
# die as quickly as possible if there are uncommitted changes
3447
3814
basis_tree = tree.revision_tree(tree.last_revision())
3448
3815
except errors.NoSuchRevision:
3449
3816
basis_tree = tree.basis_tree()
3818
# die as quickly as possible if there are uncommitted changes
3451
changes = tree.changes_from(basis_tree)
3452
if changes.has_changed():
3820
if tree.has_changes():
3453
3821
raise errors.UncommittedChanges(tree)
3455
3823
view_info = _get_view_info_for_change_reporter(tree)
3456
3824
change_reporter = delta._ChangeReporter(
3457
3825
unversioned_filter=tree.is_ignored, view_info=view_info)
3460
pb = ui.ui_factory.nested_progress_bar()
3461
cleanups.append(pb.finished)
3463
cleanups.append(tree.unlock)
3464
if location is not None:
3466
mergeable = bundle.read_mergeable_from_url(location,
3467
possible_transports=possible_transports)
3468
except errors.NotABundle:
3472
raise errors.BzrCommandError('Cannot use --uncommitted'
3473
' with bundles or merge directives.')
3475
if revision is not None:
3476
raise errors.BzrCommandError(
3477
'Cannot use -r with merge directives or bundles')
3478
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3481
if merger is None and uncommitted:
3482
if revision is not None and len(revision) > 0:
3483
raise errors.BzrCommandError('Cannot use --uncommitted and'
3484
' --revision at the same time.')
3485
location = self._select_branch_location(tree, location)[0]
3486
other_tree, other_path = WorkingTree.open_containing(location)
3487
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3489
allow_pending = False
3490
if other_path != '':
3491
merger.interesting_files = [other_path]
3494
merger, allow_pending = self._get_merger_from_branch(tree,
3495
location, revision, remember, possible_transports, pb)
3497
merger.merge_type = merge_type
3498
merger.reprocess = reprocess
3499
merger.show_base = show_base
3500
self.sanity_check_merger(merger)
3501
if (merger.base_rev_id == merger.other_rev_id and
3502
merger.other_rev_id is not None):
3503
note('Nothing to do.')
3826
pb = ui.ui_factory.nested_progress_bar()
3827
self.add_cleanup(pb.finished)
3829
self.add_cleanup(tree.unlock)
3830
if location is not None:
3832
mergeable = bundle.read_mergeable_from_url(location,
3833
possible_transports=possible_transports)
3834
except errors.NotABundle:
3838
raise errors.BzrCommandError('Cannot use --uncommitted'
3839
' with bundles or merge directives.')
3841
if revision is not None:
3842
raise errors.BzrCommandError(
3843
'Cannot use -r with merge directives or bundles')
3844
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3847
if merger is None and uncommitted:
3848
if revision is not None and len(revision) > 0:
3849
raise errors.BzrCommandError('Cannot use --uncommitted and'
3850
' --revision at the same time.')
3851
merger = self.get_merger_from_uncommitted(tree, location, None)
3852
allow_pending = False
3855
merger, allow_pending = self._get_merger_from_branch(tree,
3856
location, revision, remember, possible_transports, None)
3858
merger.merge_type = merge_type
3859
merger.reprocess = reprocess
3860
merger.show_base = show_base
3861
self.sanity_check_merger(merger)
3862
if (merger.base_rev_id == merger.other_rev_id and
3863
merger.other_rev_id is not None):
3864
note('Nothing to do.')
3867
if merger.interesting_files is not None:
3868
raise errors.BzrCommandError('Cannot pull individual files')
3869
if (merger.base_rev_id == tree.last_revision()):
3870
result = tree.pull(merger.other_branch, False,
3871
merger.other_rev_id)
3872
result.report(self.outf)
3506
if merger.interesting_files is not None:
3507
raise errors.BzrCommandError('Cannot pull individual files')
3508
if (merger.base_rev_id == tree.last_revision()):
3509
result = tree.pull(merger.other_branch, False,
3510
merger.other_rev_id)
3511
result.report(self.outf)
3513
merger.check_basis(False)
3515
return self._do_preview(merger)
3517
return self._do_merge(merger, change_reporter, allow_pending,
3520
for cleanup in reversed(cleanups):
3874
if merger.this_basis is None:
3875
raise errors.BzrCommandError(
3876
"This branch has no commits."
3877
" (perhaps you would prefer 'bzr pull')")
3879
return self._do_preview(merger)
3881
return self._do_interactive(merger)
3883
return self._do_merge(merger, change_reporter, allow_pending,
3886
def _get_preview(self, merger):
3887
tree_merger = merger.make_merger()
3888
tt = tree_merger.make_preview_transform()
3889
self.add_cleanup(tt.finalize)
3890
result_tree = tt.get_preview_tree()
3523
3893
def _do_preview(self, merger):
3524
3894
from bzrlib.diff import show_diff_trees
3525
tree_merger = merger.make_merger()
3526
tt = tree_merger.make_preview_transform()
3528
result_tree = tt.get_preview_tree()
3529
show_diff_trees(merger.this_tree, result_tree, self.outf,
3530
old_label='', new_label='')
3895
result_tree = self._get_preview(merger)
3896
show_diff_trees(merger.this_tree, result_tree, self.outf,
3897
old_label='', new_label='')
3534
3899
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3535
3900
merger.change_reporter = change_reporter
3688
4085
def run(self, file_list=None, merge_type=None, show_base=False,
3689
4086
reprocess=False):
4087
from bzrlib.conflicts import restore
3690
4088
if merge_type is None:
3691
4089
merge_type = _mod_merge.Merge3Merger
3692
4090
tree, file_list = tree_files(file_list)
3693
4091
tree.lock_write()
3695
parents = tree.get_parent_ids()
3696
if len(parents) != 2:
3697
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3698
" merges. Not cherrypicking or"
3700
repository = tree.branch.repository
3701
interesting_ids = None
3703
conflicts = tree.conflicts()
3704
if file_list is not None:
3705
interesting_ids = set()
3706
for filename in file_list:
3707
file_id = tree.path2id(filename)
3709
raise errors.NotVersionedError(filename)
3710
interesting_ids.add(file_id)
3711
if tree.kind(file_id) != "directory":
4092
self.add_cleanup(tree.unlock)
4093
parents = tree.get_parent_ids()
4094
if len(parents) != 2:
4095
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4096
" merges. Not cherrypicking or"
4098
repository = tree.branch.repository
4099
interesting_ids = None
4101
conflicts = tree.conflicts()
4102
if file_list is not None:
4103
interesting_ids = set()
4104
for filename in file_list:
4105
file_id = tree.path2id(filename)
4107
raise errors.NotVersionedError(filename)
4108
interesting_ids.add(file_id)
4109
if tree.kind(file_id) != "directory":
3714
for name, ie in tree.inventory.iter_entries(file_id):
3715
interesting_ids.add(ie.file_id)
3716
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3718
# Remerge only supports resolving contents conflicts
3719
allowed_conflicts = ('text conflict', 'contents conflict')
3720
restore_files = [c.path for c in conflicts
3721
if c.typestring in allowed_conflicts]
3722
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3723
tree.set_conflicts(ConflictList(new_conflicts))
3724
if file_list is not None:
3725
restore_files = file_list
3726
for filename in restore_files:
3728
restore(tree.abspath(filename))
3729
except errors.NotConflicted:
3731
# Disable pending merges, because the file texts we are remerging
3732
# have not had those merges performed. If we use the wrong parents
3733
# list, we imply that the working tree text has seen and rejected
3734
# all the changes from the other tree, when in fact those changes
3735
# have not yet been seen.
3736
pb = ui.ui_factory.nested_progress_bar()
3737
tree.set_parent_ids(parents[:1])
4112
for name, ie in tree.inventory.iter_entries(file_id):
4113
interesting_ids.add(ie.file_id)
4114
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4116
# Remerge only supports resolving contents conflicts
4117
allowed_conflicts = ('text conflict', 'contents conflict')
4118
restore_files = [c.path for c in conflicts
4119
if c.typestring in allowed_conflicts]
4120
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4121
tree.set_conflicts(ConflictList(new_conflicts))
4122
if file_list is not None:
4123
restore_files = file_list
4124
for filename in restore_files:
3739
merger = _mod_merge.Merger.from_revision_ids(pb,
3741
merger.interesting_ids = interesting_ids
3742
merger.merge_type = merge_type
3743
merger.show_base = show_base
3744
merger.reprocess = reprocess
3745
conflicts = merger.do_merge()
3747
tree.set_parent_ids(parents)
4126
restore(tree.abspath(filename))
4127
except errors.NotConflicted:
4129
# Disable pending merges, because the file texts we are remerging
4130
# have not had those merges performed. If we use the wrong parents
4131
# list, we imply that the working tree text has seen and rejected
4132
# all the changes from the other tree, when in fact those changes
4133
# have not yet been seen.
4134
tree.set_parent_ids(parents[:1])
4136
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4137
merger.interesting_ids = interesting_ids
4138
merger.merge_type = merge_type
4139
merger.show_base = show_base
4140
merger.reprocess = reprocess
4141
conflicts = merger.do_merge()
4143
tree.set_parent_ids(parents)
3751
4144
if conflicts > 0:
3775
4168
name. If you name a directory, all the contents of that directory will be
3778
Any files that have been newly added since that revision will be deleted,
3779
with a backup kept if appropriate. Directories containing unknown files
3780
will not be deleted.
4171
If you have newly added files since the target revision, they will be
4172
removed. If the files to be removed have been changed, backups will be
4173
created as above. Directories containing unknown files will not be
3782
The working tree contains a list of pending merged revisions, which will
3783
be included as parents in the next commit. Normally, revert clears that
3784
list as well as reverting the files. If any files are specified, revert
3785
leaves the pending merge list alone and reverts only the files. Use "bzr
3786
revert ." in the tree root to revert all files but keep the merge record,
3787
and "bzr revert --forget-merges" to clear the pending merge list without
4176
The working tree contains a list of revisions that have been merged but
4177
not yet committed. These revisions will be included as additional parents
4178
of the next commit. Normally, using revert clears that list as well as
4179
reverting the files. If any files are specified, revert leaves the list
4180
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4181
.`` in the tree root to revert all files but keep the recorded merges,
4182
and ``bzr revert --forget-merges`` to clear the pending merge list without
3788
4183
reverting any files.
4185
Using "bzr revert --forget-merges", it is possible to apply all of the
4186
changes from a branch in a single revision. To do this, perform the merge
4187
as desired. Then doing revert with the "--forget-merges" option will keep
4188
the content of the tree as it was, but it will clear the list of pending
4189
merges. The next commit will then contain all of the changes that are
4190
present in the other branch, but without any other parent revisions.
4191
Because this technique forgets where these changes originated, it may
4192
cause additional conflicts on later merges involving the same source and
3791
4196
_see_also = ['cat', 'export']
3800
4205
def run(self, revision=None, no_backup=False, file_list=None,
3801
4206
forget_merges=None):
3802
4207
tree, file_list = tree_files(file_list)
3806
tree.set_parent_ids(tree.get_parent_ids()[:1])
3808
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4208
tree.lock_tree_write()
4209
self.add_cleanup(tree.unlock)
4211
tree.set_parent_ids(tree.get_parent_ids()[:1])
4213
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3813
4216
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3814
4217
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
3815
pb = ui.ui_factory.nested_progress_bar()
3817
tree.revert(file_list, rev_tree, not no_backup, pb,
3818
report_changes=True)
4218
tree.revert(file_list, rev_tree, not no_backup, None,
4219
report_changes=True)
3823
4222
class cmd_assert_fail(Command):
3824
"""Test reporting of assertion failures"""
4223
__doc__ = """Test reporting of assertion failures"""
3825
4224
# intended just for use in testing
3967
4377
_get_revision_range(revision,
3968
4378
remote_branch, self.name()))
3970
local_branch.lock_read()
3972
remote_branch.lock_read()
3974
local_extra, remote_extra = find_unmerged(
3975
local_branch, remote_branch, restrict,
3976
backward=not reverse,
3977
include_merges=include_merges,
3978
local_revid_range=local_revid_range,
3979
remote_revid_range=remote_revid_range)
3981
if log_format is None:
3982
registry = log.log_formatter_registry
3983
log_format = registry.get_default(local_branch)
3984
lf = log_format(to_file=self.outf,
3986
show_timezone='original')
3989
if local_extra and not theirs_only:
3990
message("You have %d extra revision(s):\n" %
3992
for revision in iter_log_revisions(local_extra,
3993
local_branch.repository,
3995
lf.log_revision(revision)
3996
printed_local = True
3999
printed_local = False
4001
if remote_extra and not mine_only:
4002
if printed_local is True:
4004
message("You are missing %d revision(s):\n" %
4006
for revision in iter_log_revisions(remote_extra,
4007
remote_branch.repository,
4009
lf.log_revision(revision)
4012
if mine_only and not local_extra:
4013
# We checked local, and found nothing extra
4014
message('This branch is up to date.\n')
4015
elif theirs_only and not remote_extra:
4016
# We checked remote, and found nothing extra
4017
message('Other branch is up to date.\n')
4018
elif not (mine_only or theirs_only or local_extra or
4020
# We checked both branches, and neither one had extra
4022
message("Branches are up to date.\n")
4024
remote_branch.unlock()
4026
local_branch.unlock()
4380
local_extra, remote_extra = find_unmerged(
4381
local_branch, remote_branch, restrict,
4382
backward=not reverse,
4383
include_merges=include_merges,
4384
local_revid_range=local_revid_range,
4385
remote_revid_range=remote_revid_range)
4387
if log_format is None:
4388
registry = log.log_formatter_registry
4389
log_format = registry.get_default(local_branch)
4390
lf = log_format(to_file=self.outf,
4392
show_timezone='original')
4395
if local_extra and not theirs_only:
4396
message("You have %d extra revision(s):\n" %
4398
for revision in iter_log_revisions(local_extra,
4399
local_branch.repository,
4401
lf.log_revision(revision)
4402
printed_local = True
4405
printed_local = False
4407
if remote_extra and not mine_only:
4408
if printed_local is True:
4410
message("You are missing %d revision(s):\n" %
4412
for revision in iter_log_revisions(remote_extra,
4413
remote_branch.repository,
4415
lf.log_revision(revision)
4418
if mine_only and not local_extra:
4419
# We checked local, and found nothing extra
4420
message('This branch is up to date.\n')
4421
elif theirs_only and not remote_extra:
4422
# We checked remote, and found nothing extra
4423
message('Other branch is up to date.\n')
4424
elif not (mine_only or theirs_only or local_extra or
4426
# We checked both branches, and neither one had extra
4428
message("Branches are up to date.\n")
4027
4430
if not status_code and parent is None and other_branch is not None:
4028
4431
local_branch.lock_write()
4030
# handle race conditions - a parent might be set while we run.
4031
if local_branch.get_parent() is None:
4032
local_branch.set_parent(remote_branch.base)
4034
local_branch.unlock()
4432
self.add_cleanup(local_branch.unlock)
4433
# handle race conditions - a parent might be set while we run.
4434
if local_branch.get_parent() is None:
4435
local_branch.set_parent(remote_branch.base)
4035
4436
return status_code
4038
4439
class cmd_pack(Command):
4039
"""Compress the data within a repository."""
4440
__doc__ = """Compress the data within a repository.
4442
This operation compresses the data within a bazaar repository. As
4443
bazaar supports automatic packing of repository, this operation is
4444
normally not required to be done manually.
4446
During the pack operation, bazaar takes a backup of existing repository
4447
data, i.e. pack files. This backup is eventually removed by bazaar
4448
automatically when it is safe to do so. To save disk space by removing
4449
the backed up pack files, the --clean-obsolete-packs option may be
4452
Warning: If you use --clean-obsolete-packs and your machine crashes
4453
during or immediately after repacking, you may be left with a state
4454
where the deletion has been written to disk but the new packs have not
4455
been. In this case the repository may be unusable.
4041
4458
_see_also = ['repositories']
4042
4459
takes_args = ['branch_or_repo?']
4461
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4044
def run(self, branch_or_repo='.'):
4464
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4045
4465
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4047
4467
branch = dir.open_branch()
4048
4468
repository = branch.repository
4049
4469
except errors.NotBranchError:
4050
4470
repository = dir.open_repository()
4471
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4054
4474
class cmd_plugins(Command):
4055
"""List the installed plugins.
4475
__doc__ = """List the installed plugins.
4057
4477
This command displays the list of installed plugins including
4058
4478
version of plugin and a short description of each.
4159
4577
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4160
4578
if wt is not None:
4580
self.add_cleanup(wt.unlock)
4163
4582
branch.lock_read()
4165
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4167
file_id = wt.path2id(relpath)
4169
file_id = tree.path2id(relpath)
4171
raise errors.NotVersionedError(filename)
4172
file_version = tree.inventory[file_id].revision
4173
if wt is not None and revision is None:
4174
# If there is a tree and we're not annotating historical
4175
# versions, annotate the working tree's content.
4176
annotate_file_tree(wt, file_id, self.outf, long, all,
4179
annotate_file(branch, file_version, file_id, long, all, self.outf,
4583
self.add_cleanup(branch.unlock)
4584
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4586
self.add_cleanup(tree.unlock)
4588
file_id = wt.path2id(relpath)
4590
file_id = tree.path2id(relpath)
4592
raise errors.NotVersionedError(filename)
4593
file_version = tree.inventory[file_id].revision
4594
if wt is not None and revision is None:
4595
# If there is a tree and we're not annotating historical
4596
# versions, annotate the working tree's content.
4597
annotate_file_tree(wt, file_id, self.outf, long, all,
4600
annotate_file(branch, file_version, file_id, long, all, self.outf,
4188
4604
class cmd_re_sign(Command):
4189
"""Create a digital signature for an existing revision."""
4605
__doc__ = """Create a digital signature for an existing revision."""
4190
4606
# TODO be able to replace existing ones.
4192
4608
hidden = True # is this right ?
4402
4814
end_revision=last_revno)
4405
print 'Dry-run, pretending to remove the above revisions.'
4407
val = raw_input('Press <enter> to continue')
4817
self.outf.write('Dry-run, pretending to remove'
4818
' the above revisions.\n')
4409
print 'The above revision(s) will be removed.'
4411
val = raw_input('Are you sure [y/N]? ')
4412
if val.lower() not in ('y', 'yes'):
4820
self.outf.write('The above revision(s) will be removed.\n')
4823
if not ui.ui_factory.get_boolean('Are you sure'):
4824
self.outf.write('Canceled')
4416
4827
mutter('Uncommitting from {%s} to {%s}',
4417
4828
last_rev_id, rev_id)
4418
4829
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4419
4830
revno=revno, local=local)
4420
note('You can restore the old tip by running:\n'
4421
' bzr pull . -r revid:%s', last_rev_id)
4831
self.outf.write('You can restore the old tip by running:\n'
4832
' bzr pull . -r revid:%s\n' % last_rev_id)
4424
4835
class cmd_break_lock(Command):
4425
"""Break a dead lock on a repository, branch or working directory.
4836
__doc__ = """Break a dead lock on a repository, branch or working directory.
4427
4838
CAUTION: Locks should only be broken when you are sure that the process
4428
4839
holding the lock has been stopped.
4430
You can get information on what locks are open via the 'bzr info' command.
4841
You can get information on what locks are open via the 'bzr info
4842
[location]' command.
4846
bzr break-lock bzr+ssh://example.com/bzr/foo
4435
4848
takes_args = ['location?']
4478
4895
Option('allow-writes',
4479
4896
help='By default the server is a readonly server. Supplying '
4480
4897
'--allow-writes enables write access to the contents of '
4481
'the served directory and below.'
4898
'the served directory and below. Note that ``bzr serve`` '
4899
'does not perform authentication, so unless some form of '
4900
'external authentication is arranged supplying this '
4901
'option leads to global uncontrolled write access to your '
4485
def run_smart_server(self, smart_server):
4486
"""Run 'smart_server' forever, with no UI output at all."""
4487
# For the duration of this server, no UI output is permitted. note
4488
# that this may cause problems with blackbox tests. This should be
4489
# changed with care though, as we dont want to use bandwidth sending
4490
# progress over stderr to smart server clients!
4491
from bzrlib import lockdir
4492
old_factory = ui.ui_factory
4493
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4495
ui.ui_factory = ui.SilentUIFactory()
4496
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4497
smart_server.serve()
4499
ui.ui_factory = old_factory
4500
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4502
4906
def get_host_and_port(self, port):
4503
4907
"""Return the host and port to run the smart server on.
4505
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4506
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4909
If 'port' is None, None will be returned for the host and port.
4508
4911
If 'port' has a colon in it, the string before the colon will be
4509
4912
interpreted as the host.
4512
4915
:return: A tuple of (host, port), where 'host' is a host name or IP,
4513
4916
and port is an integer TCP/IP port.
4515
from bzrlib.smart import medium
4516
host = medium.BZR_DEFAULT_INTERFACE
4518
port = medium.BZR_DEFAULT_PORT
4919
if port is not None:
4520
4920
if ':' in port:
4521
4921
host, port = port.split(':')
4522
4922
port = int(port)
4523
4923
return host, port
4525
def get_smart_server(self, transport, inet, port):
4526
"""Construct a smart server.
4528
:param transport: The base transport from which branches will be
4530
:param inet: If True, serve over stdin and stdout. Used for running
4532
:param port: The port to listen on. By default, it's `
4533
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4535
:return: A smart server.
4537
from bzrlib.smart import medium, server
4539
smart_server = medium.SmartServerPipeStreamMedium(
4540
sys.stdin, sys.stdout, transport)
4542
host, port = self.get_host_and_port(port)
4543
smart_server = server.SmartTCPServer(
4544
transport, host=host, port=port)
4545
note('listening on port: %s' % smart_server.port)
4548
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4549
from bzrlib.transport import get_transport
4550
from bzrlib.transport.chroot import ChrootServer
4925
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4927
from bzrlib.transport import get_transport, transport_server_registry
4551
4928
if directory is None:
4552
4929
directory = os.getcwd()
4930
if protocol is None:
4931
protocol = transport_server_registry.get()
4932
host, port = self.get_host_and_port(port)
4553
4933
url = urlutils.local_path_to_url(directory)
4554
4934
if not allow_writes:
4555
4935
url = 'readonly+' + url
4556
chroot_server = ChrootServer(get_transport(url))
4557
chroot_server.setUp()
4558
t = get_transport(chroot_server.get_url())
4559
smart_server = self.get_smart_server(t, inet, port)
4560
self.run_smart_server(smart_server)
4936
transport = get_transport(url)
4937
protocol(transport, host, port, inet)
4563
4940
class cmd_join(Command):
4564
"""Combine a subtree into its containing tree.
4941
__doc__ = """Combine a tree into its containing tree.
4566
This command is for experimental use only. It requires the target tree
4567
to be in dirstate-with-subtree format, which cannot be converted into
4943
This command requires the target tree to be in a rich-root format.
4570
4945
The TREE argument should be an independent tree, inside another tree, but
4571
4946
not part of it. (Such trees can be produced by "bzr split", but also by
4753
5121
directly from the merge directive, without retrieving data from a
4756
If --no-bundle is specified, then public_branch is needed (and must be
4757
up-to-date), so that the receiver can perform the merge using the
4758
public_branch. The public_branch is always included if known, so that
4759
people can check it later.
4761
The submit branch defaults to the parent, but can be overridden. Both
4762
submit branch and public branch will be remembered if supplied.
4764
If a public_branch is known for the submit_branch, that public submit
4765
branch is used in the merge instructions. This means that a local mirror
4766
can be used as your actual submit branch, once you have set public_branch
5124
`bzr send` creates a compact data set that, when applied using bzr
5125
merge, has the same effect as merging from the source branch.
5127
By default the merge directive is self-contained and can be applied to any
5128
branch containing submit_branch in its ancestory without needing access to
5131
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5132
revisions, but only a structured request to merge from the
5133
public_location. In that case the public_branch is needed and it must be
5134
up-to-date and accessible to the recipient. The public_branch is always
5135
included if known, so that people can check it later.
5137
The submit branch defaults to the parent of the source branch, but can be
5138
overridden. Both submit branch and public branch will be remembered in
5139
branch.conf the first time they are used for a particular branch. The
5140
source branch defaults to that containing the working directory, but can
5141
be changed using --from.
5143
In order to calculate those changes, bzr must analyse the submit branch.
5144
Therefore it is most efficient for the submit branch to be a local mirror.
5145
If a public location is known for the submit_branch, that location is used
5146
in the merge directive.
5148
The default behaviour is to send the merge directive by mail, unless -o is
5149
given, in which case it is sent to a file.
4769
5151
Mail is sent using your preferred mail program. This should be transparent
4770
5152
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4810
5197
short_name='f',
4812
5199
Option('output', short_name='o',
4813
help='Write merge directive to this file; '
5200
help='Write merge directive to this file or directory; '
4814
5201
'use - for stdout.',
5204
help='Refuse to send if there are uncommitted changes in'
5205
' the working tree, --no-strict disables the check.'),
4816
5206
Option('mail-to', help='Mail the request to this address.',
4820
5210
Option('body', help='Body for the email.', type=unicode),
4821
RegistryOption.from_kwargs('format',
4822
'Use the specified output format.',
4823
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4824
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5211
RegistryOption('format',
5212
help='Use the specified output format.',
5213
lazy_registry=('bzrlib.send', 'format_registry')),
4827
5216
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4828
5217
no_patch=False, revision=None, remember=False, output=None,
4829
format='4', mail_to=None, message=None, body=None, **kwargs):
4830
return self._run(submit_branch, revision, public_branch, remember,
4831
format, no_bundle, no_patch, output,
4832
kwargs.get('from', '.'), mail_to, message, body)
4834
def _run(self, submit_branch, revision, public_branch, remember, format,
4835
no_bundle, no_patch, output, from_, mail_to, message, body):
4836
from bzrlib.revision import NULL_REVISION
4837
branch = Branch.open_containing(from_)[0]
4839
outfile = cStringIO.StringIO()
4843
outfile = open(output, 'wb')
4844
# we may need to write data into branch's repository to calculate
4849
config = branch.get_config()
4851
mail_to = config.get_user_option('submit_to')
4852
mail_client = config.get_mail_client()
4853
if (not getattr(mail_client, 'supports_body', False)
4854
and body is not None):
4855
raise errors.BzrCommandError(
4856
'Mail client "%s" does not support specifying body' %
4857
mail_client.__class__.__name__)
4858
if remember and submit_branch is None:
4859
raise errors.BzrCommandError(
4860
'--remember requires a branch to be specified.')
4861
stored_submit_branch = branch.get_submit_branch()
4862
remembered_submit_branch = None
4863
if submit_branch is None:
4864
submit_branch = stored_submit_branch
4865
remembered_submit_branch = "submit"
4867
if stored_submit_branch is None or remember:
4868
branch.set_submit_branch(submit_branch)
4869
if submit_branch is None:
4870
submit_branch = branch.get_parent()
4871
remembered_submit_branch = "parent"
4872
if submit_branch is None:
4873
raise errors.BzrCommandError('No submit branch known or'
4875
if remembered_submit_branch is not None:
4876
note('Using saved %s location "%s" to determine what '
4877
'changes to submit.', remembered_submit_branch,
4881
submit_config = Branch.open(submit_branch).get_config()
4882
mail_to = submit_config.get_user_option("child_submit_to")
4884
stored_public_branch = branch.get_public_branch()
4885
if public_branch is None:
4886
public_branch = stored_public_branch
4887
elif stored_public_branch is None or remember:
4888
branch.set_public_branch(public_branch)
4889
if no_bundle and public_branch is None:
4890
raise errors.BzrCommandError('No public branch specified or'
4892
base_revision_id = None
4894
if revision is not None:
4895
if len(revision) > 2:
4896
raise errors.BzrCommandError('bzr send takes '
4897
'at most two one revision identifiers')
4898
revision_id = revision[-1].as_revision_id(branch)
4899
if len(revision) == 2:
4900
base_revision_id = revision[0].as_revision_id(branch)
4901
if revision_id is None:
4902
revision_id = branch.last_revision()
4903
if revision_id == NULL_REVISION:
4904
raise errors.BzrCommandError('No revisions to submit.')
4906
directive = merge_directive.MergeDirective2.from_objects(
4907
branch.repository, revision_id, time.time(),
4908
osutils.local_time_offset(), submit_branch,
4909
public_branch=public_branch, include_patch=not no_patch,
4910
include_bundle=not no_bundle, message=message,
4911
base_revision_id=base_revision_id)
4912
elif format == '0.9':
4915
patch_type = 'bundle'
4917
raise errors.BzrCommandError('Format 0.9 does not'
4918
' permit bundle with no patch')
4924
directive = merge_directive.MergeDirective.from_objects(
4925
branch.repository, revision_id, time.time(),
4926
osutils.local_time_offset(), submit_branch,
4927
public_branch=public_branch, patch_type=patch_type,
4930
outfile.writelines(directive.to_lines())
4932
subject = '[MERGE] '
4933
if message is not None:
4936
revision = branch.repository.get_revision(revision_id)
4937
subject += revision.get_summary()
4938
basename = directive.get_disk_name(branch)
4939
mail_client.compose_merge_request(mail_to, subject,
5218
format=None, mail_to=None, message=None, body=None,
5219
strict=None, **kwargs):
5220
from bzrlib.send import send
5221
return send(submit_branch, revision, public_branch, remember,
5222
format, no_bundle, no_patch, output,
5223
kwargs.get('from', '.'), mail_to, message, body,
4948
5228
class cmd_bundle_revisions(cmd_send):
4950
"""Create a merge-directive for submitting changes.
5229
__doc__ = """Create a merge-directive for submitting changes.
4952
5231
A merge directive provides many things needed for requesting merges:
5008
5289
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5009
5290
no_patch=False, revision=None, remember=False, output=None,
5010
format='4', **kwargs):
5291
format=None, strict=None, **kwargs):
5011
5292
if output is None:
5013
return self._run(submit_branch, revision, public_branch, remember,
5294
from bzrlib.send import send
5295
return send(submit_branch, revision, public_branch, remember,
5014
5296
format, no_bundle, no_patch, output,
5015
kwargs.get('from', '.'), None, None, None)
5297
kwargs.get('from', '.'), None, None, None,
5298
self.outf, strict=strict)
5018
5301
class cmd_tag(Command):
5019
"""Create, remove or modify a tag naming a revision.
5302
__doc__ = """Create, remove or modify a tag naming a revision.
5021
5304
Tags give human-meaningful names to revisions. Commands that take a -r
5022
5305
(--revision) option can be given -rtag:X, where X is any previously
5058
5346
branch, relpath = Branch.open_containing(directory)
5059
5347
branch.lock_write()
5062
branch.tags.delete_tag(tag_name)
5063
self.outf.write('Deleted tag %s.\n' % tag_name)
5348
self.add_cleanup(branch.unlock)
5350
if tag_name is None:
5351
raise errors.BzrCommandError("No tag specified to delete.")
5352
branch.tags.delete_tag(tag_name)
5353
self.outf.write('Deleted tag %s.\n' % tag_name)
5356
if len(revision) != 1:
5357
raise errors.BzrCommandError(
5358
"Tags can only be placed on a single revision, "
5360
revision_id = revision[0].as_revision_id(branch)
5066
if len(revision) != 1:
5067
raise errors.BzrCommandError(
5068
"Tags can only be placed on a single revision, "
5070
revision_id = revision[0].as_revision_id(branch)
5072
revision_id = branch.last_revision()
5073
if (not force) and branch.tags.has_tag(tag_name):
5074
raise errors.TagAlreadyExists(tag_name)
5075
branch.tags.set_tag(tag_name, revision_id)
5076
self.outf.write('Created tag %s.\n' % tag_name)
5362
revision_id = branch.last_revision()
5363
if tag_name is None:
5364
tag_name = branch.automatic_tag_name(revision_id)
5365
if tag_name is None:
5366
raise errors.BzrCommandError(
5367
"Please specify a tag name.")
5368
if (not force) and branch.tags.has_tag(tag_name):
5369
raise errors.TagAlreadyExists(tag_name)
5370
branch.tags.set_tag(tag_name, revision_id)
5371
self.outf.write('Created tag %s.\n' % tag_name)
5081
5374
class cmd_tags(Command):
5375
__doc__ = """List tags.
5084
5377
This command shows a table of tag names and the revisions they reference.
5139
5430
tags.sort(key=lambda x: timestamps[x[1]])
5140
5431
if not show_ids:
5141
5432
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5142
revno_map = branch.get_revision_id_to_revno_map()
5143
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5144
for tag, revid in tags ]
5433
for index, (tag, revid) in enumerate(tags):
5435
revno = branch.revision_id_to_dotted_revno(revid)
5436
if isinstance(revno, tuple):
5437
revno = '.'.join(map(str, revno))
5438
except errors.NoSuchRevision:
5439
# Bad tag data/merges can lead to tagged revisions
5440
# which are not in this branch. Fail gracefully ...
5442
tags[index] = (tag, revno)
5145
5444
for tag, revspec in tags:
5146
5445
self.outf.write('%-20s %s\n' % (tag, revspec))
5149
5448
class cmd_reconfigure(Command):
5150
"""Reconfigure the type of a bzr directory.
5449
__doc__ = """Reconfigure the type of a bzr directory.
5152
5451
A target configuration must be specified.
5184
5483
Option('bind-to', help='Branch to bind checkout to.', type=str),
5185
5484
Option('force',
5186
help='Perform reconfiguration even if local changes'
5485
help='Perform reconfiguration even if local changes'
5487
Option('stacked-on',
5488
help='Reconfigure a branch to be stacked on another branch.',
5492
help='Reconfigure a branch to be unstacked. This '
5493
'may require copying substantial data into it.',
5190
def run(self, location=None, target_type=None, bind_to=None, force=False):
5497
def run(self, location=None, target_type=None, bind_to=None, force=False,
5191
5500
directory = bzrdir.BzrDir.open(location)
5501
if stacked_on and unstacked:
5502
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5503
elif stacked_on is not None:
5504
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5506
reconfigure.ReconfigureUnstacked().apply(directory)
5507
# At the moment you can use --stacked-on and a different
5508
# reconfiguration shape at the same time; there seems no good reason
5192
5510
if target_type is None:
5193
raise errors.BzrCommandError('No target configuration specified')
5511
if stacked_on or unstacked:
5514
raise errors.BzrCommandError('No target configuration '
5194
5516
elif target_type == 'branch':
5195
5517
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5196
5518
elif target_type == 'tree':
5233
5555
/path/to/newbranch.
5235
5557
Bound branches use the nickname of its master branch unless it is set
5236
locally, in which case switching will update the the local nickname to be
5558
locally, in which case switching will update the local nickname to be
5237
5559
that of the master.
5240
takes_args = ['to_location']
5562
takes_args = ['to_location?']
5241
5563
takes_options = [Option('force',
5242
help='Switch even if local commits will be lost.')
5564
help='Switch even if local commits will be lost.'),
5566
Option('create-branch', short_name='b',
5567
help='Create the target branch from this one before'
5568
' switching to it.'),
5245
def run(self, to_location, force=False):
5571
def run(self, to_location=None, force=False, create_branch=False,
5246
5573
from bzrlib import switch
5247
5574
tree_location = '.'
5575
revision = _get_one_revision('switch', revision)
5248
5576
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5249
branch = control_dir.open_branch()
5577
if to_location is None:
5578
if revision is None:
5579
raise errors.BzrCommandError('You must supply either a'
5580
' revision or a location')
5251
to_branch = Branch.open(to_location)
5583
branch = control_dir.open_branch()
5584
had_explicit_nick = branch.get_config().has_explicit_nickname()
5252
5585
except errors.NotBranchError:
5253
this_branch = control_dir.open_branch()
5254
# This may be a heavy checkout, where we want the master branch
5255
this_url = this_branch.get_bound_location()
5256
# If not, use a local sibling
5257
if this_url is None:
5258
this_url = this_branch.base
5259
to_branch = Branch.open(
5260
urlutils.join(this_url, '..', to_location))
5261
switch.switch(control_dir, to_branch, force)
5262
if branch.get_config().has_explicit_nickname():
5587
had_explicit_nick = False
5590
raise errors.BzrCommandError('cannot create branch without'
5592
to_location = directory_service.directories.dereference(
5594
if '/' not in to_location and '\\' not in to_location:
5595
# This path is meant to be relative to the existing branch
5596
this_url = self._get_branch_location(control_dir)
5597
to_location = urlutils.join(this_url, '..', to_location)
5598
to_branch = branch.bzrdir.sprout(to_location,
5599
possible_transports=[branch.bzrdir.root_transport],
5600
source_branch=branch).open_branch()
5603
to_branch = Branch.open(to_location)
5604
except errors.NotBranchError:
5605
this_url = self._get_branch_location(control_dir)
5606
to_branch = Branch.open(
5607
urlutils.join(this_url, '..', to_location))
5608
if revision is not None:
5609
revision = revision.as_revision_id(to_branch)
5610
switch.switch(control_dir, to_branch, force, revision_id=revision)
5611
if had_explicit_nick:
5263
5612
branch = control_dir.open_branch() #get the new branch!
5264
5613
branch.nick = to_branch.nick
5265
5614
note('Switched to branch: %s',
5266
5615
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5269
class cmd_guess_renames(Command):
5270
"""Guess which files have been have been renamed, based on their content.
5272
Only versioned files which have been deleted are candidates for rename
5273
detection, and renames to ignored files will not be detected.
5277
work_tree, file_list = tree_files(None, default_branch='.')
5278
work_tree.lock_write()
5617
def _get_branch_location(self, control_dir):
5618
"""Return location of branch for this control dir."""
5280
rename_map.RenameMap.guess_renames(work_tree)
5620
this_branch = control_dir.open_branch()
5621
# This may be a heavy checkout, where we want the master branch
5622
master_location = this_branch.get_bound_location()
5623
if master_location is not None:
5624
return master_location
5625
# If not, use a local sibling
5626
return this_branch.base
5627
except errors.NotBranchError:
5628
format = control_dir.find_branch_format()
5629
if getattr(format, 'get_reference', None) is not None:
5630
return format.get_reference(control_dir)
5632
return control_dir.root_transport.base
5285
5635
class cmd_view(Command):
5286
"""Manage filtered views.
5636
__doc__ = """Manage filtered views.
5288
5638
Views provide a mask over the tree so that users can focus on
5289
5639
a subset of a tree when doing their work. After creating a view,
5505
5880
if writer is None:
5506
5881
writer = bzrlib.option.diff_writer_registry.get()
5508
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5509
message, destroy=destroy).run()
5883
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5884
file_list, message, destroy=destroy)
5510
5889
except errors.UserAbort:
5513
5892
def run_for_list(self):
5514
5893
tree = WorkingTree.open_containing('.')[0]
5515
5894
tree.lock_read()
5517
manager = tree.get_shelf_manager()
5518
shelves = manager.active_shelves()
5519
if len(shelves) == 0:
5520
note('No shelved changes.')
5522
for shelf_id in reversed(shelves):
5523
message = manager.get_metadata(shelf_id).get('message')
5525
message = '<no message>'
5526
self.outf.write('%3d: %s\n' % (shelf_id, message))
5895
self.add_cleanup(tree.unlock)
5896
manager = tree.get_shelf_manager()
5897
shelves = manager.active_shelves()
5898
if len(shelves) == 0:
5899
note('No shelved changes.')
5901
for shelf_id in reversed(shelves):
5902
message = manager.get_metadata(shelf_id).get('message')
5904
message = '<no message>'
5905
self.outf.write('%3d: %s\n' % (shelf_id, message))
5532
5909
class cmd_unshelve(Command):
5533
"""Restore shelved changes.
5910
__doc__ = """Restore shelved changes.
5535
5912
By default, the most recently shelved changes are restored. However if you
5536
5913
specify a shelf by id those changes will be restored instead. This works
5588
5972
dry_run=dry_run, no_prompt=force)
5591
def _create_prefix(cur_transport):
5592
needed = [cur_transport]
5593
# Recurse upwards until we can create a directory successfully
5595
new_transport = cur_transport.clone('..')
5596
if new_transport.base == cur_transport.base:
5597
raise errors.BzrCommandError(
5598
"Failed to create path prefix for %s."
5599
% cur_transport.base)
5601
new_transport.mkdir('.')
5602
except errors.NoSuchFile:
5603
needed.append(new_transport)
5604
cur_transport = new_transport
5975
class cmd_reference(Command):
5976
__doc__ = """list, view and set branch locations for nested trees.
5978
If no arguments are provided, lists the branch locations for nested trees.
5979
If one argument is provided, display the branch location for that tree.
5980
If two arguments are provided, set the branch location for that tree.
5985
takes_args = ['path?', 'location?']
5987
def run(self, path=None, location=None):
5989
if path is not None:
5991
tree, branch, relpath =(
5992
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5993
if path is not None:
5996
tree = branch.basis_tree()
5998
info = branch._get_all_reference_info().iteritems()
5999
self._display_reference_info(tree, branch, info)
5607
# Now we only need to create child directories
5609
cur_transport = needed.pop()
5610
cur_transport.ensure_base()
5613
# these get imported and then picked up by the scan for cmd_*
5614
# TODO: Some more consistent way to split command definitions across files;
5615
# we do need to load at least some information about them to know of
5616
# aliases. ideally we would avoid loading the implementation until the
5617
# details were needed.
5618
from bzrlib.cmd_version_info import cmd_version_info
5619
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5620
from bzrlib.bundle.commands import (
5623
from bzrlib.sign_my_commits import cmd_sign_my_commits
5624
from bzrlib.weave_commands import cmd_versionedfile_list, \
5625
cmd_weave_plan_merge, cmd_weave_merge_text
6001
file_id = tree.path2id(path)
6003
raise errors.NotVersionedError(path)
6004
if location is None:
6005
info = [(file_id, branch.get_reference_info(file_id))]
6006
self._display_reference_info(tree, branch, info)
6008
branch.set_reference_info(file_id, path, location)
6010
def _display_reference_info(self, tree, branch, info):
6012
for file_id, (path, location) in info:
6014
path = tree.id2path(file_id)
6015
except errors.NoSuchId:
6017
ref_list.append((path, location))
6018
for path, location in sorted(ref_list):
6019
self.outf.write('%s %s\n' % (path, location))
6022
def _register_lazy_builtins():
6023
# register lazy builtins from other modules; called at startup and should
6024
# be only called once.
6025
for (name, aliases, module_name) in [
6026
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6027
('cmd_dpush', [], 'bzrlib.foreign'),
6028
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6029
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6030
('cmd_conflicts', [], 'bzrlib.conflicts'),
6031
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6033
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
