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
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)
515
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
519
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()
522
469
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
470
"""Show current revision number.
525
472
This is equal to the number of revisions on this branch.
528
475
_see_also = ['info']
529
476
takes_args = ['location?']
531
Option('tree', help='Show revno of working tree'),
535
def run(self, tree=False, location=u'.'):
538
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
540
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
raise errors.NoWorkingTree(location)
542
revid = wt.last_revision()
544
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
545
except errors.NoSuchRevision:
547
revno = ".".join(str(n) for n in revno_t)
549
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
553
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')
556
484
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
560
488
takes_args = ['revision_info*']
561
489
takes_options = [
563
custom_help('directory',
564
492
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
566
Option('tree', help='Show revno of working tree'),
493
'rather than the one containing the working directory.',
570
def run(self, revision=None, directory=u'.', tree=False,
571
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
574
wt = WorkingTree.open_containing(directory)[0]
576
self.add_cleanup(wt.lock_read().unlock)
577
except (errors.NoWorkingTree, errors.NotLocalUrl):
579
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
582
503
if revision is not None:
583
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
584
505
if revision_info_list is not None:
585
for rev_str in revision_info_list:
586
rev_spec = RevisionSpec.from_string(rev_str)
587
revision_ids.append(rev_spec.as_revision_id(b))
588
# No arguments supplied, default to the last revision
589
if len(revision_ids) == 0:
592
raise errors.NoWorkingTree(directory)
593
revision_ids.append(wt.last_revision())
595
revision_ids.append(b.last_revision())
599
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)
601
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
602
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
603
518
except errors.NoSuchRevision:
605
maxlen = max(maxlen, len(revno))
606
revinfos.append([revno, revision_id])
610
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)
613
524
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
616
527
In non-recursive mode, all the named items are added, regardless
617
528
of whether they were previously ignored. A warning is given if
682
590
should_print=(not is_quiet()))
685
self.add_cleanup(base_tree.lock_read().unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
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:
690
602
if len(ignored) > 0:
692
604
for glob in sorted(ignored.keys()):
693
605
for path in ignored[glob]:
694
606
self.outf.write("ignored %s matching \"%s\"\n"
610
for glob, paths in ignored.items():
611
match_len += len(paths)
612
self.outf.write("ignored %d file(s).\n" % match_len)
613
self.outf.write("If you wish to add ignored files, "
614
"please add them explicitly by name. "
615
"(\"bzr ignored\" gives a list)\n")
698
618
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
619
"""Create a new versioned directory.
701
621
This is equivalent to creating the directory and then adding it.
761
676
revision = _get_one_revision('inventory', revision)
762
677
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
764
if revision is not None:
765
tree = revision.as_tree(work_tree.branch)
767
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
773
if file_list is not None:
774
file_ids = tree.paths2ids(file_list, trees=extra_trees,
775
require_versioned=True)
776
# find_ids_across_trees may include some paths that don't
778
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
779
for file_id in file_ids if file_id in tree)
781
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:
784
703
for path, entry in entries:
785
704
if kind and kind != entry.kind:
922
846
dest = osutils.pathjoin(dest_parent, dest_tail)
923
847
mutter("attempting to move %s => %s", src, dest)
924
848
tree.rename_one(src, dest, after=after)
926
self.outf.write("%s => %s\n" % (src, dest))
849
self.outf.write("%s => %s\n" % (src, dest))
929
852
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
853
"""Turn this branch into a mirror of another branch.
932
By default, this command only works on branches that have not diverged.
933
Branches are considered diverged if the destination branch's most recent
934
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.
937
859
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
860
from one into the other. Once one branch has merged, the other should
939
861
be able to pull it again.
941
If you want to replace your local changes and just want your branch to
942
match the remote one, use pull --overwrite. This will work even if the two
943
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.
945
866
If there is no default location set, the first pull will set it. After
946
867
that, you can omit the location to use the default. To change the
1021
943
branch_from = Branch.open(location,
1022
944
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1025
946
if branch_to.get_parent() is None or remember:
1026
947
branch_to.set_parent(branch_from.base)
1028
if revision is not None:
1029
revision_id = revision.as_revision_id(branch_from)
1031
if tree_to is not None:
1032
view_info = _get_view_info_for_change_reporter(tree_to)
1033
change_reporter = delta._ChangeReporter(
1034
unversioned_filter=tree_to.is_ignored,
1035
view_info=view_info)
1036
result = tree_to.pull(
1037
branch_from, overwrite, revision_id, change_reporter,
1038
possible_transports=possible_transports, local=local)
1040
result = branch_to.pull(
1041
branch_from, overwrite, revision_id, local=local)
1043
result.report(self.outf)
1044
if verbose and result.old_revid != result.new_revid:
1045
log.show_branch_change(
1046
branch_to, self.outf, result.old_revno,
949
if branch_from is not branch_to:
950
branch_from.lock_read()
952
if revision is not None:
953
revision_id = revision.as_revision_id(branch_from)
955
branch_to.lock_write()
957
if tree_to is not None:
958
view_info = _get_view_info_for_change_reporter(tree_to)
959
change_reporter = delta._ChangeReporter(
960
unversioned_filter=tree_to.is_ignored,
962
result = tree_to.pull(
963
branch_from, overwrite, revision_id, change_reporter,
964
possible_transports=possible_transports, local=local)
966
result = branch_to.pull(
967
branch_from, overwrite, revision_id, local=local)
969
result.report(self.outf)
970
if verbose and result.old_revid != result.new_revid:
971
log.show_branch_change(
972
branch_to, self.outf, result.old_revno,
977
if branch_from is not branch_to:
1050
981
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
982
"""Update a mirror of this branch.
1053
984
The target branch will not have its working tree populated because this
1054
985
is both expensive, and is not supported on remote file systems.
1104
1035
def run(self, location=None, remember=False, overwrite=False,
1105
1036
create_prefix=False, verbose=False, revision=None,
1106
1037
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1108
1039
from bzrlib.push import _show_push_branch
1041
# Get the source branch and revision_id
1110
1042
if directory is None:
1111
1043
directory = '.'
1112
# Get the source branch
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1115
# Get the tip's revision_id
1044
br_from = Branch.open_containing(directory)[0]
1116
1045
revision = _get_one_revision('push', revision)
1117
1046
if revision is not None:
1118
1047
revision_id = revision.in_history(br_from).rev_id
1120
1049
revision_id = None
1121
if tree is not None and revision_id is None:
1122
tree.check_changed_or_out_of_date(
1123
strict, 'push_strict',
1124
more_error='Use --no-strict to force the push.',
1125
more_warning='Uncommitted changes will not be pushed.')
1126
1051
# Get the stacked_on branch, if any
1127
1052
if stacked_on is not None:
1128
1053
stacked_on = urlutils.normalize_url(stacked_on)
1179
1104
help='Hard-link working tree files where possible.'),
1180
1105
Option('no-tree',
1181
1106
help="Create a branch without a working-tree."),
1183
help="Switch the checkout in the current directory "
1184
"to the new branch."),
1185
1107
Option('stacked',
1186
1108
help='Create a stacked branch referring to the source branch. '
1187
1109
'The new branch will depend on the availability of the source '
1188
1110
'branch for all operations.'),
1189
1111
Option('standalone',
1190
1112
help='Do not use a shared repository, even if available.'),
1191
Option('use-existing-dir',
1192
help='By default branch will fail if the target'
1193
' directory exists, but does not already'
1194
' have a control directory. This flag will'
1195
' allow branch to proceed.'),
1197
help="Bind new branch to from location."),
1199
1114
aliases = ['get', 'clone']
1201
1116
def run(self, from_location, to_location=None, revision=None,
1202
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1204
from bzrlib import switch as _mod_switch
1117
hardlink=False, stacked=False, standalone=False, no_tree=False):
1205
1118
from bzrlib.tag import _merge_tags_if_possible
1206
1120
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1122
if (accelerator_tree is not None and
1123
accelerator_tree.supports_content_filtering()):
1124
accelerator_tree = None
1208
1125
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1221
to_transport.mkdir('.')
1222
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1128
if revision is not None:
1129
revision_id = revision.as_revision_id(br_from)
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1262
# Bind to the parent
1263
parent_branch = Branch.open(from_location)
1264
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1267
# Switch to the new branch
1268
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1271
urlutils.unescape_for_display(branch.base, 'utf-8'))
1131
# FIXME - wt.last_revision, fallback to branch, fall back to
1132
# None or perhaps NULL_REVISION to mean copy nothing
1134
revision_id = br_from.last_revision()
1135
if to_location is None:
1136
to_location = urlutils.derive_to_location(from_location)
1137
to_transport = transport.get_transport(to_location)
1139
to_transport.mkdir('.')
1140
except errors.FileExists:
1141
raise errors.BzrCommandError('Target directory "%s" already'
1142
' exists.' % to_location)
1143
except errors.NoSuchFile:
1144
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1147
# preserve whatever source format we have.
1148
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1149
possible_transports=[to_transport],
1150
accelerator_tree=accelerator_tree,
1151
hardlink=hardlink, stacked=stacked,
1152
force_new_repo=standalone,
1153
create_tree_if_local=not no_tree,
1154
source_branch=br_from)
1155
branch = dir.open_branch()
1156
except errors.NoSuchRevision:
1157
to_transport.delete_tree('.')
1158
msg = "The branch %s has no revision %s." % (from_location,
1160
raise errors.BzrCommandError(msg)
1161
_merge_tags_if_possible(br_from, branch)
1162
# If the source branch is stacked, the new branch may
1163
# be stacked whether we asked for that explicitly or not.
1164
# We therefore need a try/except here and not just 'if stacked:'
1166
note('Created new stacked branch referring to %s.' %
1167
branch.get_stacked_on_url())
1168
except (errors.NotStacked, errors.UnstackableBranchFormat,
1169
errors.UnstackableRepositoryFormat), e:
1170
note('Branched %d revision(s).' % branch.revno())
1274
1175
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1176
"""Create a new checkout of an existing branch.
1277
1178
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1179
the branch found in '.'. This is useful if you have removed the working tree
1352
1253
@display_command
1353
1254
def run(self, dir=u'.'):
1354
1255
tree = WorkingTree.open_containing(dir)[0]
1355
self.add_cleanup(tree.lock_read().unlock)
1356
new_inv = tree.inventory
1357
old_tree = tree.basis_tree()
1358
self.add_cleanup(old_tree.lock_read().unlock)
1359
old_inv = old_tree.inventory
1361
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1362
for f, paths, c, v, p, n, k, e in iterator:
1363
if paths[0] == paths[1]:
1367
renames.append(paths)
1369
for old_name, new_name in renames:
1370
self.outf.write("%s => %s\n" % (old_name, new_name))
1258
new_inv = tree.inventory
1259
old_tree = tree.basis_tree()
1260
old_tree.lock_read()
1262
old_inv = old_tree.inventory
1264
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1265
for f, paths, c, v, p, n, k, e in iterator:
1266
if paths[0] == paths[1]:
1270
renames.append(paths)
1272
for old_name, new_name in renames:
1273
self.outf.write("%s => %s\n" % (old_name, new_name))
1373
1280
class cmd_update(Command):
1374
__doc__ = """Update a tree to have the latest code committed to its branch.
1281
"""Update a tree to have the latest code committed to its branch.
1376
1283
This will perform a merge into the working tree, and may generate
1377
1284
conflicts. If you have any local changes, you will still
1380
1287
If you want to discard your local changes, you can just do a
1381
1288
'bzr revert' instead of 'bzr commit' after the update.
1383
If the tree's branch is bound to a master branch, it will also update
1384
the branch from the master.
1387
1291
_see_also = ['pull', 'working-trees', 'status-flags']
1388
1292
takes_args = ['dir?']
1389
takes_options = ['revision']
1390
1293
aliases = ['up']
1392
def run(self, dir='.', revision=None):
1393
if revision is not None and len(revision) != 1:
1394
raise errors.BzrCommandError(
1395
"bzr update --revision takes exactly one revision")
1295
def run(self, dir='.'):
1396
1296
tree = WorkingTree.open_containing(dir)[0]
1397
branch = tree.branch
1398
1297
possible_transports = []
1399
master = branch.get_master_branch(
1298
master = tree.branch.get_master_branch(
1400
1299
possible_transports=possible_transports)
1401
1300
if master is not None:
1402
branch_location = master.base
1403
1301
tree.lock_write()
1405
branch_location = tree.branch.base
1406
1303
tree.lock_tree_write()
1407
self.add_cleanup(tree.unlock)
1408
# get rid of the final '/' and be ready for display
1409
branch_location = urlutils.unescape_for_display(
1410
branch_location.rstrip('/'),
1412
existing_pending_merges = tree.get_parent_ids()[1:]
1416
# may need to fetch data into a heavyweight checkout
1417
# XXX: this may take some time, maybe we should display a
1419
old_tip = branch.update(possible_transports)
1420
if revision is not None:
1421
revision_id = revision[0].as_revision_id(branch)
1423
revision_id = branch.last_revision()
1424
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1425
revno = branch.revision_id_to_dotted_revno(revision_id)
1426
note("Tree is up to date at revision %s of branch %s" %
1427
('.'.join(map(str, revno)), branch_location))
1429
view_info = _get_view_info_for_change_reporter(tree)
1430
change_reporter = delta._ChangeReporter(
1431
unversioned_filter=tree.is_ignored,
1432
view_info=view_info)
1305
existing_pending_merges = tree.get_parent_ids()[1:]
1306
last_rev = _mod_revision.ensure_null(tree.last_revision())
1307
if last_rev == _mod_revision.ensure_null(
1308
tree.branch.last_revision()):
1309
# may be up to date, check master too.
1310
if master is None or last_rev == _mod_revision.ensure_null(
1311
master.last_revision()):
1312
revno = tree.branch.revision_id_to_revno(last_rev)
1313
note("Tree is up to date at revision %d." % (revno,))
1315
view_info = _get_view_info_for_change_reporter(tree)
1434
1316
conflicts = tree.update(
1436
possible_transports=possible_transports,
1437
revision=revision_id,
1439
except errors.NoSuchRevision, e:
1440
raise errors.BzrCommandError(
1441
"branch has no revision %s\n"
1442
"bzr update --revision only works"
1443
" for a revision in the branch history"
1445
revno = tree.branch.revision_id_to_dotted_revno(
1446
_mod_revision.ensure_null(tree.last_revision()))
1447
note('Updated to revision %s of branch %s' %
1448
('.'.join(map(str, revno)), branch_location))
1449
parent_ids = tree.get_parent_ids()
1450
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1451
note('Your local commits will now show as pending merges with '
1452
"'bzr status', and can be committed with 'bzr commit'.")
1317
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1318
view_info=view_info), possible_transports=possible_transports)
1319
revno = tree.branch.revision_id_to_revno(
1320
_mod_revision.ensure_null(tree.last_revision()))
1321
note('Updated to revision %d.' % (revno,))
1322
if tree.get_parent_ids()[1:] != existing_pending_merges:
1323
note('Your local commits will now show as pending merges with '
1324
"'bzr status', and can be committed with 'bzr commit'.")
1459
1333
class cmd_info(Command):
1460
__doc__ = """Show information about a working tree, branch or repository.
1334
"""Show information about a working tree, branch or repository.
1462
1336
This command will show all known locations and formats associated to the
1463
1337
tree, branch or repository.
1529
1403
if file_list is not None:
1530
1404
file_list = [f for f in file_list]
1532
self.add_cleanup(tree.lock_write().unlock)
1533
# Heuristics should probably all move into tree.remove_smart or
1536
added = tree.changes_from(tree.basis_tree(),
1537
specific_files=file_list).added
1538
file_list = sorted([f[0] for f in added], reverse=True)
1539
if len(file_list) == 0:
1540
raise errors.BzrCommandError('No matching files.')
1541
elif file_list is None:
1542
# missing files show up in iter_changes(basis) as
1543
# versioned-with-no-kind.
1545
for change in tree.iter_changes(tree.basis_tree()):
1546
# Find paths in the working tree that have no kind:
1547
if change[1][1] is not None and change[6][1] is None:
1548
missing.append(change[1][1])
1549
file_list = sorted(missing, reverse=True)
1550
file_deletion_strategy = 'keep'
1551
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1552
keep_files=file_deletion_strategy=='keep',
1553
force=file_deletion_strategy=='force')
1408
# Heuristics should probably all move into tree.remove_smart or
1411
added = tree.changes_from(tree.basis_tree(),
1412
specific_files=file_list).added
1413
file_list = sorted([f[0] for f in added], reverse=True)
1414
if len(file_list) == 0:
1415
raise errors.BzrCommandError('No matching files.')
1416
elif file_list is None:
1417
# missing files show up in iter_changes(basis) as
1418
# versioned-with-no-kind.
1420
for change in tree.iter_changes(tree.basis_tree()):
1421
# Find paths in the working tree that have no kind:
1422
if change[1][1] is not None and change[6][1] is None:
1423
missing.append(change[1][1])
1424
file_list = sorted(missing, reverse=True)
1425
file_deletion_strategy = 'keep'
1426
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1427
keep_files=file_deletion_strategy=='keep',
1428
force=file_deletion_strategy=='force')
1556
1433
class cmd_file_id(Command):
1557
__doc__ = """Print file_id of a particular file or directory.
1434
"""Print file_id of a particular file or directory.
1559
1436
The file_id is assigned when the file is first added and remains the
1560
1437
same through all revisions where the file exists, even when it is
1960
1812
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1961
1813
' one or two revision specifiers')
1963
if using is not None and format is not None:
1964
raise errors.BzrCommandError('--using and --format are mutually '
1967
(old_tree, new_tree,
1968
old_branch, new_branch,
1969
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1970
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1815
old_tree, new_tree, specific_files, extra_trees = \
1816
_get_trees_to_diff(file_list, revision, old, new,
1971
1818
return show_diff_trees(old_tree, new_tree, sys.stdout,
1972
1819
specific_files=specific_files,
1973
1820
external_diff_options=diff_options,
1974
1821
old_label=old_label, new_label=new_label,
1975
extra_trees=extra_trees, using=using,
1822
extra_trees=extra_trees, using=using)
1979
1825
class cmd_deleted(Command):
1980
__doc__ = """List files deleted in the working tree.
1826
"""List files deleted in the working tree.
1982
1828
# TODO: Show files deleted since a previous revision, or
1983
1829
# between two revisions.
1986
1832
# level of effort but possibly much less IO. (Or possibly not,
1987
1833
# if the directories are very large...)
1988
1834
_see_also = ['status', 'ls']
1989
takes_options = ['directory', 'show-ids']
1835
takes_options = ['show-ids']
1991
1837
@display_command
1992
def run(self, show_ids=False, directory=u'.'):
1993
tree = WorkingTree.open_containing(directory)[0]
1994
self.add_cleanup(tree.lock_read().unlock)
1995
old = tree.basis_tree()
1996
self.add_cleanup(old.lock_read().unlock)
1997
for path, ie in old.inventory.iter_entries():
1998
if not tree.has_id(ie.file_id):
1999
self.outf.write(path)
2001
self.outf.write(' ')
2002
self.outf.write(ie.file_id)
2003
self.outf.write('\n')
1838
def run(self, show_ids=False):
1839
tree = WorkingTree.open_containing(u'.')[0]
1842
old = tree.basis_tree()
1845
for path, ie in old.inventory.iter_entries():
1846
if not tree.has_id(ie.file_id):
1847
self.outf.write(path)
1849
self.outf.write(' ')
1850
self.outf.write(ie.file_id)
1851
self.outf.write('\n')
2006
1858
class cmd_modified(Command):
2007
__doc__ = """List files modified in working tree.
1859
"""List files modified in working tree.
2011
1863
_see_also = ['status', 'ls']
2012
takes_options = ['directory', 'null']
1866
help='Write an ascii NUL (\\0) separator '
1867
'between files rather than a newline.')
2014
1870
@display_command
2015
def run(self, null=False, directory=u'.'):
2016
tree = WorkingTree.open_containing(directory)[0]
1871
def run(self, null=False):
1872
tree = WorkingTree.open_containing(u'.')[0]
2017
1873
td = tree.changes_from(tree.basis_tree())
2018
1874
for path, id, kind, text_modified, meta_modified in td.modified:
2025
1881
class cmd_added(Command):
2026
__doc__ = """List files added in working tree.
1882
"""List files added in working tree.
2030
1886
_see_also = ['status', 'ls']
2031
takes_options = ['directory', 'null']
1889
help='Write an ascii NUL (\\0) separator '
1890
'between files rather than a newline.')
2033
1893
@display_command
2034
def run(self, null=False, directory=u'.'):
2035
wt = WorkingTree.open_containing(directory)[0]
2036
self.add_cleanup(wt.lock_read().unlock)
2037
basis = wt.basis_tree()
2038
self.add_cleanup(basis.lock_read().unlock)
2039
basis_inv = basis.inventory
2042
if file_id in basis_inv:
2044
if inv.is_root(file_id) and len(basis_inv) == 0:
2046
path = inv.id2path(file_id)
2047
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2050
self.outf.write(path + '\0')
2052
self.outf.write(osutils.quotefn(path) + '\n')
1894
def run(self, null=False):
1895
wt = WorkingTree.open_containing(u'.')[0]
1898
basis = wt.basis_tree()
1901
basis_inv = basis.inventory
1904
if file_id in basis_inv:
1906
if inv.is_root(file_id) and len(basis_inv) == 0:
1908
path = inv.id2path(file_id)
1909
if not os.access(osutils.abspath(path), os.F_OK):
1912
self.outf.write(path + '\0')
1914
self.outf.write(osutils.quotefn(path) + '\n')
2055
1921
class cmd_root(Command):
2056
__doc__ = """Show the tree root directory.
1922
"""Show the tree root directory.
2058
1924
The root is the nearest enclosing directory with a .bzr control
2370
2222
diff_type = 'full'
2372
# Build the log formatter
2373
if log_format is None:
2374
log_format = log.log_formatter_registry.get_default(b)
2375
# Make a non-encoding output to include the diffs - bug 328007
2376
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2377
lf = log_format(show_ids=show_ids, to_file=self.outf,
2378
to_exact_file=unencoded_output,
2379
show_timezone=timezone,
2380
delta_format=get_verbosity_level(),
2382
show_advice=levels is None,
2383
author_list_handler=authors)
2385
# Choose the algorithm for doing the logging. It's annoying
2386
# having multiple code paths like this but necessary until
2387
# the underlying repository format is faster at generating
2388
# deltas or can provide everything we need from the indices.
2389
# The default algorithm - match-using-deltas - works for
2390
# multiple files and directories and is faster for small
2391
# amounts of history (200 revisions say). However, it's too
2392
# slow for logging a single file in a repository with deep
2393
# history, i.e. > 10K revisions. In the spirit of "do no
2394
# evil when adding features", we continue to use the
2395
# original algorithm - per-file-graph - for the "single
2396
# file that isn't a directory without showing a delta" case.
2397
partial_history = revision and b.repository._format.supports_chks
2398
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2399
or delta_type or partial_history)
2401
# Build the LogRequest and execute it
2402
if len(file_ids) == 0:
2404
rqst = make_log_request_dict(
2405
direction=direction, specific_fileids=file_ids,
2406
start_revision=rev1, end_revision=rev2, limit=limit,
2407
message_search=message, delta_type=delta_type,
2408
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2409
exclude_common_ancestry=exclude_common_ancestry,
2411
Logger(b, rqst).show(lf)
2226
# Build the log formatter
2227
if log_format is None:
2228
log_format = log.log_formatter_registry.get_default(b)
2229
lf = log_format(show_ids=show_ids, to_file=self.outf,
2230
show_timezone=timezone,
2231
delta_format=get_verbosity_level(),
2233
show_advice=levels is None)
2235
# Choose the algorithm for doing the logging. It's annoying
2236
# having multiple code paths like this but necessary until
2237
# the underlying repository format is faster at generating
2238
# deltas or can provide everything we need from the indices.
2239
# The default algorithm - match-using-deltas - works for
2240
# multiple files and directories and is faster for small
2241
# amounts of history (200 revisions say). However, it's too
2242
# slow for logging a single file in a repository with deep
2243
# history, i.e. > 10K revisions. In the spirit of "do no
2244
# evil when adding features", we continue to use the
2245
# original algorithm - per-file-graph - for the "single
2246
# file that isn't a directory without showing a delta" case.
2247
partial_history = revision and b.repository._format.supports_chks
2248
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2249
or delta_type or partial_history)
2251
# Build the LogRequest and execute it
2252
if len(file_ids) == 0:
2254
rqst = make_log_request_dict(
2255
direction=direction, specific_fileids=file_ids,
2256
start_revision=rev1, end_revision=rev2, limit=limit,
2257
message_search=message, delta_type=delta_type,
2258
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2259
Logger(b, rqst).show(lf)
2414
2264
def _get_revision_range(revisionspec_list, branch, command_name):
2503
2347
help='Recurse into subdirectories.'),
2504
2348
Option('from-root',
2505
2349
help='Print paths relative to the root of the branch.'),
2506
Option('unknown', short_name='u',
2507
help='Print unknown files.'),
2350
Option('unknown', help='Print unknown files.'),
2508
2351
Option('versioned', help='Print versioned files.',
2509
2352
short_name='V'),
2510
Option('ignored', short_name='i',
2511
help='Print ignored files.'),
2512
Option('kind', short_name='k',
2353
Option('ignored', help='Print ignored files.'),
2355
help='Write an ascii NUL (\\0) separator '
2356
'between files rather than a newline.'),
2513
2358
help='List entries of a particular kind: file, directory, symlink.',
2519
2362
@display_command
2520
2363
def run(self, revision=None, verbose=False,
2521
2364
recursive=False, from_root=False,
2522
2365
unknown=False, versioned=False, ignored=False,
2523
null=False, kind=None, show_ids=False, path=None, directory=None):
2366
null=False, kind=None, show_ids=False, path=None):
2525
2368
if kind and kind not in ('file', 'directory', 'symlink'):
2526
2369
raise errors.BzrCommandError('invalid kind specified')
2560
2400
view_str = views.view_display_str(view_files)
2561
2401
note("Ignoring files outside view. View is %s" % view_str)
2563
self.add_cleanup(tree.lock_read().unlock)
2564
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2565
from_dir=relpath, recursive=recursive):
2566
# Apply additional masking
2567
if not all and not selection[fc]:
2569
if kind is not None and fkind != kind:
2574
fullpath = osutils.pathjoin(relpath, fp)
2577
views.check_path_in_view(tree, fullpath)
2578
except errors.FileOutsideView:
2583
fp = osutils.pathjoin(prefix, fp)
2584
kindch = entry.kind_character()
2585
outstring = fp + kindch
2586
ui.ui_factory.clear_term()
2588
outstring = '%-8s %s' % (fc, outstring)
2589
if show_ids and fid is not None:
2590
outstring = "%-50s %s" % (outstring, fid)
2591
self.outf.write(outstring + '\n')
2593
self.outf.write(fp + '\0')
2596
self.outf.write(fid)
2597
self.outf.write('\0')
2605
self.outf.write('%-50s %s\n' % (outstring, my_id))
2607
self.outf.write(outstring + '\n')
2405
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2406
if fp.startswith(relpath):
2407
rp = fp[len(relpath):]
2408
fp = osutils.pathjoin(prefix, rp)
2409
if not recursive and '/' in rp:
2411
if not all and not selection[fc]:
2413
if kind is not None and fkind != kind:
2417
views.check_path_in_view(tree, fp)
2418
except errors.FileOutsideView:
2420
kindch = entry.kind_character()
2421
outstring = fp + kindch
2422
ui.ui_factory.clear_term()
2424
outstring = '%-8s %s' % (fc, outstring)
2425
if show_ids and fid is not None:
2426
outstring = "%-50s %s" % (outstring, fid)
2427
self.outf.write(outstring + '\n')
2429
self.outf.write(fp + '\0')
2432
self.outf.write(fid)
2433
self.outf.write('\0')
2441
self.outf.write('%-50s %s\n' % (outstring, my_id))
2443
self.outf.write(outstring + '\n')
2610
2448
class cmd_unknowns(Command):
2611
__doc__ = """List unknown files.
2449
"""List unknown files.
2615
2453
_see_also = ['ls']
2616
takes_options = ['directory']
2618
2455
@display_command
2619
def run(self, directory=u'.'):
2620
for f in WorkingTree.open_containing(directory)[0].unknowns():
2457
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2621
2458
self.outf.write(osutils.quotefn(f) + '\n')
2624
2461
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2462
"""Ignore specified files or patterns.
2627
2464
See ``bzr help patterns`` for details on the syntax of patterns.
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2635
2466
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2467
After adding, editing or deleting that file either indirectly by
2637
2468
using this command or directly by using an editor, be sure to commit
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2653
2471
Note: ignore patterns containing shell wildcards must be quoted from
2654
2472
the shell on Unix.
2677
2491
Ignore everything but the "debian" toplevel directory::
2679
2493
bzr ignore "RE:(?!debian/).*"
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2685
bzr ignore "!./local"
2689
2496
_see_also = ['status', 'ignored', 'patterns']
2690
2497
takes_args = ['name_pattern*']
2691
takes_options = ['directory',
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2499
Option('old-default-rules',
2500
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None,
2503
def run(self, name_pattern_list=None, old_default_rules=None):
2698
2504
from bzrlib import ignores
2699
if default_rules is not None:
2700
# dump the default rules and exit
2701
for pattern in ignores.USER_DEFAULTS:
2702
self.outf.write("%s\n" % pattern)
2505
if old_default_rules is not None:
2506
# dump the rules and exit
2507
for pattern in ignores.OLD_DEFAULTS:
2704
2510
if not name_pattern_list:
2705
2511
raise errors.BzrCommandError("ignore requires at least one "
2706
"NAME_PATTERN or --default-rules.")
2512
"NAME_PATTERN or --old-default-rules")
2707
2513
name_pattern_list = [globbing.normalize_pattern(p)
2708
2514
for p in name_pattern_list]
2709
2515
for name_pattern in name_pattern_list:
2744
2550
encoding_type = 'replace'
2745
2551
_see_also = ['ignore', 'ls']
2746
takes_options = ['directory']
2748
2553
@display_command
2749
def run(self, directory=u'.'):
2750
tree = WorkingTree.open_containing(directory)[0]
2751
self.add_cleanup(tree.lock_read().unlock)
2752
for path, file_class, kind, file_id, entry in tree.list_files():
2753
if file_class != 'I':
2755
## XXX: Slightly inefficient since this was already calculated
2756
pat = tree.is_ignored(path)
2757
self.outf.write('%-50s %s\n' % (path, pat))
2555
tree = WorkingTree.open_containing(u'.')[0]
2558
for path, file_class, kind, file_id, entry in tree.list_files():
2559
if file_class != 'I':
2561
## XXX: Slightly inefficient since this was already calculated
2562
pat = tree.is_ignored(path)
2563
self.outf.write('%-50s %s\n' % (path, pat))
2760
2568
class cmd_lookup_revision(Command):
2761
__doc__ = """Lookup the revision-id from a revision-number
2569
"""Lookup the revision-id from a revision-number
2764
2572
bzr lookup-revision 33
2767
2575
takes_args = ['revno']
2768
takes_options = ['directory']
2770
2577
@display_command
2771
def run(self, revno, directory=u'.'):
2578
def run(self, revno):
2773
2580
revno = int(revno)
2774
2581
except ValueError:
2775
raise errors.BzrCommandError("not a valid revision-number: %r"
2777
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2778
self.outf.write("%s\n" % revid)
2582
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2584
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2781
2587
class cmd_export(Command):
2782
__doc__ = """Export current or past revision to a destination directory or archive.
2588
"""Export current or past revision to a destination directory or archive.
2784
2590
If no revision is specified this exports the last committed revision.
2863
2665
@display_command
2864
2666
def run(self, filename, revision=None, name_from_revision=False,
2865
filters=False, directory=None):
2866
2668
if revision is not None and len(revision) != 1:
2867
2669
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2868
2670
" one revision specifier")
2869
2671
tree, branch, relpath = \
2870
_open_directory_or_containing_tree_or_branch(filename, directory)
2871
self.add_cleanup(branch.lock_read().unlock)
2872
return self._run(tree, branch, relpath, filename, revision,
2873
name_from_revision, filters)
2672
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2675
return self._run(tree, branch, relpath, filename, revision,
2676
name_from_revision, filters)
2875
2680
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2877
2682
if tree is None:
2878
2683
tree = b.basis_tree()
2879
2684
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2880
self.add_cleanup(rev_tree.lock_read().unlock)
2882
2686
old_file_id = rev_tree.path2id(relpath)
3121
2912
if local and not tree.branch.get_bound_location():
3122
2913
raise errors.LocalRequiresBoundBranch()
3124
if message is not None:
3126
file_exists = osutils.lexists(message)
3127
except UnicodeError:
3128
# The commit message contains unicode characters that can't be
3129
# represented in the filesystem encoding, so that can't be a
3134
'The commit message is a file name: "%(f)s".\n'
3135
'(use --file "%(f)s" to take commit message from that file)'
3137
ui.ui_factory.show_warning(warning_msg)
3139
message = message.replace('\r\n', '\n')
3140
message = message.replace('\r', '\n')
3142
raise errors.BzrCommandError(
3143
"please specify either --message or --file")
3145
2915
def get_message(commit_obj):
3146
2916
"""Callback to get commit message"""
3148
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3150
my_message = f.read()
3153
elif message is not None:
3154
my_message = message
3156
# No message supplied: make one up.
3157
# text is the status of the tree
3158
text = make_commit_message_template_encoded(tree,
2917
my_message = message
2918
if my_message is None and not file:
2919
t = make_commit_message_template_encoded(tree,
3159
2920
selected_list, diff=show_diff,
3160
2921
output_encoding=osutils.get_user_encoding())
3161
# start_message is the template generated from hooks
3162
# XXX: Warning - looks like hooks return unicode,
3163
# make_commit_message_template_encoded returns user encoding.
3164
# We probably want to be using edit_commit_message instead to
3166
2922
start_message = generate_commit_message_template(commit_obj)
3167
my_message = edit_commit_message_encoded(text,
2923
my_message = edit_commit_message_encoded(t,
3168
2924
start_message=start_message)
3169
2925
if my_message is None:
3170
2926
raise errors.BzrCommandError("please specify a commit"
3171
2927
" message with either --message or --file")
2928
elif my_message and file:
2929
raise errors.BzrCommandError(
2930
"please specify either --message or --file")
2932
my_message = codecs.open(file, 'rt',
2933
osutils.get_user_encoding()).read()
3172
2934
if my_message == "":
3173
2935
raise errors.BzrCommandError("empty commit message specified")
3174
2936
return my_message
3176
# The API permits a commit with a filter of [] to mean 'select nothing'
3177
# but the command line should not do that.
3178
if not selected_list:
3179
selected_list = None
3181
2939
tree.commit(message_callback=get_message,
3182
2940
specific_files=selected_list,
3183
2941
allow_pointless=unchanged, strict=strict, local=local,
3184
2942
reporter=None, verbose=verbose, revprops=properties,
3185
authors=author, timestamp=commit_stamp,
3187
2944
exclude=safe_relpath_files(tree, exclude))
3188
2945
except PointlessCommit:
2946
# FIXME: This should really happen before the file is read in;
2947
# perhaps prepare the commit; get the message; then actually commit
3189
2948
raise errors.BzrCommandError("No changes to commit."
3190
2949
" Use --unchanged to commit anyhow.")
3191
2950
except ConflictsInTree:
3212
2970
The working tree and branch checks will only give output if a problem is
3213
2971
detected. The output fields of the repository check are:
3216
This is just the number of revisions checked. It doesn't
3220
This is just the number of versionedfiles checked. It
3221
doesn't indicate a problem.
3223
unreferenced ancestors
3224
Texts that are ancestors of other texts, but
3225
are not properly referenced by the revision ancestry. This is a
3226
subtle problem that Bazaar can work around.
3229
This is the total number of unique file contents
3230
seen in the checked revisions. It does not indicate a problem.
3233
This is the total number of repeated texts seen
3234
in the checked revisions. Texts can be repeated when their file
3235
entries are modified, but the file contents are not. It does not
2973
revisions: This is just the number of revisions checked. It doesn't
2975
versionedfiles: This is just the number of versionedfiles checked. It
2976
doesn't indicate a problem.
2977
unreferenced ancestors: Texts that are ancestors of other texts, but
2978
are not properly referenced by the revision ancestry. This is a
2979
subtle problem that Bazaar can work around.
2980
unique file texts: This is the total number of unique file contents
2981
seen in the checked revisions. It does not indicate a problem.
2982
repeated file texts: This is the total number of repeated texts seen
2983
in the checked revisions. Texts can be repeated when their file
2984
entries are modified, but the file contents are not. It does not
3238
2987
If no restrictions are specified, all Bazaar data that is found at the given
3239
2988
location will be checked.
3608
3342
verbose = not is_quiet()
3609
3343
# TODO: should possibly lock the history file...
3610
3344
benchfile = open(".perf_history", "at", buffering=1)
3611
self.add_cleanup(benchfile.close)
3613
3346
test_suite_factory = None
3614
3347
benchfile = None
3615
selftest_kwargs = {"verbose": verbose,
3617
"stop_on_failure": one,
3618
"transport": transport,
3619
"test_suite_factory": test_suite_factory,
3620
"lsprof_timed": lsprof_timed,
3621
"lsprof_tests": lsprof_tests,
3622
"bench_history": benchfile,
3623
"matching_tests_first": first,
3624
"list_only": list_only,
3625
"random_seed": randomize,
3626
"exclude_pattern": exclude,
3628
"load_list": load_list,
3629
"debug_flags": debugflag,
3630
"starting_with": starting_with
3632
selftest_kwargs.update(self.additional_selftest_args)
3633
result = selftest(**selftest_kwargs)
3349
selftest_kwargs = {"verbose": verbose,
3351
"stop_on_failure": one,
3352
"transport": transport,
3353
"test_suite_factory": test_suite_factory,
3354
"lsprof_timed": lsprof_timed,
3355
"bench_history": benchfile,
3356
"matching_tests_first": first,
3357
"list_only": list_only,
3358
"random_seed": randomize,
3359
"exclude_pattern": exclude,
3361
"load_list": load_list,
3362
"debug_flags": debugflag,
3363
"starting_with": starting_with
3365
selftest_kwargs.update(self.additional_selftest_args)
3366
result = selftest(**selftest_kwargs)
3368
if benchfile is not None:
3634
3370
return int(not result)
3637
3373
class cmd_version(Command):
3638
__doc__ = """Show version of bzr."""
3374
"""Show version of bzr."""
3640
3376
encoding_type = 'replace'
3641
3377
takes_options = [
3801
3527
verified = 'inapplicable'
3802
3528
tree = WorkingTree.open_containing(directory)[0]
3530
# die as quickly as possible if there are uncommitted changes
3805
3532
basis_tree = tree.revision_tree(tree.last_revision())
3806
3533
except errors.NoSuchRevision:
3807
3534
basis_tree = tree.basis_tree()
3809
# die as quickly as possible if there are uncommitted changes
3811
if tree.has_changes():
3536
changes = tree.changes_from(basis_tree)
3537
if changes.has_changed():
3812
3538
raise errors.UncommittedChanges(tree)
3814
3540
view_info = _get_view_info_for_change_reporter(tree)
3815
3541
change_reporter = delta._ChangeReporter(
3816
3542
unversioned_filter=tree.is_ignored, view_info=view_info)
3817
pb = ui.ui_factory.nested_progress_bar()
3818
self.add_cleanup(pb.finished)
3819
self.add_cleanup(tree.lock_write().unlock)
3820
if location is not None:
3822
mergeable = bundle.read_mergeable_from_url(location,
3823
possible_transports=possible_transports)
3824
except errors.NotABundle:
3545
pb = ui.ui_factory.nested_progress_bar()
3546
cleanups.append(pb.finished)
3548
cleanups.append(tree.unlock)
3549
if location is not None:
3551
mergeable = bundle.read_mergeable_from_url(location,
3552
possible_transports=possible_transports)
3553
except errors.NotABundle:
3557
raise errors.BzrCommandError('Cannot use --uncommitted'
3558
' with bundles or merge directives.')
3560
if revision is not None:
3561
raise errors.BzrCommandError(
3562
'Cannot use -r with merge directives or bundles')
3563
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3566
if merger is None and uncommitted:
3567
if revision is not None and len(revision) > 0:
3568
raise errors.BzrCommandError('Cannot use --uncommitted and'
3569
' --revision at the same time.')
3570
location = self._select_branch_location(tree, location)[0]
3571
other_tree, other_path = WorkingTree.open_containing(location)
3572
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3574
allow_pending = False
3575
if other_path != '':
3576
merger.interesting_files = [other_path]
3579
merger, allow_pending = self._get_merger_from_branch(tree,
3580
location, revision, remember, possible_transports, pb)
3582
merger.merge_type = merge_type
3583
merger.reprocess = reprocess
3584
merger.show_base = show_base
3585
self.sanity_check_merger(merger)
3586
if (merger.base_rev_id == merger.other_rev_id and
3587
merger.other_rev_id is not None):
3588
note('Nothing to do.')
3591
if merger.interesting_files is not None:
3592
raise errors.BzrCommandError('Cannot pull individual files')
3593
if (merger.base_rev_id == tree.last_revision()):
3594
result = tree.pull(merger.other_branch, False,
3595
merger.other_rev_id)
3596
result.report(self.outf)
3598
merger.check_basis(False)
3600
return self._do_preview(merger)
3828
raise errors.BzrCommandError('Cannot use --uncommitted'
3829
' with bundles or merge directives.')
3831
if revision is not None:
3832
raise errors.BzrCommandError(
3833
'Cannot use -r with merge directives or bundles')
3834
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3837
if merger is None and uncommitted:
3838
if revision is not None and len(revision) > 0:
3839
raise errors.BzrCommandError('Cannot use --uncommitted and'
3840
' --revision at the same time.')
3841
merger = self.get_merger_from_uncommitted(tree, location, None)
3842
allow_pending = False
3845
merger, allow_pending = self._get_merger_from_branch(tree,
3846
location, revision, remember, possible_transports, None)
3848
merger.merge_type = merge_type
3849
merger.reprocess = reprocess
3850
merger.show_base = show_base
3851
self.sanity_check_merger(merger)
3852
if (merger.base_rev_id == merger.other_rev_id and
3853
merger.other_rev_id is not None):
3854
note('Nothing to do.')
3857
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
3859
if (merger.base_rev_id == tree.last_revision()):
3860
result = tree.pull(merger.other_branch, False,
3861
merger.other_rev_id)
3862
result.report(self.outf)
3864
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
3866
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
3869
return self._do_preview(merger)
3871
return self._do_interactive(merger)
3873
return self._do_merge(merger, change_reporter, allow_pending,
3876
def _get_preview(self, merger):
3602
return self._do_merge(merger, change_reporter, allow_pending,
3605
for cleanup in reversed(cleanups):
3608
def _do_preview(self, merger):
3609
from bzrlib.diff import show_diff_trees
3877
3610
tree_merger = merger.make_merger()
3878
3611
tt = tree_merger.make_preview_transform()
3879
self.add_cleanup(tt.finalize)
3880
result_tree = tt.get_preview_tree()
3883
def _do_preview(self, merger):
3884
from bzrlib.diff import show_diff_trees
3885
result_tree = self._get_preview(merger)
3886
show_diff_trees(merger.this_tree, result_tree, self.outf,
3887
old_label='', new_label='')
3613
result_tree = tt.get_preview_tree()
3614
show_diff_trees(merger.this_tree, result_tree, self.outf,
3615
old_label='', new_label='')
3889
3619
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3890
3620
merger.change_reporter = change_reporter
4075
3773
def run(self, file_list=None, merge_type=None, show_base=False,
4076
3774
reprocess=False):
4077
from bzrlib.conflicts import restore
4078
3775
if merge_type is None:
4079
3776
merge_type = _mod_merge.Merge3Merger
4080
3777
tree, file_list = tree_files(file_list)
4081
self.add_cleanup(tree.lock_write().unlock)
4082
parents = tree.get_parent_ids()
4083
if len(parents) != 2:
4084
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4085
" merges. Not cherrypicking or"
4087
repository = tree.branch.repository
4088
interesting_ids = None
4090
conflicts = tree.conflicts()
4091
if file_list is not None:
4092
interesting_ids = set()
4093
for filename in file_list:
4094
file_id = tree.path2id(filename)
4096
raise errors.NotVersionedError(filename)
4097
interesting_ids.add(file_id)
4098
if tree.kind(file_id) != "directory":
3780
parents = tree.get_parent_ids()
3781
if len(parents) != 2:
3782
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3783
" merges. Not cherrypicking or"
3785
repository = tree.branch.repository
3786
interesting_ids = None
3788
conflicts = tree.conflicts()
3789
if file_list is not None:
3790
interesting_ids = set()
3791
for filename in file_list:
3792
file_id = tree.path2id(filename)
3794
raise errors.NotVersionedError(filename)
3795
interesting_ids.add(file_id)
3796
if tree.kind(file_id) != "directory":
4101
for name, ie in tree.inventory.iter_entries(file_id):
4102
interesting_ids.add(ie.file_id)
4103
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4105
# Remerge only supports resolving contents conflicts
4106
allowed_conflicts = ('text conflict', 'contents conflict')
4107
restore_files = [c.path for c in conflicts
4108
if c.typestring in allowed_conflicts]
4109
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4110
tree.set_conflicts(ConflictList(new_conflicts))
4111
if file_list is not None:
4112
restore_files = file_list
4113
for filename in restore_files:
3799
for name, ie in tree.inventory.iter_entries(file_id):
3800
interesting_ids.add(ie.file_id)
3801
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3803
# Remerge only supports resolving contents conflicts
3804
allowed_conflicts = ('text conflict', 'contents conflict')
3805
restore_files = [c.path for c in conflicts
3806
if c.typestring in allowed_conflicts]
3807
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3808
tree.set_conflicts(ConflictList(new_conflicts))
3809
if file_list is not None:
3810
restore_files = file_list
3811
for filename in restore_files:
3813
restore(tree.abspath(filename))
3814
except errors.NotConflicted:
3816
# Disable pending merges, because the file texts we are remerging
3817
# have not had those merges performed. If we use the wrong parents
3818
# list, we imply that the working tree text has seen and rejected
3819
# all the changes from the other tree, when in fact those changes
3820
# have not yet been seen.
3821
pb = ui.ui_factory.nested_progress_bar()
3822
tree.set_parent_ids(parents[:1])
4115
restore(tree.abspath(filename))
4116
except errors.NotConflicted:
4118
# Disable pending merges, because the file texts we are remerging
4119
# have not had those merges performed. If we use the wrong parents
4120
# list, we imply that the working tree text has seen and rejected
4121
# all the changes from the other tree, when in fact those changes
4122
# have not yet been seen.
4123
tree.set_parent_ids(parents[:1])
4125
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4126
merger.interesting_ids = interesting_ids
4127
merger.merge_type = merge_type
4128
merger.show_base = show_base
4129
merger.reprocess = reprocess
4130
conflicts = merger.do_merge()
3824
merger = _mod_merge.Merger.from_revision_ids(pb,
3826
merger.interesting_ids = interesting_ids
3827
merger.merge_type = merge_type
3828
merger.show_base = show_base
3829
merger.reprocess = reprocess
3830
conflicts = merger.do_merge()
3832
tree.set_parent_ids(parents)
4132
tree.set_parent_ids(parents)
4133
3836
if conflicts > 0:
4157
3860
name. If you name a directory, all the contents of that directory will be
4160
If you have newly added files since the target revision, they will be
4161
removed. If the files to be removed have been changed, backups will be
4162
created as above. Directories containing unknown files will not be
3863
Any files that have been newly added since that revision will be deleted,
3864
with a backup kept if appropriate. Directories containing unknown files
3865
will not be deleted.
4165
The working tree contains a list of revisions that have been merged but
4166
not yet committed. These revisions will be included as additional parents
4167
of the next commit. Normally, using revert clears that list as well as
4168
reverting the files. If any files are specified, revert leaves the list
4169
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4170
.`` in the tree root to revert all files but keep the recorded merges,
4171
and ``bzr revert --forget-merges`` to clear the pending merge list without
3867
The working tree contains a list of pending merged revisions, which will
3868
be included as parents in the next commit. Normally, revert clears that
3869
list as well as reverting the files. If any files are specified, revert
3870
leaves the pending merge list alone and reverts only the files. Use "bzr
3871
revert ." in the tree root to revert all files but keep the merge record,
3872
and "bzr revert --forget-merges" to clear the pending merge list without
4172
3873
reverting any files.
4174
Using "bzr revert --forget-merges", it is possible to apply all of the
4175
changes from a branch in a single revision. To do this, perform the merge
4176
as desired. Then doing revert with the "--forget-merges" option will keep
4177
the content of the tree as it was, but it will clear the list of pending
4178
merges. The next commit will then contain all of the changes that are
4179
present in the other branch, but without any other parent revisions.
4180
Because this technique forgets where these changes originated, it may
4181
cause additional conflicts on later merges involving the same source and
4185
3876
_see_also = ['cat', 'export']
4194
3885
def run(self, revision=None, no_backup=False, file_list=None,
4195
3886
forget_merges=None):
4196
3887
tree, file_list = tree_files(file_list)
4197
self.add_cleanup(tree.lock_tree_write().unlock)
4199
tree.set_parent_ids(tree.get_parent_ids()[:1])
4201
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3891
tree.set_parent_ids(tree.get_parent_ids()[:1])
3893
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4204
3898
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4205
3899
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4206
tree.revert(file_list, rev_tree, not no_backup, None,
4207
report_changes=True)
3900
pb = ui.ui_factory.nested_progress_bar()
3902
tree.revert(file_list, rev_tree, not no_backup, pb,
3903
report_changes=True)
4210
3908
class cmd_assert_fail(Command):
4211
__doc__ = """Test reporting of assertion failures"""
3909
"""Test reporting of assertion failures"""
4212
3910
# intended just for use in testing
4363
4053
_get_revision_range(revision,
4364
4054
remote_branch, self.name()))
4366
local_extra, remote_extra = find_unmerged(
4367
local_branch, remote_branch, restrict,
4368
backward=not reverse,
4369
include_merges=include_merges,
4370
local_revid_range=local_revid_range,
4371
remote_revid_range=remote_revid_range)
4373
if log_format is None:
4374
registry = log.log_formatter_registry
4375
log_format = registry.get_default(local_branch)
4376
lf = log_format(to_file=self.outf,
4378
show_timezone='original')
4381
if local_extra and not theirs_only:
4382
message("You have %d extra revision(s):\n" %
4384
for revision in iter_log_revisions(local_extra,
4385
local_branch.repository,
4387
lf.log_revision(revision)
4388
printed_local = True
4391
printed_local = False
4393
if remote_extra and not mine_only:
4394
if printed_local is True:
4396
message("You are missing %d revision(s):\n" %
4398
for revision in iter_log_revisions(remote_extra,
4399
remote_branch.repository,
4401
lf.log_revision(revision)
4404
if mine_only and not local_extra:
4405
# We checked local, and found nothing extra
4406
message('This branch is up to date.\n')
4407
elif theirs_only and not remote_extra:
4408
# We checked remote, and found nothing extra
4409
message('Other branch is up to date.\n')
4410
elif not (mine_only or theirs_only or local_extra or
4412
# We checked both branches, and neither one had extra
4414
message("Branches are up to date.\n")
4056
local_branch.lock_read()
4058
remote_branch.lock_read()
4060
local_extra, remote_extra = find_unmerged(
4061
local_branch, remote_branch, restrict,
4062
backward=not reverse,
4063
include_merges=include_merges,
4064
local_revid_range=local_revid_range,
4065
remote_revid_range=remote_revid_range)
4067
if log_format is None:
4068
registry = log.log_formatter_registry
4069
log_format = registry.get_default(local_branch)
4070
lf = log_format(to_file=self.outf,
4072
show_timezone='original')
4075
if local_extra and not theirs_only:
4076
message("You have %d extra revision(s):\n" %
4078
for revision in iter_log_revisions(local_extra,
4079
local_branch.repository,
4081
lf.log_revision(revision)
4082
printed_local = True
4085
printed_local = False
4087
if remote_extra and not mine_only:
4088
if printed_local is True:
4090
message("You are missing %d revision(s):\n" %
4092
for revision in iter_log_revisions(remote_extra,
4093
remote_branch.repository,
4095
lf.log_revision(revision)
4098
if mine_only and not local_extra:
4099
# We checked local, and found nothing extra
4100
message('This branch is up to date.\n')
4101
elif theirs_only and not remote_extra:
4102
# We checked remote, and found nothing extra
4103
message('Other branch is up to date.\n')
4104
elif not (mine_only or theirs_only or local_extra or
4106
# We checked both branches, and neither one had extra
4108
message("Branches are up to date.\n")
4110
remote_branch.unlock()
4112
local_branch.unlock()
4416
4113
if not status_code and parent is None and other_branch is not None:
4417
self.add_cleanup(local_branch.lock_write().unlock)
4418
# handle race conditions - a parent might be set while we run.
4419
if local_branch.get_parent() is None:
4420
local_branch.set_parent(remote_branch.base)
4114
local_branch.lock_write()
4116
# handle race conditions - a parent might be set while we run.
4117
if local_branch.get_parent() is None:
4118
local_branch.set_parent(remote_branch.base)
4120
local_branch.unlock()
4421
4121
return status_code
4424
4124
class cmd_pack(Command):
4425
__doc__ = """Compress the data within a repository.
4427
This operation compresses the data within a bazaar repository. As
4428
bazaar supports automatic packing of repository, this operation is
4429
normally not required to be done manually.
4431
During the pack operation, bazaar takes a backup of existing repository
4432
data, i.e. pack files. This backup is eventually removed by bazaar
4433
automatically when it is safe to do so. To save disk space by removing
4434
the backed up pack files, the --clean-obsolete-packs option may be
4437
Warning: If you use --clean-obsolete-packs and your machine crashes
4438
during or immediately after repacking, you may be left with a state
4439
where the deletion has been written to disk but the new packs have not
4440
been. In this case the repository may be unusable.
4125
"""Compress the data within a repository."""
4443
4127
_see_also = ['repositories']
4444
4128
takes_args = ['branch_or_repo?']
4446
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4449
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4130
def run(self, branch_or_repo='.'):
4450
4131
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4452
4133
branch = dir.open_branch()
4453
4134
repository = branch.repository
4454
4135
except errors.NotBranchError:
4455
4136
repository = dir.open_repository()
4456
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4459
4140
class cmd_plugins(Command):
4460
__doc__ = """List the installed plugins.
4141
"""List the installed plugins.
4462
4143
This command displays the list of installed plugins including
4463
4144
version of plugin and a short description of each.
4550
4234
Option('long', help='Show commit date in annotations.'),
4555
4238
encoding_type = 'exact'
4557
4240
@display_command
4558
4241
def run(self, filename, all=False, long=False, revision=None,
4559
show_ids=False, directory=None):
4560
4243
from bzrlib.annotate import annotate_file, annotate_file_tree
4561
4244
wt, branch, relpath = \
4562
_open_directory_or_containing_tree_or_branch(filename, directory)
4564
self.add_cleanup(wt.lock_read().unlock)
4566
self.add_cleanup(branch.lock_read().unlock)
4567
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4568
self.add_cleanup(tree.lock_read().unlock)
4570
file_id = wt.path2id(relpath)
4572
file_id = tree.path2id(relpath)
4574
raise errors.NotVersionedError(filename)
4575
file_version = tree.inventory[file_id].revision
4576
if wt is not None and revision is None:
4577
# If there is a tree and we're not annotating historical
4578
# versions, annotate the working tree's content.
4579
annotate_file_tree(wt, file_id, self.outf, long, all,
4582
annotate_file(branch, file_version, file_id, long, all, self.outf,
4245
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4251
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4253
file_id = wt.path2id(relpath)
4255
file_id = tree.path2id(relpath)
4257
raise errors.NotVersionedError(filename)
4258
file_version = tree.inventory[file_id].revision
4259
if wt is not None and revision is None:
4260
# If there is a tree and we're not annotating historical
4261
# versions, annotate the working tree's content.
4262
annotate_file_tree(wt, file_id, self.outf, long, all,
4265
annotate_file(branch, file_version, file_id, long, all, self.outf,
4586
4274
class cmd_re_sign(Command):
4587
__doc__ = """Create a digital signature for an existing revision."""
4275
"""Create a digital signature for an existing revision."""
4588
4276
# TODO be able to replace existing ones.
4590
4278
hidden = True # is this right ?
4591
4279
takes_args = ['revision_id*']
4592
takes_options = ['directory', 'revision']
4280
takes_options = ['revision']
4594
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4282
def run(self, revision_id_list=None, revision=None):
4595
4283
if revision_id_list is not None and revision is not None:
4596
4284
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4597
4285
if revision_id_list is None and revision is None:
4598
4286
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4599
b = WorkingTree.open_containing(directory)[0].branch
4600
self.add_cleanup(b.lock_write().unlock)
4601
return self._run(b, revision_id_list, revision)
4287
b = WorkingTree.open_containing(u'.')[0].branch
4290
return self._run(b, revision_id_list, revision)
4603
4294
def _run(self, b, revision_id_list, revision):
4604
4295
import bzrlib.gpg as gpg
4794
4488
end_revision=last_revno)
4797
self.outf.write('Dry-run, pretending to remove'
4798
' the above revisions.\n')
4491
print 'Dry-run, pretending to remove the above revisions.'
4493
val = raw_input('Press <enter> to continue')
4800
self.outf.write('The above revision(s) will be removed.\n')
4803
if not ui.ui_factory.get_boolean('Are you sure'):
4804
self.outf.write('Canceled')
4495
print 'The above revision(s) will be removed.'
4497
val = raw_input('Are you sure [y/N]? ')
4498
if val.lower() not in ('y', 'yes'):
4807
4502
mutter('Uncommitting from {%s} to {%s}',
4808
4503
last_rev_id, rev_id)
4809
4504
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4810
4505
revno=revno, local=local)
4811
self.outf.write('You can restore the old tip by running:\n'
4812
' bzr pull . -r revid:%s\n' % last_rev_id)
4506
note('You can restore the old tip by running:\n'
4507
' bzr pull . -r revid:%s', last_rev_id)
4815
4510
class cmd_break_lock(Command):
4816
__doc__ = """Break a dead lock on a repository, branch or working directory.
4511
"""Break a dead lock on a repository, branch or working directory.
4818
4513
CAUTION: Locks should only be broken when you are sure that the process
4819
4514
holding the lock has been stopped.
4821
You can get information on what locks are open via the 'bzr info
4822
[location]' command.
4516
You can get information on what locks are open via the 'bzr info' command.
4826
bzr break-lock bzr+ssh://example.com/bzr/foo
4828
4521
takes_args = ['location?']
5100
4790
directly from the merge directive, without retrieving data from a
5103
`bzr send` creates a compact data set that, when applied using bzr
5104
merge, has the same effect as merging from the source branch.
5106
By default the merge directive is self-contained and can be applied to any
5107
branch containing submit_branch in its ancestory without needing access to
5110
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5111
revisions, but only a structured request to merge from the
5112
public_location. In that case the public_branch is needed and it must be
5113
up-to-date and accessible to the recipient. The public_branch is always
5114
included if known, so that people can check it later.
5116
The submit branch defaults to the parent of the source branch, but can be
5117
overridden. Both submit branch and public branch will be remembered in
5118
branch.conf the first time they are used for a particular branch. The
5119
source branch defaults to that containing the working directory, but can
5120
be changed using --from.
5122
In order to calculate those changes, bzr must analyse the submit branch.
5123
Therefore it is most efficient for the submit branch to be a local mirror.
5124
If a public location is known for the submit_branch, that location is used
5125
in the merge directive.
5127
The default behaviour is to send the merge directive by mail, unless -o is
5128
given, in which case it is sent to a file.
4793
If --no-bundle is specified, then public_branch is needed (and must be
4794
up-to-date), so that the receiver can perform the merge using the
4795
public_branch. The public_branch is always included if known, so that
4796
people can check it later.
4798
The submit branch defaults to the parent, but can be overridden. Both
4799
submit branch and public branch will be remembered if supplied.
4801
If a public_branch is known for the submit_branch, that public submit
4802
branch is used in the merge instructions. This means that a local mirror
4803
can be used as your actual submit branch, once you have set public_branch
5130
4806
Mail is sent using your preferred mail program. This should be transparent
5131
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4807
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5132
4808
If the preferred client can't be found (or used), your editor will be used.
5134
4810
To use a specific mail program, set the mail_client configuration option.
5135
4811
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5136
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5137
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5138
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4812
specific clients are "claws", "evolution", "kmail", "mutt", and
4813
"thunderbird"; generic options are "default", "editor", "emacsclient",
4814
"mapi", and "xdg-email". Plugins may also add supported clients.
5141
4816
If mail is being sent, a to address is required. This can be supplied
5142
4817
either on the commandline, by setting the submit_to configuration
5176
4847
short_name='f',
5178
4849
Option('output', short_name='o',
5179
help='Write merge directive to this file or directory; '
4850
help='Write merge directive to this file; '
5180
4851
'use - for stdout.',
5183
help='Refuse to send if there are uncommitted changes in'
5184
' the working tree, --no-strict disables the check.'),
5185
4853
Option('mail-to', help='Mail the request to this address.',
5189
4857
Option('body', help='Body for the email.', type=unicode),
5190
4858
RegistryOption('format',
5191
help='Use the specified output format.',
5192
lazy_registry=('bzrlib.send', 'format_registry')),
4859
help='Use the specified output format.',
4860
lazy_registry=('bzrlib.send', 'format_registry'))
5195
4863
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5196
4864
no_patch=False, revision=None, remember=False, output=None,
5197
format=None, mail_to=None, message=None, body=None,
5198
strict=None, **kwargs):
4865
format=None, mail_to=None, message=None, body=None, **kwargs):
5199
4866
from bzrlib.send import send
5200
4867
return send(submit_branch, revision, public_branch, remember,
5201
format, no_bundle, no_patch, output,
5202
kwargs.get('from', '.'), mail_to, message, body,
4868
format, no_bundle, no_patch, output,
4869
kwargs.get('from', '.'), mail_to, message, body,
5207
4873
class cmd_bundle_revisions(cmd_send):
5208
__doc__ = """Create a merge-directive for submitting changes.
4874
"""Create a merge-directive for submitting changes.
5210
4876
A merge directive provides many things needed for requesting merges:
5268
4931
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5269
4932
no_patch=False, revision=None, remember=False, output=None,
5270
format=None, strict=None, **kwargs):
4933
format=None, **kwargs):
5271
4934
if output is None:
5273
4936
from bzrlib.send import send
5274
4937
return send(submit_branch, revision, public_branch, remember,
5275
4938
format, no_bundle, no_patch, output,
5276
4939
kwargs.get('from', '.'), None, None, None,
5277
self.outf, strict=strict)
5280
4943
class cmd_tag(Command):
5281
__doc__ = """Create, remove or modify a tag naming a revision.
4944
"""Create, remove or modify a tag naming a revision.
5283
4946
Tags give human-meaningful names to revisions. Commands that take a -r
5284
4947
(--revision) option can be given -rtag:X, where X is any previously
5293
4956
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5294
4957
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5296
If no tag name is specified it will be determined through the
5297
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5298
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5302
4960
_see_also = ['commit', 'tags']
5303
takes_args = ['tag_name?']
4961
takes_args = ['tag_name']
5304
4962
takes_options = [
5305
4963
Option('delete',
5306
4964
help='Delete this tag rather than placing it.',
5308
custom_help('directory',
5309
help='Branch in which to place the tag.'),
4967
help='Branch in which to place the tag.',
5310
4971
Option('force',
5311
4972
help='Replace existing tags.',
5316
def run(self, tag_name=None,
4977
def run(self, tag_name,
5322
4983
branch, relpath = Branch.open_containing(directory)
5323
self.add_cleanup(branch.lock_write().unlock)
5325
if tag_name is None:
5326
raise errors.BzrCommandError("No tag specified to delete.")
5327
branch.tags.delete_tag(tag_name)
5328
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
if len(revision) != 1:
5332
raise errors.BzrCommandError(
5333
"Tags can only be placed on a single revision, "
5335
revision_id = revision[0].as_revision_id(branch)
4987
branch.tags.delete_tag(tag_name)
4988
self.outf.write('Deleted tag %s.\n' % tag_name)
5337
revision_id = branch.last_revision()
5338
if tag_name is None:
5339
tag_name = branch.automatic_tag_name(revision_id)
5340
if tag_name is None:
5341
raise errors.BzrCommandError(
5342
"Please specify a tag name.")
5343
if (not force) and branch.tags.has_tag(tag_name):
5344
raise errors.TagAlreadyExists(tag_name)
5345
branch.tags.set_tag(tag_name, revision_id)
5346
self.outf.write('Created tag %s.\n' % tag_name)
4991
if len(revision) != 1:
4992
raise errors.BzrCommandError(
4993
"Tags can only be placed on a single revision, "
4995
revision_id = revision[0].as_revision_id(branch)
4997
revision_id = branch.last_revision()
4998
if (not force) and branch.tags.has_tag(tag_name):
4999
raise errors.TagAlreadyExists(tag_name)
5000
branch.tags.set_tag(tag_name, revision_id)
5001
self.outf.write('Created tag %s.\n' % tag_name)
5349
5006
class cmd_tags(Command):
5350
__doc__ = """List tags.
5352
5009
This command shows a table of tag names and the revisions they reference.
5355
5012
_see_also = ['tag']
5356
5013
takes_options = [
5357
custom_help('directory',
5358
help='Branch whose tags should be displayed.'),
5015
help='Branch whose tags should be displayed.',
5359
5019
RegistryOption.from_kwargs('sort',
5360
5020
'Sort tags by different criteria.', title='Sorting',
5361
5021
alpha='Sort tags lexicographically (default).',
5381
self.add_cleanup(branch.lock_read().unlock)
5383
graph = branch.repository.get_graph()
5384
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5385
revid1, revid2 = rev1.rev_id, rev2.rev_id
5386
# only show revisions between revid1 and revid2 (inclusive)
5387
tags = [(tag, revid) for tag, revid in tags if
5388
graph.is_between(revid, revid1, revid2)]
5391
elif sort == 'time':
5393
for tag, revid in tags:
5395
revobj = branch.repository.get_revision(revid)
5396
except errors.NoSuchRevision:
5397
timestamp = sys.maxint # place them at the end
5399
timestamp = revobj.timestamp
5400
timestamps[revid] = timestamp
5401
tags.sort(key=lambda x: timestamps[x[1]])
5403
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5404
for index, (tag, revid) in enumerate(tags):
5406
revno = branch.revision_id_to_dotted_revno(revid)
5407
if isinstance(revno, tuple):
5408
revno = '.'.join(map(str, revno))
5409
except errors.NoSuchRevision:
5410
# Bad tag data/merges can lead to tagged revisions
5411
# which are not in this branch. Fail gracefully ...
5413
tags[index] = (tag, revno)
5044
graph = branch.repository.get_graph()
5045
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5046
revid1, revid2 = rev1.rev_id, rev2.rev_id
5047
# only show revisions between revid1 and revid2 (inclusive)
5048
tags = [(tag, revid) for tag, revid in tags if
5049
graph.is_between(revid, revid1, revid2)]
5052
elif sort == 'time':
5054
for tag, revid in tags:
5056
revobj = branch.repository.get_revision(revid)
5057
except errors.NoSuchRevision:
5058
timestamp = sys.maxint # place them at the end
5060
timestamp = revobj.timestamp
5061
timestamps[revid] = timestamp
5062
tags.sort(key=lambda x: timestamps[x[1]])
5064
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5065
for index, (tag, revid) in enumerate(tags):
5067
revno = branch.revision_id_to_dotted_revno(revid)
5068
if isinstance(revno, tuple):
5069
revno = '.'.join(map(str, revno))
5070
except errors.NoSuchRevision:
5071
# Bad tag data/merges can lead to tagged revisions
5072
# which are not in this branch. Fail gracefully ...
5074
tags[index] = (tag, revno)
5415
5077
for tag, revspec in tags:
5416
5078
self.outf.write('%-20s %s\n' % (tag, revspec))
5419
5081
class cmd_reconfigure(Command):
5420
__doc__ = """Reconfigure the type of a bzr directory.
5082
"""Reconfigure the type of a bzr directory.
5422
5084
A target configuration must be specified.
5454
5116
Option('bind-to', help='Branch to bind checkout to.', type=str),
5455
5117
Option('force',
5456
help='Perform reconfiguration even if local changes'
5458
Option('stacked-on',
5459
help='Reconfigure a branch to be stacked on another branch.',
5463
help='Reconfigure a branch to be unstacked. This '
5464
'may require copying substantial data into it.',
5118
help='Perform reconfiguration even if local changes'
5468
def run(self, location=None, target_type=None, bind_to=None, force=False,
5122
def run(self, location=None, target_type=None, bind_to=None, force=False):
5471
5123
directory = bzrdir.BzrDir.open(location)
5472
if stacked_on and unstacked:
5473
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5474
elif stacked_on is not None:
5475
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5477
reconfigure.ReconfigureUnstacked().apply(directory)
5478
# At the moment you can use --stacked-on and a different
5479
# reconfiguration shape at the same time; there seems no good reason
5481
5124
if target_type is None:
5482
if stacked_on or unstacked:
5485
raise errors.BzrCommandError('No target configuration '
5125
raise errors.BzrCommandError('No target configuration specified')
5487
5126
elif target_type == 'branch':
5488
5127
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5489
5128
elif target_type == 'tree':
5526
5165
/path/to/newbranch.
5528
5167
Bound branches use the nickname of its master branch unless it is set
5529
locally, in which case switching will update the local nickname to be
5168
locally, in which case switching will update the the local nickname to be
5530
5169
that of the master.
5533
takes_args = ['to_location?']
5172
takes_args = ['to_location']
5534
5173
takes_options = [Option('force',
5535
help='Switch even if local commits will be lost.'),
5537
Option('create-branch', short_name='b',
5538
help='Create the target branch from this one before'
5539
' switching to it.'),
5174
help='Switch even if local commits will be lost.')
5542
def run(self, to_location=None, force=False, create_branch=False,
5177
def run(self, to_location, force=False):
5544
5178
from bzrlib import switch
5545
5179
tree_location = '.'
5546
revision = _get_one_revision('switch', revision)
5547
5180
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5548
if to_location is None:
5549
if revision is None:
5550
raise errors.BzrCommandError('You must supply either a'
5551
' revision or a location')
5554
5182
branch = control_dir.open_branch()
5555
5183
had_explicit_nick = branch.get_config().has_explicit_nickname()
5556
5184
except errors.NotBranchError:
5558
5185
had_explicit_nick = False
5561
raise errors.BzrCommandError('cannot create branch without'
5563
to_location = directory_service.directories.dereference(
5565
if '/' not in to_location and '\\' not in to_location:
5566
# This path is meant to be relative to the existing branch
5567
this_url = self._get_branch_location(control_dir)
5568
to_location = urlutils.join(this_url, '..', to_location)
5569
to_branch = branch.bzrdir.sprout(to_location,
5570
possible_transports=[branch.bzrdir.root_transport],
5571
source_branch=branch).open_branch()
5574
to_branch = Branch.open(to_location)
5575
except errors.NotBranchError:
5576
this_url = self._get_branch_location(control_dir)
5577
to_branch = Branch.open(
5578
urlutils.join(this_url, '..', to_location))
5579
if revision is not None:
5580
revision = revision.as_revision_id(to_branch)
5581
switch.switch(control_dir, to_branch, force, revision_id=revision)
5187
to_branch = Branch.open(to_location)
5188
except errors.NotBranchError:
5189
this_url = self._get_branch_location(control_dir)
5190
to_branch = Branch.open(
5191
urlutils.join(this_url, '..', to_location))
5192
switch.switch(control_dir, to_branch, force)
5582
5193
if had_explicit_nick:
5583
5194
branch = control_dir.open_branch() #get the new branch!
5584
5195
branch.nick = to_branch.nick
5851
5437
if writer is None:
5852
5438
writer = bzrlib.option.diff_writer_registry.get()
5854
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5855
file_list, message, destroy=destroy)
5440
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5441
message, destroy=destroy).run()
5860
5442
except errors.UserAbort:
5863
5445
def run_for_list(self):
5864
5446
tree = WorkingTree.open_containing('.')[0]
5865
self.add_cleanup(tree.lock_read().unlock)
5866
manager = tree.get_shelf_manager()
5867
shelves = manager.active_shelves()
5868
if len(shelves) == 0:
5869
note('No shelved changes.')
5871
for shelf_id in reversed(shelves):
5872
message = manager.get_metadata(shelf_id).get('message')
5874
message = '<no message>'
5875
self.outf.write('%3d: %s\n' % (shelf_id, message))
5449
manager = tree.get_shelf_manager()
5450
shelves = manager.active_shelves()
5451
if len(shelves) == 0:
5452
note('No shelved changes.')
5454
for shelf_id in reversed(shelves):
5455
message = manager.get_metadata(shelf_id).get('message')
5457
message = '<no message>'
5458
self.outf.write('%3d: %s\n' % (shelf_id, message))
5879
5464
class cmd_unshelve(Command):
5880
__doc__ = """Restore shelved changes.
5465
"""Restore shelved changes.
5882
5467
By default, the most recently shelved changes are restored. However if you
5883
5468
specify a shelf by id those changes will be restored instead. This works
5933
5510
' deleting them.'),
5934
5511
Option('force', help='Do not prompt before deleting.')]
5935
5512
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5936
force=False, directory=u'.'):
5937
5514
from bzrlib.clean_tree import clean_tree
5938
5515
if not (unknown or ignored or detritus):
5942
clean_tree(directory, unknown=unknown, ignored=ignored,
5943
detritus=detritus, dry_run=dry_run, no_prompt=force)
5519
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5520
dry_run=dry_run, no_prompt=force)
5946
5523
class cmd_reference(Command):
5947
__doc__ = """list, view and set branch locations for nested trees.
5524
"""list, view and set branch locations for nested trees.
5949
5526
If no arguments are provided, lists the branch locations for nested trees.
5950
5527
If one argument is provided, display the branch location for that tree.
5990
5567
self.outf.write('%s %s\n' % (path, location))
5993
def _register_lazy_builtins():
5994
# register lazy builtins from other modules; called at startup and should
5995
# be only called once.
5996
for (name, aliases, module_name) in [
5997
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5998
('cmd_dpush', [], 'bzrlib.foreign'),
5999
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6000
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6001
('cmd_conflicts', [], 'bzrlib.conflicts'),
6002
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6004
builtin_command_registry.register_lazy(name, aliases, module_name)
5570
# these get imported and then picked up by the scan for cmd_*
5571
# TODO: Some more consistent way to split command definitions across files;
5572
# we do need to load at least some information about them to know of
5573
# aliases. ideally we would avoid loading the implementation until the
5574
# details were needed.
5575
from bzrlib.cmd_version_info import cmd_version_info
5576
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5577
from bzrlib.bundle.commands import (
5580
from bzrlib.foreign import cmd_dpush
5581
from bzrlib.sign_my_commits import cmd_sign_my_commits
5582
from bzrlib.weave_commands import cmd_versionedfile_list, \
5583
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
