362
334
' --revision or a revision_id')
363
335
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')
337
# TODO: jam 20060112 should cat-revision always output utf-8?
338
if revision_id is not None:
339
revision_id = osutils.safe_revision_id(revision_id, warn=False)
341
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
342
except errors.NoSuchRevision:
343
msg = "The repository %s contains no revision %s." % (b.repository.base,
345
raise errors.BzrCommandError(msg)
346
elif revision is not None:
349
raise errors.BzrCommandError('You cannot specify a NULL'
351
rev_id = rev.as_revision_id(b)
352
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
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
355
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
395
358
PATH is a btree index file, it can be any URL. This includes things like
396
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
435
To re-create the working tree, use "bzr checkout".
481
437
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
438
takes_args = ['location?']
483
439
takes_options = [
485
441
help='Remove the working tree even if it has '
486
442
'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()
445
def run(self, location='.', force=False):
446
d = bzrdir.BzrDir.open(location)
449
working = d.open_workingtree()
450
except errors.NoWorkingTree:
451
raise errors.BzrCommandError("No working tree to remove")
452
except errors.NotLocalUrl:
453
raise errors.BzrCommandError("You cannot remove the working tree of a "
456
changes = working.changes_from(working.basis_tree())
457
if changes.has_changed():
458
raise errors.UncommittedChanges(working)
460
working_path = working.bzrdir.root_transport.base
461
branch_path = working.branch.bzrdir.root_transport.base
462
if working_path != branch_path:
463
raise errors.BzrCommandError("You cannot remove the working tree from "
464
"a lightweight checkout")
466
d.destroy_workingtree()
514
469
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
470
"""Show current revision number.
517
472
This is equal to the number of revisions on this branch.
571
530
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
533
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
535
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())
539
if revision is not None:
540
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
541
if revision_info_list is not None:
542
for rev_str in revision_info_list:
543
rev_spec = RevisionSpec.from_string(rev_str)
544
revision_ids.append(rev_spec.as_revision_id(b))
545
# No arguments supplied, default to the last revision
546
if len(revision_ids) == 0:
549
raise errors.NoWorkingTree(directory)
550
revision_ids.append(wt.last_revision())
552
revision_ids.append(b.last_revision())
556
for revision_id in revision_ids:
558
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
559
revno = '.'.join(str(i) for i in dotted_revno)
560
except errors.NoSuchRevision:
562
maxlen = max(maxlen, len(revno))
563
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
570
for ri in revinfos:
609
571
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
612
574
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
575
"""Add specified files or directories.
615
577
In non-recursive mode, all the named items are added, regardless
616
578
of whether they were previously ignored. A warning is given if
684
643
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
645
file_list = self._maybe_expand_globs(file_list)
646
tree, file_list = tree_files_for_add(file_list)
647
added, ignored = tree.smart_add(file_list, not
648
no_recurse, action=action, save=not dry_run)
650
if base_tree is not None:
690
652
if len(ignored) > 0:
692
654
for glob in sorted(ignored.keys()):
693
655
for path in ignored[glob]:
694
656
self.outf.write("ignored %s matching \"%s\"\n"
660
for glob, paths in ignored.items():
661
match_len += len(paths)
662
self.outf.write("ignored %d file(s).\n" % match_len)
663
self.outf.write("If you wish to add ignored files, "
664
"please add them explicitly by name. "
665
"(\"bzr ignored\" gives a list)\n")
698
668
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
669
"""Create a new versioned directory.
701
671
This is equivalent to creating the directory and then adding it.
761
726
revision = _get_one_revision('inventory', revision)
762
727
work_tree, file_list = tree_files(file_list)
763
728
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()
730
if revision is not None:
731
tree = revision.as_tree(work_tree.branch)
733
extra_trees = [work_tree]
739
if file_list is not None:
740
file_ids = tree.paths2ids(file_list, trees=extra_trees,
741
require_versioned=True)
742
# find_ids_across_trees may include some paths that don't
744
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
745
for file_id in file_ids if file_id in tree)
747
entries = tree.inventory.entries()
750
if tree is not work_tree:
786
753
for path, entry in entries:
787
754
if kind and kind != entry.kind:
926
896
dest = osutils.pathjoin(dest_parent, dest_tail)
927
897
mutter("attempting to move %s => %s", src, dest)
928
898
tree.rename_one(src, dest, after=after)
930
self.outf.write("%s => %s\n" % (src, dest))
899
self.outf.write("%s => %s\n" % (src, dest))
933
902
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
903
"""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
905
This command only works on branches that have not diverged. Branches are
906
considered diverged if the destination branch's most recent commit is one
907
that has not been merged (directly or indirectly) into the parent.
941
909
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
910
from one into the other. Once one branch has merged, the other should
943
911
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.
913
If you want to forget your local changes and just update your branch to
914
match the remote one, use pull --overwrite.
949
916
If there is no default location set, the first pull will set it. After
950
917
that, you can omit the location to use the default. To change the
1030
993
branch_from = Branch.open(location,
1031
994
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1035
996
if branch_to.get_parent() is None or remember:
1036
997
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,
999
if branch_from is not branch_to:
1000
branch_from.lock_read()
1002
if revision is not None:
1003
revision_id = revision.as_revision_id(branch_from)
1005
branch_to.lock_write()
1007
if tree_to is not None:
1008
view_info = _get_view_info_for_change_reporter(tree_to)
1009
change_reporter = delta._ChangeReporter(
1010
unversioned_filter=tree_to.is_ignored,
1011
view_info=view_info)
1012
result = tree_to.pull(
1013
branch_from, overwrite, revision_id, change_reporter,
1014
possible_transports=possible_transports, local=local)
1016
result = branch_to.pull(
1017
branch_from, overwrite, revision_id, local=local)
1019
result.report(self.outf)
1020
if verbose and result.old_revid != result.new_revid:
1021
log.show_branch_change(
1022
branch_to, self.outf, result.old_revno,
1027
if branch_from is not branch_to:
1028
branch_from.unlock()
1060
1031
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1032
"""Update a mirror of this branch.
1063
1034
The target branch will not have its working tree populated because this
1064
1035
is both expensive, and is not supported on remote file systems.
1125
1096
# Get the source branch
1126
1097
(tree, br_from,
1127
1098
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1100
strict = br_from.get_config().get_user_option('push_strict')
1101
if strict is not None:
1102
# FIXME: This should be better supported by config
1104
bools = dict(yes=True, no=False, on=True, off=False,
1105
true=True, false=False)
1107
strict = bools[strict.lower()]
1128
1110
# Get the tip's revision_id
1129
1111
revision = _get_one_revision('push', revision)
1130
1112
if revision is not None:
1131
1113
revision_id = revision.in_history(br_from).rev_id
1133
1115
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.')
1116
if (tree is not None and revision_id is None
1117
and (strict is None or strict)): # Default to True:
1118
changes = tree.changes_from(tree.basis_tree())
1119
if changes.has_changed() or len(tree.get_parent_ids()) > 1:
1120
raise errors.UncommittedChanges(
1121
tree, more='Use --no-strict to force the push.')
1122
if tree.last_revision() != tree.branch.last_revision():
1123
# The tree has lost sync with its branch, there is little
1124
# chance that the user is aware of it but he can still force
1125
# the push with --no-strict
1126
raise errors.OutOfDateTree(
1127
tree, more='Use --no-strict to force the push.')
1139
1129
# Get the stacked_on branch, if any
1140
1130
if stacked_on is not None:
1141
1131
stacked_on = urlutils.normalize_url(stacked_on)
1206
1193
' directory exists, but does not already'
1207
1194
' have a control directory. This flag will'
1208
1195
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
1197
aliases = ['get', 'clone']
1214
1199
def run(self, from_location, to_location=None, revision=None,
1215
1200
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1201
use_existing_dir=False):
1218
1202
from bzrlib.tag import _merge_tags_if_possible
1219
1204
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1206
if (accelerator_tree is not None and
1207
accelerator_tree.supports_content_filtering()):
1208
accelerator_tree = None
1221
1209
revision = _get_one_revision('branch', revision)
1222
1210
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)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'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'))
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1288
1267
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1268
"""Create a new checkout of an existing branch.
1291
1270
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1271
the branch found in '.'. This is useful if you have removed the working tree
1367
1346
def run(self, dir=u'.'):
1368
1347
tree = WorkingTree.open_containing(dir)[0]
1369
1348
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))
1350
new_inv = tree.inventory
1351
old_tree = tree.basis_tree()
1352
old_tree.lock_read()
1354
old_inv = old_tree.inventory
1356
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1357
for f, paths, c, v, p, n, k, e in iterator:
1358
if paths[0] == paths[1]:
1362
renames.append(paths)
1364
for old_name, new_name in renames:
1365
self.outf.write("%s => %s\n" % (old_name, new_name))
1389
1372
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1373
"""Update a tree to have the latest code committed to its branch.
1392
1375
This will perform a merge into the working tree, and may generate
1393
1376
conflicts. If you have any local changes, you will still
1396
1379
If you want to discard your local changes, you can just do a
1397
1380
'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
1383
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1384
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1385
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")
1387
def run(self, dir='.'):
1412
1388
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1389
possible_transports = []
1415
master = branch.get_master_branch(
1390
master = tree.branch.get_master_branch(
1416
1391
possible_transports=possible_transports)
1417
1392
if master is not None:
1418
1393
tree.lock_write()
1419
branch_location = master.base
1421
1395
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)
1397
existing_pending_merges = tree.get_parent_ids()[1:]
1398
last_rev = _mod_revision.ensure_null(tree.last_revision())
1399
if last_rev == _mod_revision.ensure_null(
1400
tree.branch.last_revision()):
1401
# may be up to date, check master too.
1402
if master is None or last_rev == _mod_revision.ensure_null(
1403
master.last_revision()):
1404
revno = tree.branch.revision_id_to_revno(last_rev)
1405
note("Tree is up to date at revision %d." % (revno,))
1407
view_info = _get_view_info_for_change_reporter(tree)
1450
1408
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'.")
1409
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1410
view_info=view_info), possible_transports=possible_transports)
1411
revno = tree.branch.revision_id_to_revno(
1412
_mod_revision.ensure_null(tree.last_revision()))
1413
note('Updated to revision %d.' % (revno,))
1414
if tree.get_parent_ids()[1:] != existing_pending_merges:
1415
note('Your local commits will now show as pending merges with '
1416
"'bzr status', and can be committed with 'bzr commit'.")
1475
1425
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1426
"""Show information about a working tree, branch or repository.
1478
1428
This command will show all known locations and formats associated to the
1479
1429
tree, branch or repository.
1546
1496
file_list = [f for f in file_list]
1548
1498
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')
1500
# Heuristics should probably all move into tree.remove_smart or
1503
added = tree.changes_from(tree.basis_tree(),
1504
specific_files=file_list).added
1505
file_list = sorted([f[0] for f in added], reverse=True)
1506
if len(file_list) == 0:
1507
raise errors.BzrCommandError('No matching files.')
1508
elif file_list is None:
1509
# missing files show up in iter_changes(basis) as
1510
# versioned-with-no-kind.
1512
for change in tree.iter_changes(tree.basis_tree()):
1513
# Find paths in the working tree that have no kind:
1514
if change[1][1] is not None and change[6][1] is None:
1515
missing.append(change[1][1])
1516
file_list = sorted(missing, reverse=True)
1517
file_deletion_strategy = 'keep'
1518
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1519
keep_files=file_deletion_strategy=='keep',
1520
force=file_deletion_strategy=='force')
1573
1525
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1526
"""Print file_id of a particular file or directory.
1576
1528
The file_id is assigned when the file is first added and remains the
1577
1529
same through all revisions where the file exists, even when it is
1795
1747
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1748
"""Create a shared repository to hold branches.
1798
1750
New branches created under the repository directory will store their
1799
revisions in the repository, not in the branch directory. For branches
1800
with shared history, this reduces the amount of storage needed and
1801
speeds up the creation of new branches.
1751
revisions in the repository, not in the branch directory.
1803
If the --no-trees option is given then the branches in the repository
1804
will not have working trees by default. They will still exist as
1805
directories on disk, but they will not have separate copies of the
1806
files at a certain revision. This can be useful for repositories that
1807
store branches which are interacted with through checkouts or remote
1808
branches, such as on a server.
1753
If the --no-trees option is used then the branches in the repository
1754
will not have working trees by default.
1811
Create a shared repository holding just branches::
1757
Create a shared repositories holding just branches::
1813
1759
bzr init-repo --no-trees repo
1814
1760
bzr init repo/trunk
1977
1904
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1905
' 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)
1907
old_tree, new_tree, specific_files, extra_trees = \
1908
_get_trees_to_diff(file_list, revision, old, new,
1988
1910
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1911
specific_files=specific_files,
1990
1912
external_diff_options=diff_options,
1991
1913
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1914
extra_trees=extra_trees, using=using)
1996
1917
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1918
"""List files deleted in the working tree.
1999
1920
# TODO: Show files deleted since a previous revision, or
2000
1921
# between two revisions.
2395
2314
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)
2318
# Build the log formatter
2319
if log_format is None:
2320
log_format = log.log_formatter_registry.get_default(b)
2321
lf = log_format(show_ids=show_ids, to_file=self.outf,
2322
show_timezone=timezone,
2323
delta_format=get_verbosity_level(),
2325
show_advice=levels is None)
2327
# Choose the algorithm for doing the logging. It's annoying
2328
# having multiple code paths like this but necessary until
2329
# the underlying repository format is faster at generating
2330
# deltas or can provide everything we need from the indices.
2331
# The default algorithm - match-using-deltas - works for
2332
# multiple files and directories and is faster for small
2333
# amounts of history (200 revisions say). However, it's too
2334
# slow for logging a single file in a repository with deep
2335
# history, i.e. > 10K revisions. In the spirit of "do no
2336
# evil when adding features", we continue to use the
2337
# original algorithm - per-file-graph - for the "single
2338
# file that isn't a directory without showing a delta" case.
2339
partial_history = revision and b.repository._format.supports_chks
2340
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2341
or delta_type or partial_history)
2343
# Build the LogRequest and execute it
2344
if len(file_ids) == 0:
2346
rqst = make_log_request_dict(
2347
direction=direction, specific_fileids=file_ids,
2348
start_revision=rev1, end_revision=rev2, limit=limit,
2349
message_search=message, delta_type=delta_type,
2350
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2351
Logger(b, rqst).show(lf)
2438
2356
def _get_revision_range(revisionspec_list, branch, command_name):
2585
2496
note("Ignoring files outside view. View is %s" % view_str)
2587
2498
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:
2500
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2501
from_dir=relpath, recursive=recursive):
2502
# Apply additional masking
2503
if not all and not selection[fc]:
2505
if kind is not None and fkind != kind:
2510
fullpath = osutils.pathjoin(relpath, fp)
2513
views.check_path_in_view(tree, fullpath)
2514
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))
2519
fp = osutils.pathjoin(prefix, fp)
2520
kindch = entry.kind_character()
2521
outstring = fp + kindch
2522
ui.ui_factory.clear_term()
2524
outstring = '%-8s %s' % (fc, outstring)
2525
if show_ids and fid is not None:
2526
outstring = "%-50s %s" % (outstring, fid)
2632
2527
self.outf.write(outstring + '\n')
2529
self.outf.write(fp + '\0')
2532
self.outf.write(fid)
2533
self.outf.write('\0')
2541
self.outf.write('%-50s %s\n' % (outstring, my_id))
2543
self.outf.write(outstring + '\n')
2635
2548
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2549
"""List unknown files.
2648
2561
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2562
"""Ignore specified files or patterns.
2651
2564
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
2566
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2567
After adding, editing or deleting that file either indirectly by
2661
2568
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
2571
Note: ignore patterns containing shell wildcards must be quoted from
2678
2572
the shell on Unix.
2701
2591
Ignore everything but the "debian" toplevel directory::
2703
2593
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
2596
_see_also = ['status', 'ignored', 'patterns']
2714
2597
takes_args = ['name_pattern*']
2715
2598
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2599
Option('old-default-rules',
2600
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2603
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2604
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)
2605
if old_default_rules is not None:
2606
# dump the rules and exit
2607
for pattern in ignores.OLD_DEFAULTS:
2727
2610
if not name_pattern_list:
2728
2611
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2612
"NAME_PATTERN or --old-default-rules")
2730
2613
name_pattern_list = [globbing.normalize_pattern(p)
2731
2614
for p in name_pattern_list]
2732
2615
for name_pattern in name_pattern_list:
3145
3012
if local and not tree.branch.get_bound_location():
3146
3013
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
3015
def get_message(commit_obj):
3170
3016
"""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,
3017
my_message = message
3018
if my_message is None and not file:
3019
t = make_commit_message_template_encoded(tree,
3180
3020
selected_list, diff=show_diff,
3181
3021
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
3022
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3023
my_message = edit_commit_message_encoded(t,
3189
3024
start_message=start_message)
3190
3025
if my_message is None:
3191
3026
raise errors.BzrCommandError("please specify a commit"
3192
3027
" message with either --message or --file")
3028
elif my_message and file:
3029
raise errors.BzrCommandError(
3030
"please specify either --message or --file")
3032
my_message = codecs.open(file, 'rt',
3033
osutils.get_user_encoding()).read()
3193
3034
if my_message == "":
3194
3035
raise errors.BzrCommandError("empty commit message specified")
3195
3036
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
3039
tree.commit(message_callback=get_message,
3203
3040
specific_files=selected_list,
3204
3041
allow_pointless=unchanged, strict=strict, local=local,
3205
3042
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3208
3044
exclude=safe_relpath_files(tree, exclude))
3209
3045
except PointlessCommit:
3046
# FIXME: This should really happen before the file is read in;
3047
# perhaps prepare the commit; get the message; then actually commit
3210
3048
raise errors.BzrCommandError("No changes to commit."
3211
3049
" Use --unchanged to commit anyhow.")
3212
3050
except ConflictsInTree:
3624
3451
verbose = not is_quiet()
3625
3452
# TODO: should possibly lock the history file...
3626
3453
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
3455
test_suite_factory = None
3630
3456
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)
3458
selftest_kwargs = {"verbose": verbose,
3460
"stop_on_failure": one,
3461
"transport": transport,
3462
"test_suite_factory": test_suite_factory,
3463
"lsprof_timed": lsprof_timed,
3464
"bench_history": benchfile,
3465
"matching_tests_first": first,
3466
"list_only": list_only,
3467
"random_seed": randomize,
3468
"exclude_pattern": exclude,
3470
"load_list": load_list,
3471
"debug_flags": debugflag,
3472
"starting_with": starting_with
3474
selftest_kwargs.update(self.additional_selftest_args)
3475
result = selftest(**selftest_kwargs)
3477
if benchfile is not None:
3650
3479
return int(not result)
3653
3482
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3483
"""Show version of bzr."""
3656
3485
encoding_type = 'replace'
3657
3486
takes_options = [
3822
3636
verified = 'inapplicable'
3823
3637
tree = WorkingTree.open_containing(directory)[0]
3639
# die as quickly as possible if there are uncommitted changes
3826
3641
basis_tree = tree.revision_tree(tree.last_revision())
3827
3642
except errors.NoSuchRevision:
3828
3643
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3645
changes = tree.changes_from(basis_tree)
3646
if changes.has_changed():
3833
3647
raise errors.UncommittedChanges(tree)
3835
3649
view_info = _get_view_info_for_change_reporter(tree)
3836
3650
change_reporter = delta._ChangeReporter(
3837
3651
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:
3654
pb = ui.ui_factory.nested_progress_bar()
3655
cleanups.append(pb.finished)
3657
cleanups.append(tree.unlock)
3658
if location is not None:
3660
mergeable = bundle.read_mergeable_from_url(location,
3661
possible_transports=possible_transports)
3662
except errors.NotABundle:
3666
raise errors.BzrCommandError('Cannot use --uncommitted'
3667
' with bundles or merge directives.')
3669
if revision is not None:
3670
raise errors.BzrCommandError(
3671
'Cannot use -r with merge directives or bundles')
3672
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3675
if merger is None and uncommitted:
3676
if revision is not None and len(revision) > 0:
3677
raise errors.BzrCommandError('Cannot use --uncommitted and'
3678
' --revision at the same time.')
3679
merger = self.get_merger_from_uncommitted(tree, location, pb,
3681
allow_pending = False
3684
merger, allow_pending = self._get_merger_from_branch(tree,
3685
location, revision, remember, possible_transports, pb)
3687
merger.merge_type = merge_type
3688
merger.reprocess = reprocess
3689
merger.show_base = show_base
3690
self.sanity_check_merger(merger)
3691
if (merger.base_rev_id == merger.other_rev_id and
3692
merger.other_rev_id is not None):
3693
note('Nothing to do.')
3696
if merger.interesting_files is not None:
3697
raise errors.BzrCommandError('Cannot pull individual files')
3698
if (merger.base_rev_id == tree.last_revision()):
3699
result = tree.pull(merger.other_branch, False,
3700
merger.other_rev_id)
3701
result.report(self.outf)
3703
merger.check_basis(False)
3705
return self._do_preview(merger)
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3891
return self._do_preview(merger)
3893
return self._do_interactive(merger)
3895
return self._do_merge(merger, change_reporter, allow_pending,
3898
def _get_preview(self, merger):
3707
return self._do_merge(merger, change_reporter, allow_pending,
3710
for cleanup in reversed(cleanups):
3713
def _do_preview(self, merger):
3714
from bzrlib.diff import show_diff_trees
3899
3715
tree_merger = merger.make_merger()
3900
3716
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3902
result_tree = tt.get_preview_tree()
3905
def _do_preview(self, merger):
3906
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3718
result_tree = tt.get_preview_tree()
3719
show_diff_trees(merger.this_tree, result_tree, self.outf,
3720
old_label='', new_label='')
3911
3724
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3725
merger.change_reporter = change_reporter
4097
3894
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3895
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3896
if merge_type is None:
4101
3897
merge_type = _mod_merge.Merge3Merger
4102
3898
tree, file_list = tree_files(file_list)
4103
3899
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":
3901
parents = tree.get_parent_ids()
3902
if len(parents) != 2:
3903
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3904
" merges. Not cherrypicking or"
3906
repository = tree.branch.repository
3907
interesting_ids = None
3909
conflicts = tree.conflicts()
3910
if file_list is not None:
3911
interesting_ids = set()
3912
for filename in file_list:
3913
file_id = tree.path2id(filename)
3915
raise errors.NotVersionedError(filename)
3916
interesting_ids.add(file_id)
3917
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:
3920
for name, ie in tree.inventory.iter_entries(file_id):
3921
interesting_ids.add(ie.file_id)
3922
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3924
# Remerge only supports resolving contents conflicts
3925
allowed_conflicts = ('text conflict', 'contents conflict')
3926
restore_files = [c.path for c in conflicts
3927
if c.typestring in allowed_conflicts]
3928
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3929
tree.set_conflicts(ConflictList(new_conflicts))
3930
if file_list is not None:
3931
restore_files = file_list
3932
for filename in restore_files:
3934
restore(tree.abspath(filename))
3935
except errors.NotConflicted:
3937
# Disable pending merges, because the file texts we are remerging
3938
# have not had those merges performed. If we use the wrong parents
3939
# list, we imply that the working tree text has seen and rejected
3940
# all the changes from the other tree, when in fact those changes
3941
# have not yet been seen.
3942
pb = ui.ui_factory.nested_progress_bar()
3943
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()
3945
merger = _mod_merge.Merger.from_revision_ids(pb,
3947
merger.interesting_ids = interesting_ids
3948
merger.merge_type = merge_type
3949
merger.show_base = show_base
3950
merger.reprocess = reprocess
3951
conflicts = merger.do_merge()
3953
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3957
if conflicts > 0:
4180
3981
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
3984
Any files that have been newly added since that revision will be deleted,
3985
with a backup kept if appropriate. Directories containing unknown files
3986
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
3988
The working tree contains a list of pending merged revisions, which will
3989
be included as parents in the next commit. Normally, revert clears that
3990
list as well as reverting the files. If any files are specified, revert
3991
leaves the pending merge list alone and reverts only the files. Use "bzr
3992
revert ." in the tree root to revert all files but keep the merge record,
3993
and "bzr revert --forget-merges" to clear the pending merge list without
4195
3994
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
3997
_see_also = ['cat', 'export']
4217
4006
def run(self, revision=None, no_backup=False, file_list=None,
4218
4007
forget_merges=None):
4219
4008
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)
4012
tree.set_parent_ids(tree.get_parent_ids()[:1])
4014
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4228
4019
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4020
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)
4021
pb = ui.ui_factory.nested_progress_bar()
4023
tree.revert(file_list, rev_tree, not no_backup, pb,
4024
report_changes=True)
4234
4029
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4030
"""Test reporting of assertion failures"""
4236
4031
# intended just for use in testing
4389
4174
_get_revision_range(revision,
4390
4175
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")
4177
local_branch.lock_read()
4179
remote_branch.lock_read()
4181
local_extra, remote_extra = find_unmerged(
4182
local_branch, remote_branch, restrict,
4183
backward=not reverse,
4184
include_merges=include_merges,
4185
local_revid_range=local_revid_range,
4186
remote_revid_range=remote_revid_range)
4188
if log_format is None:
4189
registry = log.log_formatter_registry
4190
log_format = registry.get_default(local_branch)
4191
lf = log_format(to_file=self.outf,
4193
show_timezone='original')
4196
if local_extra and not theirs_only:
4197
message("You have %d extra revision(s):\n" %
4199
for revision in iter_log_revisions(local_extra,
4200
local_branch.repository,
4202
lf.log_revision(revision)
4203
printed_local = True
4206
printed_local = False
4208
if remote_extra and not mine_only:
4209
if printed_local is True:
4211
message("You are missing %d revision(s):\n" %
4213
for revision in iter_log_revisions(remote_extra,
4214
remote_branch.repository,
4216
lf.log_revision(revision)
4219
if mine_only and not local_extra:
4220
# We checked local, and found nothing extra
4221
message('This branch is up to date.\n')
4222
elif theirs_only and not remote_extra:
4223
# We checked remote, and found nothing extra
4224
message('Other branch is up to date.\n')
4225
elif not (mine_only or theirs_only or local_extra or
4227
# We checked both branches, and neither one had extra
4229
message("Branches are up to date.\n")
4231
remote_branch.unlock()
4233
local_branch.unlock()
4442
4234
if not status_code and parent is None and other_branch is not None:
4443
4235
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)
4237
# handle race conditions - a parent might be set while we run.
4238
if local_branch.get_parent() is None:
4239
local_branch.set_parent(remote_branch.base)
4241
local_branch.unlock()
4448
4242
return status_code
4451
4245
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.
4246
"""Compress the data within a repository."""
4470
4248
_see_also = ['repositories']
4471
4249
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):
4251
def run(self, branch_or_repo='.'):
4477
4252
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4254
branch = dir.open_branch()
4480
4255
repository = branch.repository
4481
4256
except errors.NotBranchError:
4482
4257
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4261
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4262
"""List the installed plugins.
4489
4264
This command displays the list of installed plugins including
4490
4265
version of plugin and a short description of each.
4589
4366
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4367
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4594
4370
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,
4372
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4374
file_id = wt.path2id(relpath)
4376
file_id = tree.path2id(relpath)
4378
raise errors.NotVersionedError(filename)
4379
file_version = tree.inventory[file_id].revision
4380
if wt is not None and revision is None:
4381
# If there is a tree and we're not annotating historical
4382
# versions, annotate the working tree's content.
4383
annotate_file_tree(wt, file_id, self.outf, long, all,
4386
annotate_file(branch, file_version, file_id, long, all, self.outf,
4616
4395
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4396
"""Create a digital signature for an existing revision."""
4618
4397
# TODO be able to replace existing ones.
4620
4399
hidden = True # is this right ?
4827
4609
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4612
print 'Dry-run, pretending to remove the above revisions.'
4614
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')
4616
print 'The above revision(s) will be removed.'
4618
val = raw_input('Are you sure [y/N]? ')
4619
if val.lower() not in ('y', 'yes'):
4840
4623
mutter('Uncommitting from {%s} to {%s}',
4841
4624
last_rev_id, rev_id)
4842
4625
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4626
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)
4627
note('You can restore the old tip by running:\n'
4628
' bzr pull . -r revid:%s', last_rev_id)
4848
4631
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4632
"""Break a dead lock on a repository, branch or working directory.
4851
4634
CAUTION: Locks should only be broken when you are sure that the process
4852
4635
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4637
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
4642
takes_args = ['location?']
5134
4911
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.
4914
If --no-bundle is specified, then public_branch is needed (and must be
4915
up-to-date), so that the receiver can perform the merge using the
4916
public_branch. The public_branch is always included if known, so that
4917
people can check it later.
4919
The submit branch defaults to the parent, but can be overridden. Both
4920
submit branch and public branch will be remembered if supplied.
4922
If a public_branch is known for the submit_branch, that public submit
4923
branch is used in the merge instructions. This means that a local mirror
4924
can be used as your actual submit branch, once you have set public_branch
5164
4927
Mail is sent using your preferred mail program. This should be transparent
5165
4928
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5359
5112
branch, relpath = Branch.open_containing(directory)
5360
5113
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)
5116
branch.tags.delete_tag(tag_name)
5117
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)
5120
if len(revision) != 1:
5121
raise errors.BzrCommandError(
5122
"Tags can only be placed on a single revision, "
5124
revision_id = revision[0].as_revision_id(branch)
5126
revision_id = branch.last_revision()
5127
if (not force) and branch.tags.has_tag(tag_name):
5128
raise errors.TagAlreadyExists(tag_name)
5129
branch.tags.set_tag(tag_name, revision_id)
5130
self.outf.write('Created tag %s.\n' % tag_name)
5387
5135
class cmd_tags(Command):
5388
__doc__ = """List tags.
5390
5138
This command shows a table of tag names and the revisions they reference.
5422
5170
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)
5173
graph = branch.repository.get_graph()
5174
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5175
revid1, revid2 = rev1.rev_id, rev2.rev_id
5176
# only show revisions between revid1 and revid2 (inclusive)
5177
tags = [(tag, revid) for tag, revid in tags if
5178
graph.is_between(revid, revid1, revid2)]
5181
elif sort == 'time':
5183
for tag, revid in tags:
5185
revobj = branch.repository.get_revision(revid)
5186
except errors.NoSuchRevision:
5187
timestamp = sys.maxint # place them at the end
5189
timestamp = revobj.timestamp
5190
timestamps[revid] = timestamp
5191
tags.sort(key=lambda x: timestamps[x[1]])
5193
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5194
for index, (tag, revid) in enumerate(tags):
5196
revno = branch.revision_id_to_dotted_revno(revid)
5197
if isinstance(revno, tuple):
5198
revno = '.'.join(map(str, revno))
5199
except errors.NoSuchRevision:
5200
# Bad tag data/merges can lead to tagged revisions
5201
# which are not in this branch. Fail gracefully ...
5203
tags[index] = (tag, revno)
5457
5206
for tag, revspec in tags:
5458
5207
self.outf.write('%-20s %s\n' % (tag, revspec))
5461
5210
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5211
"""Reconfigure the type of a bzr directory.
5464
5213
A target configuration must be specified.
5496
5245
Option('bind-to', help='Branch to bind checkout to.', type=str),
5497
5246
Option('force',
5498
help='Perform reconfiguration even if local changes'
5500
Option('stacked-on',
5501
help='Reconfigure a branch to be stacked on another branch.',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
5247
help='Perform reconfiguration even if local changes'
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5251
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
5252
directory = bzrdir.BzrDir.open(location)
5514
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5516
elif stacked_on is not None:
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5519
reconfigure.ReconfigureUnstacked().apply(directory)
5520
# At the moment you can use --stacked-on and a different
5521
# reconfiguration shape at the same time; there seems no good reason
5523
5253
if target_type is None:
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5254
raise errors.BzrCommandError('No target configuration specified')
5529
5255
elif target_type == 'branch':
5530
5256
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
5257
elif target_type == 'tree':
5568
5294
/path/to/newbranch.
5570
5296
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
5297
locally, in which case switching will update the the local nickname to be
5572
5298
that of the master.
5575
takes_args = ['to_location?']
5301
takes_args = ['to_location']
5576
5302
takes_options = [Option('force',
5577
help='Switch even if local commits will be lost.'),
5579
Option('create-branch', short_name='b',
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
5303
help='Switch even if local commits will be lost.')
5584
def run(self, to_location=None, force=False, create_branch=False,
5306
def run(self, to_location, force=False):
5586
5307
from bzrlib import switch
5587
5308
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5309
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
5311
branch = control_dir.open_branch()
5597
5312
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
5313
except errors.NotBranchError:
5600
5314
had_explicit_nick = False
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5316
to_branch = Branch.open(to_location)
5317
except errors.NotBranchError:
5318
this_url = self._get_branch_location(control_dir)
5319
to_branch = Branch.open(
5320
urlutils.join(this_url, '..', to_location))
5321
switch.switch(control_dir, to_branch, force)
5624
5322
if had_explicit_nick:
5625
5323
branch = control_dir.open_branch() #get the new branch!
5626
5324
branch.nick = to_branch.nick
5893
5566
if writer is None:
5894
5567
writer = bzrlib.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5569
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5570
message, destroy=destroy).run()
5902
5571
except errors.UserAbort:
5905
5574
def run_for_list(self):
5906
5575
tree = WorkingTree.open_containing('.')[0]
5907
5576
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5578
manager = tree.get_shelf_manager()
5579
shelves = manager.active_shelves()
5580
if len(shelves) == 0:
5581
note('No shelved changes.')
5583
for shelf_id in reversed(shelves):
5584
message = manager.get_metadata(shelf_id).get('message')
5586
message = '<no message>'
5587
self.outf.write('%3d: %s\n' % (shelf_id, message))
5922
5593
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5594
"""Restore shelved changes.
5925
5596
By default, the most recently shelved changes are restored. However if you
5926
5597
specify a shelf by id those changes will be restored instead. This works
5934
5605
enum_switch=False, value_switches=True,
5935
5606
apply="Apply changes and remove from the shelf.",
5936
5607
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
delete_only="Delete changes without applying them.",
5940
keep="Apply changes but don't delete them.",
5608
delete_only="Delete changes without applying them."
5943
5611
_see_also = ['shelve']
5945
5613
def run(self, shelf_id=None, action='apply'):
5946
5614
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5951
unshelver.tree.unlock()
5615
Unshelver.from_args(shelf_id, action).run()
5954
5618
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5619
"""Remove unwanted files from working tree.
5957
5621
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5622
files are never deleted.
6032
5696
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)
5699
# these get imported and then picked up by the scan for cmd_*
5700
# TODO: Some more consistent way to split command definitions across files;
5701
# we do need to load at least some information about them to know of
5702
# aliases. ideally we would avoid loading the implementation until the
5703
# details were needed.
5704
from bzrlib.cmd_version_info import cmd_version_info
5705
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5706
from bzrlib.bundle.commands import (
5709
from bzrlib.foreign import cmd_dpush
5710
from bzrlib.sign_my_commits import cmd_sign_my_commits
5711
from bzrlib.weave_commands import cmd_versionedfile_list, \
5712
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
