362
323
' --revision or a revision_id')
363
324
b = WorkingTree.open_containing(u'.')[0].branch
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')
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'))
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()
392
344
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
345
"""Dump the contents of a btree index file to stdout.
395
347
PATH is a btree index file, it can be any URL. This includes things like
396
348
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
424
To re-create the working tree, use "bzr checkout".
481
426
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
427
takes_args = ['location?']
483
428
takes_options = [
485
430
help='Remove the working tree even if it has '
486
431
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
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()
514
458
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
459
"""Show current revision number.
517
461
This is equal to the number of revisions on this branch.
520
464
_see_also = ['info']
521
465
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
547
self.outf.write(str(revno) + '\n')
468
def run(self, location=u'.'):
469
self.outf.write(str(Branch.open_containing(location)[0].revno()))
470
self.outf.write('\n')
550
473
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
474
"""Show revision number and revision id for a given revision identifier.
554
477
takes_args = ['revision_info*']
563
Option('tree', help='Show revno of working tree'),
567
def run(self, revision=None, directory=u'.', tree=False,
568
revision_info_list=[]):
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
571
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
581
492
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
493
revs.extend(revision)
583
494
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
594
revision_ids.append(b.last_revision())
598
for revision_id in revision_ids:
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)
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
602
507
except errors.NoSuchRevision:
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
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)
612
513
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
514
"""Add specified files or directories.
615
516
In non-recursive mode, all the named items are added, regardless
616
517
of whether they were previously ignored. A warning is given if
684
582
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
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:
690
591
if len(ignored) > 0:
692
593
for glob in sorted(ignored.keys()):
693
594
for path in ignored[glob]:
694
595
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")
698
606
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
607
"""Create a new versioned directory.
701
609
This is equivalent to creating the directory and then adding it.
761
664
revision = _get_one_revision('inventory', revision)
762
665
work_tree, file_list = tree_files(file_list)
763
666
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
765
if revision is not None:
766
tree = revision.as_tree(work_tree.branch)
768
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
783
entries = tree.inventory.entries()
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:
786
691
for path, entry in entries:
787
692
if kind and kind != entry.kind:
817
722
takes_args = ['names*']
818
723
takes_options = [Option("after", help="Move only the bzr identifier"
819
724
" of the file, because the file has already been moved."),
820
Option('auto', help='Automatically guess renames.'),
821
Option('dry-run', help='Avoid making changes when guessing renames.'),
823
726
aliases = ['move', 'rename']
824
727
encoding_type = 'replace'
826
def run(self, names_list, after=False, auto=False, dry_run=False):
828
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
729
def run(self, names_list, after=False):
831
730
if names_list is None:
833
733
if len(names_list) < 2:
834
734
raise errors.BzrCommandError("missing file argument")
835
735
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
840
def run_auto(self, names_list, after, dry_run):
841
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
738
self._run(tree, names_list, rel_names, after)
852
742
def _run(self, tree, names_list, rel_names, after):
853
743
into_existing = osutils.isdir(names_list[-1])
926
815
dest = osutils.pathjoin(dest_parent, dest_tail)
927
816
mutter("attempting to move %s => %s", src, dest)
928
817
tree.rename_one(src, dest, after=after)
930
self.outf.write("%s => %s\n" % (src, dest))
818
self.outf.write("%s => %s\n" % (src, dest))
933
821
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
822
"""Turn this branch into a mirror of another branch.
936
By default, this command only works on branches that have not diverged.
937
Branches are considered diverged if the destination branch's most recent
938
commit is one that has not been merged (directly or indirectly) into the
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.
941
828
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
829
from one into the other. Once one branch has merged, the other should
943
830
be able to pull it again.
945
If you want to replace your local changes and just want your branch to
946
match the remote one, use pull --overwrite. This will work even if the two
947
branches have diverged.
832
If you want to forget your local changes and just update your branch to
833
match the remote one, use pull --overwrite.
949
835
If there is no default location set, the first pull will set it. After
950
836
that, you can omit the location to use the default. To change the
1038
910
if revision is not None:
1039
911
revision_id = revision.as_revision_id(branch_from)
1041
if tree_to is not None:
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1043
change_reporter = delta._ChangeReporter(
1044
unversioned_filter=tree_to.is_ignored,
1045
view_info=view_info)
1046
result = tree_to.pull(
1047
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1050
result = branch_to.pull(
1051
branch_from, overwrite, revision_id, local=local)
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)
1053
result.report(self.outf)
1054
if verbose and result.old_revid != result.new_revid:
1055
log.show_branch_change(
1056
branch_to, self.outf, result.old_revno,
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,
1060
933
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
934
"""Update a mirror of this branch.
1063
936
The target branch will not have its working tree populated because this
1064
937
is both expensive, and is not supported on remote file systems.
1117
987
def run(self, location=None, remember=False, overwrite=False,
1118
988
create_prefix=False, verbose=False, revision=None,
1119
989
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
991
from bzrlib.push import _show_push_branch
993
# Get the source branch and revision_id
1123
994
if directory is None:
1125
# Get the source branch
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1128
# Get the tip's revision_id
996
br_from = Branch.open_containing(directory)[0]
1129
997
revision = _get_one_revision('push', revision)
1130
998
if revision is not None:
1131
999
revision_id = revision.in_history(br_from).rev_id
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1001
revision_id = br_from.last_revision()
1139
1003
# Get the stacked_on branch, if any
1140
1004
if stacked_on is not None:
1141
1005
stacked_on = urlutils.normalize_url(stacked_on)
1192
1056
help='Hard-link working tree files where possible.'),
1193
1057
Option('no-tree',
1194
1058
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1198
1059
Option('stacked',
1199
1060
help='Create a stacked branch referring to the source branch. '
1200
1061
'The new branch will depend on the availability of the source '
1201
1062
'branch for all operations.'),
1202
1063
Option('standalone',
1203
1064
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."),
1212
1066
aliases = ['get', 'clone']
1214
1068
def run(self, from_location, to_location=None, revision=None,
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1069
hardlink=False, stacked=False, standalone=False, no_tree=False):
1218
1070
from bzrlib.tag import _merge_tags_if_possible
1219
1072
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1221
1074
revision = _get_one_revision('branch', revision)
1222
1075
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)
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)
1077
if revision is not None:
1078
revision_id = revision.as_revision_id(br_from)
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'))
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())
1288
1124
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1125
"""Create a new checkout of an existing branch.
1291
1127
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1128
the branch found in '.'. This is useful if you have removed the working tree
1367
1203
def run(self, dir=u'.'):
1368
1204
tree = WorkingTree.open_containing(dir)[0]
1369
1205
tree.lock_read()
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))
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))
1389
1229
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1230
"""Update a tree to have the latest code committed to its branch.
1392
1232
This will perform a merge into the working tree, and may generate
1393
1233
conflicts. If you have any local changes, you will still
1396
1236
If you want to discard your local changes, you can just do a
1397
1237
'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.
1403
1240
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1241
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1242
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1244
def run(self, dir='.'):
1412
1245
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1246
possible_transports = []
1415
master = branch.get_master_branch(
1247
master = tree.branch.get_master_branch(
1416
1248
possible_transports=possible_transports)
1417
1249
if master is not None:
1418
1250
tree.lock_write()
1419
branch_location = master.base
1421
1252
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)
1450
1265
conflicts = tree.update(
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'.")
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'.")
1475
1282
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1283
"""Show information about a working tree, branch or repository.
1478
1285
This command will show all known locations and formats associated to the
1479
1286
tree, branch or repository.
1546
1353
file_list = [f for f in file_list]
1548
1355
tree.lock_write()
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')
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')
1573
1382
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1383
"""Print file_id of a particular file or directory.
1576
1385
The file_id is assigned when the file is first added and remains the
1577
1386
same through all revisions where the file exists, even when it is
1977
1761
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1762
' one or two revision specifiers')
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)
1764
old_tree, new_tree, specific_files, extra_trees = \
1765
_get_trees_to_diff(file_list, revision, old, new,
1988
1767
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1768
specific_files=specific_files,
1990
1769
external_diff_options=diff_options,
1991
1770
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1771
extra_trees=extra_trees, using=using)
1996
1774
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1775
"""List files deleted in the working tree.
1999
1777
# TODO: Show files deleted since a previous revision, or
2000
1778
# between two revisions.
2395
2162
diff_type = 'full'
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2435
Logger(b, rqst).show(lf)
2166
# Build the log formatter
2167
if log_format is None:
2168
log_format = log.log_formatter_registry.get_default(b)
2169
lf = log_format(show_ids=show_ids, to_file=self.outf,
2170
show_timezone=timezone,
2171
delta_format=get_verbosity_level(),
2174
# Choose the algorithm for doing the logging. It's annoying
2175
# having multiple code paths like this but necessary until
2176
# the underlying repository format is faster at generating
2177
# deltas or can provide everything we need from the indices.
2178
# The default algorithm - match-using-deltas - works for
2179
# multiple files and directories and is faster for small
2180
# amounts of history (200 revisions say). However, it's too
2181
# slow for logging a single file in a repository with deep
2182
# history, i.e. > 10K revisions. In the spirit of "do no
2183
# evil when adding features", we continue to use the
2184
# original algorithm - per-file-graph - for the "single
2185
# file that isn't a directory without showing a delta" case.
2186
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2189
# Build the LogRequest and execute it
2190
if len(file_ids) == 0:
2192
rqst = make_log_request_dict(
2193
direction=direction, specific_fileids=file_ids,
2194
start_revision=rev1, end_revision=rev2, limit=limit,
2195
message_search=message, delta_type=delta_type,
2196
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2197
Logger(b, rqst).show(lf)
2438
2202
def _get_revision_range(revisionspec_list, branch, command_name):
2585
2340
note("Ignoring files outside view. View is %s" % view_str)
2587
2342
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2594
if kind is not None and fkind != kind:
2599
fullpath = osutils.pathjoin(relpath, fp)
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2608
fp = osutils.pathjoin(prefix, fp)
2609
kindch = entry.kind_character()
2610
outstring = fp + kindch
2611
ui.ui_factory.clear_term()
2613
outstring = '%-8s %s' % (fc, outstring)
2614
if show_ids and fid is not None:
2615
outstring = "%-50s %s" % (outstring, fid)
2616
self.outf.write(outstring + '\n')
2618
self.outf.write(fp + '\0')
2621
self.outf.write(fid)
2622
self.outf.write('\0')
2630
self.outf.write('%-50s %s\n' % (outstring, my_id))
2632
self.outf.write(outstring + '\n')
2344
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2345
if fp.startswith(relpath):
2346
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2347
if non_recursive and '/' in fp:
2349
if not all and not selection[fc]:
2351
if kind is not None and fkind != kind:
2355
views.check_path_in_view(tree, fp)
2356
except errors.FileOutsideView:
2358
kindch = entry.kind_character()
2359
outstring = fp + kindch
2361
outstring = '%-8s %s' % (fc, outstring)
2362
if show_ids and fid is not None:
2363
outstring = "%-50s %s" % (outstring, fid)
2364
self.outf.write(outstring + '\n')
2366
self.outf.write(fp + '\0')
2369
self.outf.write(fid)
2370
self.outf.write('\0')
2378
self.outf.write('%-50s %s\n' % (outstring, my_id))
2380
self.outf.write(outstring + '\n')
2635
2385
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2386
"""List unknown files.
2648
2398
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2399
"""Ignore specified files or patterns.
2651
2401
See ``bzr help patterns`` for details on the syntax of patterns.
2653
If a .bzrignore file does not exist, the ignore command
2654
will create one and add the specified files or patterns to the newly
2655
created file. The ignore command will also automatically add the
2656
.bzrignore file to be versioned. Creating a .bzrignore file without
2657
the use of the ignore command will require an explicit add command.
2659
2403
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2404
After adding, editing or deleting that file either indirectly by
2661
2405
using this command or directly by using an editor, be sure to commit
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2677
2408
Note: ignore patterns containing shell wildcards must be quoted from
2678
2409
the shell on Unix.
2701
2428
Ignore everything but the "debian" toplevel directory::
2703
2430
bzr ignore "RE:(?!debian/).*"
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2709
bzr ignore "!./local"
2713
2433
_see_also = ['status', 'ignored', 'patterns']
2714
2434
takes_args = ['name_pattern*']
2715
2435
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2436
Option('old-default-rules',
2437
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2440
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2441
from bzrlib import ignores
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
2442
if old_default_rules is not None:
2443
# dump the rules and exit
2444
for pattern in ignores.OLD_DEFAULTS:
2727
2447
if not name_pattern_list:
2728
2448
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2449
"NAME_PATTERN or --old-default-rules")
2730
2450
name_pattern_list = [globbing.normalize_pattern(p)
2731
2451
for p in name_pattern_list]
2732
2452
for name_pattern in name_pattern_list:
2942
2659
chunks = content.splitlines(True)
2943
2660
content = filtered_output_bytes(chunks, filters,
2944
2661
ContentFilterContext(relpath, rev_tree))
2946
2662
self.outf.writelines(content)
2949
2664
self.outf.write(content)
2952
2667
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2668
"""Show the offset in seconds from GMT to local time."""
2955
2670
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2672
print osutils.local_time_offset()
2961
2676
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2964
An explanatory message needs to be given for each commit. This is
2965
often done by using the --message option (getting the message from the
2966
command line) or by using the --file option (getting the message from
2967
a file). If neither of these options is given, an editor is opened for
2968
the user to enter the message. To see the changed files in the
2969
boilerplate text loaded into the editor, use the --show-diff option.
2971
By default, the entire tree is committed and the person doing the
2972
commit is assumed to be the author. These defaults can be overridden
2977
If selected files are specified, only changes to those files are
2978
committed. If a directory is specified then the directory and
2979
everything within it is committed.
2981
When excludes are given, they take precedence over selected files.
2982
For example, to commit only changes within foo, but not changes
2985
bzr commit foo -x foo/bar
2987
A selective commit after a merge is not yet supported.
2991
If the author of the change is not the same person as the committer,
2992
you can specify the author's name using the --author option. The
2993
name should be in the same format as a committer-id, e.g.
2994
"John Doe <jdoe@example.com>". If there is more than one author of
2995
the change you can specify the option multiple times, once for each
3000
A common mistake is to forget to add a new file or directory before
3001
running the commit command. The --strict option checks for unknown
3002
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3008
If you accidentially commit the wrong changes or make a spelling
3009
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3012
Hooks can also be configured to run after a commit. This allows you
3013
to trigger updates to external systems like bug trackers. The --fixes
3014
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2677
"""Commit changes into a new revision.
2679
If no arguments are given, the entire tree is committed.
2681
If selected files are specified, only changes to those files are
2682
committed. If a directory is specified then the directory and everything
2683
within it is committed.
2685
When excludes are given, they take precedence over selected files.
2686
For example, too commit only changes within foo, but not changes within
2689
bzr commit foo -x foo/bar
2691
If author of the change is not the same person as the committer, you can
2692
specify the author's name using the --author option. The name should be
2693
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2694
If there is more than one author of the change you can specify the option
2695
multiple times, once for each author.
2697
A selected-file commit may fail in some cases where the committed
2698
tree would be invalid. Consider::
2703
bzr commit foo -m "committing foo"
2704
bzr mv foo/bar foo/baz
2707
bzr commit foo/bar -m "committing bar but not baz"
2709
In the example above, the last commit will fail by design. This gives
2710
the user the opportunity to decide whether they want to commit the
2711
rename at the same time, separately first, or not at all. (As a general
2712
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2714
Note: A selected-file commit after a merge is not yet supported.
3034
2716
# TODO: Run hooks on tree to-be-committed, and after commit.
3145
2816
if local and not tree.branch.get_bound_location():
3146
2817
raise errors.LocalRequiresBoundBranch()
3148
if message is not None:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3161
ui.ui_factory.show_warning(warning_msg)
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3169
2819
def get_message(commit_obj):
3170
2820
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
2821
my_message = message
2822
if my_message is None and not file:
2823
t = make_commit_message_template_encoded(tree,
3180
2824
selected_list, diff=show_diff,
3181
2825
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3187
2826
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
2827
my_message = edit_commit_message_encoded(t,
3189
2828
start_message=start_message)
3190
2829
if my_message is None:
3191
2830
raise errors.BzrCommandError("please specify a commit"
3192
2831
" message with either --message or --file")
2832
elif my_message and file:
2833
raise errors.BzrCommandError(
2834
"please specify either --message or --file")
2836
my_message = codecs.open(file, 'rt',
2837
osutils.get_user_encoding()).read()
3193
2838
if my_message == "":
3194
2839
raise errors.BzrCommandError("empty commit message specified")
3195
2840
return my_message
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3198
# but the command line should not do that.
3199
if not selected_list:
3200
selected_list = None
3202
2843
tree.commit(message_callback=get_message,
3203
2844
specific_files=selected_list,
3204
2845
allow_pointless=unchanged, strict=strict, local=local,
3205
2846
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3208
2848
exclude=safe_relpath_files(tree, exclude))
3209
2849
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
2850
# FIXME: This should really happen before the file is read in;
2851
# perhaps prepare the commit; get the message; then actually commit
2852
raise errors.BzrCommandError("no changes to commit."
2853
" use --unchanged to commit anyhow")
3212
2854
except ConflictsInTree:
3213
2855
raise errors.BzrCommandError('Conflicts detected in working '
3214
2856
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3233
2874
The working tree and branch checks will only give output if a problem is
3234
2875
detected. The output fields of the repository check are:
3237
This is just the number of revisions checked. It doesn't
3241
This is just the number of versionedfiles checked. It
3242
doesn't indicate a problem.
3244
unreferenced ancestors
3245
Texts that are ancestors of other texts, but
3246
are not properly referenced by the revision ancestry. This is a
3247
subtle problem that Bazaar can work around.
3250
This is the total number of unique file contents
3251
seen in the checked revisions. It does not indicate a problem.
3254
This is the total number of repeated texts seen
3255
in the checked revisions. Texts can be repeated when their file
3256
entries are modified, but the file contents are not. It does not
2877
revisions: This is just the number of revisions checked. It doesn't
2879
versionedfiles: This is just the number of versionedfiles checked. It
2880
doesn't indicate a problem.
2881
unreferenced ancestors: Texts that are ancestors of other texts, but
2882
are not properly referenced by the revision ancestry. This is a
2883
subtle problem that Bazaar can work around.
2884
unique file texts: This is the total number of unique file contents
2885
seen in the checked revisions. It does not indicate a problem.
2886
repeated file texts: This is the total number of repeated texts seen
2887
in the checked revisions. Texts can be repeated when their file
2888
entries are modified, but the file contents are not. It does not
3259
2891
If no restrictions are specified, all Bazaar data that is found at the given
3260
2892
location will be checked.
3624
3254
verbose = not is_quiet()
3625
3255
# TODO: should possibly lock the history file...
3626
3256
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
3258
test_suite_factory = None
3630
3259
benchfile = None
3631
selftest_kwargs = {"verbose": verbose,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3261
selftest_kwargs = {"verbose": verbose,
3263
"stop_on_failure": one,
3264
"transport": transport,
3265
"test_suite_factory": test_suite_factory,
3266
"lsprof_timed": lsprof_timed,
3267
"bench_history": benchfile,
3268
"matching_tests_first": first,
3269
"list_only": list_only,
3270
"random_seed": randomize,
3271
"exclude_pattern": exclude,
3273
"load_list": load_list,
3274
"debug_flags": debugflag,
3275
"starting_with": starting_with
3277
selftest_kwargs.update(self.additional_selftest_args)
3278
result = selftest(**selftest_kwargs)
3280
if benchfile is not None:
3283
note('tests passed')
3285
note('tests failed')
3650
3286
return int(not result)
3653
3289
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3290
"""Show version of bzr."""
3656
3292
encoding_type = 'replace'
3657
3293
takes_options = [
3822
3443
verified = 'inapplicable'
3823
3444
tree = WorkingTree.open_containing(directory)[0]
3446
# die as quickly as possible if there are uncommitted changes
3826
3448
basis_tree = tree.revision_tree(tree.last_revision())
3827
3449
except errors.NoSuchRevision:
3828
3450
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3452
changes = tree.changes_from(basis_tree)
3453
if changes.has_changed():
3833
3454
raise errors.UncommittedChanges(tree)
3835
3456
view_info = _get_view_info_for_change_reporter(tree)
3836
3457
change_reporter = delta._ChangeReporter(
3837
3458
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3461
pb = ui.ui_factory.nested_progress_bar()
3462
cleanups.append(pb.finished)
3464
cleanups.append(tree.unlock)
3465
if location is not None:
3467
mergeable = bundle.read_mergeable_from_url(location,
3468
possible_transports=possible_transports)
3469
except errors.NotABundle:
3473
raise errors.BzrCommandError('Cannot use --uncommitted'
3474
' with bundles or merge directives.')
3476
if revision is not None:
3477
raise errors.BzrCommandError(
3478
'Cannot use -r with merge directives or bundles')
3479
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3482
if merger is None and uncommitted:
3483
if revision is not None and len(revision) > 0:
3484
raise errors.BzrCommandError('Cannot use --uncommitted and'
3485
' --revision at the same time.')
3486
location = self._select_branch_location(tree, location)[0]
3487
other_tree, other_path = WorkingTree.open_containing(location)
3488
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3490
allow_pending = False
3491
if other_path != '':
3492
merger.interesting_files = [other_path]
3495
merger, allow_pending = self._get_merger_from_branch(tree,
3496
location, revision, remember, possible_transports, pb)
3498
merger.merge_type = merge_type
3499
merger.reprocess = reprocess
3500
merger.show_base = show_base
3501
self.sanity_check_merger(merger)
3502
if (merger.base_rev_id == merger.other_rev_id and
3503
merger.other_rev_id is not None):
3504
note('Nothing to do.')
3507
if merger.interesting_files is not None:
3508
raise errors.BzrCommandError('Cannot pull individual files')
3509
if (merger.base_rev_id == tree.last_revision()):
3510
result = tree.pull(merger.other_branch, False,
3511
merger.other_rev_id)
3512
result.report(self.outf)
3514
merger.check_basis(False)
3516
return self._do_preview(merger)
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3891
return self._do_preview(merger)
3893
return self._do_interactive(merger)
3895
return self._do_merge(merger, change_reporter, allow_pending,
3898
def _get_preview(self, merger):
3518
return self._do_merge(merger, change_reporter, allow_pending,
3521
for cleanup in reversed(cleanups):
3524
def _do_preview(self, merger):
3525
from bzrlib.diff import show_diff_trees
3899
3526
tree_merger = merger.make_merger()
3900
3527
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3902
result_tree = tt.get_preview_tree()
3905
def _do_preview(self, merger):
3906
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3529
result_tree = tt.get_preview_tree()
3530
show_diff_trees(merger.this_tree, result_tree, self.outf,
3531
old_label='', new_label='')
3911
3535
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3536
merger.change_reporter = change_reporter
4097
3689
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3690
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3691
if merge_type is None:
4101
3692
merge_type = _mod_merge.Merge3Merger
4102
3693
tree, file_list = tree_files(file_list)
4103
3694
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4110
repository = tree.branch.repository
4111
interesting_ids = None
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
3696
parents = tree.get_parent_ids()
3697
if len(parents) != 2:
3698
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3699
" merges. Not cherrypicking or"
3701
repository = tree.branch.repository
3702
interesting_ids = None
3704
conflicts = tree.conflicts()
3705
if file_list is not None:
3706
interesting_ids = set()
3707
for filename in file_list:
3708
file_id = tree.path2id(filename)
3710
raise errors.NotVersionedError(filename)
3711
interesting_ids.add(file_id)
3712
if tree.kind(file_id) != "directory":
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
3715
for name, ie in tree.inventory.iter_entries(file_id):
3716
interesting_ids.add(ie.file_id)
3717
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3719
# Remerge only supports resolving contents conflicts
3720
allowed_conflicts = ('text conflict', 'contents conflict')
3721
restore_files = [c.path for c in conflicts
3722
if c.typestring in allowed_conflicts]
3723
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3724
tree.set_conflicts(ConflictList(new_conflicts))
3725
if file_list is not None:
3726
restore_files = file_list
3727
for filename in restore_files:
3729
restore(tree.abspath(filename))
3730
except errors.NotConflicted:
3732
# Disable pending merges, because the file texts we are remerging
3733
# have not had those merges performed. If we use the wrong parents
3734
# list, we imply that the working tree text has seen and rejected
3735
# all the changes from the other tree, when in fact those changes
3736
# have not yet been seen.
3737
pb = ui.ui_factory.nested_progress_bar()
3738
tree.set_parent_ids(parents[:1])
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
3740
merger = _mod_merge.Merger.from_revision_ids(pb,
3742
merger.interesting_ids = interesting_ids
3743
merger.merge_type = merge_type
3744
merger.show_base = show_base
3745
merger.reprocess = reprocess
3746
conflicts = merger.do_merge()
3748
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3752
if conflicts > 0:
4180
3776
name. If you name a directory, all the contents of that directory will be
4183
If you have newly added files since the target revision, they will be
4184
removed. If the files to be removed have been changed, backups will be
4185
created as above. Directories containing unknown files will not be
3779
Any files that have been newly added since that revision will be deleted,
3780
with a backup kept if appropriate. Directories containing unknown files
3781
will not be deleted.
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
3783
The working tree contains a list of pending merged revisions, which will
3784
be included as parents in the next commit. Normally, revert clears that
3785
list as well as reverting the files. If any files are specified, revert
3786
leaves the pending merge list alone and reverts only the files. Use "bzr
3787
revert ." in the tree root to revert all files but keep the merge record,
3788
and "bzr revert --forget-merges" to clear the pending merge list without
4195
3789
reverting any files.
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4208
3792
_see_also = ['cat', 'export']
4217
3801
def run(self, revision=None, no_backup=False, file_list=None,
4218
3802
forget_merges=None):
4219
3803
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4225
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3807
tree.set_parent_ids(tree.get_parent_ids()[:1])
3809
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4228
3814
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
3815
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
3816
pb = ui.ui_factory.nested_progress_bar()
3818
tree.revert(file_list, rev_tree, not no_backup, pb,
3819
report_changes=True)
4234
3824
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
3825
"""Test reporting of assertion failures"""
4236
3826
# intended just for use in testing
4389
3969
_get_revision_range(revision,
4390
3970
remote_branch, self.name()))
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4404
show_timezone='original')
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4413
lf.log_revision(revision)
4414
printed_local = True
4417
printed_local = False
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4422
message("You are missing %d revision(s):\n" %
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4427
lf.log_revision(revision)
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4438
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
3972
local_branch.lock_read()
3974
remote_branch.lock_read()
3976
local_extra, remote_extra = find_unmerged(
3977
local_branch, remote_branch, restrict,
3978
backward=not reverse,
3979
include_merges=include_merges,
3980
local_revid_range=local_revid_range,
3981
remote_revid_range=remote_revid_range)
3983
if log_format is None:
3984
registry = log.log_formatter_registry
3985
log_format = registry.get_default(local_branch)
3986
lf = log_format(to_file=self.outf,
3988
show_timezone='original')
3991
if local_extra and not theirs_only:
3992
message("You have %d extra revision(s):\n" %
3994
for revision in iter_log_revisions(local_extra,
3995
local_branch.repository,
3997
lf.log_revision(revision)
3998
printed_local = True
4001
printed_local = False
4003
if remote_extra and not mine_only:
4004
if printed_local is True:
4006
message("You are missing %d revision(s):\n" %
4008
for revision in iter_log_revisions(remote_extra,
4009
remote_branch.repository,
4011
lf.log_revision(revision)
4014
if mine_only and not local_extra:
4015
# We checked local, and found nothing extra
4016
message('This branch is up to date.\n')
4017
elif theirs_only and not remote_extra:
4018
# We checked remote, and found nothing extra
4019
message('Other branch is up to date.\n')
4020
elif not (mine_only or theirs_only or local_extra or
4022
# We checked both branches, and neither one had extra
4024
message("Branches are up to date.\n")
4026
remote_branch.unlock()
4028
local_branch.unlock()
4442
4029
if not status_code and parent is None and other_branch is not None:
4443
4030
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
4032
# handle race conditions - a parent might be set while we run.
4033
if local_branch.get_parent() is None:
4034
local_branch.set_parent(remote_branch.base)
4036
local_branch.unlock()
4448
4037
return status_code
4451
4040
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4041
"""Compress the data within a repository."""
4470
4043
_see_also = ['repositories']
4471
4044
takes_args = ['branch_or_repo?']
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4046
def run(self, branch_or_repo='.'):
4477
4047
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4049
branch = dir.open_branch()
4480
4050
repository = branch.repository
4481
4051
except errors.NotBranchError:
4482
4052
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4056
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4057
"""List the installed plugins.
4489
4059
This command displays the list of installed plugins including
4490
4060
version of plugin and a short description of each.
4589
4161
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4162
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4594
4165
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4600
file_id = wt.path2id(relpath)
4602
file_id = tree.path2id(relpath)
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4167
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4169
file_id = wt.path2id(relpath)
4171
file_id = tree.path2id(relpath)
4173
raise errors.NotVersionedError(filename)
4174
file_version = tree.inventory[file_id].revision
4175
if wt is not None and revision is None:
4176
# If there is a tree and we're not annotating historical
4177
# versions, annotate the working tree's content.
4178
annotate_file_tree(wt, file_id, self.outf, long, all,
4181
annotate_file(branch, file_version, file_id, long, all, self.outf,
4616
4190
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4191
"""Create a digital signature for an existing revision."""
4618
4192
# TODO be able to replace existing ones.
4620
4194
hidden = True # is this right ?
4827
4404
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4407
print 'Dry-run, pretending to remove the above revisions.'
4409
val = raw_input('Press <enter> to continue')
4833
self.outf.write('The above revision(s) will be removed.\n')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4411
print 'The above revision(s) will be removed.'
4413
val = raw_input('Are you sure [y/N]? ')
4414
if val.lower() not in ('y', 'yes'):
4840
4418
mutter('Uncommitting from {%s} to {%s}',
4841
4419
last_rev_id, rev_id)
4842
4420
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4421
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4422
note('You can restore the old tip by running:\n'
4423
' bzr pull . -r revid:%s', last_rev_id)
4848
4426
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4427
"""Break a dead lock on a repository, branch or working directory.
4851
4429
CAUTION: Locks should only be broken when you are sure that the process
4852
4430
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4432
You can get information on what locks are open via the 'bzr info' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4861
4437
takes_args = ['location?']
4908
4480
Option('allow-writes',
4909
4481
help='By default the server is a readonly server. Supplying '
4910
4482
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
4912
'does not perform authentication, so unless some form of '
4913
'external authentication is arranged supplying this '
4914
'option leads to global uncontrolled write access to your '
4483
'the served directory and below.'
4487
def run_smart_server(self, smart_server):
4488
"""Run 'smart_server' forever, with no UI output at all."""
4489
# For the duration of this server, no UI output is permitted. note
4490
# that this may cause problems with blackbox tests. This should be
4491
# changed with care though, as we dont want to use bandwidth sending
4492
# progress over stderr to smart server clients!
4493
from bzrlib import lockdir
4494
old_factory = ui.ui_factory
4495
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4497
ui.ui_factory = ui.SilentUIFactory()
4498
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4499
smart_server.serve()
4501
ui.ui_factory = old_factory
4502
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4919
4504
def get_host_and_port(self, port):
4920
4505
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4507
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4508
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4924
4510
If 'port' has a colon in it, the string before the colon will be
4925
4511
interpreted as the host.
4928
4514
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
4515
and port is an integer TCP/IP port.
4932
if port is not None:
4517
from bzrlib.smart import medium
4518
host = medium.BZR_DEFAULT_INTERFACE
4520
port = medium.BZR_DEFAULT_PORT
4933
4522
if ':' in port:
4934
4523
host, port = port.split(':')
4935
4524
port = int(port)
4936
4525
return host, port
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
4527
def get_smart_server(self, transport, inet, port):
4528
"""Construct a smart server.
4530
:param transport: The base transport from which branches will be
4532
:param inet: If True, serve over stdin and stdout. Used for running
4534
:param port: The port to listen on. By default, it's `
4535
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4537
:return: A smart server.
4539
from bzrlib.smart import medium, server
4541
smart_server = medium.SmartServerPipeStreamMedium(
4542
sys.stdin, sys.stdout, transport)
4544
host, port = self.get_host_and_port(port)
4545
smart_server = server.SmartTCPServer(
4546
transport, host=host, port=port)
4547
note('listening on port: %s' % smart_server.port)
4550
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4551
from bzrlib.transport import get_transport
4552
from bzrlib.transport.chroot import ChrootServer
4941
4553
if directory is None:
4942
4554
directory = os.getcwd()
4943
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
4555
url = urlutils.local_path_to_url(directory)
4947
4556
if not allow_writes:
4948
4557
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4558
chroot_server = ChrootServer(get_transport(url))
4559
chroot_server.setUp()
4560
t = get_transport(chroot_server.get_url())
4561
smart_server = self.get_smart_server(t, inet, port)
4562
self.run_smart_server(smart_server)
4953
4565
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4566
"""Combine a subtree into its containing tree.
4956
This command requires the target tree to be in a rich-root format.
4568
This command is for experimental use only. It requires the target tree
4569
to be in dirstate-with-subtree format, which cannot be converted into
4958
4572
The TREE argument should be an independent tree, inside another tree, but
4959
4573
not part of it. (Such trees can be produced by "bzr split", but also by
5134
4755
directly from the merge directive, without retrieving data from a
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
4758
If --no-bundle is specified, then public_branch is needed (and must be
4759
up-to-date), so that the receiver can perform the merge using the
4760
public_branch. The public_branch is always included if known, so that
4761
people can check it later.
4763
The submit branch defaults to the parent, but can be overridden. Both
4764
submit branch and public branch will be remembered if supplied.
4766
If a public_branch is known for the submit_branch, that public submit
4767
branch is used in the merge instructions. This means that a local mirror
4768
can be used as your actual submit branch, once you have set public_branch
5164
4771
Mail is sent using your preferred mail program. This should be transparent
5165
4772
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5210
4812
short_name='f',
5212
4814
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
4815
help='Write merge directive to this file; '
5214
4816
'use - for stdout.',
5217
help='Refuse to send if there are uncommitted changes in'
5218
' the working tree, --no-strict disables the check.'),
5219
4818
Option('mail-to', help='Mail the request to this address.',
5223
4822
Option('body', help='Body for the email.', type=unicode),
5224
RegistryOption('format',
5225
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
4823
RegistryOption.from_kwargs('format',
4824
'Use the specified output format.',
4825
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4826
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5229
4829
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
4830
no_patch=False, revision=None, remember=False, output=None,
5231
format=None, mail_to=None, message=None, body=None,
5232
strict=None, **kwargs):
5233
from bzrlib.send import send
5234
return send(submit_branch, revision, public_branch, remember,
5235
format, no_bundle, no_patch, output,
5236
kwargs.get('from', '.'), mail_to, message, body,
4831
format='4', mail_to=None, message=None, body=None, **kwargs):
4832
return self._run(submit_branch, revision, public_branch, remember,
4833
format, no_bundle, no_patch, output,
4834
kwargs.get('from', '.'), mail_to, message, body)
4836
def _run(self, submit_branch, revision, public_branch, remember, format,
4837
no_bundle, no_patch, output, from_, mail_to, message, body):
4838
from bzrlib.revision import NULL_REVISION
4839
branch = Branch.open_containing(from_)[0]
4841
outfile = cStringIO.StringIO()
4845
outfile = open(output, 'wb')
4846
# we may need to write data into branch's repository to calculate
4851
config = branch.get_config()
4853
mail_to = config.get_user_option('submit_to')
4854
mail_client = config.get_mail_client()
4855
if (not getattr(mail_client, 'supports_body', False)
4856
and body is not None):
4857
raise errors.BzrCommandError(
4858
'Mail client "%s" does not support specifying body' %
4859
mail_client.__class__.__name__)
4860
if remember and submit_branch is None:
4861
raise errors.BzrCommandError(
4862
'--remember requires a branch to be specified.')
4863
stored_submit_branch = branch.get_submit_branch()
4864
remembered_submit_branch = None
4865
if submit_branch is None:
4866
submit_branch = stored_submit_branch
4867
remembered_submit_branch = "submit"
4869
if stored_submit_branch is None or remember:
4870
branch.set_submit_branch(submit_branch)
4871
if submit_branch is None:
4872
submit_branch = branch.get_parent()
4873
remembered_submit_branch = "parent"
4874
if submit_branch is None:
4875
raise errors.BzrCommandError('No submit branch known or'
4877
if remembered_submit_branch is not None:
4878
note('Using saved %s location "%s" to determine what '
4879
'changes to submit.', remembered_submit_branch,
4883
submit_config = Branch.open(submit_branch).get_config()
4884
mail_to = submit_config.get_user_option("child_submit_to")
4886
stored_public_branch = branch.get_public_branch()
4887
if public_branch is None:
4888
public_branch = stored_public_branch
4889
elif stored_public_branch is None or remember:
4890
branch.set_public_branch(public_branch)
4891
if no_bundle and public_branch is None:
4892
raise errors.BzrCommandError('No public branch specified or'
4894
base_revision_id = None
4896
if revision is not None:
4897
if len(revision) > 2:
4898
raise errors.BzrCommandError('bzr send takes '
4899
'at most two one revision identifiers')
4900
revision_id = revision[-1].as_revision_id(branch)
4901
if len(revision) == 2:
4902
base_revision_id = revision[0].as_revision_id(branch)
4903
if revision_id is None:
4904
revision_id = branch.last_revision()
4905
if revision_id == NULL_REVISION:
4906
raise errors.BzrCommandError('No revisions to submit.')
4908
directive = merge_directive.MergeDirective2.from_objects(
4909
branch.repository, revision_id, time.time(),
4910
osutils.local_time_offset(), submit_branch,
4911
public_branch=public_branch, include_patch=not no_patch,
4912
include_bundle=not no_bundle, message=message,
4913
base_revision_id=base_revision_id)
4914
elif format == '0.9':
4917
patch_type = 'bundle'
4919
raise errors.BzrCommandError('Format 0.9 does not'
4920
' permit bundle with no patch')
4926
directive = merge_directive.MergeDirective.from_objects(
4927
branch.repository, revision_id, time.time(),
4928
osutils.local_time_offset(), submit_branch,
4929
public_branch=public_branch, patch_type=patch_type,
4932
outfile.writelines(directive.to_lines())
4934
subject = '[MERGE] '
4935
if message is not None:
4938
revision = branch.repository.get_revision(revision_id)
4939
subject += revision.get_summary()
4940
basename = directive.get_disk_name(branch)
4941
mail_client.compose_merge_request(mail_to, subject,
5241
4950
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
4952
"""Create a merge-directive for submitting changes.
5244
4954
A merge directive provides many things needed for requesting merges:
5302
5010
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5303
5011
no_patch=False, revision=None, remember=False, output=None,
5304
format=None, strict=None, **kwargs):
5012
format='4', **kwargs):
5305
5013
if output is None:
5307
from bzrlib.send import send
5308
return send(submit_branch, revision, public_branch, remember,
5015
return self._run(submit_branch, revision, public_branch, remember,
5309
5016
format, no_bundle, no_patch, output,
5310
kwargs.get('from', '.'), None, None, None,
5311
self.outf, strict=strict)
5017
kwargs.get('from', '.'), None, None, None)
5314
5020
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5021
"""Create, remove or modify a tag naming a revision.
5317
5023
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5024
(--revision) option can be given -rtag:X, where X is any previously
5359
5060
branch, relpath = Branch.open_containing(directory)
5360
5061
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5369
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5371
"Tags can only be placed on a single revision, "
5373
revision_id = revision[0].as_revision_id(branch)
5064
branch.tags.delete_tag(tag_name)
5065
self.outf.write('Deleted tag %s.\n' % tag_name)
5375
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5382
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5068
if len(revision) != 1:
5069
raise errors.BzrCommandError(
5070
"Tags can only be placed on a single revision, "
5072
revision_id = revision[0].as_revision_id(branch)
5074
revision_id = branch.last_revision()
5075
if (not force) and branch.tags.has_tag(tag_name):
5076
raise errors.TagAlreadyExists(tag_name)
5077
branch.tags.set_tag(tag_name, revision_id)
5078
self.outf.write('Created tag %s.\n' % tag_name)
5387
5083
class cmd_tags(Command):
5388
__doc__ = """List tags.
5390
5086
This command shows a table of tag names and the revisions they reference.
5443
5141
tags.sort(key=lambda x: timestamps[x[1]])
5444
5142
if not show_ids:
5445
5143
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
for index, (tag, revid) in enumerate(tags):
5448
revno = branch.revision_id_to_dotted_revno(revid)
5449
if isinstance(revno, tuple):
5450
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5452
# Bad tag data/merges can lead to tagged revisions
5453
# which are not in this branch. Fail gracefully ...
5455
tags[index] = (tag, revno)
5144
revno_map = branch.get_revision_id_to_revno_map()
5145
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5146
for tag, revid in tags ]
5457
5147
for tag, revspec in tags:
5458
5148
self.outf.write('%-20s %s\n' % (tag, revspec))
5461
5151
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5152
"""Reconfigure the type of a bzr directory.
5464
5154
A target configuration must be specified.
5496
5186
Option('bind-to', help='Branch to bind checkout to.', type=str),
5497
5187
Option('force',
5498
help='Perform reconfiguration even if local changes'
5500
Option('stacked-on',
5501
help='Reconfigure a branch to be stacked on another branch.',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
5188
help='Perform reconfiguration even if local changes'
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5192
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
5193
directory = bzrdir.BzrDir.open(location)
5514
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5516
elif stacked_on is not None:
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5519
reconfigure.ReconfigureUnstacked().apply(directory)
5520
# At the moment you can use --stacked-on and a different
5521
# reconfiguration shape at the same time; there seems no good reason
5523
5194
if target_type is None:
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5195
raise errors.BzrCommandError('No target configuration specified')
5529
5196
elif target_type == 'branch':
5530
5197
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
5198
elif target_type == 'tree':
5568
5235
/path/to/newbranch.
5570
5237
Bound branches use the nickname of its master branch unless it is set
5571
locally, in which case switching will update the local nickname to be
5238
locally, in which case switching will update the the local nickname to be
5572
5239
that of the master.
5575
takes_args = ['to_location?']
5242
takes_args = ['to_location']
5576
5243
takes_options = [Option('force',
5577
help='Switch even if local commits will be lost.'),
5579
Option('create-branch', short_name='b',
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
5244
help='Switch even if local commits will be lost.')
5584
def run(self, to_location=None, force=False, create_branch=False,
5247
def run(self, to_location, force=False):
5586
5248
from bzrlib import switch
5587
5249
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5250
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5251
branch = control_dir.open_branch()
5596
branch = control_dir.open_branch()
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5253
to_branch = Branch.open(to_location)
5598
5254
except errors.NotBranchError:
5600
had_explicit_nick = False
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
if had_explicit_nick:
5255
this_branch = control_dir.open_branch()
5256
# This may be a heavy checkout, where we want the master branch
5257
this_url = this_branch.get_bound_location()
5258
# If not, use a local sibling
5259
if this_url is None:
5260
this_url = this_branch.base
5261
to_branch = Branch.open(
5262
urlutils.join(this_url, '..', to_location))
5263
switch.switch(control_dir, to_branch, force)
5264
if branch.get_config().has_explicit_nickname():
5625
5265
branch = control_dir.open_branch() #get the new branch!
5626
5266
branch.nick = to_branch.nick
5627
5267
note('Switched to branch: %s',
5628
5268
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5271
class cmd_guess_renames(Command):
5272
"""Guess which files have been have been renamed, based on their content.
5274
Only versioned files which have been deleted are candidates for rename
5275
detection, and renames to ignored files will not be detected.
5279
work_tree, file_list = tree_files(None, default_branch='.')
5280
work_tree.lock_write()
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5282
rename_map.RenameMap.guess_renames(work_tree)
5648
5287
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5288
"""Manage filtered views.
5651
5290
Views provide a mask over the tree so that users can focus on
5652
5291
a subset of a tree when doing their work. After creating a view,
5893
5507
if writer is None:
5894
5508
writer = bzrlib.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5510
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5511
message, destroy=destroy).run()
5902
5512
except errors.UserAbort:
5905
5515
def run_for_list(self):
5906
5516
tree = WorkingTree.open_containing('.')[0]
5907
5517
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5519
manager = tree.get_shelf_manager()
5520
shelves = manager.active_shelves()
5521
if len(shelves) == 0:
5522
note('No shelved changes.')
5524
for shelf_id in reversed(shelves):
5525
message = manager.get_metadata(shelf_id).get('message')
5527
message = '<no message>'
5528
self.outf.write('%3d: %s\n' % (shelf_id, message))
5922
5534
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5535
"""Restore shelved changes.
5925
5537
By default, the most recently shelved changes are restored. However if you
5926
5538
specify a shelf by id those changes will be restored instead. This works
5985
5590
dry_run=dry_run, no_prompt=force)
5988
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5991
If no arguments are provided, lists the branch locations for nested trees.
5992
If one argument is provided, display the branch location for that tree.
5993
If two arguments are provided, set the branch location for that tree.
5998
takes_args = ['path?', 'location?']
6000
def run(self, path=None, location=None):
6002
if path is not None:
6004
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6006
if path is not None:
6009
tree = branch.basis_tree()
6011
info = branch._get_all_reference_info().iteritems()
6012
self._display_reference_info(tree, branch, info)
5593
def _create_prefix(cur_transport):
5594
needed = [cur_transport]
5595
# Recurse upwards until we can create a directory successfully
5597
new_transport = cur_transport.clone('..')
5598
if new_transport.base == cur_transport.base:
5599
raise errors.BzrCommandError(
5600
"Failed to create path prefix for %s."
5601
% cur_transport.base)
5603
new_transport.mkdir('.')
5604
except errors.NoSuchFile:
5605
needed.append(new_transport)
5606
cur_transport = new_transport
6014
file_id = tree.path2id(path)
6016
raise errors.NotVersionedError(path)
6017
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6019
self._display_reference_info(tree, branch, info)
6021
branch.set_reference_info(file_id, path, location)
6023
def _display_reference_info(self, tree, branch, info):
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6030
ref_list.append((path, location))
6031
for path, location in sorted(ref_list):
6032
self.outf.write('%s %s\n' % (path, location))
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
5609
# Now we only need to create child directories
5611
cur_transport = needed.pop()
5612
cur_transport.ensure_base()
5615
# these get imported and then picked up by the scan for cmd_*
5616
# TODO: Some more consistent way to split command definitions across files;
5617
# we do need to load at least some information about them to know of
5618
# aliases. ideally we would avoid loading the implementation until the
5619
# details were needed.
5620
from bzrlib.cmd_version_info import cmd_version_info
5621
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5622
from bzrlib.bundle.commands import (
5625
from bzrlib.sign_my_commits import cmd_sign_my_commits
5626
from bzrlib.weave_commands import cmd_versionedfile_list, \
5627
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
