362
320
' --revision or a revision_id')
363
321
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
323
# TODO: jam 20060112 should cat-revision always output utf-8?
324
if revision_id is not None:
325
revision_id = osutils.safe_revision_id(revision_id, warn=False)
327
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
328
except errors.NoSuchRevision:
329
msg = "The repository %s contains no revision %s." % (b.repository.base,
331
raise errors.BzrCommandError(msg)
332
elif revision is not None:
335
raise errors.BzrCommandError('You cannot specify a NULL'
337
rev_id = rev.as_revision_id(b)
338
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
341
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
342
"""Dump the contents of a btree index file to stdout.
395
344
PATH is a btree index file, it can be any URL. This includes things like
396
345
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
421
To re-create the working tree, use "bzr checkout".
481
423
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
424
takes_args = ['location?']
483
425
takes_options = [
485
427
help='Remove the working tree even if it has '
486
428
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
431
def run(self, location='.', force=False):
432
d = bzrdir.BzrDir.open(location)
435
working = d.open_workingtree()
436
except errors.NoWorkingTree:
437
raise errors.BzrCommandError("No working tree to remove")
438
except errors.NotLocalUrl:
439
raise errors.BzrCommandError("You cannot remove the working tree of a "
442
changes = working.changes_from(working.basis_tree())
443
if changes.has_changed():
444
raise errors.UncommittedChanges(working)
446
working_path = working.bzrdir.root_transport.base
447
branch_path = working.branch.bzrdir.root_transport.base
448
if working_path != branch_path:
449
raise errors.BzrCommandError("You cannot remove the working tree from "
450
"a lightweight checkout")
452
d.destroy_workingtree()
514
455
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
456
"""Show current revision number.
517
458
This is equal to the number of revisions on this branch.
520
461
_see_also = ['info']
521
462
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
547
self.outf.write(str(revno) + '\n')
465
def run(self, location=u'.'):
466
self.outf.write(str(Branch.open_containing(location)[0].revno()))
467
self.outf.write('\n')
550
470
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
471
"""Show revision number and revision id for a given revision identifier.
554
474
takes_args = ['revision_info*']
563
Option('tree', help='Show revno of working tree'),
567
def run(self, revision=None, directory=u'.', tree=False,
568
revision_info_list=[]):
486
def run(self, revision=None, directory=u'.', revision_info_list=[]):
571
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
581
489
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
490
revs.extend(revision)
583
491
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
594
revision_ids.append(b.last_revision())
598
for revision_id in revision_ids:
492
for rev in revision_info_list:
493
revs.append(RevisionSpec.from_string(rev))
495
b = Branch.open_containing(directory)[0]
498
revs.append(RevisionSpec.from_string('-1'))
501
revision_id = rev.as_revision_id(b)
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
503
revno = '%4d' % (b.revision_id_to_revno(revision_id))
602
504
except errors.NoSuchRevision:
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
505
dotted_map = b.get_revision_id_to_revno_map()
506
revno = '.'.join(str(i) for i in dotted_map[revision_id])
507
print '%s %s' % (revno, revision_id)
612
510
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
511
"""Add specified files or directories.
615
513
In non-recursive mode, all the named items are added, regardless
616
514
of whether they were previously ignored. A warning is given if
817
719
takes_args = ['names*']
818
720
takes_options = [Option("after", help="Move only the bzr identifier"
819
721
" of the file, because the file has already been moved."),
820
Option('auto', help='Automatically guess renames.'),
821
Option('dry-run', help='Avoid making changes when guessing renames.'),
823
723
aliases = ['move', 'rename']
824
724
encoding_type = 'replace'
826
def run(self, names_list, after=False, auto=False, dry_run=False):
828
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
726
def run(self, names_list, after=False):
831
727
if names_list is None:
833
730
if len(names_list) < 2:
834
731
raise errors.BzrCommandError("missing file argument")
835
732
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
840
def run_auto(self, names_list, after, dry_run):
841
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
735
self._run(tree, names_list, rel_names, after)
852
739
def _run(self, tree, names_list, rel_names, after):
853
740
into_existing = osutils.isdir(names_list[-1])
926
812
dest = osutils.pathjoin(dest_parent, dest_tail)
927
813
mutter("attempting to move %s => %s", src, dest)
928
814
tree.rename_one(src, dest, after=after)
930
self.outf.write("%s => %s\n" % (src, dest))
815
self.outf.write("%s => %s\n" % (src, dest))
933
818
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
819
"""Turn this branch into a mirror of another branch.
936
By default, this command only works on branches that have not diverged.
937
Branches are considered diverged if the destination branch's most recent
938
commit is one that has not been merged (directly or indirectly) into the
821
This command only works on branches that have not diverged. Branches are
822
considered diverged if the destination branch's most recent commit is one
823
that has not been merged (directly or indirectly) into the parent.
941
825
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
826
from one into the other. Once one branch has merged, the other should
943
827
be able to pull it again.
945
If you want to replace your local changes and just want your branch to
946
match the remote one, use pull --overwrite. This will work even if the two
947
branches have diverged.
829
If you want to forget your local changes and just update your branch to
830
match the remote one, use pull --overwrite.
949
832
If there is no default location set, the first pull will set it. After
950
833
that, you can omit the location to use the default. To change the
1038
907
if revision is not None:
1039
908
revision_id = revision.as_revision_id(branch_from)
1041
if tree_to is not None:
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1043
change_reporter = delta._ChangeReporter(
1044
unversioned_filter=tree_to.is_ignored,
1045
view_info=view_info)
1046
result = tree_to.pull(
1047
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1050
result = branch_to.pull(
1051
branch_from, overwrite, revision_id, local=local)
910
branch_to.lock_write()
912
if tree_to is not None:
913
view_info = _get_view_info_for_change_reporter(tree_to)
914
change_reporter = delta._ChangeReporter(
915
unversioned_filter=tree_to.is_ignored, view_info=view_info)
916
result = tree_to.pull(branch_from, overwrite, revision_id,
918
possible_transports=possible_transports)
920
result = branch_to.pull(branch_from, overwrite, revision_id)
1053
result.report(self.outf)
1054
if verbose and result.old_revid != result.new_revid:
1055
log.show_branch_change(
1056
branch_to, self.outf, result.old_revno,
922
result.report(self.outf)
923
if verbose and result.old_revid != result.new_revid:
924
log.show_branch_change(branch_to, self.outf, result.old_revno,
1060
930
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
931
"""Update a mirror of this branch.
1063
933
The target branch will not have its working tree populated because this
1064
934
is both expensive, and is not supported on remote file systems.
1192
1053
help='Hard-link working tree files where possible.'),
1193
1054
Option('no-tree',
1194
1055
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1198
1056
Option('stacked',
1199
1057
help='Create a stacked branch referring to the source branch. '
1200
1058
'The new branch will depend on the availability of the source '
1201
1059
'branch for all operations.'),
1202
1060
Option('standalone',
1203
1061
help='Do not use a shared repository, even if available.'),
1204
Option('use-existing-dir',
1205
help='By default branch will fail if the target'
1206
' directory exists, but does not already'
1207
' have a control directory. This flag will'
1208
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
1063
aliases = ['get', 'clone']
1214
1065
def run(self, from_location, to_location=None, revision=None,
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1066
hardlink=False, stacked=False, standalone=False, no_tree=False):
1218
1067
from bzrlib.tag import _merge_tags_if_possible
1219
1069
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1221
1071
revision = _get_one_revision('branch', revision)
1222
1072
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1074
if revision is not None:
1075
revision_id = revision.as_revision_id(br_from)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1077
# FIXME - wt.last_revision, fallback to branch, fall back to
1078
# None or perhaps NULL_REVISION to mean copy nothing
1080
revision_id = br_from.last_revision()
1081
if to_location is None:
1082
to_location = urlutils.derive_to_location(from_location)
1083
to_transport = transport.get_transport(to_location)
1085
to_transport.mkdir('.')
1086
except errors.FileExists:
1087
raise errors.BzrCommandError('Target directory "%s" already'
1088
' exists.' % to_location)
1089
except errors.NoSuchFile:
1090
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1093
# preserve whatever source format we have.
1094
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1095
possible_transports=[to_transport],
1096
accelerator_tree=accelerator_tree,
1097
hardlink=hardlink, stacked=stacked,
1098
force_new_repo=standalone,
1099
create_tree_if_local=not no_tree,
1100
source_branch=br_from)
1101
branch = dir.open_branch()
1102
except errors.NoSuchRevision:
1103
to_transport.delete_tree('.')
1104
msg = "The branch %s has no revision %s." % (from_location,
1106
raise errors.BzrCommandError(msg)
1107
_merge_tags_if_possible(br_from, branch)
1108
# If the source branch is stacked, the new branch may
1109
# be stacked whether we asked for that explicitly or not.
1110
# We therefore need a try/except here and not just 'if stacked:'
1112
note('Created new stacked branch referring to %s.' %
1113
branch.get_stacked_on_url())
1114
except (errors.NotStacked, errors.UnstackableBranchFormat,
1115
errors.UnstackableRepositoryFormat), e:
1116
note('Branched %d revision(s).' % branch.revno())
1288
1121
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1122
"""Create a new checkout of an existing branch.
1291
1124
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1125
the branch found in '.'. This is useful if you have removed the working tree
1367
1200
def run(self, dir=u'.'):
1368
1201
tree = WorkingTree.open_containing(dir)[0]
1369
1202
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1383
renames.append(paths)
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1204
new_inv = tree.inventory
1205
old_tree = tree.basis_tree()
1206
old_tree.lock_read()
1208
old_inv = old_tree.inventory
1210
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1211
for f, paths, c, v, p, n, k, e in iterator:
1212
if paths[0] == paths[1]:
1216
renames.append(paths)
1218
for old_name, new_name in renames:
1219
self.outf.write("%s => %s\n" % (old_name, new_name))
1389
1226
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1227
"""Update a tree to have the latest code committed to its branch.
1392
1229
This will perform a merge into the working tree, and may generate
1393
1230
conflicts. If you have any local changes, you will still
1396
1233
If you want to discard your local changes, you can just do a
1397
1234
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1403
1237
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1238
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1239
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1241
def run(self, dir='.'):
1412
1242
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1243
possible_transports = []
1415
master = branch.get_master_branch(
1244
master = tree.branch.get_master_branch(
1416
1245
possible_transports=possible_transports)
1417
1246
if master is not None:
1418
1247
tree.lock_write()
1419
branch_location = master.base
1421
1249
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1251
existing_pending_merges = tree.get_parent_ids()[1:]
1252
last_rev = _mod_revision.ensure_null(tree.last_revision())
1253
if last_rev == _mod_revision.ensure_null(
1254
tree.branch.last_revision()):
1255
# may be up to date, check master too.
1256
if master is None or last_rev == _mod_revision.ensure_null(
1257
master.last_revision()):
1258
revno = tree.branch.revision_id_to_revno(last_rev)
1259
note("Tree is up to date at revision %d." % (revno,))
1261
view_info = _get_view_info_for_change_reporter(tree)
1450
1262
conflicts = tree.update(
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1263
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1264
view_info=view_info), possible_transports=possible_transports)
1265
revno = tree.branch.revision_id_to_revno(
1266
_mod_revision.ensure_null(tree.last_revision()))
1267
note('Updated to revision %d.' % (revno,))
1268
if tree.get_parent_ids()[1:] != existing_pending_merges:
1269
note('Your local commits will now show as pending merges with '
1270
"'bzr status', and can be committed with 'bzr commit'.")
1475
1279
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1280
"""Show information about a working tree, branch or repository.
1478
1282
This command will show all known locations and formats associated to the
1479
1283
tree, branch or repository.
1546
1350
file_list = [f for f in file_list]
1548
1352
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1550
# Heuristics should probably all move into tree.remove_smart or
1553
added = tree.changes_from(tree.basis_tree(),
1554
specific_files=file_list).added
1555
file_list = sorted([f[0] for f in added], reverse=True)
1556
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1558
elif file_list is None:
1559
# missing files show up in iter_changes(basis) as
1560
# versioned-with-no-kind.
1562
for change in tree.iter_changes(tree.basis_tree()):
1563
# Find paths in the working tree that have no kind:
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1566
file_list = sorted(missing, reverse=True)
1567
file_deletion_strategy = 'keep'
1568
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1354
# Heuristics should probably all move into tree.remove_smart or
1357
added = tree.changes_from(tree.basis_tree(),
1358
specific_files=file_list).added
1359
file_list = sorted([f[0] for f in added], reverse=True)
1360
if len(file_list) == 0:
1361
raise errors.BzrCommandError('No matching files.')
1362
elif file_list is None:
1363
# missing files show up in iter_changes(basis) as
1364
# versioned-with-no-kind.
1366
for change in tree.iter_changes(tree.basis_tree()):
1367
# Find paths in the working tree that have no kind:
1368
if change[1][1] is not None and change[6][1] is None:
1369
missing.append(change[1][1])
1370
file_list = sorted(missing, reverse=True)
1371
file_deletion_strategy = 'keep'
1372
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1373
keep_files=file_deletion_strategy=='keep',
1374
force=file_deletion_strategy=='force')
1573
1379
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1380
"""Print file_id of a particular file or directory.
1576
1382
The file_id is assigned when the file is first added and remains the
1577
1383
same through all revisions where the file exists, even when it is
1977
1758
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1759
' one or two revision specifiers')
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1984
(old_tree, new_tree,
1985
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1761
old_tree, new_tree, specific_files, extra_trees = \
1762
_get_trees_to_diff(file_list, revision, old, new,
1988
1764
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1765
specific_files=specific_files,
1990
1766
external_diff_options=diff_options,
1991
1767
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1768
extra_trees=extra_trees, using=using)
1996
1771
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1772
"""List files deleted in the working tree.
1999
1774
# TODO: Show files deleted since a previous revision, or
2000
1775
# between two revisions.
2229
2018
:Tips & tricks:
2231
2020
GUI tools and IDEs are often better at exploring history than command
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2021
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2022
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2023
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2025
Web interfaces are often better at exploring history than command line
2026
tools, particularly for branches on servers. You may prefer Loggerhead
2027
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2237
2029
You may find it useful to add the aliases below to ``bazaar.conf``::
2241
top = log -l10 --line
2033
top = log -r-10.. --short --forward
2034
show = log -v -p -n1 --long
2244
2036
``bzr tip`` will then show the latest revision while ``bzr top``
2245
2037
will show the last 10 mainline revisions. To see the details of a
2246
2038
particular revision X, ``bzr show -rX``.
2248
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2040
As many GUI tools and Web interfaces do, you may prefer viewing
2041
history collapsed initially. If you are interested in looking deeper
2042
into a particular merge X, use ``bzr log -n0 -rX``. If you like
2043
working this way, you may wish to either:
2045
* change your default log format to short (or line)
2046
* add this alias: log = log -n1
2251
2048
``bzr log -v`` on a branch with lots of history is currently
2252
2049
very slow. A fix for this issue is currently under development.
2378
2145
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2146
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2382
2150
rev1, rev2 = _get_revision_range(revision, b, self.name())
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2393
diff_type = 'partial'
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2435
Logger(b, rqst).show(lf)
2151
if log_format is None:
2152
log_format = log.log_formatter_registry.get_default(b)
2154
lf = log_format(show_ids=show_ids, to_file=self.outf,
2155
show_timezone=timezone,
2156
delta_format=get_verbosity_level(),
2163
direction=direction,
2164
start_revision=rev1,
2168
show_diff=show_diff)
2438
2173
def _get_revision_range(revisionspec_list, branch, command_name):
2439
2174
"""Take the input of a revision option and turn it into a revision range.
2441
2176
It returns RevisionInfo objects which can be used to obtain the rev_id's
2442
of the desired revisions. It does some user input validations.
2177
of the desired revisons. It does some user input validations.
2444
2179
if revisionspec_list is None:
2583
2309
apply_view = True
2584
2310
view_str = views.view_display_str(view_files)
2585
note("Ignoring files outside view. View is %s" % view_str)
2311
note("ignoring files outside view: %s" % view_str)
2587
2313
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2594
if kind is not None and fkind != kind:
2599
fullpath = osutils.pathjoin(relpath, fp)
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2608
fp = osutils.pathjoin(prefix, fp)
2609
kindch = entry.kind_character()
2610
outstring = fp + kindch
2611
ui.ui_factory.clear_term()
2613
outstring = '%-8s %s' % (fc, outstring)
2614
if show_ids and fid is not None:
2615
outstring = "%-50s %s" % (outstring, fid)
2616
self.outf.write(outstring + '\n')
2618
self.outf.write(fp + '\0')
2621
self.outf.write(fid)
2622
self.outf.write('\0')
2630
self.outf.write('%-50s %s\n' % (outstring, my_id))
2632
self.outf.write(outstring + '\n')
2315
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2316
if fp.startswith(relpath):
2317
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2318
if non_recursive and '/' in fp:
2320
if not all and not selection[fc]:
2322
if kind is not None and fkind != kind:
2326
views.check_path_in_view(tree, fp)
2327
except errors.FileOutsideView:
2329
kindch = entry.kind_character()
2330
outstring = fp + kindch
2332
outstring = '%-8s %s' % (fc, outstring)
2333
if show_ids and fid is not None:
2334
outstring = "%-50s %s" % (outstring, fid)
2335
self.outf.write(outstring + '\n')
2337
self.outf.write(fp + '\0')
2340
self.outf.write(fid)
2341
self.outf.write('\0')
2349
self.outf.write('%-50s %s\n' % (outstring, my_id))
2351
self.outf.write(outstring + '\n')
2635
2356
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2357
"""List unknown files.
2701
2399
Ignore everything but the "debian" toplevel directory::
2703
2401
bzr ignore "RE:(?!debian/).*"
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2709
bzr ignore "!./local"
2713
2404
_see_also = ['status', 'ignored', 'patterns']
2714
2405
takes_args = ['name_pattern*']
2715
2406
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2407
Option('old-default-rules',
2408
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2411
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2412
from bzrlib import ignores
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
2413
if old_default_rules is not None:
2414
# dump the rules and exit
2415
for pattern in ignores.OLD_DEFAULTS:
2727
2418
if not name_pattern_list:
2728
2419
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2420
"NAME_PATTERN or --old-default-rules")
2730
2421
name_pattern_list = [globbing.normalize_pattern(p)
2731
2422
for p in name_pattern_list]
2732
2423
for name_pattern in name_pattern_list:
2875
2559
_see_also = ['ls']
2876
2560
takes_options = [
2877
2561
Option('name-from-revision', help='The path name in the old tree.'),
2878
Option('filters', help='Apply content filters to display the '
2879
'convenience form.'),
2882
2564
takes_args = ['filename']
2883
2565
encoding_type = 'exact'
2885
2567
@display_command
2886
def run(self, filename, revision=None, name_from_revision=False,
2568
def run(self, filename, revision=None, name_from_revision=False):
2888
2569
if revision is not None and len(revision) != 1:
2889
2570
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2571
" one revision specifier")
2891
2572
tree, branch, relpath = \
2892
2573
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2574
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2576
return self._run(tree, branch, relpath, filename, revision,
2898
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2581
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2900
2582
if tree is None:
2901
2583
tree = b.basis_tree()
2902
2584
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2586
cur_file_id = tree.path2id(relpath)
2906
2587
old_file_id = rev_tree.path2id(relpath)
2908
2589
if name_from_revision:
2909
# Try in revision if requested
2910
2590
if old_file_id is None:
2911
2591
raise errors.BzrCommandError(
2912
2592
"%r is not present in revision %s" % (
2913
2593
filename, rev_tree.get_revision_id()))
2915
2595
content = rev_tree.get_file_text(old_file_id)
2917
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
2935
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
2949
self.outf.write(content)
2596
elif cur_file_id is not None:
2597
content = rev_tree.get_file_text(cur_file_id)
2598
elif old_file_id is not None:
2599
content = rev_tree.get_file_text(old_file_id)
2601
raise errors.BzrCommandError(
2602
"%r is not present in revision %s" % (
2603
filename, rev_tree.get_revision_id()))
2604
self.outf.write(content)
2952
2607
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2608
"""Show the offset in seconds from GMT to local time."""
2955
2610
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2612
print osutils.local_time_offset()
2961
2616
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2964
An explanatory message needs to be given for each commit. This is
2965
often done by using the --message option (getting the message from the
2966
command line) or by using the --file option (getting the message from
2967
a file). If neither of these options is given, an editor is opened for
2968
the user to enter the message. To see the changed files in the
2969
boilerplate text loaded into the editor, use the --show-diff option.
2971
By default, the entire tree is committed and the person doing the
2972
commit is assumed to be the author. These defaults can be overridden
2977
If selected files are specified, only changes to those files are
2978
committed. If a directory is specified then the directory and
2979
everything within it is committed.
2981
When excludes are given, they take precedence over selected files.
2982
For example, to commit only changes within foo, but not changes
2985
bzr commit foo -x foo/bar
2987
A selective commit after a merge is not yet supported.
2991
If the author of the change is not the same person as the committer,
2992
you can specify the author's name using the --author option. The
2993
name should be in the same format as a committer-id, e.g.
2994
"John Doe <jdoe@example.com>". If there is more than one author of
2995
the change you can specify the option multiple times, once for each
3000
A common mistake is to forget to add a new file or directory before
3001
running the commit command. The --strict option checks for unknown
3002
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3008
If you accidentially commit the wrong changes or make a spelling
3009
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3012
Hooks can also be configured to run after a commit. This allows you
3013
to trigger updates to external systems like bug trackers. The --fixes
3014
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2617
"""Commit changes into a new revision.
2619
If no arguments are given, the entire tree is committed.
2621
If selected files are specified, only changes to those files are
2622
committed. If a directory is specified then the directory and everything
2623
within it is committed.
2625
When excludes are given, they take precedence over selected files.
2626
For example, too commit only changes within foo, but not changes within
2629
bzr commit foo -x foo/bar
2631
If author of the change is not the same person as the committer, you can
2632
specify the author's name using the --author option. The name should be
2633
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2634
If there is more than one author of the change you can specify the option
2635
multiple times, once for each author.
2637
A selected-file commit may fail in some cases where the committed
2638
tree would be invalid. Consider::
2643
bzr commit foo -m "committing foo"
2644
bzr mv foo/bar foo/baz
2647
bzr commit foo/bar -m "committing bar but not baz"
2649
In the example above, the last commit will fail by design. This gives
2650
the user the opportunity to decide whether they want to commit the
2651
rename at the same time, separately first, or not at all. (As a general
2652
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2654
Note: A selected-file commit after a merge is not yet supported.
3034
2656
# TODO: Run hooks on tree to-be-committed, and after commit.
3145
2756
if local and not tree.branch.get_bound_location():
3146
2757
raise errors.LocalRequiresBoundBranch()
3148
if message is not None:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3161
ui.ui_factory.show_warning(warning_msg)
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3169
2759
def get_message(commit_obj):
3170
2760
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
2761
my_message = message
2762
if my_message is None and not file:
2763
t = make_commit_message_template_encoded(tree,
3180
2764
selected_list, diff=show_diff,
3181
2765
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3187
2766
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
2767
my_message = edit_commit_message_encoded(t,
3189
2768
start_message=start_message)
3190
2769
if my_message is None:
3191
2770
raise errors.BzrCommandError("please specify a commit"
3192
2771
" message with either --message or --file")
2772
elif my_message and file:
2773
raise errors.BzrCommandError(
2774
"please specify either --message or --file")
2776
my_message = codecs.open(file, 'rt',
2777
osutils.get_user_encoding()).read()
3193
2778
if my_message == "":
3194
2779
raise errors.BzrCommandError("empty commit message specified")
3195
2780
return my_message
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3198
# but the command line should not do that.
3199
if not selected_list:
3200
selected_list = None
3202
2783
tree.commit(message_callback=get_message,
3203
2784
specific_files=selected_list,
3204
2785
allow_pointless=unchanged, strict=strict, local=local,
3205
2786
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3208
2788
exclude=safe_relpath_files(tree, exclude))
3209
2789
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
2790
# FIXME: This should really happen before the file is read in;
2791
# perhaps prepare the commit; get the message; then actually commit
2792
raise errors.BzrCommandError("no changes to commit."
2793
" use --unchanged to commit anyhow")
3212
2794
except ConflictsInTree:
3213
2795
raise errors.BzrCommandError('Conflicts detected in working '
3214
2796
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3233
2814
The working tree and branch checks will only give output if a problem is
3234
2815
detected. The output fields of the repository check are:
3237
This is just the number of revisions checked. It doesn't
3241
This is just the number of versionedfiles checked. It
3242
doesn't indicate a problem.
3244
unreferenced ancestors
3245
Texts that are ancestors of other texts, but
3246
are not properly referenced by the revision ancestry. This is a
3247
subtle problem that Bazaar can work around.
3250
This is the total number of unique file contents
3251
seen in the checked revisions. It does not indicate a problem.
3254
This is the total number of repeated texts seen
3255
in the checked revisions. Texts can be repeated when their file
3256
entries are modified, but the file contents are not. It does not
2817
revisions: This is just the number of revisions checked. It doesn't
2819
versionedfiles: This is just the number of versionedfiles checked. It
2820
doesn't indicate a problem.
2821
unreferenced ancestors: Texts that are ancestors of other texts, but
2822
are not properly referenced by the revision ancestry. This is a
2823
subtle problem that Bazaar can work around.
2824
unique file texts: This is the total number of unique file contents
2825
seen in the checked revisions. It does not indicate a problem.
2826
repeated file texts: This is the total number of repeated texts seen
2827
in the checked revisions. Texts can be repeated when their file
2828
entries are modified, but the file contents are not. It does not
3259
2831
If no restrictions are specified, all Bazaar data that is found at the given
3260
2832
location will be checked.
3600
3161
if cache_dir is not None:
3601
3162
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3164
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
3165
print ' %s (%s python%s)' % (
3167
bzrlib.version_string,
3168
bzrlib._format_version_tuple(sys.version_info),
3602
3171
if testspecs_list is not None:
3603
3172
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
self.additional_selftest_args.setdefault(
3620
'suite_decorators', []).append(parallel)
3622
3176
test_suite_factory = benchmarks.test_suite
3623
3177
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
3178
verbose = not is_quiet()
3625
3179
# TODO: should possibly lock the history file...
3626
3180
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
3182
test_suite_factory = None
3630
3183
benchfile = None
3631
selftest_kwargs = {"verbose": verbose,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3185
selftest_kwargs = {"verbose": verbose,
3187
"stop_on_failure": one,
3188
"transport": transport,
3189
"test_suite_factory": test_suite_factory,
3190
"lsprof_timed": lsprof_timed,
3191
"bench_history": benchfile,
3192
"matching_tests_first": first,
3193
"list_only": list_only,
3194
"random_seed": randomize,
3195
"exclude_pattern": exclude,
3197
"load_list": load_list,
3198
"debug_flags": debugflag,
3199
"starting_with": starting_with
3201
selftest_kwargs.update(self.additional_selftest_args)
3202
result = selftest(**selftest_kwargs)
3204
if benchfile is not None:
3207
note('tests passed')
3209
note('tests failed')
3650
3210
return int(not result)
3653
3213
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3214
"""Show version of bzr."""
3656
3216
encoding_type = 'replace'
3657
3217
takes_options = [
3822
3367
verified = 'inapplicable'
3823
3368
tree = WorkingTree.open_containing(directory)[0]
3370
# die as quickly as possible if there are uncommitted changes
3826
3372
basis_tree = tree.revision_tree(tree.last_revision())
3827
3373
except errors.NoSuchRevision:
3828
3374
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3833
raise errors.UncommittedChanges(tree)
3375
changes = tree.changes_from(basis_tree)
3376
if changes.has_changed():
3377
raise errors.UncommittedChanges(tree)
3835
3379
view_info = _get_view_info_for_change_reporter(tree)
3836
3380
change_reporter = delta._ChangeReporter(
3837
3381
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3384
pb = ui.ui_factory.nested_progress_bar()
3385
cleanups.append(pb.finished)
3387
cleanups.append(tree.unlock)
3388
if location is not None:
3390
mergeable = bundle.read_mergeable_from_url(location,
3391
possible_transports=possible_transports)
3392
except errors.NotABundle:
3396
raise errors.BzrCommandError('Cannot use --uncommitted'
3397
' with bundles or merge directives.')
3399
if revision is not None:
3400
raise errors.BzrCommandError(
3401
'Cannot use -r with merge directives or bundles')
3402
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3405
if merger is None and uncommitted:
3406
if revision is not None and len(revision) > 0:
3407
raise errors.BzrCommandError('Cannot use --uncommitted and'
3408
' --revision at the same time.')
3409
location = self._select_branch_location(tree, location)[0]
3410
other_tree, other_path = WorkingTree.open_containing(location)
3411
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3413
allow_pending = False
3414
if other_path != '':
3415
merger.interesting_files = [other_path]
3418
merger, allow_pending = self._get_merger_from_branch(tree,
3419
location, revision, remember, possible_transports, pb)
3421
merger.merge_type = merge_type
3422
merger.reprocess = reprocess
3423
merger.show_base = show_base
3424
self.sanity_check_merger(merger)
3425
if (merger.base_rev_id == merger.other_rev_id and
3426
merger.other_rev_id is not None):
3427
note('Nothing to do.')
3430
if merger.interesting_files is not None:
3431
raise errors.BzrCommandError('Cannot pull individual files')
3432
if (merger.base_rev_id == tree.last_revision()):
3433
result = tree.pull(merger.other_branch, False,
3434
merger.other_rev_id)
3435
result.report(self.outf)
3437
merger.check_basis(False)
3439
return self._do_preview(merger)
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3891
return self._do_preview(merger)
3893
return self._do_interactive(merger)
3895
return self._do_merge(merger, change_reporter, allow_pending,
3898
def _get_preview(self, merger):
3441
return self._do_merge(merger, change_reporter, allow_pending,
3444
for cleanup in reversed(cleanups):
3447
def _do_preview(self, merger):
3448
from bzrlib.diff import show_diff_trees
3899
3449
tree_merger = merger.make_merger()
3900
3450
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3902
result_tree = tt.get_preview_tree()
3905
def _do_preview(self, merger):
3906
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3452
result_tree = tt.get_preview_tree()
3453
show_diff_trees(merger.this_tree, result_tree, self.outf,
3454
old_label='', new_label='')
3911
3458
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3459
merger.change_reporter = change_reporter
4097
3612
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3613
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3614
if merge_type is None:
4101
3615
merge_type = _mod_merge.Merge3Merger
4102
3616
tree, file_list = tree_files(file_list)
4103
3617
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4110
repository = tree.branch.repository
4111
interesting_ids = None
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
3619
parents = tree.get_parent_ids()
3620
if len(parents) != 2:
3621
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3622
" merges. Not cherrypicking or"
3624
repository = tree.branch.repository
3625
interesting_ids = None
3627
conflicts = tree.conflicts()
3628
if file_list is not None:
3629
interesting_ids = set()
3630
for filename in file_list:
3631
file_id = tree.path2id(filename)
3633
raise errors.NotVersionedError(filename)
3634
interesting_ids.add(file_id)
3635
if tree.kind(file_id) != "directory":
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
3638
for name, ie in tree.inventory.iter_entries(file_id):
3639
interesting_ids.add(ie.file_id)
3640
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3642
# Remerge only supports resolving contents conflicts
3643
allowed_conflicts = ('text conflict', 'contents conflict')
3644
restore_files = [c.path for c in conflicts
3645
if c.typestring in allowed_conflicts]
3646
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3647
tree.set_conflicts(ConflictList(new_conflicts))
3648
if file_list is not None:
3649
restore_files = file_list
3650
for filename in restore_files:
3652
restore(tree.abspath(filename))
3653
except errors.NotConflicted:
3655
# Disable pending merges, because the file texts we are remerging
3656
# have not had those merges performed. If we use the wrong parents
3657
# list, we imply that the working tree text has seen and rejected
3658
# all the changes from the other tree, when in fact those changes
3659
# have not yet been seen.
3660
pb = ui.ui_factory.nested_progress_bar()
3661
tree.set_parent_ids(parents[:1])
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
3663
merger = _mod_merge.Merger.from_revision_ids(pb,
3665
merger.interesting_ids = interesting_ids
3666
merger.merge_type = merge_type
3667
merger.show_base = show_base
3668
merger.reprocess = reprocess
3669
conflicts = merger.do_merge()
3671
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3675
if conflicts > 0:
4180
3699
name. If you name a directory, all the contents of that directory will be
4183
If you have newly added files since the target revision, they will be
4184
removed. If the files to be removed have been changed, backups will be
4185
created as above. Directories containing unknown files will not be
3702
Any files that have been newly added since that revision will be deleted,
3703
with a backup kept if appropriate. Directories containing unknown files
3704
will not be deleted.
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
3706
The working tree contains a list of pending merged revisions, which will
3707
be included as parents in the next commit. Normally, revert clears that
3708
list as well as reverting the files. If any files are specified, revert
3709
leaves the pending merge list alone and reverts only the files. Use "bzr
3710
revert ." in the tree root to revert all files but keep the merge record,
3711
and "bzr revert --forget-merges" to clear the pending merge list without
4195
3712
reverting any files.
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4208
3715
_see_also = ['cat', 'export']
4389
3891
_get_revision_range(revision,
4390
3892
remote_branch, self.name()))
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4404
show_timezone='original')
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4413
lf.log_revision(revision)
4414
printed_local = True
4417
printed_local = False
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4422
message("You are missing %d revision(s):\n" %
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4427
lf.log_revision(revision)
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4438
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
3894
local_branch.lock_read()
3896
remote_branch.lock_read()
3898
local_extra, remote_extra = find_unmerged(
3899
local_branch, remote_branch, restrict,
3900
backward=not reverse,
3901
include_merges=include_merges,
3902
local_revid_range=local_revid_range,
3903
remote_revid_range=remote_revid_range)
3905
if log_format is None:
3906
registry = log.log_formatter_registry
3907
log_format = registry.get_default(local_branch)
3908
lf = log_format(to_file=self.outf,
3910
show_timezone='original')
3913
if local_extra and not theirs_only:
3914
message("You have %d extra revision(s):\n" %
3916
for revision in iter_log_revisions(local_extra,
3917
local_branch.repository,
3919
lf.log_revision(revision)
3920
printed_local = True
3923
printed_local = False
3925
if remote_extra and not mine_only:
3926
if printed_local is True:
3928
message("You are missing %d revision(s):\n" %
3930
for revision in iter_log_revisions(remote_extra,
3931
remote_branch.repository,
3933
lf.log_revision(revision)
3936
if mine_only and not local_extra:
3937
# We checked local, and found nothing extra
3938
message('This branch is up to date.\n')
3939
elif theirs_only and not remote_extra:
3940
# We checked remote, and found nothing extra
3941
message('Other branch is up to date.\n')
3942
elif not (mine_only or theirs_only or local_extra or
3944
# We checked both branches, and neither one had extra
3946
message("Branches are up to date.\n")
3948
remote_branch.unlock()
3950
local_branch.unlock()
4442
3951
if not status_code and parent is None and other_branch is not None:
4443
3952
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
3954
# handle race conditions - a parent might be set while we run.
3955
if local_branch.get_parent() is None:
3956
local_branch.set_parent(remote_branch.base)
3958
local_branch.unlock()
4448
3959
return status_code
4451
3962
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
3963
"""Compress the data within a repository."""
4470
3965
_see_also = ['repositories']
4471
3966
takes_args = ['branch_or_repo?']
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
3968
def run(self, branch_or_repo='.'):
4477
3969
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
3971
branch = dir.open_branch()
4480
3972
repository = branch.repository
4481
3973
except errors.NotBranchError:
4482
3974
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
3978
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
3979
"""List the installed plugins.
4489
3981
This command displays the list of installed plugins including
4490
3982
version of plugin and a short description of each.
4589
4083
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4084
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4594
4087
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4600
file_id = wt.path2id(relpath)
4602
file_id = tree.path2id(relpath)
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4089
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4091
file_id = wt.path2id(relpath)
4093
file_id = tree.path2id(relpath)
4095
raise errors.NotVersionedError(filename)
4096
file_version = tree.inventory[file_id].revision
4097
if wt is not None and revision is None:
4098
# If there is a tree and we're not annotating historical
4099
# versions, annotate the working tree's content.
4100
annotate_file_tree(wt, file_id, self.outf, long, all,
4103
annotate_file(branch, file_version, file_id, long, all, self.outf,
4616
4112
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4113
"""Create a digital signature for an existing revision."""
4618
4114
# TODO be able to replace existing ones.
4620
4116
hidden = True # is this right ?
4827
4326
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4329
print 'Dry-run, pretending to remove the above revisions.'
4331
val = raw_input('Press <enter> to continue')
4833
self.outf.write('The above revision(s) will be removed.\n')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4333
print 'The above revision(s) will be removed.'
4335
val = raw_input('Are you sure [y/N]? ')
4336
if val.lower() not in ('y', 'yes'):
4840
4340
mutter('Uncommitting from {%s} to {%s}',
4841
4341
last_rev_id, rev_id)
4842
4342
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4343
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4344
note('You can restore the old tip by running:\n'
4345
' bzr pull . -r revid:%s', last_rev_id)
4848
4348
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4349
"""Break a dead lock on a repository, branch or working directory.
4851
4351
CAUTION: Locks should only be broken when you are sure that the process
4852
4352
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4354
You can get information on what locks are open via the 'bzr info' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4861
4359
takes_args = ['location?']
4908
4402
Option('allow-writes',
4909
4403
help='By default the server is a readonly server. Supplying '
4910
4404
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
4912
'does not perform authentication, so unless some form of '
4913
'external authentication is arranged supplying this '
4914
'option leads to global uncontrolled write access to your '
4405
'the served directory and below.'
4409
def run_smart_server(self, smart_server):
4410
"""Run 'smart_server' forever, with no UI output at all."""
4411
# For the duration of this server, no UI output is permitted. note
4412
# that this may cause problems with blackbox tests. This should be
4413
# changed with care though, as we dont want to use bandwidth sending
4414
# progress over stderr to smart server clients!
4415
from bzrlib import lockdir
4416
old_factory = ui.ui_factory
4417
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4419
ui.ui_factory = ui.SilentUIFactory()
4420
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4421
smart_server.serve()
4423
ui.ui_factory = old_factory
4424
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4919
4426
def get_host_and_port(self, port):
4920
4427
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4429
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4430
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4924
4432
If 'port' has a colon in it, the string before the colon will be
4925
4433
interpreted as the host.
4928
4436
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
4437
and port is an integer TCP/IP port.
4932
if port is not None:
4439
from bzrlib.smart import medium
4440
host = medium.BZR_DEFAULT_INTERFACE
4442
port = medium.BZR_DEFAULT_PORT
4933
4444
if ':' in port:
4934
4445
host, port = port.split(':')
4935
4446
port = int(port)
4936
4447
return host, port
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
4449
def get_smart_server(self, transport, inet, port):
4450
"""Construct a smart server.
4452
:param transport: The base transport from which branches will be
4454
:param inet: If True, serve over stdin and stdout. Used for running
4456
:param port: The port to listen on. By default, it's `
4457
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4459
:return: A smart server.
4461
from bzrlib.smart import medium, server
4463
smart_server = medium.SmartServerPipeStreamMedium(
4464
sys.stdin, sys.stdout, transport)
4466
host, port = self.get_host_and_port(port)
4467
smart_server = server.SmartTCPServer(
4468
transport, host=host, port=port)
4469
note('listening on port: %s' % smart_server.port)
4472
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4473
from bzrlib.transport import get_transport
4474
from bzrlib.transport.chroot import ChrootServer
4941
4475
if directory is None:
4942
4476
directory = os.getcwd()
4943
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
4477
url = urlutils.local_path_to_url(directory)
4947
4478
if not allow_writes:
4948
4479
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4480
chroot_server = ChrootServer(get_transport(url))
4481
chroot_server.setUp()
4482
t = get_transport(chroot_server.get_url())
4483
smart_server = self.get_smart_server(t, inet, port)
4484
self.run_smart_server(smart_server)
4953
4487
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4488
"""Combine a subtree into its containing tree.
4956
This command requires the target tree to be in a rich-root format.
4490
This command is for experimental use only. It requires the target tree
4491
to be in dirstate-with-subtree format, which cannot be converted into
4958
4494
The TREE argument should be an independent tree, inside another tree, but
4959
4495
not part of it. (Such trees can be produced by "bzr split", but also by
5134
4677
directly from the merge directive, without retrieving data from a
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
4680
If --no-bundle is specified, then public_branch is needed (and must be
4681
up-to-date), so that the receiver can perform the merge using the
4682
public_branch. The public_branch is always included if known, so that
4683
people can check it later.
4685
The submit branch defaults to the parent, but can be overridden. Both
4686
submit branch and public branch will be remembered if supplied.
4688
If a public_branch is known for the submit_branch, that public submit
4689
branch is used in the merge instructions. This means that a local mirror
4690
can be used as your actual submit branch, once you have set public_branch
5164
4693
Mail is sent using your preferred mail program. This should be transparent
5165
4694
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5210
4734
short_name='f',
5212
4736
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
4737
help='Write merge directive to this file; '
5214
4738
'use - for stdout.',
5217
help='Refuse to send if there are uncommitted changes in'
5218
' the working tree, --no-strict disables the check.'),
5219
4740
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5224
RegistryOption('format',
5225
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
4744
RegistryOption.from_kwargs('format',
4745
'Use the specified output format.',
4746
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4747
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5229
4750
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
4751
no_patch=False, revision=None, remember=False, output=None,
5231
format=None, mail_to=None, message=None, body=None,
5232
strict=None, **kwargs):
5233
from bzrlib.send import send
5234
return send(submit_branch, revision, public_branch, remember,
5235
format, no_bundle, no_patch, output,
5236
kwargs.get('from', '.'), mail_to, message, body,
4752
format='4', mail_to=None, message=None, **kwargs):
4753
return self._run(submit_branch, revision, public_branch, remember,
4754
format, no_bundle, no_patch, output,
4755
kwargs.get('from', '.'), mail_to, message)
4757
def _run(self, submit_branch, revision, public_branch, remember, format,
4758
no_bundle, no_patch, output, from_, mail_to, message):
4759
from bzrlib.revision import NULL_REVISION
4760
branch = Branch.open_containing(from_)[0]
4762
outfile = cStringIO.StringIO()
4766
outfile = open(output, 'wb')
4767
# we may need to write data into branch's repository to calculate
4772
config = branch.get_config()
4774
mail_to = config.get_user_option('submit_to')
4775
mail_client = config.get_mail_client()
4776
if remember and submit_branch is None:
4777
raise errors.BzrCommandError(
4778
'--remember requires a branch to be specified.')
4779
stored_submit_branch = branch.get_submit_branch()
4780
remembered_submit_branch = None
4781
if submit_branch is None:
4782
submit_branch = stored_submit_branch
4783
remembered_submit_branch = "submit"
4785
if stored_submit_branch is None or remember:
4786
branch.set_submit_branch(submit_branch)
4787
if submit_branch is None:
4788
submit_branch = branch.get_parent()
4789
remembered_submit_branch = "parent"
4790
if submit_branch is None:
4791
raise errors.BzrCommandError('No submit branch known or'
4793
if remembered_submit_branch is not None:
4794
note('Using saved %s location "%s" to determine what '
4795
'changes to submit.', remembered_submit_branch,
4799
submit_config = Branch.open(submit_branch).get_config()
4800
mail_to = submit_config.get_user_option("child_submit_to")
4802
stored_public_branch = branch.get_public_branch()
4803
if public_branch is None:
4804
public_branch = stored_public_branch
4805
elif stored_public_branch is None or remember:
4806
branch.set_public_branch(public_branch)
4807
if no_bundle and public_branch is None:
4808
raise errors.BzrCommandError('No public branch specified or'
4810
base_revision_id = None
4812
if revision is not None:
4813
if len(revision) > 2:
4814
raise errors.BzrCommandError('bzr send takes '
4815
'at most two one revision identifiers')
4816
revision_id = revision[-1].as_revision_id(branch)
4817
if len(revision) == 2:
4818
base_revision_id = revision[0].as_revision_id(branch)
4819
if revision_id is None:
4820
revision_id = branch.last_revision()
4821
if revision_id == NULL_REVISION:
4822
raise errors.BzrCommandError('No revisions to submit.')
4824
directive = merge_directive.MergeDirective2.from_objects(
4825
branch.repository, revision_id, time.time(),
4826
osutils.local_time_offset(), submit_branch,
4827
public_branch=public_branch, include_patch=not no_patch,
4828
include_bundle=not no_bundle, message=message,
4829
base_revision_id=base_revision_id)
4830
elif format == '0.9':
4833
patch_type = 'bundle'
4835
raise errors.BzrCommandError('Format 0.9 does not'
4836
' permit bundle with no patch')
4842
directive = merge_directive.MergeDirective.from_objects(
4843
branch.repository, revision_id, time.time(),
4844
osutils.local_time_offset(), submit_branch,
4845
public_branch=public_branch, patch_type=patch_type,
4848
outfile.writelines(directive.to_lines())
4850
subject = '[MERGE] '
4851
if message is not None:
4854
revision = branch.repository.get_revision(revision_id)
4855
subject += revision.get_summary()
4856
basename = directive.get_disk_name(branch)
4857
mail_client.compose_merge_request(mail_to, subject,
4858
outfile.getvalue(), basename)
5241
4865
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
4867
"""Create a merge-directive for submitting changes.
5244
4869
A merge directive provides many things needed for requesting merges:
5302
4925
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5303
4926
no_patch=False, revision=None, remember=False, output=None,
5304
format=None, strict=None, **kwargs):
4927
format='4', **kwargs):
5305
4928
if output is None:
5307
from bzrlib.send import send
5308
return send(submit_branch, revision, public_branch, remember,
4930
return self._run(submit_branch, revision, public_branch, remember,
5309
4931
format, no_bundle, no_patch, output,
5310
kwargs.get('from', '.'), None, None, None,
5311
self.outf, strict=strict)
4932
kwargs.get('from', '.'), None, None)
5314
4935
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
4936
"""Create, remove or modify a tag naming a revision.
5317
4938
Tags give human-meaningful names to revisions. Commands that take a -r
5318
4939
(--revision) option can be given -rtag:X, where X is any previously
5359
4975
branch, relpath = Branch.open_containing(directory)
5360
4976
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5369
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5371
"Tags can only be placed on a single revision, "
5373
revision_id = revision[0].as_revision_id(branch)
4979
branch.tags.delete_tag(tag_name)
4980
self.outf.write('Deleted tag %s.\n' % tag_name)
5375
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5382
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
4983
if len(revision) != 1:
4984
raise errors.BzrCommandError(
4985
"Tags can only be placed on a single revision, "
4987
revision_id = revision[0].as_revision_id(branch)
4989
revision_id = branch.last_revision()
4990
if (not force) and branch.tags.has_tag(tag_name):
4991
raise errors.TagAlreadyExists(tag_name)
4992
branch.tags.set_tag(tag_name, revision_id)
4993
self.outf.write('Created tag %s.\n' % tag_name)
5387
4998
class cmd_tags(Command):
5388
__doc__ = """List tags.
5390
5001
This command shows a table of tag names and the revisions they reference.
5496
5101
Option('bind-to', help='Branch to bind checkout to.', type=str),
5497
5102
Option('force',
5498
help='Perform reconfiguration even if local changes'
5500
Option('stacked-on',
5501
help='Reconfigure a branch to be stacked on another branch.',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
5103
help='Perform reconfiguration even if local changes'
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5107
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
5108
directory = bzrdir.BzrDir.open(location)
5514
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5516
elif stacked_on is not None:
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5519
reconfigure.ReconfigureUnstacked().apply(directory)
5520
# At the moment you can use --stacked-on and a different
5521
# reconfiguration shape at the same time; there seems no good reason
5523
5109
if target_type is None:
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5110
raise errors.BzrCommandError('No target configuration specified')
5529
5111
elif target_type == 'branch':
5530
5112
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
5113
elif target_type == 'tree':
5568
5150
/path/to/newbranch.
5570
5152
Bound branches use the nickname of its master branch unless it is set
5571
locally, in which case switching will update the local nickname to be
5153
locally, in which case switching will update the the local nickname to be
5572
5154
that of the master.
5575
takes_args = ['to_location?']
5157
takes_args = ['to_location']
5576
5158
takes_options = [Option('force',
5577
help='Switch even if local commits will be lost.'),
5579
Option('create-branch', short_name='b',
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
5159
help='Switch even if local commits will be lost.')
5584
def run(self, to_location=None, force=False, create_branch=False,
5162
def run(self, to_location, force=False):
5586
5163
from bzrlib import switch
5587
5164
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5165
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5166
branch = control_dir.open_branch()
5596
branch = control_dir.open_branch()
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5168
to_branch = Branch.open(to_location)
5598
5169
except errors.NotBranchError:
5600
had_explicit_nick = False
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
if had_explicit_nick:
5170
this_branch = control_dir.open_branch()
5171
# This may be a heavy checkout, where we want the master branch
5172
this_url = this_branch.get_bound_location()
5173
# If not, use a local sibling
5174
if this_url is None:
5175
this_url = this_branch.base
5176
to_branch = Branch.open(
5177
urlutils.join(this_url, '..', to_location))
5178
switch.switch(control_dir, to_branch, force)
5179
if branch.get_config().has_explicit_nickname():
5625
5180
branch = control_dir.open_branch() #get the new branch!
5626
5181
branch.nick = to_branch.nick
5627
5182
note('Switched to branch: %s',
5628
5183
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5648
5186
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5187
"""Manage filtered views.
5651
5189
Views provide a mask over the tree so that users can focus on
5652
5190
a subset of a tree when doing their work. After creating a view,
5802
5340
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5341
"""Show a branch's currently registered hooks.
5808
for hook_key in sorted(hooks.known_hooks.keys()):
5809
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5810
self.outf.write("%s:\n" % type(some_hooks).__name__)
5811
for hook_name, hook_point in sorted(some_hooks.items()):
5812
self.outf.write(" %s:\n" % (hook_name,))
5813
found_hooks = list(hook_point)
5815
for hook in found_hooks:
5816
self.outf.write(" %s\n" %
5817
(some_hooks.get_hook_name(hook),))
5819
self.outf.write(" <no hooks installed>\n")
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5830
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
5836
takes_args = ["location?"]
5838
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5345
takes_args = ['path?']
5347
def run(self, path=None):
5350
branch_hooks = Branch.open(path).hooks
5351
for hook_type in branch_hooks:
5352
hooks = branch_hooks[hook_type]
5353
self.outf.write("%s:\n" % (hook_type,))
5356
self.outf.write(" %s\n" %
5357
(branch_hooks.get_hook_name(hook),))
5359
self.outf.write(" <no hooks installed>\n")
5847
5362
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5363
"""Temporarily set aside some changes from the current tree.
5850
5365
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5366
ie. out of the way, until a later time when you can bring them back from
5880
5395
value_switches=True, enum_switch=False),
5882
5397
Option('list', help='List shelved changes.'),
5884
help='Destroy removed changes instead of shelving them.'),
5886
5399
_see_also = ['unshelve']
5888
5401
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
5402
writer=None, list=False):
5891
5404
return self.run_for_list()
5892
5405
from bzrlib.shelf_ui import Shelver
5893
5406
if writer is None:
5894
5407
writer = bzrlib.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5409
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5902
5411
except errors.UserAbort:
5905
5414
def run_for_list(self):
5906
5415
tree = WorkingTree.open_containing('.')[0]
5907
5416
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5418
manager = tree.get_shelf_manager()
5419
shelves = manager.active_shelves()
5420
if len(shelves) == 0:
5421
note('No shelved changes.')
5423
for shelf_id in reversed(shelves):
5424
message = manager.get_metadata(shelf_id).get('message')
5426
message = '<no message>'
5427
self.outf.write('%3d: %s\n' % (shelf_id, message))
5922
5433
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5434
"""Restore shelved changes.
5925
5436
By default, the most recently shelved changes are restored. However if you
5926
5437
specify a shelf by id those changes will be restored instead. This works
5985
5489
dry_run=dry_run, no_prompt=force)
5988
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5991
If no arguments are provided, lists the branch locations for nested trees.
5992
If one argument is provided, display the branch location for that tree.
5993
If two arguments are provided, set the branch location for that tree.
5998
takes_args = ['path?', 'location?']
6000
def run(self, path=None, location=None):
6002
if path is not None:
6004
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6006
if path is not None:
6009
tree = branch.basis_tree()
6011
info = branch._get_all_reference_info().iteritems()
6012
self._display_reference_info(tree, branch, info)
5492
def _create_prefix(cur_transport):
5493
needed = [cur_transport]
5494
# Recurse upwards until we can create a directory successfully
5496
new_transport = cur_transport.clone('..')
5497
if new_transport.base == cur_transport.base:
5498
raise errors.BzrCommandError(
5499
"Failed to create path prefix for %s."
5500
% cur_transport.base)
5502
new_transport.mkdir('.')
5503
except errors.NoSuchFile:
5504
needed.append(new_transport)
5505
cur_transport = new_transport
6014
file_id = tree.path2id(path)
6016
raise errors.NotVersionedError(path)
6017
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6019
self._display_reference_info(tree, branch, info)
6021
branch.set_reference_info(file_id, path, location)
6023
def _display_reference_info(self, tree, branch, info):
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6030
ref_list.append((path, location))
6031
for path, location in sorted(ref_list):
6032
self.outf.write('%s %s\n' % (path, location))
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
5508
# Now we only need to create child directories
5510
cur_transport = needed.pop()
5511
cur_transport.ensure_base()
5514
# these get imported and then picked up by the scan for cmd_*
5515
# TODO: Some more consistent way to split command definitions across files;
5516
# we do need to load at least some information about them to know of
5517
# aliases. ideally we would avoid loading the implementation until the
5518
# details were needed.
5519
from bzrlib.cmd_version_info import cmd_version_info
5520
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5521
from bzrlib.bundle.commands import (
5524
from bzrlib.sign_my_commits import cmd_sign_my_commits
5525
from bzrlib.weave_commands import cmd_versionedfile_list, \
5526
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
