323
358
' --revision or a revision_id')
324
359
b = WorkingTree.open_containing(u'.')[0].branch
326
# TODO: jam 20060112 should cat-revision always output utf-8?
327
if revision_id is not None:
328
revision_id = osutils.safe_revision_id(revision_id, warn=False)
330
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
331
except errors.NoSuchRevision:
332
msg = "The repository %s contains no revision %s." % (b.repository.base,
334
raise errors.BzrCommandError(msg)
335
elif revision is not None:
338
raise errors.BzrCommandError('You cannot specify a NULL'
340
rev_id = rev.as_revision_id(b)
341
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
361
revisions = b.repository.revisions
362
if revisions is None:
363
raise errors.BzrCommandError('Repository %r does not support '
364
'access to raw revision texts')
366
b.repository.lock_read()
368
# TODO: jam 20060112 should cat-revision always output utf-8?
369
if revision_id is not None:
370
revision_id = osutils.safe_revision_id(revision_id, warn=False)
372
self.print_revision(revisions, revision_id)
373
except errors.NoSuchRevision:
374
msg = "The repository %s contains no revision %s." % (
375
b.repository.base, revision_id)
376
raise errors.BzrCommandError(msg)
377
elif revision is not None:
380
raise errors.BzrCommandError(
381
'You cannot specify a NULL revision.')
382
rev_id = rev.as_revision_id(b)
383
self.print_revision(revisions, rev_id)
385
b.repository.unlock()
344
388
class cmd_dump_btree(Command):
345
389
"""Dump the contents of a btree index file to stdout.
424
475
To re-create the working tree, use "bzr checkout".
426
477
_see_also = ['checkout', 'working-trees']
427
takes_args = ['location?']
478
takes_args = ['location*']
428
479
takes_options = [
430
481
help='Remove the working tree even if it has '
431
482
'uncommitted changes.'),
434
def run(self, location='.', force=False):
435
d = bzrdir.BzrDir.open(location)
438
working = d.open_workingtree()
439
except errors.NoWorkingTree:
440
raise errors.BzrCommandError("No working tree to remove")
441
except errors.NotLocalUrl:
442
raise errors.BzrCommandError("You cannot remove the working tree of a "
445
changes = working.changes_from(working.basis_tree())
446
if changes.has_changed():
447
raise errors.UncommittedChanges(working)
449
working_path = working.bzrdir.root_transport.base
450
branch_path = working.branch.bzrdir.root_transport.base
451
if working_path != branch_path:
452
raise errors.BzrCommandError("You cannot remove the working tree from "
453
"a lightweight checkout")
455
d.destroy_workingtree()
485
def run(self, location_list, force=False):
486
if not location_list:
489
for location in location_list:
490
d = bzrdir.BzrDir.open(location)
493
working = d.open_workingtree()
494
except errors.NoWorkingTree:
495
raise errors.BzrCommandError("No working tree to remove")
496
except errors.NotLocalUrl:
497
raise errors.BzrCommandError("You cannot remove the working tree"
500
if (working.has_changes()):
501
raise errors.UncommittedChanges(working)
503
working_path = working.bzrdir.root_transport.base
504
branch_path = working.branch.bzrdir.root_transport.base
505
if working_path != branch_path:
506
raise errors.BzrCommandError("You cannot remove the working tree"
507
" from a lightweight checkout")
509
d.destroy_workingtree()
458
512
class cmd_revno(Command):
561
Option('tree', help='Show revno of working tree'),
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
565
def run(self, revision=None, directory=u'.', tree=False,
566
revision_info_list=[]):
569
wt = WorkingTree.open_containing(directory)[0]
572
self.add_cleanup(wt.unlock)
573
except (errors.NoWorkingTree, errors.NotLocalUrl):
575
b = Branch.open_containing(directory)[0]
577
self.add_cleanup(b.unlock)
492
579
if revision is not None:
493
revs.extend(revision)
580
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
494
581
if revision_info_list is not None:
495
for rev in revision_info_list:
496
revs.append(RevisionSpec.from_string(rev))
498
b = Branch.open_containing(directory)[0]
501
revs.append(RevisionSpec.from_string('-1'))
504
revision_id = rev.as_revision_id(b)
582
for rev_str in revision_info_list:
583
rev_spec = RevisionSpec.from_string(rev_str)
584
revision_ids.append(rev_spec.as_revision_id(b))
585
# No arguments supplied, default to the last revision
586
if len(revision_ids) == 0:
589
raise errors.NoWorkingTree(directory)
590
revision_ids.append(wt.last_revision())
592
revision_ids.append(b.last_revision())
596
for revision_id in revision_ids:
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
598
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
599
revno = '.'.join(str(i) for i in dotted_revno)
507
600
except errors.NoSuchRevision:
508
dotted_map = b.get_revision_id_to_revno_map()
509
revno = '.'.join(str(i) for i in dotted_map[revision_id])
510
print '%s %s' % (revno, revision_id)
602
maxlen = max(maxlen, len(revno))
603
revinfos.append([revno, revision_id])
607
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
513
610
class cmd_add(Command):
664
759
revision = _get_one_revision('inventory', revision)
665
760
work_tree, file_list = tree_files(file_list)
666
761
work_tree.lock_read()
668
if revision is not None:
669
tree = revision.as_tree(work_tree.branch)
671
extra_trees = [work_tree]
677
if file_list is not None:
678
file_ids = tree.paths2ids(file_list, trees=extra_trees,
679
require_versioned=True)
680
# find_ids_across_trees may include some paths that don't
682
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
683
for file_id in file_ids if file_id in tree)
685
entries = tree.inventory.entries()
688
if tree is not work_tree:
762
self.add_cleanup(work_tree.unlock)
763
if revision is not None:
764
tree = revision.as_tree(work_tree.branch)
766
extra_trees = [work_tree]
768
self.add_cleanup(tree.unlock)
773
if file_list is not None:
774
file_ids = tree.paths2ids(file_list, trees=extra_trees,
775
require_versioned=True)
776
# find_ids_across_trees may include some paths that don't
778
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
779
for file_id in file_ids if file_id in tree)
781
entries = tree.inventory.entries()
691
784
for path, entry in entries:
692
785
if kind and kind != entry.kind:
722
815
takes_args = ['names*']
723
816
takes_options = [Option("after", help="Move only the bzr identifier"
724
817
" of the file, because the file has already been moved."),
818
Option('auto', help='Automatically guess renames.'),
819
Option('dry-run', help='Avoid making changes when guessing renames.'),
726
821
aliases = ['move', 'rename']
727
822
encoding_type = 'replace'
729
def run(self, names_list, after=False):
824
def run(self, names_list, after=False, auto=False, dry_run=False):
826
return self.run_auto(names_list, after, dry_run)
828
raise errors.BzrCommandError('--dry-run requires --auto.')
730
829
if names_list is None:
733
831
if len(names_list) < 2:
734
832
raise errors.BzrCommandError("missing file argument")
735
833
tree, rel_names = tree_files(names_list, canonicalize=False)
738
self._run(tree, names_list, rel_names, after)
834
tree.lock_tree_write()
835
self.add_cleanup(tree.unlock)
836
self._run(tree, names_list, rel_names, after)
838
def run_auto(self, names_list, after, dry_run):
839
if names_list is not None and len(names_list) > 1:
840
raise errors.BzrCommandError('Only one path may be specified to'
843
raise errors.BzrCommandError('--after cannot be specified with'
845
work_tree, file_list = tree_files(names_list, default_branch='.')
846
work_tree.lock_tree_write()
847
self.add_cleanup(work_tree.unlock)
848
rename_map.RenameMap.guess_renames(work_tree, dry_run)
742
850
def _run(self, tree, names_list, rel_names, after):
743
851
into_existing = osutils.isdir(names_list[-1])
815
924
dest = osutils.pathjoin(dest_parent, dest_tail)
816
925
mutter("attempting to move %s => %s", src, dest)
817
926
tree.rename_one(src, dest, after=after)
818
self.outf.write("%s => %s\n" % (src, dest))
928
self.outf.write("%s => %s\n" % (src, dest))
821
931
class cmd_pull(Command):
822
932
"""Turn this branch into a mirror of another branch.
824
This command only works on branches that have not diverged. Branches are
825
considered diverged if the destination branch's most recent commit is one
826
that has not been merged (directly or indirectly) into the parent.
934
By default, this command only works on branches that have not diverged.
935
Branches are considered diverged if the destination branch's most recent
936
commit is one that has not been merged (directly or indirectly) into the
828
939
If branches have diverged, you can use 'bzr merge' to integrate the changes
829
940
from one into the other. Once one branch has merged, the other should
830
941
be able to pull it again.
832
If you want to forget your local changes and just update your branch to
833
match the remote one, use pull --overwrite.
943
If you want to replace your local changes and just want your branch to
944
match the remote one, use pull --overwrite. This will work even if the two
945
branches have diverged.
835
947
If there is no default location set, the first pull will set it. After
836
948
that, you can omit the location to use the default. To change the
907
1027
if branch_to.get_parent() is None or remember:
908
1028
branch_to.set_parent(branch_from.base)
1030
if branch_from is not branch_to:
1031
branch_from.lock_read()
1032
self.add_cleanup(branch_from.unlock)
910
1033
if revision is not None:
911
1034
revision_id = revision.as_revision_id(branch_from)
913
1036
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)
1037
self.add_cleanup(branch_to.unlock)
1038
if tree_to is not None:
1039
view_info = _get_view_info_for_change_reporter(tree_to)
1040
change_reporter = delta._ChangeReporter(
1041
unversioned_filter=tree_to.is_ignored,
1042
view_info=view_info)
1043
result = tree_to.pull(
1044
branch_from, overwrite, revision_id, change_reporter,
1045
possible_transports=possible_transports, local=local)
1047
result = branch_to.pull(
1048
branch_from, overwrite, revision_id, local=local)
925
result.report(self.outf)
926
if verbose and result.old_revid != result.new_revid:
927
log.show_branch_change(branch_to, self.outf, result.old_revno,
1050
result.report(self.outf)
1051
if verbose and result.old_revid != result.new_revid:
1052
log.show_branch_change(
1053
branch_to, self.outf, result.old_revno,
933
1057
class cmd_push(Command):
987
1114
def run(self, location=None, remember=False, overwrite=False,
988
1115
create_prefix=False, verbose=False, revision=None,
989
1116
use_existing_dir=False, directory=None, stacked_on=None,
1117
stacked=False, strict=None):
991
1118
from bzrlib.push import _show_push_branch
993
# Get the source branch and revision_id
994
1120
if directory is None:
996
br_from = Branch.open_containing(directory)[0]
1122
# Get the source branch
1124
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1126
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1127
if strict is None: strict = True # default value
1128
# Get the tip's revision_id
997
1129
revision = _get_one_revision('push', revision)
998
1130
if revision is not None:
999
1131
revision_id = revision.in_history(br_from).rev_id
1001
revision_id = br_from.last_revision()
1134
if strict and tree is not None and revision_id is None:
1135
if (tree.has_changes()):
1136
raise errors.UncommittedChanges(
1137
tree, more='Use --no-strict to force the push.')
1138
if tree.last_revision() != tree.branch.last_revision():
1139
# The tree has lost sync with its branch, there is little
1140
# chance that the user is aware of it but he can still force
1141
# the push with --no-strict
1142
raise errors.OutOfDateTree(
1143
tree, more='Use --no-strict to force the push.')
1003
1145
# Get the stacked_on branch, if any
1004
1146
if stacked_on is not None:
1056
1198
help='Hard-link working tree files where possible.'),
1057
1199
Option('no-tree',
1058
1200
help="Create a branch without a working-tree."),
1202
help="Switch the checkout in the current directory "
1203
"to the new branch."),
1059
1204
Option('stacked',
1060
1205
help='Create a stacked branch referring to the source branch. '
1061
1206
'The new branch will depend on the availability of the source '
1062
1207
'branch for all operations.'),
1063
1208
Option('standalone',
1064
1209
help='Do not use a shared repository, even if available.'),
1210
Option('use-existing-dir',
1211
help='By default branch will fail if the target'
1212
' directory exists, but does not already'
1213
' have a control directory. This flag will'
1214
' allow branch to proceed.'),
1216
help="Bind new branch to from location."),
1066
1218
aliases = ['get', 'clone']
1068
1220
def run(self, from_location, to_location=None, revision=None,
1069
hardlink=False, stacked=False, standalone=False, no_tree=False):
1221
hardlink=False, stacked=False, standalone=False, no_tree=False,
1222
use_existing_dir=False, switch=False, bind=False):
1223
from bzrlib import switch as _mod_switch
1070
1224
from bzrlib.tag import _merge_tags_if_possible
1072
1225
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1074
1227
revision = _get_one_revision('branch', revision)
1075
1228
br_from.lock_read()
1229
self.add_cleanup(br_from.unlock)
1230
if revision is not None:
1231
revision_id = revision.as_revision_id(br_from)
1233
# FIXME - wt.last_revision, fallback to branch, fall back to
1234
# None or perhaps NULL_REVISION to mean copy nothing
1236
revision_id = br_from.last_revision()
1237
if to_location is None:
1238
to_location = urlutils.derive_to_location(from_location)
1239
to_transport = transport.get_transport(to_location)
1077
if revision is not None:
1078
revision_id = revision.as_revision_id(br_from)
1241
to_transport.mkdir('.')
1242
except errors.FileExists:
1243
if not use_existing_dir:
1244
raise errors.BzrCommandError('Target directory "%s" '
1245
'already exists.' % to_location)
1080
# FIXME - wt.last_revision, fallback to branch, fall back to
1081
# None or perhaps NULL_REVISION to mean copy nothing
1083
revision_id = br_from.last_revision()
1084
if to_location is None:
1085
to_location = urlutils.derive_to_location(from_location)
1086
to_transport = transport.get_transport(to_location)
1088
to_transport.mkdir('.')
1089
except errors.FileExists:
1090
raise errors.BzrCommandError('Target directory "%s" already'
1091
' exists.' % to_location)
1092
except errors.NoSuchFile:
1093
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1096
# preserve whatever source format we have.
1097
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1098
possible_transports=[to_transport],
1099
accelerator_tree=accelerator_tree,
1100
hardlink=hardlink, stacked=stacked,
1101
force_new_repo=standalone,
1102
create_tree_if_local=not no_tree,
1103
source_branch=br_from)
1104
branch = dir.open_branch()
1105
except errors.NoSuchRevision:
1106
to_transport.delete_tree('.')
1107
msg = "The branch %s has no revision %s." % (from_location,
1109
raise errors.BzrCommandError(msg)
1110
_merge_tags_if_possible(br_from, branch)
1111
# If the source branch is stacked, the new branch may
1112
# be stacked whether we asked for that explicitly or not.
1113
# We therefore need a try/except here and not just 'if stacked:'
1115
note('Created new stacked branch referring to %s.' %
1116
branch.get_stacked_on_url())
1117
except (errors.NotStacked, errors.UnstackableBranchFormat,
1118
errors.UnstackableRepositoryFormat), e:
1119
note('Branched %d revision(s).' % branch.revno())
1248
bzrdir.BzrDir.open_from_transport(to_transport)
1249
except errors.NotBranchError:
1252
raise errors.AlreadyBranchError(to_location)
1253
except errors.NoSuchFile:
1254
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1257
# preserve whatever source format we have.
1258
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1259
possible_transports=[to_transport],
1260
accelerator_tree=accelerator_tree,
1261
hardlink=hardlink, stacked=stacked,
1262
force_new_repo=standalone,
1263
create_tree_if_local=not no_tree,
1264
source_branch=br_from)
1265
branch = dir.open_branch()
1266
except errors.NoSuchRevision:
1267
to_transport.delete_tree('.')
1268
msg = "The branch %s has no revision %s." % (from_location,
1270
raise errors.BzrCommandError(msg)
1271
_merge_tags_if_possible(br_from, branch)
1272
# If the source branch is stacked, the new branch may
1273
# be stacked whether we asked for that explicitly or not.
1274
# We therefore need a try/except here and not just 'if stacked:'
1276
note('Created new stacked branch referring to %s.' %
1277
branch.get_stacked_on_url())
1278
except (errors.NotStacked, errors.UnstackableBranchFormat,
1279
errors.UnstackableRepositoryFormat), e:
1280
note('Branched %d revision(s).' % branch.revno())
1282
# Bind to the parent
1283
parent_branch = Branch.open(from_location)
1284
branch.bind(parent_branch)
1285
note('New branch bound to %s' % from_location)
1287
# Switch to the new branch
1288
wt, _ = WorkingTree.open_containing('.')
1289
_mod_switch.switch(wt.bzrdir, branch)
1290
note('Switched to branch: %s',
1291
urlutils.unescape_for_display(branch.base, 'utf-8'))
1124
1294
class cmd_checkout(Command):
1203
1373
def run(self, dir=u'.'):
1204
1374
tree = WorkingTree.open_containing(dir)[0]
1205
1375
tree.lock_read()
1207
new_inv = tree.inventory
1208
old_tree = tree.basis_tree()
1209
old_tree.lock_read()
1211
old_inv = old_tree.inventory
1213
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1214
for f, paths, c, v, p, n, k, e in iterator:
1215
if paths[0] == paths[1]:
1219
renames.append(paths)
1221
for old_name, new_name in renames:
1222
self.outf.write("%s => %s\n" % (old_name, new_name))
1376
self.add_cleanup(tree.unlock)
1377
new_inv = tree.inventory
1378
old_tree = tree.basis_tree()
1379
old_tree.lock_read()
1380
self.add_cleanup(old_tree.unlock)
1381
old_inv = old_tree.inventory
1383
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1384
for f, paths, c, v, p, n, k, e in iterator:
1385
if paths[0] == paths[1]:
1389
renames.append(paths)
1391
for old_name, new_name in renames:
1392
self.outf.write("%s => %s\n" % (old_name, new_name))
1229
1395
class cmd_update(Command):
1236
1402
If you want to discard your local changes, you can just do a
1237
1403
'bzr revert' instead of 'bzr commit' after the update.
1405
If the tree's branch is bound to a master branch, it will also update
1406
the branch from the master.
1240
1409
_see_also = ['pull', 'working-trees', 'status-flags']
1241
1410
takes_args = ['dir?']
1411
takes_options = ['revision']
1242
1412
aliases = ['up']
1244
def run(self, dir='.'):
1414
def run(self, dir='.', revision=None):
1415
if revision is not None and len(revision) != 1:
1416
raise errors.BzrCommandError(
1417
"bzr update --revision takes exactly one revision")
1245
1418
tree = WorkingTree.open_containing(dir)[0]
1419
branch = tree.branch
1246
1420
possible_transports = []
1247
master = tree.branch.get_master_branch(
1421
master = branch.get_master_branch(
1248
1422
possible_transports=possible_transports)
1249
1423
if master is not None:
1250
1424
tree.lock_write()
1425
branch_location = master.base
1252
1427
tree.lock_tree_write()
1428
branch_location = tree.branch.base
1429
self.add_cleanup(tree.unlock)
1430
# get rid of the final '/' and be ready for display
1431
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1433
existing_pending_merges = tree.get_parent_ids()[1:]
1437
# may need to fetch data into a heavyweight checkout
1438
# XXX: this may take some time, maybe we should display a
1440
old_tip = branch.update(possible_transports)
1441
if revision is not None:
1442
revision_id = revision[0].as_revision_id(branch)
1444
revision_id = branch.last_revision()
1445
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1446
revno = branch.revision_id_to_revno(revision_id)
1447
note("Tree is up to date at revision %d of branch %s" %
1448
(revno, branch_location))
1450
view_info = _get_view_info_for_change_reporter(tree)
1451
change_reporter = delta._ChangeReporter(
1452
unversioned_filter=tree.is_ignored,
1453
view_info=view_info)
1254
existing_pending_merges = tree.get_parent_ids()[1:]
1255
last_rev = _mod_revision.ensure_null(tree.last_revision())
1256
if last_rev == _mod_revision.ensure_null(
1257
tree.branch.last_revision()):
1258
# may be up to date, check master too.
1259
if master is None or last_rev == _mod_revision.ensure_null(
1260
master.last_revision()):
1261
revno = tree.branch.revision_id_to_revno(last_rev)
1262
note("Tree is up to date at revision %d." % (revno,))
1264
view_info = _get_view_info_for_change_reporter(tree)
1265
1455
conflicts = tree.update(
1266
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1267
view_info=view_info), possible_transports=possible_transports)
1268
revno = tree.branch.revision_id_to_revno(
1269
_mod_revision.ensure_null(tree.last_revision()))
1270
note('Updated to revision %d.' % (revno,))
1271
if tree.get_parent_ids()[1:] != existing_pending_merges:
1272
note('Your local commits will now show as pending merges with '
1273
"'bzr status', and can be committed with 'bzr commit'.")
1457
possible_transports=possible_transports,
1458
revision=revision_id,
1460
except errors.NoSuchRevision, e:
1461
raise errors.BzrCommandError(
1462
"branch has no revision %s\n"
1463
"bzr update --revision only works"
1464
" for a revision in the branch history"
1466
revno = tree.branch.revision_id_to_revno(
1467
_mod_revision.ensure_null(tree.last_revision()))
1468
note('Updated to revision %d of branch %s' %
1469
(revno, branch_location))
1470
if tree.get_parent_ids()[1:] != existing_pending_merges:
1471
note('Your local commits will now show as pending merges with '
1472
"'bzr status', and can be committed with 'bzr commit'.")
1282
1479
class cmd_info(Command):
1353
1550
file_list = [f for f in file_list]
1355
1552
tree.lock_write()
1357
# Heuristics should probably all move into tree.remove_smart or
1360
added = tree.changes_from(tree.basis_tree(),
1361
specific_files=file_list).added
1362
file_list = sorted([f[0] for f in added], reverse=True)
1363
if len(file_list) == 0:
1364
raise errors.BzrCommandError('No matching files.')
1365
elif file_list is None:
1366
# missing files show up in iter_changes(basis) as
1367
# versioned-with-no-kind.
1369
for change in tree.iter_changes(tree.basis_tree()):
1370
# Find paths in the working tree that have no kind:
1371
if change[1][1] is not None and change[6][1] is None:
1372
missing.append(change[1][1])
1373
file_list = sorted(missing, reverse=True)
1374
file_deletion_strategy = 'keep'
1375
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1376
keep_files=file_deletion_strategy=='keep',
1377
force=file_deletion_strategy=='force')
1553
self.add_cleanup(tree.unlock)
1554
# Heuristics should probably all move into tree.remove_smart or
1557
added = tree.changes_from(tree.basis_tree(),
1558
specific_files=file_list).added
1559
file_list = sorted([f[0] for f in added], reverse=True)
1560
if len(file_list) == 0:
1561
raise errors.BzrCommandError('No matching files.')
1562
elif file_list is None:
1563
# missing files show up in iter_changes(basis) as
1564
# versioned-with-no-kind.
1566
for change in tree.iter_changes(tree.basis_tree()):
1567
# Find paths in the working tree that have no kind:
1568
if change[1][1] is not None and change[6][1] is None:
1569
missing.append(change[1][1])
1570
file_list = sorted(missing, reverse=True)
1571
file_deletion_strategy = 'keep'
1572
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1573
keep_files=file_deletion_strategy=='keep',
1574
force=file_deletion_strategy=='force')
1382
1577
class cmd_file_id(Command):
2016
2223
:Tips & tricks:
2018
2225
GUI tools and IDEs are often better at exploring history than command
2019
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2020
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2021
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2023
Web interfaces are often better at exploring history than command line
2024
tools, particularly for branches on servers. You may prefer Loggerhead
2025
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2226
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2227
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2228
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2229
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2027
2231
You may find it useful to add the aliases below to ``bazaar.conf``::
2031
2235
top = log -l10 --line
2032
show = log -v -p -n1 --long
2034
2238
``bzr tip`` will then show the latest revision while ``bzr top``
2035
2239
will show the last 10 mainline revisions. To see the details of a
2036
2240
particular revision X, ``bzr show -rX``.
2038
As many GUI tools and Web interfaces do, you may prefer viewing
2039
history collapsed initially. If you are interested in looking deeper
2040
into a particular merge X, use ``bzr log -n0 -rX``. If you like
2041
working this way, you may wish to either:
2043
* change your default log format to short (or line)
2044
* add this alias: log = log -n1
2242
If you are interested in looking deeper into a particular merge X,
2243
use ``bzr log -n0 -rX``.
2046
2245
``bzr log -v`` on a branch with lots of history is currently
2047
2246
very slow. A fix for this issue is currently under development.
2168
2379
diff_type = 'full'
2172
# Build the log formatter
2173
if log_format is None:
2174
log_format = log.log_formatter_registry.get_default(b)
2175
lf = log_format(show_ids=show_ids, to_file=self.outf,
2176
show_timezone=timezone,
2177
delta_format=get_verbosity_level(),
2180
# Choose the algorithm for doing the logging. It's annoying
2181
# having multiple code paths like this but necessary until
2182
# the underlying repository format is faster at generating
2183
# deltas or can provide everything we need from the indices.
2184
# The default algorithm - match-using-deltas - works for
2185
# multiple files and directories and is faster for small
2186
# amounts of history (200 revisions say). However, it's too
2187
# slow for logging a single file in a repository with deep
2188
# history, i.e. > 10K revisions. In the spirit of "do no
2189
# evil when adding features", we continue to use the
2190
# original algorithm - per-file-graph - for the "single
2191
# file that isn't a directory without showing a delta" case.
2192
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2195
# Build the LogRequest and execute it
2196
if len(file_ids) == 0:
2198
rqst = make_log_request_dict(
2199
direction=direction, specific_fileids=file_ids,
2200
start_revision=rev1, end_revision=rev2, limit=limit,
2201
message_search=message, delta_type=delta_type,
2202
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2203
Logger(b, rqst).show(lf)
2381
# Build the log formatter
2382
if log_format is None:
2383
log_format = log.log_formatter_registry.get_default(b)
2384
# Make a non-encoding output to include the diffs - bug 328007
2385
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2386
lf = log_format(show_ids=show_ids, to_file=self.outf,
2387
to_exact_file=unencoded_output,
2388
show_timezone=timezone,
2389
delta_format=get_verbosity_level(),
2391
show_advice=levels is None)
2393
# Choose the algorithm for doing the logging. It's annoying
2394
# having multiple code paths like this but necessary until
2395
# the underlying repository format is faster at generating
2396
# deltas or can provide everything we need from the indices.
2397
# The default algorithm - match-using-deltas - works for
2398
# multiple files and directories and is faster for small
2399
# amounts of history (200 revisions say). However, it's too
2400
# slow for logging a single file in a repository with deep
2401
# history, i.e. > 10K revisions. In the spirit of "do no
2402
# evil when adding features", we continue to use the
2403
# original algorithm - per-file-graph - for the "single
2404
# file that isn't a directory without showing a delta" case.
2405
partial_history = revision and b.repository._format.supports_chks
2406
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2407
or delta_type or partial_history)
2409
# Build the LogRequest and execute it
2410
if len(file_ids) == 0:
2412
rqst = make_log_request_dict(
2413
direction=direction, specific_fileids=file_ids,
2414
start_revision=rev1, end_revision=rev2, limit=limit,
2415
message_search=message, delta_type=delta_type,
2416
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2417
Logger(b, rqst).show(lf)
2208
2420
def _get_revision_range(revisionspec_list, branch, command_name):
2344
2565
apply_view = True
2345
2566
view_str = views.view_display_str(view_files)
2346
note("ignoring files outside view: %s" % view_str)
2567
note("Ignoring files outside view. View is %s" % view_str)
2348
2569
tree.lock_read()
2350
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2351
if fp.startswith(relpath):
2352
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2353
if non_recursive and '/' in fp:
2355
if not all and not selection[fc]:
2357
if kind is not None and fkind != kind:
2361
views.check_path_in_view(tree, fp)
2362
except errors.FileOutsideView:
2364
kindch = entry.kind_character()
2365
outstring = fp + kindch
2367
outstring = '%-8s %s' % (fc, outstring)
2368
if show_ids and fid is not None:
2369
outstring = "%-50s %s" % (outstring, fid)
2370
self.outf.write(outstring + '\n')
2372
self.outf.write(fp + '\0')
2375
self.outf.write(fid)
2376
self.outf.write('\0')
2384
self.outf.write('%-50s %s\n' % (outstring, my_id))
2386
self.outf.write(outstring + '\n')
2570
self.add_cleanup(tree.unlock)
2571
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2572
from_dir=relpath, recursive=recursive):
2573
# Apply additional masking
2574
if not all and not selection[fc]:
2576
if kind is not None and fkind != kind:
2581
fullpath = osutils.pathjoin(relpath, fp)
2584
views.check_path_in_view(tree, fullpath)
2585
except errors.FileOutsideView:
2590
fp = osutils.pathjoin(prefix, fp)
2591
kindch = entry.kind_character()
2592
outstring = fp + kindch
2593
ui.ui_factory.clear_term()
2595
outstring = '%-8s %s' % (fc, outstring)
2596
if show_ids and fid is not None:
2597
outstring = "%-50s %s" % (outstring, fid)
2598
self.outf.write(outstring + '\n')
2600
self.outf.write(fp + '\0')
2603
self.outf.write(fid)
2604
self.outf.write('\0')
2612
self.outf.write('%-50s %s\n' % (outstring, my_id))
2614
self.outf.write(outstring + '\n')
2391
2617
class cmd_unknowns(Command):
2676
2931
@display_command
2678
print osutils.local_time_offset()
2933
self.outf.write("%s\n" % osutils.local_time_offset())
2682
2937
class cmd_commit(Command):
2683
2938
"""Commit changes into a new revision.
2685
If no arguments are given, the entire tree is committed.
2687
If selected files are specified, only changes to those files are
2688
committed. If a directory is specified then the directory and everything
2689
within it is committed.
2691
When excludes are given, they take precedence over selected files.
2692
For example, too commit only changes within foo, but not changes within
2695
bzr commit foo -x foo/bar
2697
If author of the change is not the same person as the committer, you can
2698
specify the author's name using the --author option. The name should be
2699
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2700
If there is more than one author of the change you can specify the option
2701
multiple times, once for each author.
2703
A selected-file commit may fail in some cases where the committed
2704
tree would be invalid. Consider::
2709
bzr commit foo -m "committing foo"
2710
bzr mv foo/bar foo/baz
2713
bzr commit foo/bar -m "committing bar but not baz"
2715
In the example above, the last commit will fail by design. This gives
2716
the user the opportunity to decide whether they want to commit the
2717
rename at the same time, separately first, or not at all. (As a general
2718
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2720
Note: A selected-file commit after a merge is not yet supported.
2940
An explanatory message needs to be given for each commit. This is
2941
often done by using the --message option (getting the message from the
2942
command line) or by using the --file option (getting the message from
2943
a file). If neither of these options is given, an editor is opened for
2944
the user to enter the message. To see the changed files in the
2945
boilerplate text loaded into the editor, use the --show-diff option.
2947
By default, the entire tree is committed and the person doing the
2948
commit is assumed to be the author. These defaults can be overridden
2953
If selected files are specified, only changes to those files are
2954
committed. If a directory is specified then the directory and
2955
everything within it is committed.
2957
When excludes are given, they take precedence over selected files.
2958
For example, to commit only changes within foo, but not changes
2961
bzr commit foo -x foo/bar
2963
A selective commit after a merge is not yet supported.
2967
If the author of the change is not the same person as the committer,
2968
you can specify the author's name using the --author option. The
2969
name should be in the same format as a committer-id, e.g.
2970
"John Doe <jdoe@example.com>". If there is more than one author of
2971
the change you can specify the option multiple times, once for each
2976
A common mistake is to forget to add a new file or directory before
2977
running the commit command. The --strict option checks for unknown
2978
files and aborts the commit if any are found. More advanced pre-commit
2979
checks can be implemented by defining hooks. See ``bzr help hooks``
2984
If you accidentially commit the wrong changes or make a spelling
2985
mistake in the commit message say, you can use the uncommit command
2986
to undo it. See ``bzr help uncommit`` for details.
2988
Hooks can also be configured to run after a commit. This allows you
2989
to trigger updates to external systems like bug trackers. The --fixes
2990
option can be used to record the association between a revision and
2991
one or more bugs. See ``bzr help bugs`` for details.
2993
A selective commit may fail in some cases where the committed
2994
tree would be invalid. Consider::
2999
bzr commit foo -m "committing foo"
3000
bzr mv foo/bar foo/baz
3003
bzr commit foo/bar -m "committing bar but not baz"
3005
In the example above, the last commit will fail by design. This gives
3006
the user the opportunity to decide whether they want to commit the
3007
rename at the same time, separately first, or not at all. (As a general
3008
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2722
3010
# TODO: Run hooks on tree to-be-committed, and after commit.
2880
3203
The working tree and branch checks will only give output if a problem is
2881
3204
detected. The output fields of the repository check are:
2883
revisions: This is just the number of revisions checked. It doesn't
2885
versionedfiles: This is just the number of versionedfiles checked. It
2886
doesn't indicate a problem.
2887
unreferenced ancestors: Texts that are ancestors of other texts, but
2888
are not properly referenced by the revision ancestry. This is a
2889
subtle problem that Bazaar can work around.
2890
unique file texts: This is the total number of unique file contents
2891
seen in the checked revisions. It does not indicate a problem.
2892
repeated file texts: This is the total number of repeated texts seen
2893
in the checked revisions. Texts can be repeated when their file
2894
entries are modified, but the file contents are not. It does not
3207
This is just the number of revisions checked. It doesn't
3211
This is just the number of versionedfiles checked. It
3212
doesn't indicate a problem.
3214
unreferenced ancestors
3215
Texts that are ancestors of other texts, but
3216
are not properly referenced by the revision ancestry. This is a
3217
subtle problem that Bazaar can work around.
3220
This is the total number of unique file contents
3221
seen in the checked revisions. It does not indicate a problem.
3224
This is the total number of repeated texts seen
3225
in the checked revisions. Texts can be repeated when their file
3226
entries are modified, but the file contents are not. It does not
2897
3229
If no restrictions are specified, all Bazaar data that is found at the given
2898
3230
location will be checked.
3247
3580
raise errors.BzrCommandError("subunit not available. subunit "
3248
3581
"needs to be installed to use --subunit.")
3249
3582
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3584
self.additional_selftest_args.setdefault(
3585
'suite_decorators', []).append(parallel)
3251
3587
test_suite_factory = benchmarks.test_suite
3252
3588
# Unless user explicitly asks for quiet, be verbose in benchmarks
3253
3589
verbose = not is_quiet()
3254
3590
# TODO: should possibly lock the history file...
3255
3591
benchfile = open(".perf_history", "at", buffering=1)
3592
self.add_cleanup(benchfile.close)
3257
3594
test_suite_factory = None
3258
3595
benchfile = None
3260
selftest_kwargs = {"verbose": verbose,
3262
"stop_on_failure": one,
3263
"transport": transport,
3264
"test_suite_factory": test_suite_factory,
3265
"lsprof_timed": lsprof_timed,
3266
"bench_history": benchfile,
3267
"matching_tests_first": first,
3268
"list_only": list_only,
3269
"random_seed": randomize,
3270
"exclude_pattern": exclude,
3272
"load_list": load_list,
3273
"debug_flags": debugflag,
3274
"starting_with": starting_with
3276
selftest_kwargs.update(self.additional_selftest_args)
3277
result = selftest(**selftest_kwargs)
3279
if benchfile is not None:
3282
note('tests passed')
3284
note('tests failed')
3596
selftest_kwargs = {"verbose": verbose,
3598
"stop_on_failure": one,
3599
"transport": transport,
3600
"test_suite_factory": test_suite_factory,
3601
"lsprof_timed": lsprof_timed,
3602
"lsprof_tests": lsprof_tests,
3603
"bench_history": benchfile,
3604
"matching_tests_first": first,
3605
"list_only": list_only,
3606
"random_seed": randomize,
3607
"exclude_pattern": exclude,
3609
"load_list": load_list,
3610
"debug_flags": debugflag,
3611
"starting_with": starting_with
3613
selftest_kwargs.update(self.additional_selftest_args)
3614
result = selftest(**selftest_kwargs)
3285
3615
return int(not result)
3442
3787
verified = 'inapplicable'
3443
3788
tree = WorkingTree.open_containing(directory)[0]
3445
# die as quickly as possible if there are uncommitted changes
3447
3791
basis_tree = tree.revision_tree(tree.last_revision())
3448
3792
except errors.NoSuchRevision:
3449
3793
basis_tree = tree.basis_tree()
3795
# die as quickly as possible if there are uncommitted changes
3451
changes = tree.changes_from(basis_tree)
3452
if changes.has_changed():
3797
if tree.has_changes():
3453
3798
raise errors.UncommittedChanges(tree)
3455
3800
view_info = _get_view_info_for_change_reporter(tree)
3456
3801
change_reporter = delta._ChangeReporter(
3457
3802
unversioned_filter=tree.is_ignored, view_info=view_info)
3460
pb = ui.ui_factory.nested_progress_bar()
3461
cleanups.append(pb.finished)
3463
cleanups.append(tree.unlock)
3464
if location is not None:
3466
mergeable = bundle.read_mergeable_from_url(location,
3467
possible_transports=possible_transports)
3468
except errors.NotABundle:
3472
raise errors.BzrCommandError('Cannot use --uncommitted'
3473
' with bundles or merge directives.')
3475
if revision is not None:
3476
raise errors.BzrCommandError(
3477
'Cannot use -r with merge directives or bundles')
3478
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3481
if merger is None and uncommitted:
3482
if revision is not None and len(revision) > 0:
3483
raise errors.BzrCommandError('Cannot use --uncommitted and'
3484
' --revision at the same time.')
3485
location = self._select_branch_location(tree, location)[0]
3486
other_tree, other_path = WorkingTree.open_containing(location)
3487
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3489
allow_pending = False
3490
if other_path != '':
3491
merger.interesting_files = [other_path]
3494
merger, allow_pending = self._get_merger_from_branch(tree,
3495
location, revision, remember, possible_transports, pb)
3497
merger.merge_type = merge_type
3498
merger.reprocess = reprocess
3499
merger.show_base = show_base
3500
self.sanity_check_merger(merger)
3501
if (merger.base_rev_id == merger.other_rev_id and
3502
merger.other_rev_id is not None):
3503
note('Nothing to do.')
3803
pb = ui.ui_factory.nested_progress_bar()
3804
self.add_cleanup(pb.finished)
3806
self.add_cleanup(tree.unlock)
3807
if location is not None:
3809
mergeable = bundle.read_mergeable_from_url(location,
3810
possible_transports=possible_transports)
3811
except errors.NotABundle:
3815
raise errors.BzrCommandError('Cannot use --uncommitted'
3816
' with bundles or merge directives.')
3818
if revision is not None:
3819
raise errors.BzrCommandError(
3820
'Cannot use -r with merge directives or bundles')
3821
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3824
if merger is None and uncommitted:
3825
if revision is not None and len(revision) > 0:
3826
raise errors.BzrCommandError('Cannot use --uncommitted and'
3827
' --revision at the same time.')
3828
merger = self.get_merger_from_uncommitted(tree, location, None)
3829
allow_pending = False
3832
merger, allow_pending = self._get_merger_from_branch(tree,
3833
location, revision, remember, possible_transports, None)
3835
merger.merge_type = merge_type
3836
merger.reprocess = reprocess
3837
merger.show_base = show_base
3838
self.sanity_check_merger(merger)
3839
if (merger.base_rev_id == merger.other_rev_id and
3840
merger.other_rev_id is not None):
3841
note('Nothing to do.')
3844
if merger.interesting_files is not None:
3845
raise errors.BzrCommandError('Cannot pull individual files')
3846
if (merger.base_rev_id == tree.last_revision()):
3847
result = tree.pull(merger.other_branch, False,
3848
merger.other_rev_id)
3849
result.report(self.outf)
3506
if merger.interesting_files is not None:
3507
raise errors.BzrCommandError('Cannot pull individual files')
3508
if (merger.base_rev_id == tree.last_revision()):
3509
result = tree.pull(merger.other_branch, False,
3510
merger.other_rev_id)
3511
result.report(self.outf)
3513
merger.check_basis(False)
3515
return self._do_preview(merger)
3517
return self._do_merge(merger, change_reporter, allow_pending,
3520
for cleanup in reversed(cleanups):
3851
if merger.this_basis is None:
3852
raise errors.BzrCommandError(
3853
"This branch has no commits."
3854
" (perhaps you would prefer 'bzr pull')")
3856
return self._do_preview(merger)
3858
return self._do_interactive(merger)
3860
return self._do_merge(merger, change_reporter, allow_pending,
3863
def _get_preview(self, merger):
3864
tree_merger = merger.make_merger()
3865
tt = tree_merger.make_preview_transform()
3866
self.add_cleanup(tt.finalize)
3867
result_tree = tt.get_preview_tree()
3523
3870
def _do_preview(self, merger):
3524
3871
from bzrlib.diff import show_diff_trees
3525
tree_merger = merger.make_merger()
3526
tt = tree_merger.make_preview_transform()
3528
result_tree = tt.get_preview_tree()
3529
show_diff_trees(merger.this_tree, result_tree, self.outf,
3530
old_label='', new_label='')
3872
result_tree = self._get_preview(merger)
3873
show_diff_trees(merger.this_tree, result_tree, self.outf,
3874
old_label='', new_label='')
3534
3876
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3535
3877
merger.change_reporter = change_reporter
3691
4065
merge_type = _mod_merge.Merge3Merger
3692
4066
tree, file_list = tree_files(file_list)
3693
4067
tree.lock_write()
3695
parents = tree.get_parent_ids()
3696
if len(parents) != 2:
3697
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3698
" merges. Not cherrypicking or"
3700
repository = tree.branch.repository
3701
interesting_ids = None
3703
conflicts = tree.conflicts()
3704
if file_list is not None:
3705
interesting_ids = set()
3706
for filename in file_list:
3707
file_id = tree.path2id(filename)
3709
raise errors.NotVersionedError(filename)
3710
interesting_ids.add(file_id)
3711
if tree.kind(file_id) != "directory":
4068
self.add_cleanup(tree.unlock)
4069
parents = tree.get_parent_ids()
4070
if len(parents) != 2:
4071
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4072
" merges. Not cherrypicking or"
4074
repository = tree.branch.repository
4075
interesting_ids = None
4077
conflicts = tree.conflicts()
4078
if file_list is not None:
4079
interesting_ids = set()
4080
for filename in file_list:
4081
file_id = tree.path2id(filename)
4083
raise errors.NotVersionedError(filename)
4084
interesting_ids.add(file_id)
4085
if tree.kind(file_id) != "directory":
3714
for name, ie in tree.inventory.iter_entries(file_id):
3715
interesting_ids.add(ie.file_id)
3716
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3718
# Remerge only supports resolving contents conflicts
3719
allowed_conflicts = ('text conflict', 'contents conflict')
3720
restore_files = [c.path for c in conflicts
3721
if c.typestring in allowed_conflicts]
3722
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3723
tree.set_conflicts(ConflictList(new_conflicts))
3724
if file_list is not None:
3725
restore_files = file_list
3726
for filename in restore_files:
3728
restore(tree.abspath(filename))
3729
except errors.NotConflicted:
3731
# Disable pending merges, because the file texts we are remerging
3732
# have not had those merges performed. If we use the wrong parents
3733
# list, we imply that the working tree text has seen and rejected
3734
# all the changes from the other tree, when in fact those changes
3735
# have not yet been seen.
3736
pb = ui.ui_factory.nested_progress_bar()
3737
tree.set_parent_ids(parents[:1])
4088
for name, ie in tree.inventory.iter_entries(file_id):
4089
interesting_ids.add(ie.file_id)
4090
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4092
# Remerge only supports resolving contents conflicts
4093
allowed_conflicts = ('text conflict', 'contents conflict')
4094
restore_files = [c.path for c in conflicts
4095
if c.typestring in allowed_conflicts]
4096
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4097
tree.set_conflicts(ConflictList(new_conflicts))
4098
if file_list is not None:
4099
restore_files = file_list
4100
for filename in restore_files:
3739
merger = _mod_merge.Merger.from_revision_ids(pb,
3741
merger.interesting_ids = interesting_ids
3742
merger.merge_type = merge_type
3743
merger.show_base = show_base
3744
merger.reprocess = reprocess
3745
conflicts = merger.do_merge()
3747
tree.set_parent_ids(parents)
4102
restore(tree.abspath(filename))
4103
except errors.NotConflicted:
4105
# Disable pending merges, because the file texts we are remerging
4106
# have not had those merges performed. If we use the wrong parents
4107
# list, we imply that the working tree text has seen and rejected
4108
# all the changes from the other tree, when in fact those changes
4109
# have not yet been seen.
4110
tree.set_parent_ids(parents[:1])
4112
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4113
merger.interesting_ids = interesting_ids
4114
merger.merge_type = merge_type
4115
merger.show_base = show_base
4116
merger.reprocess = reprocess
4117
conflicts = merger.do_merge()
4119
tree.set_parent_ids(parents)
3751
4120
if conflicts > 0:
3775
4144
name. If you name a directory, all the contents of that directory will be
3778
Any files that have been newly added since that revision will be deleted,
3779
with a backup kept if appropriate. Directories containing unknown files
3780
will not be deleted.
4147
If you have newly added files since the target revision, they will be
4148
removed. If the files to be removed have been changed, backups will be
4149
created as above. Directories containing unknown files will not be
3782
The working tree contains a list of pending merged revisions, which will
3783
be included as parents in the next commit. Normally, revert clears that
3784
list as well as reverting the files. If any files are specified, revert
3785
leaves the pending merge list alone and reverts only the files. Use "bzr
3786
revert ." in the tree root to revert all files but keep the merge record,
3787
and "bzr revert --forget-merges" to clear the pending merge list without
4152
The working tree contains a list of revisions that have been merged but
4153
not yet committed. These revisions will be included as additional parents
4154
of the next commit. Normally, using revert clears that list as well as
4155
reverting the files. If any files are specified, revert leaves the list
4156
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4157
.`` in the tree root to revert all files but keep the recorded merges,
4158
and ``bzr revert --forget-merges`` to clear the pending merge list without
3788
4159
reverting any files.
4161
Using "bzr revert --forget-merges", it is possible to apply all of the
4162
changes from a branch in a single revision. To do this, perform the merge
4163
as desired. Then doing revert with the "--forget-merges" option will keep
4164
the content of the tree as it was, but it will clear the list of pending
4165
merges. The next commit will then contain all of the changes that are
4166
present in the other branch, but without any other parent revisions.
4167
Because this technique forgets where these changes originated, it may
4168
cause additional conflicts on later merges involving the same source and
3791
4172
_see_also = ['cat', 'export']
3959
4339
if remote_branch.base == local_branch.base:
3960
4340
remote_branch = local_branch
4342
local_branch.lock_read()
4343
self.add_cleanup(local_branch.unlock)
3962
4344
local_revid_range = _revision_range_to_revid_range(
3963
4345
_get_revision_range(my_revision, local_branch,
4348
remote_branch.lock_read()
4349
self.add_cleanup(remote_branch.unlock)
3966
4350
remote_revid_range = _revision_range_to_revid_range(
3967
4351
_get_revision_range(revision,
3968
4352
remote_branch, self.name()))
3970
local_branch.lock_read()
3972
remote_branch.lock_read()
3974
local_extra, remote_extra = find_unmerged(
3975
local_branch, remote_branch, restrict,
3976
backward=not reverse,
3977
include_merges=include_merges,
3978
local_revid_range=local_revid_range,
3979
remote_revid_range=remote_revid_range)
3981
if log_format is None:
3982
registry = log.log_formatter_registry
3983
log_format = registry.get_default(local_branch)
3984
lf = log_format(to_file=self.outf,
3986
show_timezone='original')
3989
if local_extra and not theirs_only:
3990
message("You have %d extra revision(s):\n" %
3992
for revision in iter_log_revisions(local_extra,
3993
local_branch.repository,
3995
lf.log_revision(revision)
3996
printed_local = True
3999
printed_local = False
4001
if remote_extra and not mine_only:
4002
if printed_local is True:
4004
message("You are missing %d revision(s):\n" %
4006
for revision in iter_log_revisions(remote_extra,
4007
remote_branch.repository,
4009
lf.log_revision(revision)
4012
if mine_only and not local_extra:
4013
# We checked local, and found nothing extra
4014
message('This branch is up to date.\n')
4015
elif theirs_only and not remote_extra:
4016
# We checked remote, and found nothing extra
4017
message('Other branch is up to date.\n')
4018
elif not (mine_only or theirs_only or local_extra or
4020
# We checked both branches, and neither one had extra
4022
message("Branches are up to date.\n")
4024
remote_branch.unlock()
4026
local_branch.unlock()
4354
local_extra, remote_extra = find_unmerged(
4355
local_branch, remote_branch, restrict,
4356
backward=not reverse,
4357
include_merges=include_merges,
4358
local_revid_range=local_revid_range,
4359
remote_revid_range=remote_revid_range)
4361
if log_format is None:
4362
registry = log.log_formatter_registry
4363
log_format = registry.get_default(local_branch)
4364
lf = log_format(to_file=self.outf,
4366
show_timezone='original')
4369
if local_extra and not theirs_only:
4370
message("You have %d extra revision(s):\n" %
4372
for revision in iter_log_revisions(local_extra,
4373
local_branch.repository,
4375
lf.log_revision(revision)
4376
printed_local = True
4379
printed_local = False
4381
if remote_extra and not mine_only:
4382
if printed_local is True:
4384
message("You are missing %d revision(s):\n" %
4386
for revision in iter_log_revisions(remote_extra,
4387
remote_branch.repository,
4389
lf.log_revision(revision)
4392
if mine_only and not local_extra:
4393
# We checked local, and found nothing extra
4394
message('This branch is up to date.\n')
4395
elif theirs_only and not remote_extra:
4396
# We checked remote, and found nothing extra
4397
message('Other branch is up to date.\n')
4398
elif not (mine_only or theirs_only or local_extra or
4400
# We checked both branches, and neither one had extra
4402
message("Branches are up to date.\n")
4027
4404
if not status_code and parent is None and other_branch is not None:
4028
4405
local_branch.lock_write()
4030
# handle race conditions - a parent might be set while we run.
4031
if local_branch.get_parent() is None:
4032
local_branch.set_parent(remote_branch.base)
4034
local_branch.unlock()
4406
self.add_cleanup(local_branch.unlock)
4407
# handle race conditions - a parent might be set while we run.
4408
if local_branch.get_parent() is None:
4409
local_branch.set_parent(remote_branch.base)
4035
4410
return status_code
4159
4532
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4160
4533
if wt is not None:
4535
self.add_cleanup(wt.unlock)
4163
4537
branch.lock_read()
4165
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4167
file_id = wt.path2id(relpath)
4169
file_id = tree.path2id(relpath)
4171
raise errors.NotVersionedError(filename)
4172
file_version = tree.inventory[file_id].revision
4173
if wt is not None and revision is None:
4174
# If there is a tree and we're not annotating historical
4175
# versions, annotate the working tree's content.
4176
annotate_file_tree(wt, file_id, self.outf, long, all,
4179
annotate_file(branch, file_version, file_id, long, all, self.outf,
4538
self.add_cleanup(branch.unlock)
4539
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4541
self.add_cleanup(tree.unlock)
4543
file_id = wt.path2id(relpath)
4545
file_id = tree.path2id(relpath)
4547
raise errors.NotVersionedError(filename)
4548
file_version = tree.inventory[file_id].revision
4549
if wt is not None and revision is None:
4550
# If there is a tree and we're not annotating historical
4551
# versions, annotate the working tree's content.
4552
annotate_file_tree(wt, file_id, self.outf, long, all,
4555
annotate_file(branch, file_version, file_id, long, all, self.outf,
4188
4559
class cmd_re_sign(Command):
4478
4850
Option('allow-writes',
4479
4851
help='By default the server is a readonly server. Supplying '
4480
4852
'--allow-writes enables write access to the contents of '
4481
'the served directory and below.'
4853
'the served directory and below. Note that ``bzr serve`` '
4854
'does not perform authentication, so unless some form of '
4855
'external authentication is arranged supplying this '
4856
'option leads to global uncontrolled write access to your '
4485
def run_smart_server(self, smart_server):
4486
"""Run 'smart_server' forever, with no UI output at all."""
4487
# For the duration of this server, no UI output is permitted. note
4488
# that this may cause problems with blackbox tests. This should be
4489
# changed with care though, as we dont want to use bandwidth sending
4490
# progress over stderr to smart server clients!
4491
from bzrlib import lockdir
4492
old_factory = ui.ui_factory
4493
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4495
ui.ui_factory = ui.SilentUIFactory()
4496
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4497
smart_server.serve()
4499
ui.ui_factory = old_factory
4500
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4502
4861
def get_host_and_port(self, port):
4503
4862
"""Return the host and port to run the smart server on.
4505
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4506
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4864
If 'port' is None, None will be returned for the host and port.
4508
4866
If 'port' has a colon in it, the string before the colon will be
4509
4867
interpreted as the host.
4512
4870
:return: A tuple of (host, port), where 'host' is a host name or IP,
4513
4871
and port is an integer TCP/IP port.
4515
from bzrlib.smart import medium
4516
host = medium.BZR_DEFAULT_INTERFACE
4518
port = medium.BZR_DEFAULT_PORT
4874
if port is not None:
4520
4875
if ':' in port:
4521
4876
host, port = port.split(':')
4522
4877
port = int(port)
4523
4878
return host, port
4525
def get_smart_server(self, transport, inet, port):
4526
"""Construct a smart server.
4528
:param transport: The base transport from which branches will be
4530
:param inet: If True, serve over stdin and stdout. Used for running
4532
:param port: The port to listen on. By default, it's `
4533
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4535
:return: A smart server.
4537
from bzrlib.smart import medium, server
4539
smart_server = medium.SmartServerPipeStreamMedium(
4540
sys.stdin, sys.stdout, transport)
4542
host, port = self.get_host_and_port(port)
4543
smart_server = server.SmartTCPServer(
4544
transport, host=host, port=port)
4545
note('listening on port: %s' % smart_server.port)
4548
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4549
from bzrlib.transport import get_transport
4550
from bzrlib.transport.chroot import ChrootServer
4880
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4882
from bzrlib.transport import get_transport, transport_server_registry
4551
4883
if directory is None:
4552
4884
directory = os.getcwd()
4885
if protocol is None:
4886
protocol = transport_server_registry.get()
4887
host, port = self.get_host_and_port(port)
4553
4888
url = urlutils.local_path_to_url(directory)
4554
4889
if not allow_writes:
4555
4890
url = 'readonly+' + url
4556
chroot_server = ChrootServer(get_transport(url))
4557
chroot_server.setUp()
4558
t = get_transport(chroot_server.get_url())
4559
smart_server = self.get_smart_server(t, inet, port)
4560
self.run_smart_server(smart_server)
4891
transport = get_transport(url)
4892
protocol(transport, host, port, inet)
4563
4895
class cmd_join(Command):
4564
"""Combine a subtree into its containing tree.
4896
"""Combine a tree into its containing tree.
4566
This command is for experimental use only. It requires the target tree
4567
to be in dirstate-with-subtree format, which cannot be converted into
4898
This command requires the target tree to be in a rich-root format.
4570
4900
The TREE argument should be an independent tree, inside another tree, but
4571
4901
not part of it. (Such trees can be produced by "bzr split", but also by
4753
5076
directly from the merge directive, without retrieving data from a
4756
If --no-bundle is specified, then public_branch is needed (and must be
4757
up-to-date), so that the receiver can perform the merge using the
4758
public_branch. The public_branch is always included if known, so that
4759
people can check it later.
4761
The submit branch defaults to the parent, but can be overridden. Both
4762
submit branch and public branch will be remembered if supplied.
4764
If a public_branch is known for the submit_branch, that public submit
4765
branch is used in the merge instructions. This means that a local mirror
4766
can be used as your actual submit branch, once you have set public_branch
5079
`bzr send` creates a compact data set that, when applied using bzr
5080
merge, has the same effect as merging from the source branch.
5082
By default the merge directive is self-contained and can be applied to any
5083
branch containing submit_branch in its ancestory without needing access to
5086
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5087
revisions, but only a structured request to merge from the
5088
public_location. In that case the public_branch is needed and it must be
5089
up-to-date and accessible to the recipient. The public_branch is always
5090
included if known, so that people can check it later.
5092
The submit branch defaults to the parent of the source branch, but can be
5093
overridden. Both submit branch and public branch will be remembered in
5094
branch.conf the first time they are used for a particular branch. The
5095
source branch defaults to that containing the working directory, but can
5096
be changed using --from.
5098
In order to calculate those changes, bzr must analyse the submit branch.
5099
Therefore it is most efficient for the submit branch to be a local mirror.
5100
If a public location is known for the submit_branch, that location is used
5101
in the merge directive.
5103
The default behaviour is to send the merge directive by mail, unless -o is
5104
given, in which case it is sent to a file.
4769
5106
Mail is sent using your preferred mail program. This should be transparent
4770
5107
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4810
5152
short_name='f',
4812
5154
Option('output', short_name='o',
4813
help='Write merge directive to this file; '
5155
help='Write merge directive to this file or directory; '
4814
5156
'use - for stdout.',
5159
help='Refuse to send if there are uncommitted changes in'
5160
' the working tree, --no-strict disables the check.'),
4816
5161
Option('mail-to', help='Mail the request to this address.',
4820
5165
Option('body', help='Body for the email.', type=unicode),
4821
RegistryOption.from_kwargs('format',
4822
'Use the specified output format.',
4823
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4824
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5166
RegistryOption('format',
5167
help='Use the specified output format.',
5168
lazy_registry=('bzrlib.send', 'format_registry')),
4827
5171
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4828
5172
no_patch=False, revision=None, remember=False, output=None,
4829
format='4', mail_to=None, message=None, body=None, **kwargs):
4830
return self._run(submit_branch, revision, public_branch, remember,
4831
format, no_bundle, no_patch, output,
4832
kwargs.get('from', '.'), mail_to, message, body)
4834
def _run(self, submit_branch, revision, public_branch, remember, format,
4835
no_bundle, no_patch, output, from_, mail_to, message, body):
4836
from bzrlib.revision import NULL_REVISION
4837
branch = Branch.open_containing(from_)[0]
4839
outfile = cStringIO.StringIO()
4843
outfile = open(output, 'wb')
4844
# we may need to write data into branch's repository to calculate
4849
config = branch.get_config()
4851
mail_to = config.get_user_option('submit_to')
4852
mail_client = config.get_mail_client()
4853
if (not getattr(mail_client, 'supports_body', False)
4854
and body is not None):
4855
raise errors.BzrCommandError(
4856
'Mail client "%s" does not support specifying body' %
4857
mail_client.__class__.__name__)
4858
if remember and submit_branch is None:
4859
raise errors.BzrCommandError(
4860
'--remember requires a branch to be specified.')
4861
stored_submit_branch = branch.get_submit_branch()
4862
remembered_submit_branch = None
4863
if submit_branch is None:
4864
submit_branch = stored_submit_branch
4865
remembered_submit_branch = "submit"
4867
if stored_submit_branch is None or remember:
4868
branch.set_submit_branch(submit_branch)
4869
if submit_branch is None:
4870
submit_branch = branch.get_parent()
4871
remembered_submit_branch = "parent"
4872
if submit_branch is None:
4873
raise errors.BzrCommandError('No submit branch known or'
4875
if remembered_submit_branch is not None:
4876
note('Using saved %s location "%s" to determine what '
4877
'changes to submit.', remembered_submit_branch,
4881
submit_config = Branch.open(submit_branch).get_config()
4882
mail_to = submit_config.get_user_option("child_submit_to")
4884
stored_public_branch = branch.get_public_branch()
4885
if public_branch is None:
4886
public_branch = stored_public_branch
4887
elif stored_public_branch is None or remember:
4888
branch.set_public_branch(public_branch)
4889
if no_bundle and public_branch is None:
4890
raise errors.BzrCommandError('No public branch specified or'
4892
base_revision_id = None
4894
if revision is not None:
4895
if len(revision) > 2:
4896
raise errors.BzrCommandError('bzr send takes '
4897
'at most two one revision identifiers')
4898
revision_id = revision[-1].as_revision_id(branch)
4899
if len(revision) == 2:
4900
base_revision_id = revision[0].as_revision_id(branch)
4901
if revision_id is None:
4902
revision_id = branch.last_revision()
4903
if revision_id == NULL_REVISION:
4904
raise errors.BzrCommandError('No revisions to submit.')
4906
directive = merge_directive.MergeDirective2.from_objects(
4907
branch.repository, revision_id, time.time(),
4908
osutils.local_time_offset(), submit_branch,
4909
public_branch=public_branch, include_patch=not no_patch,
4910
include_bundle=not no_bundle, message=message,
4911
base_revision_id=base_revision_id)
4912
elif format == '0.9':
4915
patch_type = 'bundle'
4917
raise errors.BzrCommandError('Format 0.9 does not'
4918
' permit bundle with no patch')
4924
directive = merge_directive.MergeDirective.from_objects(
4925
branch.repository, revision_id, time.time(),
4926
osutils.local_time_offset(), submit_branch,
4927
public_branch=public_branch, patch_type=patch_type,
4930
outfile.writelines(directive.to_lines())
4932
subject = '[MERGE] '
4933
if message is not None:
4936
revision = branch.repository.get_revision(revision_id)
4937
subject += revision.get_summary()
4938
basename = directive.get_disk_name(branch)
4939
mail_client.compose_merge_request(mail_to, subject,
5173
format=None, mail_to=None, message=None, body=None,
5174
strict=None, **kwargs):
5175
from bzrlib.send import send
5176
return send(submit_branch, revision, public_branch, remember,
5177
format, no_bundle, no_patch, output,
5178
kwargs.get('from', '.'), mail_to, message, body,
4948
5183
class cmd_bundle_revisions(cmd_send):
4950
5184
"""Create a merge-directive for submitting changes.
4952
5186
A merge directive provides many things needed for requesting merges:
5008
5244
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5009
5245
no_patch=False, revision=None, remember=False, output=None,
5010
format='4', **kwargs):
5246
format=None, strict=None, **kwargs):
5011
5247
if output is None:
5013
return self._run(submit_branch, revision, public_branch, remember,
5249
from bzrlib.send import send
5250
return send(submit_branch, revision, public_branch, remember,
5014
5251
format, no_bundle, no_patch, output,
5015
kwargs.get('from', '.'), None, None, None)
5252
kwargs.get('from', '.'), None, None, None,
5253
self.outf, strict=strict)
5018
5256
class cmd_tag(Command):
5058
5301
branch, relpath = Branch.open_containing(directory)
5059
5302
branch.lock_write()
5062
branch.tags.delete_tag(tag_name)
5063
self.outf.write('Deleted tag %s.\n' % tag_name)
5303
self.add_cleanup(branch.unlock)
5305
if tag_name is None:
5306
raise errors.BzrCommandError("No tag specified to delete.")
5307
branch.tags.delete_tag(tag_name)
5308
self.outf.write('Deleted tag %s.\n' % tag_name)
5311
if len(revision) != 1:
5312
raise errors.BzrCommandError(
5313
"Tags can only be placed on a single revision, "
5315
revision_id = revision[0].as_revision_id(branch)
5066
if len(revision) != 1:
5067
raise errors.BzrCommandError(
5068
"Tags can only be placed on a single revision, "
5070
revision_id = revision[0].as_revision_id(branch)
5072
revision_id = branch.last_revision()
5073
if (not force) and branch.tags.has_tag(tag_name):
5074
raise errors.TagAlreadyExists(tag_name)
5075
branch.tags.set_tag(tag_name, revision_id)
5076
self.outf.write('Created tag %s.\n' % tag_name)
5317
revision_id = branch.last_revision()
5318
if tag_name is None:
5319
tag_name = branch.automatic_tag_name(revision_id)
5320
if tag_name is None:
5321
raise errors.BzrCommandError(
5322
"Please specify a tag name.")
5323
if (not force) and branch.tags.has_tag(tag_name):
5324
raise errors.TagAlreadyExists(tag_name)
5325
branch.tags.set_tag(tag_name, revision_id)
5326
self.outf.write('Created tag %s.\n' % tag_name)
5081
5329
class cmd_tags(Command):
5184
5438
Option('bind-to', help='Branch to bind checkout to.', type=str),
5185
5439
Option('force',
5186
help='Perform reconfiguration even if local changes'
5440
help='Perform reconfiguration even if local changes'
5442
Option('stacked-on',
5443
help='Reconfigure a branch to be stacked on another branch.',
5447
help='Reconfigure a branch to be unstacked. This '
5448
'may require copying substantial data into it.',
5190
def run(self, location=None, target_type=None, bind_to=None, force=False):
5452
def run(self, location=None, target_type=None, bind_to=None, force=False,
5191
5455
directory = bzrdir.BzrDir.open(location)
5456
if stacked_on and unstacked:
5457
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5458
elif stacked_on is not None:
5459
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5461
reconfigure.ReconfigureUnstacked().apply(directory)
5462
# At the moment you can use --stacked-on and a different
5463
# reconfiguration shape at the same time; there seems no good reason
5192
5465
if target_type is None:
5193
raise errors.BzrCommandError('No target configuration specified')
5466
if stacked_on or unstacked:
5469
raise errors.BzrCommandError('No target configuration '
5194
5471
elif target_type == 'branch':
5195
5472
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5196
5473
elif target_type == 'tree':
5233
5510
/path/to/newbranch.
5235
5512
Bound branches use the nickname of its master branch unless it is set
5236
locally, in which case switching will update the the local nickname to be
5513
locally, in which case switching will update the local nickname to be
5237
5514
that of the master.
5240
takes_args = ['to_location']
5517
takes_args = ['to_location?']
5241
5518
takes_options = [Option('force',
5242
help='Switch even if local commits will be lost.')
5519
help='Switch even if local commits will be lost.'),
5521
Option('create-branch', short_name='b',
5522
help='Create the target branch from this one before'
5523
' switching to it.'),
5245
def run(self, to_location, force=False):
5526
def run(self, to_location=None, force=False, create_branch=False,
5246
5528
from bzrlib import switch
5247
5529
tree_location = '.'
5530
revision = _get_one_revision('switch', revision)
5248
5531
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5249
branch = control_dir.open_branch()
5532
if to_location is None:
5533
if revision is None:
5534
raise errors.BzrCommandError('You must supply either a'
5535
' revision or a location')
5251
to_branch = Branch.open(to_location)
5538
branch = control_dir.open_branch()
5539
had_explicit_nick = branch.get_config().has_explicit_nickname()
5252
5540
except errors.NotBranchError:
5253
this_branch = control_dir.open_branch()
5254
# This may be a heavy checkout, where we want the master branch
5255
this_url = this_branch.get_bound_location()
5256
# If not, use a local sibling
5257
if this_url is None:
5258
this_url = this_branch.base
5259
to_branch = Branch.open(
5260
urlutils.join(this_url, '..', to_location))
5261
switch.switch(control_dir, to_branch, force)
5262
if branch.get_config().has_explicit_nickname():
5542
had_explicit_nick = False
5545
raise errors.BzrCommandError('cannot create branch without'
5547
to_location = directory_service.directories.dereference(
5549
if '/' not in to_location and '\\' not in to_location:
5550
# This path is meant to be relative to the existing branch
5551
this_url = self._get_branch_location(control_dir)
5552
to_location = urlutils.join(this_url, '..', to_location)
5553
to_branch = branch.bzrdir.sprout(to_location,
5554
possible_transports=[branch.bzrdir.root_transport],
5555
source_branch=branch).open_branch()
5558
to_branch = Branch.open(to_location)
5559
except errors.NotBranchError:
5560
this_url = self._get_branch_location(control_dir)
5561
to_branch = Branch.open(
5562
urlutils.join(this_url, '..', to_location))
5563
if revision is not None:
5564
revision = revision.as_revision_id(to_branch)
5565
switch.switch(control_dir, to_branch, force, revision_id=revision)
5566
if had_explicit_nick:
5263
5567
branch = control_dir.open_branch() #get the new branch!
5264
5568
branch.nick = to_branch.nick
5265
5569
note('Switched to branch: %s',
5266
5570
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5269
class cmd_guess_renames(Command):
5270
"""Guess which files have been have been renamed, based on their content.
5272
Only versioned files which have been deleted are candidates for rename
5273
detection, and renames to ignored files will not be detected.
5277
work_tree, file_list = tree_files(None, default_branch='.')
5278
work_tree.lock_write()
5572
def _get_branch_location(self, control_dir):
5573
"""Return location of branch for this control dir."""
5280
rename_map.RenameMap.guess_renames(work_tree)
5575
this_branch = control_dir.open_branch()
5576
# This may be a heavy checkout, where we want the master branch
5577
master_location = this_branch.get_bound_location()
5578
if master_location is not None:
5579
return master_location
5580
# If not, use a local sibling
5581
return this_branch.base
5582
except errors.NotBranchError:
5583
format = control_dir.find_branch_format()
5584
if getattr(format, 'get_reference', None) is not None:
5585
return format.get_reference(control_dir)
5587
return control_dir.root_transport.base
5285
5590
class cmd_view(Command):
5505
5835
if writer is None:
5506
5836
writer = bzrlib.option.diff_writer_registry.get()
5508
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5509
message, destroy=destroy).run()
5838
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5839
file_list, message, destroy=destroy)
5510
5844
except errors.UserAbort:
5513
5847
def run_for_list(self):
5514
5848
tree = WorkingTree.open_containing('.')[0]
5515
5849
tree.lock_read()
5517
manager = tree.get_shelf_manager()
5518
shelves = manager.active_shelves()
5519
if len(shelves) == 0:
5520
note('No shelved changes.')
5522
for shelf_id in reversed(shelves):
5523
message = manager.get_metadata(shelf_id).get('message')
5525
message = '<no message>'
5526
self.outf.write('%3d: %s\n' % (shelf_id, message))
5850
self.add_cleanup(tree.unlock)
5851
manager = tree.get_shelf_manager()
5852
shelves = manager.active_shelves()
5853
if len(shelves) == 0:
5854
note('No shelved changes.')
5856
for shelf_id in reversed(shelves):
5857
message = manager.get_metadata(shelf_id).get('message')
5859
message = '<no message>'
5860
self.outf.write('%3d: %s\n' % (shelf_id, message))
5532
5864
class cmd_unshelve(Command):
5588
5927
dry_run=dry_run, no_prompt=force)
5591
def _create_prefix(cur_transport):
5592
needed = [cur_transport]
5593
# Recurse upwards until we can create a directory successfully
5595
new_transport = cur_transport.clone('..')
5596
if new_transport.base == cur_transport.base:
5597
raise errors.BzrCommandError(
5598
"Failed to create path prefix for %s."
5599
% cur_transport.base)
5601
new_transport.mkdir('.')
5602
except errors.NoSuchFile:
5603
needed.append(new_transport)
5604
cur_transport = new_transport
5930
class cmd_reference(Command):
5931
"""list, view and set branch locations for nested trees.
5933
If no arguments are provided, lists the branch locations for nested trees.
5934
If one argument is provided, display the branch location for that tree.
5935
If two arguments are provided, set the branch location for that tree.
5940
takes_args = ['path?', 'location?']
5942
def run(self, path=None, location=None):
5944
if path is not None:
5946
tree, branch, relpath =(
5947
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5948
if path is not None:
5951
tree = branch.basis_tree()
5953
info = branch._get_all_reference_info().iteritems()
5954
self._display_reference_info(tree, branch, info)
5607
# Now we only need to create child directories
5609
cur_transport = needed.pop()
5610
cur_transport.ensure_base()
5613
# these get imported and then picked up by the scan for cmd_*
5614
# TODO: Some more consistent way to split command definitions across files;
5615
# we do need to load at least some information about them to know of
5616
# aliases. ideally we would avoid loading the implementation until the
5617
# details were needed.
5956
file_id = tree.path2id(path)
5958
raise errors.NotVersionedError(path)
5959
if location is None:
5960
info = [(file_id, branch.get_reference_info(file_id))]
5961
self._display_reference_info(tree, branch, info)
5963
branch.set_reference_info(file_id, path, location)
5965
def _display_reference_info(self, tree, branch, info):
5967
for file_id, (path, location) in info:
5969
path = tree.id2path(file_id)
5970
except errors.NoSuchId:
5972
ref_list.append((path, location))
5973
for path, location in sorted(ref_list):
5974
self.outf.write('%s %s\n' % (path, location))
5618
5977
from bzrlib.cmd_version_info import cmd_version_info
5619
5978
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5620
from bzrlib.bundle.commands import (
5979
from bzrlib.foreign import cmd_dpush
5623
5980
from bzrlib.sign_my_commits import cmd_sign_my_commits
5624
from bzrlib.weave_commands import cmd_versionedfile_list, \
5625
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
