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 some of these files,"
614
" please add them by name.\n")
698
617
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
618
"""Create a new versioned directory.
701
620
This is equivalent to creating the directory and then adding it.
761
675
revision = _get_one_revision('inventory', revision)
762
676
work_tree, file_list = tree_files(file_list)
763
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()
677
work_tree.lock_read()
679
if revision is not None:
680
tree = revision.as_tree(work_tree.branch)
682
extra_trees = [work_tree]
688
if file_list is not None:
689
file_ids = tree.paths2ids(file_list, trees=extra_trees,
690
require_versioned=True)
691
# find_ids_across_trees may include some paths that don't
693
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
694
for file_id in file_ids if file_id in tree)
696
entries = tree.inventory.entries()
699
if tree is not work_tree:
784
702
for path, entry in entries:
785
703
if kind and kind != entry.kind:
922
845
dest = osutils.pathjoin(dest_parent, dest_tail)
923
846
mutter("attempting to move %s => %s", src, dest)
924
847
tree.rename_one(src, dest, after=after)
926
self.outf.write("%s => %s\n" % (src, dest))
848
self.outf.write("%s => %s\n" % (src, dest))
929
851
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
852
"""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
854
This command only works on branches that have not diverged. Branches are
855
considered diverged if the destination branch's most recent commit is one
856
that has not been merged (directly or indirectly) into the parent.
937
858
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
859
from one into the other. Once one branch has merged, the other should
939
860
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.
862
If you want to forget your local changes and just update your branch to
863
match the remote one, use pull --overwrite.
945
865
If there is no default location set, the first pull will set it. After
946
866
that, you can omit the location to use the default. To change the
1028
948
if revision is not None:
1029
949
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)
951
branch_to.lock_write()
953
if tree_to is not None:
954
view_info = _get_view_info_for_change_reporter(tree_to)
955
change_reporter = delta._ChangeReporter(
956
unversioned_filter=tree_to.is_ignored, view_info=view_info)
957
result = tree_to.pull(branch_from, overwrite, revision_id,
959
possible_transports=possible_transports,
962
result = branch_to.pull(branch_from, overwrite, revision_id,
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,
965
result.report(self.outf)
966
if verbose and result.old_revid != result.new_revid:
967
log.show_branch_change(branch_to, self.outf, result.old_revno,
1050
973
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
974
"""Update a mirror of this branch.
1053
976
The target branch will not have its working tree populated because this
1054
977
is both expensive, and is not supported on remote file systems.
1104
1027
def run(self, location=None, remember=False, overwrite=False,
1105
1028
create_prefix=False, verbose=False, revision=None,
1106
1029
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1108
1031
from bzrlib.push import _show_push_branch
1033
# Get the source branch and revision_id
1110
1034
if directory is None:
1111
1035
directory = '.'
1112
# Get the source branch
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1115
# Get the tip's revision_id
1036
br_from = Branch.open_containing(directory)[0]
1116
1037
revision = _get_one_revision('push', revision)
1117
1038
if revision is not None:
1118
1039
revision_id = revision.in_history(br_from).rev_id
1120
1041
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
1043
# Get the stacked_on branch, if any
1127
1044
if stacked_on is not None:
1128
1045
stacked_on = urlutils.normalize_url(stacked_on)
1179
1096
help='Hard-link working tree files where possible.'),
1180
1097
Option('no-tree',
1181
1098
help="Create a branch without a working-tree."),
1183
help="Switch the checkout in the current directory "
1184
"to the new branch."),
1185
1099
Option('stacked',
1186
1100
help='Create a stacked branch referring to the source branch. '
1187
1101
'The new branch will depend on the availability of the source '
1188
1102
'branch for all operations.'),
1189
1103
Option('standalone',
1190
1104
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
1106
aliases = ['get', 'clone']
1201
1108
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
1109
hardlink=False, stacked=False, standalone=False, no_tree=False):
1205
1110
from bzrlib.tag import _merge_tags_if_possible
1206
1112
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1114
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)
1117
if revision is not None:
1118
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'))
1120
# FIXME - wt.last_revision, fallback to branch, fall back to
1121
# None or perhaps NULL_REVISION to mean copy nothing
1123
revision_id = br_from.last_revision()
1124
if to_location is None:
1125
to_location = urlutils.derive_to_location(from_location)
1126
to_transport = transport.get_transport(to_location)
1128
to_transport.mkdir('.')
1129
except errors.FileExists:
1130
raise errors.BzrCommandError('Target directory "%s" already'
1131
' exists.' % to_location)
1132
except errors.NoSuchFile:
1133
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1136
# preserve whatever source format we have.
1137
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1138
possible_transports=[to_transport],
1139
accelerator_tree=accelerator_tree,
1140
hardlink=hardlink, stacked=stacked,
1141
force_new_repo=standalone,
1142
create_tree_if_local=not no_tree,
1143
source_branch=br_from)
1144
branch = dir.open_branch()
1145
except errors.NoSuchRevision:
1146
to_transport.delete_tree('.')
1147
msg = "The branch %s has no revision %s." % (from_location,
1149
raise errors.BzrCommandError(msg)
1150
_merge_tags_if_possible(br_from, branch)
1151
# If the source branch is stacked, the new branch may
1152
# be stacked whether we asked for that explicitly or not.
1153
# We therefore need a try/except here and not just 'if stacked:'
1155
note('Created new stacked branch referring to %s.' %
1156
branch.get_stacked_on_url())
1157
except (errors.NotStacked, errors.UnstackableBranchFormat,
1158
errors.UnstackableRepositoryFormat), e:
1159
note('Branched %d revision(s).' % branch.revno())
1274
1164
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1165
"""Create a new checkout of an existing branch.
1277
1167
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1168
the branch found in '.'. This is useful if you have removed the working tree
1357
1242
@display_command
1358
1243
def run(self, dir=u'.'):
1359
1244
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1361
new_inv = tree.inventory
1362
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1364
old_inv = old_tree.inventory
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1372
renames.append(paths)
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1247
new_inv = tree.inventory
1248
old_tree = tree.basis_tree()
1249
old_tree.lock_read()
1251
old_inv = old_tree.inventory
1253
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1254
for f, paths, c, v, p, n, k, e in iterator:
1255
if paths[0] == paths[1]:
1259
renames.append(paths)
1261
for old_name, new_name in renames:
1262
self.outf.write("%s => %s\n" % (old_name, new_name))
1378
1269
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1270
"""Update a tree to have the latest code committed to its branch.
1381
1272
This will perform a merge into the working tree, and may generate
1382
1273
conflicts. If you have any local changes, you will still
1385
1276
If you want to discard your local changes, you can just do a
1386
1277
'bzr revert' instead of 'bzr commit' after the update.
1388
If the tree's branch is bound to a master branch, it will also update
1389
the branch from the master.
1392
1280
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1281
takes_args = ['dir?']
1394
takes_options = ['revision']
1395
1282
aliases = ['up']
1397
def run(self, dir='.', revision=None):
1398
if revision is not None and len(revision) != 1:
1399
raise errors.BzrCommandError(
1400
"bzr update --revision takes exactly one revision")
1284
def run(self, dir='.'):
1401
1285
tree = WorkingTree.open_containing(dir)[0]
1402
branch = tree.branch
1403
1286
possible_transports = []
1404
master = branch.get_master_branch(
1287
master = tree.branch.get_master_branch(
1405
1288
possible_transports=possible_transports)
1406
1289
if master is not None:
1407
branch_location = master.base
1408
1290
tree.lock_write()
1410
branch_location = tree.branch.base
1411
1292
tree.lock_tree_write()
1412
self.add_cleanup(tree.unlock)
1413
# get rid of the final '/' and be ready for display
1414
branch_location = urlutils.unescape_for_display(
1415
branch_location.rstrip('/'),
1417
existing_pending_merges = tree.get_parent_ids()[1:]
1421
# may need to fetch data into a heavyweight checkout
1422
# XXX: this may take some time, maybe we should display a
1424
old_tip = branch.update(possible_transports)
1425
if revision is not None:
1426
revision_id = revision[0].as_revision_id(branch)
1428
revision_id = branch.last_revision()
1429
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1430
revno = branch.revision_id_to_dotted_revno(revision_id)
1431
note("Tree is up to date at revision %s of branch %s" %
1432
('.'.join(map(str, revno)), branch_location))
1434
view_info = _get_view_info_for_change_reporter(tree)
1435
change_reporter = delta._ChangeReporter(
1436
unversioned_filter=tree.is_ignored,
1437
view_info=view_info)
1294
existing_pending_merges = tree.get_parent_ids()[1:]
1295
last_rev = _mod_revision.ensure_null(tree.last_revision())
1296
if last_rev == _mod_revision.ensure_null(
1297
tree.branch.last_revision()):
1298
# may be up to date, check master too.
1299
if master is None or last_rev == _mod_revision.ensure_null(
1300
master.last_revision()):
1301
revno = tree.branch.revision_id_to_revno(last_rev)
1302
note("Tree is up to date at revision %d." % (revno,))
1304
view_info = _get_view_info_for_change_reporter(tree)
1439
1305
conflicts = tree.update(
1441
possible_transports=possible_transports,
1442
revision=revision_id,
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1446
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1450
revno = tree.branch.revision_id_to_dotted_revno(
1451
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1454
parent_ids = tree.get_parent_ids()
1455
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1456
note('Your local commits will now show as pending merges with '
1457
"'bzr status', and can be committed with 'bzr commit'.")
1306
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1307
view_info=view_info), possible_transports=possible_transports)
1308
revno = tree.branch.revision_id_to_revno(
1309
_mod_revision.ensure_null(tree.last_revision()))
1310
note('Updated to revision %d.' % (revno,))
1311
if tree.get_parent_ids()[1:] != existing_pending_merges:
1312
note('Your local commits will now show as pending merges with '
1313
"'bzr status', and can be committed with 'bzr commit'.")
1464
1322
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1323
"""Show information about a working tree, branch or repository.
1467
1325
This command will show all known locations and formats associated to the
1468
1326
tree, branch or repository.
1534
1392
if file_list is not None:
1535
1393
file_list = [f for f in file_list]
1537
self.add_cleanup(tree.lock_write().unlock)
1538
# Heuristics should probably all move into tree.remove_smart or
1541
added = tree.changes_from(tree.basis_tree(),
1542
specific_files=file_list).added
1543
file_list = sorted([f[0] for f in added], reverse=True)
1544
if len(file_list) == 0:
1545
raise errors.BzrCommandError('No matching files.')
1546
elif file_list is None:
1547
# missing files show up in iter_changes(basis) as
1548
# versioned-with-no-kind.
1550
for change in tree.iter_changes(tree.basis_tree()):
1551
# Find paths in the working tree that have no kind:
1552
if change[1][1] is not None and change[6][1] is None:
1553
missing.append(change[1][1])
1554
file_list = sorted(missing, reverse=True)
1555
file_deletion_strategy = 'keep'
1556
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1557
keep_files=file_deletion_strategy=='keep',
1558
force=file_deletion_strategy=='force')
1397
# Heuristics should probably all move into tree.remove_smart or
1400
added = tree.changes_from(tree.basis_tree(),
1401
specific_files=file_list).added
1402
file_list = sorted([f[0] for f in added], reverse=True)
1403
if len(file_list) == 0:
1404
raise errors.BzrCommandError('No matching files.')
1405
elif file_list is None:
1406
# missing files show up in iter_changes(basis) as
1407
# versioned-with-no-kind.
1409
for change in tree.iter_changes(tree.basis_tree()):
1410
# Find paths in the working tree that have no kind:
1411
if change[1][1] is not None and change[6][1] is None:
1412
missing.append(change[1][1])
1413
file_list = sorted(missing, reverse=True)
1414
file_deletion_strategy = 'keep'
1415
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1416
keep_files=file_deletion_strategy=='keep',
1417
force=file_deletion_strategy=='force')
1561
1422
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1423
"""Print file_id of a particular file or directory.
1564
1425
The file_id is assigned when the file is first added and remains the
1565
1426
same through all revisions where the file exists, even when it is
1965
1801
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1802
' one or two revision specifiers')
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1972
(old_tree, new_tree,
1973
old_branch, new_branch,
1974
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1804
old_tree, new_tree, specific_files, extra_trees = \
1805
_get_trees_to_diff(file_list, revision, old, new,
1976
1807
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1808
specific_files=specific_files,
1978
1809
external_diff_options=diff_options,
1979
1810
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1811
extra_trees=extra_trees, using=using)
1984
1814
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1815
"""List files deleted in the working tree.
1987
1817
# TODO: Show files deleted since a previous revision, or
1988
1818
# between two revisions.
1991
1821
# level of effort but possibly much less IO. (Or possibly not,
1992
1822
# if the directories are very large...)
1993
1823
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1824
takes_options = ['show-ids']
1996
1826
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
2000
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
2002
for path, ie in old.inventory.iter_entries():
2003
if not tree.has_id(ie.file_id):
2004
self.outf.write(path)
2006
self.outf.write(' ')
2007
self.outf.write(ie.file_id)
2008
self.outf.write('\n')
1827
def run(self, show_ids=False):
1828
tree = WorkingTree.open_containing(u'.')[0]
1831
old = tree.basis_tree()
1834
for path, ie in old.inventory.iter_entries():
1835
if not tree.has_id(ie.file_id):
1836
self.outf.write(path)
1838
self.outf.write(' ')
1839
self.outf.write(ie.file_id)
1840
self.outf.write('\n')
2011
1847
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1848
"""List files modified in working tree.
2016
1852
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
1855
help='Write an ascii NUL (\\0) separator '
1856
'between files rather than a newline.')
2019
1859
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
1860
def run(self, null=False):
1861
tree = WorkingTree.open_containing(u'.')[0]
2022
1862
td = tree.changes_from(tree.basis_tree())
2023
1863
for path, id, kind, text_modified, meta_modified in td.modified:
2030
1870
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1871
"""List files added in working tree.
2035
1875
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
1878
help='Write an ascii NUL (\\0) separator '
1879
'between files rather than a newline.')
2038
1882
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2042
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2044
basis_inv = basis.inventory
2047
if file_id in basis_inv:
2049
if inv.is_root(file_id) and len(basis_inv) == 0:
2051
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2055
self.outf.write(path + '\0')
2057
self.outf.write(osutils.quotefn(path) + '\n')
1883
def run(self, null=False):
1884
wt = WorkingTree.open_containing(u'.')[0]
1887
basis = wt.basis_tree()
1890
basis_inv = basis.inventory
1893
if file_id in basis_inv:
1895
if inv.is_root(file_id) and len(basis_inv) == 0:
1897
path = inv.id2path(file_id)
1898
if not os.access(osutils.abspath(path), os.F_OK):
1901
self.outf.write(path + '\0')
1903
self.outf.write(osutils.quotefn(path) + '\n')
2060
1910
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
1911
"""Show the tree root directory.
2063
1913
The root is the nearest enclosing directory with a .bzr control
2375
2211
diff_type = 'full'
2377
# Build the log formatter
2378
if log_format is None:
2379
log_format = log.log_formatter_registry.get_default(b)
2380
# Make a non-encoding output to include the diffs - bug 328007
2381
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2382
lf = log_format(show_ids=show_ids, to_file=self.outf,
2383
to_exact_file=unencoded_output,
2384
show_timezone=timezone,
2385
delta_format=get_verbosity_level(),
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2390
# Choose the algorithm for doing the logging. It's annoying
2391
# having multiple code paths like this but necessary until
2392
# the underlying repository format is faster at generating
2393
# deltas or can provide everything we need from the indices.
2394
# The default algorithm - match-using-deltas - works for
2395
# multiple files and directories and is faster for small
2396
# amounts of history (200 revisions say). However, it's too
2397
# slow for logging a single file in a repository with deep
2398
# history, i.e. > 10K revisions. In the spirit of "do no
2399
# evil when adding features", we continue to use the
2400
# original algorithm - per-file-graph - for the "single
2401
# file that isn't a directory without showing a delta" case.
2402
partial_history = revision and b.repository._format.supports_chks
2403
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2404
or delta_type or partial_history)
2406
# Build the LogRequest and execute it
2407
if len(file_ids) == 0:
2409
rqst = make_log_request_dict(
2410
direction=direction, specific_fileids=file_ids,
2411
start_revision=rev1, end_revision=rev2, limit=limit,
2412
message_search=message, delta_type=delta_type,
2413
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2414
exclude_common_ancestry=exclude_common_ancestry,
2416
Logger(b, rqst).show(lf)
2215
# Build the log formatter
2216
if log_format is None:
2217
log_format = log.log_formatter_registry.get_default(b)
2218
lf = log_format(show_ids=show_ids, to_file=self.outf,
2219
show_timezone=timezone,
2220
delta_format=get_verbosity_level(),
2222
show_advice=levels is None)
2224
# Choose the algorithm for doing the logging. It's annoying
2225
# having multiple code paths like this but necessary until
2226
# the underlying repository format is faster at generating
2227
# deltas or can provide everything we need from the indices.
2228
# The default algorithm - match-using-deltas - works for
2229
# multiple files and directories and is faster for small
2230
# amounts of history (200 revisions say). However, it's too
2231
# slow for logging a single file in a repository with deep
2232
# history, i.e. > 10K revisions. In the spirit of "do no
2233
# evil when adding features", we continue to use the
2234
# original algorithm - per-file-graph - for the "single
2235
# file that isn't a directory without showing a delta" case.
2236
partial_history = revision and b.repository._format.supports_chks
2237
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2238
or delta_type or partial_history)
2240
# Build the LogRequest and execute it
2241
if len(file_ids) == 0:
2243
rqst = make_log_request_dict(
2244
direction=direction, specific_fileids=file_ids,
2245
start_revision=rev1, end_revision=rev2, limit=limit,
2246
message_search=message, delta_type=delta_type,
2247
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2248
Logger(b, rqst).show(lf)
2419
2253
def _get_revision_range(revisionspec_list, branch, command_name):
2508
2336
help='Recurse into subdirectories.'),
2509
2337
Option('from-root',
2510
2338
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2339
Option('unknown', help='Print unknown files.'),
2513
2340
Option('versioned', help='Print versioned files.',
2514
2341
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2342
Option('ignored', help='Print ignored files.'),
2344
help='Write an ascii NUL (\\0) separator '
2345
'between files rather than a newline.'),
2518
2347
help='List entries of a particular kind: file, directory, symlink.',
2524
2351
@display_command
2525
2352
def run(self, revision=None, verbose=False,
2526
2353
recursive=False, from_root=False,
2527
2354
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2355
null=False, kind=None, show_ids=False, path=None):
2530
2357
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2358
raise errors.BzrCommandError('invalid kind specified')
2565
2389
view_str = views.view_display_str(view_files)
2566
2390
note("Ignoring files outside view. View is %s" % view_str)
2568
self.add_cleanup(tree.lock_read().unlock)
2569
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
from_dir=relpath, recursive=recursive):
2571
# Apply additional masking
2572
if not all and not selection[fc]:
2574
if kind is not None and fkind != kind:
2579
fullpath = osutils.pathjoin(relpath, fp)
2582
views.check_path_in_view(tree, fullpath)
2583
except errors.FileOutsideView:
2588
fp = osutils.pathjoin(prefix, fp)
2589
kindch = entry.kind_character()
2590
outstring = fp + kindch
2591
ui.ui_factory.clear_term()
2593
outstring = '%-8s %s' % (fc, outstring)
2594
if show_ids and fid is not None:
2595
outstring = "%-50s %s" % (outstring, fid)
2596
self.outf.write(outstring + '\n')
2598
self.outf.write(fp + '\0')
2601
self.outf.write(fid)
2602
self.outf.write('\0')
2610
self.outf.write('%-50s %s\n' % (outstring, my_id))
2612
self.outf.write(outstring + '\n')
2394
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2395
if fp.startswith(relpath):
2396
rp = fp[len(relpath):]
2397
fp = osutils.pathjoin(prefix, rp)
2398
if not recursive and '/' in rp:
2400
if not all and not selection[fc]:
2402
if kind is not None and fkind != kind:
2406
views.check_path_in_view(tree, fp)
2407
except errors.FileOutsideView:
2409
kindch = entry.kind_character()
2410
outstring = fp + kindch
2412
outstring = '%-8s %s' % (fc, outstring)
2413
if show_ids and fid is not None:
2414
outstring = "%-50s %s" % (outstring, fid)
2415
self.outf.write(outstring + '\n')
2417
self.outf.write(fp + '\0')
2420
self.outf.write(fid)
2421
self.outf.write('\0')
2429
self.outf.write('%-50s %s\n' % (outstring, my_id))
2431
self.outf.write(outstring + '\n')
2615
2436
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2437
"""List unknown files.
2620
2441
_see_also = ['ls']
2621
takes_options = ['directory']
2623
2443
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2445
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2446
self.outf.write(osutils.quotefn(f) + '\n')
2629
2449
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2450
"""Ignore specified files or patterns.
2632
2452
See ``bzr help patterns`` for details on the syntax of patterns.
2634
If a .bzrignore file does not exist, the ignore command
2635
will create one and add the specified files or patterns to the newly
2636
created file. The ignore command will also automatically add the
2637
.bzrignore file to be versioned. Creating a .bzrignore file without
2638
the use of the ignore command will require an explicit add command.
2640
2454
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2455
After adding, editing or deleting that file either indirectly by
2642
2456
using this command or directly by using an editor, be sure to commit
2645
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2646
the global ignore file can be found in the application data directory as
2647
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2648
Global ignores are not touched by this command. The global ignore file
2649
can be edited directly using an editor.
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2652
precedence over regular ignores. Such exceptions are used to specify
2653
files that should be versioned which would otherwise be ignored.
2655
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
precedence over the '!' exception patterns.
2658
2459
Note: ignore patterns containing shell wildcards must be quoted from
2659
2460
the shell on Unix.
2682
2479
Ignore everything but the "debian" toplevel directory::
2684
2481
bzr ignore "RE:(?!debian/).*"
2686
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
2690
bzr ignore "!./local"
2694
2484
_see_also = ['status', 'ignored', 'patterns']
2695
2485
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2487
Option('old-default-rules',
2488
help='Write out the ignore rules bzr < 0.9 always used.')
2701
def run(self, name_pattern_list=None, default_rules=None,
2491
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2492
from bzrlib import ignores
2704
if default_rules is not None:
2705
# dump the default rules and exit
2706
for pattern in ignores.USER_DEFAULTS:
2707
self.outf.write("%s\n" % pattern)
2493
if old_default_rules is not None:
2494
# dump the rules and exit
2495
for pattern in ignores.OLD_DEFAULTS:
2709
2498
if not name_pattern_list:
2710
2499
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2500
"NAME_PATTERN or --old-default-rules")
2712
2501
name_pattern_list = [globbing.normalize_pattern(p)
2713
2502
for p in name_pattern_list]
2714
2503
for name_pattern in name_pattern_list:
2749
2538
encoding_type = 'replace'
2750
2539
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2753
2541
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2757
for path, file_class, kind, file_id, entry in tree.list_files():
2758
if file_class != 'I':
2760
## XXX: Slightly inefficient since this was already calculated
2761
pat = tree.is_ignored(path)
2762
self.outf.write('%-50s %s\n' % (path, pat))
2543
tree = WorkingTree.open_containing(u'.')[0]
2546
for path, file_class, kind, file_id, entry in tree.list_files():
2547
if file_class != 'I':
2549
## XXX: Slightly inefficient since this was already calculated
2550
pat = tree.is_ignored(path)
2551
self.outf.write('%-50s %s\n' % (path, pat))
2765
2556
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2557
"""Lookup the revision-id from a revision-number
2769
2560
bzr lookup-revision 33
2772
2563
takes_args = ['revno']
2773
takes_options = ['directory']
2775
2565
@display_command
2776
def run(self, revno, directory=u'.'):
2566
def run(self, revno):
2778
2568
revno = int(revno)
2779
2569
except ValueError:
2780
raise errors.BzrCommandError("not a valid revision-number: %r"
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2783
self.outf.write("%s\n" % revid)
2570
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2572
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2786
2575
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2576
"""Export current or past revision to a destination directory or archive.
2789
2578
If no revision is specified this exports the last committed revision.
2868
2653
@display_command
2869
2654
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2871
2656
if revision is not None and len(revision) != 1:
2872
2657
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2658
" one revision specifier")
2874
2659
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2877
return self._run(tree, branch, relpath, filename, revision,
2878
name_from_revision, filters)
2660
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2663
return self._run(tree, branch, relpath, filename, revision,
2664
name_from_revision, filters)
2880
2668
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2882
2670
if tree is None:
2883
2671
tree = b.basis_tree()
2884
2672
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2887
2674
old_file_id = rev_tree.path2id(relpath)
3126
2900
if local and not tree.branch.get_bound_location():
3127
2901
raise errors.LocalRequiresBoundBranch()
3129
if message is not None:
3131
file_exists = osutils.lexists(message)
3132
except UnicodeError:
3133
# The commit message contains unicode characters that can't be
3134
# represented in the filesystem encoding, so that can't be a
3139
'The commit message is a file name: "%(f)s".\n'
3140
'(use --file "%(f)s" to take commit message from that file)'
3142
ui.ui_factory.show_warning(warning_msg)
3144
message = message.replace('\r\n', '\n')
3145
message = message.replace('\r', '\n')
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3150
2903
def get_message(commit_obj):
3151
2904
"""Callback to get commit message"""
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3155
elif message is not None:
3156
my_message = message
3158
# No message supplied: make one up.
3159
# text is the status of the tree
3160
text = make_commit_message_template_encoded(tree,
2905
my_message = message
2906
if my_message is None and not file:
2907
t = make_commit_message_template_encoded(tree,
3161
2908
selected_list, diff=show_diff,
3162
2909
output_encoding=osutils.get_user_encoding())
3163
# start_message is the template generated from hooks
3164
# XXX: Warning - looks like hooks return unicode,
3165
# make_commit_message_template_encoded returns user encoding.
3166
# We probably want to be using edit_commit_message instead to
3168
2910
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
2911
my_message = edit_commit_message_encoded(t,
3170
2912
start_message=start_message)
3171
2913
if my_message is None:
3172
2914
raise errors.BzrCommandError("please specify a commit"
3173
2915
" message with either --message or --file")
2916
elif my_message and file:
2917
raise errors.BzrCommandError(
2918
"please specify either --message or --file")
2920
my_message = codecs.open(file, 'rt',
2921
osutils.get_user_encoding()).read()
3174
2922
if my_message == "":
3175
2923
raise errors.BzrCommandError("empty commit message specified")
3176
2924
return my_message
3178
# The API permits a commit with a filter of [] to mean 'select nothing'
3179
# but the command line should not do that.
3180
if not selected_list:
3181
selected_list = None
3183
2927
tree.commit(message_callback=get_message,
3184
2928
specific_files=selected_list,
3185
2929
allow_pointless=unchanged, strict=strict, local=local,
3186
2930
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3189
2932
exclude=safe_relpath_files(tree, exclude))
3190
2933
except PointlessCommit:
2934
# FIXME: This should really happen before the file is read in;
2935
# perhaps prepare the commit; get the message; then actually commit
3191
2936
raise errors.BzrCommandError("No changes to commit."
3192
2937
" Use --unchanged to commit anyhow.")
3193
2938
except ConflictsInTree:
3214
2958
The working tree and branch checks will only give output if a problem is
3215
2959
detected. The output fields of the repository check are:
3218
This is just the number of revisions checked. It doesn't
3222
This is just the number of versionedfiles checked. It
3223
doesn't indicate a problem.
3225
unreferenced ancestors
3226
Texts that are ancestors of other texts, but
3227
are not properly referenced by the revision ancestry. This is a
3228
subtle problem that Bazaar can work around.
3231
This is the total number of unique file contents
3232
seen in the checked revisions. It does not indicate a problem.
3235
This is the total number of repeated texts seen
3236
in the checked revisions. Texts can be repeated when their file
3237
entries are modified, but the file contents are not. It does not
2961
revisions: This is just the number of revisions checked. It doesn't
2963
versionedfiles: This is just the number of versionedfiles checked. It
2964
doesn't indicate a problem.
2965
unreferenced ancestors: Texts that are ancestors of other texts, but
2966
are not properly referenced by the revision ancestry. This is a
2967
subtle problem that Bazaar can work around.
2968
unique file texts: This is the total number of unique file contents
2969
seen in the checked revisions. It does not indicate a problem.
2970
repeated file texts: This is the total number of repeated texts seen
2971
in the checked revisions. Texts can be repeated when their file
2972
entries are modified, but the file contents are not. It does not
3240
2975
If no restrictions are specified, all Bazaar data that is found at the given
3241
2976
location will be checked.
3606
3330
verbose = not is_quiet()
3607
3331
# TODO: should possibly lock the history file...
3608
3332
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3611
3334
test_suite_factory = None
3612
3335
benchfile = None
3613
selftest_kwargs = {"verbose": verbose,
3615
"stop_on_failure": one,
3616
"transport": transport,
3617
"test_suite_factory": test_suite_factory,
3618
"lsprof_timed": lsprof_timed,
3619
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
"matching_tests_first": first,
3622
"list_only": list_only,
3623
"random_seed": randomize,
3624
"exclude_pattern": exclude,
3626
"load_list": load_list,
3627
"debug_flags": debugflag,
3628
"starting_with": starting_with
3630
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
3337
selftest_kwargs = {"verbose": verbose,
3339
"stop_on_failure": one,
3340
"transport": transport,
3341
"test_suite_factory": test_suite_factory,
3342
"lsprof_timed": lsprof_timed,
3343
"bench_history": benchfile,
3344
"matching_tests_first": first,
3345
"list_only": list_only,
3346
"random_seed": randomize,
3347
"exclude_pattern": exclude,
3349
"load_list": load_list,
3350
"debug_flags": debugflag,
3351
"starting_with": starting_with
3353
selftest_kwargs.update(self.additional_selftest_args)
3354
result = selftest(**selftest_kwargs)
3356
if benchfile is not None:
3632
3358
return int(not result)
3635
3361
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3362
"""Show version of bzr."""
3638
3364
encoding_type = 'replace'
3639
3365
takes_options = [
3799
3515
verified = 'inapplicable'
3800
3516
tree = WorkingTree.open_containing(directory)[0]
3518
# die as quickly as possible if there are uncommitted changes
3803
3520
basis_tree = tree.revision_tree(tree.last_revision())
3804
3521
except errors.NoSuchRevision:
3805
3522
basis_tree = tree.basis_tree()
3807
# die as quickly as possible if there are uncommitted changes
3809
if tree.has_changes():
3524
changes = tree.changes_from(basis_tree)
3525
if changes.has_changed():
3810
3526
raise errors.UncommittedChanges(tree)
3812
3528
view_info = _get_view_info_for_change_reporter(tree)
3813
3529
change_reporter = delta._ChangeReporter(
3814
3530
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
pb = ui.ui_factory.nested_progress_bar()
3816
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3818
if location is not None:
3820
mergeable = bundle.read_mergeable_from_url(location,
3821
possible_transports=possible_transports)
3822
except errors.NotABundle:
3533
pb = ui.ui_factory.nested_progress_bar()
3534
cleanups.append(pb.finished)
3536
cleanups.append(tree.unlock)
3537
if location is not None:
3539
mergeable = bundle.read_mergeable_from_url(location,
3540
possible_transports=possible_transports)
3541
except errors.NotABundle:
3545
raise errors.BzrCommandError('Cannot use --uncommitted'
3546
' with bundles or merge directives.')
3548
if revision is not None:
3549
raise errors.BzrCommandError(
3550
'Cannot use -r with merge directives or bundles')
3551
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3554
if merger is None and uncommitted:
3555
if revision is not None and len(revision) > 0:
3556
raise errors.BzrCommandError('Cannot use --uncommitted and'
3557
' --revision at the same time.')
3558
location = self._select_branch_location(tree, location)[0]
3559
other_tree, other_path = WorkingTree.open_containing(location)
3560
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3562
allow_pending = False
3563
if other_path != '':
3564
merger.interesting_files = [other_path]
3567
merger, allow_pending = self._get_merger_from_branch(tree,
3568
location, revision, remember, possible_transports, pb)
3570
merger.merge_type = merge_type
3571
merger.reprocess = reprocess
3572
merger.show_base = show_base
3573
self.sanity_check_merger(merger)
3574
if (merger.base_rev_id == merger.other_rev_id and
3575
merger.other_rev_id is not None):
3576
note('Nothing to do.')
3579
if merger.interesting_files is not None:
3580
raise errors.BzrCommandError('Cannot pull individual files')
3581
if (merger.base_rev_id == tree.last_revision()):
3582
result = tree.pull(merger.other_branch, False,
3583
merger.other_rev_id)
3584
result.report(self.outf)
3586
merger.check_basis(False)
3588
return self._do_preview(merger)
3826
raise errors.BzrCommandError('Cannot use --uncommitted'
3827
' with bundles or merge directives.')
3829
if revision is not None:
3830
raise errors.BzrCommandError(
3831
'Cannot use -r with merge directives or bundles')
3832
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3835
if merger is None and uncommitted:
3836
if revision is not None and len(revision) > 0:
3837
raise errors.BzrCommandError('Cannot use --uncommitted and'
3838
' --revision at the same time.')
3839
merger = self.get_merger_from_uncommitted(tree, location, None)
3840
allow_pending = False
3843
merger, allow_pending = self._get_merger_from_branch(tree,
3844
location, revision, remember, possible_transports, None)
3846
merger.merge_type = merge_type
3847
merger.reprocess = reprocess
3848
merger.show_base = show_base
3849
self.sanity_check_merger(merger)
3850
if (merger.base_rev_id == merger.other_rev_id and
3851
merger.other_rev_id is not None):
3852
note('Nothing to do.')
3855
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
3857
if (merger.base_rev_id == tree.last_revision()):
3858
result = tree.pull(merger.other_branch, False,
3859
merger.other_rev_id)
3860
result.report(self.outf)
3862
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
3864
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
3867
return self._do_preview(merger)
3869
return self._do_interactive(merger)
3871
return self._do_merge(merger, change_reporter, allow_pending,
3874
def _get_preview(self, merger):
3590
return self._do_merge(merger, change_reporter, allow_pending,
3593
for cleanup in reversed(cleanups):
3596
def _do_preview(self, merger):
3597
from bzrlib.diff import show_diff_trees
3875
3598
tree_merger = merger.make_merger()
3876
3599
tt = tree_merger.make_preview_transform()
3877
self.add_cleanup(tt.finalize)
3878
result_tree = tt.get_preview_tree()
3881
def _do_preview(self, merger):
3882
from bzrlib.diff import show_diff_trees
3883
result_tree = self._get_preview(merger)
3884
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
old_label='', new_label='')
3601
result_tree = tt.get_preview_tree()
3602
show_diff_trees(merger.this_tree, result_tree, self.outf,
3603
old_label='', new_label='')
3887
3607
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3888
3608
merger.change_reporter = change_reporter
4073
3761
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3762
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3763
if merge_type is None:
4077
3764
merge_type = _mod_merge.Merge3Merger
4078
3765
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4080
parents = tree.get_parent_ids()
4081
if len(parents) != 2:
4082
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4083
" merges. Not cherrypicking or"
4085
repository = tree.branch.repository
4086
interesting_ids = None
4088
conflicts = tree.conflicts()
4089
if file_list is not None:
4090
interesting_ids = set()
4091
for filename in file_list:
4092
file_id = tree.path2id(filename)
4094
raise errors.NotVersionedError(filename)
4095
interesting_ids.add(file_id)
4096
if tree.kind(file_id) != "directory":
3768
parents = tree.get_parent_ids()
3769
if len(parents) != 2:
3770
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3771
" merges. Not cherrypicking or"
3773
repository = tree.branch.repository
3774
interesting_ids = None
3776
conflicts = tree.conflicts()
3777
if file_list is not None:
3778
interesting_ids = set()
3779
for filename in file_list:
3780
file_id = tree.path2id(filename)
3782
raise errors.NotVersionedError(filename)
3783
interesting_ids.add(file_id)
3784
if tree.kind(file_id) != "directory":
4099
for name, ie in tree.inventory.iter_entries(file_id):
4100
interesting_ids.add(ie.file_id)
4101
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4103
# Remerge only supports resolving contents conflicts
4104
allowed_conflicts = ('text conflict', 'contents conflict')
4105
restore_files = [c.path for c in conflicts
4106
if c.typestring in allowed_conflicts]
4107
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4108
tree.set_conflicts(ConflictList(new_conflicts))
4109
if file_list is not None:
4110
restore_files = file_list
4111
for filename in restore_files:
3787
for name, ie in tree.inventory.iter_entries(file_id):
3788
interesting_ids.add(ie.file_id)
3789
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3791
# Remerge only supports resolving contents conflicts
3792
allowed_conflicts = ('text conflict', 'contents conflict')
3793
restore_files = [c.path for c in conflicts
3794
if c.typestring in allowed_conflicts]
3795
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3796
tree.set_conflicts(ConflictList(new_conflicts))
3797
if file_list is not None:
3798
restore_files = file_list
3799
for filename in restore_files:
3801
restore(tree.abspath(filename))
3802
except errors.NotConflicted:
3804
# Disable pending merges, because the file texts we are remerging
3805
# have not had those merges performed. If we use the wrong parents
3806
# list, we imply that the working tree text has seen and rejected
3807
# all the changes from the other tree, when in fact those changes
3808
# have not yet been seen.
3809
pb = ui.ui_factory.nested_progress_bar()
3810
tree.set_parent_ids(parents[:1])
4113
restore(tree.abspath(filename))
4114
except errors.NotConflicted:
4116
# Disable pending merges, because the file texts we are remerging
4117
# have not had those merges performed. If we use the wrong parents
4118
# list, we imply that the working tree text has seen and rejected
4119
# all the changes from the other tree, when in fact those changes
4120
# have not yet been seen.
4121
tree.set_parent_ids(parents[:1])
4123
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4124
merger.interesting_ids = interesting_ids
4125
merger.merge_type = merge_type
4126
merger.show_base = show_base
4127
merger.reprocess = reprocess
4128
conflicts = merger.do_merge()
3812
merger = _mod_merge.Merger.from_revision_ids(pb,
3814
merger.interesting_ids = interesting_ids
3815
merger.merge_type = merge_type
3816
merger.show_base = show_base
3817
merger.reprocess = reprocess
3818
conflicts = merger.do_merge()
3820
tree.set_parent_ids(parents)
4130
tree.set_parent_ids(parents)
4131
3824
if conflicts > 0:
4155
3848
name. If you name a directory, all the contents of that directory will be
4158
If you have newly added files since the target revision, they will be
4159
removed. If the files to be removed have been changed, backups will be
4160
created as above. Directories containing unknown files will not be
3851
Any files that have been newly added since that revision will be deleted,
3852
with a backup kept if appropriate. Directories containing unknown files
3853
will not be deleted.
4163
The working tree contains a list of revisions that have been merged but
4164
not yet committed. These revisions will be included as additional parents
4165
of the next commit. Normally, using revert clears that list as well as
4166
reverting the files. If any files are specified, revert leaves the list
4167
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4168
.`` in the tree root to revert all files but keep the recorded merges,
4169
and ``bzr revert --forget-merges`` to clear the pending merge list without
3855
The working tree contains a list of pending merged revisions, which will
3856
be included as parents in the next commit. Normally, revert clears that
3857
list as well as reverting the files. If any files are specified, revert
3858
leaves the pending merge list alone and reverts only the files. Use "bzr
3859
revert ." in the tree root to revert all files but keep the merge record,
3860
and "bzr revert --forget-merges" to clear the pending merge list without
4170
3861
reverting any files.
4172
Using "bzr revert --forget-merges", it is possible to apply all of the
4173
changes from a branch in a single revision. To do this, perform the merge
4174
as desired. Then doing revert with the "--forget-merges" option will keep
4175
the content of the tree as it was, but it will clear the list of pending
4176
merges. The next commit will then contain all of the changes that are
4177
present in the other branch, but without any other parent revisions.
4178
Because this technique forgets where these changes originated, it may
4179
cause additional conflicts on later merges involving the same source and
4183
3864
_see_also = ['cat', 'export']
4192
3873
def run(self, revision=None, no_backup=False, file_list=None,
4193
3874
forget_merges=None):
4194
3875
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4197
tree.set_parent_ids(tree.get_parent_ids()[:1])
4199
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3879
tree.set_parent_ids(tree.get_parent_ids()[:1])
3881
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4202
3886
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
3887
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4204
tree.revert(file_list, rev_tree, not no_backup, None,
4205
report_changes=True)
3888
pb = ui.ui_factory.nested_progress_bar()
3890
tree.revert(file_list, rev_tree, not no_backup, pb,
3891
report_changes=True)
4208
3896
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
3897
"""Test reporting of assertion failures"""
4210
3898
# intended just for use in testing
4361
4041
_get_revision_range(revision,
4362
4042
remote_branch, self.name()))
4364
local_extra, remote_extra = find_unmerged(
4365
local_branch, remote_branch, restrict,
4366
backward=not reverse,
4367
include_merges=include_merges,
4368
local_revid_range=local_revid_range,
4369
remote_revid_range=remote_revid_range)
4371
if log_format is None:
4372
registry = log.log_formatter_registry
4373
log_format = registry.get_default(local_branch)
4374
lf = log_format(to_file=self.outf,
4376
show_timezone='original')
4379
if local_extra and not theirs_only:
4380
message("You have %d extra revision(s):\n" %
4382
for revision in iter_log_revisions(local_extra,
4383
local_branch.repository,
4385
lf.log_revision(revision)
4386
printed_local = True
4389
printed_local = False
4391
if remote_extra and not mine_only:
4392
if printed_local is True:
4394
message("You are missing %d revision(s):\n" %
4396
for revision in iter_log_revisions(remote_extra,
4397
remote_branch.repository,
4399
lf.log_revision(revision)
4402
if mine_only and not local_extra:
4403
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
4405
elif theirs_only and not remote_extra:
4406
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
4408
elif not (mine_only or theirs_only or local_extra or
4410
# We checked both branches, and neither one had extra
4412
message("Branches are up to date.\n")
4044
local_branch.lock_read()
4046
remote_branch.lock_read()
4048
local_extra, remote_extra = find_unmerged(
4049
local_branch, remote_branch, restrict,
4050
backward=not reverse,
4051
include_merges=include_merges,
4052
local_revid_range=local_revid_range,
4053
remote_revid_range=remote_revid_range)
4055
if log_format is None:
4056
registry = log.log_formatter_registry
4057
log_format = registry.get_default(local_branch)
4058
lf = log_format(to_file=self.outf,
4060
show_timezone='original')
4063
if local_extra and not theirs_only:
4064
message("You have %d extra revision(s):\n" %
4066
for revision in iter_log_revisions(local_extra,
4067
local_branch.repository,
4069
lf.log_revision(revision)
4070
printed_local = True
4073
printed_local = False
4075
if remote_extra and not mine_only:
4076
if printed_local is True:
4078
message("You are missing %d revision(s):\n" %
4080
for revision in iter_log_revisions(remote_extra,
4081
remote_branch.repository,
4083
lf.log_revision(revision)
4086
if mine_only and not local_extra:
4087
# We checked local, and found nothing extra
4088
message('This branch is up to date.\n')
4089
elif theirs_only and not remote_extra:
4090
# We checked remote, and found nothing extra
4091
message('Other branch is up to date.\n')
4092
elif not (mine_only or theirs_only or local_extra or
4094
# We checked both branches, and neither one had extra
4096
message("Branches are up to date.\n")
4098
remote_branch.unlock()
4100
local_branch.unlock()
4414
4101
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4416
# handle race conditions - a parent might be set while we run.
4417
if local_branch.get_parent() is None:
4418
local_branch.set_parent(remote_branch.base)
4102
local_branch.lock_write()
4104
# handle race conditions - a parent might be set while we run.
4105
if local_branch.get_parent() is None:
4106
local_branch.set_parent(remote_branch.base)
4108
local_branch.unlock()
4419
4109
return status_code
4422
4112
class cmd_pack(Command):
4423
__doc__ = """Compress the data within a repository.
4425
This operation compresses the data within a bazaar repository. As
4426
bazaar supports automatic packing of repository, this operation is
4427
normally not required to be done manually.
4429
During the pack operation, bazaar takes a backup of existing repository
4430
data, i.e. pack files. This backup is eventually removed by bazaar
4431
automatically when it is safe to do so. To save disk space by removing
4432
the backed up pack files, the --clean-obsolete-packs option may be
4435
Warning: If you use --clean-obsolete-packs and your machine crashes
4436
during or immediately after repacking, you may be left with a state
4437
where the deletion has been written to disk but the new packs have not
4438
been. In this case the repository may be unusable.
4113
"""Compress the data within a repository."""
4441
4115
_see_also = ['repositories']
4442
4116
takes_args = ['branch_or_repo?']
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4118
def run(self, branch_or_repo='.'):
4448
4119
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4450
4121
branch = dir.open_branch()
4451
4122
repository = branch.repository
4452
4123
except errors.NotBranchError:
4453
4124
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4457
4128
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4129
"""List the installed plugins.
4460
4131
This command displays the list of installed plugins including
4461
4132
version of plugin and a short description of each.
4548
4222
Option('long', help='Show commit date in annotations.'),
4553
4226
encoding_type = 'exact'
4555
4228
@display_command
4556
4229
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4558
4231
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4232
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4562
self.add_cleanup(wt.lock_read().unlock)
4564
self.add_cleanup(branch.lock_read().unlock)
4565
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4568
file_id = wt.path2id(relpath)
4570
file_id = tree.path2id(relpath)
4572
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
if wt is not None and revision is None:
4575
# If there is a tree and we're not annotating historical
4576
# versions, annotate the working tree's content.
4577
annotate_file_tree(wt, file_id, self.outf, long, all,
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
4233
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4239
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4241
file_id = wt.path2id(relpath)
4243
file_id = tree.path2id(relpath)
4245
raise errors.NotVersionedError(filename)
4246
file_version = tree.inventory[file_id].revision
4247
if wt is not None and revision is None:
4248
# If there is a tree and we're not annotating historical
4249
# versions, annotate the working tree's content.
4250
annotate_file_tree(wt, file_id, self.outf, long, all,
4253
annotate_file(branch, file_version, file_id, long, all, self.outf,
4584
4262
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4263
"""Create a digital signature for an existing revision."""
4586
4264
# TODO be able to replace existing ones.
4588
4266
hidden = True # is this right ?
4589
4267
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4268
takes_options = ['revision']
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4270
def run(self, revision_id_list=None, revision=None):
4593
4271
if revision_id_list is not None and revision is not None:
4594
4272
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4273
if revision_id_list is None and revision is None:
4596
4274
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4599
return self._run(b, revision_id_list, revision)
4275
b = WorkingTree.open_containing(u'.')[0].branch
4278
return self._run(b, revision_id_list, revision)
4601
4282
def _run(self, b, revision_id_list, revision):
4602
4283
import bzrlib.gpg as gpg
4792
4476
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4479
print 'Dry-run, pretending to remove the above revisions.'
4481
val = raw_input('Press <enter> to continue')
4798
self.outf.write('The above revision(s) will be removed.\n')
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4483
print 'The above revision(s) will be removed.'
4485
val = raw_input('Are you sure [y/N]? ')
4486
if val.lower() not in ('y', 'yes'):
4805
4490
mutter('Uncommitting from {%s} to {%s}',
4806
4491
last_rev_id, rev_id)
4807
4492
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4493
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
4494
note('You can restore the old tip by running:\n'
4495
' bzr pull . -r revid:%s', last_rev_id)
4813
4498
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4499
"""Break a dead lock on a repository, branch or working directory.
4816
4501
CAUTION: Locks should only be broken when you are sure that the process
4817
4502
holding the lock has been stopped.
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4504
You can get information on what locks are open via the 'bzr info' command.
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
4826
4509
takes_args = ['location?']
4852
4535
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4536
"""Run the bzr server."""
4855
4538
aliases = ['server']
4857
4540
takes_options = [
4859
4542
help='Serve on stdin/out for use from inetd or sshd.'),
4860
RegistryOption('protocol',
4861
help="Protocol to serve.",
4862
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4863
value_switches=True),
4865
4544
help='Listen for connections on nominated port of the form '
4866
4545
'[hostname:]portnumber. Passing 0 as the port number will '
4867
'result in a dynamically allocated port. The default port '
4868
'depends on the protocol.',
4546
'result in a dynamically allocated port. The default port is '
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4550
help='Serve contents of this directory.',
4872
4552
Option('allow-writes',
4873
4553
help='By default the server is a readonly server. Supplying '
4874
4554
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
4876
'does not perform authentication, so unless some form of '
4877
'external authentication is arranged supplying this '
4878
'option leads to global uncontrolled write access to your '
4555
'the served directory and below.'
4559
def run_smart_server(self, smart_server):
4560
"""Run 'smart_server' forever, with no UI output at all."""
4561
# For the duration of this server, no UI output is permitted. note
4562
# that this may cause problems with blackbox tests. This should be
4563
# changed with care though, as we dont want to use bandwidth sending
4564
# progress over stderr to smart server clients!
4565
from bzrlib import lockdir
4566
old_factory = ui.ui_factory
4567
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4569
ui.ui_factory = ui.SilentUIFactory()
4570
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4571
smart_server.serve()
4573
ui.ui_factory = old_factory
4574
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4883
4576
def get_host_and_port(self, port):
4884
4577
"""Return the host and port to run the smart server on.
4886
If 'port' is None, None will be returned for the host and port.
4579
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4580
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4888
4582
If 'port' has a colon in it, the string before the colon will be
4889
4583
interpreted as the host.
4892
4586
:return: A tuple of (host, port), where 'host' is a host name or IP,
4893
4587
and port is an integer TCP/IP port.
4896
if port is not None:
4589
from bzrlib.smart import medium
4590
host = medium.BZR_DEFAULT_INTERFACE
4592
port = medium.BZR_DEFAULT_PORT
4897
4594
if ':' in port:
4898
4595
host, port = port.split(':')
4899
4596
port = int(port)
4900
4597
return host, port
4902
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4904
from bzrlib.transport import get_transport, transport_server_registry
4599
def get_smart_server(self, transport, inet, port):
4600
"""Construct a smart server.
4602
:param transport: The base transport from which branches will be
4604
:param inet: If True, serve over stdin and stdout. Used for running
4606
:param port: The port to listen on. By default, it's `
4607
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4609
:return: A smart server.
4611
from bzrlib.smart import medium, server
4613
smart_server = medium.SmartServerPipeStreamMedium(
4614
sys.stdin, sys.stdout, transport)
4616
host, port = self.get_host_and_port(port)
4617
smart_server = server.SmartTCPServer(
4618
transport, host=host, port=port)
4619
note('listening on port: %s' % smart_server.port)
4622
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4623
from bzrlib.transport import get_transport
4624
from bzrlib.transport.chroot import ChrootServer
4905
4625
if directory is None:
4906
4626
directory = os.getcwd()
4907
if protocol is None:
4908
protocol = transport_server_registry.get()
4909
host, port = self.get_host_and_port(port)
4910
4627
url = urlutils.local_path_to_url(directory)
4911
4628
if not allow_writes:
4912
4629
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
4630
chroot_server = ChrootServer(get_transport(url))
4631
chroot_server.setUp()
4632
t = get_transport(chroot_server.get_url())
4633
smart_server = self.get_smart_server(t, inet, port)
4634
self.run_smart_server(smart_server)
4917
4637
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4638
"""Combine a tree into its containing tree.
4920
4640
This command requires the target tree to be in a rich-root format.
5098
4818
directly from the merge directive, without retrieving data from a
5101
`bzr send` creates a compact data set that, when applied using bzr
5102
merge, has the same effect as merging from the source branch.
5104
By default the merge directive is self-contained and can be applied to any
5105
branch containing submit_branch in its ancestory without needing access to
5108
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5109
revisions, but only a structured request to merge from the
5110
public_location. In that case the public_branch is needed and it must be
5111
up-to-date and accessible to the recipient. The public_branch is always
5112
included if known, so that people can check it later.
5114
The submit branch defaults to the parent of the source branch, but can be
5115
overridden. Both submit branch and public branch will be remembered in
5116
branch.conf the first time they are used for a particular branch. The
5117
source branch defaults to that containing the working directory, but can
5118
be changed using --from.
5120
In order to calculate those changes, bzr must analyse the submit branch.
5121
Therefore it is most efficient for the submit branch to be a local mirror.
5122
If a public location is known for the submit_branch, that location is used
5123
in the merge directive.
5125
The default behaviour is to send the merge directive by mail, unless -o is
5126
given, in which case it is sent to a file.
4821
If --no-bundle is specified, then public_branch is needed (and must be
4822
up-to-date), so that the receiver can perform the merge using the
4823
public_branch. The public_branch is always included if known, so that
4824
people can check it later.
4826
The submit branch defaults to the parent, but can be overridden. Both
4827
submit branch and public branch will be remembered if supplied.
4829
If a public_branch is known for the submit_branch, that public submit
4830
branch is used in the merge instructions. This means that a local mirror
4831
can be used as your actual submit branch, once you have set public_branch
5128
4834
Mail is sent using your preferred mail program. This should be transparent
5129
4835
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5174
4875
short_name='f',
5176
4877
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
4878
help='Write merge directive to this file; '
5178
4879
'use - for stdout.',
5181
help='Refuse to send if there are uncommitted changes in'
5182
' the working tree, --no-strict disables the check.'),
5183
4881
Option('mail-to', help='Mail the request to this address.',
5187
4885
Option('body', help='Body for the email.', type=unicode),
5188
RegistryOption('format',
5189
help='Use the specified output format.',
5190
lazy_registry=('bzrlib.send', 'format_registry')),
4886
RegistryOption.from_kwargs('format',
4887
'Use the specified output format.',
4888
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4889
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5193
4892
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5194
4893
no_patch=False, revision=None, remember=False, output=None,
5195
format=None, mail_to=None, message=None, body=None,
5196
strict=None, **kwargs):
5197
from bzrlib.send import send
5198
return send(submit_branch, revision, public_branch, remember,
5199
format, no_bundle, no_patch, output,
5200
kwargs.get('from', '.'), mail_to, message, body,
4894
format=None, mail_to=None, message=None, body=None, **kwargs):
4895
return self._run(submit_branch, revision, public_branch, remember,
4896
format, no_bundle, no_patch, output,
4897
kwargs.get('from', '.'), mail_to, message, body)
4899
def _run(self, submit_branch, revision, public_branch, remember, format,
4900
no_bundle, no_patch, output, from_, mail_to, message, body):
4901
from bzrlib.revision import NULL_REVISION
4902
tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
4903
# we may need to write data into branch's repository to calculate
4908
config = branch.get_config()
4910
mail_to = config.get_user_option('submit_to')
4911
mail_client = config.get_mail_client()
4912
if (not getattr(mail_client, 'supports_body', False)
4913
and body is not None):
4914
raise errors.BzrCommandError(
4915
'Mail client "%s" does not support specifying body' %
4916
mail_client.__class__.__name__)
4917
if remember and submit_branch is None:
4918
raise errors.BzrCommandError(
4919
'--remember requires a branch to be specified.')
4920
stored_submit_branch = branch.get_submit_branch()
4921
remembered_submit_branch = None
4922
if submit_branch is None:
4923
submit_branch = stored_submit_branch
4924
remembered_submit_branch = "submit"
4926
if stored_submit_branch is None or remember:
4927
branch.set_submit_branch(submit_branch)
4928
if submit_branch is None:
4929
submit_branch = branch.get_parent()
4930
remembered_submit_branch = "parent"
4931
if submit_branch is None:
4932
raise errors.BzrCommandError('No submit branch known or'
4934
if remembered_submit_branch is not None:
4935
note('Using saved %s location "%s" to determine what '
4936
'changes to submit.', remembered_submit_branch,
4939
if mail_to is None or format is None:
4940
submit_config = Branch.open(submit_branch).get_config()
4942
mail_to = submit_config.get_user_option("child_submit_to")
4944
format = submit_config.get_user_option("child_submit_format")
4946
stored_public_branch = branch.get_public_branch()
4947
if public_branch is None:
4948
public_branch = stored_public_branch
4949
elif stored_public_branch is None or remember:
4950
branch.set_public_branch(public_branch)
4951
if no_bundle and public_branch is None:
4952
raise errors.BzrCommandError('No public branch specified or'
4954
base_revision_id = None
4956
if revision is not None:
4957
if len(revision) > 2:
4958
raise errors.BzrCommandError('bzr send takes '
4959
'at most two one revision identifiers')
4960
revision_id = revision[-1].as_revision_id(branch)
4961
if len(revision) == 2:
4962
base_revision_id = revision[0].as_revision_id(branch)
4963
if revision_id is None:
4964
revision_id = branch.last_revision()
4965
if revision_id == NULL_REVISION:
4966
raise errors.BzrCommandError('No revisions to submit.')
4970
directive = merge_directive.MergeDirective2.from_objects(
4971
branch.repository, revision_id, time.time(),
4972
osutils.local_time_offset(), submit_branch,
4973
public_branch=public_branch, include_patch=not no_patch,
4974
include_bundle=not no_bundle, message=message,
4975
base_revision_id=base_revision_id)
4976
elif format == '0.9':
4979
patch_type = 'bundle'
4981
raise errors.BzrCommandError('Format 0.9 does not'
4982
' permit bundle with no patch')
4988
directive = merge_directive.MergeDirective.from_objects(
4989
branch.repository, revision_id, time.time(),
4990
osutils.local_time_offset(), submit_branch,
4991
public_branch=public_branch, patch_type=patch_type,
4994
raise errors.BzrCommandError("No such send format '%s'." %
4998
directive.compose_merge_request(mail_client, mail_to, body,
5004
outfile = open(output, 'wb')
5006
outfile.writelines(directive.to_lines())
5008
if outfile is not self.outf:
5205
5014
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
5016
"""Create a merge-directive for submitting changes.
5208
5018
A merge directive provides many things needed for requesting merges:
5266
5074
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5267
5075
no_patch=False, revision=None, remember=False, output=None,
5268
format=None, strict=None, **kwargs):
5076
format=None, **kwargs):
5269
5077
if output is None:
5271
from bzrlib.send import send
5272
return send(submit_branch, revision, public_branch, remember,
5079
return self._run(submit_branch, revision, public_branch, remember,
5273
5080
format, no_bundle, no_patch, output,
5274
kwargs.get('from', '.'), None, None, None,
5275
self.outf, strict=strict)
5081
kwargs.get('from', '.'), None, None, None)
5278
5084
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5085
"""Create, remove or modify a tag naming a revision.
5281
5087
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5088
(--revision) option can be given -rtag:X, where X is any previously
5291
5097
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5098
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5294
If no tag name is specified it will be determined through the
5295
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5296
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5300
5101
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5102
takes_args = ['tag_name']
5302
5103
takes_options = [
5303
5104
Option('delete',
5304
5105
help='Delete this tag rather than placing it.',
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5108
help='Branch in which to place the tag.',
5308
5112
Option('force',
5309
5113
help='Replace existing tags.',
5314
def run(self, tag_name=None,
5118
def run(self, tag_name,
5320
5124
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5323
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5325
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
5329
if len(revision) != 1:
5330
raise errors.BzrCommandError(
5331
"Tags can only be placed on a single revision, "
5333
revision_id = revision[0].as_revision_id(branch)
5128
branch.tags.delete_tag(tag_name)
5129
self.outf.write('Deleted tag %s.\n' % tag_name)
5335
revision_id = branch.last_revision()
5336
if tag_name is None:
5337
tag_name = branch.automatic_tag_name(revision_id)
5338
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
if (not force) and branch.tags.has_tag(tag_name):
5342
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % tag_name)
5132
if len(revision) != 1:
5133
raise errors.BzrCommandError(
5134
"Tags can only be placed on a single revision, "
5136
revision_id = revision[0].as_revision_id(branch)
5138
revision_id = branch.last_revision()
5139
if (not force) and branch.tags.has_tag(tag_name):
5140
raise errors.TagAlreadyExists(tag_name)
5141
branch.tags.set_tag(tag_name, revision_id)
5142
self.outf.write('Created tag %s.\n' % tag_name)
5347
5147
class cmd_tags(Command):
5348
__doc__ = """List tags.
5350
5150
This command shows a table of tag names and the revisions they reference.
5353
5153
_see_also = ['tag']
5354
5154
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5156
help='Branch whose tags should be displayed.',
5357
5160
RegistryOption.from_kwargs('sort',
5358
5161
'Sort tags by different criteria.', title='Sorting',
5359
5162
alpha='Sort tags lexicographically (default).',
5399
5205
tags.sort(key=lambda x: timestamps[x[1]])
5400
5206
if not show_ids:
5401
5207
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5411
tags[index] = (tag, revno)
5208
revno_map = branch.get_revision_id_to_revno_map()
5209
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5210
for tag, revid in tags ]
5413
5211
for tag, revspec in tags:
5414
5212
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5215
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5216
"""Reconfigure the type of a bzr directory.
5420
5218
A target configuration must be specified.
5452
5250
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5251
Option('force',
5454
help='Perform reconfiguration even if local changes'
5456
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
5252
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5256
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5257
directory = bzrdir.BzrDir.open(location)
5470
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5472
elif stacked_on is not None:
5473
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5475
reconfigure.ReconfigureUnstacked().apply(directory)
5476
# At the moment you can use --stacked-on and a different
5477
# reconfiguration shape at the same time; there seems no good reason
5479
5258
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5259
raise errors.BzrCommandError('No target configuration specified')
5485
5260
elif target_type == 'branch':
5486
5261
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5262
elif target_type == 'tree':
5524
5299
/path/to/newbranch.
5526
5301
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5302
locally, in which case switching will update the the local nickname to be
5528
5303
that of the master.
5531
takes_args = ['to_location?']
5306
takes_args = ['to_location']
5532
5307
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
5535
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
5308
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5311
def run(self, to_location, force=False):
5542
5312
from bzrlib import switch
5543
5313
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5314
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5552
5316
branch = control_dir.open_branch()
5553
5317
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
5318
except errors.NotBranchError:
5556
5319
had_explicit_nick = False
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
5573
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5321
to_branch = Branch.open(to_location)
5322
except errors.NotBranchError:
5323
this_url = self._get_branch_location(control_dir)
5324
to_branch = Branch.open(
5325
urlutils.join(this_url, '..', to_location))
5326
switch.switch(control_dir, to_branch, force)
5580
5327
if had_explicit_nick:
5581
5328
branch = control_dir.open_branch() #get the new branch!
5582
5329
branch.nick = to_branch.nick
5849
5571
if writer is None:
5850
5572
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5574
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5575
message, destroy=destroy).run()
5858
5576
except errors.UserAbort:
5861
5579
def run_for_list(self):
5862
5580
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5583
manager = tree.get_shelf_manager()
5584
shelves = manager.active_shelves()
5585
if len(shelves) == 0:
5586
note('No shelved changes.')
5588
for shelf_id in reversed(shelves):
5589
message = manager.get_metadata(shelf_id).get('message')
5591
message = '<no message>'
5592
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5598
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5599
"""Restore shelved changes.
5880
5601
By default, the most recently shelved changes are restored. However if you
5881
5602
specify a shelf by id those changes will be restored instead. This works
5988
5701
self.outf.write('%s %s\n' % (path, location))
5991
def _register_lazy_builtins():
5992
# register lazy builtins from other modules; called at startup and should
5993
# be only called once.
5994
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6002
builtin_command_registry.register_lazy(name, aliases, module_name)
5704
# these get imported and then picked up by the scan for cmd_*
5705
# TODO: Some more consistent way to split command definitions across files;
5706
# we do need to load at least some information about them to know of
5707
# aliases. ideally we would avoid loading the implementation until the
5708
# details were needed.
5709
from bzrlib.cmd_version_info import cmd_version_info
5710
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5711
from bzrlib.bundle.commands import (
5714
from bzrlib.foreign import cmd_dpush
5715
from bzrlib.sign_my_commits import cmd_sign_my_commits
5716
from bzrlib.weave_commands import cmd_versionedfile_list, \
5717
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
