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.
520
475
_see_also = ['info']
521
476
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
547
self.outf.write(str(revno) + '\n')
479
def run(self, location=u'.'):
480
self.outf.write(str(Branch.open_containing(location)[0].revno()))
481
self.outf.write('\n')
550
484
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
554
488
takes_args = ['revision_info*']
563
Option('tree', help='Show revno of working tree'),
567
def run(self, revision=None, directory=u'.', tree=False,
568
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
571
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
581
503
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
583
505
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())
594
revision_ids.append(b.last_revision())
598
for revision_id in revision_ids:
506
for rev in revision_info_list:
507
revs.append(RevisionSpec.from_string(rev))
509
b = Branch.open_containing(directory)[0]
512
revs.append(RevisionSpec.from_string('-1'))
515
revision_id = rev.as_revision_id(b)
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
602
518
except errors.NoSuchRevision:
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
519
dotted_map = b.get_revision_id_to_revno_map()
520
revno = '.'.join(str(i) for i in dotted_map[revision_id])
521
print '%s %s' % (revno, revision_id)
612
524
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
615
527
In non-recursive mode, all the named items are added, regardless
616
528
of whether they were previously ignored. A warning is given if
684
593
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)
595
file_list = self._maybe_expand_globs(file_list)
596
tree, file_list = tree_files_for_add(file_list)
597
added, ignored = tree.smart_add(file_list, not
598
no_recurse, action=action, save=not dry_run)
600
if base_tree is not None:
690
602
if len(ignored) > 0:
692
604
for glob in sorted(ignored.keys()):
693
605
for path in ignored[glob]:
694
606
self.outf.write("ignored %s matching \"%s\"\n"
610
for glob, paths in ignored.items():
611
match_len += len(paths)
612
self.outf.write("ignored %d file(s).\n" % match_len)
613
self.outf.write("If you wish to add ignored files, "
614
"please add them explicitly by name. "
615
"(\"bzr ignored\" gives a list)\n")
698
618
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
619
"""Create a new versioned directory.
701
621
This is equivalent to creating the directory and then adding it.
761
676
revision = _get_one_revision('inventory', revision)
762
677
work_tree, file_list = tree_files(file_list)
763
678
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()
680
if revision is not None:
681
tree = revision.as_tree(work_tree.branch)
683
extra_trees = [work_tree]
689
if file_list is not None:
690
file_ids = tree.paths2ids(file_list, trees=extra_trees,
691
require_versioned=True)
692
# find_ids_across_trees may include some paths that don't
694
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
695
for file_id in file_ids if file_id in tree)
697
entries = tree.inventory.entries()
700
if tree is not work_tree:
786
703
for path, entry in entries:
787
704
if kind and kind != entry.kind:
926
846
dest = osutils.pathjoin(dest_parent, dest_tail)
927
847
mutter("attempting to move %s => %s", src, dest)
928
848
tree.rename_one(src, dest, after=after)
930
self.outf.write("%s => %s\n" % (src, dest))
849
self.outf.write("%s => %s\n" % (src, dest))
933
852
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
853
"""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
855
This command only works on branches that have not diverged. Branches are
856
considered diverged if the destination branch's most recent commit is one
857
that has not been merged (directly or indirectly) into the parent.
941
859
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
860
from one into the other. Once one branch has merged, the other should
943
861
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.
863
If you want to forget your local changes and just update your branch to
864
match the remote one, use pull --overwrite.
949
866
If there is no default location set, the first pull will set it. After
950
867
that, you can omit the location to use the default. To change the
1038
949
if revision is not None:
1039
950
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)
952
branch_to.lock_write()
954
if tree_to is not None:
955
view_info = _get_view_info_for_change_reporter(tree_to)
956
change_reporter = delta._ChangeReporter(
957
unversioned_filter=tree_to.is_ignored, view_info=view_info)
958
result = tree_to.pull(branch_from, overwrite, revision_id,
960
possible_transports=possible_transports,
963
result = branch_to.pull(branch_from, overwrite, revision_id,
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,
966
result.report(self.outf)
967
if verbose and result.old_revid != result.new_revid:
968
log.show_branch_change(branch_to, self.outf, result.old_revno,
1060
974
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
975
"""Update a mirror of this branch.
1063
977
The target branch will not have its working tree populated because this
1064
978
is both expensive, and is not supported on remote file systems.
1117
1028
def run(self, location=None, remember=False, overwrite=False,
1118
1029
create_prefix=False, verbose=False, revision=None,
1119
1030
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
1032
from bzrlib.push import _show_push_branch
1034
# Get the source branch and revision_id
1123
1035
if directory is None:
1124
1036
directory = '.'
1125
# Get the source branch
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1128
# Get the tip's revision_id
1037
br_from = Branch.open_containing(directory)[0]
1129
1038
revision = _get_one_revision('push', revision)
1130
1039
if revision is not None:
1131
1040
revision_id = revision.in_history(br_from).rev_id
1133
1042
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.')
1139
1044
# Get the stacked_on branch, if any
1140
1045
if stacked_on is not None:
1141
1046
stacked_on = urlutils.normalize_url(stacked_on)
1192
1097
help='Hard-link working tree files where possible.'),
1193
1098
Option('no-tree',
1194
1099
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1198
1100
Option('stacked',
1199
1101
help='Create a stacked branch referring to the source branch. '
1200
1102
'The new branch will depend on the availability of the source '
1201
1103
'branch for all operations.'),
1202
1104
Option('standalone',
1203
1105
help='Do not use a shared repository, even if available.'),
1204
Option('use-existing-dir',
1205
help='By default branch will fail if the target'
1206
' directory exists, but does not already'
1207
' have a control directory. This flag will'
1208
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
1107
aliases = ['get', 'clone']
1214
1109
def run(self, from_location, to_location=None, revision=None,
1215
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
1110
hardlink=False, stacked=False, standalone=False, no_tree=False):
1218
1111
from bzrlib.tag import _merge_tags_if_possible
1219
1113
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1221
1115
revision = _get_one_revision('branch', revision)
1222
1116
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)
1118
if revision is not None:
1119
revision_id = revision.as_revision_id(br_from)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
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'))
1121
# FIXME - wt.last_revision, fallback to branch, fall back to
1122
# None or perhaps NULL_REVISION to mean copy nothing
1124
revision_id = br_from.last_revision()
1125
if to_location is None:
1126
to_location = urlutils.derive_to_location(from_location)
1127
to_transport = transport.get_transport(to_location)
1129
to_transport.mkdir('.')
1130
except errors.FileExists:
1131
raise errors.BzrCommandError('Target directory "%s" already'
1132
' exists.' % to_location)
1133
except errors.NoSuchFile:
1134
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1137
# preserve whatever source format we have.
1138
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1139
possible_transports=[to_transport],
1140
accelerator_tree=accelerator_tree,
1141
hardlink=hardlink, stacked=stacked,
1142
force_new_repo=standalone,
1143
create_tree_if_local=not no_tree,
1144
source_branch=br_from)
1145
branch = dir.open_branch()
1146
except errors.NoSuchRevision:
1147
to_transport.delete_tree('.')
1148
msg = "The branch %s has no revision %s." % (from_location,
1150
raise errors.BzrCommandError(msg)
1151
_merge_tags_if_possible(br_from, branch)
1152
# If the source branch is stacked, the new branch may
1153
# be stacked whether we asked for that explicitly or not.
1154
# We therefore need a try/except here and not just 'if stacked:'
1156
note('Created new stacked branch referring to %s.' %
1157
branch.get_stacked_on_url())
1158
except (errors.NotStacked, errors.UnstackableBranchFormat,
1159
errors.UnstackableRepositoryFormat), e:
1160
note('Branched %d revision(s).' % branch.revno())
1288
1165
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1166
"""Create a new checkout of an existing branch.
1291
1168
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1169
the branch found in '.'. This is useful if you have removed the working tree
1367
1244
def run(self, dir=u'.'):
1368
1245
tree = WorkingTree.open_containing(dir)[0]
1369
1246
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))
1248
new_inv = tree.inventory
1249
old_tree = tree.basis_tree()
1250
old_tree.lock_read()
1252
old_inv = old_tree.inventory
1254
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1255
for f, paths, c, v, p, n, k, e in iterator:
1256
if paths[0] == paths[1]:
1260
renames.append(paths)
1262
for old_name, new_name in renames:
1263
self.outf.write("%s => %s\n" % (old_name, new_name))
1389
1270
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1271
"""Update a tree to have the latest code committed to its branch.
1392
1273
This will perform a merge into the working tree, and may generate
1393
1274
conflicts. If you have any local changes, you will still
1396
1277
If you want to discard your local changes, you can just do a
1397
1278
'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
1281
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1282
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1283
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")
1285
def run(self, dir='.'):
1412
1286
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1287
possible_transports = []
1415
master = branch.get_master_branch(
1288
master = tree.branch.get_master_branch(
1416
1289
possible_transports=possible_transports)
1417
1290
if master is not None:
1418
1291
tree.lock_write()
1419
branch_location = master.base
1421
1293
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)
1295
existing_pending_merges = tree.get_parent_ids()[1:]
1296
last_rev = _mod_revision.ensure_null(tree.last_revision())
1297
if last_rev == _mod_revision.ensure_null(
1298
tree.branch.last_revision()):
1299
# may be up to date, check master too.
1300
if master is None or last_rev == _mod_revision.ensure_null(
1301
master.last_revision()):
1302
revno = tree.branch.revision_id_to_revno(last_rev)
1303
note("Tree is up to date at revision %d." % (revno,))
1305
view_info = _get_view_info_for_change_reporter(tree)
1450
1306
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'.")
1307
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1308
view_info=view_info), possible_transports=possible_transports)
1309
revno = tree.branch.revision_id_to_revno(
1310
_mod_revision.ensure_null(tree.last_revision()))
1311
note('Updated to revision %d.' % (revno,))
1312
if tree.get_parent_ids()[1:] != existing_pending_merges:
1313
note('Your local commits will now show as pending merges with '
1314
"'bzr status', and can be committed with 'bzr commit'.")
1475
1323
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1324
"""Show information about a working tree, branch or repository.
1478
1326
This command will show all known locations and formats associated to the
1479
1327
tree, branch or repository.
1546
1394
file_list = [f for f in file_list]
1548
1396
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')
1398
# Heuristics should probably all move into tree.remove_smart or
1401
added = tree.changes_from(tree.basis_tree(),
1402
specific_files=file_list).added
1403
file_list = sorted([f[0] for f in added], reverse=True)
1404
if len(file_list) == 0:
1405
raise errors.BzrCommandError('No matching files.')
1406
elif file_list is None:
1407
# missing files show up in iter_changes(basis) as
1408
# versioned-with-no-kind.
1410
for change in tree.iter_changes(tree.basis_tree()):
1411
# Find paths in the working tree that have no kind:
1412
if change[1][1] is not None and change[6][1] is None:
1413
missing.append(change[1][1])
1414
file_list = sorted(missing, reverse=True)
1415
file_deletion_strategy = 'keep'
1416
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1417
keep_files=file_deletion_strategy=='keep',
1418
force=file_deletion_strategy=='force')
1573
1423
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1424
"""Print file_id of a particular file or directory.
1576
1426
The file_id is assigned when the file is first added and remains the
1577
1427
same through all revisions where the file exists, even when it is
1977
1802
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1803
' 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)
1805
old_tree, new_tree, specific_files, extra_trees = \
1806
_get_trees_to_diff(file_list, revision, old, new,
1988
1808
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1809
specific_files=specific_files,
1990
1810
external_diff_options=diff_options,
1991
1811
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1812
extra_trees=extra_trees, using=using)
1996
1815
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1816
"""List files deleted in the working tree.
1999
1818
# TODO: Show files deleted since a previous revision, or
2000
1819
# between two revisions.
2395
2212
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)
2216
# Build the log formatter
2217
if log_format is None:
2218
log_format = log.log_formatter_registry.get_default(b)
2219
lf = log_format(show_ids=show_ids, to_file=self.outf,
2220
show_timezone=timezone,
2221
delta_format=get_verbosity_level(),
2223
show_advice=levels is None)
2225
# Choose the algorithm for doing the logging. It's annoying
2226
# having multiple code paths like this but necessary until
2227
# the underlying repository format is faster at generating
2228
# deltas or can provide everything we need from the indices.
2229
# The default algorithm - match-using-deltas - works for
2230
# multiple files and directories and is faster for small
2231
# amounts of history (200 revisions say). However, it's too
2232
# slow for logging a single file in a repository with deep
2233
# history, i.e. > 10K revisions. In the spirit of "do no
2234
# evil when adding features", we continue to use the
2235
# original algorithm - per-file-graph - for the "single
2236
# file that isn't a directory without showing a delta" case.
2237
partial_history = revision and b.repository._format.supports_chks
2238
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2239
or delta_type or partial_history)
2241
# Build the LogRequest and execute it
2242
if len(file_ids) == 0:
2244
rqst = make_log_request_dict(
2245
direction=direction, specific_fileids=file_ids,
2246
start_revision=rev1, end_revision=rev2, limit=limit,
2247
message_search=message, delta_type=delta_type,
2248
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2249
Logger(b, rqst).show(lf)
2438
2254
def _get_revision_range(revisionspec_list, branch, command_name):
2585
2391
note("Ignoring files outside view. View is %s" % view_str)
2587
2393
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:
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))
2632
self.outf.write(outstring + '\n')
2395
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2396
if fp.startswith(relpath):
2397
rp = fp[len(relpath):]
2398
fp = osutils.pathjoin(prefix, rp)
2399
if not recursive and '/' in rp:
2401
if not all and not selection[fc]:
2403
if kind is not None and fkind != kind:
2407
views.check_path_in_view(tree, fp)
2408
except errors.FileOutsideView:
2410
kindch = entry.kind_character()
2411
outstring = fp + kindch
2413
outstring = '%-8s %s' % (fc, outstring)
2414
if show_ids and fid is not None:
2415
outstring = "%-50s %s" % (outstring, fid)
2416
self.outf.write(outstring + '\n')
2418
self.outf.write(fp + '\0')
2421
self.outf.write(fid)
2422
self.outf.write('\0')
2430
self.outf.write('%-50s %s\n' % (outstring, my_id))
2432
self.outf.write(outstring + '\n')
2635
2437
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2438
"""List unknown files.
2648
2450
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2451
"""Ignore specified files or patterns.
2651
2453
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
2455
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2456
After adding, editing or deleting that file either indirectly by
2661
2457
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
2460
Note: ignore patterns containing shell wildcards must be quoted from
2678
2461
the shell on Unix.
2701
2480
Ignore everything but the "debian" toplevel directory::
2703
2482
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
2485
_see_also = ['status', 'ignored', 'patterns']
2714
2486
takes_args = ['name_pattern*']
2715
2487
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2488
Option('old-default-rules',
2489
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2492
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2493
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)
2494
if old_default_rules is not None:
2495
# dump the rules and exit
2496
for pattern in ignores.OLD_DEFAULTS:
2727
2499
if not name_pattern_list:
2728
2500
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2501
"NAME_PATTERN or --old-default-rules")
2730
2502
name_pattern_list = [globbing.normalize_pattern(p)
2731
2503
for p in name_pattern_list]
2732
2504
for name_pattern in name_pattern_list:
3145
2901
if local and not tree.branch.get_bound_location():
3146
2902
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
2904
def get_message(commit_obj):
3170
2905
"""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,
2906
my_message = message
2907
if my_message is None and not file:
2908
t = make_commit_message_template_encoded(tree,
3180
2909
selected_list, diff=show_diff,
3181
2910
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
2911
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
2912
my_message = edit_commit_message_encoded(t,
3189
2913
start_message=start_message)
3190
2914
if my_message is None:
3191
2915
raise errors.BzrCommandError("please specify a commit"
3192
2916
" message with either --message or --file")
2917
elif my_message and file:
2918
raise errors.BzrCommandError(
2919
"please specify either --message or --file")
2921
my_message = codecs.open(file, 'rt',
2922
osutils.get_user_encoding()).read()
3193
2923
if my_message == "":
3194
2924
raise errors.BzrCommandError("empty commit message specified")
3195
2925
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
2928
tree.commit(message_callback=get_message,
3203
2929
specific_files=selected_list,
3204
2930
allow_pointless=unchanged, strict=strict, local=local,
3205
2931
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3208
2933
exclude=safe_relpath_files(tree, exclude))
3209
2934
except PointlessCommit:
2935
# FIXME: This should really happen before the file is read in;
2936
# perhaps prepare the commit; get the message; then actually commit
3210
2937
raise errors.BzrCommandError("No changes to commit."
3211
2938
" Use --unchanged to commit anyhow.")
3212
2939
except ConflictsInTree:
3233
2959
The working tree and branch checks will only give output if a problem is
3234
2960
detected. The output fields of the repository check are:
3237
This is just the number of revisions checked. It doesn't
3241
This is just the number of versionedfiles checked. It
3242
doesn't indicate a problem.
3244
unreferenced ancestors
3245
Texts that are ancestors of other texts, but
3246
are not properly referenced by the revision ancestry. This is a
3247
subtle problem that Bazaar can work around.
3250
This is the total number of unique file contents
3251
seen in the checked revisions. It does not indicate a problem.
3254
This is the total number of repeated texts seen
3255
in the checked revisions. Texts can be repeated when their file
3256
entries are modified, but the file contents are not. It does not
2962
revisions: This is just the number of revisions checked. It doesn't
2964
versionedfiles: This is just the number of versionedfiles checked. It
2965
doesn't indicate a problem.
2966
unreferenced ancestors: Texts that are ancestors of other texts, but
2967
are not properly referenced by the revision ancestry. This is a
2968
subtle problem that Bazaar can work around.
2969
unique file texts: This is the total number of unique file contents
2970
seen in the checked revisions. It does not indicate a problem.
2971
repeated file texts: This is the total number of repeated texts seen
2972
in the checked revisions. Texts can be repeated when their file
2973
entries are modified, but the file contents are not. It does not
3259
2976
If no restrictions are specified, all Bazaar data that is found at the given
3260
2977
location will be checked.
3624
3331
verbose = not is_quiet()
3625
3332
# TODO: should possibly lock the history file...
3626
3333
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
3335
test_suite_factory = None
3630
3336
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)
3338
selftest_kwargs = {"verbose": verbose,
3340
"stop_on_failure": one,
3341
"transport": transport,
3342
"test_suite_factory": test_suite_factory,
3343
"lsprof_timed": lsprof_timed,
3344
"bench_history": benchfile,
3345
"matching_tests_first": first,
3346
"list_only": list_only,
3347
"random_seed": randomize,
3348
"exclude_pattern": exclude,
3350
"load_list": load_list,
3351
"debug_flags": debugflag,
3352
"starting_with": starting_with
3354
selftest_kwargs.update(self.additional_selftest_args)
3355
result = selftest(**selftest_kwargs)
3357
if benchfile is not None:
3650
3359
return int(not result)
3653
3362
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3363
"""Show version of bzr."""
3656
3365
encoding_type = 'replace'
3657
3366
takes_options = [
3822
3516
verified = 'inapplicable'
3823
3517
tree = WorkingTree.open_containing(directory)[0]
3519
# die as quickly as possible if there are uncommitted changes
3826
3521
basis_tree = tree.revision_tree(tree.last_revision())
3827
3522
except errors.NoSuchRevision:
3828
3523
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3525
changes = tree.changes_from(basis_tree)
3526
if changes.has_changed():
3833
3527
raise errors.UncommittedChanges(tree)
3835
3529
view_info = _get_view_info_for_change_reporter(tree)
3836
3530
change_reporter = delta._ChangeReporter(
3837
3531
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:
3534
pb = ui.ui_factory.nested_progress_bar()
3535
cleanups.append(pb.finished)
3537
cleanups.append(tree.unlock)
3538
if location is not None:
3540
mergeable = bundle.read_mergeable_from_url(location,
3541
possible_transports=possible_transports)
3542
except errors.NotABundle:
3546
raise errors.BzrCommandError('Cannot use --uncommitted'
3547
' with bundles or merge directives.')
3549
if revision is not None:
3550
raise errors.BzrCommandError(
3551
'Cannot use -r with merge directives or bundles')
3552
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3555
if merger is None and uncommitted:
3556
if revision is not None and len(revision) > 0:
3557
raise errors.BzrCommandError('Cannot use --uncommitted and'
3558
' --revision at the same time.')
3559
location = self._select_branch_location(tree, location)[0]
3560
other_tree, other_path = WorkingTree.open_containing(location)
3561
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3563
allow_pending = False
3564
if other_path != '':
3565
merger.interesting_files = [other_path]
3568
merger, allow_pending = self._get_merger_from_branch(tree,
3569
location, revision, remember, possible_transports, pb)
3571
merger.merge_type = merge_type
3572
merger.reprocess = reprocess
3573
merger.show_base = show_base
3574
self.sanity_check_merger(merger)
3575
if (merger.base_rev_id == merger.other_rev_id and
3576
merger.other_rev_id is not None):
3577
note('Nothing to do.')
3580
if merger.interesting_files is not None:
3581
raise errors.BzrCommandError('Cannot pull individual files')
3582
if (merger.base_rev_id == tree.last_revision()):
3583
result = tree.pull(merger.other_branch, False,
3584
merger.other_rev_id)
3585
result.report(self.outf)
3587
merger.check_basis(False)
3589
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):
3591
return self._do_merge(merger, change_reporter, allow_pending,
3594
for cleanup in reversed(cleanups):
3597
def _do_preview(self, merger):
3598
from bzrlib.diff import show_diff_trees
3899
3599
tree_merger = merger.make_merger()
3900
3600
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='')
3602
result_tree = tt.get_preview_tree()
3603
show_diff_trees(merger.this_tree, result_tree, self.outf,
3604
old_label='', new_label='')
3911
3608
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3609
merger.change_reporter = change_reporter
4097
3762
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3763
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3764
if merge_type is None:
4101
3765
merge_type = _mod_merge.Merge3Merger
4102
3766
tree, file_list = tree_files(file_list)
4103
3767
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":
3769
parents = tree.get_parent_ids()
3770
if len(parents) != 2:
3771
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3772
" merges. Not cherrypicking or"
3774
repository = tree.branch.repository
3775
interesting_ids = None
3777
conflicts = tree.conflicts()
3778
if file_list is not None:
3779
interesting_ids = set()
3780
for filename in file_list:
3781
file_id = tree.path2id(filename)
3783
raise errors.NotVersionedError(filename)
3784
interesting_ids.add(file_id)
3785
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:
3788
for name, ie in tree.inventory.iter_entries(file_id):
3789
interesting_ids.add(ie.file_id)
3790
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3792
# Remerge only supports resolving contents conflicts
3793
allowed_conflicts = ('text conflict', 'contents conflict')
3794
restore_files = [c.path for c in conflicts
3795
if c.typestring in allowed_conflicts]
3796
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3797
tree.set_conflicts(ConflictList(new_conflicts))
3798
if file_list is not None:
3799
restore_files = file_list
3800
for filename in restore_files:
3802
restore(tree.abspath(filename))
3803
except errors.NotConflicted:
3805
# Disable pending merges, because the file texts we are remerging
3806
# have not had those merges performed. If we use the wrong parents
3807
# list, we imply that the working tree text has seen and rejected
3808
# all the changes from the other tree, when in fact those changes
3809
# have not yet been seen.
3810
pb = ui.ui_factory.nested_progress_bar()
3811
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()
3813
merger = _mod_merge.Merger.from_revision_ids(pb,
3815
merger.interesting_ids = interesting_ids
3816
merger.merge_type = merge_type
3817
merger.show_base = show_base
3818
merger.reprocess = reprocess
3819
conflicts = merger.do_merge()
3821
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3825
if conflicts > 0:
4180
3849
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
3852
Any files that have been newly added since that revision will be deleted,
3853
with a backup kept if appropriate. Directories containing unknown files
3854
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
3856
The working tree contains a list of pending merged revisions, which will
3857
be included as parents in the next commit. Normally, revert clears that
3858
list as well as reverting the files. If any files are specified, revert
3859
leaves the pending merge list alone and reverts only the files. Use "bzr
3860
revert ." in the tree root to revert all files but keep the merge record,
3861
and "bzr revert --forget-merges" to clear the pending merge list without
4195
3862
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
3865
_see_also = ['cat', 'export']
4217
3874
def run(self, revision=None, no_backup=False, file_list=None,
4218
3875
forget_merges=None):
4219
3876
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)
3880
tree.set_parent_ids(tree.get_parent_ids()[:1])
3882
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4228
3887
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
3888
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)
3889
pb = ui.ui_factory.nested_progress_bar()
3891
tree.revert(file_list, rev_tree, not no_backup, pb,
3892
report_changes=True)
4234
3897
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
3898
"""Test reporting of assertion failures"""
4236
3899
# intended just for use in testing
4389
4042
_get_revision_range(revision,
4390
4043
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")
4045
local_branch.lock_read()
4047
remote_branch.lock_read()
4049
local_extra, remote_extra = find_unmerged(
4050
local_branch, remote_branch, restrict,
4051
backward=not reverse,
4052
include_merges=include_merges,
4053
local_revid_range=local_revid_range,
4054
remote_revid_range=remote_revid_range)
4056
if log_format is None:
4057
registry = log.log_formatter_registry
4058
log_format = registry.get_default(local_branch)
4059
lf = log_format(to_file=self.outf,
4061
show_timezone='original')
4064
if local_extra and not theirs_only:
4065
message("You have %d extra revision(s):\n" %
4067
for revision in iter_log_revisions(local_extra,
4068
local_branch.repository,
4070
lf.log_revision(revision)
4071
printed_local = True
4074
printed_local = False
4076
if remote_extra and not mine_only:
4077
if printed_local is True:
4079
message("You are missing %d revision(s):\n" %
4081
for revision in iter_log_revisions(remote_extra,
4082
remote_branch.repository,
4084
lf.log_revision(revision)
4087
if mine_only and not local_extra:
4088
# We checked local, and found nothing extra
4089
message('This branch is up to date.\n')
4090
elif theirs_only and not remote_extra:
4091
# We checked remote, and found nothing extra
4092
message('Other branch is up to date.\n')
4093
elif not (mine_only or theirs_only or local_extra or
4095
# We checked both branches, and neither one had extra
4097
message("Branches are up to date.\n")
4099
remote_branch.unlock()
4101
local_branch.unlock()
4442
4102
if not status_code and parent is None and other_branch is not None:
4443
4103
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)
4105
# handle race conditions - a parent might be set while we run.
4106
if local_branch.get_parent() is None:
4107
local_branch.set_parent(remote_branch.base)
4109
local_branch.unlock()
4448
4110
return status_code
4451
4113
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.
4114
"""Compress the data within a repository."""
4470
4116
_see_also = ['repositories']
4471
4117
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):
4119
def run(self, branch_or_repo='.'):
4477
4120
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4122
branch = dir.open_branch()
4480
4123
repository = branch.repository
4481
4124
except errors.NotBranchError:
4482
4125
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4129
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4130
"""List the installed plugins.
4489
4132
This command displays the list of installed plugins including
4490
4133
version of plugin and a short description of each.
4589
4234
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4235
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4594
4238
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,
4240
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4242
file_id = wt.path2id(relpath)
4244
file_id = tree.path2id(relpath)
4246
raise errors.NotVersionedError(filename)
4247
file_version = tree.inventory[file_id].revision
4248
if wt is not None and revision is None:
4249
# If there is a tree and we're not annotating historical
4250
# versions, annotate the working tree's content.
4251
annotate_file_tree(wt, file_id, self.outf, long, all,
4254
annotate_file(branch, file_version, file_id, long, all, self.outf,
4616
4263
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4264
"""Create a digital signature for an existing revision."""
4618
4265
# TODO be able to replace existing ones.
4620
4267
hidden = True # is this right ?
4827
4477
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4480
print 'Dry-run, pretending to remove the above revisions.'
4482
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')
4484
print 'The above revision(s) will be removed.'
4486
val = raw_input('Are you sure [y/N]? ')
4487
if val.lower() not in ('y', 'yes'):
4840
4491
mutter('Uncommitting from {%s} to {%s}',
4841
4492
last_rev_id, rev_id)
4842
4493
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4494
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)
4495
note('You can restore the old tip by running:\n'
4496
' bzr pull . -r revid:%s', last_rev_id)
4848
4499
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4500
"""Break a dead lock on a repository, branch or working directory.
4851
4502
CAUTION: Locks should only be broken when you are sure that the process
4852
4503
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4505
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
4510
takes_args = ['location?']
5134
4779
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.
4782
If --no-bundle is specified, then public_branch is needed (and must be
4783
up-to-date), so that the receiver can perform the merge using the
4784
public_branch. The public_branch is always included if known, so that
4785
people can check it later.
4787
The submit branch defaults to the parent, but can be overridden. Both
4788
submit branch and public branch will be remembered if supplied.
4790
If a public_branch is known for the submit_branch, that public submit
4791
branch is used in the merge instructions. This means that a local mirror
4792
can be used as your actual submit branch, once you have set public_branch
5164
4795
Mail is sent using your preferred mail program. This should be transparent
5165
4796
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5210
4836
short_name='f',
5212
4838
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
4839
help='Write merge directive to this file; '
5214
4840
'use - for stdout.',
5217
help='Refuse to send if there are uncommitted changes in'
5218
' the working tree, --no-strict disables the check.'),
5219
4842
Option('mail-to', help='Mail the request to this address.',
5223
4846
Option('body', help='Body for the email.', type=unicode),
5224
4847
RegistryOption('format',
5225
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
4848
help='Use the specified output format.',
4849
lazy_registry=('bzrlib.send', 'format_registry'))
5229
4852
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
4853
no_patch=False, revision=None, remember=False, output=None,
5231
format=None, mail_to=None, message=None, body=None,
5232
strict=None, **kwargs):
4854
format=None, mail_to=None, message=None, body=None, **kwargs):
5233
4855
from bzrlib.send import send
5234
4856
return send(submit_branch, revision, public_branch, remember,
5235
format, no_bundle, no_patch, output,
5236
kwargs.get('from', '.'), mail_to, message, body,
4857
format, no_bundle, no_patch, output,
4858
kwargs.get('from', '.'), mail_to, message, body,
5241
4862
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
4863
"""Create a merge-directive for submitting changes.
5244
4865
A merge directive provides many things needed for requesting merges:
5302
4920
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5303
4921
no_patch=False, revision=None, remember=False, output=None,
5304
format=None, strict=None, **kwargs):
4922
format=None, **kwargs):
5305
4923
if output is None:
5307
4925
from bzrlib.send import send
5308
4926
return send(submit_branch, revision, public_branch, remember,
5309
4927
format, no_bundle, no_patch, output,
5310
4928
kwargs.get('from', '.'), None, None, None,
5311
self.outf, strict=strict)
5314
4932
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
4933
"""Create, remove or modify a tag naming a revision.
5317
4935
Tags give human-meaningful names to revisions. Commands that take a -r
5318
4936
(--revision) option can be given -rtag:X, where X is any previously
5359
4972
branch, relpath = Branch.open_containing(directory)
5360
4973
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)
4976
branch.tags.delete_tag(tag_name)
4977
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)
4980
if len(revision) != 1:
4981
raise errors.BzrCommandError(
4982
"Tags can only be placed on a single revision, "
4984
revision_id = revision[0].as_revision_id(branch)
4986
revision_id = branch.last_revision()
4987
if (not force) and branch.tags.has_tag(tag_name):
4988
raise errors.TagAlreadyExists(tag_name)
4989
branch.tags.set_tag(tag_name, revision_id)
4990
self.outf.write('Created tag %s.\n' % tag_name)
5387
4995
class cmd_tags(Command):
5388
__doc__ = """List tags.
5390
4998
This command shows a table of tag names and the revisions they reference.
5422
5030
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)
5033
graph = branch.repository.get_graph()
5034
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5035
revid1, revid2 = rev1.rev_id, rev2.rev_id
5036
# only show revisions between revid1 and revid2 (inclusive)
5037
tags = [(tag, revid) for tag, revid in tags if
5038
graph.is_between(revid, revid1, revid2)]
5041
elif sort == 'time':
5043
for tag, revid in tags:
5045
revobj = branch.repository.get_revision(revid)
5046
except errors.NoSuchRevision:
5047
timestamp = sys.maxint # place them at the end
5049
timestamp = revobj.timestamp
5050
timestamps[revid] = timestamp
5051
tags.sort(key=lambda x: timestamps[x[1]])
5053
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5054
for index, (tag, revid) in enumerate(tags):
5056
revno = branch.revision_id_to_dotted_revno(revid)
5057
if isinstance(revno, tuple):
5058
revno = '.'.join(map(str, revno))
5059
except errors.NoSuchRevision:
5060
# Bad tag data/merges can lead to tagged revisions
5061
# which are not in this branch. Fail gracefully ...
5063
tags[index] = (tag, revno)
5457
5066
for tag, revspec in tags:
5458
5067
self.outf.write('%-20s %s\n' % (tag, revspec))
5461
5070
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5071
"""Reconfigure the type of a bzr directory.
5464
5073
A target configuration must be specified.
5496
5105
Option('bind-to', help='Branch to bind checkout to.', type=str),
5497
5106
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.',
5107
help='Perform reconfiguration even if local changes'
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5111
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
5112
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
5113
if target_type is None:
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5114
raise errors.BzrCommandError('No target configuration specified')
5529
5115
elif target_type == 'branch':
5530
5116
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
5117
elif target_type == 'tree':
5568
5154
/path/to/newbranch.
5570
5156
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
5157
locally, in which case switching will update the the local nickname to be
5572
5158
that of the master.
5575
takes_args = ['to_location?']
5161
takes_args = ['to_location']
5576
5162
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.'),
5163
help='Switch even if local commits will be lost.')
5584
def run(self, to_location=None, force=False, create_branch=False,
5166
def run(self, to_location, force=False):
5586
5167
from bzrlib import switch
5587
5168
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5169
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
5171
branch = control_dir.open_branch()
5597
5172
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
5173
except errors.NotBranchError:
5600
5174
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)
5176
to_branch = Branch.open(to_location)
5177
except errors.NotBranchError:
5178
this_url = self._get_branch_location(control_dir)
5179
to_branch = Branch.open(
5180
urlutils.join(this_url, '..', to_location))
5181
switch.switch(control_dir, to_branch, force)
5624
5182
if had_explicit_nick:
5625
5183
branch = control_dir.open_branch() #get the new branch!
5626
5184
branch.nick = to_branch.nick
5893
5426
if writer is None:
5894
5427
writer = bzrlib.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5429
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5430
message, destroy=destroy).run()
5902
5431
except errors.UserAbort:
5905
5434
def run_for_list(self):
5906
5435
tree = WorkingTree.open_containing('.')[0]
5907
5436
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))
5438
manager = tree.get_shelf_manager()
5439
shelves = manager.active_shelves()
5440
if len(shelves) == 0:
5441
note('No shelved changes.')
5443
for shelf_id in reversed(shelves):
5444
message = manager.get_metadata(shelf_id).get('message')
5446
message = '<no message>'
5447
self.outf.write('%3d: %s\n' % (shelf_id, message))
5922
5453
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5454
"""Restore shelved changes.
5925
5456
By default, the most recently shelved changes are restored. However if you
5926
5457
specify a shelf by id those changes will be restored instead. This works
5934
5465
enum_switch=False, value_switches=True,
5935
5466
apply="Apply changes and remove from the shelf.",
5936
5467
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.",
5468
delete_only="Delete changes without applying them."
5943
5471
_see_also = ['shelve']
5945
5473
def run(self, shelf_id=None, action='apply'):
5946
5474
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5951
unshelver.tree.unlock()
5475
Unshelver.from_args(shelf_id, action).run()
5954
5478
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5479
"""Remove unwanted files from working tree.
5957
5481
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5482
files are never deleted.
6032
5556
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)
5559
# these get imported and then picked up by the scan for cmd_*
5560
# TODO: Some more consistent way to split command definitions across files;
5561
# we do need to load at least some information about them to know of
5562
# aliases. ideally we would avoid loading the implementation until the
5563
# details were needed.
5564
from bzrlib.cmd_version_info import cmd_version_info
5565
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5566
from bzrlib.bundle.commands import (
5569
from bzrlib.foreign import cmd_dpush
5570
from bzrlib.sign_my_commits import cmd_sign_my_commits
5571
from bzrlib.weave_commands import cmd_versionedfile_list, \
5572
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
