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.
569
530
wt = WorkingTree.open_containing(directory)[0]
571
self.add_cleanup(wt.lock_read().unlock)
572
533
except (errors.NoWorkingTree, errors.NotLocalUrl):
574
535
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
577
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
579
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
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])
590
revision_ids.append(b.last_revision())
594
for revision_id in revision_ids:
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
598
except errors.NoSuchRevision:
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
604
570
for ri in revinfos:
605
571
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
608
574
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
575
"""Add specified files or directories.
611
577
In non-recursive mode, all the named items are added, regardless
612
578
of whether they were previously ignored. A warning is given if
677
640
should_print=(not is_quiet()))
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
643
base_tree.lock_read()
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:
685
652
if len(ignored) > 0:
687
654
for glob in sorted(ignored.keys()):
688
655
for path in ignored[glob]:
689
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")
693
668
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
669
"""Create a new versioned directory.
696
671
This is equivalent to creating the directory and then adding it.
756
726
revision = _get_one_revision('inventory', revision)
757
727
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
776
entries = tree.inventory.entries()
728
work_tree.lock_read()
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:
779
753
for path, entry in entries:
780
754
if kind and kind != entry.kind:
917
896
dest = osutils.pathjoin(dest_parent, dest_tail)
918
897
mutter("attempting to move %s => %s", src, dest)
919
898
tree.rename_one(src, dest, after=after)
921
self.outf.write("%s => %s\n" % (src, dest))
899
self.outf.write("%s => %s\n" % (src, dest))
924
902
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
903
"""Turn this branch into a mirror of another branch.
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
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.
932
909
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
910
from one into the other. Once one branch has merged, the other should
934
911
be able to pull it again.
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
913
If you want to forget your local changes and just update your branch to
914
match the remote one, use pull --overwrite.
940
916
If there is no default location set, the first pull will set it. After
941
917
that, you can omit the location to use the default. To change the
1019
993
branch_from = Branch.open(location,
1020
994
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1023
996
if branch_to.get_parent() is None or remember:
1024
997
branch_to.set_parent(branch_from.base)
1026
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
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()
1048
1031
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1032
"""Update a mirror of this branch.
1051
1034
The target branch will not have its working tree populated because this
1052
1035
is both expensive, and is not supported on remote file systems.
1113
1096
# Get the source branch
1114
1097
(tree, br_from,
1115
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()]
1116
1110
# Get the tip's revision_id
1117
1111
revision = _get_one_revision('push', revision)
1118
1112
if revision is not None:
1119
1113
revision_id = revision.in_history(br_from).rev_id
1121
1115
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
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.')
1127
1129
# Get the stacked_on branch, if any
1128
1130
if stacked_on is not None:
1129
1131
stacked_on = urlutils.normalize_url(stacked_on)
1194
1193
' directory exists, but does not already'
1195
1194
' have a control directory. This flag will'
1196
1195
' allow branch to proceed.'),
1198
help="Bind new branch to from location."),
1200
1197
aliases = ['get', 'clone']
1202
1199
def run(self, from_location, to_location=None, revision=None,
1203
1200
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1201
use_existing_dir=False):
1206
1202
from bzrlib.tag import _merge_tags_if_possible
1207
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
1209
1209
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
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)
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
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())
1275
1267
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1268
"""Create a new checkout of an existing branch.
1278
1270
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1271
the branch found in '.'. This is useful if you have removed the working tree
1353
1345
@display_command
1354
1346
def run(self, dir=u'.'):
1355
1347
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1368
renames.append(paths)
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
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))
1374
1372
class cmd_update(Command):
1375
__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.
1377
1375
This will perform a merge into the working tree, and may generate
1378
1376
conflicts. If you have any local changes, you will still
1381
1379
If you want to discard your local changes, you can just do a
1382
1380
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1388
1383
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1384
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1385
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1387
def run(self, dir='.'):
1397
1388
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1389
possible_transports = []
1400
master = branch.get_master_branch(
1390
master = tree.branch.get_master_branch(
1401
1391
possible_transports=possible_transports)
1402
1392
if master is not None:
1403
branch_location = master.base
1404
1393
tree.lock_write()
1406
branch_location = tree.branch.base
1407
1395
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
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)
1435
1408
conflicts = tree.update(
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
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'.")
1460
1425
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1426
"""Show information about a working tree, branch or repository.
1463
1428
This command will show all known locations and formats associated to the
1464
1429
tree, branch or repository.
1530
1495
if file_list is not None:
1531
1496
file_list = [f for f in file_list]
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
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')
1557
1525
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1526
"""Print file_id of a particular file or directory.
1560
1528
The file_id is assigned when the file is first added and remains the
1561
1529
same through all revisions where the file exists, even when it is
1779
1747
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1748
"""Create a shared repository to hold branches.
1782
1750
New branches created under the repository directory will store their
1783
revisions in the repository, not in the branch directory. For branches
1784
with shared history, this reduces the amount of storage needed and
1785
speeds up the creation of new branches.
1751
revisions in the repository, not in the branch directory.
1787
If the --no-trees option is given then the branches in the repository
1788
will not have working trees by default. They will still exist as
1789
directories on disk, but they will not have separate copies of the
1790
files at a certain revision. This can be useful for repositories that
1791
store branches which are interacted with through checkouts or remote
1792
branches, such as on a server.
1753
If the --no-trees option is used then the branches in the repository
1754
will not have working trees by default.
1795
Create a shared repository holding just branches::
1757
Create a shared repositories holding just branches::
1797
1759
bzr init-repo --no-trees repo
1798
1760
bzr init repo/trunk
1961
1904
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1905
' one or two revision specifiers')
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1968
(old_tree, new_tree,
1969
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1907
old_tree, new_tree, specific_files, extra_trees = \
1908
_get_trees_to_diff(file_list, revision, old, new,
1972
1910
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1911
specific_files=specific_files,
1974
1912
external_diff_options=diff_options,
1975
1913
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1914
extra_trees=extra_trees, using=using)
1980
1917
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1918
"""List files deleted in the working tree.
1983
1920
# TODO: Show files deleted since a previous revision, or
1984
1921
# between two revisions.
2373
2314
diff_type = 'full'
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2385
show_advice=levels is None)
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2413
Logger(b, rqst).show(lf)
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)
2416
2356
def _get_revision_range(revisionspec_list, branch, command_name):
2561
2495
view_str = views.view_display_str(view_files)
2562
2496
note("Ignoring files outside view. View is %s" % view_str)
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2570
if kind is not None and fkind != kind:
2575
fullpath = osutils.pathjoin(relpath, fp)
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
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:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2594
self.outf.write(fp + '\0')
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
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)
2608
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')
2611
2548
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2549
"""List unknown files.
2624
2561
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2562
"""Ignore specified files or patterns.
2627
2564
See ``bzr help patterns`` for details on the syntax of patterns.
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2635
2566
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2567
After adding, editing or deleting that file either indirectly by
2637
2568
using this command or directly by using an editor, be sure to commit
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2653
2571
Note: ignore patterns containing shell wildcards must be quoted from
2654
2572
the shell on Unix.
2677
2591
Ignore everything but the "debian" toplevel directory::
2679
2593
bzr ignore "RE:(?!debian/).*"
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2685
bzr ignore "!./local"
2689
2596
_see_also = ['status', 'ignored', 'patterns']
2690
2597
takes_args = ['name_pattern*']
2691
2598
takes_options = [
2692
Option('default-rules',
2693
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.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2603
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2604
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2605
if old_default_rules is not None:
2606
# dump the rules and exit
2607
for pattern in ignores.OLD_DEFAULTS:
2703
2610
if not name_pattern_list:
2704
2611
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2612
"NAME_PATTERN or --old-default-rules")
2706
2613
name_pattern_list = [globbing.normalize_pattern(p)
2707
2614
for p in name_pattern_list]
2708
2615
for name_pattern in name_pattern_list:
2865
2770
" one revision specifier")
2866
2771
tree, branch, relpath = \
2867
2772
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2775
return self._run(tree, branch, relpath, filename, revision,
2776
name_from_revision, filters)
2872
2780
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2874
2782
if tree is None:
2875
2783
tree = b.basis_tree()
2876
2784
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2879
2786
old_file_id = rev_tree.path2id(relpath)
3118
3012
if local and not tree.branch.get_bound_location():
3119
3013
raise errors.LocalRequiresBoundBranch()
3121
if message is not None:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3134
ui.ui_factory.show_warning(warning_msg)
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3142
3015
def get_message(commit_obj):
3143
3016
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
3017
my_message = message
3018
if my_message is None and not file:
3019
t = make_commit_message_template_encoded(tree,
3153
3020
selected_list, diff=show_diff,
3154
3021
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3160
3022
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3023
my_message = edit_commit_message_encoded(t,
3162
3024
start_message=start_message)
3163
3025
if my_message is None:
3164
3026
raise errors.BzrCommandError("please specify a commit"
3165
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()
3166
3034
if my_message == "":
3167
3035
raise errors.BzrCommandError("empty commit message specified")
3168
3036
return my_message
3170
# The API permits a commit with a filter of [] to mean 'select nothing'
3171
# but the command line should not do that.
3172
if not selected_list:
3173
selected_list = None
3175
3039
tree.commit(message_callback=get_message,
3176
3040
specific_files=selected_list,
3177
3041
allow_pointless=unchanged, strict=strict, local=local,
3178
3042
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3181
3044
exclude=safe_relpath_files(tree, exclude))
3182
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
3183
3048
raise errors.BzrCommandError("No changes to commit."
3184
3049
" Use --unchanged to commit anyhow.")
3185
3050
except ConflictsInTree:
3597
3451
verbose = not is_quiet()
3598
3452
# TODO: should possibly lock the history file...
3599
3453
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
3455
test_suite_factory = None
3603
3456
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
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:
3623
3479
return int(not result)
3626
3482
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3483
"""Show version of bzr."""
3629
3485
encoding_type = 'replace'
3630
3486
takes_options = [
3793
3636
verified = 'inapplicable'
3794
3637
tree = WorkingTree.open_containing(directory)[0]
3639
# die as quickly as possible if there are uncommitted changes
3797
3641
basis_tree = tree.revision_tree(tree.last_revision())
3798
3642
except errors.NoSuchRevision:
3799
3643
basis_tree = tree.basis_tree()
3801
# die as quickly as possible if there are uncommitted changes
3803
if tree.has_changes():
3645
changes = tree.changes_from(basis_tree)
3646
if changes.has_changed():
3804
3647
raise errors.UncommittedChanges(tree)
3806
3649
view_info = _get_view_info_for_change_reporter(tree)
3807
3650
change_reporter = delta._ChangeReporter(
3808
3651
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
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)
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3861
return self._do_preview(merger)
3863
return self._do_interactive(merger)
3865
return self._do_merge(merger, change_reporter, allow_pending,
3868
def _get_preview(self, merger):
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
3869
3715
tree_merger = merger.make_merger()
3870
3716
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3872
result_tree = tt.get_preview_tree()
3875
def _do_preview(self, merger):
3876
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3878
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
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='')
3881
3724
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3725
merger.change_reporter = change_reporter
4067
3894
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3895
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3896
if merge_type is None:
4071
3897
merge_type = _mod_merge.Merge3Merger
4072
3898
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4079
repository = tree.branch.repository
4080
interesting_ids = None
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
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":
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
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])
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
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)
4124
tree.set_parent_ids(parents)
4125
3957
if conflicts > 0:
4149
3981
name. If you name a directory, all the contents of that directory will be
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
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.
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
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
4164
3994
reverting any files.
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4177
3997
_see_also = ['cat', 'export']
4186
4006
def run(self, revision=None, no_backup=False, file_list=None,
4187
4007
forget_merges=None):
4188
4008
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4012
tree.set_parent_ids(tree.get_parent_ids()[:1])
4014
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4196
4019
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
4020
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
4021
pb = ui.ui_factory.nested_progress_bar()
4023
tree.revert(file_list, rev_tree, not no_backup, pb,
4024
report_changes=True)
4202
4029
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4030
"""Test reporting of assertion failures"""
4204
4031
# intended just for use in testing
4355
4174
_get_revision_range(revision,
4356
4175
remote_branch, self.name()))
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4370
show_timezone='original')
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4379
lf.log_revision(revision)
4380
printed_local = True
4383
printed_local = False
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4388
message("You are missing %d revision(s):\n" %
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4393
lf.log_revision(revision)
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4404
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
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()
4408
4234
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4235
local_branch.lock_write()
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()
4413
4242
return status_code
4416
4245
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4246
"""Compress the data within a repository."""
4435
4248
_see_also = ['repositories']
4436
4249
takes_args = ['branch_or_repo?']
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4251
def run(self, branch_or_repo='.'):
4442
4252
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
4254
branch = dir.open_branch()
4445
4255
repository = branch.repository
4446
4256
except errors.NotBranchError:
4447
4257
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
4261
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4262
"""List the installed plugins.
4454
4264
This command displays the list of installed plugins including
4455
4265
version of plugin and a short description of each.
4552
4365
wt, branch, relpath = \
4553
4366
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4367
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4561
file_id = wt.path2id(relpath)
4563
file_id = tree.path2id(relpath)
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
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,
4577
4395
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4396
"""Create a digital signature for an existing revision."""
4579
4397
# TODO be able to replace existing ones.
4581
4399
hidden = True # is this right ?
4785
4609
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4612
print 'Dry-run, pretending to remove the above revisions.'
4614
val = raw_input('Press <enter> to continue')
4791
self.outf.write('The above revision(s) will be removed.\n')
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
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'):
4798
4623
mutter('Uncommitting from {%s} to {%s}',
4799
4624
last_rev_id, rev_id)
4800
4625
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4626
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4627
note('You can restore the old tip by running:\n'
4628
' bzr pull . -r revid:%s', last_rev_id)
4806
4631
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4632
"""Break a dead lock on a repository, branch or working directory.
4809
4634
CAUTION: Locks should only be broken when you are sure that the process
4810
4635
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4637
You can get information on what locks are open via the 'bzr info' command.
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4819
4642
takes_args = ['location?']
5092
4911
directly from the merge directive, without retrieving data from a
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
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
5122
4927
Mail is sent using your preferred mail program. This should be transparent
5123
4928
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5311
def run(self, tag_name=None,
5106
def run(self, tag_name,
5317
5112
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5330
revision_id = revision[0].as_revision_id(branch)
5116
branch.tags.delete_tag(tag_name)
5117
self.outf.write('Deleted tag %s.\n' % tag_name)
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
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)
5344
5135
class cmd_tags(Command):
5345
__doc__ = """List tags.
5347
5138
This command shows a table of tag names and the revisions they reference.
5379
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5411
tags[index] = (tag, revno)
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)
5413
5206
for tag, revspec in tags:
5414
5207
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5210
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5211
"""Reconfigure the type of a bzr directory.
5420
5213
A target configuration must be specified.
5452
5245
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5246
Option('force',
5454
help='Perform reconfiguration even if local changes'
5456
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
5247
help='Perform reconfiguration even if local changes'
5466
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):
5469
5252
directory = bzrdir.BzrDir.open(location)
5470
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5472
elif stacked_on is not None:
5473
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5475
reconfigure.ReconfigureUnstacked().apply(directory)
5476
# At the moment you can use --stacked-on and a different
5477
# reconfiguration shape at the same time; there seems no good reason
5479
5253
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5254
raise errors.BzrCommandError('No target configuration specified')
5485
5255
elif target_type == 'branch':
5486
5256
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5257
elif target_type == 'tree':
5524
5294
/path/to/newbranch.
5526
5296
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5297
locally, in which case switching will update the the local nickname to be
5528
5298
that of the master.
5531
takes_args = ['to_location?']
5301
takes_args = ['to_location']
5532
5302
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
5535
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
5303
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5306
def run(self, to_location, force=False):
5542
5307
from bzrlib import switch
5543
5308
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5309
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5552
5311
branch = control_dir.open_branch()
5553
5312
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
5313
except errors.NotBranchError:
5556
5314
had_explicit_nick = False
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
5573
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
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)
5580
5322
if had_explicit_nick:
5581
5323
branch = control_dir.open_branch() #get the new branch!
5582
5324
branch.nick = to_branch.nick
5849
5566
if writer is None:
5850
5567
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5569
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5570
message, destroy=destroy).run()
5858
5571
except errors.UserAbort:
5861
5574
def run_for_list(self):
5862
5575
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
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))
5877
5593
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5594
"""Restore shelved changes.
5880
5596
By default, the most recently shelved changes are restored. However if you
5881
5597
specify a shelf by id those changes will be restored instead. This works
5889
5605
enum_switch=False, value_switches=True,
5890
5606
apply="Apply changes and remove from the shelf.",
5891
5607
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5608
delete_only="Delete changes without applying them."
5898
5611
_see_also = ['shelve']
5900
5613
def run(self, shelf_id=None, action='apply'):
5901
5614
from bzrlib.shelf_ui import Unshelver
5902
unshelver = Unshelver.from_args(shelf_id, action)
5906
unshelver.tree.unlock()
5615
Unshelver.from_args(shelf_id, action).run()
5909
5618
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5619
"""Remove unwanted files from working tree.
5912
5621
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5622
files are never deleted.
5987
5696
self.outf.write('%s %s\n' % (path, location))
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
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
