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 some of these files,"
614
" please add them by name.\n")
698
617
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
618
"""Create a new versioned directory.
701
620
This is equivalent to creating the directory and then adding it.
761
675
revision = _get_one_revision('inventory', revision)
762
676
work_tree, file_list = tree_files(file_list)
763
677
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()
679
if revision is not None:
680
tree = revision.as_tree(work_tree.branch)
682
extra_trees = [work_tree]
688
if file_list is not None:
689
file_ids = tree.paths2ids(file_list, trees=extra_trees,
690
require_versioned=True)
691
# find_ids_across_trees may include some paths that don't
693
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
694
for file_id in file_ids if file_id in tree)
696
entries = tree.inventory.entries()
699
if tree is not work_tree:
786
702
for path, entry in entries:
787
703
if kind and kind != entry.kind:
926
845
dest = osutils.pathjoin(dest_parent, dest_tail)
927
846
mutter("attempting to move %s => %s", src, dest)
928
847
tree.rename_one(src, dest, after=after)
930
self.outf.write("%s => %s\n" % (src, dest))
848
self.outf.write("%s => %s\n" % (src, dest))
933
851
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
852
"""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
854
This command only works on branches that have not diverged. Branches are
855
considered diverged if the destination branch's most recent commit is one
856
that has not been merged (directly or indirectly) into the parent.
941
858
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
859
from one into the other. Once one branch has merged, the other should
943
860
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.
862
If you want to forget your local changes and just update your branch to
863
match the remote one, use pull --overwrite.
949
865
If there is no default location set, the first pull will set it. After
950
866
that, you can omit the location to use the default. To change the
1038
948
if revision is not None:
1039
949
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)
951
branch_to.lock_write()
953
if tree_to is not None:
954
view_info = _get_view_info_for_change_reporter(tree_to)
955
change_reporter = delta._ChangeReporter(
956
unversioned_filter=tree_to.is_ignored, view_info=view_info)
957
result = tree_to.pull(branch_from, overwrite, revision_id,
959
possible_transports=possible_transports,
962
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,
965
result.report(self.outf)
966
if verbose and result.old_revid != result.new_revid:
967
log.show_branch_change(branch_to, self.outf, result.old_revno,
1060
973
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
974
"""Update a mirror of this branch.
1063
976
The target branch will not have its working tree populated because this
1064
977
is both expensive, and is not supported on remote file systems.
1117
1027
def run(self, location=None, remember=False, overwrite=False,
1118
1028
create_prefix=False, verbose=False, revision=None,
1119
1029
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
1031
from bzrlib.push import _show_push_branch
1033
# Get the source branch and revision_id
1123
1034
if directory is None:
1124
1035
directory = '.'
1125
# Get the source branch
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1128
# Get the tip's revision_id
1036
br_from = Branch.open_containing(directory)[0]
1129
1037
revision = _get_one_revision('push', revision)
1130
1038
if revision is not None:
1131
1039
revision_id = revision.in_history(br_from).rev_id
1133
1041
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
1043
# Get the stacked_on branch, if any
1140
1044
if stacked_on is not None:
1141
1045
stacked_on = urlutils.normalize_url(stacked_on)
1192
1096
help='Hard-link working tree files where possible.'),
1193
1097
Option('no-tree',
1194
1098
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1198
1099
Option('stacked',
1199
1100
help='Create a stacked branch referring to the source branch. '
1200
1101
'The new branch will depend on the availability of the source '
1201
1102
'branch for all operations.'),
1202
1103
Option('standalone',
1203
1104
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
1106
aliases = ['get', 'clone']
1214
1108
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
1109
hardlink=False, stacked=False, standalone=False, no_tree=False):
1218
1110
from bzrlib.tag import _merge_tags_if_possible
1219
1112
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1221
1114
revision = _get_one_revision('branch', revision)
1222
1115
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)
1117
if revision is not None:
1118
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'))
1120
# FIXME - wt.last_revision, fallback to branch, fall back to
1121
# None or perhaps NULL_REVISION to mean copy nothing
1123
revision_id = br_from.last_revision()
1124
if to_location is None:
1125
to_location = urlutils.derive_to_location(from_location)
1126
to_transport = transport.get_transport(to_location)
1128
to_transport.mkdir('.')
1129
except errors.FileExists:
1130
raise errors.BzrCommandError('Target directory "%s" already'
1131
' exists.' % to_location)
1132
except errors.NoSuchFile:
1133
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1136
# preserve whatever source format we have.
1137
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1138
possible_transports=[to_transport],
1139
accelerator_tree=accelerator_tree,
1140
hardlink=hardlink, stacked=stacked,
1141
force_new_repo=standalone,
1142
create_tree_if_local=not no_tree,
1143
source_branch=br_from)
1144
branch = dir.open_branch()
1145
except errors.NoSuchRevision:
1146
to_transport.delete_tree('.')
1147
msg = "The branch %s has no revision %s." % (from_location,
1149
raise errors.BzrCommandError(msg)
1150
_merge_tags_if_possible(br_from, branch)
1151
# If the source branch is stacked, the new branch may
1152
# be stacked whether we asked for that explicitly or not.
1153
# We therefore need a try/except here and not just 'if stacked:'
1155
note('Created new stacked branch referring to %s.' %
1156
branch.get_stacked_on_url())
1157
except (errors.NotStacked, errors.UnstackableBranchFormat,
1158
errors.UnstackableRepositoryFormat), e:
1159
note('Branched %d revision(s).' % branch.revno())
1288
1164
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1165
"""Create a new checkout of an existing branch.
1291
1167
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1168
the branch found in '.'. This is useful if you have removed the working tree
1367
1243
def run(self, dir=u'.'):
1368
1244
tree = WorkingTree.open_containing(dir)[0]
1369
1245
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))
1247
new_inv = tree.inventory
1248
old_tree = tree.basis_tree()
1249
old_tree.lock_read()
1251
old_inv = old_tree.inventory
1253
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1254
for f, paths, c, v, p, n, k, e in iterator:
1255
if paths[0] == paths[1]:
1259
renames.append(paths)
1261
for old_name, new_name in renames:
1262
self.outf.write("%s => %s\n" % (old_name, new_name))
1389
1269
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1270
"""Update a tree to have the latest code committed to its branch.
1392
1272
This will perform a merge into the working tree, and may generate
1393
1273
conflicts. If you have any local changes, you will still
1396
1276
If you want to discard your local changes, you can just do a
1397
1277
'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
1280
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1281
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1282
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")
1284
def run(self, dir='.'):
1412
1285
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1286
possible_transports = []
1415
master = branch.get_master_branch(
1287
master = tree.branch.get_master_branch(
1416
1288
possible_transports=possible_transports)
1417
1289
if master is not None:
1418
1290
tree.lock_write()
1419
branch_location = master.base
1421
1292
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)
1294
existing_pending_merges = tree.get_parent_ids()[1:]
1295
last_rev = _mod_revision.ensure_null(tree.last_revision())
1296
if last_rev == _mod_revision.ensure_null(
1297
tree.branch.last_revision()):
1298
# may be up to date, check master too.
1299
if master is None or last_rev == _mod_revision.ensure_null(
1300
master.last_revision()):
1301
revno = tree.branch.revision_id_to_revno(last_rev)
1302
note("Tree is up to date at revision %d." % (revno,))
1304
view_info = _get_view_info_for_change_reporter(tree)
1450
1305
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'.")
1306
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1307
view_info=view_info), possible_transports=possible_transports)
1308
revno = tree.branch.revision_id_to_revno(
1309
_mod_revision.ensure_null(tree.last_revision()))
1310
note('Updated to revision %d.' % (revno,))
1311
if tree.get_parent_ids()[1:] != existing_pending_merges:
1312
note('Your local commits will now show as pending merges with '
1313
"'bzr status', and can be committed with 'bzr commit'.")
1475
1322
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1323
"""Show information about a working tree, branch or repository.
1478
1325
This command will show all known locations and formats associated to the
1479
1326
tree, branch or repository.
1546
1393
file_list = [f for f in file_list]
1548
1395
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')
1397
# Heuristics should probably all move into tree.remove_smart or
1400
added = tree.changes_from(tree.basis_tree(),
1401
specific_files=file_list).added
1402
file_list = sorted([f[0] for f in added], reverse=True)
1403
if len(file_list) == 0:
1404
raise errors.BzrCommandError('No matching files.')
1405
elif file_list is None:
1406
# missing files show up in iter_changes(basis) as
1407
# versioned-with-no-kind.
1409
for change in tree.iter_changes(tree.basis_tree()):
1410
# Find paths in the working tree that have no kind:
1411
if change[1][1] is not None and change[6][1] is None:
1412
missing.append(change[1][1])
1413
file_list = sorted(missing, reverse=True)
1414
file_deletion_strategy = 'keep'
1415
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1416
keep_files=file_deletion_strategy=='keep',
1417
force=file_deletion_strategy=='force')
1573
1422
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1423
"""Print file_id of a particular file or directory.
1576
1425
The file_id is assigned when the file is first added and remains the
1577
1426
same through all revisions where the file exists, even when it is
1977
1801
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1802
' 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)
1804
old_tree, new_tree, specific_files, extra_trees = \
1805
_get_trees_to_diff(file_list, revision, old, new,
1988
1807
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1808
specific_files=specific_files,
1990
1809
external_diff_options=diff_options,
1991
1810
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1811
extra_trees=extra_trees, using=using)
1996
1814
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1815
"""List files deleted in the working tree.
1999
1817
# TODO: Show files deleted since a previous revision, or
2000
1818
# between two revisions.
2395
2211
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)
2215
# Build the log formatter
2216
if log_format is None:
2217
log_format = log.log_formatter_registry.get_default(b)
2218
lf = log_format(show_ids=show_ids, to_file=self.outf,
2219
show_timezone=timezone,
2220
delta_format=get_verbosity_level(),
2222
show_advice=levels is None)
2224
# Choose the algorithm for doing the logging. It's annoying
2225
# having multiple code paths like this but necessary until
2226
# the underlying repository format is faster at generating
2227
# deltas or can provide everything we need from the indices.
2228
# The default algorithm - match-using-deltas - works for
2229
# multiple files and directories and is faster for small
2230
# amounts of history (200 revisions say). However, it's too
2231
# slow for logging a single file in a repository with deep
2232
# history, i.e. > 10K revisions. In the spirit of "do no
2233
# evil when adding features", we continue to use the
2234
# original algorithm - per-file-graph - for the "single
2235
# file that isn't a directory without showing a delta" case.
2236
partial_history = revision and b.repository._format.supports_chks
2237
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2238
or delta_type or partial_history)
2240
# Build the LogRequest and execute it
2241
if len(file_ids) == 0:
2243
rqst = make_log_request_dict(
2244
direction=direction, specific_fileids=file_ids,
2245
start_revision=rev1, end_revision=rev2, limit=limit,
2246
message_search=message, delta_type=delta_type,
2247
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2248
Logger(b, rqst).show(lf)
2438
2253
def _get_revision_range(revisionspec_list, branch, command_name):
2585
2390
note("Ignoring files outside view. View is %s" % view_str)
2587
2392
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')
2394
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2395
if fp.startswith(relpath):
2396
rp = fp[len(relpath):]
2397
fp = osutils.pathjoin(prefix, rp)
2398
if not recursive and '/' in rp:
2400
if not all and not selection[fc]:
2402
if kind is not None and fkind != kind:
2406
views.check_path_in_view(tree, fp)
2407
except errors.FileOutsideView:
2409
kindch = entry.kind_character()
2410
outstring = fp + kindch
2412
outstring = '%-8s %s' % (fc, outstring)
2413
if show_ids and fid is not None:
2414
outstring = "%-50s %s" % (outstring, fid)
2415
self.outf.write(outstring + '\n')
2417
self.outf.write(fp + '\0')
2420
self.outf.write(fid)
2421
self.outf.write('\0')
2429
self.outf.write('%-50s %s\n' % (outstring, my_id))
2431
self.outf.write(outstring + '\n')
2635
2436
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2437
"""List unknown files.
2648
2449
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2450
"""Ignore specified files or patterns.
2651
2452
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
2454
To remove patterns from the ignore list, edit the .bzrignore file.
2660
2455
After adding, editing or deleting that file either indirectly by
2661
2456
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
2459
Note: ignore patterns containing shell wildcards must be quoted from
2678
2460
the shell on Unix.
2701
2479
Ignore everything but the "debian" toplevel directory::
2703
2481
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
2484
_see_also = ['status', 'ignored', 'patterns']
2714
2485
takes_args = ['name_pattern*']
2715
2486
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2487
Option('old-default-rules',
2488
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2491
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2492
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)
2493
if old_default_rules is not None:
2494
# dump the rules and exit
2495
for pattern in ignores.OLD_DEFAULTS:
2727
2498
if not name_pattern_list:
2728
2499
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2500
"NAME_PATTERN or --old-default-rules")
2730
2501
name_pattern_list = [globbing.normalize_pattern(p)
2731
2502
for p in name_pattern_list]
2732
2503
for name_pattern in name_pattern_list:
3145
2900
if local and not tree.branch.get_bound_location():
3146
2901
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
2903
def get_message(commit_obj):
3170
2904
"""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,
2905
my_message = message
2906
if my_message is None and not file:
2907
t = make_commit_message_template_encoded(tree,
3180
2908
selected_list, diff=show_diff,
3181
2909
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
2910
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
2911
my_message = edit_commit_message_encoded(t,
3189
2912
start_message=start_message)
3190
2913
if my_message is None:
3191
2914
raise errors.BzrCommandError("please specify a commit"
3192
2915
" message with either --message or --file")
2916
elif my_message and file:
2917
raise errors.BzrCommandError(
2918
"please specify either --message or --file")
2920
my_message = codecs.open(file, 'rt',
2921
osutils.get_user_encoding()).read()
3193
2922
if my_message == "":
3194
2923
raise errors.BzrCommandError("empty commit message specified")
3195
2924
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
2927
tree.commit(message_callback=get_message,
3203
2928
specific_files=selected_list,
3204
2929
allow_pointless=unchanged, strict=strict, local=local,
3205
2930
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3208
2932
exclude=safe_relpath_files(tree, exclude))
3209
2933
except PointlessCommit:
2934
# FIXME: This should really happen before the file is read in;
2935
# perhaps prepare the commit; get the message; then actually commit
3210
2936
raise errors.BzrCommandError("No changes to commit."
3211
2937
" Use --unchanged to commit anyhow.")
3212
2938
except ConflictsInTree:
3233
2958
The working tree and branch checks will only give output if a problem is
3234
2959
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
2961
revisions: This is just the number of revisions checked. It doesn't
2963
versionedfiles: This is just the number of versionedfiles checked. It
2964
doesn't indicate a problem.
2965
unreferenced ancestors: Texts that are ancestors of other texts, but
2966
are not properly referenced by the revision ancestry. This is a
2967
subtle problem that Bazaar can work around.
2968
unique file texts: This is the total number of unique file contents
2969
seen in the checked revisions. It does not indicate a problem.
2970
repeated file texts: This is the total number of repeated texts seen
2971
in the checked revisions. Texts can be repeated when their file
2972
entries are modified, but the file contents are not. It does not
3259
2975
If no restrictions are specified, all Bazaar data that is found at the given
3260
2976
location will be checked.
3624
3330
verbose = not is_quiet()
3625
3331
# TODO: should possibly lock the history file...
3626
3332
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
3334
test_suite_factory = None
3630
3335
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)
3337
selftest_kwargs = {"verbose": verbose,
3339
"stop_on_failure": one,
3340
"transport": transport,
3341
"test_suite_factory": test_suite_factory,
3342
"lsprof_timed": lsprof_timed,
3343
"bench_history": benchfile,
3344
"matching_tests_first": first,
3345
"list_only": list_only,
3346
"random_seed": randomize,
3347
"exclude_pattern": exclude,
3349
"load_list": load_list,
3350
"debug_flags": debugflag,
3351
"starting_with": starting_with
3353
selftest_kwargs.update(self.additional_selftest_args)
3354
result = selftest(**selftest_kwargs)
3356
if benchfile is not None:
3650
3358
return int(not result)
3653
3361
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3362
"""Show version of bzr."""
3656
3364
encoding_type = 'replace'
3657
3365
takes_options = [
3822
3515
verified = 'inapplicable'
3823
3516
tree = WorkingTree.open_containing(directory)[0]
3518
# die as quickly as possible if there are uncommitted changes
3826
3520
basis_tree = tree.revision_tree(tree.last_revision())
3827
3521
except errors.NoSuchRevision:
3828
3522
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3524
changes = tree.changes_from(basis_tree)
3525
if changes.has_changed():
3833
3526
raise errors.UncommittedChanges(tree)
3835
3528
view_info = _get_view_info_for_change_reporter(tree)
3836
3529
change_reporter = delta._ChangeReporter(
3837
3530
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:
3533
pb = ui.ui_factory.nested_progress_bar()
3534
cleanups.append(pb.finished)
3536
cleanups.append(tree.unlock)
3537
if location is not None:
3539
mergeable = bundle.read_mergeable_from_url(location,
3540
possible_transports=possible_transports)
3541
except errors.NotABundle:
3545
raise errors.BzrCommandError('Cannot use --uncommitted'
3546
' with bundles or merge directives.')
3548
if revision is not None:
3549
raise errors.BzrCommandError(
3550
'Cannot use -r with merge directives or bundles')
3551
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3554
if merger is None and uncommitted:
3555
if revision is not None and len(revision) > 0:
3556
raise errors.BzrCommandError('Cannot use --uncommitted and'
3557
' --revision at the same time.')
3558
location = self._select_branch_location(tree, location)[0]
3559
other_tree, other_path = WorkingTree.open_containing(location)
3560
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3562
allow_pending = False
3563
if other_path != '':
3564
merger.interesting_files = [other_path]
3567
merger, allow_pending = self._get_merger_from_branch(tree,
3568
location, revision, remember, possible_transports, pb)
3570
merger.merge_type = merge_type
3571
merger.reprocess = reprocess
3572
merger.show_base = show_base
3573
self.sanity_check_merger(merger)
3574
if (merger.base_rev_id == merger.other_rev_id and
3575
merger.other_rev_id is not None):
3576
note('Nothing to do.')
3579
if merger.interesting_files is not None:
3580
raise errors.BzrCommandError('Cannot pull individual files')
3581
if (merger.base_rev_id == tree.last_revision()):
3582
result = tree.pull(merger.other_branch, False,
3583
merger.other_rev_id)
3584
result.report(self.outf)
3586
merger.check_basis(False)
3588
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):
3590
return self._do_merge(merger, change_reporter, allow_pending,
3593
for cleanup in reversed(cleanups):
3596
def _do_preview(self, merger):
3597
from bzrlib.diff import show_diff_trees
3899
3598
tree_merger = merger.make_merger()
3900
3599
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='')
3601
result_tree = tt.get_preview_tree()
3602
show_diff_trees(merger.this_tree, result_tree, self.outf,
3603
old_label='', new_label='')
3911
3607
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3608
merger.change_reporter = change_reporter
4097
3761
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3762
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3763
if merge_type is None:
4101
3764
merge_type = _mod_merge.Merge3Merger
4102
3765
tree, file_list = tree_files(file_list)
4103
3766
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":
3768
parents = tree.get_parent_ids()
3769
if len(parents) != 2:
3770
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3771
" merges. Not cherrypicking or"
3773
repository = tree.branch.repository
3774
interesting_ids = None
3776
conflicts = tree.conflicts()
3777
if file_list is not None:
3778
interesting_ids = set()
3779
for filename in file_list:
3780
file_id = tree.path2id(filename)
3782
raise errors.NotVersionedError(filename)
3783
interesting_ids.add(file_id)
3784
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:
3787
for name, ie in tree.inventory.iter_entries(file_id):
3788
interesting_ids.add(ie.file_id)
3789
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3791
# Remerge only supports resolving contents conflicts
3792
allowed_conflicts = ('text conflict', 'contents conflict')
3793
restore_files = [c.path for c in conflicts
3794
if c.typestring in allowed_conflicts]
3795
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3796
tree.set_conflicts(ConflictList(new_conflicts))
3797
if file_list is not None:
3798
restore_files = file_list
3799
for filename in restore_files:
3801
restore(tree.abspath(filename))
3802
except errors.NotConflicted:
3804
# Disable pending merges, because the file texts we are remerging
3805
# have not had those merges performed. If we use the wrong parents
3806
# list, we imply that the working tree text has seen and rejected
3807
# all the changes from the other tree, when in fact those changes
3808
# have not yet been seen.
3809
pb = ui.ui_factory.nested_progress_bar()
3810
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()
3812
merger = _mod_merge.Merger.from_revision_ids(pb,
3814
merger.interesting_ids = interesting_ids
3815
merger.merge_type = merge_type
3816
merger.show_base = show_base
3817
merger.reprocess = reprocess
3818
conflicts = merger.do_merge()
3820
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3824
if conflicts > 0:
4180
3848
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
3851
Any files that have been newly added since that revision will be deleted,
3852
with a backup kept if appropriate. Directories containing unknown files
3853
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
3855
The working tree contains a list of pending merged revisions, which will
3856
be included as parents in the next commit. Normally, revert clears that
3857
list as well as reverting the files. If any files are specified, revert
3858
leaves the pending merge list alone and reverts only the files. Use "bzr
3859
revert ." in the tree root to revert all files but keep the merge record,
3860
and "bzr revert --forget-merges" to clear the pending merge list without
4195
3861
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
3864
_see_also = ['cat', 'export']
4217
3873
def run(self, revision=None, no_backup=False, file_list=None,
4218
3874
forget_merges=None):
4219
3875
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)
3879
tree.set_parent_ids(tree.get_parent_ids()[:1])
3881
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4228
3886
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
3887
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)
3888
pb = ui.ui_factory.nested_progress_bar()
3890
tree.revert(file_list, rev_tree, not no_backup, pb,
3891
report_changes=True)
4234
3896
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
3897
"""Test reporting of assertion failures"""
4236
3898
# intended just for use in testing
4389
4041
_get_revision_range(revision,
4390
4042
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")
4044
local_branch.lock_read()
4046
remote_branch.lock_read()
4048
local_extra, remote_extra = find_unmerged(
4049
local_branch, remote_branch, restrict,
4050
backward=not reverse,
4051
include_merges=include_merges,
4052
local_revid_range=local_revid_range,
4053
remote_revid_range=remote_revid_range)
4055
if log_format is None:
4056
registry = log.log_formatter_registry
4057
log_format = registry.get_default(local_branch)
4058
lf = log_format(to_file=self.outf,
4060
show_timezone='original')
4063
if local_extra and not theirs_only:
4064
message("You have %d extra revision(s):\n" %
4066
for revision in iter_log_revisions(local_extra,
4067
local_branch.repository,
4069
lf.log_revision(revision)
4070
printed_local = True
4073
printed_local = False
4075
if remote_extra and not mine_only:
4076
if printed_local is True:
4078
message("You are missing %d revision(s):\n" %
4080
for revision in iter_log_revisions(remote_extra,
4081
remote_branch.repository,
4083
lf.log_revision(revision)
4086
if mine_only and not local_extra:
4087
# We checked local, and found nothing extra
4088
message('This branch is up to date.\n')
4089
elif theirs_only and not remote_extra:
4090
# We checked remote, and found nothing extra
4091
message('Other branch is up to date.\n')
4092
elif not (mine_only or theirs_only or local_extra or
4094
# We checked both branches, and neither one had extra
4096
message("Branches are up to date.\n")
4098
remote_branch.unlock()
4100
local_branch.unlock()
4442
4101
if not status_code and parent is None and other_branch is not None:
4443
4102
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)
4104
# handle race conditions - a parent might be set while we run.
4105
if local_branch.get_parent() is None:
4106
local_branch.set_parent(remote_branch.base)
4108
local_branch.unlock()
4448
4109
return status_code
4451
4112
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.
4113
"""Compress the data within a repository."""
4470
4115
_see_also = ['repositories']
4471
4116
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):
4118
def run(self, branch_or_repo='.'):
4477
4119
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4121
branch = dir.open_branch()
4480
4122
repository = branch.repository
4481
4123
except errors.NotBranchError:
4482
4124
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4128
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4129
"""List the installed plugins.
4489
4131
This command displays the list of installed plugins including
4490
4132
version of plugin and a short description of each.
4589
4233
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
4234
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4594
4237
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,
4239
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4241
file_id = wt.path2id(relpath)
4243
file_id = tree.path2id(relpath)
4245
raise errors.NotVersionedError(filename)
4246
file_version = tree.inventory[file_id].revision
4247
if wt is not None and revision is None:
4248
# If there is a tree and we're not annotating historical
4249
# versions, annotate the working tree's content.
4250
annotate_file_tree(wt, file_id, self.outf, long, all,
4253
annotate_file(branch, file_version, file_id, long, all, self.outf,
4616
4262
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4263
"""Create a digital signature for an existing revision."""
4618
4264
# TODO be able to replace existing ones.
4620
4266
hidden = True # is this right ?
4827
4476
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4479
print 'Dry-run, pretending to remove the above revisions.'
4481
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')
4483
print 'The above revision(s) will be removed.'
4485
val = raw_input('Are you sure [y/N]? ')
4486
if val.lower() not in ('y', 'yes'):
4840
4490
mutter('Uncommitting from {%s} to {%s}',
4841
4491
last_rev_id, rev_id)
4842
4492
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4493
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)
4494
note('You can restore the old tip by running:\n'
4495
' bzr pull . -r revid:%s', last_rev_id)
4848
4498
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4499
"""Break a dead lock on a repository, branch or working directory.
4851
4501
CAUTION: Locks should only be broken when you are sure that the process
4852
4502
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4504
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
4509
takes_args = ['location?']
4908
4552
Option('allow-writes',
4909
4553
help='By default the server is a readonly server. Supplying '
4910
4554
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
4912
'does not perform authentication, so unless some form of '
4913
'external authentication is arranged supplying this '
4914
'option leads to global uncontrolled write access to your '
4555
'the served directory and below.'
4559
def run_smart_server(self, smart_server):
4560
"""Run 'smart_server' forever, with no UI output at all."""
4561
# For the duration of this server, no UI output is permitted. note
4562
# that this may cause problems with blackbox tests. This should be
4563
# changed with care though, as we dont want to use bandwidth sending
4564
# progress over stderr to smart server clients!
4565
from bzrlib import lockdir
4566
old_factory = ui.ui_factory
4567
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4569
ui.ui_factory = ui.SilentUIFactory()
4570
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4571
smart_server.serve()
4573
ui.ui_factory = old_factory
4574
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4919
4576
def get_host_and_port(self, port):
4920
4577
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4579
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4580
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4924
4582
If 'port' has a colon in it, the string before the colon will be
4925
4583
interpreted as the host.
4928
4586
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
4587
and port is an integer TCP/IP port.
4932
if port is not None:
4589
from bzrlib.smart import medium
4590
host = medium.BZR_DEFAULT_INTERFACE
4592
port = medium.BZR_DEFAULT_PORT
4933
4594
if ':' in port:
4934
4595
host, port = port.split(':')
4935
4596
port = int(port)
4936
4597
return host, port
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
4599
def get_smart_server(self, transport, inet, port):
4600
"""Construct a smart server.
4602
:param transport: The base transport from which branches will be
4604
:param inet: If True, serve over stdin and stdout. Used for running
4606
:param port: The port to listen on. By default, it's `
4607
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4609
:return: A smart server.
4611
from bzrlib.smart import medium, server
4613
smart_server = medium.SmartServerPipeStreamMedium(
4614
sys.stdin, sys.stdout, transport)
4616
host, port = self.get_host_and_port(port)
4617
smart_server = server.SmartTCPServer(
4618
transport, host=host, port=port)
4619
note('listening on port: %s' % smart_server.port)
4622
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4623
from bzrlib.transport import get_transport
4624
from bzrlib.transport.chroot import ChrootServer
4941
4625
if directory is None:
4942
4626
directory = os.getcwd()
4943
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
4627
url = urlutils.local_path_to_url(directory)
4947
4628
if not allow_writes:
4948
4629
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4630
chroot_server = ChrootServer(get_transport(url))
4631
chroot_server.setUp()
4632
t = get_transport(chroot_server.get_url())
4633
smart_server = self.get_smart_server(t, inet, port)
4634
self.run_smart_server(smart_server)
4953
4637
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4638
"""Combine a tree into its containing tree.
4956
4640
This command requires the target tree to be in a rich-root format.
5134
4818
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.
4821
If --no-bundle is specified, then public_branch is needed (and must be
4822
up-to-date), so that the receiver can perform the merge using the
4823
public_branch. The public_branch is always included if known, so that
4824
people can check it later.
4826
The submit branch defaults to the parent, but can be overridden. Both
4827
submit branch and public branch will be remembered if supplied.
4829
If a public_branch is known for the submit_branch, that public submit
4830
branch is used in the merge instructions. This means that a local mirror
4831
can be used as your actual submit branch, once you have set public_branch
5164
4834
Mail is sent using your preferred mail program. This should be transparent
5165
4835
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5210
4875
short_name='f',
5212
4877
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
4878
help='Write merge directive to this file; '
5214
4879
'use - for stdout.',
5217
help='Refuse to send if there are uncommitted changes in'
5218
' the working tree, --no-strict disables the check.'),
5219
4881
Option('mail-to', help='Mail the request to this address.',
5223
4885
Option('body', help='Body for the email.', type=unicode),
5224
RegistryOption('format',
5225
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
4886
RegistryOption.from_kwargs('format',
4887
'Use the specified output format.',
4888
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4889
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5229
4892
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
4893
no_patch=False, revision=None, remember=False, output=None,
5231
format=None, mail_to=None, message=None, body=None,
5232
strict=None, **kwargs):
5233
from bzrlib.send import send
5234
return send(submit_branch, revision, public_branch, remember,
5235
format, no_bundle, no_patch, output,
5236
kwargs.get('from', '.'), mail_to, message, body,
4894
format='4', mail_to=None, message=None, body=None, **kwargs):
4895
return self._run(submit_branch, revision, public_branch, remember,
4896
format, no_bundle, no_patch, output,
4897
kwargs.get('from', '.'), mail_to, message, body)
4899
def _run(self, submit_branch, revision, public_branch, remember, format,
4900
no_bundle, no_patch, output, from_, mail_to, message, body):
4901
from bzrlib.revision import NULL_REVISION
4902
tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
4903
# we may need to write data into branch's repository to calculate
4908
config = branch.get_config()
4910
mail_to = config.get_user_option('submit_to')
4911
mail_client = config.get_mail_client()
4912
if (not getattr(mail_client, 'supports_body', False)
4913
and body is not None):
4914
raise errors.BzrCommandError(
4915
'Mail client "%s" does not support specifying body' %
4916
mail_client.__class__.__name__)
4917
if remember and submit_branch is None:
4918
raise errors.BzrCommandError(
4919
'--remember requires a branch to be specified.')
4920
stored_submit_branch = branch.get_submit_branch()
4921
remembered_submit_branch = None
4922
if submit_branch is None:
4923
submit_branch = stored_submit_branch
4924
remembered_submit_branch = "submit"
4926
if stored_submit_branch is None or remember:
4927
branch.set_submit_branch(submit_branch)
4928
if submit_branch is None:
4929
submit_branch = branch.get_parent()
4930
remembered_submit_branch = "parent"
4931
if submit_branch is None:
4932
raise errors.BzrCommandError('No submit branch known or'
4934
if remembered_submit_branch is not None:
4935
note('Using saved %s location "%s" to determine what '
4936
'changes to submit.', remembered_submit_branch,
4940
submit_config = Branch.open(submit_branch).get_config()
4941
mail_to = submit_config.get_user_option("child_submit_to")
4943
stored_public_branch = branch.get_public_branch()
4944
if public_branch is None:
4945
public_branch = stored_public_branch
4946
elif stored_public_branch is None or remember:
4947
branch.set_public_branch(public_branch)
4948
if no_bundle and public_branch is None:
4949
raise errors.BzrCommandError('No public branch specified or'
4951
base_revision_id = None
4953
if revision is not None:
4954
if len(revision) > 2:
4955
raise errors.BzrCommandError('bzr send takes '
4956
'at most two one revision identifiers')
4957
revision_id = revision[-1].as_revision_id(branch)
4958
if len(revision) == 2:
4959
base_revision_id = revision[0].as_revision_id(branch)
4960
if revision_id is None:
4961
revision_id = branch.last_revision()
4962
if revision_id == NULL_REVISION:
4963
raise errors.BzrCommandError('No revisions to submit.')
4965
directive = merge_directive.MergeDirective2.from_objects(
4966
branch.repository, revision_id, time.time(),
4967
osutils.local_time_offset(), submit_branch,
4968
public_branch=public_branch, include_patch=not no_patch,
4969
include_bundle=not no_bundle, message=message,
4970
base_revision_id=base_revision_id)
4971
elif format == '0.9':
4974
patch_type = 'bundle'
4976
raise errors.BzrCommandError('Format 0.9 does not'
4977
' permit bundle with no patch')
4983
directive = merge_directive.MergeDirective.from_objects(
4984
branch.repository, revision_id, time.time(),
4985
osutils.local_time_offset(), submit_branch,
4986
public_branch=public_branch, patch_type=patch_type,
4990
directive.compose_merge_request(mail_client, mail_to, body,
4996
outfile = open(output, 'wb')
4998
outfile.writelines(directive.to_lines())
5000
if outfile is not self.outf:
5241
5006
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5008
"""Create a merge-directive for submitting changes.
5244
5010
A merge directive provides many things needed for requesting merges:
5302
5066
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5303
5067
no_patch=False, revision=None, remember=False, output=None,
5304
format=None, strict=None, **kwargs):
5068
format='4', **kwargs):
5305
5069
if output is None:
5307
from bzrlib.send import send
5308
return send(submit_branch, revision, public_branch, remember,
5071
return self._run(submit_branch, revision, public_branch, remember,
5309
5072
format, no_bundle, no_patch, output,
5310
kwargs.get('from', '.'), None, None, None,
5311
self.outf, strict=strict)
5073
kwargs.get('from', '.'), None, None, None)
5314
5076
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5077
"""Create, remove or modify a tag naming a revision.
5317
5079
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5080
(--revision) option can be given -rtag:X, where X is any previously
5359
5116
branch, relpath = Branch.open_containing(directory)
5360
5117
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)
5120
branch.tags.delete_tag(tag_name)
5121
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)
5124
if len(revision) != 1:
5125
raise errors.BzrCommandError(
5126
"Tags can only be placed on a single revision, "
5128
revision_id = revision[0].as_revision_id(branch)
5130
revision_id = branch.last_revision()
5131
if (not force) and branch.tags.has_tag(tag_name):
5132
raise errors.TagAlreadyExists(tag_name)
5133
branch.tags.set_tag(tag_name, revision_id)
5134
self.outf.write('Created tag %s.\n' % tag_name)
5387
5139
class cmd_tags(Command):
5388
__doc__ = """List tags.
5390
5142
This command shows a table of tag names and the revisions they reference.
5443
5197
tags.sort(key=lambda x: timestamps[x[1]])
5444
5198
if not show_ids:
5445
5199
# [ (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)
5200
revno_map = branch.get_revision_id_to_revno_map()
5201
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5202
for tag, revid in tags ]
5457
5203
for tag, revspec in tags:
5458
5204
self.outf.write('%-20s %s\n' % (tag, revspec))
5461
5207
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5208
"""Reconfigure the type of a bzr directory.
5464
5210
A target configuration must be specified.
5496
5242
Option('bind-to', help='Branch to bind checkout to.', type=str),
5497
5243
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.',
5244
help='Perform reconfiguration even if local changes'
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5248
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
5249
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
5250
if target_type is None:
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5251
raise errors.BzrCommandError('No target configuration specified')
5529
5252
elif target_type == 'branch':
5530
5253
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
5254
elif target_type == 'tree':
5568
5291
/path/to/newbranch.
5570
5293
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
5294
locally, in which case switching will update the the local nickname to be
5572
5295
that of the master.
5575
takes_args = ['to_location?']
5298
takes_args = ['to_location']
5576
5299
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.'),
5300
help='Switch even if local commits will be lost.')
5584
def run(self, to_location=None, force=False, create_branch=False,
5303
def run(self, to_location, force=False):
5586
5304
from bzrlib import switch
5587
5305
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5306
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
5308
branch = control_dir.open_branch()
5597
5309
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
5310
except errors.NotBranchError:
5600
5311
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)
5313
to_branch = Branch.open(to_location)
5314
except errors.NotBranchError:
5315
this_url = self._get_branch_location(control_dir)
5316
to_branch = Branch.open(
5317
urlutils.join(this_url, '..', to_location))
5318
switch.switch(control_dir, to_branch, force)
5624
5319
if had_explicit_nick:
5625
5320
branch = control_dir.open_branch() #get the new branch!
5626
5321
branch.nick = to_branch.nick
5893
5563
if writer is None:
5894
5564
writer = bzrlib.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5566
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5567
message, destroy=destroy).run()
5902
5568
except errors.UserAbort:
5905
5571
def run_for_list(self):
5906
5572
tree = WorkingTree.open_containing('.')[0]
5907
5573
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))
5575
manager = tree.get_shelf_manager()
5576
shelves = manager.active_shelves()
5577
if len(shelves) == 0:
5578
note('No shelved changes.')
5580
for shelf_id in reversed(shelves):
5581
message = manager.get_metadata(shelf_id).get('message')
5583
message = '<no message>'
5584
self.outf.write('%3d: %s\n' % (shelf_id, message))
5922
5590
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5591
"""Restore shelved changes.
5925
5593
By default, the most recently shelved changes are restored. However if you
5926
5594
specify a shelf by id those changes will be restored instead. This works
5934
5602
enum_switch=False, value_switches=True,
5935
5603
apply="Apply changes and remove from the shelf.",
5936
5604
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.",
5605
delete_only="Delete changes without applying them."
5943
5608
_see_also = ['shelve']
5945
5610
def run(self, shelf_id=None, action='apply'):
5946
5611
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5951
unshelver.tree.unlock()
5612
Unshelver.from_args(shelf_id, action).run()
5954
5615
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5616
"""Remove unwanted files from working tree.
5957
5618
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5619
files are never deleted.
6032
5693
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)
5696
# these get imported and then picked up by the scan for cmd_*
5697
# TODO: Some more consistent way to split command definitions across files;
5698
# we do need to load at least some information about them to know of
5699
# aliases. ideally we would avoid loading the implementation until the
5700
# details were needed.
5701
from bzrlib.cmd_version_info import cmd_version_info
5702
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5703
from bzrlib.bundle.commands import (
5706
from bzrlib.foreign import cmd_dpush
5707
from bzrlib.sign_my_commits import cmd_sign_my_commits
5708
from bzrlib.weave_commands import cmd_versionedfile_list, \
5709
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
