358
334
' --revision or a revision_id')
359
335
b = WorkingTree.open_containing(u'.')[0].branch
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')
337
# TODO: jam 20060112 should cat-revision always output utf-8?
338
if revision_id is not None:
339
revision_id = osutils.safe_revision_id(revision_id, warn=False)
341
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
342
except errors.NoSuchRevision:
343
msg = "The repository %s contains no revision %s." % (b.repository.base,
345
raise errors.BzrCommandError(msg)
346
elif revision is not None:
349
raise errors.BzrCommandError('You cannot specify a NULL'
351
rev_id = rev.as_revision_id(b)
352
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
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()
388
355
class cmd_dump_btree(Command):
389
356
"""Dump the contents of a btree index file to stdout.
470
435
To re-create the working tree, use "bzr checkout".
472
437
_see_also = ['checkout', 'working-trees']
473
takes_args = ['location*']
438
takes_args = ['location?']
474
439
takes_options = [
476
441
help='Remove the working tree even if it has '
477
442
'uncommitted changes.'),
480
def run(self, location_list, force=False):
481
if not location_list:
484
for location in location_list:
485
d = bzrdir.BzrDir.open(location)
488
working = d.open_workingtree()
489
except errors.NoWorkingTree:
490
raise errors.BzrCommandError("No working tree to remove")
491
except errors.NotLocalUrl:
492
raise errors.BzrCommandError("You cannot remove the working tree"
495
if (working.has_changes()):
496
raise errors.UncommittedChanges(working)
498
working_path = working.bzrdir.root_transport.base
499
branch_path = working.branch.bzrdir.root_transport.base
500
if working_path != branch_path:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" from a lightweight checkout")
504
d.destroy_workingtree()
445
def run(self, location='.', force=False):
446
d = bzrdir.BzrDir.open(location)
449
working = d.open_workingtree()
450
except errors.NoWorkingTree:
451
raise errors.BzrCommandError("No working tree to remove")
452
except errors.NotLocalUrl:
453
raise errors.BzrCommandError("You cannot remove the working tree of a "
456
changes = working.changes_from(working.basis_tree())
457
if changes.has_changed():
458
raise errors.UncommittedChanges(working)
460
working_path = working.bzrdir.root_transport.base
461
branch_path = working.branch.bzrdir.root_transport.base
462
if working_path != branch_path:
463
raise errors.BzrCommandError("You cannot remove the working tree from "
464
"a lightweight checkout")
466
d.destroy_workingtree()
507
469
class cmd_revno(Command):
556
Option('tree', help='Show revno of working tree'),
560
def run(self, revision=None, directory=u'.', tree=False,
561
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
564
wt = WorkingTree.open_containing(directory)[0]
567
self.add_cleanup(wt.unlock)
568
except (errors.NoWorkingTree, errors.NotLocalUrl):
570
b = Branch.open_containing(directory)[0]
572
self.add_cleanup(b.unlock)
574
503
if revision is not None:
575
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
576
505
if revision_info_list is not None:
577
for rev_str in revision_info_list:
578
rev_spec = RevisionSpec.from_string(rev_str)
579
revision_ids.append(rev_spec.as_revision_id(b))
580
# No arguments supplied, default to the last revision
581
if len(revision_ids) == 0:
584
raise errors.NoWorkingTree(directory)
585
revision_ids.append(wt.last_revision())
587
revision_ids.append(b.last_revision())
591
for revision_id in revision_ids:
506
for rev in revision_info_list:
507
revs.append(RevisionSpec.from_string(rev))
509
b = Branch.open_containing(directory)[0]
512
revs.append(RevisionSpec.from_string('-1'))
515
revision_id = rev.as_revision_id(b)
593
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
594
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
595
518
except errors.NoSuchRevision:
597
maxlen = max(maxlen, len(revno))
598
revinfos.append([revno, revision_id])
602
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
519
dotted_map = b.get_revision_id_to_revno_map()
520
revno = '.'.join(str(i) for i in dotted_map[revision_id])
521
print '%s %s' % (revno, revision_id)
605
524
class cmd_add(Command):
677
593
base_tree.lock_read()
678
self.add_cleanup(base_tree.unlock)
679
tree, file_list = tree_files_for_add(file_list)
680
added, ignored = tree.smart_add(file_list, not
681
no_recurse, action=action, save=not dry_run)
595
file_list = self._maybe_expand_globs(file_list)
596
tree, file_list = tree_files_for_add(file_list)
597
added, ignored = tree.smart_add(file_list, not
598
no_recurse, action=action, save=not dry_run)
600
if base_tree is not None:
683
602
if len(ignored) > 0:
685
604
for glob in sorted(ignored.keys()):
686
605
for path in ignored[glob]:
687
606
self.outf.write("ignored %s matching \"%s\"\n"
610
for glob, paths in ignored.items():
611
match_len += len(paths)
612
self.outf.write("ignored %d file(s).\n" % match_len)
613
self.outf.write("If you wish to add ignored files, "
614
"please add them explicitly by name. "
615
"(\"bzr ignored\" gives a list)\n")
691
618
class cmd_mkdir(Command):
749
676
revision = _get_one_revision('inventory', revision)
750
677
work_tree, file_list = tree_files(file_list)
751
678
work_tree.lock_read()
752
self.add_cleanup(work_tree.unlock)
753
if revision is not None:
754
tree = revision.as_tree(work_tree.branch)
756
extra_trees = [work_tree]
758
self.add_cleanup(tree.unlock)
763
if file_list is not None:
764
file_ids = tree.paths2ids(file_list, trees=extra_trees,
765
require_versioned=True)
766
# find_ids_across_trees may include some paths that don't
768
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
769
for file_id in file_ids if file_id in tree)
771
entries = tree.inventory.entries()
680
if revision is not None:
681
tree = revision.as_tree(work_tree.branch)
683
extra_trees = [work_tree]
689
if file_list is not None:
690
file_ids = tree.paths2ids(file_list, trees=extra_trees,
691
require_versioned=True)
692
# find_ids_across_trees may include some paths that don't
694
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
695
for file_id in file_ids if file_id in tree)
697
entries = tree.inventory.entries()
700
if tree is not work_tree:
774
703
for path, entry in entries:
775
704
if kind and kind != entry.kind:
914
846
dest = osutils.pathjoin(dest_parent, dest_tail)
915
847
mutter("attempting to move %s => %s", src, dest)
916
848
tree.rename_one(src, dest, after=after)
918
self.outf.write("%s => %s\n" % (src, dest))
849
self.outf.write("%s => %s\n" % (src, dest))
921
852
class cmd_pull(Command):
922
853
"""Turn this branch into a mirror of another branch.
924
By default, this command only works on branches that have not diverged.
925
Branches are considered diverged if the destination branch's most recent
926
commit is one that has not been merged (directly or indirectly) into the
855
This command only works on branches that have not diverged. Branches are
856
considered diverged if the destination branch's most recent commit is one
857
that has not been merged (directly or indirectly) into the parent.
929
859
If branches have diverged, you can use 'bzr merge' to integrate the changes
930
860
from one into the other. Once one branch has merged, the other should
931
861
be able to pull it again.
933
If you want to replace your local changes and just want your branch to
934
match the remote one, use pull --overwrite. This will work even if the two
935
branches have diverged.
863
If you want to forget your local changes and just update your branch to
864
match the remote one, use pull --overwrite.
937
866
If there is no default location set, the first pull will set it. After
938
867
that, you can omit the location to use the default. To change the
1017
946
if branch_to.get_parent() is None or remember:
1018
947
branch_to.set_parent(branch_from.base)
1020
if branch_from is not branch_to:
1021
branch_from.lock_read()
1022
self.add_cleanup(branch_from.unlock)
1023
949
if revision is not None:
1024
950
revision_id = revision.as_revision_id(branch_from)
1026
952
branch_to.lock_write()
1027
self.add_cleanup(branch_to.unlock)
1028
if tree_to is not None:
1029
view_info = _get_view_info_for_change_reporter(tree_to)
1030
change_reporter = delta._ChangeReporter(
1031
unversioned_filter=tree_to.is_ignored,
1032
view_info=view_info)
1033
result = tree_to.pull(
1034
branch_from, overwrite, revision_id, change_reporter,
1035
possible_transports=possible_transports, local=local)
1037
result = branch_to.pull(
1038
branch_from, overwrite, revision_id, local=local)
954
if tree_to is not None:
955
view_info = _get_view_info_for_change_reporter(tree_to)
956
change_reporter = delta._ChangeReporter(
957
unversioned_filter=tree_to.is_ignored, view_info=view_info)
958
result = tree_to.pull(branch_from, overwrite, revision_id,
960
possible_transports=possible_transports,
963
result = branch_to.pull(branch_from, overwrite, revision_id,
1040
result.report(self.outf)
1041
if verbose and result.old_revid != result.new_revid:
1042
log.show_branch_change(
1043
branch_to, self.outf, result.old_revno,
966
result.report(self.outf)
967
if verbose and result.old_revid != result.new_revid:
968
log.show_branch_change(branch_to, self.outf, result.old_revno,
1047
974
class cmd_push(Command):
1104
1028
def run(self, location=None, remember=False, overwrite=False,
1105
1029
create_prefix=False, verbose=False, revision=None,
1106
1030
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1108
1032
from bzrlib.push import _show_push_branch
1034
# Get the source branch and revision_id
1110
1035
if directory is None:
1111
1036
directory = '.'
1112
# Get the source branch
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1116
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1117
if strict is None: strict = True # default value
1118
# Get the tip's revision_id
1037
br_from = Branch.open_containing(directory)[0]
1119
1038
revision = _get_one_revision('push', revision)
1120
1039
if revision is not None:
1121
1040
revision_id = revision.in_history(br_from).rev_id
1123
1042
revision_id = None
1124
if strict and tree is not None and revision_id is None:
1125
if (tree.has_changes()):
1126
raise errors.UncommittedChanges(
1127
tree, more='Use --no-strict to force the push.')
1128
if tree.last_revision() != tree.branch.last_revision():
1129
# The tree has lost sync with its branch, there is little
1130
# chance that the user is aware of it but he can still force
1131
# the push with --no-strict
1132
raise errors.OutOfDateTree(
1133
tree, more='Use --no-strict to force the push.')
1135
1044
# Get the stacked_on branch, if any
1136
1045
if stacked_on is not None:
1188
1097
help='Hard-link working tree files where possible.'),
1189
1098
Option('no-tree',
1190
1099
help="Create a branch without a working-tree."),
1192
help="Switch the checkout in the current directory "
1193
"to the new branch."),
1194
1100
Option('stacked',
1195
1101
help='Create a stacked branch referring to the source branch. '
1196
1102
'The new branch will depend on the availability of the source '
1197
1103
'branch for all operations.'),
1198
1104
Option('standalone',
1199
1105
help='Do not use a shared repository, even if available.'),
1200
Option('use-existing-dir',
1201
help='By default branch will fail if the target'
1202
' directory exists, but does not already'
1203
' have a control directory. This flag will'
1204
' allow branch to proceed.'),
1206
help="Bind new branch to from location."),
1208
1107
aliases = ['get', 'clone']
1210
1109
def run(self, from_location, to_location=None, revision=None,
1211
hardlink=False, stacked=False, standalone=False, no_tree=False,
1212
use_existing_dir=False, switch=False, bind=False):
1213
from bzrlib import switch as _mod_switch
1110
hardlink=False, stacked=False, standalone=False, no_tree=False):
1214
1111
from bzrlib.tag import _merge_tags_if_possible
1215
1113
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1217
1115
revision = _get_one_revision('branch', revision)
1218
1116
br_from.lock_read()
1219
self.add_cleanup(br_from.unlock)
1220
if revision is not None:
1221
revision_id = revision.as_revision_id(br_from)
1223
# FIXME - wt.last_revision, fallback to branch, fall back to
1224
# None or perhaps NULL_REVISION to mean copy nothing
1226
revision_id = br_from.last_revision()
1227
if to_location is None:
1228
to_location = urlutils.derive_to_location(from_location)
1229
to_transport = transport.get_transport(to_location)
1231
to_transport.mkdir('.')
1232
except errors.FileExists:
1233
if not use_existing_dir:
1234
raise errors.BzrCommandError('Target directory "%s" '
1235
'already exists.' % to_location)
1118
if revision is not None:
1119
revision_id = revision.as_revision_id(br_from)
1238
bzrdir.BzrDir.open_from_transport(to_transport)
1239
except errors.NotBranchError:
1242
raise errors.AlreadyBranchError(to_location)
1243
except errors.NoSuchFile:
1244
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1247
# preserve whatever source format we have.
1248
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1249
possible_transports=[to_transport],
1250
accelerator_tree=accelerator_tree,
1251
hardlink=hardlink, stacked=stacked,
1252
force_new_repo=standalone,
1253
create_tree_if_local=not no_tree,
1254
source_branch=br_from)
1255
branch = dir.open_branch()
1256
except errors.NoSuchRevision:
1257
to_transport.delete_tree('.')
1258
msg = "The branch %s has no revision %s." % (from_location,
1260
raise errors.BzrCommandError(msg)
1261
_merge_tags_if_possible(br_from, branch)
1262
# If the source branch is stacked, the new branch may
1263
# be stacked whether we asked for that explicitly or not.
1264
# We therefore need a try/except here and not just 'if stacked:'
1266
note('Created new stacked branch referring to %s.' %
1267
branch.get_stacked_on_url())
1268
except (errors.NotStacked, errors.UnstackableBranchFormat,
1269
errors.UnstackableRepositoryFormat), e:
1270
note('Branched %d revision(s).' % branch.revno())
1272
# Bind to the parent
1273
parent_branch = Branch.open(from_location)
1274
branch.bind(parent_branch)
1275
note('New branch bound to %s' % from_location)
1277
# Switch to the new branch
1278
wt, _ = WorkingTree.open_containing('.')
1279
_mod_switch.switch(wt.bzrdir, branch)
1280
note('Switched to branch: %s',
1281
urlutils.unescape_for_display(branch.base, 'utf-8'))
1121
# FIXME - wt.last_revision, fallback to branch, fall back to
1122
# None or perhaps NULL_REVISION to mean copy nothing
1124
revision_id = br_from.last_revision()
1125
if to_location is None:
1126
to_location = urlutils.derive_to_location(from_location)
1127
to_transport = transport.get_transport(to_location)
1129
to_transport.mkdir('.')
1130
except errors.FileExists:
1131
raise errors.BzrCommandError('Target directory "%s" already'
1132
' exists.' % to_location)
1133
except errors.NoSuchFile:
1134
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1137
# preserve whatever source format we have.
1138
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1139
possible_transports=[to_transport],
1140
accelerator_tree=accelerator_tree,
1141
hardlink=hardlink, stacked=stacked,
1142
force_new_repo=standalone,
1143
create_tree_if_local=not no_tree,
1144
source_branch=br_from)
1145
branch = dir.open_branch()
1146
except errors.NoSuchRevision:
1147
to_transport.delete_tree('.')
1148
msg = "The branch %s has no revision %s." % (from_location,
1150
raise errors.BzrCommandError(msg)
1151
_merge_tags_if_possible(br_from, branch)
1152
# If the source branch is stacked, the new branch may
1153
# be stacked whether we asked for that explicitly or not.
1154
# We therefore need a try/except here and not just 'if stacked:'
1156
note('Created new stacked branch referring to %s.' %
1157
branch.get_stacked_on_url())
1158
except (errors.NotStacked, errors.UnstackableBranchFormat,
1159
errors.UnstackableRepositoryFormat), e:
1160
note('Branched %d revision(s).' % branch.revno())
1284
1165
class cmd_checkout(Command):
1363
1244
def run(self, dir=u'.'):
1364
1245
tree = WorkingTree.open_containing(dir)[0]
1365
1246
tree.lock_read()
1366
self.add_cleanup(tree.unlock)
1367
new_inv = tree.inventory
1368
old_tree = tree.basis_tree()
1369
old_tree.lock_read()
1370
self.add_cleanup(old_tree.unlock)
1371
old_inv = old_tree.inventory
1373
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1374
for f, paths, c, v, p, n, k, e in iterator:
1375
if paths[0] == paths[1]:
1379
renames.append(paths)
1381
for old_name, new_name in renames:
1382
self.outf.write("%s => %s\n" % (old_name, new_name))
1248
new_inv = tree.inventory
1249
old_tree = tree.basis_tree()
1250
old_tree.lock_read()
1252
old_inv = old_tree.inventory
1254
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1255
for f, paths, c, v, p, n, k, e in iterator:
1256
if paths[0] == paths[1]:
1260
renames.append(paths)
1262
for old_name, new_name in renames:
1263
self.outf.write("%s => %s\n" % (old_name, new_name))
1385
1270
class cmd_update(Command):
1392
1277
If you want to discard your local changes, you can just do a
1393
1278
'bzr revert' instead of 'bzr commit' after the update.
1395
If the tree's branch is bound to a master branch, it will also update
1396
the branch from the master.
1399
1281
_see_also = ['pull', 'working-trees', 'status-flags']
1400
1282
takes_args = ['dir?']
1401
takes_options = ['revision']
1402
1283
aliases = ['up']
1404
def run(self, dir='.', revision=None):
1405
if revision is not None and len(revision) != 1:
1406
raise errors.BzrCommandError(
1407
"bzr update --revision takes exactly one revision")
1285
def run(self, dir='.'):
1408
1286
tree = WorkingTree.open_containing(dir)[0]
1409
branch = tree.branch
1410
1287
possible_transports = []
1411
master = branch.get_master_branch(
1288
master = tree.branch.get_master_branch(
1412
1289
possible_transports=possible_transports)
1413
1290
if master is not None:
1414
1291
tree.lock_write()
1415
branch_location = master.base
1417
1293
tree.lock_tree_write()
1418
branch_location = tree.branch.base
1419
self.add_cleanup(tree.unlock)
1420
# get rid of the final '/' and be ready for display
1421
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1423
existing_pending_merges = tree.get_parent_ids()[1:]
1427
# may need to fetch data into a heavyweight checkout
1428
# XXX: this may take some time, maybe we should display a
1430
old_tip = branch.update(possible_transports)
1431
if revision is not None:
1432
revision_id = revision[0].as_revision_id(branch)
1434
revision_id = branch.last_revision()
1435
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1436
revno = branch.revision_id_to_revno(revision_id)
1437
note("Tree is up to date at revision %d of branch %s" %
1438
(revno, branch_location))
1440
view_info = _get_view_info_for_change_reporter(tree)
1441
change_reporter = delta._ChangeReporter(
1442
unversioned_filter=tree.is_ignored,
1443
view_info=view_info)
1295
existing_pending_merges = tree.get_parent_ids()[1:]
1296
last_rev = _mod_revision.ensure_null(tree.last_revision())
1297
if last_rev == _mod_revision.ensure_null(
1298
tree.branch.last_revision()):
1299
# may be up to date, check master too.
1300
if master is None or last_rev == _mod_revision.ensure_null(
1301
master.last_revision()):
1302
revno = tree.branch.revision_id_to_revno(last_rev)
1303
note("Tree is up to date at revision %d." % (revno,))
1305
view_info = _get_view_info_for_change_reporter(tree)
1445
1306
conflicts = tree.update(
1447
possible_transports=possible_transports,
1448
revision=revision_id,
1450
except errors.NoSuchRevision, e:
1451
raise errors.BzrCommandError(
1452
"branch has no revision %s\n"
1453
"bzr update --revision only works"
1454
" for a revision in the branch history"
1456
revno = tree.branch.revision_id_to_revno(
1457
_mod_revision.ensure_null(tree.last_revision()))
1458
note('Updated to revision %d of branch %s' %
1459
(revno, branch_location))
1460
if tree.get_parent_ids()[1:] != existing_pending_merges:
1461
note('Your local commits will now show as pending merges with '
1462
"'bzr status', and can be committed with 'bzr commit'.")
1307
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1308
view_info=view_info), possible_transports=possible_transports)
1309
revno = tree.branch.revision_id_to_revno(
1310
_mod_revision.ensure_null(tree.last_revision()))
1311
note('Updated to revision %d.' % (revno,))
1312
if tree.get_parent_ids()[1:] != existing_pending_merges:
1313
note('Your local commits will now show as pending merges with '
1314
"'bzr status', and can be committed with 'bzr commit'.")
1469
1323
class cmd_info(Command):
1540
1394
file_list = [f for f in file_list]
1542
1396
tree.lock_write()
1543
self.add_cleanup(tree.unlock)
1544
# Heuristics should probably all move into tree.remove_smart or
1547
added = tree.changes_from(tree.basis_tree(),
1548
specific_files=file_list).added
1549
file_list = sorted([f[0] for f in added], reverse=True)
1550
if len(file_list) == 0:
1551
raise errors.BzrCommandError('No matching files.')
1552
elif file_list is None:
1553
# missing files show up in iter_changes(basis) as
1554
# versioned-with-no-kind.
1556
for change in tree.iter_changes(tree.basis_tree()):
1557
# Find paths in the working tree that have no kind:
1558
if change[1][1] is not None and change[6][1] is None:
1559
missing.append(change[1][1])
1560
file_list = sorted(missing, reverse=True)
1561
file_deletion_strategy = 'keep'
1562
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1563
keep_files=file_deletion_strategy=='keep',
1564
force=file_deletion_strategy=='force')
1398
# Heuristics should probably all move into tree.remove_smart or
1401
added = tree.changes_from(tree.basis_tree(),
1402
specific_files=file_list).added
1403
file_list = sorted([f[0] for f in added], reverse=True)
1404
if len(file_list) == 0:
1405
raise errors.BzrCommandError('No matching files.')
1406
elif file_list is None:
1407
# missing files show up in iter_changes(basis) as
1408
# versioned-with-no-kind.
1410
for change in tree.iter_changes(tree.basis_tree()):
1411
# Find paths in the working tree that have no kind:
1412
if change[1][1] is not None and change[6][1] is None:
1413
missing.append(change[1][1])
1414
file_list = sorted(missing, reverse=True)
1415
file_deletion_strategy = 'keep'
1416
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1417
keep_files=file_deletion_strategy=='keep',
1418
force=file_deletion_strategy=='force')
1567
1423
class cmd_file_id(Command):
1789
1645
class cmd_init_repository(Command):
1790
"""Create a shared repository for branches to share storage space.
1646
"""Create a shared repository to hold branches.
1792
1648
New branches created under the repository directory will store their
1793
revisions in the repository, not in the branch directory. For branches
1794
with shared history, this reduces the amount of storage needed and
1795
speeds up the creation of new branches.
1649
revisions in the repository, not in the branch directory.
1797
If the --no-trees option is given then the branches in the repository
1798
will not have working trees by default. They will still exist as
1799
directories on disk, but they will not have separate copies of the
1800
files at a certain revision. This can be useful for repositories that
1801
store branches which are interacted with through checkouts or remote
1802
branches, such as on a server.
1651
If the --no-trees option is used then the branches in the repository
1652
will not have working trees by default.
1805
Create a shared repository holding just branches::
1655
Create a shared repositories holding just branches::
1807
1657
bzr init-repo --no-trees repo
1808
1658
bzr init repo/trunk
2369
2212
diff_type = 'full'
2371
# Build the log formatter
2372
if log_format is None:
2373
log_format = log.log_formatter_registry.get_default(b)
2374
# Make a non-encoding output to include the diffs - bug 328007
2375
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2376
lf = log_format(show_ids=show_ids, to_file=self.outf,
2377
to_exact_file=unencoded_output,
2378
show_timezone=timezone,
2379
delta_format=get_verbosity_level(),
2381
show_advice=levels is None)
2383
# Choose the algorithm for doing the logging. It's annoying
2384
# having multiple code paths like this but necessary until
2385
# the underlying repository format is faster at generating
2386
# deltas or can provide everything we need from the indices.
2387
# The default algorithm - match-using-deltas - works for
2388
# multiple files and directories and is faster for small
2389
# amounts of history (200 revisions say). However, it's too
2390
# slow for logging a single file in a repository with deep
2391
# history, i.e. > 10K revisions. In the spirit of "do no
2392
# evil when adding features", we continue to use the
2393
# original algorithm - per-file-graph - for the "single
2394
# file that isn't a directory without showing a delta" case.
2395
partial_history = revision and b.repository._format.supports_chks
2396
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2397
or delta_type or partial_history)
2399
# Build the LogRequest and execute it
2400
if len(file_ids) == 0:
2402
rqst = make_log_request_dict(
2403
direction=direction, specific_fileids=file_ids,
2404
start_revision=rev1, end_revision=rev2, limit=limit,
2405
message_search=message, delta_type=delta_type,
2406
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2407
Logger(b, rqst).show(lf)
2216
# Build the log formatter
2217
if log_format is None:
2218
log_format = log.log_formatter_registry.get_default(b)
2219
lf = log_format(show_ids=show_ids, to_file=self.outf,
2220
show_timezone=timezone,
2221
delta_format=get_verbosity_level(),
2223
show_advice=levels is None)
2225
# Choose the algorithm for doing the logging. It's annoying
2226
# having multiple code paths like this but necessary until
2227
# the underlying repository format is faster at generating
2228
# deltas or can provide everything we need from the indices.
2229
# The default algorithm - match-using-deltas - works for
2230
# multiple files and directories and is faster for small
2231
# amounts of history (200 revisions say). However, it's too
2232
# slow for logging a single file in a repository with deep
2233
# history, i.e. > 10K revisions. In the spirit of "do no
2234
# evil when adding features", we continue to use the
2235
# original algorithm - per-file-graph - for the "single
2236
# file that isn't a directory without showing a delta" case.
2237
partial_history = revision and b.repository._format.supports_chks
2238
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2239
or delta_type or partial_history)
2241
# Build the LogRequest and execute it
2242
if len(file_ids) == 0:
2244
rqst = make_log_request_dict(
2245
direction=direction, specific_fileids=file_ids,
2246
start_revision=rev1, end_revision=rev2, limit=limit,
2247
message_search=message, delta_type=delta_type,
2248
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2249
Logger(b, rqst).show(lf)
2410
2254
def _get_revision_range(revisionspec_list, branch, command_name):
2553
2391
note("Ignoring files outside view. View is %s" % view_str)
2555
2393
tree.lock_read()
2556
self.add_cleanup(tree.unlock)
2557
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2558
from_dir=relpath, recursive=recursive):
2559
# Apply additional masking
2560
if not all and not selection[fc]:
2562
if kind is not None and fkind != kind:
2567
fullpath = osutils.pathjoin(relpath, fp)
2570
views.check_path_in_view(tree, fullpath)
2571
except errors.FileOutsideView:
2576
fp = osutils.pathjoin(prefix, fp)
2577
kindch = entry.kind_character()
2578
outstring = fp + kindch
2579
ui.ui_factory.clear_term()
2581
outstring = '%-8s %s' % (fc, outstring)
2582
if show_ids and fid is not None:
2583
outstring = "%-50s %s" % (outstring, fid)
2584
self.outf.write(outstring + '\n')
2586
self.outf.write(fp + '\0')
2589
self.outf.write(fid)
2590
self.outf.write('\0')
2598
self.outf.write('%-50s %s\n' % (outstring, my_id))
2600
self.outf.write(outstring + '\n')
2395
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2396
if fp.startswith(relpath):
2397
rp = fp[len(relpath):]
2398
fp = osutils.pathjoin(prefix, rp)
2399
if not recursive and '/' in rp:
2401
if not all and not selection[fc]:
2403
if kind is not None and fkind != kind:
2407
views.check_path_in_view(tree, fp)
2408
except errors.FileOutsideView:
2410
kindch = entry.kind_character()
2411
outstring = fp + kindch
2412
ui.ui_factory.clear_term()
2414
outstring = '%-8s %s' % (fc, outstring)
2415
if show_ids and fid is not None:
2416
outstring = "%-50s %s" % (outstring, fid)
2417
self.outf.write(outstring + '\n')
2419
self.outf.write(fp + '\0')
2422
self.outf.write(fid)
2423
self.outf.write('\0')
2431
self.outf.write('%-50s %s\n' % (outstring, my_id))
2433
self.outf.write(outstring + '\n')
2603
2438
class cmd_unknowns(Command):
3183
2960
The working tree and branch checks will only give output if a problem is
3184
2961
detected. The output fields of the repository check are:
3187
This is just the number of revisions checked. It doesn't
3191
This is just the number of versionedfiles checked. It
3192
doesn't indicate a problem.
3194
unreferenced ancestors
3195
Texts that are ancestors of other texts, but
3196
are not properly referenced by the revision ancestry. This is a
3197
subtle problem that Bazaar can work around.
3200
This is the total number of unique file contents
3201
seen in the checked revisions. It does not indicate a problem.
3204
This is the total number of repeated texts seen
3205
in the checked revisions. Texts can be repeated when their file
3206
entries are modified, but the file contents are not. It does not
2963
revisions: This is just the number of revisions checked. It doesn't
2965
versionedfiles: This is just the number of versionedfiles checked. It
2966
doesn't indicate a problem.
2967
unreferenced ancestors: Texts that are ancestors of other texts, but
2968
are not properly referenced by the revision ancestry. This is a
2969
subtle problem that Bazaar can work around.
2970
unique file texts: This is the total number of unique file contents
2971
seen in the checked revisions. It does not indicate a problem.
2972
repeated file texts: This is the total number of repeated texts seen
2973
in the checked revisions. Texts can be repeated when their file
2974
entries are modified, but the file contents are not. It does not
3209
2977
If no restrictions are specified, all Bazaar data that is found at the given
3210
2978
location will be checked.
3569
3332
verbose = not is_quiet()
3570
3333
# TODO: should possibly lock the history file...
3571
3334
benchfile = open(".perf_history", "at", buffering=1)
3572
self.add_cleanup(benchfile.close)
3574
3336
test_suite_factory = None
3575
3337
benchfile = None
3576
selftest_kwargs = {"verbose": verbose,
3578
"stop_on_failure": one,
3579
"transport": transport,
3580
"test_suite_factory": test_suite_factory,
3581
"lsprof_timed": lsprof_timed,
3582
"lsprof_tests": lsprof_tests,
3583
"bench_history": benchfile,
3584
"matching_tests_first": first,
3585
"list_only": list_only,
3586
"random_seed": randomize,
3587
"exclude_pattern": exclude,
3589
"load_list": load_list,
3590
"debug_flags": debugflag,
3591
"starting_with": starting_with
3593
selftest_kwargs.update(self.additional_selftest_args)
3594
result = selftest(**selftest_kwargs)
3339
selftest_kwargs = {"verbose": verbose,
3341
"stop_on_failure": one,
3342
"transport": transport,
3343
"test_suite_factory": test_suite_factory,
3344
"lsprof_timed": lsprof_timed,
3345
"bench_history": benchfile,
3346
"matching_tests_first": first,
3347
"list_only": list_only,
3348
"random_seed": randomize,
3349
"exclude_pattern": exclude,
3351
"load_list": load_list,
3352
"debug_flags": debugflag,
3353
"starting_with": starting_with
3355
selftest_kwargs.update(self.additional_selftest_args)
3356
result = selftest(**selftest_kwargs)
3358
if benchfile is not None:
3595
3360
return int(not result)
3767
3517
verified = 'inapplicable'
3768
3518
tree = WorkingTree.open_containing(directory)[0]
3520
# die as quickly as possible if there are uncommitted changes
3771
3522
basis_tree = tree.revision_tree(tree.last_revision())
3772
3523
except errors.NoSuchRevision:
3773
3524
basis_tree = tree.basis_tree()
3775
# die as quickly as possible if there are uncommitted changes
3777
if tree.has_changes():
3526
changes = tree.changes_from(basis_tree)
3527
if changes.has_changed():
3778
3528
raise errors.UncommittedChanges(tree)
3780
3530
view_info = _get_view_info_for_change_reporter(tree)
3781
3531
change_reporter = delta._ChangeReporter(
3782
3532
unversioned_filter=tree.is_ignored, view_info=view_info)
3783
pb = ui.ui_factory.nested_progress_bar()
3784
self.add_cleanup(pb.finished)
3786
self.add_cleanup(tree.unlock)
3787
if location is not None:
3789
mergeable = bundle.read_mergeable_from_url(location,
3790
possible_transports=possible_transports)
3791
except errors.NotABundle:
3535
pb = ui.ui_factory.nested_progress_bar()
3536
cleanups.append(pb.finished)
3538
cleanups.append(tree.unlock)
3539
if location is not None:
3541
mergeable = bundle.read_mergeable_from_url(location,
3542
possible_transports=possible_transports)
3543
except errors.NotABundle:
3547
raise errors.BzrCommandError('Cannot use --uncommitted'
3548
' with bundles or merge directives.')
3550
if revision is not None:
3551
raise errors.BzrCommandError(
3552
'Cannot use -r with merge directives or bundles')
3553
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3556
if merger is None and uncommitted:
3557
if revision is not None and len(revision) > 0:
3558
raise errors.BzrCommandError('Cannot use --uncommitted and'
3559
' --revision at the same time.')
3560
location = self._select_branch_location(tree, location)[0]
3561
other_tree, other_path = WorkingTree.open_containing(location)
3562
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3564
allow_pending = False
3565
if other_path != '':
3566
merger.interesting_files = [other_path]
3569
merger, allow_pending = self._get_merger_from_branch(tree,
3570
location, revision, remember, possible_transports, pb)
3572
merger.merge_type = merge_type
3573
merger.reprocess = reprocess
3574
merger.show_base = show_base
3575
self.sanity_check_merger(merger)
3576
if (merger.base_rev_id == merger.other_rev_id and
3577
merger.other_rev_id is not None):
3578
note('Nothing to do.')
3581
if merger.interesting_files is not None:
3582
raise errors.BzrCommandError('Cannot pull individual files')
3583
if (merger.base_rev_id == tree.last_revision()):
3584
result = tree.pull(merger.other_branch, False,
3585
merger.other_rev_id)
3586
result.report(self.outf)
3588
merger.check_basis(False)
3590
return self._do_preview(merger)
3795
raise errors.BzrCommandError('Cannot use --uncommitted'
3796
' with bundles or merge directives.')
3798
if revision is not None:
3799
raise errors.BzrCommandError(
3800
'Cannot use -r with merge directives or bundles')
3801
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3804
if merger is None and uncommitted:
3805
if revision is not None and len(revision) > 0:
3806
raise errors.BzrCommandError('Cannot use --uncommitted and'
3807
' --revision at the same time.')
3808
merger = self.get_merger_from_uncommitted(tree, location, None)
3809
allow_pending = False
3812
merger, allow_pending = self._get_merger_from_branch(tree,
3813
location, revision, remember, possible_transports, None)
3815
merger.merge_type = merge_type
3816
merger.reprocess = reprocess
3817
merger.show_base = show_base
3818
self.sanity_check_merger(merger)
3819
if (merger.base_rev_id == merger.other_rev_id and
3820
merger.other_rev_id is not None):
3821
note('Nothing to do.')
3824
if merger.interesting_files is not None:
3825
raise errors.BzrCommandError('Cannot pull individual files')
3826
if (merger.base_rev_id == tree.last_revision()):
3827
result = tree.pull(merger.other_branch, False,
3828
merger.other_rev_id)
3829
result.report(self.outf)
3831
if merger.this_basis is None:
3832
raise errors.BzrCommandError(
3833
"This branch has no commits."
3834
" (perhaps you would prefer 'bzr pull')")
3836
return self._do_preview(merger)
3838
return self._do_interactive(merger)
3840
return self._do_merge(merger, change_reporter, allow_pending,
3843
def _get_preview(self, merger):
3592
return self._do_merge(merger, change_reporter, allow_pending,
3595
for cleanup in reversed(cleanups):
3598
def _do_preview(self, merger):
3599
from bzrlib.diff import show_diff_trees
3844
3600
tree_merger = merger.make_merger()
3845
3601
tt = tree_merger.make_preview_transform()
3846
self.add_cleanup(tt.finalize)
3847
result_tree = tt.get_preview_tree()
3850
def _do_preview(self, merger):
3851
from bzrlib.diff import show_diff_trees
3852
result_tree = self._get_preview(merger)
3853
show_diff_trees(merger.this_tree, result_tree, self.outf,
3854
old_label='', new_label='')
3603
result_tree = tt.get_preview_tree()
3604
show_diff_trees(merger.this_tree, result_tree, self.outf,
3605
old_label='', new_label='')
3856
3609
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3857
3610
merger.change_reporter = change_reporter
4045
3766
merge_type = _mod_merge.Merge3Merger
4046
3767
tree, file_list = tree_files(file_list)
4047
3768
tree.lock_write()
4048
self.add_cleanup(tree.unlock)
4049
parents = tree.get_parent_ids()
4050
if len(parents) != 2:
4051
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4052
" merges. Not cherrypicking or"
4054
repository = tree.branch.repository
4055
interesting_ids = None
4057
conflicts = tree.conflicts()
4058
if file_list is not None:
4059
interesting_ids = set()
4060
for filename in file_list:
4061
file_id = tree.path2id(filename)
4063
raise errors.NotVersionedError(filename)
4064
interesting_ids.add(file_id)
4065
if tree.kind(file_id) != "directory":
3770
parents = tree.get_parent_ids()
3771
if len(parents) != 2:
3772
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3773
" merges. Not cherrypicking or"
3775
repository = tree.branch.repository
3776
interesting_ids = None
3778
conflicts = tree.conflicts()
3779
if file_list is not None:
3780
interesting_ids = set()
3781
for filename in file_list:
3782
file_id = tree.path2id(filename)
3784
raise errors.NotVersionedError(filename)
3785
interesting_ids.add(file_id)
3786
if tree.kind(file_id) != "directory":
4068
for name, ie in tree.inventory.iter_entries(file_id):
4069
interesting_ids.add(ie.file_id)
4070
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4072
# Remerge only supports resolving contents conflicts
4073
allowed_conflicts = ('text conflict', 'contents conflict')
4074
restore_files = [c.path for c in conflicts
4075
if c.typestring in allowed_conflicts]
4076
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4077
tree.set_conflicts(ConflictList(new_conflicts))
4078
if file_list is not None:
4079
restore_files = file_list
4080
for filename in restore_files:
3789
for name, ie in tree.inventory.iter_entries(file_id):
3790
interesting_ids.add(ie.file_id)
3791
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3793
# Remerge only supports resolving contents conflicts
3794
allowed_conflicts = ('text conflict', 'contents conflict')
3795
restore_files = [c.path for c in conflicts
3796
if c.typestring in allowed_conflicts]
3797
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3798
tree.set_conflicts(ConflictList(new_conflicts))
3799
if file_list is not None:
3800
restore_files = file_list
3801
for filename in restore_files:
3803
restore(tree.abspath(filename))
3804
except errors.NotConflicted:
3806
# Disable pending merges, because the file texts we are remerging
3807
# have not had those merges performed. If we use the wrong parents
3808
# list, we imply that the working tree text has seen and rejected
3809
# all the changes from the other tree, when in fact those changes
3810
# have not yet been seen.
3811
pb = ui.ui_factory.nested_progress_bar()
3812
tree.set_parent_ids(parents[:1])
4082
restore(tree.abspath(filename))
4083
except errors.NotConflicted:
4085
# Disable pending merges, because the file texts we are remerging
4086
# have not had those merges performed. If we use the wrong parents
4087
# list, we imply that the working tree text has seen and rejected
4088
# all the changes from the other tree, when in fact those changes
4089
# have not yet been seen.
4090
tree.set_parent_ids(parents[:1])
4092
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4093
merger.interesting_ids = interesting_ids
4094
merger.merge_type = merge_type
4095
merger.show_base = show_base
4096
merger.reprocess = reprocess
4097
conflicts = merger.do_merge()
3814
merger = _mod_merge.Merger.from_revision_ids(pb,
3816
merger.interesting_ids = interesting_ids
3817
merger.merge_type = merge_type
3818
merger.show_base = show_base
3819
merger.reprocess = reprocess
3820
conflicts = merger.do_merge()
3822
tree.set_parent_ids(parents)
4099
tree.set_parent_ids(parents)
4100
3826
if conflicts > 0:
4124
3850
name. If you name a directory, all the contents of that directory will be
4127
If you have newly added files since the target revision, they will be
4128
removed. If the files to be removed have been changed, backups will be
4129
created as above. Directories containing unknown files will not be
3853
Any files that have been newly added since that revision will be deleted,
3854
with a backup kept if appropriate. Directories containing unknown files
3855
will not be deleted.
4132
The working tree contains a list of revisions that have been merged but
4133
not yet committed. These revisions will be included as additional parents
4134
of the next commit. Normally, using revert clears that list as well as
4135
reverting the files. If any files are specified, revert leaves the list
4136
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4137
.`` in the tree root to revert all files but keep the recorded merges,
4138
and ``bzr revert --forget-merges`` to clear the pending merge list without
3857
The working tree contains a list of pending merged revisions, which will
3858
be included as parents in the next commit. Normally, revert clears that
3859
list as well as reverting the files. If any files are specified, revert
3860
leaves the pending merge list alone and reverts only the files. Use "bzr
3861
revert ." in the tree root to revert all files but keep the merge record,
3862
and "bzr revert --forget-merges" to clear the pending merge list without
4139
3863
reverting any files.
4141
Using "bzr revert --forget-merges", it is possible to apply all of the
4142
changes from a branch in a single revision. To do this, perform the merge
4143
as desired. Then doing revert with the "--forget-merges" option will keep
4144
the content of the tree as it was, but it will clear the list of pending
4145
merges. The next commit will then contain all of the changes that are
4146
present in the other branch, but without any other parent revisions.
4147
Because this technique forgets where these changes originated, it may
4148
cause additional conflicts on later merges involving the same source and
4152
3866
_see_also = ['cat', 'export']
4319
4035
if remote_branch.base == local_branch.base:
4320
4036
remote_branch = local_branch
4322
local_branch.lock_read()
4323
self.add_cleanup(local_branch.unlock)
4324
4038
local_revid_range = _revision_range_to_revid_range(
4325
4039
_get_revision_range(my_revision, local_branch,
4328
remote_branch.lock_read()
4329
self.add_cleanup(remote_branch.unlock)
4330
4042
remote_revid_range = _revision_range_to_revid_range(
4331
4043
_get_revision_range(revision,
4332
4044
remote_branch, self.name()))
4334
local_extra, remote_extra = find_unmerged(
4335
local_branch, remote_branch, restrict,
4336
backward=not reverse,
4337
include_merges=include_merges,
4338
local_revid_range=local_revid_range,
4339
remote_revid_range=remote_revid_range)
4341
if log_format is None:
4342
registry = log.log_formatter_registry
4343
log_format = registry.get_default(local_branch)
4344
lf = log_format(to_file=self.outf,
4346
show_timezone='original')
4349
if local_extra and not theirs_only:
4350
message("You have %d extra revision(s):\n" %
4352
for revision in iter_log_revisions(local_extra,
4353
local_branch.repository,
4355
lf.log_revision(revision)
4356
printed_local = True
4359
printed_local = False
4361
if remote_extra and not mine_only:
4362
if printed_local is True:
4364
message("You are missing %d revision(s):\n" %
4366
for revision in iter_log_revisions(remote_extra,
4367
remote_branch.repository,
4369
lf.log_revision(revision)
4372
if mine_only and not local_extra:
4373
# We checked local, and found nothing extra
4374
message('This branch is up to date.\n')
4375
elif theirs_only and not remote_extra:
4376
# We checked remote, and found nothing extra
4377
message('Other branch is up to date.\n')
4378
elif not (mine_only or theirs_only or local_extra or
4380
# We checked both branches, and neither one had extra
4382
message("Branches are up to date.\n")
4046
local_branch.lock_read()
4048
remote_branch.lock_read()
4050
local_extra, remote_extra = find_unmerged(
4051
local_branch, remote_branch, restrict,
4052
backward=not reverse,
4053
include_merges=include_merges,
4054
local_revid_range=local_revid_range,
4055
remote_revid_range=remote_revid_range)
4057
if log_format is None:
4058
registry = log.log_formatter_registry
4059
log_format = registry.get_default(local_branch)
4060
lf = log_format(to_file=self.outf,
4062
show_timezone='original')
4065
if local_extra and not theirs_only:
4066
message("You have %d extra revision(s):\n" %
4068
for revision in iter_log_revisions(local_extra,
4069
local_branch.repository,
4071
lf.log_revision(revision)
4072
printed_local = True
4075
printed_local = False
4077
if remote_extra and not mine_only:
4078
if printed_local is True:
4080
message("You are missing %d revision(s):\n" %
4082
for revision in iter_log_revisions(remote_extra,
4083
remote_branch.repository,
4085
lf.log_revision(revision)
4088
if mine_only and not local_extra:
4089
# We checked local, and found nothing extra
4090
message('This branch is up to date.\n')
4091
elif theirs_only and not remote_extra:
4092
# We checked remote, and found nothing extra
4093
message('Other branch is up to date.\n')
4094
elif not (mine_only or theirs_only or local_extra or
4096
# We checked both branches, and neither one had extra
4098
message("Branches are up to date.\n")
4100
remote_branch.unlock()
4102
local_branch.unlock()
4384
4103
if not status_code and parent is None and other_branch is not None:
4385
4104
local_branch.lock_write()
4386
self.add_cleanup(local_branch.unlock)
4387
# handle race conditions - a parent might be set while we run.
4388
if local_branch.get_parent() is None:
4389
local_branch.set_parent(remote_branch.base)
4106
# handle race conditions - a parent might be set while we run.
4107
if local_branch.get_parent() is None:
4108
local_branch.set_parent(remote_branch.base)
4110
local_branch.unlock()
4390
4111
return status_code
4512
4235
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4513
4236
if wt is not None:
4515
self.add_cleanup(wt.unlock)
4517
4239
branch.lock_read()
4518
self.add_cleanup(branch.unlock)
4519
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4521
self.add_cleanup(tree.unlock)
4523
file_id = wt.path2id(relpath)
4525
file_id = tree.path2id(relpath)
4527
raise errors.NotVersionedError(filename)
4528
file_version = tree.inventory[file_id].revision
4529
if wt is not None and revision is None:
4530
# If there is a tree and we're not annotating historical
4531
# versions, annotate the working tree's content.
4532
annotate_file_tree(wt, file_id, self.outf, long, all,
4535
annotate_file(branch, file_version, file_id, long, all, self.outf,
4241
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4243
file_id = wt.path2id(relpath)
4245
file_id = tree.path2id(relpath)
4247
raise errors.NotVersionedError(filename)
4248
file_version = tree.inventory[file_id].revision
4249
if wt is not None and revision is None:
4250
# If there is a tree and we're not annotating historical
4251
# versions, annotate the working tree's content.
4252
annotate_file_tree(wt, file_id, self.outf, long, all,
4255
annotate_file(branch, file_version, file_id, long, all, self.outf,
4539
4264
class cmd_re_sign(Command):
5056
4780
directly from the merge directive, without retrieving data from a
5059
`bzr send` creates a compact data set that, when applied using bzr
5060
merge, has the same effect as merging from the source branch.
5062
By default the merge directive is self-contained and can be applied to any
5063
branch containing submit_branch in its ancestory without needing access to
5066
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5067
revisions, but only a structured request to merge from the
5068
public_location. In that case the public_branch is needed and it must be
5069
up-to-date and accessible to the recipient. The public_branch is always
5070
included if known, so that people can check it later.
5072
The submit branch defaults to the parent of the source branch, but can be
5073
overridden. Both submit branch and public branch will be remembered in
5074
branch.conf the first time they are used for a particular branch. The
5075
source branch defaults to that containing the working directory, but can
5076
be changed using --from.
5078
In order to calculate those changes, bzr must analyse the submit branch.
5079
Therefore it is most efficient for the submit branch to be a local mirror.
5080
If a public location is known for the submit_branch, that location is used
5081
in the merge directive.
5083
The default behaviour is to send the merge directive by mail, unless -o is
5084
given, in which case it is sent to a file.
4783
If --no-bundle is specified, then public_branch is needed (and must be
4784
up-to-date), so that the receiver can perform the merge using the
4785
public_branch. The public_branch is always included if known, so that
4786
people can check it later.
4788
The submit branch defaults to the parent, but can be overridden. Both
4789
submit branch and public branch will be remembered if supplied.
4791
If a public_branch is known for the submit_branch, that public submit
4792
branch is used in the merge instructions. This means that a local mirror
4793
can be used as your actual submit branch, once you have set public_branch
5086
4796
Mail is sent using your preferred mail program. This should be transparent
5087
4797
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5135
4840
help='Write merge directive to this file; '
5136
4841
'use - for stdout.',
5139
help='Refuse to send if there are uncommitted changes in'
5140
' the working tree, --no-strict disables the check.'),
5141
4843
Option('mail-to', help='Mail the request to this address.',
5145
4847
Option('body', help='Body for the email.', type=unicode),
5146
4848
RegistryOption('format',
5147
help='Use the specified output format.',
5148
lazy_registry=('bzrlib.send', 'format_registry')),
4849
help='Use the specified output format.',
4850
lazy_registry=('bzrlib.send', 'format_registry'))
5151
4853
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5152
4854
no_patch=False, revision=None, remember=False, output=None,
5153
format=None, mail_to=None, message=None, body=None,
5154
strict=None, **kwargs):
4855
format=None, mail_to=None, message=None, body=None, **kwargs):
5155
4856
from bzrlib.send import send
5156
4857
return send(submit_branch, revision, public_branch, remember,
5157
format, no_bundle, no_patch, output,
5158
kwargs.get('from', '.'), mail_to, message, body,
4858
format, no_bundle, no_patch, output,
4859
kwargs.get('from', '.'), mail_to, message, body,
5163
4863
class cmd_bundle_revisions(cmd_send):
5276
4973
branch, relpath = Branch.open_containing(directory)
5277
4974
branch.lock_write()
5278
self.add_cleanup(branch.unlock)
5280
branch.tags.delete_tag(tag_name)
5281
self.outf.write('Deleted tag %s.\n' % tag_name)
5284
if len(revision) != 1:
5285
raise errors.BzrCommandError(
5286
"Tags can only be placed on a single revision, "
5288
revision_id = revision[0].as_revision_id(branch)
4977
branch.tags.delete_tag(tag_name)
4978
self.outf.write('Deleted tag %s.\n' % tag_name)
5290
revision_id = branch.last_revision()
5291
if (not force) and branch.tags.has_tag(tag_name):
5292
raise errors.TagAlreadyExists(tag_name)
5293
branch.tags.set_tag(tag_name, revision_id)
5294
self.outf.write('Created tag %s.\n' % tag_name)
4981
if len(revision) != 1:
4982
raise errors.BzrCommandError(
4983
"Tags can only be placed on a single revision, "
4985
revision_id = revision[0].as_revision_id(branch)
4987
revision_id = branch.last_revision()
4988
if (not force) and branch.tags.has_tag(tag_name):
4989
raise errors.TagAlreadyExists(tag_name)
4990
branch.tags.set_tag(tag_name, revision_id)
4991
self.outf.write('Created tag %s.\n' % tag_name)
5297
4996
class cmd_tags(Command):
5332
5031
branch.lock_read()
5333
self.add_cleanup(branch.unlock)
5335
graph = branch.repository.get_graph()
5336
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5337
revid1, revid2 = rev1.rev_id, rev2.rev_id
5338
# only show revisions between revid1 and revid2 (inclusive)
5339
tags = [(tag, revid) for tag, revid in tags if
5340
graph.is_between(revid, revid1, revid2)]
5343
elif sort == 'time':
5345
for tag, revid in tags:
5347
revobj = branch.repository.get_revision(revid)
5348
except errors.NoSuchRevision:
5349
timestamp = sys.maxint # place them at the end
5351
timestamp = revobj.timestamp
5352
timestamps[revid] = timestamp
5353
tags.sort(key=lambda x: timestamps[x[1]])
5355
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5356
for index, (tag, revid) in enumerate(tags):
5358
revno = branch.revision_id_to_dotted_revno(revid)
5359
if isinstance(revno, tuple):
5360
revno = '.'.join(map(str, revno))
5361
except errors.NoSuchRevision:
5362
# Bad tag data/merges can lead to tagged revisions
5363
# which are not in this branch. Fail gracefully ...
5365
tags[index] = (tag, revno)
5034
graph = branch.repository.get_graph()
5035
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5036
revid1, revid2 = rev1.rev_id, rev2.rev_id
5037
# only show revisions between revid1 and revid2 (inclusive)
5038
tags = [(tag, revid) for tag, revid in tags if
5039
graph.is_between(revid, revid1, revid2)]
5042
elif sort == 'time':
5044
for tag, revid in tags:
5046
revobj = branch.repository.get_revision(revid)
5047
except errors.NoSuchRevision:
5048
timestamp = sys.maxint # place them at the end
5050
timestamp = revobj.timestamp
5051
timestamps[revid] = timestamp
5052
tags.sort(key=lambda x: timestamps[x[1]])
5054
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5055
for index, (tag, revid) in enumerate(tags):
5057
revno = branch.revision_id_to_dotted_revno(revid)
5058
if isinstance(revno, tuple):
5059
revno = '.'.join(map(str, revno))
5060
except errors.NoSuchRevision:
5061
# Bad tag data/merges can lead to tagged revisions
5062
# which are not in this branch. Fail gracefully ...
5064
tags[index] = (tag, revno)
5367
5067
for tag, revspec in tags:
5368
5068
self.outf.write('%-20s %s\n' % (tag, revspec))
5406
5106
Option('bind-to', help='Branch to bind checkout to.', type=str),
5407
5107
Option('force',
5408
help='Perform reconfiguration even if local changes'
5410
Option('stacked-on',
5411
help='Reconfigure a branch to be stacked on another branch.',
5415
help='Reconfigure a branch to be unstacked. This '
5416
'may require copying substantial data into it.',
5108
help='Perform reconfiguration even if local changes'
5420
def run(self, location=None, target_type=None, bind_to=None, force=False,
5112
def run(self, location=None, target_type=None, bind_to=None, force=False):
5423
5113
directory = bzrdir.BzrDir.open(location)
5424
if stacked_on and unstacked:
5425
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5426
elif stacked_on is not None:
5427
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5429
reconfigure.ReconfigureUnstacked().apply(directory)
5430
# At the moment you can use --stacked-on and a different
5431
# reconfiguration shape at the same time; there seems no good reason
5433
5114
if target_type is None:
5434
if stacked_on or unstacked:
5437
raise errors.BzrCommandError('No target configuration '
5115
raise errors.BzrCommandError('No target configuration specified')
5439
5116
elif target_type == 'branch':
5440
5117
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5441
5118
elif target_type == 'tree':
5478
5155
/path/to/newbranch.
5480
5157
Bound branches use the nickname of its master branch unless it is set
5481
locally, in which case switching will update the local nickname to be
5158
locally, in which case switching will update the the local nickname to be
5482
5159
that of the master.
5485
takes_args = ['to_location?']
5162
takes_args = ['to_location']
5486
5163
takes_options = [Option('force',
5487
help='Switch even if local commits will be lost.'),
5489
Option('create-branch', short_name='b',
5490
help='Create the target branch from this one before'
5491
' switching to it.'),
5164
help='Switch even if local commits will be lost.')
5494
def run(self, to_location=None, force=False, create_branch=False,
5167
def run(self, to_location, force=False):
5496
5168
from bzrlib import switch
5497
5169
tree_location = '.'
5498
revision = _get_one_revision('switch', revision)
5499
5170
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5500
if to_location is None:
5501
if revision is None:
5502
raise errors.BzrCommandError('You must supply either a'
5503
' revision or a location')
5506
5172
branch = control_dir.open_branch()
5507
5173
had_explicit_nick = branch.get_config().has_explicit_nickname()
5508
5174
except errors.NotBranchError:
5510
5175
had_explicit_nick = False
5513
raise errors.BzrCommandError('cannot create branch without'
5515
to_location = directory_service.directories.dereference(
5517
if '/' not in to_location and '\\' not in to_location:
5518
# This path is meant to be relative to the existing branch
5519
this_url = self._get_branch_location(control_dir)
5520
to_location = urlutils.join(this_url, '..', to_location)
5521
to_branch = branch.bzrdir.sprout(to_location,
5522
possible_transports=[branch.bzrdir.root_transport],
5523
source_branch=branch).open_branch()
5526
to_branch = Branch.open(to_location)
5527
except errors.NotBranchError:
5528
this_url = self._get_branch_location(control_dir)
5529
to_branch = Branch.open(
5530
urlutils.join(this_url, '..', to_location))
5531
if revision is not None:
5532
revision = revision.as_revision_id(to_branch)
5533
switch.switch(control_dir, to_branch, force, revision_id=revision)
5177
to_branch = Branch.open(to_location)
5178
except errors.NotBranchError:
5179
this_url = self._get_branch_location(control_dir)
5180
to_branch = Branch.open(
5181
urlutils.join(this_url, '..', to_location))
5182
switch.switch(control_dir, to_branch, force)
5534
5183
if had_explicit_nick:
5535
5184
branch = control_dir.open_branch() #get the new branch!
5536
5185
branch.nick = to_branch.nick
5778
5427
if writer is None:
5779
5428
writer = bzrlib.option.diff_writer_registry.get()
5781
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5782
file_list, message, destroy=destroy)
5430
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5431
message, destroy=destroy).run()
5787
5432
except errors.UserAbort:
5790
5435
def run_for_list(self):
5791
5436
tree = WorkingTree.open_containing('.')[0]
5792
5437
tree.lock_read()
5793
self.add_cleanup(tree.unlock)
5794
manager = tree.get_shelf_manager()
5795
shelves = manager.active_shelves()
5796
if len(shelves) == 0:
5797
note('No shelved changes.')
5799
for shelf_id in reversed(shelves):
5800
message = manager.get_metadata(shelf_id).get('message')
5802
message = '<no message>'
5803
self.outf.write('%3d: %s\n' % (shelf_id, message))
5439
manager = tree.get_shelf_manager()
5440
shelves = manager.active_shelves()
5441
if len(shelves) == 0:
5442
note('No shelved changes.')
5444
for shelf_id in reversed(shelves):
5445
message = manager.get_metadata(shelf_id).get('message')
5447
message = '<no message>'
5448
self.outf.write('%3d: %s\n' % (shelf_id, message))
5807
5454
class cmd_unshelve(Command):
added
removed
bzrlib/builtins.py
