350
322
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
323
takes_options = ['revision']
352
324
# cat-revision is more for frontends so should be exact
353
325
encoding = 'strict'
355
def print_revision(self, revisions, revid):
356
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
357
record = stream.next()
358
if record.storage_kind == 'absent':
359
raise errors.NoSuchRevision(revisions, revid)
360
revtext = record.get_bytes_as('fulltext')
361
self.outf.write(revtext.decode('utf-8'))
364
def run(self, revision_id=None, revision=None, directory=u'.'):
328
def run(self, revision_id=None, revision=None):
365
329
if revision_id is not None and revision is not None:
366
330
raise errors.BzrCommandError('You can only supply one of'
367
331
' revision_id or --revision')
368
332
if revision_id is None and revision is None:
369
333
raise errors.BzrCommandError('You must supply either'
370
334
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
373
revisions = b.repository.revisions
374
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
378
b.repository.lock_read()
380
# TODO: jam 20060112 should cat-revision always output utf-8?
381
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
384
self.print_revision(revisions, revision_id)
385
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
389
elif revision is not None:
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
394
rev_id = rev.as_revision_id(b)
395
self.print_revision(revisions, rev_id)
397
b.repository.unlock()
335
b = WorkingTree.open_containing(u'.')[0].branch
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'))
400
355
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
403
358
PATH is a btree index file, it can be any URL. This includes things like
404
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
487
435
To re-create the working tree, use "bzr checkout".
489
437
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
438
takes_args = ['location?']
491
439
takes_options = [
493
441
help='Remove the working tree even if it has '
494
'uncommitted or shelved changes.'),
442
'uncommitted changes.'),
497
def run(self, location_list, force=False):
498
if not location_list:
501
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
505
working = d.open_workingtree()
506
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
508
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
512
if (working.has_changes()):
513
raise errors.UncommittedChanges(working)
514
if working.get_shelf_manager().last_shelf() is not None:
515
raise errors.ShelvedChanges(working)
517
if working.user_url != working.branch.user_url:
518
raise errors.BzrCommandError("You cannot remove the working tree"
519
" from a lightweight checkout")
521
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()
524
469
class cmd_revno(Command):
525
__doc__ = """Show current revision number.
470
"""Show current revision number.
527
472
This is equal to the number of revisions on this branch.
530
475
_see_also = ['info']
531
476
takes_args = ['location?']
533
Option('tree', help='Show revno of working tree'),
537
def run(self, tree=False, location=u'.'):
540
wt = WorkingTree.open_containing(location)[0]
541
self.add_cleanup(wt.lock_read().unlock)
542
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
raise errors.NoWorkingTree(location)
544
revid = wt.last_revision()
546
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
547
except errors.NoSuchRevision:
549
revno = ".".join(str(n) for n in revno_t)
551
b = Branch.open_containing(location)[0]
552
self.add_cleanup(b.lock_read().unlock)
555
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')
558
484
class cmd_revision_info(Command):
559
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
562
488
takes_args = ['revision_info*']
563
489
takes_options = [
565
custom_help('directory',
566
492
help='Branch to examine, '
567
'rather than the one containing the working directory.'),
568
Option('tree', help='Show revno of working tree'),
493
'rather than the one containing the working directory.',
572
def run(self, revision=None, directory=u'.', tree=False,
573
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
576
wt = WorkingTree.open_containing(directory)[0]
578
self.add_cleanup(wt.lock_read().unlock)
579
except (errors.NoWorkingTree, errors.NotLocalUrl):
581
b = Branch.open_containing(directory)[0]
582
self.add_cleanup(b.lock_read().unlock)
584
503
if revision is not None:
585
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
586
505
if revision_info_list is not None:
587
for rev_str in revision_info_list:
588
rev_spec = RevisionSpec.from_string(rev_str)
589
revision_ids.append(rev_spec.as_revision_id(b))
590
# No arguments supplied, default to the last revision
591
if len(revision_ids) == 0:
594
raise errors.NoWorkingTree(directory)
595
revision_ids.append(wt.last_revision())
597
revision_ids.append(b.last_revision())
601
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)
603
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
604
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
605
518
except errors.NoSuchRevision:
607
maxlen = max(maxlen, len(revno))
608
revinfos.append([revno, revision_id])
612
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)
615
524
class cmd_add(Command):
616
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
618
527
In non-recursive mode, all the named items are added, regardless
619
528
of whether they were previously ignored. A warning is given if
684
590
should_print=(not is_quiet()))
687
self.add_cleanup(base_tree.lock_read().unlock)
688
tree, file_list = tree_files_for_add(file_list)
689
added, ignored = tree.smart_add(file_list, not
690
no_recurse, action=action, save=not dry_run)
593
base_tree.lock_read()
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:
692
602
if len(ignored) > 0:
694
604
for glob in sorted(ignored.keys()):
695
605
for path in ignored[glob]:
696
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")
700
618
class cmd_mkdir(Command):
701
__doc__ = """Create a new versioned directory.
619
"""Create a new versioned directory.
703
621
This is equivalent to creating the directory and then adding it.
763
676
revision = _get_one_revision('inventory', revision)
764
677
work_tree, file_list = tree_files(file_list)
765
self.add_cleanup(work_tree.lock_read().unlock)
766
if revision is not None:
767
tree = revision.as_tree(work_tree.branch)
769
extra_trees = [work_tree]
770
self.add_cleanup(tree.lock_read().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()
678
work_tree.lock_read()
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:
924
846
dest = osutils.pathjoin(dest_parent, dest_tail)
925
847
mutter("attempting to move %s => %s", src, dest)
926
848
tree.rename_one(src, dest, after=after)
928
self.outf.write("%s => %s\n" % (src, dest))
849
self.outf.write("%s => %s\n" % (src, dest))
931
852
class cmd_pull(Command):
932
__doc__ = """Turn this branch into a mirror of another branch.
853
"""Turn this branch into a mirror of another branch.
934
By default, this command only works on branches that have not diverged.
935
Branches are considered diverged if the destination branch's most recent
936
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.
939
859
If branches have diverged, you can use 'bzr merge' to integrate the changes
940
860
from one into the other. Once one branch has merged, the other should
941
861
be able to pull it again.
943
If you want to replace your local changes and just want your branch to
944
match the remote one, use pull --overwrite. This will work even if the two
945
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.
947
866
If there is no default location set, the first pull will set it. After
948
867
that, you can omit the location to use the default. To change the
1030
949
if revision is not None:
1031
950
revision_id = revision.as_revision_id(branch_from)
1033
if tree_to is not None:
1034
view_info = _get_view_info_for_change_reporter(tree_to)
1035
change_reporter = delta._ChangeReporter(
1036
unversioned_filter=tree_to.is_ignored,
1037
view_info=view_info)
1038
result = tree_to.pull(
1039
branch_from, overwrite, revision_id, change_reporter,
1040
possible_transports=possible_transports, local=local)
1042
result = branch_to.pull(
1043
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,
1045
result.report(self.outf)
1046
if verbose and result.old_revid != result.new_revid:
1047
log.show_branch_change(
1048
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,
1052
974
class cmd_push(Command):
1053
__doc__ = """Update a mirror of this branch.
975
"""Update a mirror of this branch.
1055
977
The target branch will not have its working tree populated because this
1056
978
is both expensive, and is not supported on remote file systems.
1106
1028
def run(self, location=None, remember=False, overwrite=False,
1107
1029
create_prefix=False, verbose=False, revision=None,
1108
1030
use_existing_dir=False, directory=None, stacked_on=None,
1109
stacked=False, strict=None):
1110
1032
from bzrlib.push import _show_push_branch
1034
# Get the source branch and revision_id
1112
1035
if directory is None:
1113
1036
directory = '.'
1114
# Get the source branch
1116
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1117
# Get the tip's revision_id
1037
br_from = Branch.open_containing(directory)[0]
1118
1038
revision = _get_one_revision('push', revision)
1119
1039
if revision is not None:
1120
1040
revision_id = revision.in_history(br_from).rev_id
1122
1042
revision_id = None
1123
if tree is not None and revision_id is None:
1124
tree.check_changed_or_out_of_date(
1125
strict, 'push_strict',
1126
more_error='Use --no-strict to force the push.',
1127
more_warning='Uncommitted changes will not be pushed.')
1128
1044
# Get the stacked_on branch, if any
1129
1045
if stacked_on is not None:
1130
1046
stacked_on = urlutils.normalize_url(stacked_on)
1181
1097
help='Hard-link working tree files where possible.'),
1182
1098
Option('no-tree',
1183
1099
help="Create a branch without a working-tree."),
1185
help="Switch the checkout in the current directory "
1186
"to the new branch."),
1187
1100
Option('stacked',
1188
1101
help='Create a stacked branch referring to the source branch. '
1189
1102
'The new branch will depend on the availability of the source '
1190
1103
'branch for all operations.'),
1191
1104
Option('standalone',
1192
1105
help='Do not use a shared repository, even if available.'),
1193
Option('use-existing-dir',
1194
help='By default branch will fail if the target'
1195
' directory exists, but does not already'
1196
' have a control directory. This flag will'
1197
' allow branch to proceed.'),
1199
help="Bind new branch to from location."),
1201
1107
aliases = ['get', 'clone']
1203
1109
def run(self, from_location, to_location=None, revision=None,
1204
hardlink=False, stacked=False, standalone=False, no_tree=False,
1205
use_existing_dir=False, switch=False, bind=False):
1206
from bzrlib import switch as _mod_switch
1110
hardlink=False, stacked=False, standalone=False, no_tree=False):
1207
1111
from bzrlib.tag import _merge_tags_if_possible
1208
1113
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1210
1115
revision = _get_one_revision('branch', revision)
1211
self.add_cleanup(br_from.lock_read().unlock)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1118
if revision is not None:
1119
revision_id = revision.as_revision_id(br_from)
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1264
# Bind to the parent
1265
parent_branch = Branch.open(from_location)
1266
branch.bind(parent_branch)
1267
note('New branch bound to %s' % from_location)
1269
# Switch to the new branch
1270
wt, _ = WorkingTree.open_containing('.')
1271
_mod_switch.switch(wt.bzrdir, branch)
1272
note('Switched to branch: %s',
1273
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())
1276
1165
class cmd_checkout(Command):
1277
__doc__ = """Create a new checkout of an existing branch.
1166
"""Create a new checkout of an existing branch.
1279
1168
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1280
1169
the branch found in '.'. This is useful if you have removed the working tree
1354
1243
@display_command
1355
1244
def run(self, dir=u'.'):
1356
1245
tree = WorkingTree.open_containing(dir)[0]
1357
self.add_cleanup(tree.lock_read().unlock)
1358
new_inv = tree.inventory
1359
old_tree = tree.basis_tree()
1360
self.add_cleanup(old_tree.lock_read().unlock)
1361
old_inv = old_tree.inventory
1363
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1364
for f, paths, c, v, p, n, k, e in iterator:
1365
if paths[0] == paths[1]:
1369
renames.append(paths)
1371
for old_name, new_name in renames:
1372
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))
1375
1270
class cmd_update(Command):
1376
__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.
1378
1273
This will perform a merge into the working tree, and may generate
1379
1274
conflicts. If you have any local changes, you will still
1382
1277
If you want to discard your local changes, you can just do a
1383
1278
'bzr revert' instead of 'bzr commit' after the update.
1385
If the tree's branch is bound to a master branch, it will also update
1386
the branch from the master.
1389
1281
_see_also = ['pull', 'working-trees', 'status-flags']
1390
1282
takes_args = ['dir?']
1391
takes_options = ['revision']
1392
1283
aliases = ['up']
1394
def run(self, dir='.', revision=None):
1395
if revision is not None and len(revision) != 1:
1396
raise errors.BzrCommandError(
1397
"bzr update --revision takes exactly one revision")
1285
def run(self, dir='.'):
1398
1286
tree = WorkingTree.open_containing(dir)[0]
1399
branch = tree.branch
1400
1287
possible_transports = []
1401
master = branch.get_master_branch(
1288
master = tree.branch.get_master_branch(
1402
1289
possible_transports=possible_transports)
1403
1290
if master is not None:
1404
branch_location = master.base
1405
1291
tree.lock_write()
1407
branch_location = tree.branch.base
1408
1293
tree.lock_tree_write()
1409
self.add_cleanup(tree.unlock)
1410
# get rid of the final '/' and be ready for display
1411
branch_location = urlutils.unescape_for_display(
1412
branch_location.rstrip('/'),
1414
existing_pending_merges = tree.get_parent_ids()[1:]
1418
# may need to fetch data into a heavyweight checkout
1419
# XXX: this may take some time, maybe we should display a
1421
old_tip = branch.update(possible_transports)
1422
if revision is not None:
1423
revision_id = revision[0].as_revision_id(branch)
1425
revision_id = branch.last_revision()
1426
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1427
revno = branch.revision_id_to_dotted_revno(revision_id)
1428
note("Tree is up to date at revision %s of branch %s" %
1429
('.'.join(map(str, revno)), branch_location))
1431
view_info = _get_view_info_for_change_reporter(tree)
1432
change_reporter = delta._ChangeReporter(
1433
unversioned_filter=tree.is_ignored,
1434
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)
1436
1306
conflicts = tree.update(
1438
possible_transports=possible_transports,
1439
revision=revision_id,
1441
except errors.NoSuchRevision, e:
1442
raise errors.BzrCommandError(
1443
"branch has no revision %s\n"
1444
"bzr update --revision only works"
1445
" for a revision in the branch history"
1447
revno = tree.branch.revision_id_to_dotted_revno(
1448
_mod_revision.ensure_null(tree.last_revision()))
1449
note('Updated to revision %s of branch %s' %
1450
('.'.join(map(str, revno)), branch_location))
1451
parent_ids = tree.get_parent_ids()
1452
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1453
note('Your local commits will now show as pending merges with '
1454
"'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'.")
1461
1323
class cmd_info(Command):
1462
__doc__ = """Show information about a working tree, branch or repository.
1324
"""Show information about a working tree, branch or repository.
1464
1326
This command will show all known locations and formats associated to the
1465
1327
tree, branch or repository.
1531
1393
if file_list is not None:
1532
1394
file_list = [f for f in file_list]
1534
self.add_cleanup(tree.lock_write().unlock)
1535
# Heuristics should probably all move into tree.remove_smart or
1538
added = tree.changes_from(tree.basis_tree(),
1539
specific_files=file_list).added
1540
file_list = sorted([f[0] for f in added], reverse=True)
1541
if len(file_list) == 0:
1542
raise errors.BzrCommandError('No matching files.')
1543
elif file_list is None:
1544
# missing files show up in iter_changes(basis) as
1545
# versioned-with-no-kind.
1547
for change in tree.iter_changes(tree.basis_tree()):
1548
# Find paths in the working tree that have no kind:
1549
if change[1][1] is not None and change[6][1] is None:
1550
missing.append(change[1][1])
1551
file_list = sorted(missing, reverse=True)
1552
file_deletion_strategy = 'keep'
1553
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1554
keep_files=file_deletion_strategy=='keep',
1555
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')
1558
1423
class cmd_file_id(Command):
1559
__doc__ = """Print file_id of a particular file or directory.
1424
"""Print file_id of a particular file or directory.
1561
1426
The file_id is assigned when the file is first added and remains the
1562
1427
same through all revisions where the file exists, even when it is
1962
1802
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1963
1803
' one or two revision specifiers')
1965
if using is not None and format is not None:
1966
raise errors.BzrCommandError('--using and --format are mutually '
1969
(old_tree, new_tree,
1970
old_branch, new_branch,
1971
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1972
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1973
# GNU diff on Windows uses ANSI encoding for filenames
1974
path_encoding = osutils.get_diff_header_encoding()
1805
old_tree, new_tree, specific_files, extra_trees = \
1806
_get_trees_to_diff(file_list, revision, old, new,
1975
1808
return show_diff_trees(old_tree, new_tree, sys.stdout,
1976
1809
specific_files=specific_files,
1977
1810
external_diff_options=diff_options,
1978
1811
old_label=old_label, new_label=new_label,
1979
extra_trees=extra_trees,
1980
path_encoding=path_encoding,
1812
extra_trees=extra_trees, using=using)
1985
1815
class cmd_deleted(Command):
1986
__doc__ = """List files deleted in the working tree.
1816
"""List files deleted in the working tree.
1988
1818
# TODO: Show files deleted since a previous revision, or
1989
1819
# between two revisions.
1992
1822
# level of effort but possibly much less IO. (Or possibly not,
1993
1823
# if the directories are very large...)
1994
1824
_see_also = ['status', 'ls']
1995
takes_options = ['directory', 'show-ids']
1825
takes_options = ['show-ids']
1997
1827
@display_command
1998
def run(self, show_ids=False, directory=u'.'):
1999
tree = WorkingTree.open_containing(directory)[0]
2000
self.add_cleanup(tree.lock_read().unlock)
2001
old = tree.basis_tree()
2002
self.add_cleanup(old.lock_read().unlock)
2003
for path, ie in old.inventory.iter_entries():
2004
if not tree.has_id(ie.file_id):
2005
self.outf.write(path)
2007
self.outf.write(' ')
2008
self.outf.write(ie.file_id)
2009
self.outf.write('\n')
1828
def run(self, show_ids=False):
1829
tree = WorkingTree.open_containing(u'.')[0]
1832
old = tree.basis_tree()
1835
for path, ie in old.inventory.iter_entries():
1836
if not tree.has_id(ie.file_id):
1837
self.outf.write(path)
1839
self.outf.write(' ')
1840
self.outf.write(ie.file_id)
1841
self.outf.write('\n')
2012
1848
class cmd_modified(Command):
2013
__doc__ = """List files modified in working tree.
1849
"""List files modified in working tree.
2017
1853
_see_also = ['status', 'ls']
2018
takes_options = ['directory', 'null']
1856
help='Write an ascii NUL (\\0) separator '
1857
'between files rather than a newline.')
2020
1860
@display_command
2021
def run(self, null=False, directory=u'.'):
2022
tree = WorkingTree.open_containing(directory)[0]
1861
def run(self, null=False):
1862
tree = WorkingTree.open_containing(u'.')[0]
2023
1863
td = tree.changes_from(tree.basis_tree())
2024
1864
for path, id, kind, text_modified, meta_modified in td.modified:
2031
1871
class cmd_added(Command):
2032
__doc__ = """List files added in working tree.
1872
"""List files added in working tree.
2036
1876
_see_also = ['status', 'ls']
2037
takes_options = ['directory', 'null']
1879
help='Write an ascii NUL (\\0) separator '
1880
'between files rather than a newline.')
2039
1883
@display_command
2040
def run(self, null=False, directory=u'.'):
2041
wt = WorkingTree.open_containing(directory)[0]
2042
self.add_cleanup(wt.lock_read().unlock)
2043
basis = wt.basis_tree()
2044
self.add_cleanup(basis.lock_read().unlock)
2045
basis_inv = basis.inventory
2048
if file_id in basis_inv:
2050
if inv.is_root(file_id) and len(basis_inv) == 0:
2052
path = inv.id2path(file_id)
2053
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2056
self.outf.write(path + '\0')
2058
self.outf.write(osutils.quotefn(path) + '\n')
1884
def run(self, null=False):
1885
wt = WorkingTree.open_containing(u'.')[0]
1888
basis = wt.basis_tree()
1891
basis_inv = basis.inventory
1894
if file_id in basis_inv:
1896
if inv.is_root(file_id) and len(basis_inv) == 0:
1898
path = inv.id2path(file_id)
1899
if not os.access(osutils.abspath(path), os.F_OK):
1902
self.outf.write(path + '\0')
1904
self.outf.write(osutils.quotefn(path) + '\n')
2061
1911
class cmd_root(Command):
2062
__doc__ = """Show the tree root directory.
1912
"""Show the tree root directory.
2064
1914
The root is the nearest enclosing directory with a .bzr control
2376
2212
diff_type = 'full'
2378
# Build the log formatter
2379
if log_format is None:
2380
log_format = log.log_formatter_registry.get_default(b)
2381
# Make a non-encoding output to include the diffs - bug 328007
2382
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2383
lf = log_format(show_ids=show_ids, to_file=self.outf,
2384
to_exact_file=unencoded_output,
2385
show_timezone=timezone,
2386
delta_format=get_verbosity_level(),
2388
show_advice=levels is None,
2389
author_list_handler=authors)
2391
# Choose the algorithm for doing the logging. It's annoying
2392
# having multiple code paths like this but necessary until
2393
# the underlying repository format is faster at generating
2394
# deltas or can provide everything we need from the indices.
2395
# The default algorithm - match-using-deltas - works for
2396
# multiple files and directories and is faster for small
2397
# amounts of history (200 revisions say). However, it's too
2398
# slow for logging a single file in a repository with deep
2399
# history, i.e. > 10K revisions. In the spirit of "do no
2400
# evil when adding features", we continue to use the
2401
# original algorithm - per-file-graph - for the "single
2402
# file that isn't a directory without showing a delta" case.
2403
partial_history = revision and b.repository._format.supports_chks
2404
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2405
or delta_type or partial_history)
2407
# Build the LogRequest and execute it
2408
if len(file_ids) == 0:
2410
rqst = make_log_request_dict(
2411
direction=direction, specific_fileids=file_ids,
2412
start_revision=rev1, end_revision=rev2, limit=limit,
2413
message_search=message, delta_type=delta_type,
2414
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2415
exclude_common_ancestry=exclude_common_ancestry,
2417
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)
2420
2254
def _get_revision_range(revisionspec_list, branch, command_name):
2509
2337
help='Recurse into subdirectories.'),
2510
2338
Option('from-root',
2511
2339
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2340
Option('unknown', help='Print unknown files.'),
2514
2341
Option('versioned', help='Print versioned files.',
2515
2342
short_name='V'),
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2343
Option('ignored', help='Print ignored files.'),
2345
help='Write an ascii NUL (\\0) separator '
2346
'between files rather than a newline.'),
2519
2348
help='List entries of a particular kind: file, directory, symlink.',
2525
2352
@display_command
2526
2353
def run(self, revision=None, verbose=False,
2527
2354
recursive=False, from_root=False,
2528
2355
unknown=False, versioned=False, ignored=False,
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
2356
null=False, kind=None, show_ids=False, path=None):
2531
2358
if kind and kind not in ('file', 'directory', 'symlink'):
2532
2359
raise errors.BzrCommandError('invalid kind specified')
2566
2390
view_str = views.view_display_str(view_files)
2567
2391
note("Ignoring files outside view. View is %s" % view_str)
2569
self.add_cleanup(tree.lock_read().unlock)
2570
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2571
from_dir=relpath, recursive=recursive):
2572
# Apply additional masking
2573
if not all and not selection[fc]:
2575
if kind is not None and fkind != kind:
2580
fullpath = osutils.pathjoin(relpath, fp)
2583
views.check_path_in_view(tree, fullpath)
2584
except errors.FileOutsideView:
2589
fp = osutils.pathjoin(prefix, fp)
2590
kindch = entry.kind_character()
2591
outstring = fp + kindch
2592
ui.ui_factory.clear_term()
2594
outstring = '%-8s %s' % (fc, outstring)
2595
if show_ids and fid is not None:
2596
outstring = "%-50s %s" % (outstring, fid)
2597
self.outf.write(outstring + '\n')
2599
self.outf.write(fp + '\0')
2602
self.outf.write(fid)
2603
self.outf.write('\0')
2611
self.outf.write('%-50s %s\n' % (outstring, my_id))
2613
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
2412
ui.ui_factory.clear_term()
2414
outstring = '%-8s %s' % (fc, outstring)
2415
if show_ids and fid is not None:
2416
outstring = "%-50s %s" % (outstring, fid)
2417
self.outf.write(outstring + '\n')
2419
self.outf.write(fp + '\0')
2422
self.outf.write(fid)
2423
self.outf.write('\0')
2431
self.outf.write('%-50s %s\n' % (outstring, my_id))
2433
self.outf.write(outstring + '\n')
2616
2438
class cmd_unknowns(Command):
2617
__doc__ = """List unknown files.
2439
"""List unknown files.
2621
2443
_see_also = ['ls']
2622
takes_options = ['directory']
2624
2445
@display_command
2625
def run(self, directory=u'.'):
2626
for f in WorkingTree.open_containing(directory)[0].unknowns():
2447
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2627
2448
self.outf.write(osutils.quotefn(f) + '\n')
2630
2451
class cmd_ignore(Command):
2631
__doc__ = """Ignore specified files or patterns.
2452
"""Ignore specified files or patterns.
2633
2454
See ``bzr help patterns`` for details on the syntax of patterns.
2635
If a .bzrignore file does not exist, the ignore command
2636
will create one and add the specified files or patterns to the newly
2637
created file. The ignore command will also automatically add the
2638
.bzrignore file to be versioned. Creating a .bzrignore file without
2639
the use of the ignore command will require an explicit add command.
2641
2456
To remove patterns from the ignore list, edit the .bzrignore file.
2642
2457
After adding, editing or deleting that file either indirectly by
2643
2458
using this command or directly by using an editor, be sure to commit
2646
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2647
the global ignore file can be found in the application data directory as
2648
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2649
Global ignores are not touched by this command. The global ignore file
2650
can be edited directly using an editor.
2652
Patterns prefixed with '!' are exceptions to ignore patterns and take
2653
precedence over regular ignores. Such exceptions are used to specify
2654
files that should be versioned which would otherwise be ignored.
2656
Patterns prefixed with '!!' act as regular ignore patterns, but have
2657
precedence over the '!' exception patterns.
2659
2461
Note: ignore patterns containing shell wildcards must be quoted from
2660
2462
the shell on Unix.
2683
2481
Ignore everything but the "debian" toplevel directory::
2685
2483
bzr ignore "RE:(?!debian/).*"
2687
Ignore everything except the "local" toplevel directory,
2688
but always ignore "*~" autosave files, even under local/::
2691
bzr ignore "!./local"
2695
2486
_see_also = ['status', 'ignored', 'patterns']
2696
2487
takes_args = ['name_pattern*']
2697
takes_options = ['directory',
2698
Option('default-rules',
2699
help='Display the default ignore rules that bzr uses.')
2489
Option('old-default-rules',
2490
help='Write out the ignore rules bzr < 0.9 always used.')
2702
def run(self, name_pattern_list=None, default_rules=None,
2493
def run(self, name_pattern_list=None, old_default_rules=None):
2704
2494
from bzrlib import ignores
2705
if default_rules is not None:
2706
# dump the default rules and exit
2707
for pattern in ignores.USER_DEFAULTS:
2708
self.outf.write("%s\n" % pattern)
2495
if old_default_rules is not None:
2496
# dump the rules and exit
2497
for pattern in ignores.OLD_DEFAULTS:
2710
2500
if not name_pattern_list:
2711
2501
raise errors.BzrCommandError("ignore requires at least one "
2712
"NAME_PATTERN or --default-rules.")
2502
"NAME_PATTERN or --old-default-rules")
2713
2503
name_pattern_list = [globbing.normalize_pattern(p)
2714
2504
for p in name_pattern_list]
2716
for p in name_pattern_list:
2717
if not globbing.Globster.is_pattern_valid(p):
2718
bad_patterns += ('\n %s' % p)
2720
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2721
ui.ui_factory.show_error(msg)
2722
raise errors.InvalidPattern('')
2723
2505
for name_pattern in name_pattern_list:
2724
2506
if (name_pattern[0] == '/' or
2725
2507
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2726
2508
raise errors.BzrCommandError(
2727
2509
"NAME_PATTERN should not be an absolute path")
2728
tree, relpath = WorkingTree.open_containing(directory)
2510
tree, relpath = WorkingTree.open_containing(u'.')
2729
2511
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2730
2512
ignored = globbing.Globster(name_pattern_list)
2732
self.add_cleanup(tree.lock_read().unlock)
2733
2515
for entry in tree.list_files():
2735
2517
if id is not None:
2736
2518
filename = entry[0]
2737
2519
if ignored.match(filename):
2738
matches.append(filename)
2520
matches.append(filename.encode('utf-8'))
2739
2522
if len(matches) > 0:
2740
self.outf.write("Warning: the following files are version controlled and"
2741
" match your ignore pattern:\n%s"
2742
"\nThese files will continue to be version controlled"
2743
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2523
print "Warning: the following files are version controlled and" \
2524
" match your ignore pattern:\n%s" \
2525
"\nThese files will continue to be version controlled" \
2526
" unless you 'bzr remove' them." % ("\n".join(matches),)
2746
2529
class cmd_ignored(Command):
2747
__doc__ = """List ignored files and the patterns that matched them.
2530
"""List ignored files and the patterns that matched them.
2749
2532
List all the ignored files and the ignore pattern that caused the file to
2757
2540
encoding_type = 'replace'
2758
2541
_see_also = ['ignore', 'ls']
2759
takes_options = ['directory']
2761
2543
@display_command
2762
def run(self, directory=u'.'):
2763
tree = WorkingTree.open_containing(directory)[0]
2764
self.add_cleanup(tree.lock_read().unlock)
2765
for path, file_class, kind, file_id, entry in tree.list_files():
2766
if file_class != 'I':
2768
## XXX: Slightly inefficient since this was already calculated
2769
pat = tree.is_ignored(path)
2770
self.outf.write('%-50s %s\n' % (path, pat))
2545
tree = WorkingTree.open_containing(u'.')[0]
2548
for path, file_class, kind, file_id, entry in tree.list_files():
2549
if file_class != 'I':
2551
## XXX: Slightly inefficient since this was already calculated
2552
pat = tree.is_ignored(path)
2553
self.outf.write('%-50s %s\n' % (path, pat))
2773
2558
class cmd_lookup_revision(Command):
2774
__doc__ = """Lookup the revision-id from a revision-number
2559
"""Lookup the revision-id from a revision-number
2777
2562
bzr lookup-revision 33
2780
2565
takes_args = ['revno']
2781
takes_options = ['directory']
2783
2567
@display_command
2784
def run(self, revno, directory=u'.'):
2568
def run(self, revno):
2786
2570
revno = int(revno)
2787
2571
except ValueError:
2788
raise errors.BzrCommandError("not a valid revision-number: %r"
2790
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2791
self.outf.write("%s\n" % revid)
2572
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2574
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2794
2577
class cmd_export(Command):
2795
__doc__ = """Export current or past revision to a destination directory or archive.
2578
"""Export current or past revision to a destination directory or archive.
2797
2580
If no revision is specified this exports the last committed revision.
2876
2655
@display_command
2877
2656
def run(self, filename, revision=None, name_from_revision=False,
2878
filters=False, directory=None):
2879
2658
if revision is not None and len(revision) != 1:
2880
2659
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2881
2660
" one revision specifier")
2882
2661
tree, branch, relpath = \
2883
_open_directory_or_containing_tree_or_branch(filename, directory)
2884
self.add_cleanup(branch.lock_read().unlock)
2885
return self._run(tree, branch, relpath, filename, revision,
2886
name_from_revision, filters)
2662
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2665
return self._run(tree, branch, relpath, filename, revision,
2666
name_from_revision, filters)
2888
2670
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2890
2672
if tree is None:
2891
2673
tree = b.basis_tree()
2892
2674
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2893
self.add_cleanup(rev_tree.lock_read().unlock)
2895
2676
old_file_id = rev_tree.path2id(relpath)
3134
2902
if local and not tree.branch.get_bound_location():
3135
2903
raise errors.LocalRequiresBoundBranch()
3137
if message is not None:
3139
file_exists = osutils.lexists(message)
3140
except UnicodeError:
3141
# The commit message contains unicode characters that can't be
3142
# represented in the filesystem encoding, so that can't be a
3147
'The commit message is a file name: "%(f)s".\n'
3148
'(use --file "%(f)s" to take commit message from that file)'
3150
ui.ui_factory.show_warning(warning_msg)
3152
message = message.replace('\r\n', '\n')
3153
message = message.replace('\r', '\n')
3155
raise errors.BzrCommandError(
3156
"please specify either --message or --file")
3158
2905
def get_message(commit_obj):
3159
2906
"""Callback to get commit message"""
3161
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3163
my_message = f.read()
3166
elif message is not None:
3167
my_message = message
3169
# No message supplied: make one up.
3170
# text is the status of the tree
3171
text = make_commit_message_template_encoded(tree,
2907
my_message = message
2908
if my_message is None and not file:
2909
t = make_commit_message_template_encoded(tree,
3172
2910
selected_list, diff=show_diff,
3173
2911
output_encoding=osutils.get_user_encoding())
3174
# start_message is the template generated from hooks
3175
# XXX: Warning - looks like hooks return unicode,
3176
# make_commit_message_template_encoded returns user encoding.
3177
# We probably want to be using edit_commit_message instead to
3179
2912
start_message = generate_commit_message_template(commit_obj)
3180
my_message = edit_commit_message_encoded(text,
2913
my_message = edit_commit_message_encoded(t,
3181
2914
start_message=start_message)
3182
2915
if my_message is None:
3183
2916
raise errors.BzrCommandError("please specify a commit"
3184
2917
" message with either --message or --file")
2918
elif my_message and file:
2919
raise errors.BzrCommandError(
2920
"please specify either --message or --file")
2922
my_message = codecs.open(file, 'rt',
2923
osutils.get_user_encoding()).read()
3185
2924
if my_message == "":
3186
2925
raise errors.BzrCommandError("empty commit message specified")
3187
2926
return my_message
3189
# The API permits a commit with a filter of [] to mean 'select nothing'
3190
# but the command line should not do that.
3191
if not selected_list:
3192
selected_list = None
3194
2929
tree.commit(message_callback=get_message,
3195
2930
specific_files=selected_list,
3196
2931
allow_pointless=unchanged, strict=strict, local=local,
3197
2932
reporter=None, verbose=verbose, revprops=properties,
3198
authors=author, timestamp=commit_stamp,
3200
2934
exclude=safe_relpath_files(tree, exclude))
3201
2935
except PointlessCommit:
2936
# FIXME: This should really happen before the file is read in;
2937
# perhaps prepare the commit; get the message; then actually commit
3202
2938
raise errors.BzrCommandError("No changes to commit."
3203
2939
" Use --unchanged to commit anyhow.")
3204
2940
except ConflictsInTree:
3225
2960
The working tree and branch checks will only give output if a problem is
3226
2961
detected. The output fields of the repository check are:
3229
This is just the number of revisions checked. It doesn't
3233
This is just the number of versionedfiles checked. It
3234
doesn't indicate a problem.
3236
unreferenced ancestors
3237
Texts that are ancestors of other texts, but
3238
are not properly referenced by the revision ancestry. This is a
3239
subtle problem that Bazaar can work around.
3242
This is the total number of unique file contents
3243
seen in the checked revisions. It does not indicate a problem.
3246
This is the total number of repeated texts seen
3247
in the checked revisions. Texts can be repeated when their file
3248
entries are modified, but the file contents are not. It does not
2963
revisions: This is just the number of revisions checked. It doesn't
2965
versionedfiles: This is just the number of versionedfiles checked. It
2966
doesn't indicate a problem.
2967
unreferenced ancestors: Texts that are ancestors of other texts, but
2968
are not properly referenced by the revision ancestry. This is a
2969
subtle problem that Bazaar can work around.
2970
unique file texts: This is the total number of unique file contents
2971
seen in the checked revisions. It does not indicate a problem.
2972
repeated file texts: This is the total number of repeated texts seen
2973
in the checked revisions. Texts can be repeated when their file
2974
entries are modified, but the file contents are not. It does not
3251
2977
If no restrictions are specified, all Bazaar data that is found at the given
3252
2978
location will be checked.
3584
3299
def run(self, testspecs_list=None, verbose=False, one=False,
3585
3300
transport=None, benchmark=None,
3301
lsprof_timed=None, cache_dir=None,
3587
3302
first=False, list_only=False,
3588
3303
randomize=None, exclude=None, strict=False,
3589
3304
load_list=None, debugflag=None, starting_with=None, subunit=False,
3590
parallel=None, lsprof_tests=False):
3591
3306
from bzrlib.tests import selftest
3307
import bzrlib.benchmarks as benchmarks
3308
from bzrlib.benchmarks import tree_creator
3593
3310
# Make deprecation warnings visible, unless -Werror is set
3594
3311
symbol_versioning.activate_deprecation_warnings(override=False)
3313
if cache_dir is not None:
3314
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3596
3315
if testspecs_list is not None:
3597
3316
pattern = '|'.join(testspecs_list)
3604
3323
raise errors.BzrCommandError("subunit not available. subunit "
3605
3324
"needs to be installed to use --subunit.")
3606
3325
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3607
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3608
# stdout, which would corrupt the subunit stream.
3609
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3610
# following code can be deleted when it's sufficiently deployed
3611
# -- vila/mgz 20100514
3612
if (sys.platform == "win32"
3613
and getattr(sys.stdout, 'fileno', None) is not None):
3615
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3617
3327
self.additional_selftest_args.setdefault(
3618
3328
'suite_decorators', []).append(parallel)
3620
raise errors.BzrCommandError(
3621
"--benchmark is no longer supported from bzr 2.2; "
3622
"use bzr-usertest instead")
3623
test_suite_factory = None
3624
selftest_kwargs = {"verbose": verbose,
3626
"stop_on_failure": one,
3627
"transport": transport,
3628
"test_suite_factory": test_suite_factory,
3629
"lsprof_timed": lsprof_timed,
3630
"lsprof_tests": lsprof_tests,
3631
"matching_tests_first": first,
3632
"list_only": list_only,
3633
"random_seed": randomize,
3634
"exclude_pattern": exclude,
3636
"load_list": load_list,
3637
"debug_flags": debugflag,
3638
"starting_with": starting_with
3640
selftest_kwargs.update(self.additional_selftest_args)
3641
result = selftest(**selftest_kwargs)
3330
test_suite_factory = benchmarks.test_suite
3331
# Unless user explicitly asks for quiet, be verbose in benchmarks
3332
verbose = not is_quiet()
3333
# TODO: should possibly lock the history file...
3334
benchfile = open(".perf_history", "at", buffering=1)
3336
test_suite_factory = None
3339
selftest_kwargs = {"verbose": verbose,
3341
"stop_on_failure": one,
3342
"transport": transport,
3343
"test_suite_factory": test_suite_factory,
3344
"lsprof_timed": lsprof_timed,
3345
"bench_history": benchfile,
3346
"matching_tests_first": first,
3347
"list_only": list_only,
3348
"random_seed": randomize,
3349
"exclude_pattern": exclude,
3351
"load_list": load_list,
3352
"debug_flags": debugflag,
3353
"starting_with": starting_with
3355
selftest_kwargs.update(self.additional_selftest_args)
3356
result = selftest(**selftest_kwargs)
3358
if benchfile is not None:
3642
3360
return int(not result)
3645
3363
class cmd_version(Command):
3646
__doc__ = """Show version of bzr."""
3364
"""Show version of bzr."""
3648
3366
encoding_type = 'replace'
3649
3367
takes_options = [
3809
3517
verified = 'inapplicable'
3810
3518
tree = WorkingTree.open_containing(directory)[0]
3520
# die as quickly as possible if there are uncommitted changes
3813
3522
basis_tree = tree.revision_tree(tree.last_revision())
3814
3523
except errors.NoSuchRevision:
3815
3524
basis_tree = tree.basis_tree()
3817
# die as quickly as possible if there are uncommitted changes
3819
if tree.has_changes():
3526
changes = tree.changes_from(basis_tree)
3527
if changes.has_changed():
3820
3528
raise errors.UncommittedChanges(tree)
3822
3530
view_info = _get_view_info_for_change_reporter(tree)
3823
3531
change_reporter = delta._ChangeReporter(
3824
3532
unversioned_filter=tree.is_ignored, view_info=view_info)
3825
pb = ui.ui_factory.nested_progress_bar()
3826
self.add_cleanup(pb.finished)
3827
self.add_cleanup(tree.lock_write().unlock)
3828
if location is not None:
3830
mergeable = bundle.read_mergeable_from_url(location,
3831
possible_transports=possible_transports)
3832
except errors.NotABundle:
3535
pb = ui.ui_factory.nested_progress_bar()
3536
cleanups.append(pb.finished)
3538
cleanups.append(tree.unlock)
3539
if location is not None:
3541
mergeable = bundle.read_mergeable_from_url(location,
3542
possible_transports=possible_transports)
3543
except errors.NotABundle:
3547
raise errors.BzrCommandError('Cannot use --uncommitted'
3548
' with bundles or merge directives.')
3550
if revision is not None:
3551
raise errors.BzrCommandError(
3552
'Cannot use -r with merge directives or bundles')
3553
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3556
if merger is None and uncommitted:
3557
if revision is not None and len(revision) > 0:
3558
raise errors.BzrCommandError('Cannot use --uncommitted and'
3559
' --revision at the same time.')
3560
location = self._select_branch_location(tree, location)[0]
3561
other_tree, other_path = WorkingTree.open_containing(location)
3562
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3564
allow_pending = False
3565
if other_path != '':
3566
merger.interesting_files = [other_path]
3569
merger, allow_pending = self._get_merger_from_branch(tree,
3570
location, revision, remember, possible_transports, pb)
3572
merger.merge_type = merge_type
3573
merger.reprocess = reprocess
3574
merger.show_base = show_base
3575
self.sanity_check_merger(merger)
3576
if (merger.base_rev_id == merger.other_rev_id and
3577
merger.other_rev_id is not None):
3578
note('Nothing to do.')
3581
if merger.interesting_files is not None:
3582
raise errors.BzrCommandError('Cannot pull individual files')
3583
if (merger.base_rev_id == tree.last_revision()):
3584
result = tree.pull(merger.other_branch, False,
3585
merger.other_rev_id)
3586
result.report(self.outf)
3588
merger.check_basis(False)
3590
return self._do_preview(merger)
3836
raise errors.BzrCommandError('Cannot use --uncommitted'
3837
' with bundles or merge directives.')
3839
if revision is not None:
3840
raise errors.BzrCommandError(
3841
'Cannot use -r with merge directives or bundles')
3842
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3845
if merger is None and uncommitted:
3846
if revision is not None and len(revision) > 0:
3847
raise errors.BzrCommandError('Cannot use --uncommitted and'
3848
' --revision at the same time.')
3849
merger = self.get_merger_from_uncommitted(tree, location, None)
3850
allow_pending = False
3853
merger, allow_pending = self._get_merger_from_branch(tree,
3854
location, revision, remember, possible_transports, None)
3856
merger.merge_type = merge_type
3857
merger.reprocess = reprocess
3858
merger.show_base = show_base
3859
self.sanity_check_merger(merger)
3860
if (merger.base_rev_id == merger.other_rev_id and
3861
merger.other_rev_id is not None):
3862
note('Nothing to do.')
3865
if merger.interesting_files is not None:
3866
raise errors.BzrCommandError('Cannot pull individual files')
3867
if (merger.base_rev_id == tree.last_revision()):
3868
result = tree.pull(merger.other_branch, False,
3869
merger.other_rev_id)
3870
result.report(self.outf)
3872
if merger.this_basis is None:
3873
raise errors.BzrCommandError(
3874
"This branch has no commits."
3875
" (perhaps you would prefer 'bzr pull')")
3877
return self._do_preview(merger)
3879
return self._do_interactive(merger)
3881
return self._do_merge(merger, change_reporter, allow_pending,
3884
def _get_preview(self, merger):
3592
return self._do_merge(merger, change_reporter, allow_pending,
3595
for cleanup in reversed(cleanups):
3598
def _do_preview(self, merger):
3599
from bzrlib.diff import show_diff_trees
3885
3600
tree_merger = merger.make_merger()
3886
3601
tt = tree_merger.make_preview_transform()
3887
self.add_cleanup(tt.finalize)
3888
result_tree = tt.get_preview_tree()
3891
def _do_preview(self, merger):
3892
from bzrlib.diff import show_diff_trees
3893
result_tree = self._get_preview(merger)
3894
path_encoding = osutils.get_diff_header_encoding()
3895
show_diff_trees(merger.this_tree, result_tree, self.outf,
3896
old_label='', new_label='',
3897
path_encoding=path_encoding)
3603
result_tree = tt.get_preview_tree()
3604
show_diff_trees(merger.this_tree, result_tree, self.outf,
3605
old_label='', new_label='')
3899
3609
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3900
3610
merger.change_reporter = change_reporter
4085
3763
def run(self, file_list=None, merge_type=None, show_base=False,
4086
3764
reprocess=False):
4087
from bzrlib.conflicts import restore
4088
3765
if merge_type is None:
4089
3766
merge_type = _mod_merge.Merge3Merger
4090
3767
tree, file_list = tree_files(file_list)
4091
self.add_cleanup(tree.lock_write().unlock)
4092
parents = tree.get_parent_ids()
4093
if len(parents) != 2:
4094
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4095
" merges. Not cherrypicking or"
4097
repository = tree.branch.repository
4098
interesting_ids = None
4100
conflicts = tree.conflicts()
4101
if file_list is not None:
4102
interesting_ids = set()
4103
for filename in file_list:
4104
file_id = tree.path2id(filename)
4106
raise errors.NotVersionedError(filename)
4107
interesting_ids.add(file_id)
4108
if tree.kind(file_id) != "directory":
3770
parents = tree.get_parent_ids()
3771
if len(parents) != 2:
3772
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3773
" merges. Not cherrypicking or"
3775
repository = tree.branch.repository
3776
interesting_ids = None
3778
conflicts = tree.conflicts()
3779
if file_list is not None:
3780
interesting_ids = set()
3781
for filename in file_list:
3782
file_id = tree.path2id(filename)
3784
raise errors.NotVersionedError(filename)
3785
interesting_ids.add(file_id)
3786
if tree.kind(file_id) != "directory":
4111
for name, ie in tree.inventory.iter_entries(file_id):
4112
interesting_ids.add(ie.file_id)
4113
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4115
# Remerge only supports resolving contents conflicts
4116
allowed_conflicts = ('text conflict', 'contents conflict')
4117
restore_files = [c.path for c in conflicts
4118
if c.typestring in allowed_conflicts]
4119
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4120
tree.set_conflicts(ConflictList(new_conflicts))
4121
if file_list is not None:
4122
restore_files = file_list
4123
for filename in restore_files:
3789
for name, ie in tree.inventory.iter_entries(file_id):
3790
interesting_ids.add(ie.file_id)
3791
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3793
# Remerge only supports resolving contents conflicts
3794
allowed_conflicts = ('text conflict', 'contents conflict')
3795
restore_files = [c.path for c in conflicts
3796
if c.typestring in allowed_conflicts]
3797
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3798
tree.set_conflicts(ConflictList(new_conflicts))
3799
if file_list is not None:
3800
restore_files = file_list
3801
for filename in restore_files:
3803
restore(tree.abspath(filename))
3804
except errors.NotConflicted:
3806
# Disable pending merges, because the file texts we are remerging
3807
# have not had those merges performed. If we use the wrong parents
3808
# list, we imply that the working tree text has seen and rejected
3809
# all the changes from the other tree, when in fact those changes
3810
# have not yet been seen.
3811
pb = ui.ui_factory.nested_progress_bar()
3812
tree.set_parent_ids(parents[:1])
4125
restore(tree.abspath(filename))
4126
except errors.NotConflicted:
4128
# Disable pending merges, because the file texts we are remerging
4129
# have not had those merges performed. If we use the wrong parents
4130
# list, we imply that the working tree text has seen and rejected
4131
# all the changes from the other tree, when in fact those changes
4132
# have not yet been seen.
4133
tree.set_parent_ids(parents[:1])
4135
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4136
merger.interesting_ids = interesting_ids
4137
merger.merge_type = merge_type
4138
merger.show_base = show_base
4139
merger.reprocess = reprocess
4140
conflicts = merger.do_merge()
3814
merger = _mod_merge.Merger.from_revision_ids(pb,
3816
merger.interesting_ids = interesting_ids
3817
merger.merge_type = merge_type
3818
merger.show_base = show_base
3819
merger.reprocess = reprocess
3820
conflicts = merger.do_merge()
3822
tree.set_parent_ids(parents)
4142
tree.set_parent_ids(parents)
4143
3826
if conflicts > 0:
4167
3850
name. If you name a directory, all the contents of that directory will be
4170
If you have newly added files since the target revision, they will be
4171
removed. If the files to be removed have been changed, backups will be
4172
created as above. Directories containing unknown files will not be
3853
Any files that have been newly added since that revision will be deleted,
3854
with a backup kept if appropriate. Directories containing unknown files
3855
will not be deleted.
4175
The working tree contains a list of revisions that have been merged but
4176
not yet committed. These revisions will be included as additional parents
4177
of the next commit. Normally, using revert clears that list as well as
4178
reverting the files. If any files are specified, revert leaves the list
4179
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4180
.`` in the tree root to revert all files but keep the recorded merges,
4181
and ``bzr revert --forget-merges`` to clear the pending merge list without
3857
The working tree contains a list of pending merged revisions, which will
3858
be included as parents in the next commit. Normally, revert clears that
3859
list as well as reverting the files. If any files are specified, revert
3860
leaves the pending merge list alone and reverts only the files. Use "bzr
3861
revert ." in the tree root to revert all files but keep the merge record,
3862
and "bzr revert --forget-merges" to clear the pending merge list without
4182
3863
reverting any files.
4184
Using "bzr revert --forget-merges", it is possible to apply all of the
4185
changes from a branch in a single revision. To do this, perform the merge
4186
as desired. Then doing revert with the "--forget-merges" option will keep
4187
the content of the tree as it was, but it will clear the list of pending
4188
merges. The next commit will then contain all of the changes that are
4189
present in the other branch, but without any other parent revisions.
4190
Because this technique forgets where these changes originated, it may
4191
cause additional conflicts on later merges involving the same source and
4195
3866
_see_also = ['cat', 'export']
4204
3875
def run(self, revision=None, no_backup=False, file_list=None,
4205
3876
forget_merges=None):
4206
3877
tree, file_list = tree_files(file_list)
4207
self.add_cleanup(tree.lock_tree_write().unlock)
4209
tree.set_parent_ids(tree.get_parent_ids()[:1])
4211
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3881
tree.set_parent_ids(tree.get_parent_ids()[:1])
3883
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4214
3888
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4215
3889
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4216
tree.revert(file_list, rev_tree, not no_backup, None,
4217
report_changes=True)
3890
pb = ui.ui_factory.nested_progress_bar()
3892
tree.revert(file_list, rev_tree, not no_backup, pb,
3893
report_changes=True)
4220
3898
class cmd_assert_fail(Command):
4221
__doc__ = """Test reporting of assertion failures"""
3899
"""Test reporting of assertion failures"""
4222
3900
# intended just for use in testing
4375
4043
_get_revision_range(revision,
4376
4044
remote_branch, self.name()))
4378
local_extra, remote_extra = find_unmerged(
4379
local_branch, remote_branch, restrict,
4380
backward=not reverse,
4381
include_merges=include_merges,
4382
local_revid_range=local_revid_range,
4383
remote_revid_range=remote_revid_range)
4385
if log_format is None:
4386
registry = log.log_formatter_registry
4387
log_format = registry.get_default(local_branch)
4388
lf = log_format(to_file=self.outf,
4390
show_timezone='original')
4393
if local_extra and not theirs_only:
4394
message("You have %d extra revision(s):\n" %
4396
for revision in iter_log_revisions(local_extra,
4397
local_branch.repository,
4399
lf.log_revision(revision)
4400
printed_local = True
4403
printed_local = False
4405
if remote_extra and not mine_only:
4406
if printed_local is True:
4408
message("You are missing %d revision(s):\n" %
4410
for revision in iter_log_revisions(remote_extra,
4411
remote_branch.repository,
4413
lf.log_revision(revision)
4416
if mine_only and not local_extra:
4417
# We checked local, and found nothing extra
4418
message('This branch is up to date.\n')
4419
elif theirs_only and not remote_extra:
4420
# We checked remote, and found nothing extra
4421
message('Other branch is up to date.\n')
4422
elif not (mine_only or theirs_only or local_extra or
4424
# We checked both branches, and neither one had extra
4426
message("Branches are up to date.\n")
4046
local_branch.lock_read()
4048
remote_branch.lock_read()
4050
local_extra, remote_extra = find_unmerged(
4051
local_branch, remote_branch, restrict,
4052
backward=not reverse,
4053
include_merges=include_merges,
4054
local_revid_range=local_revid_range,
4055
remote_revid_range=remote_revid_range)
4057
if log_format is None:
4058
registry = log.log_formatter_registry
4059
log_format = registry.get_default(local_branch)
4060
lf = log_format(to_file=self.outf,
4062
show_timezone='original')
4065
if local_extra and not theirs_only:
4066
message("You have %d extra revision(s):\n" %
4068
for revision in iter_log_revisions(local_extra,
4069
local_branch.repository,
4071
lf.log_revision(revision)
4072
printed_local = True
4075
printed_local = False
4077
if remote_extra and not mine_only:
4078
if printed_local is True:
4080
message("You are missing %d revision(s):\n" %
4082
for revision in iter_log_revisions(remote_extra,
4083
remote_branch.repository,
4085
lf.log_revision(revision)
4088
if mine_only and not local_extra:
4089
# We checked local, and found nothing extra
4090
message('This branch is up to date.\n')
4091
elif theirs_only and not remote_extra:
4092
# We checked remote, and found nothing extra
4093
message('Other branch is up to date.\n')
4094
elif not (mine_only or theirs_only or local_extra or
4096
# We checked both branches, and neither one had extra
4098
message("Branches are up to date.\n")
4100
remote_branch.unlock()
4102
local_branch.unlock()
4428
4103
if not status_code and parent is None and other_branch is not None:
4429
self.add_cleanup(local_branch.lock_write().unlock)
4430
# handle race conditions - a parent might be set while we run.
4431
if local_branch.get_parent() is None:
4432
local_branch.set_parent(remote_branch.base)
4104
local_branch.lock_write()
4106
# handle race conditions - a parent might be set while we run.
4107
if local_branch.get_parent() is None:
4108
local_branch.set_parent(remote_branch.base)
4110
local_branch.unlock()
4433
4111
return status_code
4436
4114
class cmd_pack(Command):
4437
__doc__ = """Compress the data within a repository.
4439
This operation compresses the data within a bazaar repository. As
4440
bazaar supports automatic packing of repository, this operation is
4441
normally not required to be done manually.
4443
During the pack operation, bazaar takes a backup of existing repository
4444
data, i.e. pack files. This backup is eventually removed by bazaar
4445
automatically when it is safe to do so. To save disk space by removing
4446
the backed up pack files, the --clean-obsolete-packs option may be
4449
Warning: If you use --clean-obsolete-packs and your machine crashes
4450
during or immediately after repacking, you may be left with a state
4451
where the deletion has been written to disk but the new packs have not
4452
been. In this case the repository may be unusable.
4115
"""Compress the data within a repository."""
4455
4117
_see_also = ['repositories']
4456
4118
takes_args = ['branch_or_repo?']
4458
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4461
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4120
def run(self, branch_or_repo='.'):
4462
4121
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4464
4123
branch = dir.open_branch()
4465
4124
repository = branch.repository
4466
4125
except errors.NotBranchError:
4467
4126
repository = dir.open_repository()
4468
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4471
4130
class cmd_plugins(Command):
4472
__doc__ = """List the installed plugins.
4131
"""List the installed plugins.
4474
4133
This command displays the list of installed plugins including
4475
4134
version of plugin and a short description of each.
4562
4224
Option('long', help='Show commit date in annotations.'),
4567
4228
encoding_type = 'exact'
4569
4230
@display_command
4570
4231
def run(self, filename, all=False, long=False, revision=None,
4571
show_ids=False, directory=None):
4572
4233
from bzrlib.annotate import annotate_file, annotate_file_tree
4573
4234
wt, branch, relpath = \
4574
_open_directory_or_containing_tree_or_branch(filename, directory)
4576
self.add_cleanup(wt.lock_read().unlock)
4578
self.add_cleanup(branch.lock_read().unlock)
4579
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4580
self.add_cleanup(tree.lock_read().unlock)
4582
file_id = wt.path2id(relpath)
4584
file_id = tree.path2id(relpath)
4586
raise errors.NotVersionedError(filename)
4587
file_version = tree.inventory[file_id].revision
4588
if wt is not None and revision is None:
4589
# If there is a tree and we're not annotating historical
4590
# versions, annotate the working tree's content.
4591
annotate_file_tree(wt, file_id, self.outf, long, all,
4594
annotate_file(branch, file_version, file_id, long, all, self.outf,
4235
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4241
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4243
file_id = wt.path2id(relpath)
4245
file_id = tree.path2id(relpath)
4247
raise errors.NotVersionedError(filename)
4248
file_version = tree.inventory[file_id].revision
4249
if wt is not None and revision is None:
4250
# If there is a tree and we're not annotating historical
4251
# versions, annotate the working tree's content.
4252
annotate_file_tree(wt, file_id, self.outf, long, all,
4255
annotate_file(branch, file_version, file_id, long, all, self.outf,
4598
4264
class cmd_re_sign(Command):
4599
__doc__ = """Create a digital signature for an existing revision."""
4265
"""Create a digital signature for an existing revision."""
4600
4266
# TODO be able to replace existing ones.
4602
4268
hidden = True # is this right ?
4603
4269
takes_args = ['revision_id*']
4604
takes_options = ['directory', 'revision']
4270
takes_options = ['revision']
4606
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4272
def run(self, revision_id_list=None, revision=None):
4607
4273
if revision_id_list is not None and revision is not None:
4608
4274
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4609
4275
if revision_id_list is None and revision is None:
4610
4276
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4611
b = WorkingTree.open_containing(directory)[0].branch
4612
self.add_cleanup(b.lock_write().unlock)
4613
return self._run(b, revision_id_list, revision)
4277
b = WorkingTree.open_containing(u'.')[0].branch
4280
return self._run(b, revision_id_list, revision)
4615
4284
def _run(self, b, revision_id_list, revision):
4616
4285
import bzrlib.gpg as gpg
4806
4478
end_revision=last_revno)
4809
self.outf.write('Dry-run, pretending to remove'
4810
' the above revisions.\n')
4481
print 'Dry-run, pretending to remove the above revisions.'
4483
val = raw_input('Press <enter> to continue')
4812
self.outf.write('The above revision(s) will be removed.\n')
4815
if not ui.ui_factory.get_boolean('Are you sure'):
4816
self.outf.write('Canceled')
4485
print 'The above revision(s) will be removed.'
4487
val = raw_input('Are you sure [y/N]? ')
4488
if val.lower() not in ('y', 'yes'):
4819
4492
mutter('Uncommitting from {%s} to {%s}',
4820
4493
last_rev_id, rev_id)
4821
4494
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4822
4495
revno=revno, local=local)
4823
self.outf.write('You can restore the old tip by running:\n'
4824
' bzr pull . -r revid:%s\n' % last_rev_id)
4496
note('You can restore the old tip by running:\n'
4497
' bzr pull . -r revid:%s', last_rev_id)
4827
4500
class cmd_break_lock(Command):
4828
__doc__ = """Break a dead lock on a repository, branch or working directory.
4501
"""Break a dead lock on a repository, branch or working directory.
4830
4503
CAUTION: Locks should only be broken when you are sure that the process
4831
4504
holding the lock has been stopped.
4833
You can get information on what locks are open via the 'bzr info
4834
[location]' command.
4506
You can get information on what locks are open via the 'bzr info' command.
4838
bzr break-lock bzr+ssh://example.com/bzr/foo
4840
4511
takes_args = ['location?']
5114
4780
directly from the merge directive, without retrieving data from a
5117
`bzr send` creates a compact data set that, when applied using bzr
5118
merge, has the same effect as merging from the source branch.
5120
By default the merge directive is self-contained and can be applied to any
5121
branch containing submit_branch in its ancestory without needing access to
5124
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5125
revisions, but only a structured request to merge from the
5126
public_location. In that case the public_branch is needed and it must be
5127
up-to-date and accessible to the recipient. The public_branch is always
5128
included if known, so that people can check it later.
5130
The submit branch defaults to the parent of the source branch, but can be
5131
overridden. Both submit branch and public branch will be remembered in
5132
branch.conf the first time they are used for a particular branch. The
5133
source branch defaults to that containing the working directory, but can
5134
be changed using --from.
5136
In order to calculate those changes, bzr must analyse the submit branch.
5137
Therefore it is most efficient for the submit branch to be a local mirror.
5138
If a public location is known for the submit_branch, that location is used
5139
in the merge directive.
5141
The default behaviour is to send the merge directive by mail, unless -o is
5142
given, in which case it is sent to a file.
4783
If --no-bundle is specified, then public_branch is needed (and must be
4784
up-to-date), so that the receiver can perform the merge using the
4785
public_branch. The public_branch is always included if known, so that
4786
people can check it later.
4788
The submit branch defaults to the parent, but can be overridden. Both
4789
submit branch and public branch will be remembered if supplied.
4791
If a public_branch is known for the submit_branch, that public submit
4792
branch is used in the merge instructions. This means that a local mirror
4793
can be used as your actual submit branch, once you have set public_branch
5144
4796
Mail is sent using your preferred mail program. This should be transparent
5145
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4797
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5146
4798
If the preferred client can't be found (or used), your editor will be used.
5148
4800
To use a specific mail program, set the mail_client configuration option.
5149
4801
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5150
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5151
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5152
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4802
specific clients are "claws", "evolution", "kmail", "mutt", and
4803
"thunderbird"; generic options are "default", "editor", "emacsclient",
4804
"mapi", and "xdg-email". Plugins may also add supported clients.
5155
4806
If mail is being sent, a to address is required. This can be supplied
5156
4807
either on the commandline, by setting the submit_to configuration
5190
4837
short_name='f',
5192
4839
Option('output', short_name='o',
5193
help='Write merge directive to this file or directory; '
4840
help='Write merge directive to this file; '
5194
4841
'use - for stdout.',
5197
help='Refuse to send if there are uncommitted changes in'
5198
' the working tree, --no-strict disables the check.'),
5199
4843
Option('mail-to', help='Mail the request to this address.',
5203
4847
Option('body', help='Body for the email.', type=unicode),
5204
4848
RegistryOption('format',
5205
help='Use the specified output format.',
5206
lazy_registry=('bzrlib.send', 'format_registry')),
4849
help='Use the specified output format.',
4850
lazy_registry=('bzrlib.send', 'format_registry'))
5209
4853
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5210
4854
no_patch=False, revision=None, remember=False, output=None,
5211
format=None, mail_to=None, message=None, body=None,
5212
strict=None, **kwargs):
4855
format=None, mail_to=None, message=None, body=None, **kwargs):
5213
4856
from bzrlib.send import send
5214
4857
return send(submit_branch, revision, public_branch, remember,
5215
format, no_bundle, no_patch, output,
5216
kwargs.get('from', '.'), mail_to, message, body,
4858
format, no_bundle, no_patch, output,
4859
kwargs.get('from', '.'), mail_to, message, body,
5221
4863
class cmd_bundle_revisions(cmd_send):
5222
__doc__ = """Create a merge-directive for submitting changes.
4864
"""Create a merge-directive for submitting changes.
5224
4866
A merge directive provides many things needed for requesting merges:
5282
4921
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5283
4922
no_patch=False, revision=None, remember=False, output=None,
5284
format=None, strict=None, **kwargs):
4923
format=None, **kwargs):
5285
4924
if output is None:
5287
4926
from bzrlib.send import send
5288
4927
return send(submit_branch, revision, public_branch, remember,
5289
4928
format, no_bundle, no_patch, output,
5290
4929
kwargs.get('from', '.'), None, None, None,
5291
self.outf, strict=strict)
5294
4933
class cmd_tag(Command):
5295
__doc__ = """Create, remove or modify a tag naming a revision.
4934
"""Create, remove or modify a tag naming a revision.
5297
4936
Tags give human-meaningful names to revisions. Commands that take a -r
5298
4937
(--revision) option can be given -rtag:X, where X is any previously
5307
4946
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5308
4947
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5310
If no tag name is specified it will be determined through the
5311
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5312
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5316
4950
_see_also = ['commit', 'tags']
5317
takes_args = ['tag_name?']
4951
takes_args = ['tag_name']
5318
4952
takes_options = [
5319
4953
Option('delete',
5320
4954
help='Delete this tag rather than placing it.',
5322
custom_help('directory',
5323
help='Branch in which to place the tag.'),
4957
help='Branch in which to place the tag.',
5324
4961
Option('force',
5325
4962
help='Replace existing tags.',
5330
def run(self, tag_name=None,
4967
def run(self, tag_name,
5336
4973
branch, relpath = Branch.open_containing(directory)
5337
self.add_cleanup(branch.lock_write().unlock)
5339
if tag_name is None:
5340
raise errors.BzrCommandError("No tag specified to delete.")
5341
branch.tags.delete_tag(tag_name)
5342
self.outf.write('Deleted tag %s.\n' % tag_name)
5345
if len(revision) != 1:
5346
raise errors.BzrCommandError(
5347
"Tags can only be placed on a single revision, "
5349
revision_id = revision[0].as_revision_id(branch)
4977
branch.tags.delete_tag(tag_name)
4978
self.outf.write('Deleted tag %s.\n' % tag_name)
5351
revision_id = branch.last_revision()
5352
if tag_name is None:
5353
tag_name = branch.automatic_tag_name(revision_id)
5354
if tag_name is None:
5355
raise errors.BzrCommandError(
5356
"Please specify a tag name.")
5357
if (not force) and branch.tags.has_tag(tag_name):
5358
raise errors.TagAlreadyExists(tag_name)
5359
branch.tags.set_tag(tag_name, revision_id)
5360
self.outf.write('Created tag %s.\n' % tag_name)
4981
if len(revision) != 1:
4982
raise errors.BzrCommandError(
4983
"Tags can only be placed on a single revision, "
4985
revision_id = revision[0].as_revision_id(branch)
4987
revision_id = branch.last_revision()
4988
if (not force) and branch.tags.has_tag(tag_name):
4989
raise errors.TagAlreadyExists(tag_name)
4990
branch.tags.set_tag(tag_name, revision_id)
4991
self.outf.write('Created tag %s.\n' % tag_name)
5363
4996
class cmd_tags(Command):
5364
__doc__ = """List tags.
5366
4999
This command shows a table of tag names and the revisions they reference.
5369
5002
_see_also = ['tag']
5370
5003
takes_options = [
5371
custom_help('directory',
5372
help='Branch whose tags should be displayed.'),
5005
help='Branch whose tags should be displayed.',
5373
5009
RegistryOption.from_kwargs('sort',
5374
5010
'Sort tags by different criteria.', title='Sorting',
5375
5011
alpha='Sort tags lexicographically (default).',
5395
self.add_cleanup(branch.lock_read().unlock)
5397
graph = branch.repository.get_graph()
5398
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5399
revid1, revid2 = rev1.rev_id, rev2.rev_id
5400
# only show revisions between revid1 and revid2 (inclusive)
5401
tags = [(tag, revid) for tag, revid in tags if
5402
graph.is_between(revid, revid1, revid2)]
5405
elif sort == 'time':
5407
for tag, revid in tags:
5409
revobj = branch.repository.get_revision(revid)
5410
except errors.NoSuchRevision:
5411
timestamp = sys.maxint # place them at the end
5413
timestamp = revobj.timestamp
5414
timestamps[revid] = timestamp
5415
tags.sort(key=lambda x: timestamps[x[1]])
5417
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5418
for index, (tag, revid) in enumerate(tags):
5420
revno = branch.revision_id_to_dotted_revno(revid)
5421
if isinstance(revno, tuple):
5422
revno = '.'.join(map(str, revno))
5423
except errors.NoSuchRevision:
5424
# Bad tag data/merges can lead to tagged revisions
5425
# which are not in this branch. Fail gracefully ...
5427
tags[index] = (tag, revno)
5034
graph = branch.repository.get_graph()
5035
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5036
revid1, revid2 = rev1.rev_id, rev2.rev_id
5037
# only show revisions between revid1 and revid2 (inclusive)
5038
tags = [(tag, revid) for tag, revid in tags if
5039
graph.is_between(revid, revid1, revid2)]
5042
elif sort == 'time':
5044
for tag, revid in tags:
5046
revobj = branch.repository.get_revision(revid)
5047
except errors.NoSuchRevision:
5048
timestamp = sys.maxint # place them at the end
5050
timestamp = revobj.timestamp
5051
timestamps[revid] = timestamp
5052
tags.sort(key=lambda x: timestamps[x[1]])
5054
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5055
for index, (tag, revid) in enumerate(tags):
5057
revno = branch.revision_id_to_dotted_revno(revid)
5058
if isinstance(revno, tuple):
5059
revno = '.'.join(map(str, revno))
5060
except errors.NoSuchRevision:
5061
# Bad tag data/merges can lead to tagged revisions
5062
# which are not in this branch. Fail gracefully ...
5064
tags[index] = (tag, revno)
5429
5067
for tag, revspec in tags:
5430
5068
self.outf.write('%-20s %s\n' % (tag, revspec))
5433
5071
class cmd_reconfigure(Command):
5434
__doc__ = """Reconfigure the type of a bzr directory.
5072
"""Reconfigure the type of a bzr directory.
5436
5074
A target configuration must be specified.
5468
5106
Option('bind-to', help='Branch to bind checkout to.', type=str),
5469
5107
Option('force',
5470
help='Perform reconfiguration even if local changes'
5472
Option('stacked-on',
5473
help='Reconfigure a branch to be stacked on another branch.',
5477
help='Reconfigure a branch to be unstacked. This '
5478
'may require copying substantial data into it.',
5108
help='Perform reconfiguration even if local changes'
5482
def run(self, location=None, target_type=None, bind_to=None, force=False,
5112
def run(self, location=None, target_type=None, bind_to=None, force=False):
5485
5113
directory = bzrdir.BzrDir.open(location)
5486
if stacked_on and unstacked:
5487
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5488
elif stacked_on is not None:
5489
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5491
reconfigure.ReconfigureUnstacked().apply(directory)
5492
# At the moment you can use --stacked-on and a different
5493
# reconfiguration shape at the same time; there seems no good reason
5495
5114
if target_type is None:
5496
if stacked_on or unstacked:
5499
raise errors.BzrCommandError('No target configuration '
5115
raise errors.BzrCommandError('No target configuration specified')
5501
5116
elif target_type == 'branch':
5502
5117
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5503
5118
elif target_type == 'tree':
5540
5155
/path/to/newbranch.
5542
5157
Bound branches use the nickname of its master branch unless it is set
5543
locally, in which case switching will update the local nickname to be
5158
locally, in which case switching will update the the local nickname to be
5544
5159
that of the master.
5547
takes_args = ['to_location?']
5548
takes_options = ['directory',
5550
help='Switch even if local commits will be lost.'),
5552
Option('create-branch', short_name='b',
5553
help='Create the target branch from this one before'
5554
' switching to it.'),
5162
takes_args = ['to_location']
5163
takes_options = [Option('force',
5164
help='Switch even if local commits will be lost.')
5557
def run(self, to_location=None, force=False, create_branch=False,
5558
revision=None, directory=u'.'):
5167
def run(self, to_location, force=False):
5559
5168
from bzrlib import switch
5560
tree_location = directory
5561
revision = _get_one_revision('switch', revision)
5562
5170
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5563
if to_location is None:
5564
if revision is None:
5565
raise errors.BzrCommandError('You must supply either a'
5566
' revision or a location')
5567
to_location = tree_location
5569
5172
branch = control_dir.open_branch()
5570
5173
had_explicit_nick = branch.get_config().has_explicit_nickname()
5571
5174
except errors.NotBranchError:
5573
5175
had_explicit_nick = False
5576
raise errors.BzrCommandError('cannot create branch without'
5578
to_location = directory_service.directories.dereference(
5580
if '/' not in to_location and '\\' not in to_location:
5581
# This path is meant to be relative to the existing branch
5582
this_url = self._get_branch_location(control_dir)
5583
to_location = urlutils.join(this_url, '..', to_location)
5584
to_branch = branch.bzrdir.sprout(to_location,
5585
possible_transports=[branch.bzrdir.root_transport],
5586
source_branch=branch).open_branch()
5589
to_branch = Branch.open(to_location)
5590
except errors.NotBranchError:
5591
this_url = self._get_branch_location(control_dir)
5592
to_branch = Branch.open(
5593
urlutils.join(this_url, '..', to_location))
5594
if revision is not None:
5595
revision = revision.as_revision_id(to_branch)
5596
switch.switch(control_dir, to_branch, force, revision_id=revision)
5177
to_branch = Branch.open(to_location)
5178
except errors.NotBranchError:
5179
this_url = self._get_branch_location(control_dir)
5180
to_branch = Branch.open(
5181
urlutils.join(this_url, '..', to_location))
5182
switch.switch(control_dir, to_branch, force)
5597
5183
if had_explicit_nick:
5598
5184
branch = control_dir.open_branch() #get the new branch!
5599
5185
branch.nick = to_branch.nick
5860
5420
_see_also = ['unshelve']
5862
5422
def run(self, revision=None, all=False, file_list=None, message=None,
5863
writer=None, list=False, destroy=False, directory=u'.'):
5423
writer=None, list=False, destroy=False):
5865
5425
return self.run_for_list()
5866
5426
from bzrlib.shelf_ui import Shelver
5867
5427
if writer is None:
5868
5428
writer = bzrlib.option.diff_writer_registry.get()
5870
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5871
file_list, message, destroy=destroy, directory=directory)
5430
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5431
message, destroy=destroy).run()
5876
5432
except errors.UserAbort:
5879
5435
def run_for_list(self):
5880
5436
tree = WorkingTree.open_containing('.')[0]
5881
self.add_cleanup(tree.lock_read().unlock)
5882
manager = tree.get_shelf_manager()
5883
shelves = manager.active_shelves()
5884
if len(shelves) == 0:
5885
note('No shelved changes.')
5887
for shelf_id in reversed(shelves):
5888
message = manager.get_metadata(shelf_id).get('message')
5890
message = '<no message>'
5891
self.outf.write('%3d: %s\n' % (shelf_id, message))
5439
manager = tree.get_shelf_manager()
5440
shelves = manager.active_shelves()
5441
if len(shelves) == 0:
5442
note('No shelved changes.')
5444
for shelf_id in reversed(shelves):
5445
message = manager.get_metadata(shelf_id).get('message')
5447
message = '<no message>'
5448
self.outf.write('%3d: %s\n' % (shelf_id, message))
5895
5454
class cmd_unshelve(Command):
5896
__doc__ = """Restore shelved changes.
5455
"""Restore shelved changes.
5898
5457
By default, the most recently shelved changes are restored. However if you
5899
5458
specify a shelf by id those changes will be restored instead. This works
5903
5462
takes_args = ['shelf_id?']
5904
5463
takes_options = [
5906
5464
RegistryOption.from_kwargs(
5907
5465
'action', help="The action to perform.",
5908
5466
enum_switch=False, value_switches=True,
5909
5467
apply="Apply changes and remove from the shelf.",
5910
5468
dry_run="Show changes, but do not apply or remove them.",
5911
preview="Instead of unshelving the changes, show the diff that "
5912
"would result from unshelving.",
5913
delete_only="Delete changes without applying them.",
5914
keep="Apply changes but don't delete them.",
5469
delete_only="Delete changes without applying them."
5917
5472
_see_also = ['shelve']
5919
def run(self, shelf_id=None, action='apply', directory=u'.'):
5474
def run(self, shelf_id=None, action='apply'):
5920
5475
from bzrlib.shelf_ui import Unshelver
5921
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5925
unshelver.tree.unlock()
5476
Unshelver.from_args(shelf_id, action).run()
5928
5479
class cmd_clean_tree(Command):
5929
__doc__ = """Remove unwanted files from working tree.
5480
"""Remove unwanted files from working tree.
5931
5482
By default, only unknown files, not ignored files, are deleted. Versioned
5932
5483
files are never deleted.
5950
5500
' deleting them.'),
5951
5501
Option('force', help='Do not prompt before deleting.')]
5952
5502
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5953
force=False, directory=u'.'):
5954
5504
from bzrlib.clean_tree import clean_tree
5955
5505
if not (unknown or ignored or detritus):
5959
clean_tree(directory, unknown=unknown, ignored=ignored,
5960
detritus=detritus, dry_run=dry_run, no_prompt=force)
5509
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5510
dry_run=dry_run, no_prompt=force)
5963
5513
class cmd_reference(Command):
5964
__doc__ = """list, view and set branch locations for nested trees.
5514
"""list, view and set branch locations for nested trees.
5966
5516
If no arguments are provided, lists the branch locations for nested trees.
5967
5517
If one argument is provided, display the branch location for that tree.
6007
5557
self.outf.write('%s %s\n' % (path, location))
6010
def _register_lazy_builtins():
6011
# register lazy builtins from other modules; called at startup and should
6012
# be only called once.
6013
for (name, aliases, module_name) in [
6014
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6015
('cmd_dpush', [], 'bzrlib.foreign'),
6016
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6017
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6018
('cmd_conflicts', [], 'bzrlib.conflicts'),
6019
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6021
builtin_command_registry.register_lazy(name, aliases, module_name)
5560
# these get imported and then picked up by the scan for cmd_*
5561
# TODO: Some more consistent way to split command definitions across files;
5562
# we do need to load at least some information about them to know of
5563
# aliases. ideally we would avoid loading the implementation until the
5564
# details were needed.
5565
from bzrlib.cmd_version_info import cmd_version_info
5566
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5567
from bzrlib.bundle.commands import (
5570
from bzrlib.foreign import cmd_dpush
5571
from bzrlib.sign_my_commits import cmd_sign_my_commits
5572
from bzrlib.weave_commands import cmd_versionedfile_list, \
5573
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
