362
333
' --revision or a revision_id')
363
334
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')
336
# TODO: jam 20060112 should cat-revision always output utf-8?
337
if revision_id is not None:
338
revision_id = osutils.safe_revision_id(revision_id, warn=False)
340
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
341
except errors.NoSuchRevision:
342
msg = "The repository %s contains no revision %s." % (b.repository.base,
344
raise errors.BzrCommandError(msg)
345
elif revision is not None:
348
raise errors.BzrCommandError('You cannot specify a NULL'
350
rev_id = rev.as_revision_id(b)
351
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
354
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
355
"""Dump the contents of a btree index file to stdout.
395
357
PATH is a btree index file, it can be any URL. This includes things like
396
358
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
434
To re-create the working tree, use "bzr checkout".
481
436
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
437
takes_args = ['location?']
483
438
takes_options = [
485
440
help='Remove the working tree even if it has '
486
441
'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()
444
def run(self, location='.', force=False):
445
d = bzrdir.BzrDir.open(location)
448
working = d.open_workingtree()
449
except errors.NoWorkingTree:
450
raise errors.BzrCommandError("No working tree to remove")
451
except errors.NotLocalUrl:
452
raise errors.BzrCommandError("You cannot remove the working tree"
455
# XXX: What about pending merges ? -- vila 20090629
456
if working.has_changes(working.basis_tree()):
457
raise errors.UncommittedChanges(working)
459
working_path = working.bzrdir.root_transport.base
460
branch_path = working.branch.bzrdir.root_transport.base
461
if working_path != branch_path:
462
raise errors.BzrCommandError("You cannot remove the working tree"
463
" from a lightweight checkout")
465
d.destroy_workingtree()
514
468
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
469
"""Show current revision number.
517
471
This is equal to the number of revisions on this branch.
569
529
wt = WorkingTree.open_containing(directory)[0]
571
self.add_cleanup(wt.lock_read().unlock)
572
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
574
534
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
577
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
579
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
538
if revision is not None:
539
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
540
if revision_info_list is not None:
541
for rev_str in revision_info_list:
542
rev_spec = RevisionSpec.from_string(rev_str)
543
revision_ids.append(rev_spec.as_revision_id(b))
544
# No arguments supplied, default to the last revision
545
if len(revision_ids) == 0:
548
raise errors.NoWorkingTree(directory)
549
revision_ids.append(wt.last_revision())
551
revision_ids.append(b.last_revision())
555
for revision_id in revision_ids:
557
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
558
revno = '.'.join(str(i) for i in dotted_revno)
559
except errors.NoSuchRevision:
561
maxlen = max(maxlen, len(revno))
562
revinfos.append([revno, revision_id])
590
revision_ids.append(b.last_revision())
594
for revision_id in revision_ids:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
598
except errors.NoSuchRevision:
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
604
569
for ri in revinfos:
605
570
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
608
573
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
574
"""Add specified files or directories.
611
576
In non-recursive mode, all the named items are added, regardless
612
577
of whether they were previously ignored. A warning is given if
756
720
revision = _get_one_revision('inventory', revision)
757
721
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
776
entries = tree.inventory.entries()
722
work_tree.lock_read()
724
if revision is not None:
725
tree = revision.as_tree(work_tree.branch)
727
extra_trees = [work_tree]
733
if file_list is not None:
734
file_ids = tree.paths2ids(file_list, trees=extra_trees,
735
require_versioned=True)
736
# find_ids_across_trees may include some paths that don't
738
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
739
for file_id in file_ids if file_id in tree)
741
entries = tree.inventory.entries()
744
if tree is not work_tree:
779
747
for path, entry in entries:
780
748
if kind and kind != entry.kind:
917
890
dest = osutils.pathjoin(dest_parent, dest_tail)
918
891
mutter("attempting to move %s => %s", src, dest)
919
892
tree.rename_one(src, dest, after=after)
921
self.outf.write("%s => %s\n" % (src, dest))
893
self.outf.write("%s => %s\n" % (src, dest))
924
896
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
897
"""Turn this branch into a mirror of another branch.
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
899
This command only works on branches that have not diverged. Branches are
900
considered diverged if the destination branch's most recent commit is one
901
that has not been merged (directly or indirectly) into the parent.
932
903
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
904
from one into the other. Once one branch has merged, the other should
934
905
be able to pull it again.
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
907
If you want to forget your local changes and just update your branch to
908
match the remote one, use pull --overwrite.
940
910
If there is no default location set, the first pull will set it. After
941
911
that, you can omit the location to use the default. To change the
1019
987
branch_from = Branch.open(location,
1020
988
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1023
990
if branch_to.get_parent() is None or remember:
1024
991
branch_to.set_parent(branch_from.base)
1026
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
993
if branch_from is not branch_to:
994
branch_from.lock_read()
996
if revision is not None:
997
revision_id = revision.as_revision_id(branch_from)
999
branch_to.lock_write()
1001
if tree_to is not None:
1002
view_info = _get_view_info_for_change_reporter(tree_to)
1003
change_reporter = delta._ChangeReporter(
1004
unversioned_filter=tree_to.is_ignored,
1005
view_info=view_info)
1006
result = tree_to.pull(
1007
branch_from, overwrite, revision_id, change_reporter,
1008
possible_transports=possible_transports, local=local)
1010
result = branch_to.pull(
1011
branch_from, overwrite, revision_id, local=local)
1013
result.report(self.outf)
1014
if verbose and result.old_revid != result.new_revid:
1015
log.show_branch_change(
1016
branch_to, self.outf, result.old_revno,
1021
if branch_from is not branch_to:
1022
branch_from.unlock()
1048
1025
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1026
"""Update a mirror of this branch.
1051
1028
The target branch will not have its working tree populated because this
1052
1029
is both expensive, and is not supported on remote file systems.
1113
1090
# Get the source branch
1114
1091
(tree, br_from,
1115
1092
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1094
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1095
if strict is None: strict = True # default value
1116
1096
# Get the tip's revision_id
1117
1097
revision = _get_one_revision('push', revision)
1118
1098
if revision is not None:
1119
1099
revision_id = revision.in_history(br_from).rev_id
1121
1101
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1102
if strict and tree is not None and revision_id is None:
1103
if (tree.has_changes(tree.basis_tree())
1104
or len(tree.get_parent_ids()) > 1):
1105
raise errors.UncommittedChanges(
1106
tree, more='Use --no-strict to force the push.')
1107
if tree.last_revision() != tree.branch.last_revision():
1108
# The tree has lost sync with its branch, there is little
1109
# chance that the user is aware of it but he can still force
1110
# the push with --no-strict
1111
raise errors.OutOfDateTree(
1112
tree, more='Use --no-strict to force the push.')
1127
1114
# Get the stacked_on branch, if any
1128
1115
if stacked_on is not None:
1129
1116
stacked_on = urlutils.normalize_url(stacked_on)
1194
1178
' directory exists, but does not already'
1195
1179
' have a control directory. This flag will'
1196
1180
' allow branch to proceed.'),
1198
help="Bind new branch to from location."),
1200
1182
aliases = ['get', 'clone']
1202
1184
def run(self, from_location, to_location=None, revision=None,
1203
1185
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1186
use_existing_dir=False):
1206
1187
from bzrlib.tag import _merge_tags_if_possible
1207
1189
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1191
if (accelerator_tree is not None and
1192
accelerator_tree.supports_content_filtering()):
1193
accelerator_tree = None
1209
1194
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1197
if revision is not None:
1198
revision_id = revision.as_revision_id(br_from)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1200
# FIXME - wt.last_revision, fallback to branch, fall back to
1201
# None or perhaps NULL_REVISION to mean copy nothing
1203
revision_id = br_from.last_revision()
1204
if to_location is None:
1205
to_location = urlutils.derive_to_location(from_location)
1206
to_transport = transport.get_transport(to_location)
1208
to_transport.mkdir('.')
1209
except errors.FileExists:
1210
if not use_existing_dir:
1211
raise errors.BzrCommandError('Target directory "%s" '
1212
'already exists.' % to_location)
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1215
bzrdir.BzrDir.open_from_transport(to_transport)
1216
except errors.NotBranchError:
1219
raise errors.AlreadyBranchError(to_location)
1220
except errors.NoSuchFile:
1221
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1224
# preserve whatever source format we have.
1225
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1226
possible_transports=[to_transport],
1227
accelerator_tree=accelerator_tree,
1228
hardlink=hardlink, stacked=stacked,
1229
force_new_repo=standalone,
1230
create_tree_if_local=not no_tree,
1231
source_branch=br_from)
1232
branch = dir.open_branch()
1233
except errors.NoSuchRevision:
1234
to_transport.delete_tree('.')
1235
msg = "The branch %s has no revision %s." % (from_location,
1237
raise errors.BzrCommandError(msg)
1238
_merge_tags_if_possible(br_from, branch)
1239
# If the source branch is stacked, the new branch may
1240
# be stacked whether we asked for that explicitly or not.
1241
# We therefore need a try/except here and not just 'if stacked:'
1243
note('Created new stacked branch referring to %s.' %
1244
branch.get_stacked_on_url())
1245
except (errors.NotStacked, errors.UnstackableBranchFormat,
1246
errors.UnstackableRepositoryFormat), e:
1247
note('Branched %d revision(s).' % branch.revno())
1275
1252
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1253
"""Create a new checkout of an existing branch.
1278
1255
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1256
the branch found in '.'. This is useful if you have removed the working tree
1353
1330
@display_command
1354
1331
def run(self, dir=u'.'):
1355
1332
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1368
renames.append(paths)
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1335
new_inv = tree.inventory
1336
old_tree = tree.basis_tree()
1337
old_tree.lock_read()
1339
old_inv = old_tree.inventory
1341
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1342
for f, paths, c, v, p, n, k, e in iterator:
1343
if paths[0] == paths[1]:
1347
renames.append(paths)
1349
for old_name, new_name in renames:
1350
self.outf.write("%s => %s\n" % (old_name, new_name))
1374
1357
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1358
"""Update a tree to have the latest code committed to its branch.
1377
1360
This will perform a merge into the working tree, and may generate
1378
1361
conflicts. If you have any local changes, you will still
1381
1364
If you want to discard your local changes, you can just do a
1382
1365
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1388
1368
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1369
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1370
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1372
def run(self, dir='.'):
1397
1373
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1374
possible_transports = []
1400
master = branch.get_master_branch(
1375
master = tree.branch.get_master_branch(
1401
1376
possible_transports=possible_transports)
1402
1377
if master is not None:
1403
branch_location = master.base
1404
1378
tree.lock_write()
1406
branch_location = tree.branch.base
1407
1380
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1382
existing_pending_merges = tree.get_parent_ids()[1:]
1383
last_rev = _mod_revision.ensure_null(tree.last_revision())
1384
if last_rev == _mod_revision.ensure_null(
1385
tree.branch.last_revision()):
1386
# may be up to date, check master too.
1387
if master is None or last_rev == _mod_revision.ensure_null(
1388
master.last_revision()):
1389
revno = tree.branch.revision_id_to_revno(last_rev)
1390
note("Tree is up to date at revision %d." % (revno,))
1392
view_info = _get_view_info_for_change_reporter(tree)
1435
1393
conflicts = tree.update(
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1394
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1395
view_info=view_info), possible_transports=possible_transports)
1396
revno = tree.branch.revision_id_to_revno(
1397
_mod_revision.ensure_null(tree.last_revision()))
1398
note('Updated to revision %d.' % (revno,))
1399
if tree.get_parent_ids()[1:] != existing_pending_merges:
1400
note('Your local commits will now show as pending merges with '
1401
"'bzr status', and can be committed with 'bzr commit'.")
1460
1410
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1411
"""Show information about a working tree, branch or repository.
1463
1413
This command will show all known locations and formats associated to the
1464
1414
tree, branch or repository.
1530
1480
if file_list is not None:
1531
1481
file_list = [f for f in file_list]
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1485
# Heuristics should probably all move into tree.remove_smart or
1488
added = tree.changes_from(tree.basis_tree(),
1489
specific_files=file_list).added
1490
file_list = sorted([f[0] for f in added], reverse=True)
1491
if len(file_list) == 0:
1492
raise errors.BzrCommandError('No matching files.')
1493
elif file_list is None:
1494
# missing files show up in iter_changes(basis) as
1495
# versioned-with-no-kind.
1497
for change in tree.iter_changes(tree.basis_tree()):
1498
# Find paths in the working tree that have no kind:
1499
if change[1][1] is not None and change[6][1] is None:
1500
missing.append(change[1][1])
1501
file_list = sorted(missing, reverse=True)
1502
file_deletion_strategy = 'keep'
1503
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1504
keep_files=file_deletion_strategy=='keep',
1505
force=file_deletion_strategy=='force')
1557
1510
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1511
"""Print file_id of a particular file or directory.
1560
1513
The file_id is assigned when the file is first added and remains the
1561
1514
same through all revisions where the file exists, even when it is
1779
1732
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1733
"""Create a shared repository to hold branches.
1782
1735
New branches created under the repository directory will store their
1783
revisions in the repository, not in the branch directory. For branches
1784
with shared history, this reduces the amount of storage needed and
1785
speeds up the creation of new branches.
1736
revisions in the repository, not in the branch directory.
1787
If the --no-trees option is given then the branches in the repository
1788
will not have working trees by default. They will still exist as
1789
directories on disk, but they will not have separate copies of the
1790
files at a certain revision. This can be useful for repositories that
1791
store branches which are interacted with through checkouts or remote
1792
branches, such as on a server.
1738
If the --no-trees option is used then the branches in the repository
1739
will not have working trees by default.
1795
Create a shared repository holding just branches::
1742
Create a shared repositories holding just branches::
1797
1744
bzr init-repo --no-trees repo
1798
1745
bzr init repo/trunk
1961
1889
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1890
' one or two revision specifiers')
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1968
(old_tree, new_tree,
1969
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1892
old_tree, new_tree, specific_files, extra_trees = \
1893
_get_trees_to_diff(file_list, revision, old, new,
1972
1895
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1896
specific_files=specific_files,
1974
1897
external_diff_options=diff_options,
1975
1898
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1899
extra_trees=extra_trees, using=using)
1980
1902
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1903
"""List files deleted in the working tree.
1983
1905
# TODO: Show files deleted since a previous revision, or
1984
1906
# between two revisions.
2373
2299
diff_type = 'full'
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2385
show_advice=levels is None)
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2413
Logger(b, rqst).show(lf)
2303
# Build the log formatter
2304
if log_format is None:
2305
log_format = log.log_formatter_registry.get_default(b)
2306
lf = log_format(show_ids=show_ids, to_file=self.outf,
2307
show_timezone=timezone,
2308
delta_format=get_verbosity_level(),
2310
show_advice=levels is None)
2312
# Choose the algorithm for doing the logging. It's annoying
2313
# having multiple code paths like this but necessary until
2314
# the underlying repository format is faster at generating
2315
# deltas or can provide everything we need from the indices.
2316
# The default algorithm - match-using-deltas - works for
2317
# multiple files and directories and is faster for small
2318
# amounts of history (200 revisions say). However, it's too
2319
# slow for logging a single file in a repository with deep
2320
# history, i.e. > 10K revisions. In the spirit of "do no
2321
# evil when adding features", we continue to use the
2322
# original algorithm - per-file-graph - for the "single
2323
# file that isn't a directory without showing a delta" case.
2324
partial_history = revision and b.repository._format.supports_chks
2325
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2326
or delta_type or partial_history)
2328
# Build the LogRequest and execute it
2329
if len(file_ids) == 0:
2331
rqst = make_log_request_dict(
2332
direction=direction, specific_fileids=file_ids,
2333
start_revision=rev1, end_revision=rev2, limit=limit,
2334
message_search=message, delta_type=delta_type,
2335
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2336
Logger(b, rqst).show(lf)
2416
2341
def _get_revision_range(revisionspec_list, branch, command_name):
2561
2480
view_str = views.view_display_str(view_files)
2562
2481
note("Ignoring files outside view. View is %s" % view_str)
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2570
if kind is not None and fkind != kind:
2575
fullpath = osutils.pathjoin(relpath, fp)
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2485
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2486
from_dir=relpath, recursive=recursive):
2487
# Apply additional masking
2488
if not all and not selection[fc]:
2490
if kind is not None and fkind != kind:
2495
fullpath = osutils.pathjoin(relpath, fp)
2498
views.check_path_in_view(tree, fullpath)
2499
except errors.FileOutsideView:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2594
self.outf.write(fp + '\0')
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2504
fp = osutils.pathjoin(prefix, fp)
2505
kindch = entry.kind_character()
2506
outstring = fp + kindch
2507
ui.ui_factory.clear_term()
2509
outstring = '%-8s %s' % (fc, outstring)
2510
if show_ids and fid is not None:
2511
outstring = "%-50s %s" % (outstring, fid)
2608
2512
self.outf.write(outstring + '\n')
2514
self.outf.write(fp + '\0')
2517
self.outf.write(fid)
2518
self.outf.write('\0')
2526
self.outf.write('%-50s %s\n' % (outstring, my_id))
2528
self.outf.write(outstring + '\n')
2611
2533
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2534
"""List unknown files.
2624
2546
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2547
"""Ignore specified files or patterns.
2627
2549
See ``bzr help patterns`` for details on the syntax of patterns.
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2635
2551
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2552
After adding, editing or deleting that file either indirectly by
2637
2553
using this command or directly by using an editor, be sure to commit
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2653
2556
Note: ignore patterns containing shell wildcards must be quoted from
2654
2557
the shell on Unix.
2677
2576
Ignore everything but the "debian" toplevel directory::
2679
2578
bzr ignore "RE:(?!debian/).*"
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2685
bzr ignore "!./local"
2689
2581
_see_also = ['status', 'ignored', 'patterns']
2690
2582
takes_args = ['name_pattern*']
2691
2583
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2584
Option('old-default-rules',
2585
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2588
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2589
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2590
if old_default_rules is not None:
2591
# dump the rules and exit
2592
for pattern in ignores.OLD_DEFAULTS:
2703
2595
if not name_pattern_list:
2704
2596
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2597
"NAME_PATTERN or --old-default-rules")
2706
2598
name_pattern_list = [globbing.normalize_pattern(p)
2707
2599
for p in name_pattern_list]
2708
2600
for name_pattern in name_pattern_list:
2865
2755
" one revision specifier")
2866
2756
tree, branch, relpath = \
2867
2757
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2760
return self._run(tree, branch, relpath, filename, revision,
2761
name_from_revision, filters)
2872
2765
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2874
2767
if tree is None:
2875
2768
tree = b.basis_tree()
2876
2769
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2879
2771
old_file_id = rev_tree.path2id(relpath)
3118
2997
if local and not tree.branch.get_bound_location():
3119
2998
raise errors.LocalRequiresBoundBranch()
3121
if message is not None:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3134
ui.ui_factory.show_warning(warning_msg)
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3142
3000
def get_message(commit_obj):
3143
3001
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
3002
my_message = message
3003
if my_message is None and not file:
3004
t = make_commit_message_template_encoded(tree,
3153
3005
selected_list, diff=show_diff,
3154
3006
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3160
3007
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3008
my_message = edit_commit_message_encoded(t,
3162
3009
start_message=start_message)
3163
3010
if my_message is None:
3164
3011
raise errors.BzrCommandError("please specify a commit"
3165
3012
" message with either --message or --file")
3013
elif my_message and file:
3014
raise errors.BzrCommandError(
3015
"please specify either --message or --file")
3017
my_message = codecs.open(file, 'rt',
3018
osutils.get_user_encoding()).read()
3166
3019
if my_message == "":
3167
3020
raise errors.BzrCommandError("empty commit message specified")
3168
3021
return my_message
3170
# The API permits a commit with a filter of [] to mean 'select nothing'
3171
# but the command line should not do that.
3172
if not selected_list:
3173
selected_list = None
3175
3024
tree.commit(message_callback=get_message,
3176
3025
specific_files=selected_list,
3177
3026
allow_pointless=unchanged, strict=strict, local=local,
3178
3027
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3181
3029
exclude=safe_relpath_files(tree, exclude))
3182
3030
except PointlessCommit:
3031
# FIXME: This should really happen before the file is read in;
3032
# perhaps prepare the commit; get the message; then actually commit
3183
3033
raise errors.BzrCommandError("No changes to commit."
3184
3034
" Use --unchanged to commit anyhow.")
3185
3035
except ConflictsInTree:
3597
3436
verbose = not is_quiet()
3598
3437
# TODO: should possibly lock the history file...
3599
3438
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
3440
test_suite_factory = None
3603
3441
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3443
selftest_kwargs = {"verbose": verbose,
3445
"stop_on_failure": one,
3446
"transport": transport,
3447
"test_suite_factory": test_suite_factory,
3448
"lsprof_timed": lsprof_timed,
3449
"bench_history": benchfile,
3450
"matching_tests_first": first,
3451
"list_only": list_only,
3452
"random_seed": randomize,
3453
"exclude_pattern": exclude,
3455
"load_list": load_list,
3456
"debug_flags": debugflag,
3457
"starting_with": starting_with
3459
selftest_kwargs.update(self.additional_selftest_args)
3460
result = selftest(**selftest_kwargs)
3462
if benchfile is not None:
3623
3464
return int(not result)
3626
3467
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3468
"""Show version of bzr."""
3629
3470
encoding_type = 'replace'
3630
3471
takes_options = [
3793
3628
verified = 'inapplicable'
3794
3629
tree = WorkingTree.open_containing(directory)[0]
3631
# die as quickly as possible if there are uncommitted changes
3797
3633
basis_tree = tree.revision_tree(tree.last_revision())
3798
3634
except errors.NoSuchRevision:
3799
3635
basis_tree = tree.basis_tree()
3801
# die as quickly as possible if there are uncommitted changes
3803
if tree.has_changes():
3637
if tree.has_changes(basis_tree):
3804
3638
raise errors.UncommittedChanges(tree)
3806
3640
view_info = _get_view_info_for_change_reporter(tree)
3807
3641
change_reporter = delta._ChangeReporter(
3808
3642
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3645
pb = ui.ui_factory.nested_progress_bar()
3646
cleanups.append(pb.finished)
3648
cleanups.append(tree.unlock)
3649
if location is not None:
3651
mergeable = bundle.read_mergeable_from_url(location,
3652
possible_transports=possible_transports)
3653
except errors.NotABundle:
3657
raise errors.BzrCommandError('Cannot use --uncommitted'
3658
' with bundles or merge directives.')
3660
if revision is not None:
3661
raise errors.BzrCommandError(
3662
'Cannot use -r with merge directives or bundles')
3663
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3666
if merger is None and uncommitted:
3667
if revision is not None and len(revision) > 0:
3668
raise errors.BzrCommandError('Cannot use --uncommitted and'
3669
' --revision at the same time.')
3670
merger = self.get_merger_from_uncommitted(tree, location, pb,
3672
allow_pending = False
3675
merger, allow_pending = self._get_merger_from_branch(tree,
3676
location, revision, remember, possible_transports, pb)
3678
merger.merge_type = merge_type
3679
merger.reprocess = reprocess
3680
merger.show_base = show_base
3681
self.sanity_check_merger(merger)
3682
if (merger.base_rev_id == merger.other_rev_id and
3683
merger.other_rev_id is not None):
3684
note('Nothing to do.')
3687
if merger.interesting_files is not None:
3688
raise errors.BzrCommandError('Cannot pull individual files')
3689
if (merger.base_rev_id == tree.last_revision()):
3690
result = tree.pull(merger.other_branch, False,
3691
merger.other_rev_id)
3692
result.report(self.outf)
3694
merger.check_basis(False)
3696
return self._do_preview(merger, cleanups)
3698
return self._do_interactive(merger, cleanups)
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3861
return self._do_preview(merger)
3863
return self._do_interactive(merger)
3865
return self._do_merge(merger, change_reporter, allow_pending,
3868
def _get_preview(self, merger):
3700
return self._do_merge(merger, change_reporter, allow_pending,
3703
for cleanup in reversed(cleanups):
3706
def _get_preview(self, merger, cleanups):
3869
3707
tree_merger = merger.make_merger()
3870
3708
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3709
cleanups.append(tt.finalize)
3872
3710
result_tree = tt.get_preview_tree()
3873
3711
return result_tree
3875
def _do_preview(self, merger):
3713
def _do_preview(self, merger, cleanups):
3876
3714
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3715
result_tree = self._get_preview(merger, cleanups)
3878
3716
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
3717
old_label='', new_label='')
4067
3904
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3905
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3906
if merge_type is None:
4071
3907
merge_type = _mod_merge.Merge3Merger
4072
3908
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4079
repository = tree.branch.repository
4080
interesting_ids = None
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
3911
parents = tree.get_parent_ids()
3912
if len(parents) != 2:
3913
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3914
" merges. Not cherrypicking or"
3916
repository = tree.branch.repository
3917
interesting_ids = None
3919
conflicts = tree.conflicts()
3920
if file_list is not None:
3921
interesting_ids = set()
3922
for filename in file_list:
3923
file_id = tree.path2id(filename)
3925
raise errors.NotVersionedError(filename)
3926
interesting_ids.add(file_id)
3927
if tree.kind(file_id) != "directory":
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3930
for name, ie in tree.inventory.iter_entries(file_id):
3931
interesting_ids.add(ie.file_id)
3932
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3934
# Remerge only supports resolving contents conflicts
3935
allowed_conflicts = ('text conflict', 'contents conflict')
3936
restore_files = [c.path for c in conflicts
3937
if c.typestring in allowed_conflicts]
3938
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3939
tree.set_conflicts(ConflictList(new_conflicts))
3940
if file_list is not None:
3941
restore_files = file_list
3942
for filename in restore_files:
3944
restore(tree.abspath(filename))
3945
except errors.NotConflicted:
3947
# Disable pending merges, because the file texts we are remerging
3948
# have not had those merges performed. If we use the wrong parents
3949
# list, we imply that the working tree text has seen and rejected
3950
# all the changes from the other tree, when in fact those changes
3951
# have not yet been seen.
3952
pb = ui.ui_factory.nested_progress_bar()
3953
tree.set_parent_ids(parents[:1])
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
3955
merger = _mod_merge.Merger.from_revision_ids(pb,
3957
merger.interesting_ids = interesting_ids
3958
merger.merge_type = merge_type
3959
merger.show_base = show_base
3960
merger.reprocess = reprocess
3961
conflicts = merger.do_merge()
3963
tree.set_parent_ids(parents)
4124
tree.set_parent_ids(parents)
4125
3967
if conflicts > 0:
4149
3991
name. If you name a directory, all the contents of that directory will be
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
3994
Any files that have been newly added since that revision will be deleted,
3995
with a backup kept if appropriate. Directories containing unknown files
3996
will not be deleted.
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
3998
The working tree contains a list of pending merged revisions, which will
3999
be included as parents in the next commit. Normally, revert clears that
4000
list as well as reverting the files. If any files are specified, revert
4001
leaves the pending merge list alone and reverts only the files. Use "bzr
4002
revert ." in the tree root to revert all files but keep the merge record,
4003
and "bzr revert --forget-merges" to clear the pending merge list without
4164
4004
reverting any files.
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4177
4007
_see_also = ['cat', 'export']
4186
4016
def run(self, revision=None, no_backup=False, file_list=None,
4187
4017
forget_merges=None):
4188
4018
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4022
tree.set_parent_ids(tree.get_parent_ids()[:1])
4024
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4196
4029
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4030
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
4031
pb = ui.ui_factory.nested_progress_bar()
4033
tree.revert(file_list, rev_tree, not no_backup, pb,
4034
report_changes=True)
4202
4039
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4040
"""Test reporting of assertion failures"""
4204
4041
# intended just for use in testing
4355
4184
_get_revision_range(revision,
4356
4185
remote_branch, self.name()))
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4370
show_timezone='original')
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4379
lf.log_revision(revision)
4380
printed_local = True
4383
printed_local = False
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4388
message("You are missing %d revision(s):\n" %
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4393
lf.log_revision(revision)
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4404
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
4187
local_branch.lock_read()
4189
remote_branch.lock_read()
4191
local_extra, remote_extra = find_unmerged(
4192
local_branch, remote_branch, restrict,
4193
backward=not reverse,
4194
include_merges=include_merges,
4195
local_revid_range=local_revid_range,
4196
remote_revid_range=remote_revid_range)
4198
if log_format is None:
4199
registry = log.log_formatter_registry
4200
log_format = registry.get_default(local_branch)
4201
lf = log_format(to_file=self.outf,
4203
show_timezone='original')
4206
if local_extra and not theirs_only:
4207
message("You have %d extra revision(s):\n" %
4209
for revision in iter_log_revisions(local_extra,
4210
local_branch.repository,
4212
lf.log_revision(revision)
4213
printed_local = True
4216
printed_local = False
4218
if remote_extra and not mine_only:
4219
if printed_local is True:
4221
message("You are missing %d revision(s):\n" %
4223
for revision in iter_log_revisions(remote_extra,
4224
remote_branch.repository,
4226
lf.log_revision(revision)
4229
if mine_only and not local_extra:
4230
# We checked local, and found nothing extra
4231
message('This branch is up to date.\n')
4232
elif theirs_only and not remote_extra:
4233
# We checked remote, and found nothing extra
4234
message('Other branch is up to date.\n')
4235
elif not (mine_only or theirs_only or local_extra or
4237
# We checked both branches, and neither one had extra
4239
message("Branches are up to date.\n")
4241
remote_branch.unlock()
4243
local_branch.unlock()
4408
4244
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4245
local_branch.lock_write()
4247
# handle race conditions - a parent might be set while we run.
4248
if local_branch.get_parent() is None:
4249
local_branch.set_parent(remote_branch.base)
4251
local_branch.unlock()
4413
4252
return status_code
4416
4255
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4256
"""Compress the data within a repository."""
4435
4258
_see_also = ['repositories']
4436
4259
takes_args = ['branch_or_repo?']
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4261
def run(self, branch_or_repo='.'):
4442
4262
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
4264
branch = dir.open_branch()
4445
4265
repository = branch.repository
4446
4266
except errors.NotBranchError:
4447
4267
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
4271
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4272
"""List the installed plugins.
4454
4274
This command displays the list of installed plugins including
4455
4275
version of plugin and a short description of each.
4552
4375
wt, branch, relpath = \
4553
4376
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4377
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4561
file_id = wt.path2id(relpath)
4563
file_id = tree.path2id(relpath)
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4382
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4384
file_id = wt.path2id(relpath)
4386
file_id = tree.path2id(relpath)
4388
raise errors.NotVersionedError(filename)
4389
file_version = tree.inventory[file_id].revision
4390
if wt is not None and revision is None:
4391
# If there is a tree and we're not annotating historical
4392
# versions, annotate the working tree's content.
4393
annotate_file_tree(wt, file_id, self.outf, long, all,
4396
annotate_file(branch, file_version, file_id, long, all, self.outf,
4577
4405
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4406
"""Create a digital signature for an existing revision."""
4579
4407
# TODO be able to replace existing ones.
4581
4409
hidden = True # is this right ?
4785
4619
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4622
print 'Dry-run, pretending to remove the above revisions.'
4624
val = raw_input('Press <enter> to continue')
4791
self.outf.write('The above revision(s) will be removed.\n')
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4626
print 'The above revision(s) will be removed.'
4628
val = raw_input('Are you sure [y/N]? ')
4629
if val.lower() not in ('y', 'yes'):
4798
4633
mutter('Uncommitting from {%s} to {%s}',
4799
4634
last_rev_id, rev_id)
4800
4635
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4636
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4637
note('You can restore the old tip by running:\n'
4638
' bzr pull . -r revid:%s', last_rev_id)
4806
4641
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4642
"""Break a dead lock on a repository, branch or working directory.
4809
4644
CAUTION: Locks should only be broken when you are sure that the process
4810
4645
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4647
You can get information on what locks are open via the 'bzr info' command.
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4819
4652
takes_args = ['location?']
5092
4921
directly from the merge directive, without retrieving data from a
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4924
If --no-bundle is specified, then public_branch is needed (and must be
4925
up-to-date), so that the receiver can perform the merge using the
4926
public_branch. The public_branch is always included if known, so that
4927
people can check it later.
4929
The submit branch defaults to the parent, but can be overridden. Both
4930
submit branch and public branch will be remembered if supplied.
4932
If a public_branch is known for the submit_branch, that public submit
4933
branch is used in the merge instructions. This means that a local mirror
4934
can be used as your actual submit branch, once you have set public_branch
5122
4937
Mail is sent using your preferred mail program. This should be transparent
5123
4938
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5311
def run(self, tag_name=None,
5116
def run(self, tag_name,
5317
5122
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5330
revision_id = revision[0].as_revision_id(branch)
5126
branch.tags.delete_tag(tag_name)
5127
self.outf.write('Deleted tag %s.\n' % tag_name)
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5130
if len(revision) != 1:
5131
raise errors.BzrCommandError(
5132
"Tags can only be placed on a single revision, "
5134
revision_id = revision[0].as_revision_id(branch)
5136
revision_id = branch.last_revision()
5137
if (not force) and branch.tags.has_tag(tag_name):
5138
raise errors.TagAlreadyExists(tag_name)
5139
branch.tags.set_tag(tag_name, revision_id)
5140
self.outf.write('Created tag %s.\n' % tag_name)
5344
5145
class cmd_tags(Command):
5345
__doc__ = """List tags.
5347
5148
This command shows a table of tag names and the revisions they reference.
5379
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5411
tags[index] = (tag, revno)
5183
graph = branch.repository.get_graph()
5184
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5185
revid1, revid2 = rev1.rev_id, rev2.rev_id
5186
# only show revisions between revid1 and revid2 (inclusive)
5187
tags = [(tag, revid) for tag, revid in tags if
5188
graph.is_between(revid, revid1, revid2)]
5191
elif sort == 'time':
5193
for tag, revid in tags:
5195
revobj = branch.repository.get_revision(revid)
5196
except errors.NoSuchRevision:
5197
timestamp = sys.maxint # place them at the end
5199
timestamp = revobj.timestamp
5200
timestamps[revid] = timestamp
5201
tags.sort(key=lambda x: timestamps[x[1]])
5203
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5204
for index, (tag, revid) in enumerate(tags):
5206
revno = branch.revision_id_to_dotted_revno(revid)
5207
if isinstance(revno, tuple):
5208
revno = '.'.join(map(str, revno))
5209
except errors.NoSuchRevision:
5210
# Bad tag data/merges can lead to tagged revisions
5211
# which are not in this branch. Fail gracefully ...
5213
tags[index] = (tag, revno)
5413
5216
for tag, revspec in tags:
5414
5217
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5220
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5221
"""Reconfigure the type of a bzr directory.
5420
5223
A target configuration must be specified.
5524
5327
/path/to/newbranch.
5526
5329
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5330
locally, in which case switching will update the the local nickname to be
5528
5331
that of the master.
5531
takes_args = ['to_location?']
5334
takes_args = ['to_location']
5532
5335
takes_options = [Option('force',
5533
5336
help='Switch even if local commits will be lost.'),
5535
5337
Option('create-branch', short_name='b',
5536
5338
help='Create the target branch from this one before'
5537
5339
' switching to it.'),
5540
def run(self, to_location=None, force=False, create_branch=False,
5342
def run(self, to_location, force=False, create_branch=False):
5542
5343
from bzrlib import switch
5543
5344
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5345
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5552
5347
branch = control_dir.open_branch()
5553
5348
had_explicit_nick = branch.get_config().has_explicit_nickname()
5849
5622
if writer is None:
5850
5623
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5625
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5626
message, destroy=destroy).run()
5858
5627
except errors.UserAbort:
5861
5630
def run_for_list(self):
5862
5631
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5634
manager = tree.get_shelf_manager()
5635
shelves = manager.active_shelves()
5636
if len(shelves) == 0:
5637
note('No shelved changes.')
5639
for shelf_id in reversed(shelves):
5640
message = manager.get_metadata(shelf_id).get('message')
5642
message = '<no message>'
5643
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5649
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5650
"""Restore shelved changes.
5880
5652
By default, the most recently shelved changes are restored. However if you
5881
5653
specify a shelf by id those changes will be restored instead. This works
5889
5661
enum_switch=False, value_switches=True,
5890
5662
apply="Apply changes and remove from the shelf.",
5891
5663
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5664
delete_only="Delete changes without applying them."
5898
5667
_see_also = ['shelve']
5900
5669
def run(self, shelf_id=None, action='apply'):
5901
5670
from bzrlib.shelf_ui import Unshelver
5902
unshelver = Unshelver.from_args(shelf_id, action)
5906
unshelver.tree.unlock()
5671
Unshelver.from_args(shelf_id, action).run()
5909
5674
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5675
"""Remove unwanted files from working tree.
5912
5677
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5678
files are never deleted.
5987
5752
self.outf.write('%s %s\n' % (path, location))
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5755
# these get imported and then picked up by the scan for cmd_*
5756
# TODO: Some more consistent way to split command definitions across files;
5757
# we do need to load at least some information about them to know of
5758
# aliases. ideally we would avoid loading the implementation until the
5759
# details were needed.
5760
from bzrlib.cmd_version_info import cmd_version_info
5761
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5762
from bzrlib.bundle.commands import (
5765
from bzrlib.foreign import cmd_dpush
5766
from bzrlib.sign_my_commits import cmd_sign_my_commits
5767
from bzrlib.weave_commands import cmd_versionedfile_list, \
5768
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
