362
342
' --revision or a revision_id')
363
343
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')
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
359
rev_id = rev.as_revision_id(b)
360
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
363
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
364
"""Dump the contents of a btree index file to stdout.
395
366
PATH is a btree index file, it can be any URL. This includes things like
396
367
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
443
To re-create the working tree, use "bzr checkout".
481
445
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
446
takes_args = ['location?']
483
447
takes_options = [
485
449
help='Remove the working tree even if it has '
486
450
'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()
453
def run(self, location='.', force=False):
454
d = bzrdir.BzrDir.open(location)
457
working = d.open_workingtree()
458
except errors.NoWorkingTree:
459
raise errors.BzrCommandError("No working tree to remove")
460
except errors.NotLocalUrl:
461
raise errors.BzrCommandError("You cannot remove the working tree"
464
# XXX: What about pending merges ? -- vila 20090629
465
if working.has_changes(working.basis_tree()):
466
raise errors.UncommittedChanges(working)
468
working_path = working.bzrdir.root_transport.base
469
branch_path = working.branch.bzrdir.root_transport.base
470
if working_path != branch_path:
471
raise errors.BzrCommandError("You cannot remove the working tree"
472
" from a lightweight checkout")
474
d.destroy_workingtree()
514
477
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
478
"""Show current revision number.
517
480
This is equal to the number of revisions on this branch.
571
538
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
541
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
543
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
581
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
583
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())
547
if revision is not None:
548
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
549
if revision_info_list is not None:
550
for rev_str in revision_info_list:
551
rev_spec = RevisionSpec.from_string(rev_str)
552
revision_ids.append(rev_spec.as_revision_id(b))
553
# No arguments supplied, default to the last revision
554
if len(revision_ids) == 0:
557
raise errors.NoWorkingTree(directory)
558
revision_ids.append(wt.last_revision())
560
revision_ids.append(b.last_revision())
564
for revision_id in revision_ids:
566
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
567
revno = '.'.join(str(i) for i in dotted_revno)
568
except errors.NoSuchRevision:
570
maxlen = max(maxlen, len(revno))
571
revinfos.append([revno, revision_id])
594
revision_ids.append(b.last_revision())
598
for revision_id in revision_ids:
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
602
except errors.NoSuchRevision:
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
608
578
for ri in revinfos:
609
579
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
612
582
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
583
"""Add specified files or directories.
615
585
In non-recursive mode, all the named items are added, regardless
616
586
of whether they were previously ignored. A warning is given if
761
729
revision = _get_one_revision('inventory', revision)
762
730
work_tree, file_list = tree_files(file_list)
763
731
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
765
if revision is not None:
766
tree = revision.as_tree(work_tree.branch)
768
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
783
entries = tree.inventory.entries()
733
if revision is not None:
734
tree = revision.as_tree(work_tree.branch)
736
extra_trees = [work_tree]
742
if file_list is not None:
743
file_ids = tree.paths2ids(file_list, trees=extra_trees,
744
require_versioned=True)
745
# find_ids_across_trees may include some paths that don't
747
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
748
for file_id in file_ids if file_id in tree)
750
entries = tree.inventory.entries()
753
if tree is not work_tree:
786
756
for path, entry in entries:
787
757
if kind and kind != entry.kind:
926
899
dest = osutils.pathjoin(dest_parent, dest_tail)
927
900
mutter("attempting to move %s => %s", src, dest)
928
901
tree.rename_one(src, dest, after=after)
930
self.outf.write("%s => %s\n" % (src, dest))
902
self.outf.write("%s => %s\n" % (src, dest))
933
905
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
906
"""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
908
This command only works on branches that have not diverged. Branches are
909
considered diverged if the destination branch's most recent commit is one
910
that has not been merged (directly or indirectly) into the parent.
941
912
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
913
from one into the other. Once one branch has merged, the other should
943
914
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.
916
If you want to forget your local changes and just update your branch to
917
match the remote one, use pull --overwrite.
949
919
If there is no default location set, the first pull will set it. After
950
920
that, you can omit the location to use the default. To change the
1030
996
branch_from = Branch.open(location,
1031
997
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1035
999
if branch_to.get_parent() is None or remember:
1036
1000
branch_to.set_parent(branch_from.base)
1038
if revision is not None:
1039
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)
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,
1002
if branch_from is not branch_to:
1003
branch_from.lock_read()
1005
if revision is not None:
1006
revision_id = revision.as_revision_id(branch_from)
1008
branch_to.lock_write()
1010
if tree_to is not None:
1011
view_info = _get_view_info_for_change_reporter(tree_to)
1012
change_reporter = delta._ChangeReporter(
1013
unversioned_filter=tree_to.is_ignored,
1014
view_info=view_info)
1015
result = tree_to.pull(
1016
branch_from, overwrite, revision_id, change_reporter,
1017
possible_transports=possible_transports, local=local)
1019
result = branch_to.pull(
1020
branch_from, overwrite, revision_id, local=local)
1022
result.report(self.outf)
1023
if verbose and result.old_revid != result.new_revid:
1024
log.show_branch_change(
1025
branch_to, self.outf, result.old_revno,
1030
if branch_from is not branch_to:
1031
branch_from.unlock()
1060
1034
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1035
"""Update a mirror of this branch.
1063
1037
The target branch will not have its working tree populated because this
1064
1038
is both expensive, and is not supported on remote file systems.
1125
1099
# Get the source branch
1126
1100
(tree, br_from,
1127
1101
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1103
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1104
if strict is None: strict = True # default value
1128
1105
# Get the tip's revision_id
1129
1106
revision = _get_one_revision('push', revision)
1130
1107
if revision is not None:
1131
1108
revision_id = revision.in_history(br_from).rev_id
1133
1110
revision_id = None
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1111
if strict and tree is not None and revision_id is None:
1112
if (tree.has_changes(tree.basis_tree())
1113
or len(tree.get_parent_ids()) > 1):
1114
raise errors.UncommittedChanges(
1115
tree, more='Use --no-strict to force the push.')
1116
if tree.last_revision() != tree.branch.last_revision():
1117
# The tree has lost sync with its branch, there is little
1118
# chance that the user is aware of it but he can still force
1119
# the push with --no-strict
1120
raise errors.OutOfDateTree(
1121
tree, more='Use --no-strict to force the push.')
1139
1123
# Get the stacked_on branch, if any
1140
1124
if stacked_on is not None:
1141
1125
stacked_on = urlutils.normalize_url(stacked_on)
1206
1190
' directory exists, but does not already'
1207
1191
' have a control directory. This flag will'
1208
1192
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
1194
aliases = ['get', 'clone']
1214
1196
def run(self, from_location, to_location=None, revision=None,
1215
1197
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1198
use_existing_dir=False, switch=False):
1217
1199
from bzrlib import switch as _mod_switch
1218
1200
from bzrlib.tag import _merge_tags_if_possible
1219
1201
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1203
if (accelerator_tree is not None and
1204
accelerator_tree.supports_content_filtering()):
1205
accelerator_tree = None
1221
1206
revision = _get_one_revision('branch', revision)
1222
1207
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)
1209
if revision is not None:
1210
revision_id = revision.as_revision_id(br_from)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1212
# FIXME - wt.last_revision, fallback to branch, fall back to
1213
# None or perhaps NULL_REVISION to mean copy nothing
1215
revision_id = br_from.last_revision()
1216
if to_location is None:
1217
to_location = urlutils.derive_to_location(from_location)
1218
to_transport = transport.get_transport(to_location)
1220
to_transport.mkdir('.')
1221
except errors.FileExists:
1222
if not use_existing_dir:
1223
raise errors.BzrCommandError('Target directory "%s" '
1224
'already exists.' % to_location)
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'))
1227
bzrdir.BzrDir.open_from_transport(to_transport)
1228
except errors.NotBranchError:
1231
raise errors.AlreadyBranchError(to_location)
1232
except errors.NoSuchFile:
1233
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
# preserve whatever source format we have.
1237
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1238
possible_transports=[to_transport],
1239
accelerator_tree=accelerator_tree,
1240
hardlink=hardlink, stacked=stacked,
1241
force_new_repo=standalone,
1242
create_tree_if_local=not no_tree,
1243
source_branch=br_from)
1244
branch = dir.open_branch()
1245
except errors.NoSuchRevision:
1246
to_transport.delete_tree('.')
1247
msg = "The branch %s has no revision %s." % (from_location,
1249
raise errors.BzrCommandError(msg)
1250
_merge_tags_if_possible(br_from, branch)
1251
# If the source branch is stacked, the new branch may
1252
# be stacked whether we asked for that explicitly or not.
1253
# We therefore need a try/except here and not just 'if stacked:'
1255
note('Created new stacked branch referring to %s.' %
1256
branch.get_stacked_on_url())
1257
except (errors.NotStacked, errors.UnstackableBranchFormat,
1258
errors.UnstackableRepositoryFormat), e:
1259
note('Branched %d revision(s).' % branch.revno())
1261
# Switch to the new branch
1262
wt, _ = WorkingTree.open_containing('.')
1263
_mod_switch.switch(wt.bzrdir, branch)
1264
note('Switched to branch: %s',
1265
urlutils.unescape_for_display(branch.base, 'utf-8'))
1288
1270
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1271
"""Create a new checkout of an existing branch.
1291
1273
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1274
the branch found in '.'. This is useful if you have removed the working tree
1367
1349
def run(self, dir=u'.'):
1368
1350
tree = WorkingTree.open_containing(dir)[0]
1369
1351
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))
1353
new_inv = tree.inventory
1354
old_tree = tree.basis_tree()
1355
old_tree.lock_read()
1357
old_inv = old_tree.inventory
1359
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1360
for f, paths, c, v, p, n, k, e in iterator:
1361
if paths[0] == paths[1]:
1365
renames.append(paths)
1367
for old_name, new_name in renames:
1368
self.outf.write("%s => %s\n" % (old_name, new_name))
1389
1375
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1376
"""Update a tree to have the latest code committed to its branch.
1392
1378
This will perform a merge into the working tree, and may generate
1393
1379
conflicts. If you have any local changes, you will still
1396
1382
If you want to discard your local changes, you can just do a
1397
1383
'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
1386
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1387
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1388
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")
1390
def run(self, dir='.'):
1412
1391
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1392
possible_transports = []
1415
master = branch.get_master_branch(
1393
master = tree.branch.get_master_branch(
1416
1394
possible_transports=possible_transports)
1417
1395
if master is not None:
1418
1396
tree.lock_write()
1419
branch_location = master.base
1421
1398
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)
1400
existing_pending_merges = tree.get_parent_ids()[1:]
1401
last_rev = _mod_revision.ensure_null(tree.last_revision())
1402
if last_rev == _mod_revision.ensure_null(
1403
tree.branch.last_revision()):
1404
# may be up to date, check master too.
1405
if master is None or last_rev == _mod_revision.ensure_null(
1406
master.last_revision()):
1407
revno = tree.branch.revision_id_to_revno(last_rev)
1408
note("Tree is up to date at revision %d." % (revno,))
1410
view_info = _get_view_info_for_change_reporter(tree)
1450
1411
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'.")
1412
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1413
view_info=view_info), possible_transports=possible_transports)
1414
revno = tree.branch.revision_id_to_revno(
1415
_mod_revision.ensure_null(tree.last_revision()))
1416
note('Updated to revision %d.' % (revno,))
1417
if tree.get_parent_ids()[1:] != existing_pending_merges:
1418
note('Your local commits will now show as pending merges with '
1419
"'bzr status', and can be committed with 'bzr commit'.")
1475
1428
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1429
"""Show information about a working tree, branch or repository.
1478
1431
This command will show all known locations and formats associated to the
1479
1432
tree, branch or repository.
1546
1499
file_list = [f for f in file_list]
1548
1501
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')
1503
# Heuristics should probably all move into tree.remove_smart or
1506
added = tree.changes_from(tree.basis_tree(),
1507
specific_files=file_list).added
1508
file_list = sorted([f[0] for f in added], reverse=True)
1509
if len(file_list) == 0:
1510
raise errors.BzrCommandError('No matching files.')
1511
elif file_list is None:
1512
# missing files show up in iter_changes(basis) as
1513
# versioned-with-no-kind.
1515
for change in tree.iter_changes(tree.basis_tree()):
1516
# Find paths in the working tree that have no kind:
1517
if change[1][1] is not None and change[6][1] is None:
1518
missing.append(change[1][1])
1519
file_list = sorted(missing, reverse=True)
1520
file_deletion_strategy = 'keep'
1521
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1522
keep_files=file_deletion_strategy=='keep',
1523
force=file_deletion_strategy=='force')
1573
1528
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1529
"""Print file_id of a particular file or directory.
1576
1531
The file_id is assigned when the file is first added and remains the
1577
1532
same through all revisions where the file exists, even when it is
1977
1907
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1908
' 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)
1910
old_tree, new_tree, specific_files, extra_trees = \
1911
_get_trees_to_diff(file_list, revision, old, new,
1988
1913
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1914
specific_files=specific_files,
1990
1915
external_diff_options=diff_options,
1991
1916
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1917
extra_trees=extra_trees, using=using)
1996
1920
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1921
"""List files deleted in the working tree.
1999
1923
# TODO: Show files deleted since a previous revision, or
2000
1924
# between two revisions.
2395
2317
diff_type = 'full'
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2435
Logger(b, rqst).show(lf)
2321
# Build the log formatter
2322
if log_format is None:
2323
log_format = log.log_formatter_registry.get_default(b)
2324
lf = log_format(show_ids=show_ids, to_file=self.outf,
2325
show_timezone=timezone,
2326
delta_format=get_verbosity_level(),
2328
show_advice=levels is None)
2330
# Choose the algorithm for doing the logging. It's annoying
2331
# having multiple code paths like this but necessary until
2332
# the underlying repository format is faster at generating
2333
# deltas or can provide everything we need from the indices.
2334
# The default algorithm - match-using-deltas - works for
2335
# multiple files and directories and is faster for small
2336
# amounts of history (200 revisions say). However, it's too
2337
# slow for logging a single file in a repository with deep
2338
# history, i.e. > 10K revisions. In the spirit of "do no
2339
# evil when adding features", we continue to use the
2340
# original algorithm - per-file-graph - for the "single
2341
# file that isn't a directory without showing a delta" case.
2342
partial_history = revision and b.repository._format.supports_chks
2343
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2344
or delta_type or partial_history)
2346
# Build the LogRequest and execute it
2347
if len(file_ids) == 0:
2349
rqst = make_log_request_dict(
2350
direction=direction, specific_fileids=file_ids,
2351
start_revision=rev1, end_revision=rev2, limit=limit,
2352
message_search=message, delta_type=delta_type,
2353
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2354
Logger(b, rqst).show(lf)
2438
2359
def _get_revision_range(revisionspec_list, branch, command_name):
2585
2499
note("Ignoring files outside view. View is %s" % view_str)
2587
2501
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:
2503
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2504
from_dir=relpath, recursive=recursive):
2505
# Apply additional masking
2506
if not all and not selection[fc]:
2508
if kind is not None and fkind != kind:
2513
fullpath = osutils.pathjoin(relpath, fp)
2516
views.check_path_in_view(tree, fullpath)
2517
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))
2522
fp = osutils.pathjoin(prefix, fp)
2523
kindch = entry.kind_character()
2524
outstring = fp + kindch
2525
ui.ui_factory.clear_term()
2527
outstring = '%-8s %s' % (fc, outstring)
2528
if show_ids and fid is not None:
2529
outstring = "%-50s %s" % (outstring, fid)
2632
2530
self.outf.write(outstring + '\n')
2532
self.outf.write(fp + '\0')
2535
self.outf.write(fid)
2536
self.outf.write('\0')
2544
self.outf.write('%-50s %s\n' % (outstring, my_id))
2546
self.outf.write(outstring + '\n')
2635
2551
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2552
"""List unknown files.
2648
2564
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2565
"""Ignore specified files or patterns.
2651
2567
See ``bzr help patterns`` for details on the syntax of patterns.
2653
If a .bzrignore file does not exist, the ignore command
2654
will create one and add the specified files or patterns to the newly
2655
created file. The ignore command will also automatically add the
2656
.bzrignore file to be versioned. Creating a .bzrignore file without
2657
the use of the ignore command will require an explicit add command.
2659
2569
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2570
After adding, editing or deleting that file either indirectly by
2661
2571
using this command or directly by using an editor, be sure to commit
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2677
2574
Note: ignore patterns containing shell wildcards must be quoted from
2678
2575
the shell on Unix.
2701
2594
Ignore everything but the "debian" toplevel directory::
2703
2596
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
2599
_see_also = ['status', 'ignored', 'patterns']
2714
2600
takes_args = ['name_pattern*']
2715
2601
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2602
Option('old-default-rules',
2603
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2606
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2607
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)
2608
if old_default_rules is not None:
2609
# dump the rules and exit
2610
for pattern in ignores.OLD_DEFAULTS:
2727
2613
if not name_pattern_list:
2728
2614
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2615
"NAME_PATTERN or --old-default-rules")
2730
2616
name_pattern_list = [globbing.normalize_pattern(p)
2731
2617
for p in name_pattern_list]
2732
2618
for name_pattern in name_pattern_list:
3145
3015
if local and not tree.branch.get_bound_location():
3146
3016
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
3018
def get_message(commit_obj):
3170
3019
"""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,
3020
my_message = message
3021
if my_message is None and not file:
3022
t = make_commit_message_template_encoded(tree,
3180
3023
selected_list, diff=show_diff,
3181
3024
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
3025
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3026
my_message = edit_commit_message_encoded(t,
3189
3027
start_message=start_message)
3190
3028
if my_message is None:
3191
3029
raise errors.BzrCommandError("please specify a commit"
3192
3030
" message with either --message or --file")
3031
elif my_message and file:
3032
raise errors.BzrCommandError(
3033
"please specify either --message or --file")
3035
my_message = codecs.open(file, 'rt',
3036
osutils.get_user_encoding()).read()
3193
3037
if my_message == "":
3194
3038
raise errors.BzrCommandError("empty commit message specified")
3195
3039
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
3042
tree.commit(message_callback=get_message,
3203
3043
specific_files=selected_list,
3204
3044
allow_pointless=unchanged, strict=strict, local=local,
3205
3045
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3208
3047
exclude=safe_relpath_files(tree, exclude))
3209
3048
except PointlessCommit:
3049
# FIXME: This should really happen before the file is read in;
3050
# perhaps prepare the commit; get the message; then actually commit
3210
3051
raise errors.BzrCommandError("No changes to commit."
3211
3052
" Use --unchanged to commit anyhow.")
3212
3053
except ConflictsInTree:
3624
3456
verbose = not is_quiet()
3625
3457
# TODO: should possibly lock the history file...
3626
3458
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
3460
test_suite_factory = None
3630
3461
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)
3463
selftest_kwargs = {"verbose": verbose,
3465
"stop_on_failure": one,
3466
"transport": transport,
3467
"test_suite_factory": test_suite_factory,
3468
"lsprof_timed": lsprof_timed,
3469
"lsprof_tests": lsprof_tests,
3470
"bench_history": benchfile,
3471
"matching_tests_first": first,
3472
"list_only": list_only,
3473
"random_seed": randomize,
3474
"exclude_pattern": exclude,
3476
"load_list": load_list,
3477
"debug_flags": debugflag,
3478
"starting_with": starting_with
3480
selftest_kwargs.update(self.additional_selftest_args)
3481
result = selftest(**selftest_kwargs)
3483
if benchfile is not None:
3650
3485
return int(not result)
3653
3488
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3489
"""Show version of bzr."""
3656
3491
encoding_type = 'replace'
3657
3492
takes_options = [
3822
3649
verified = 'inapplicable'
3823
3650
tree = WorkingTree.open_containing(directory)[0]
3652
# die as quickly as possible if there are uncommitted changes
3826
3654
basis_tree = tree.revision_tree(tree.last_revision())
3827
3655
except errors.NoSuchRevision:
3828
3656
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3658
if tree.has_changes(basis_tree):
3833
3659
raise errors.UncommittedChanges(tree)
3835
3661
view_info = _get_view_info_for_change_reporter(tree)
3836
3662
change_reporter = delta._ChangeReporter(
3837
3663
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:
3666
pb = ui.ui_factory.nested_progress_bar()
3667
cleanups.append(pb.finished)
3669
cleanups.append(tree.unlock)
3670
if location is not None:
3672
mergeable = bundle.read_mergeable_from_url(location,
3673
possible_transports=possible_transports)
3674
except errors.NotABundle:
3678
raise errors.BzrCommandError('Cannot use --uncommitted'
3679
' with bundles or merge directives.')
3681
if revision is not None:
3682
raise errors.BzrCommandError(
3683
'Cannot use -r with merge directives or bundles')
3684
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3687
if merger is None and uncommitted:
3688
if revision is not None and len(revision) > 0:
3689
raise errors.BzrCommandError('Cannot use --uncommitted and'
3690
' --revision at the same time.')
3691
merger = self.get_merger_from_uncommitted(tree, location, pb,
3693
allow_pending = False
3696
merger, allow_pending = self._get_merger_from_branch(tree,
3697
location, revision, remember, possible_transports, pb)
3699
merger.merge_type = merge_type
3700
merger.reprocess = reprocess
3701
merger.show_base = show_base
3702
self.sanity_check_merger(merger)
3703
if (merger.base_rev_id == merger.other_rev_id and
3704
merger.other_rev_id is not None):
3705
note('Nothing to do.')
3708
if merger.interesting_files is not None:
3709
raise errors.BzrCommandError('Cannot pull individual files')
3710
if (merger.base_rev_id == tree.last_revision()):
3711
result = tree.pull(merger.other_branch, False,
3712
merger.other_rev_id)
3713
result.report(self.outf)
3715
merger.check_basis(False)
3717
return self._do_preview(merger, cleanups)
3719
return self._do_interactive(merger, cleanups)
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):
3721
return self._do_merge(merger, change_reporter, allow_pending,
3724
for cleanup in reversed(cleanups):
3727
def _get_preview(self, merger, cleanups):
3899
3728
tree_merger = merger.make_merger()
3900
3729
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3730
cleanups.append(tt.finalize)
3902
3731
result_tree = tt.get_preview_tree()
3903
3732
return result_tree
3905
def _do_preview(self, merger):
3734
def _do_preview(self, merger, cleanups):
3906
3735
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3736
result_tree = self._get_preview(merger, cleanups)
3908
3737
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
3738
old_label='', new_label='')
4097
3925
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3926
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3927
if merge_type is None:
4101
3928
merge_type = _mod_merge.Merge3Merger
4102
3929
tree, file_list = tree_files(file_list)
4103
3930
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":
3932
parents = tree.get_parent_ids()
3933
if len(parents) != 2:
3934
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3935
" merges. Not cherrypicking or"
3937
repository = tree.branch.repository
3938
interesting_ids = None
3940
conflicts = tree.conflicts()
3941
if file_list is not None:
3942
interesting_ids = set()
3943
for filename in file_list:
3944
file_id = tree.path2id(filename)
3946
raise errors.NotVersionedError(filename)
3947
interesting_ids.add(file_id)
3948
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:
3951
for name, ie in tree.inventory.iter_entries(file_id):
3952
interesting_ids.add(ie.file_id)
3953
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3955
# Remerge only supports resolving contents conflicts
3956
allowed_conflicts = ('text conflict', 'contents conflict')
3957
restore_files = [c.path for c in conflicts
3958
if c.typestring in allowed_conflicts]
3959
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3960
tree.set_conflicts(ConflictList(new_conflicts))
3961
if file_list is not None:
3962
restore_files = file_list
3963
for filename in restore_files:
3965
restore(tree.abspath(filename))
3966
except errors.NotConflicted:
3968
# Disable pending merges, because the file texts we are remerging
3969
# have not had those merges performed. If we use the wrong parents
3970
# list, we imply that the working tree text has seen and rejected
3971
# all the changes from the other tree, when in fact those changes
3972
# have not yet been seen.
3973
pb = ui.ui_factory.nested_progress_bar()
3974
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()
3976
merger = _mod_merge.Merger.from_revision_ids(pb,
3978
merger.interesting_ids = interesting_ids
3979
merger.merge_type = merge_type
3980
merger.show_base = show_base
3981
merger.reprocess = reprocess
3982
conflicts = merger.do_merge()
3984
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3988
if conflicts > 0:
4180
4012
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
4015
Any files that have been newly added since that revision will be deleted,
4016
with a backup kept if appropriate. Directories containing unknown files
4017
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
4019
The working tree contains a list of pending merged revisions, which will
4020
be included as parents in the next commit. Normally, revert clears that
4021
list as well as reverting the files. If any files are specified, revert
4022
leaves the pending merge list alone and reverts only the files. Use "bzr
4023
revert ." in the tree root to revert all files but keep the merge record,
4024
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4025
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
4028
_see_also = ['cat', 'export']
4217
4037
def run(self, revision=None, no_backup=False, file_list=None,
4218
4038
forget_merges=None):
4219
4039
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4225
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4043
tree.set_parent_ids(tree.get_parent_ids()[:1])
4045
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4228
4050
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4051
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
4052
pb = ui.ui_factory.nested_progress_bar()
4054
tree.revert(file_list, rev_tree, not no_backup, pb,
4055
report_changes=True)
4234
4060
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4061
"""Test reporting of assertion failures"""
4236
4062
# intended just for use in testing
4389
4205
_get_revision_range(revision,
4390
4206
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")
4208
local_branch.lock_read()
4210
remote_branch.lock_read()
4212
local_extra, remote_extra = find_unmerged(
4213
local_branch, remote_branch, restrict,
4214
backward=not reverse,
4215
include_merges=include_merges,
4216
local_revid_range=local_revid_range,
4217
remote_revid_range=remote_revid_range)
4219
if log_format is None:
4220
registry = log.log_formatter_registry
4221
log_format = registry.get_default(local_branch)
4222
lf = log_format(to_file=self.outf,
4224
show_timezone='original')
4227
if local_extra and not theirs_only:
4228
message("You have %d extra revision(s):\n" %
4230
for revision in iter_log_revisions(local_extra,
4231
local_branch.repository,
4233
lf.log_revision(revision)
4234
printed_local = True
4237
printed_local = False
4239
if remote_extra and not mine_only:
4240
if printed_local is True:
4242
message("You are missing %d revision(s):\n" %
4244
for revision in iter_log_revisions(remote_extra,
4245
remote_branch.repository,
4247
lf.log_revision(revision)
4250
if mine_only and not local_extra:
4251
# We checked local, and found nothing extra
4252
message('This branch is up to date.\n')
4253
elif theirs_only and not remote_extra:
4254
# We checked remote, and found nothing extra
4255
message('Other branch is up to date.\n')
4256
elif not (mine_only or theirs_only or local_extra or
4258
# We checked both branches, and neither one had extra
4260
message("Branches are up to date.\n")
4262
remote_branch.unlock()
4264
local_branch.unlock()
4442
4265
if not status_code and parent is None and other_branch is not None:
4443
4266
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)
4268
# handle race conditions - a parent might be set while we run.
4269
if local_branch.get_parent() is None:
4270
local_branch.set_parent(remote_branch.base)
4272
local_branch.unlock()
4448
4273
return status_code
4451
4276
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.
4277
"""Compress the data within a repository."""
4470
4279
_see_also = ['repositories']
4471
4280
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):
4282
def run(self, branch_or_repo='.'):
4477
4283
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4285
branch = dir.open_branch()
4480
4286
repository = branch.repository
4481
4287
except errors.NotBranchError:
4482
4288
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4292
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4293
"""List the installed plugins.
4489
4295
This command displays the list of installed plugins including
4490
4296
version of plugin and a short description of each.
4589
4397
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4398
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4594
4401
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,
4403
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4405
file_id = wt.path2id(relpath)
4407
file_id = tree.path2id(relpath)
4409
raise errors.NotVersionedError(filename)
4410
file_version = tree.inventory[file_id].revision
4411
if wt is not None and revision is None:
4412
# If there is a tree and we're not annotating historical
4413
# versions, annotate the working tree's content.
4414
annotate_file_tree(wt, file_id, self.outf, long, all,
4417
annotate_file(branch, file_version, file_id, long, all, self.outf,
4616
4426
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4427
"""Create a digital signature for an existing revision."""
4618
4428
# TODO be able to replace existing ones.
4620
4430
hidden = True # is this right ?
4827
4640
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4643
print 'Dry-run, pretending to remove the above revisions.'
4645
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')
4647
print 'The above revision(s) will be removed.'
4649
val = raw_input('Are you sure [y/N]? ')
4650
if val.lower() not in ('y', 'yes'):
4840
4654
mutter('Uncommitting from {%s} to {%s}',
4841
4655
last_rev_id, rev_id)
4842
4656
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4657
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)
4658
note('You can restore the old tip by running:\n'
4659
' bzr pull . -r revid:%s', last_rev_id)
4848
4662
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4663
"""Break a dead lock on a repository, branch or working directory.
4851
4665
CAUTION: Locks should only be broken when you are sure that the process
4852
4666
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4668
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
4673
takes_args = ['location?']
5134
4942
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.
4945
If --no-bundle is specified, then public_branch is needed (and must be
4946
up-to-date), so that the receiver can perform the merge using the
4947
public_branch. The public_branch is always included if known, so that
4948
people can check it later.
4950
The submit branch defaults to the parent, but can be overridden. Both
4951
submit branch and public branch will be remembered if supplied.
4953
If a public_branch is known for the submit_branch, that public submit
4954
branch is used in the merge instructions. This means that a local mirror
4955
can be used as your actual submit branch, once you have set public_branch
5164
4958
Mail is sent using your preferred mail program. This should be transparent
5165
4959
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5359
5143
branch, relpath = Branch.open_containing(directory)
5360
5144
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)
5147
branch.tags.delete_tag(tag_name)
5148
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)
5151
if len(revision) != 1:
5152
raise errors.BzrCommandError(
5153
"Tags can only be placed on a single revision, "
5155
revision_id = revision[0].as_revision_id(branch)
5157
revision_id = branch.last_revision()
5158
if (not force) and branch.tags.has_tag(tag_name):
5159
raise errors.TagAlreadyExists(tag_name)
5160
branch.tags.set_tag(tag_name, revision_id)
5161
self.outf.write('Created tag %s.\n' % tag_name)
5387
5166
class cmd_tags(Command):
5388
__doc__ = """List tags.
5390
5169
This command shows a table of tag names and the revisions they reference.
5422
5201
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
for index, (tag, revid) in enumerate(tags):
5448
revno = branch.revision_id_to_dotted_revno(revid)
5449
if isinstance(revno, tuple):
5450
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5452
# Bad tag data/merges can lead to tagged revisions
5453
# which are not in this branch. Fail gracefully ...
5455
tags[index] = (tag, revno)
5204
graph = branch.repository.get_graph()
5205
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5206
revid1, revid2 = rev1.rev_id, rev2.rev_id
5207
# only show revisions between revid1 and revid2 (inclusive)
5208
tags = [(tag, revid) for tag, revid in tags if
5209
graph.is_between(revid, revid1, revid2)]
5212
elif sort == 'time':
5214
for tag, revid in tags:
5216
revobj = branch.repository.get_revision(revid)
5217
except errors.NoSuchRevision:
5218
timestamp = sys.maxint # place them at the end
5220
timestamp = revobj.timestamp
5221
timestamps[revid] = timestamp
5222
tags.sort(key=lambda x: timestamps[x[1]])
5224
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5225
for index, (tag, revid) in enumerate(tags):
5227
revno = branch.revision_id_to_dotted_revno(revid)
5228
if isinstance(revno, tuple):
5229
revno = '.'.join(map(str, revno))
5230
except errors.NoSuchRevision:
5231
# Bad tag data/merges can lead to tagged revisions
5232
# which are not in this branch. Fail gracefully ...
5234
tags[index] = (tag, revno)
5457
5237
for tag, revspec in tags:
5458
5238
self.outf.write('%-20s %s\n' % (tag, revspec))
5461
5241
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5242
"""Reconfigure the type of a bzr directory.
5464
5244
A target configuration must be specified.
5568
5348
/path/to/newbranch.
5570
5350
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
5351
locally, in which case switching will update the the local nickname to be
5572
5352
that of the master.
5575
takes_args = ['to_location?']
5355
takes_args = ['to_location']
5576
5356
takes_options = [Option('force',
5577
5357
help='Switch even if local commits will be lost.'),
5579
5358
Option('create-branch', short_name='b',
5580
5359
help='Create the target branch from this one before'
5581
5360
' switching to it.'),
5584
def run(self, to_location=None, force=False, create_branch=False,
5363
def run(self, to_location, force=False, create_branch=False):
5586
5364
from bzrlib import switch
5587
5365
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5366
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')
5596
5368
branch = control_dir.open_branch()
5597
5369
had_explicit_nick = branch.get_config().has_explicit_nickname()
6032
5781
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)
5784
# these get imported and then picked up by the scan for cmd_*
5785
# TODO: Some more consistent way to split command definitions across files;
5786
# we do need to load at least some information about them to know of
5787
# aliases. ideally we would avoid loading the implementation until the
5788
# details were needed.
5789
from bzrlib.cmd_version_info import cmd_version_info
5790
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5791
from bzrlib.bundle.commands import (
5794
from bzrlib.foreign import cmd_dpush
5795
from bzrlib.sign_my_commits import cmd_sign_my_commits
5796
from bzrlib.weave_commands import cmd_versionedfile_list, \
5797
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
