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.
538
485
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
540
487
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
488
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)
490
revid = wt.last_revision()
492
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
493
except errors.NoSuchRevision:
495
revno = ".".join(str(n) for n in revno_t)
549
499
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
553
506
self.outf.write(str(revno) + '\n')
556
509
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
510
"""Show revision number and revision id for a given revision identifier.
560
513
takes_args = ['revision_info*']
561
514
takes_options = [
563
custom_help('directory',
564
517
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
518
'rather than the one containing the working directory.',
566
522
Option('tree', help='Show revno of working tree'),
574
530
wt = WorkingTree.open_containing(directory)[0]
576
self.add_cleanup(wt.lock_read().unlock)
577
533
except (errors.NoWorkingTree, errors.NotLocalUrl):
579
535
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
582
if revision is not None:
583
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
584
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())
539
if revision is not None:
540
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
541
if revision_info_list is not None:
542
for rev_str in revision_info_list:
543
rev_spec = RevisionSpec.from_string(rev_str)
544
revision_ids.append(rev_spec.as_revision_id(b))
545
# No arguments supplied, default to the last revision
546
if len(revision_ids) == 0:
549
raise errors.NoWorkingTree(directory)
550
revision_ids.append(wt.last_revision())
552
revision_ids.append(b.last_revision())
556
for revision_id in revision_ids:
558
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
559
revno = '.'.join(str(i) for i in dotted_revno)
560
except errors.NoSuchRevision:
562
maxlen = max(maxlen, len(revno))
563
revinfos.append([revno, revision_id])
595
revision_ids.append(b.last_revision())
599
for revision_id in revision_ids:
601
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
602
revno = '.'.join(str(i) for i in dotted_revno)
603
except errors.NoSuchRevision:
605
maxlen = max(maxlen, len(revno))
606
revinfos.append([revno, revision_id])
609
570
for ri in revinfos:
610
571
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
613
574
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
575
"""Add specified files or directories.
616
577
In non-recursive mode, all the named items are added, regardless
617
578
of whether they were previously ignored. A warning is given if
682
640
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)
643
base_tree.lock_read()
645
file_list = self._maybe_expand_globs(file_list)
646
tree, file_list = tree_files_for_add(file_list)
647
added, ignored = tree.smart_add(file_list, not
648
no_recurse, action=action, save=not dry_run)
650
if base_tree is not None:
690
652
if len(ignored) > 0:
692
654
for glob in sorted(ignored.keys()):
693
655
for path in ignored[glob]:
694
656
self.outf.write("ignored %s matching \"%s\"\n"
660
for glob, paths in ignored.items():
661
match_len += len(paths)
662
self.outf.write("ignored %d file(s).\n" % match_len)
663
self.outf.write("If you wish to add ignored files, "
664
"please add them explicitly by name. "
665
"(\"bzr ignored\" gives a list)\n")
698
668
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
669
"""Create a new versioned directory.
701
671
This is equivalent to creating the directory and then adding it.
761
726
revision = _get_one_revision('inventory', revision)
762
727
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()
728
work_tree.lock_read()
730
if revision is not None:
731
tree = revision.as_tree(work_tree.branch)
733
extra_trees = [work_tree]
739
if file_list is not None:
740
file_ids = tree.paths2ids(file_list, trees=extra_trees,
741
require_versioned=True)
742
# find_ids_across_trees may include some paths that don't
744
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
745
for file_id in file_ids if file_id in tree)
747
entries = tree.inventory.entries()
750
if tree is not work_tree:
784
753
for path, entry in entries:
785
754
if kind and kind != entry.kind:
922
896
dest = osutils.pathjoin(dest_parent, dest_tail)
923
897
mutter("attempting to move %s => %s", src, dest)
924
898
tree.rename_one(src, dest, after=after)
926
self.outf.write("%s => %s\n" % (src, dest))
899
self.outf.write("%s => %s\n" % (src, dest))
929
902
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
903
"""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
905
This command only works on branches that have not diverged. Branches are
906
considered diverged if the destination branch's most recent commit is one
907
that has not been merged (directly or indirectly) into the parent.
937
909
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
910
from one into the other. Once one branch has merged, the other should
939
911
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.
913
If you want to forget your local changes and just update your branch to
914
match the remote one, use pull --overwrite.
945
916
If there is no default location set, the first pull will set it. After
946
917
that, you can omit the location to use the default. To change the
1021
993
branch_from = Branch.open(location,
1022
994
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1025
996
if branch_to.get_parent() is None or remember:
1026
997
branch_to.set_parent(branch_from.base)
1028
if revision is not None:
1029
revision_id = revision.as_revision_id(branch_from)
1031
if tree_to is not None:
1032
view_info = _get_view_info_for_change_reporter(tree_to)
1033
change_reporter = delta._ChangeReporter(
1034
unversioned_filter=tree_to.is_ignored,
1035
view_info=view_info)
1036
result = tree_to.pull(
1037
branch_from, overwrite, revision_id, change_reporter,
1038
possible_transports=possible_transports, local=local)
1040
result = branch_to.pull(
1041
branch_from, overwrite, revision_id, local=local)
1043
result.report(self.outf)
1044
if verbose and result.old_revid != result.new_revid:
1045
log.show_branch_change(
1046
branch_to, self.outf, result.old_revno,
999
if branch_from is not branch_to:
1000
branch_from.lock_read()
1002
if revision is not None:
1003
revision_id = revision.as_revision_id(branch_from)
1005
branch_to.lock_write()
1007
if tree_to is not None:
1008
view_info = _get_view_info_for_change_reporter(tree_to)
1009
change_reporter = delta._ChangeReporter(
1010
unversioned_filter=tree_to.is_ignored,
1011
view_info=view_info)
1012
result = tree_to.pull(
1013
branch_from, overwrite, revision_id, change_reporter,
1014
possible_transports=possible_transports, local=local)
1016
result = branch_to.pull(
1017
branch_from, overwrite, revision_id, local=local)
1019
result.report(self.outf)
1020
if verbose and result.old_revid != result.new_revid:
1021
log.show_branch_change(
1022
branch_to, self.outf, result.old_revno,
1027
if branch_from is not branch_to:
1028
branch_from.unlock()
1050
1031
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
1032
"""Update a mirror of this branch.
1053
1034
The target branch will not have its working tree populated because this
1054
1035
is both expensive, and is not supported on remote file systems.
1112
1096
# Get the source branch
1113
1097
(tree, br_from,
1114
1098
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1100
strict = br_from.get_config().get_user_option('push_strict')
1101
if strict is not None:
1102
# FIXME: This should be better supported by config
1104
bools = dict(yes=True, no=False, on=True, off=False,
1105
true=True, false=False)
1107
strict = bools[strict.lower()]
1115
1110
# Get the tip's revision_id
1116
1111
revision = _get_one_revision('push', revision)
1117
1112
if revision is not None:
1118
1113
revision_id = revision.in_history(br_from).rev_id
1120
1115
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.')
1116
if (tree is not None and revision_id is None
1117
and (strict is None or strict)): # Default to True:
1118
changes = tree.changes_from(tree.basis_tree())
1119
if changes.has_changed() or len(tree.get_parent_ids()) > 1:
1120
raise errors.UncommittedChanges(
1121
tree, more='Use --no-strict to force the push.')
1122
if tree.last_revision() != tree.branch.last_revision():
1123
# The tree has lost sync with its branch, there is little
1124
# chance that the user is aware of it but he can still force
1125
# the push with --no-strict
1126
raise errors.OutOfDateTree(
1127
tree, more='Use --no-strict to force the push.')
1126
1129
# Get the stacked_on branch, if any
1127
1130
if stacked_on is not None:
1128
1131
stacked_on = urlutils.normalize_url(stacked_on)
1193
1193
' directory exists, but does not already'
1194
1194
' have a control directory. This flag will'
1195
1195
' allow branch to proceed.'),
1197
help="Bind new branch to from location."),
1199
1197
aliases = ['get', 'clone']
1201
1199
def run(self, from_location, to_location=None, revision=None,
1202
1200
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
1201
use_existing_dir=False):
1205
1202
from bzrlib.tag import _merge_tags_if_possible
1206
1204
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1206
if (accelerator_tree is not None and
1207
accelerator_tree.supports_content_filtering()):
1208
accelerator_tree = None
1208
1209
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)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
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'))
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1274
1267
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1268
"""Create a new checkout of an existing branch.
1277
1270
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1271
the branch found in '.'. This is useful if you have removed the working tree
1357
1345
@display_command
1358
1346
def run(self, dir=u'.'):
1359
1347
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))
1350
new_inv = tree.inventory
1351
old_tree = tree.basis_tree()
1352
old_tree.lock_read()
1354
old_inv = old_tree.inventory
1356
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1357
for f, paths, c, v, p, n, k, e in iterator:
1358
if paths[0] == paths[1]:
1362
renames.append(paths)
1364
for old_name, new_name in renames:
1365
self.outf.write("%s => %s\n" % (old_name, new_name))
1378
1372
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1373
"""Update a tree to have the latest code committed to its branch.
1381
1375
This will perform a merge into the working tree, and may generate
1382
1376
conflicts. If you have any local changes, you will still
1385
1379
If you want to discard your local changes, you can just do a
1386
1380
'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
1383
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1384
takes_args = ['dir?']
1394
takes_options = ['revision']
1395
1385
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")
1387
def run(self, dir='.'):
1401
1388
tree = WorkingTree.open_containing(dir)[0]
1402
branch = tree.branch
1403
1389
possible_transports = []
1404
master = branch.get_master_branch(
1390
master = tree.branch.get_master_branch(
1405
1391
possible_transports=possible_transports)
1406
1392
if master is not None:
1407
branch_location = master.base
1408
1393
tree.lock_write()
1410
branch_location = tree.branch.base
1411
1395
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)
1397
existing_pending_merges = tree.get_parent_ids()[1:]
1398
last_rev = _mod_revision.ensure_null(tree.last_revision())
1399
if last_rev == _mod_revision.ensure_null(
1400
tree.branch.last_revision()):
1401
# may be up to date, check master too.
1402
if master is None or last_rev == _mod_revision.ensure_null(
1403
master.last_revision()):
1404
revno = tree.branch.revision_id_to_revno(last_rev)
1405
note("Tree is up to date at revision %d." % (revno,))
1407
view_info = _get_view_info_for_change_reporter(tree)
1439
1408
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'.")
1409
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1410
view_info=view_info), possible_transports=possible_transports)
1411
revno = tree.branch.revision_id_to_revno(
1412
_mod_revision.ensure_null(tree.last_revision()))
1413
note('Updated to revision %d.' % (revno,))
1414
if tree.get_parent_ids()[1:] != existing_pending_merges:
1415
note('Your local commits will now show as pending merges with '
1416
"'bzr status', and can be committed with 'bzr commit'.")
1464
1425
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1426
"""Show information about a working tree, branch or repository.
1467
1428
This command will show all known locations and formats associated to the
1468
1429
tree, branch or repository.
1534
1495
if file_list is not None:
1535
1496
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')
1500
# Heuristics should probably all move into tree.remove_smart or
1503
added = tree.changes_from(tree.basis_tree(),
1504
specific_files=file_list).added
1505
file_list = sorted([f[0] for f in added], reverse=True)
1506
if len(file_list) == 0:
1507
raise errors.BzrCommandError('No matching files.')
1508
elif file_list is None:
1509
# missing files show up in iter_changes(basis) as
1510
# versioned-with-no-kind.
1512
for change in tree.iter_changes(tree.basis_tree()):
1513
# Find paths in the working tree that have no kind:
1514
if change[1][1] is not None and change[6][1] is None:
1515
missing.append(change[1][1])
1516
file_list = sorted(missing, reverse=True)
1517
file_deletion_strategy = 'keep'
1518
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1519
keep_files=file_deletion_strategy=='keep',
1520
force=file_deletion_strategy=='force')
1561
1525
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1526
"""Print file_id of a particular file or directory.
1564
1528
The file_id is assigned when the file is first added and remains the
1565
1529
same through all revisions where the file exists, even when it is
1783
1747
class cmd_init_repository(Command):
1784
__doc__ = """Create a shared repository for branches to share storage space.
1748
"""Create a shared repository to hold branches.
1786
1750
New branches created under the repository directory will store their
1787
revisions in the repository, not in the branch directory. For branches
1788
with shared history, this reduces the amount of storage needed and
1789
speeds up the creation of new branches.
1751
revisions in the repository, not in the branch directory.
1791
If the --no-trees option is given then the branches in the repository
1792
will not have working trees by default. They will still exist as
1793
directories on disk, but they will not have separate copies of the
1794
files at a certain revision. This can be useful for repositories that
1795
store branches which are interacted with through checkouts or remote
1796
branches, such as on a server.
1753
If the --no-trees option is used then the branches in the repository
1754
will not have working trees by default.
1799
Create a shared repository holding just branches::
1757
Create a shared repositories holding just branches::
1801
1759
bzr init-repo --no-trees repo
1802
1760
bzr init repo/trunk
1965
1904
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1905
' 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)
1907
old_tree, new_tree, specific_files, extra_trees = \
1908
_get_trees_to_diff(file_list, revision, old, new,
1976
1910
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1911
specific_files=specific_files,
1978
1912
external_diff_options=diff_options,
1979
1913
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1914
extra_trees=extra_trees, using=using)
1984
1917
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1918
"""List files deleted in the working tree.
1987
1920
# TODO: Show files deleted since a previous revision, or
1988
1921
# between two revisions.
1991
1924
# level of effort but possibly much less IO. (Or possibly not,
1992
1925
# if the directories are very large...)
1993
1926
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1927
takes_options = ['show-ids']
1996
1929
@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')
1930
def run(self, show_ids=False):
1931
tree = WorkingTree.open_containing(u'.')[0]
1934
old = tree.basis_tree()
1937
for path, ie in old.inventory.iter_entries():
1938
if not tree.has_id(ie.file_id):
1939
self.outf.write(path)
1941
self.outf.write(' ')
1942
self.outf.write(ie.file_id)
1943
self.outf.write('\n')
2011
1950
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1951
"""List files modified in working tree.
2016
1955
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
1958
help='Write an ascii NUL (\\0) separator '
1959
'between files rather than a newline.')
2019
1962
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
1963
def run(self, null=False):
1964
tree = WorkingTree.open_containing(u'.')[0]
2022
1965
td = tree.changes_from(tree.basis_tree())
2023
1966
for path, id, kind, text_modified, meta_modified in td.modified:
2030
1973
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1974
"""List files added in working tree.
2035
1978
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
1981
help='Write an ascii NUL (\\0) separator '
1982
'between files rather than a newline.')
2038
1985
@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')
1986
def run(self, null=False):
1987
wt = WorkingTree.open_containing(u'.')[0]
1990
basis = wt.basis_tree()
1993
basis_inv = basis.inventory
1996
if file_id in basis_inv:
1998
if inv.is_root(file_id) and len(basis_inv) == 0:
2000
path = inv.id2path(file_id)
2001
if not os.access(osutils.abspath(path), os.F_OK):
2004
self.outf.write(path + '\0')
2006
self.outf.write(osutils.quotefn(path) + '\n')
2060
2013
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
2014
"""Show the tree root directory.
2063
2016
The root is the nearest enclosing directory with a .bzr control
2375
2314
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)
2318
# Build the log formatter
2319
if log_format is None:
2320
log_format = log.log_formatter_registry.get_default(b)
2321
lf = log_format(show_ids=show_ids, to_file=self.outf,
2322
show_timezone=timezone,
2323
delta_format=get_verbosity_level(),
2325
show_advice=levels is None)
2327
# Choose the algorithm for doing the logging. It's annoying
2328
# having multiple code paths like this but necessary until
2329
# the underlying repository format is faster at generating
2330
# deltas or can provide everything we need from the indices.
2331
# The default algorithm - match-using-deltas - works for
2332
# multiple files and directories and is faster for small
2333
# amounts of history (200 revisions say). However, it's too
2334
# slow for logging a single file in a repository with deep
2335
# history, i.e. > 10K revisions. In the spirit of "do no
2336
# evil when adding features", we continue to use the
2337
# original algorithm - per-file-graph - for the "single
2338
# file that isn't a directory without showing a delta" case.
2339
partial_history = revision and b.repository._format.supports_chks
2340
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2341
or delta_type or partial_history)
2343
# Build the LogRequest and execute it
2344
if len(file_ids) == 0:
2346
rqst = make_log_request_dict(
2347
direction=direction, specific_fileids=file_ids,
2348
start_revision=rev1, end_revision=rev2, limit=limit,
2349
message_search=message, delta_type=delta_type,
2350
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2351
Logger(b, rqst).show(lf)
2419
2356
def _get_revision_range(revisionspec_list, branch, command_name):
2508
2439
help='Recurse into subdirectories.'),
2509
2440
Option('from-root',
2510
2441
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2442
Option('unknown', help='Print unknown files.'),
2513
2443
Option('versioned', help='Print versioned files.',
2514
2444
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2445
Option('ignored', help='Print ignored files.'),
2447
help='Write an ascii NUL (\\0) separator '
2448
'between files rather than a newline.'),
2518
2450
help='List entries of a particular kind: file, directory, symlink.',
2524
2454
@display_command
2525
2455
def run(self, revision=None, verbose=False,
2526
2456
recursive=False, from_root=False,
2527
2457
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2458
null=False, kind=None, show_ids=False, path=None):
2530
2460
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2461
raise errors.BzrCommandError('invalid kind specified')
2565
2495
view_str = views.view_display_str(view_files)
2566
2496
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:
2500
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2501
from_dir=relpath, recursive=recursive):
2502
# Apply additional masking
2503
if not all and not selection[fc]:
2505
if kind is not None and fkind != kind:
2510
fullpath = osutils.pathjoin(relpath, fp)
2513
views.check_path_in_view(tree, fullpath)
2514
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))
2519
fp = osutils.pathjoin(prefix, fp)
2520
kindch = entry.kind_character()
2521
outstring = fp + kindch
2522
ui.ui_factory.clear_term()
2524
outstring = '%-8s %s' % (fc, outstring)
2525
if show_ids and fid is not None:
2526
outstring = "%-50s %s" % (outstring, fid)
2612
2527
self.outf.write(outstring + '\n')
2529
self.outf.write(fp + '\0')
2532
self.outf.write(fid)
2533
self.outf.write('\0')
2541
self.outf.write('%-50s %s\n' % (outstring, my_id))
2543
self.outf.write(outstring + '\n')
2615
2548
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2549
"""List unknown files.
2620
2553
_see_also = ['ls']
2621
takes_options = ['directory']
2623
2555
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2557
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2558
self.outf.write(osutils.quotefn(f) + '\n')
2629
2561
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2562
"""Ignore specified files or patterns.
2632
2564
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
2566
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2567
After adding, editing or deleting that file either indirectly by
2642
2568
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
2571
Note: ignore patterns containing shell wildcards must be quoted from
2659
2572
the shell on Unix.
2682
2591
Ignore everything but the "debian" toplevel directory::
2684
2593
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
2596
_see_also = ['status', 'ignored', 'patterns']
2695
2597
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2599
Option('old-default-rules',
2600
help='Write out the ignore rules bzr < 0.9 always used.')
2701
def run(self, name_pattern_list=None, default_rules=None,
2603
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2604
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)
2605
if old_default_rules is not None:
2606
# dump the rules and exit
2607
for pattern in ignores.OLD_DEFAULTS:
2709
2610
if not name_pattern_list:
2710
2611
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2612
"NAME_PATTERN or --old-default-rules")
2712
2613
name_pattern_list = [globbing.normalize_pattern(p)
2713
2614
for p in name_pattern_list]
2714
2615
for name_pattern in name_pattern_list:
2749
2650
encoding_type = 'replace'
2750
2651
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2753
2653
@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))
2655
tree = WorkingTree.open_containing(u'.')[0]
2658
for path, file_class, kind, file_id, entry in tree.list_files():
2659
if file_class != 'I':
2661
## XXX: Slightly inefficient since this was already calculated
2662
pat = tree.is_ignored(path)
2663
self.outf.write('%-50s %s\n' % (path, pat))
2765
2668
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2669
"""Lookup the revision-id from a revision-number
2769
2672
bzr lookup-revision 33
2772
2675
takes_args = ['revno']
2773
takes_options = ['directory']
2775
2677
@display_command
2776
def run(self, revno, directory=u'.'):
2678
def run(self, revno):
2778
2680
revno = int(revno)
2779
2681
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)
2682
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2684
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2786
2687
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2688
"""Export current or past revision to a destination directory or archive.
2789
2690
If no revision is specified this exports the last committed revision.
2868
2765
@display_command
2869
2766
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2871
2768
if revision is not None and len(revision) != 1:
2872
2769
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2770
" one revision specifier")
2874
2771
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)
2772
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2775
return self._run(tree, branch, relpath, filename, revision,
2776
name_from_revision, filters)
2880
2780
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2882
2782
if tree is None:
2883
2783
tree = b.basis_tree()
2884
2784
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2887
2786
old_file_id = rev_tree.path2id(relpath)
3126
3012
if local and not tree.branch.get_bound_location():
3127
3013
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
3015
def get_message(commit_obj):
3151
3016
"""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,
3017
my_message = message
3018
if my_message is None and not file:
3019
t = make_commit_message_template_encoded(tree,
3161
3020
selected_list, diff=show_diff,
3162
3021
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
3022
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3023
my_message = edit_commit_message_encoded(t,
3170
3024
start_message=start_message)
3171
3025
if my_message is None:
3172
3026
raise errors.BzrCommandError("please specify a commit"
3173
3027
" message with either --message or --file")
3028
elif my_message and file:
3029
raise errors.BzrCommandError(
3030
"please specify either --message or --file")
3032
my_message = codecs.open(file, 'rt',
3033
osutils.get_user_encoding()).read()
3174
3034
if my_message == "":
3175
3035
raise errors.BzrCommandError("empty commit message specified")
3176
3036
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
3039
tree.commit(message_callback=get_message,
3184
3040
specific_files=selected_list,
3185
3041
allow_pointless=unchanged, strict=strict, local=local,
3186
3042
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3189
3044
exclude=safe_relpath_files(tree, exclude))
3190
3045
except PointlessCommit:
3046
# FIXME: This should really happen before the file is read in;
3047
# perhaps prepare the commit; get the message; then actually commit
3191
3048
raise errors.BzrCommandError("No changes to commit."
3192
3049
" Use --unchanged to commit anyhow.")
3193
3050
except ConflictsInTree:
3606
3451
verbose = not is_quiet()
3607
3452
# TODO: should possibly lock the history file...
3608
3453
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3611
3455
test_suite_factory = None
3612
3456
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)
3458
selftest_kwargs = {"verbose": verbose,
3460
"stop_on_failure": one,
3461
"transport": transport,
3462
"test_suite_factory": test_suite_factory,
3463
"lsprof_timed": lsprof_timed,
3464
"bench_history": benchfile,
3465
"matching_tests_first": first,
3466
"list_only": list_only,
3467
"random_seed": randomize,
3468
"exclude_pattern": exclude,
3470
"load_list": load_list,
3471
"debug_flags": debugflag,
3472
"starting_with": starting_with
3474
selftest_kwargs.update(self.additional_selftest_args)
3475
result = selftest(**selftest_kwargs)
3477
if benchfile is not None:
3632
3479
return int(not result)
3635
3482
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3483
"""Show version of bzr."""
3638
3485
encoding_type = 'replace'
3639
3486
takes_options = [
3799
3636
verified = 'inapplicable'
3800
3637
tree = WorkingTree.open_containing(directory)[0]
3639
# die as quickly as possible if there are uncommitted changes
3803
3641
basis_tree = tree.revision_tree(tree.last_revision())
3804
3642
except errors.NoSuchRevision:
3805
3643
basis_tree = tree.basis_tree()
3807
# die as quickly as possible if there are uncommitted changes
3809
if tree.has_changes():
3645
changes = tree.changes_from(basis_tree)
3646
if changes.has_changed():
3810
3647
raise errors.UncommittedChanges(tree)
3812
3649
view_info = _get_view_info_for_change_reporter(tree)
3813
3650
change_reporter = delta._ChangeReporter(
3814
3651
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:
3654
pb = ui.ui_factory.nested_progress_bar()
3655
cleanups.append(pb.finished)
3657
cleanups.append(tree.unlock)
3658
if location is not None:
3660
mergeable = bundle.read_mergeable_from_url(location,
3661
possible_transports=possible_transports)
3662
except errors.NotABundle:
3666
raise errors.BzrCommandError('Cannot use --uncommitted'
3667
' with bundles or merge directives.')
3669
if revision is not None:
3670
raise errors.BzrCommandError(
3671
'Cannot use -r with merge directives or bundles')
3672
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3675
if merger is None and uncommitted:
3676
if revision is not None and len(revision) > 0:
3677
raise errors.BzrCommandError('Cannot use --uncommitted and'
3678
' --revision at the same time.')
3679
merger = self.get_merger_from_uncommitted(tree, location, pb,
3681
allow_pending = False
3684
merger, allow_pending = self._get_merger_from_branch(tree,
3685
location, revision, remember, possible_transports, pb)
3687
merger.merge_type = merge_type
3688
merger.reprocess = reprocess
3689
merger.show_base = show_base
3690
self.sanity_check_merger(merger)
3691
if (merger.base_rev_id == merger.other_rev_id and
3692
merger.other_rev_id is not None):
3693
note('Nothing to do.')
3696
if merger.interesting_files is not None:
3697
raise errors.BzrCommandError('Cannot pull individual files')
3698
if (merger.base_rev_id == tree.last_revision()):
3699
result = tree.pull(merger.other_branch, False,
3700
merger.other_rev_id)
3701
result.report(self.outf)
3703
merger.check_basis(False)
3705
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):
3707
return self._do_merge(merger, change_reporter, allow_pending,
3710
for cleanup in reversed(cleanups):
3713
def _do_preview(self, merger):
3714
from bzrlib.diff import show_diff_trees
3875
3715
tree_merger = merger.make_merger()
3876
3716
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='')
3718
result_tree = tt.get_preview_tree()
3719
show_diff_trees(merger.this_tree, result_tree, self.outf,
3720
old_label='', new_label='')
3887
3724
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3888
3725
merger.change_reporter = change_reporter
4073
3894
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3895
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3896
if merge_type is None:
4077
3897
merge_type = _mod_merge.Merge3Merger
4078
3898
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":
3901
parents = tree.get_parent_ids()
3902
if len(parents) != 2:
3903
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3904
" merges. Not cherrypicking or"
3906
repository = tree.branch.repository
3907
interesting_ids = None
3909
conflicts = tree.conflicts()
3910
if file_list is not None:
3911
interesting_ids = set()
3912
for filename in file_list:
3913
file_id = tree.path2id(filename)
3915
raise errors.NotVersionedError(filename)
3916
interesting_ids.add(file_id)
3917
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:
3920
for name, ie in tree.inventory.iter_entries(file_id):
3921
interesting_ids.add(ie.file_id)
3922
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3924
# Remerge only supports resolving contents conflicts
3925
allowed_conflicts = ('text conflict', 'contents conflict')
3926
restore_files = [c.path for c in conflicts
3927
if c.typestring in allowed_conflicts]
3928
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3929
tree.set_conflicts(ConflictList(new_conflicts))
3930
if file_list is not None:
3931
restore_files = file_list
3932
for filename in restore_files:
3934
restore(tree.abspath(filename))
3935
except errors.NotConflicted:
3937
# Disable pending merges, because the file texts we are remerging
3938
# have not had those merges performed. If we use the wrong parents
3939
# list, we imply that the working tree text has seen and rejected
3940
# all the changes from the other tree, when in fact those changes
3941
# have not yet been seen.
3942
pb = ui.ui_factory.nested_progress_bar()
3943
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()
3945
merger = _mod_merge.Merger.from_revision_ids(pb,
3947
merger.interesting_ids = interesting_ids
3948
merger.merge_type = merge_type
3949
merger.show_base = show_base
3950
merger.reprocess = reprocess
3951
conflicts = merger.do_merge()
3953
tree.set_parent_ids(parents)
4130
tree.set_parent_ids(parents)
4131
3957
if conflicts > 0:
4155
3981
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
3984
Any files that have been newly added since that revision will be deleted,
3985
with a backup kept if appropriate. Directories containing unknown files
3986
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
3988
The working tree contains a list of pending merged revisions, which will
3989
be included as parents in the next commit. Normally, revert clears that
3990
list as well as reverting the files. If any files are specified, revert
3991
leaves the pending merge list alone and reverts only the files. Use "bzr
3992
revert ." in the tree root to revert all files but keep the merge record,
3993
and "bzr revert --forget-merges" to clear the pending merge list without
4170
3994
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
3997
_see_also = ['cat', 'export']
4192
4006
def run(self, revision=None, no_backup=False, file_list=None,
4193
4007
forget_merges=None):
4194
4008
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)
4012
tree.set_parent_ids(tree.get_parent_ids()[:1])
4014
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4202
4019
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
4020
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)
4021
pb = ui.ui_factory.nested_progress_bar()
4023
tree.revert(file_list, rev_tree, not no_backup, pb,
4024
report_changes=True)
4208
4029
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4030
"""Test reporting of assertion failures"""
4210
4031
# intended just for use in testing
4361
4174
_get_revision_range(revision,
4362
4175
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")
4177
local_branch.lock_read()
4179
remote_branch.lock_read()
4181
local_extra, remote_extra = find_unmerged(
4182
local_branch, remote_branch, restrict,
4183
backward=not reverse,
4184
include_merges=include_merges,
4185
local_revid_range=local_revid_range,
4186
remote_revid_range=remote_revid_range)
4188
if log_format is None:
4189
registry = log.log_formatter_registry
4190
log_format = registry.get_default(local_branch)
4191
lf = log_format(to_file=self.outf,
4193
show_timezone='original')
4196
if local_extra and not theirs_only:
4197
message("You have %d extra revision(s):\n" %
4199
for revision in iter_log_revisions(local_extra,
4200
local_branch.repository,
4202
lf.log_revision(revision)
4203
printed_local = True
4206
printed_local = False
4208
if remote_extra and not mine_only:
4209
if printed_local is True:
4211
message("You are missing %d revision(s):\n" %
4213
for revision in iter_log_revisions(remote_extra,
4214
remote_branch.repository,
4216
lf.log_revision(revision)
4219
if mine_only and not local_extra:
4220
# We checked local, and found nothing extra
4221
message('This branch is up to date.\n')
4222
elif theirs_only and not remote_extra:
4223
# We checked remote, and found nothing extra
4224
message('Other branch is up to date.\n')
4225
elif not (mine_only or theirs_only or local_extra or
4227
# We checked both branches, and neither one had extra
4229
message("Branches are up to date.\n")
4231
remote_branch.unlock()
4233
local_branch.unlock()
4414
4234
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)
4235
local_branch.lock_write()
4237
# handle race conditions - a parent might be set while we run.
4238
if local_branch.get_parent() is None:
4239
local_branch.set_parent(remote_branch.base)
4241
local_branch.unlock()
4419
4242
return status_code
4422
4245
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.
4246
"""Compress the data within a repository."""
4441
4248
_see_also = ['repositories']
4442
4249
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):
4251
def run(self, branch_or_repo='.'):
4448
4252
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4450
4254
branch = dir.open_branch()
4451
4255
repository = branch.repository
4452
4256
except errors.NotBranchError:
4453
4257
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4457
4261
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4262
"""List the installed plugins.
4460
4264
This command displays the list of installed plugins including
4461
4265
version of plugin and a short description of each.
4548
4355
Option('long', help='Show commit date in annotations.'),
4553
4359
encoding_type = 'exact'
4555
4361
@display_command
4556
4362
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4558
4364
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4365
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,
4366
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4372
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4374
file_id = wt.path2id(relpath)
4376
file_id = tree.path2id(relpath)
4378
raise errors.NotVersionedError(filename)
4379
file_version = tree.inventory[file_id].revision
4380
if wt is not None and revision is None:
4381
# If there is a tree and we're not annotating historical
4382
# versions, annotate the working tree's content.
4383
annotate_file_tree(wt, file_id, self.outf, long, all,
4386
annotate_file(branch, file_version, file_id, long, all, self.outf,
4584
4395
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4396
"""Create a digital signature for an existing revision."""
4586
4397
# TODO be able to replace existing ones.
4588
4399
hidden = True # is this right ?
4589
4400
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4401
takes_options = ['revision']
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4403
def run(self, revision_id_list=None, revision=None):
4593
4404
if revision_id_list is not None and revision is not None:
4594
4405
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4406
if revision_id_list is None and revision is None:
4596
4407
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)
4408
b = WorkingTree.open_containing(u'.')[0].branch
4411
return self._run(b, revision_id_list, revision)
4601
4415
def _run(self, b, revision_id_list, revision):
4602
4416
import bzrlib.gpg as gpg
4792
4609
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4612
print 'Dry-run, pretending to remove the above revisions.'
4614
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')
4616
print 'The above revision(s) will be removed.'
4618
val = raw_input('Are you sure [y/N]? ')
4619
if val.lower() not in ('y', 'yes'):
4805
4623
mutter('Uncommitting from {%s} to {%s}',
4806
4624
last_rev_id, rev_id)
4807
4625
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4626
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)
4627
note('You can restore the old tip by running:\n'
4628
' bzr pull . -r revid:%s', last_rev_id)
4813
4631
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4632
"""Break a dead lock on a repository, branch or working directory.
4816
4634
CAUTION: Locks should only be broken when you are sure that the process
4817
4635
holding the lock has been stopped.
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4637
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
4642
takes_args = ['location?']
5098
4911
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.
4914
If --no-bundle is specified, then public_branch is needed (and must be
4915
up-to-date), so that the receiver can perform the merge using the
4916
public_branch. The public_branch is always included if known, so that
4917
people can check it later.
4919
The submit branch defaults to the parent, but can be overridden. Both
4920
submit branch and public branch will be remembered if supplied.
4922
If a public_branch is known for the submit_branch, that public submit
4923
branch is used in the merge instructions. This means that a local mirror
4924
can be used as your actual submit branch, once you have set public_branch
5128
4927
Mail is sent using your preferred mail program. This should be transparent
5129
4928
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5291
5085
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5086
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
5089
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5090
takes_args = ['tag_name']
5302
5091
takes_options = [
5303
5092
Option('delete',
5304
5093
help='Delete this tag rather than placing it.',
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5096
help='Branch in which to place the tag.',
5308
5100
Option('force',
5309
5101
help='Replace existing tags.',
5314
def run(self, tag_name=None,
5106
def run(self, tag_name,
5320
5112
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)
5116
branch.tags.delete_tag(tag_name)
5117
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)
5120
if len(revision) != 1:
5121
raise errors.BzrCommandError(
5122
"Tags can only be placed on a single revision, "
5124
revision_id = revision[0].as_revision_id(branch)
5126
revision_id = branch.last_revision()
5127
if (not force) and branch.tags.has_tag(tag_name):
5128
raise errors.TagAlreadyExists(tag_name)
5129
branch.tags.set_tag(tag_name, revision_id)
5130
self.outf.write('Created tag %s.\n' % tag_name)
5347
5135
class cmd_tags(Command):
5348
__doc__ = """List tags.
5350
5138
This command shows a table of tag names and the revisions they reference.
5353
5141
_see_also = ['tag']
5354
5142
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5144
help='Branch whose tags should be displayed.',
5357
5148
RegistryOption.from_kwargs('sort',
5358
5149
'Sort tags by different criteria.', title='Sorting',
5359
5150
alpha='Sort tags lexicographically (default).',
5379
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5401
# [ (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)
5173
graph = branch.repository.get_graph()
5174
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5175
revid1, revid2 = rev1.rev_id, rev2.rev_id
5176
# only show revisions between revid1 and revid2 (inclusive)
5177
tags = [(tag, revid) for tag, revid in tags if
5178
graph.is_between(revid, revid1, revid2)]
5181
elif sort == 'time':
5183
for tag, revid in tags:
5185
revobj = branch.repository.get_revision(revid)
5186
except errors.NoSuchRevision:
5187
timestamp = sys.maxint # place them at the end
5189
timestamp = revobj.timestamp
5190
timestamps[revid] = timestamp
5191
tags.sort(key=lambda x: timestamps[x[1]])
5193
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5194
for index, (tag, revid) in enumerate(tags):
5196
revno = branch.revision_id_to_dotted_revno(revid)
5197
if isinstance(revno, tuple):
5198
revno = '.'.join(map(str, revno))
5199
except errors.NoSuchRevision:
5200
# Bad tag data/merges can lead to tagged revisions
5201
# which are not in this branch. Fail gracefully ...
5203
tags[index] = (tag, revno)
5413
5206
for tag, revspec in tags:
5414
5207
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5210
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5211
"""Reconfigure the type of a bzr directory.
5420
5213
A target configuration must be specified.
5452
5245
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5246
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.',
5247
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5251
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5252
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
5253
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5254
raise errors.BzrCommandError('No target configuration specified')
5485
5255
elif target_type == 'branch':
5486
5256
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5257
elif target_type == 'tree':
5524
5294
/path/to/newbranch.
5526
5296
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
5297
locally, in which case switching will update the the local nickname to be
5528
5298
that of the master.
5531
takes_args = ['to_location?']
5301
takes_args = ['to_location']
5532
5302
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.'),
5303
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5306
def run(self, to_location, force=False):
5542
5307
from bzrlib import switch
5543
5308
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5309
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
5311
branch = control_dir.open_branch()
5553
5312
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
5313
except errors.NotBranchError:
5556
5314
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)
5316
to_branch = Branch.open(to_location)
5317
except errors.NotBranchError:
5318
this_url = self._get_branch_location(control_dir)
5319
to_branch = Branch.open(
5320
urlutils.join(this_url, '..', to_location))
5321
switch.switch(control_dir, to_branch, force)
5580
5322
if had_explicit_nick:
5581
5323
branch = control_dir.open_branch() #get the new branch!
5582
5324
branch.nick = to_branch.nick
5849
5566
if writer is None:
5850
5567
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5569
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5570
message, destroy=destroy).run()
5858
5571
except errors.UserAbort:
5861
5574
def run_for_list(self):
5862
5575
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))
5578
manager = tree.get_shelf_manager()
5579
shelves = manager.active_shelves()
5580
if len(shelves) == 0:
5581
note('No shelved changes.')
5583
for shelf_id in reversed(shelves):
5584
message = manager.get_metadata(shelf_id).get('message')
5586
message = '<no message>'
5587
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5593
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5594
"""Restore shelved changes.
5880
5596
By default, the most recently shelved changes are restored. However if you
5881
5597
specify a shelf by id those changes will be restored instead. This works
5889
5605
enum_switch=False, value_switches=True,
5890
5606
apply="Apply changes and remove from the shelf.",
5891
5607
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5608
delete_only="Delete changes without applying them."
5898
5611
_see_also = ['shelve']
5900
5613
def run(self, shelf_id=None, action='apply'):
5901
5614
from bzrlib.shelf_ui import Unshelver
5902
unshelver = Unshelver.from_args(shelf_id, action)
5906
unshelver.tree.unlock()
5615
Unshelver.from_args(shelf_id, action).run()
5909
5618
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5619
"""Remove unwanted files from working tree.
5912
5621
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5622
files are never deleted.
5931
5639
' deleting them.'),
5932
5640
Option('force', help='Do not prompt before deleting.')]
5933
5641
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5935
5643
from bzrlib.clean_tree import clean_tree
5936
5644
if not (unknown or ignored or detritus):
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5648
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5649
dry_run=dry_run, no_prompt=force)
5944
5652
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5653
"""list, view and set branch locations for nested trees.
5947
5655
If no arguments are provided, lists the branch locations for nested trees.
5948
5656
If one argument is provided, display the branch location for that tree.
5988
5696
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)
5699
# these get imported and then picked up by the scan for cmd_*
5700
# TODO: Some more consistent way to split command definitions across files;
5701
# we do need to load at least some information about them to know of
5702
# aliases. ideally we would avoid loading the implementation until the
5703
# details were needed.
5704
from bzrlib.cmd_version_info import cmd_version_info
5705
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5706
from bzrlib.bundle.commands import (
5709
from bzrlib.foreign import cmd_dpush
5710
from bzrlib.sign_my_commits import cmd_sign_my_commits
5711
from bzrlib.weave_commands import cmd_versionedfile_list, \
5712
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
