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 of a "
455
changes = working.changes_from(working.basis_tree())
456
if changes.has_changed():
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 from "
463
"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.
571
529
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
534
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())
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])
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
569
for ri in revinfos:
609
570
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
612
573
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
574
"""Add specified files or directories.
615
576
In non-recursive mode, all the named items are added, regardless
616
577
of whether they were previously ignored. A warning is given if
684
642
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)
644
file_list = self._maybe_expand_globs(file_list)
645
tree, file_list = tree_files_for_add(file_list)
646
added, ignored = tree.smart_add(file_list, not
647
no_recurse, action=action, save=not dry_run)
649
if base_tree is not None:
690
651
if len(ignored) > 0:
692
653
for glob in sorted(ignored.keys()):
693
654
for path in ignored[glob]:
694
655
self.outf.write("ignored %s matching \"%s\"\n"
659
for glob, paths in ignored.items():
660
match_len += len(paths)
661
self.outf.write("ignored %d file(s).\n" % match_len)
662
self.outf.write("If you wish to add ignored files, "
663
"please add them explicitly by name. "
664
"(\"bzr ignored\" gives a list)\n")
698
667
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
668
"""Create a new versioned directory.
701
670
This is equivalent to creating the directory and then adding it.
761
725
revision = _get_one_revision('inventory', revision)
762
726
work_tree, file_list = tree_files(file_list)
763
727
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()
729
if revision is not None:
730
tree = revision.as_tree(work_tree.branch)
732
extra_trees = [work_tree]
738
if file_list is not None:
739
file_ids = tree.paths2ids(file_list, trees=extra_trees,
740
require_versioned=True)
741
# find_ids_across_trees may include some paths that don't
743
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
744
for file_id in file_ids if file_id in tree)
746
entries = tree.inventory.entries()
749
if tree is not work_tree:
786
752
for path, entry in entries:
787
753
if kind and kind != entry.kind:
926
895
dest = osutils.pathjoin(dest_parent, dest_tail)
927
896
mutter("attempting to move %s => %s", src, dest)
928
897
tree.rename_one(src, dest, after=after)
930
self.outf.write("%s => %s\n" % (src, dest))
898
self.outf.write("%s => %s\n" % (src, dest))
933
901
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
902
"""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
904
This command only works on branches that have not diverged. Branches are
905
considered diverged if the destination branch's most recent commit is one
906
that has not been merged (directly or indirectly) into the parent.
941
908
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
909
from one into the other. Once one branch has merged, the other should
943
910
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.
912
If you want to forget your local changes and just update your branch to
913
match the remote one, use pull --overwrite.
949
915
If there is no default location set, the first pull will set it. After
950
916
that, you can omit the location to use the default. To change the
1030
992
branch_from = Branch.open(location,
1031
993
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1035
995
if branch_to.get_parent() is None or remember:
1036
996
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,
998
if branch_from is not branch_to:
999
branch_from.lock_read()
1001
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
1004
branch_to.lock_write()
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
1026
if branch_from is not branch_to:
1027
branch_from.unlock()
1060
1030
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1031
"""Update a mirror of this branch.
1063
1033
The target branch will not have its working tree populated because this
1064
1034
is both expensive, and is not supported on remote file systems.
1125
1095
# Get the source branch
1126
1096
(tree, br_from,
1127
1097
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1099
strict = br_from.get_config().get_user_option('push_strict')
1100
if strict is not None:
1101
# FIXME: This should be better supported by config
1103
bools = dict(yes=True, no=False, on=True, off=False,
1104
true=True, false=False)
1106
strict = bools[strict.lower()]
1128
1109
# Get the tip's revision_id
1129
1110
revision = _get_one_revision('push', revision)
1130
1111
if revision is not None:
1131
1112
revision_id = revision.in_history(br_from).rev_id
1133
1114
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.')
1115
if (tree is not None and revision_id is None
1116
and (strict is None or strict)): # Default to True:
1117
changes = tree.changes_from(tree.basis_tree())
1118
if changes.has_changed() or len(tree.get_parent_ids()) > 1:
1119
raise errors.UncommittedChanges(
1120
tree, more='Use --no-strict to force the push.')
1121
if tree.last_revision() != tree.branch.last_revision():
1122
# The tree has lost sync with its branch, there is little
1123
# chance that the user is aware of it but he can still force
1124
# the push with --no-strict
1125
raise errors.OutOfDateTree(
1126
tree, more='Use --no-strict to force the push.')
1139
1128
# Get the stacked_on branch, if any
1140
1129
if stacked_on is not None:
1141
1130
stacked_on = urlutils.normalize_url(stacked_on)
1206
1192
' directory exists, but does not already'
1207
1193
' have a control directory. This flag will'
1208
1194
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
1196
aliases = ['get', 'clone']
1214
1198
def run(self, from_location, to_location=None, revision=None,
1215
1199
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
1200
use_existing_dir=False):
1218
1201
from bzrlib.tag import _merge_tags_if_possible
1219
1203
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1205
if (accelerator_tree is not None and
1206
accelerator_tree.supports_content_filtering()):
1207
accelerator_tree = None
1221
1208
revision = _get_one_revision('branch', revision)
1222
1209
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)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
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)
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'))
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
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())
1288
1266
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1267
"""Create a new checkout of an existing branch.
1291
1269
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1270
the branch found in '.'. This is useful if you have removed the working tree
1367
1345
def run(self, dir=u'.'):
1368
1346
tree = WorkingTree.open_containing(dir)[0]
1369
1347
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))
1349
new_inv = tree.inventory
1350
old_tree = tree.basis_tree()
1351
old_tree.lock_read()
1353
old_inv = old_tree.inventory
1355
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1356
for f, paths, c, v, p, n, k, e in iterator:
1357
if paths[0] == paths[1]:
1361
renames.append(paths)
1363
for old_name, new_name in renames:
1364
self.outf.write("%s => %s\n" % (old_name, new_name))
1389
1371
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1372
"""Update a tree to have the latest code committed to its branch.
1392
1374
This will perform a merge into the working tree, and may generate
1393
1375
conflicts. If you have any local changes, you will still
1396
1378
If you want to discard your local changes, you can just do a
1397
1379
'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
1382
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1383
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1384
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")
1386
def run(self, dir='.'):
1412
1387
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1388
possible_transports = []
1415
master = branch.get_master_branch(
1389
master = tree.branch.get_master_branch(
1416
1390
possible_transports=possible_transports)
1417
1391
if master is not None:
1418
1392
tree.lock_write()
1419
branch_location = master.base
1421
1394
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)
1396
existing_pending_merges = tree.get_parent_ids()[1:]
1397
last_rev = _mod_revision.ensure_null(tree.last_revision())
1398
if last_rev == _mod_revision.ensure_null(
1399
tree.branch.last_revision()):
1400
# may be up to date, check master too.
1401
if master is None or last_rev == _mod_revision.ensure_null(
1402
master.last_revision()):
1403
revno = tree.branch.revision_id_to_revno(last_rev)
1404
note("Tree is up to date at revision %d." % (revno,))
1406
view_info = _get_view_info_for_change_reporter(tree)
1450
1407
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'.")
1408
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1409
view_info=view_info), possible_transports=possible_transports)
1410
revno = tree.branch.revision_id_to_revno(
1411
_mod_revision.ensure_null(tree.last_revision()))
1412
note('Updated to revision %d.' % (revno,))
1413
if tree.get_parent_ids()[1:] != existing_pending_merges:
1414
note('Your local commits will now show as pending merges with '
1415
"'bzr status', and can be committed with 'bzr commit'.")
1475
1424
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1425
"""Show information about a working tree, branch or repository.
1478
1427
This command will show all known locations and formats associated to the
1479
1428
tree, branch or repository.
1546
1495
file_list = [f for f in file_list]
1548
1497
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')
1499
# Heuristics should probably all move into tree.remove_smart or
1502
added = tree.changes_from(tree.basis_tree(),
1503
specific_files=file_list).added
1504
file_list = sorted([f[0] for f in added], reverse=True)
1505
if len(file_list) == 0:
1506
raise errors.BzrCommandError('No matching files.')
1507
elif file_list is None:
1508
# missing files show up in iter_changes(basis) as
1509
# versioned-with-no-kind.
1511
for change in tree.iter_changes(tree.basis_tree()):
1512
# Find paths in the working tree that have no kind:
1513
if change[1][1] is not None and change[6][1] is None:
1514
missing.append(change[1][1])
1515
file_list = sorted(missing, reverse=True)
1516
file_deletion_strategy = 'keep'
1517
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1518
keep_files=file_deletion_strategy=='keep',
1519
force=file_deletion_strategy=='force')
1573
1524
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1525
"""Print file_id of a particular file or directory.
1576
1527
The file_id is assigned when the file is first added and remains the
1577
1528
same through all revisions where the file exists, even when it is
1795
1746
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1747
"""Create a shared repository to hold branches.
1798
1749
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.
1750
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.
1752
If the --no-trees option is used then the branches in the repository
1753
will not have working trees by default.
1811
Create a shared repository holding just branches::
1756
Create a shared repositories holding just branches::
1813
1758
bzr init-repo --no-trees repo
1814
1759
bzr init repo/trunk
1977
1903
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1904
' 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)
1906
old_tree, new_tree, specific_files, extra_trees = \
1907
_get_trees_to_diff(file_list, revision, old, new,
1988
1909
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1910
specific_files=specific_files,
1990
1911
external_diff_options=diff_options,
1991
1912
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1913
extra_trees=extra_trees, using=using)
1996
1916
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1917
"""List files deleted in the working tree.
1999
1919
# TODO: Show files deleted since a previous revision, or
2000
1920
# between two revisions.
2395
2313
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)
2317
# Build the log formatter
2318
if log_format is None:
2319
log_format = log.log_formatter_registry.get_default(b)
2320
lf = log_format(show_ids=show_ids, to_file=self.outf,
2321
show_timezone=timezone,
2322
delta_format=get_verbosity_level(),
2324
show_advice=levels is None)
2326
# Choose the algorithm for doing the logging. It's annoying
2327
# having multiple code paths like this but necessary until
2328
# the underlying repository format is faster at generating
2329
# deltas or can provide everything we need from the indices.
2330
# The default algorithm - match-using-deltas - works for
2331
# multiple files and directories and is faster for small
2332
# amounts of history (200 revisions say). However, it's too
2333
# slow for logging a single file in a repository with deep
2334
# history, i.e. > 10K revisions. In the spirit of "do no
2335
# evil when adding features", we continue to use the
2336
# original algorithm - per-file-graph - for the "single
2337
# file that isn't a directory without showing a delta" case.
2338
partial_history = revision and b.repository._format.supports_chks
2339
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2340
or delta_type or partial_history)
2342
# Build the LogRequest and execute it
2343
if len(file_ids) == 0:
2345
rqst = make_log_request_dict(
2346
direction=direction, specific_fileids=file_ids,
2347
start_revision=rev1, end_revision=rev2, limit=limit,
2348
message_search=message, delta_type=delta_type,
2349
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2350
Logger(b, rqst).show(lf)
2438
2355
def _get_revision_range(revisionspec_list, branch, command_name):
2585
2495
note("Ignoring files outside view. View is %s" % view_str)
2587
2497
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:
2499
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2500
from_dir=relpath, recursive=recursive):
2501
# Apply additional masking
2502
if not all and not selection[fc]:
2504
if kind is not None and fkind != kind:
2509
fullpath = osutils.pathjoin(relpath, fp)
2512
views.check_path_in_view(tree, fullpath)
2513
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))
2518
fp = osutils.pathjoin(prefix, fp)
2519
kindch = entry.kind_character()
2520
outstring = fp + kindch
2521
ui.ui_factory.clear_term()
2523
outstring = '%-8s %s' % (fc, outstring)
2524
if show_ids and fid is not None:
2525
outstring = "%-50s %s" % (outstring, fid)
2632
2526
self.outf.write(outstring + '\n')
2528
self.outf.write(fp + '\0')
2531
self.outf.write(fid)
2532
self.outf.write('\0')
2540
self.outf.write('%-50s %s\n' % (outstring, my_id))
2542
self.outf.write(outstring + '\n')
2635
2547
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2548
"""List unknown files.
2648
2560
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2561
"""Ignore specified files or patterns.
2651
2563
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
2565
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2566
After adding, editing or deleting that file either indirectly by
2661
2567
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
2570
Note: ignore patterns containing shell wildcards must be quoted from
2678
2571
the shell on Unix.
2701
2590
Ignore everything but the "debian" toplevel directory::
2703
2592
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
2595
_see_also = ['status', 'ignored', 'patterns']
2714
2596
takes_args = ['name_pattern*']
2715
2597
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2598
Option('old-default-rules',
2599
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2602
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2603
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)
2604
if old_default_rules is not None:
2605
# dump the rules and exit
2606
for pattern in ignores.OLD_DEFAULTS:
2727
2609
if not name_pattern_list:
2728
2610
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2611
"NAME_PATTERN or --old-default-rules")
2730
2612
name_pattern_list = [globbing.normalize_pattern(p)
2731
2613
for p in name_pattern_list]
2732
2614
for name_pattern in name_pattern_list:
3145
3011
if local and not tree.branch.get_bound_location():
3146
3012
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
3014
def get_message(commit_obj):
3170
3015
"""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,
3016
my_message = message
3017
if my_message is None and not file:
3018
t = make_commit_message_template_encoded(tree,
3180
3019
selected_list, diff=show_diff,
3181
3020
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
3021
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3022
my_message = edit_commit_message_encoded(t,
3189
3023
start_message=start_message)
3190
3024
if my_message is None:
3191
3025
raise errors.BzrCommandError("please specify a commit"
3192
3026
" message with either --message or --file")
3027
elif my_message and file:
3028
raise errors.BzrCommandError(
3029
"please specify either --message or --file")
3031
my_message = codecs.open(file, 'rt',
3032
osutils.get_user_encoding()).read()
3193
3033
if my_message == "":
3194
3034
raise errors.BzrCommandError("empty commit message specified")
3195
3035
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
3038
tree.commit(message_callback=get_message,
3203
3039
specific_files=selected_list,
3204
3040
allow_pointless=unchanged, strict=strict, local=local,
3205
3041
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3208
3043
exclude=safe_relpath_files(tree, exclude))
3209
3044
except PointlessCommit:
3045
# FIXME: This should really happen before the file is read in;
3046
# perhaps prepare the commit; get the message; then actually commit
3210
3047
raise errors.BzrCommandError("No changes to commit."
3211
3048
" Use --unchanged to commit anyhow.")
3212
3049
except ConflictsInTree:
3624
3450
verbose = not is_quiet()
3625
3451
# TODO: should possibly lock the history file...
3626
3452
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
3454
test_suite_factory = None
3630
3455
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)
3457
selftest_kwargs = {"verbose": verbose,
3459
"stop_on_failure": one,
3460
"transport": transport,
3461
"test_suite_factory": test_suite_factory,
3462
"lsprof_timed": lsprof_timed,
3463
"bench_history": benchfile,
3464
"matching_tests_first": first,
3465
"list_only": list_only,
3466
"random_seed": randomize,
3467
"exclude_pattern": exclude,
3469
"load_list": load_list,
3470
"debug_flags": debugflag,
3471
"starting_with": starting_with
3473
selftest_kwargs.update(self.additional_selftest_args)
3474
result = selftest(**selftest_kwargs)
3476
if benchfile is not None:
3650
3478
return int(not result)
3653
3481
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3482
"""Show version of bzr."""
3656
3484
encoding_type = 'replace'
3657
3485
takes_options = [
3822
3635
verified = 'inapplicable'
3823
3636
tree = WorkingTree.open_containing(directory)[0]
3638
# die as quickly as possible if there are uncommitted changes
3826
3640
basis_tree = tree.revision_tree(tree.last_revision())
3827
3641
except errors.NoSuchRevision:
3828
3642
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3644
changes = tree.changes_from(basis_tree)
3645
if changes.has_changed():
3833
3646
raise errors.UncommittedChanges(tree)
3835
3648
view_info = _get_view_info_for_change_reporter(tree)
3836
3649
change_reporter = delta._ChangeReporter(
3837
3650
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:
3653
pb = ui.ui_factory.nested_progress_bar()
3654
cleanups.append(pb.finished)
3656
cleanups.append(tree.unlock)
3657
if location is not None:
3659
mergeable = bundle.read_mergeable_from_url(location,
3660
possible_transports=possible_transports)
3661
except errors.NotABundle:
3665
raise errors.BzrCommandError('Cannot use --uncommitted'
3666
' with bundles or merge directives.')
3668
if revision is not None:
3669
raise errors.BzrCommandError(
3670
'Cannot use -r with merge directives or bundles')
3671
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3674
if merger is None and uncommitted:
3675
if revision is not None and len(revision) > 0:
3676
raise errors.BzrCommandError('Cannot use --uncommitted and'
3677
' --revision at the same time.')
3678
merger = self.get_merger_from_uncommitted(tree, location, pb,
3680
allow_pending = False
3683
merger, allow_pending = self._get_merger_from_branch(tree,
3684
location, revision, remember, possible_transports, pb)
3686
merger.merge_type = merge_type
3687
merger.reprocess = reprocess
3688
merger.show_base = show_base
3689
self.sanity_check_merger(merger)
3690
if (merger.base_rev_id == merger.other_rev_id and
3691
merger.other_rev_id is not None):
3692
note('Nothing to do.')
3695
if merger.interesting_files is not None:
3696
raise errors.BzrCommandError('Cannot pull individual files')
3697
if (merger.base_rev_id == tree.last_revision()):
3698
result = tree.pull(merger.other_branch, False,
3699
merger.other_rev_id)
3700
result.report(self.outf)
3702
merger.check_basis(False)
3704
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):
3706
return self._do_merge(merger, change_reporter, allow_pending,
3709
for cleanup in reversed(cleanups):
3712
def _do_preview(self, merger):
3713
from bzrlib.diff import show_diff_trees
3899
3714
tree_merger = merger.make_merger()
3900
3715
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='')
3717
result_tree = tt.get_preview_tree()
3718
show_diff_trees(merger.this_tree, result_tree, self.outf,
3719
old_label='', new_label='')
3911
3723
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3724
merger.change_reporter = change_reporter
4097
3893
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3894
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3895
if merge_type is None:
4101
3896
merge_type = _mod_merge.Merge3Merger
4102
3897
tree, file_list = tree_files(file_list)
4103
3898
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":
3900
parents = tree.get_parent_ids()
3901
if len(parents) != 2:
3902
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3903
" merges. Not cherrypicking or"
3905
repository = tree.branch.repository
3906
interesting_ids = None
3908
conflicts = tree.conflicts()
3909
if file_list is not None:
3910
interesting_ids = set()
3911
for filename in file_list:
3912
file_id = tree.path2id(filename)
3914
raise errors.NotVersionedError(filename)
3915
interesting_ids.add(file_id)
3916
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:
3919
for name, ie in tree.inventory.iter_entries(file_id):
3920
interesting_ids.add(ie.file_id)
3921
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3923
# Remerge only supports resolving contents conflicts
3924
allowed_conflicts = ('text conflict', 'contents conflict')
3925
restore_files = [c.path for c in conflicts
3926
if c.typestring in allowed_conflicts]
3927
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3928
tree.set_conflicts(ConflictList(new_conflicts))
3929
if file_list is not None:
3930
restore_files = file_list
3931
for filename in restore_files:
3933
restore(tree.abspath(filename))
3934
except errors.NotConflicted:
3936
# Disable pending merges, because the file texts we are remerging
3937
# have not had those merges performed. If we use the wrong parents
3938
# list, we imply that the working tree text has seen and rejected
3939
# all the changes from the other tree, when in fact those changes
3940
# have not yet been seen.
3941
pb = ui.ui_factory.nested_progress_bar()
3942
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()
3944
merger = _mod_merge.Merger.from_revision_ids(pb,
3946
merger.interesting_ids = interesting_ids
3947
merger.merge_type = merge_type
3948
merger.show_base = show_base
3949
merger.reprocess = reprocess
3950
conflicts = merger.do_merge()
3952
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3956
if conflicts > 0:
4180
3980
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
3983
Any files that have been newly added since that revision will be deleted,
3984
with a backup kept if appropriate. Directories containing unknown files
3985
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
3987
The working tree contains a list of pending merged revisions, which will
3988
be included as parents in the next commit. Normally, revert clears that
3989
list as well as reverting the files. If any files are specified, revert
3990
leaves the pending merge list alone and reverts only the files. Use "bzr
3991
revert ." in the tree root to revert all files but keep the merge record,
3992
and "bzr revert --forget-merges" to clear the pending merge list without
4195
3993
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
3996
_see_also = ['cat', 'export']
4217
4005
def run(self, revision=None, no_backup=False, file_list=None,
4218
4006
forget_merges=None):
4219
4007
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)
4011
tree.set_parent_ids(tree.get_parent_ids()[:1])
4013
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4228
4018
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4019
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)
4020
pb = ui.ui_factory.nested_progress_bar()
4022
tree.revert(file_list, rev_tree, not no_backup, pb,
4023
report_changes=True)
4234
4028
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4029
"""Test reporting of assertion failures"""
4236
4030
# intended just for use in testing
4389
4173
_get_revision_range(revision,
4390
4174
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")
4176
local_branch.lock_read()
4178
remote_branch.lock_read()
4180
local_extra, remote_extra = find_unmerged(
4181
local_branch, remote_branch, restrict,
4182
backward=not reverse,
4183
include_merges=include_merges,
4184
local_revid_range=local_revid_range,
4185
remote_revid_range=remote_revid_range)
4187
if log_format is None:
4188
registry = log.log_formatter_registry
4189
log_format = registry.get_default(local_branch)
4190
lf = log_format(to_file=self.outf,
4192
show_timezone='original')
4195
if local_extra and not theirs_only:
4196
message("You have %d extra revision(s):\n" %
4198
for revision in iter_log_revisions(local_extra,
4199
local_branch.repository,
4201
lf.log_revision(revision)
4202
printed_local = True
4205
printed_local = False
4207
if remote_extra and not mine_only:
4208
if printed_local is True:
4210
message("You are missing %d revision(s):\n" %
4212
for revision in iter_log_revisions(remote_extra,
4213
remote_branch.repository,
4215
lf.log_revision(revision)
4218
if mine_only and not local_extra:
4219
# We checked local, and found nothing extra
4220
message('This branch is up to date.\n')
4221
elif theirs_only and not remote_extra:
4222
# We checked remote, and found nothing extra
4223
message('Other branch is up to date.\n')
4224
elif not (mine_only or theirs_only or local_extra or
4226
# We checked both branches, and neither one had extra
4228
message("Branches are up to date.\n")
4230
remote_branch.unlock()
4232
local_branch.unlock()
4442
4233
if not status_code and parent is None and other_branch is not None:
4443
4234
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)
4236
# handle race conditions - a parent might be set while we run.
4237
if local_branch.get_parent() is None:
4238
local_branch.set_parent(remote_branch.base)
4240
local_branch.unlock()
4448
4241
return status_code
4451
4244
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.
4245
"""Compress the data within a repository."""
4470
4247
_see_also = ['repositories']
4471
4248
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):
4250
def run(self, branch_or_repo='.'):
4477
4251
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4253
branch = dir.open_branch()
4480
4254
repository = branch.repository
4481
4255
except errors.NotBranchError:
4482
4256
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4260
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4261
"""List the installed plugins.
4489
4263
This command displays the list of installed plugins including
4490
4264
version of plugin and a short description of each.
4589
4365
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4366
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4594
4369
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,
4371
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4373
file_id = wt.path2id(relpath)
4375
file_id = tree.path2id(relpath)
4377
raise errors.NotVersionedError(filename)
4378
file_version = tree.inventory[file_id].revision
4379
if wt is not None and revision is None:
4380
# If there is a tree and we're not annotating historical
4381
# versions, annotate the working tree's content.
4382
annotate_file_tree(wt, file_id, self.outf, long, all,
4385
annotate_file(branch, file_version, file_id, long, all, self.outf,
4616
4394
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4395
"""Create a digital signature for an existing revision."""
4618
4396
# TODO be able to replace existing ones.
4620
4398
hidden = True # is this right ?
4827
4608
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4611
print 'Dry-run, pretending to remove the above revisions.'
4613
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')
4615
print 'The above revision(s) will be removed.'
4617
val = raw_input('Are you sure [y/N]? ')
4618
if val.lower() not in ('y', 'yes'):
4840
4622
mutter('Uncommitting from {%s} to {%s}',
4841
4623
last_rev_id, rev_id)
4842
4624
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4625
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)
4626
note('You can restore the old tip by running:\n'
4627
' bzr pull . -r revid:%s', last_rev_id)
4848
4630
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4631
"""Break a dead lock on a repository, branch or working directory.
4851
4633
CAUTION: Locks should only be broken when you are sure that the process
4852
4634
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4636
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
4641
takes_args = ['location?']
5134
4910
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.
4913
If --no-bundle is specified, then public_branch is needed (and must be
4914
up-to-date), so that the receiver can perform the merge using the
4915
public_branch. The public_branch is always included if known, so that
4916
people can check it later.
4918
The submit branch defaults to the parent, but can be overridden. Both
4919
submit branch and public branch will be remembered if supplied.
4921
If a public_branch is known for the submit_branch, that public submit
4922
branch is used in the merge instructions. This means that a local mirror
4923
can be used as your actual submit branch, once you have set public_branch
5164
4926
Mail is sent using your preferred mail program. This should be transparent
5165
4927
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5359
5111
branch, relpath = Branch.open_containing(directory)
5360
5112
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)
5115
branch.tags.delete_tag(tag_name)
5116
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)
5119
if len(revision) != 1:
5120
raise errors.BzrCommandError(
5121
"Tags can only be placed on a single revision, "
5123
revision_id = revision[0].as_revision_id(branch)
5125
revision_id = branch.last_revision()
5126
if (not force) and branch.tags.has_tag(tag_name):
5127
raise errors.TagAlreadyExists(tag_name)
5128
branch.tags.set_tag(tag_name, revision_id)
5129
self.outf.write('Created tag %s.\n' % tag_name)
5387
5134
class cmd_tags(Command):
5388
__doc__ = """List tags.
5390
5137
This command shows a table of tag names and the revisions they reference.
5422
5169
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)
5172
graph = branch.repository.get_graph()
5173
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5174
revid1, revid2 = rev1.rev_id, rev2.rev_id
5175
# only show revisions between revid1 and revid2 (inclusive)
5176
tags = [(tag, revid) for tag, revid in tags if
5177
graph.is_between(revid, revid1, revid2)]
5180
elif sort == 'time':
5182
for tag, revid in tags:
5184
revobj = branch.repository.get_revision(revid)
5185
except errors.NoSuchRevision:
5186
timestamp = sys.maxint # place them at the end
5188
timestamp = revobj.timestamp
5189
timestamps[revid] = timestamp
5190
tags.sort(key=lambda x: timestamps[x[1]])
5192
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5193
for index, (tag, revid) in enumerate(tags):
5195
revno = branch.revision_id_to_dotted_revno(revid)
5196
if isinstance(revno, tuple):
5197
revno = '.'.join(map(str, revno))
5198
except errors.NoSuchRevision:
5199
# Bad tag data/merges can lead to tagged revisions
5200
# which are not in this branch. Fail gracefully ...
5202
tags[index] = (tag, revno)
5457
5205
for tag, revspec in tags:
5458
5206
self.outf.write('%-20s %s\n' % (tag, revspec))
5461
5209
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5210
"""Reconfigure the type of a bzr directory.
5464
5212
A target configuration must be specified.
5496
5244
Option('bind-to', help='Branch to bind checkout to.', type=str),
5497
5245
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.',
5246
help='Perform reconfiguration even if local changes'
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5250
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
5251
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
5252
if target_type is None:
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5253
raise errors.BzrCommandError('No target configuration specified')
5529
5254
elif target_type == 'branch':
5530
5255
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
5256
elif target_type == 'tree':
5568
5293
/path/to/newbranch.
5570
5295
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
5296
locally, in which case switching will update the the local nickname to be
5572
5297
that of the master.
5575
takes_args = ['to_location?']
5300
takes_args = ['to_location']
5576
5301
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.'),
5302
help='Switch even if local commits will be lost.')
5584
def run(self, to_location=None, force=False, create_branch=False,
5305
def run(self, to_location, force=False):
5586
5306
from bzrlib import switch
5587
5307
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5308
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
5310
branch = control_dir.open_branch()
5597
5311
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
5312
except errors.NotBranchError:
5600
5313
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)
5315
to_branch = Branch.open(to_location)
5316
except errors.NotBranchError:
5317
this_url = self._get_branch_location(control_dir)
5318
to_branch = Branch.open(
5319
urlutils.join(this_url, '..', to_location))
5320
switch.switch(control_dir, to_branch, force)
5624
5321
if had_explicit_nick:
5625
5322
branch = control_dir.open_branch() #get the new branch!
5626
5323
branch.nick = to_branch.nick
5893
5565
if writer is None:
5894
5566
writer = bzrlib.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5568
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5569
message, destroy=destroy).run()
5902
5570
except errors.UserAbort:
5905
5573
def run_for_list(self):
5906
5574
tree = WorkingTree.open_containing('.')[0]
5907
5575
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))
5577
manager = tree.get_shelf_manager()
5578
shelves = manager.active_shelves()
5579
if len(shelves) == 0:
5580
note('No shelved changes.')
5582
for shelf_id in reversed(shelves):
5583
message = manager.get_metadata(shelf_id).get('message')
5585
message = '<no message>'
5586
self.outf.write('%3d: %s\n' % (shelf_id, message))
5922
5592
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5593
"""Restore shelved changes.
5925
5595
By default, the most recently shelved changes are restored. However if you
5926
5596
specify a shelf by id those changes will be restored instead. This works
5934
5604
enum_switch=False, value_switches=True,
5935
5605
apply="Apply changes and remove from the shelf.",
5936
5606
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.",
5607
delete_only="Delete changes without applying them."
5943
5610
_see_also = ['shelve']
5945
5612
def run(self, shelf_id=None, action='apply'):
5946
5613
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5951
unshelver.tree.unlock()
5614
Unshelver.from_args(shelf_id, action).run()
5954
5617
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5618
"""Remove unwanted files from working tree.
5957
5620
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5621
files are never deleted.
6032
5695
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)
5698
# these get imported and then picked up by the scan for cmd_*
5699
# TODO: Some more consistent way to split command definitions across files;
5700
# we do need to load at least some information about them to know of
5701
# aliases. ideally we would avoid loading the implementation until the
5702
# details were needed.
5703
from bzrlib.cmd_version_info import cmd_version_info
5704
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5705
from bzrlib.bundle.commands import (
5708
from bzrlib.foreign import cmd_dpush
5709
from bzrlib.sign_my_commits import cmd_sign_my_commits
5710
from bzrlib.weave_commands import cmd_versionedfile_list, \
5711
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
