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(tree)
1126
1122
# Get the stacked_on branch, if any
1127
1123
if stacked_on is not None:
1128
1124
stacked_on = urlutils.normalize_url(stacked_on)
1179
1175
help='Hard-link working tree files where possible.'),
1180
1176
Option('no-tree',
1181
1177
help="Create a branch without a working-tree."),
1183
help="Switch the checkout in the current directory "
1184
"to the new branch."),
1185
1178
Option('stacked',
1186
1179
help='Create a stacked branch referring to the source branch. '
1187
1180
'The new branch will depend on the availability of the source '
1188
1181
'branch for all operations.'),
1189
1182
Option('standalone',
1190
1183
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
1185
aliases = ['get', 'clone']
1201
1187
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
1188
hardlink=False, stacked=False, standalone=False, no_tree=False):
1205
1189
from bzrlib.tag import _merge_tags_if_possible
1206
1191
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1193
if (accelerator_tree is not None and
1194
accelerator_tree.supports_content_filtering()):
1195
accelerator_tree = None
1208
1196
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)
1199
if revision is not None:
1200
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'))
1202
# FIXME - wt.last_revision, fallback to branch, fall back to
1203
# None or perhaps NULL_REVISION to mean copy nothing
1205
revision_id = br_from.last_revision()
1206
if to_location is None:
1207
to_location = urlutils.derive_to_location(from_location)
1208
to_transport = transport.get_transport(to_location)
1210
to_transport.mkdir('.')
1211
except errors.FileExists:
1212
raise errors.BzrCommandError('Target directory "%s" already'
1213
' exists.' % to_location)
1214
except errors.NoSuchFile:
1215
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1218
# preserve whatever source format we have.
1219
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1220
possible_transports=[to_transport],
1221
accelerator_tree=accelerator_tree,
1222
hardlink=hardlink, stacked=stacked,
1223
force_new_repo=standalone,
1224
create_tree_if_local=not no_tree,
1225
source_branch=br_from)
1226
branch = dir.open_branch()
1227
except errors.NoSuchRevision:
1228
to_transport.delete_tree('.')
1229
msg = "The branch %s has no revision %s." % (from_location,
1231
raise errors.BzrCommandError(msg)
1232
_merge_tags_if_possible(br_from, branch)
1233
# If the source branch is stacked, the new branch may
1234
# be stacked whether we asked for that explicitly or not.
1235
# We therefore need a try/except here and not just 'if stacked:'
1237
note('Created new stacked branch referring to %s.' %
1238
branch.get_stacked_on_url())
1239
except (errors.NotStacked, errors.UnstackableBranchFormat,
1240
errors.UnstackableRepositoryFormat), e:
1241
note('Branched %d revision(s).' % branch.revno())
1274
1246
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1247
"""Create a new checkout of an existing branch.
1277
1249
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1250
the branch found in '.'. This is useful if you have removed the working tree
1352
1324
@display_command
1353
1325
def run(self, dir=u'.'):
1354
1326
tree = WorkingTree.open_containing(dir)[0]
1355
self.add_cleanup(tree.lock_read().unlock)
1356
new_inv = tree.inventory
1357
old_tree = tree.basis_tree()
1358
self.add_cleanup(old_tree.lock_read().unlock)
1359
old_inv = old_tree.inventory
1361
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1362
for f, paths, c, v, p, n, k, e in iterator:
1363
if paths[0] == paths[1]:
1367
renames.append(paths)
1369
for old_name, new_name in renames:
1370
self.outf.write("%s => %s\n" % (old_name, new_name))
1329
new_inv = tree.inventory
1330
old_tree = tree.basis_tree()
1331
old_tree.lock_read()
1333
old_inv = old_tree.inventory
1335
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1336
for f, paths, c, v, p, n, k, e in iterator:
1337
if paths[0] == paths[1]:
1341
renames.append(paths)
1343
for old_name, new_name in renames:
1344
self.outf.write("%s => %s\n" % (old_name, new_name))
1373
1351
class cmd_update(Command):
1374
__doc__ = """Update a tree to have the latest code committed to its branch.
1352
"""Update a tree to have the latest code committed to its branch.
1376
1354
This will perform a merge into the working tree, and may generate
1377
1355
conflicts. If you have any local changes, you will still
1380
1358
If you want to discard your local changes, you can just do a
1381
1359
'bzr revert' instead of 'bzr commit' after the update.
1383
If the tree's branch is bound to a master branch, it will also update
1384
the branch from the master.
1387
1362
_see_also = ['pull', 'working-trees', 'status-flags']
1388
1363
takes_args = ['dir?']
1389
takes_options = ['revision']
1390
1364
aliases = ['up']
1392
def run(self, dir='.', revision=None):
1393
if revision is not None and len(revision) != 1:
1394
raise errors.BzrCommandError(
1395
"bzr update --revision takes exactly one revision")
1366
def run(self, dir='.'):
1396
1367
tree = WorkingTree.open_containing(dir)[0]
1397
branch = tree.branch
1398
1368
possible_transports = []
1399
master = branch.get_master_branch(
1369
master = tree.branch.get_master_branch(
1400
1370
possible_transports=possible_transports)
1401
1371
if master is not None:
1402
branch_location = master.base
1403
1372
tree.lock_write()
1405
branch_location = tree.branch.base
1406
1374
tree.lock_tree_write()
1407
self.add_cleanup(tree.unlock)
1408
# get rid of the final '/' and be ready for display
1409
branch_location = urlutils.unescape_for_display(
1410
branch_location.rstrip('/'),
1412
existing_pending_merges = tree.get_parent_ids()[1:]
1416
# may need to fetch data into a heavyweight checkout
1417
# XXX: this may take some time, maybe we should display a
1419
old_tip = branch.update(possible_transports)
1420
if revision is not None:
1421
revision_id = revision[0].as_revision_id(branch)
1423
revision_id = branch.last_revision()
1424
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1425
revno = branch.revision_id_to_dotted_revno(revision_id)
1426
note("Tree is up to date at revision %s of branch %s" %
1427
('.'.join(map(str, revno)), branch_location))
1429
view_info = _get_view_info_for_change_reporter(tree)
1430
change_reporter = delta._ChangeReporter(
1431
unversioned_filter=tree.is_ignored,
1432
view_info=view_info)
1376
existing_pending_merges = tree.get_parent_ids()[1:]
1377
last_rev = _mod_revision.ensure_null(tree.last_revision())
1378
if last_rev == _mod_revision.ensure_null(
1379
tree.branch.last_revision()):
1380
# may be up to date, check master too.
1381
if master is None or last_rev == _mod_revision.ensure_null(
1382
master.last_revision()):
1383
revno = tree.branch.revision_id_to_revno(last_rev)
1384
note("Tree is up to date at revision %d." % (revno,))
1386
view_info = _get_view_info_for_change_reporter(tree)
1434
1387
conflicts = tree.update(
1436
possible_transports=possible_transports,
1437
revision=revision_id,
1439
except errors.NoSuchRevision, e:
1440
raise errors.BzrCommandError(
1441
"branch has no revision %s\n"
1442
"bzr update --revision only works"
1443
" for a revision in the branch history"
1445
revno = tree.branch.revision_id_to_dotted_revno(
1446
_mod_revision.ensure_null(tree.last_revision()))
1447
note('Updated to revision %s of branch %s' %
1448
('.'.join(map(str, revno)), branch_location))
1449
parent_ids = tree.get_parent_ids()
1450
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1451
note('Your local commits will now show as pending merges with '
1452
"'bzr status', and can be committed with 'bzr commit'.")
1388
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1389
view_info=view_info), possible_transports=possible_transports)
1390
revno = tree.branch.revision_id_to_revno(
1391
_mod_revision.ensure_null(tree.last_revision()))
1392
note('Updated to revision %d.' % (revno,))
1393
if tree.get_parent_ids()[1:] != existing_pending_merges:
1394
note('Your local commits will now show as pending merges with '
1395
"'bzr status', and can be committed with 'bzr commit'.")
1459
1404
class cmd_info(Command):
1460
__doc__ = """Show information about a working tree, branch or repository.
1405
"""Show information about a working tree, branch or repository.
1462
1407
This command will show all known locations and formats associated to the
1463
1408
tree, branch or repository.
1529
1474
if file_list is not None:
1530
1475
file_list = [f for f in file_list]
1532
self.add_cleanup(tree.lock_write().unlock)
1533
# Heuristics should probably all move into tree.remove_smart or
1536
added = tree.changes_from(tree.basis_tree(),
1537
specific_files=file_list).added
1538
file_list = sorted([f[0] for f in added], reverse=True)
1539
if len(file_list) == 0:
1540
raise errors.BzrCommandError('No matching files.')
1541
elif file_list is None:
1542
# missing files show up in iter_changes(basis) as
1543
# versioned-with-no-kind.
1545
for change in tree.iter_changes(tree.basis_tree()):
1546
# Find paths in the working tree that have no kind:
1547
if change[1][1] is not None and change[6][1] is None:
1548
missing.append(change[1][1])
1549
file_list = sorted(missing, reverse=True)
1550
file_deletion_strategy = 'keep'
1551
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1552
keep_files=file_deletion_strategy=='keep',
1553
force=file_deletion_strategy=='force')
1479
# Heuristics should probably all move into tree.remove_smart or
1482
added = tree.changes_from(tree.basis_tree(),
1483
specific_files=file_list).added
1484
file_list = sorted([f[0] for f in added], reverse=True)
1485
if len(file_list) == 0:
1486
raise errors.BzrCommandError('No matching files.')
1487
elif file_list is None:
1488
# missing files show up in iter_changes(basis) as
1489
# versioned-with-no-kind.
1491
for change in tree.iter_changes(tree.basis_tree()):
1492
# Find paths in the working tree that have no kind:
1493
if change[1][1] is not None and change[6][1] is None:
1494
missing.append(change[1][1])
1495
file_list = sorted(missing, reverse=True)
1496
file_deletion_strategy = 'keep'
1497
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1498
keep_files=file_deletion_strategy=='keep',
1499
force=file_deletion_strategy=='force')
1556
1504
class cmd_file_id(Command):
1557
__doc__ = """Print file_id of a particular file or directory.
1505
"""Print file_id of a particular file or directory.
1559
1507
The file_id is assigned when the file is first added and remains the
1560
1508
same through all revisions where the file exists, even when it is
1960
1883
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1961
1884
' one or two revision specifiers')
1963
if using is not None and format is not None:
1964
raise errors.BzrCommandError('--using and --format are mutually '
1967
(old_tree, new_tree,
1968
old_branch, new_branch,
1969
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1970
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1886
old_tree, new_tree, specific_files, extra_trees = \
1887
_get_trees_to_diff(file_list, revision, old, new,
1971
1889
return show_diff_trees(old_tree, new_tree, sys.stdout,
1972
1890
specific_files=specific_files,
1973
1891
external_diff_options=diff_options,
1974
1892
old_label=old_label, new_label=new_label,
1975
extra_trees=extra_trees, using=using,
1893
extra_trees=extra_trees, using=using)
1979
1896
class cmd_deleted(Command):
1980
__doc__ = """List files deleted in the working tree.
1897
"""List files deleted in the working tree.
1982
1899
# TODO: Show files deleted since a previous revision, or
1983
1900
# between two revisions.
1986
1903
# level of effort but possibly much less IO. (Or possibly not,
1987
1904
# if the directories are very large...)
1988
1905
_see_also = ['status', 'ls']
1989
takes_options = ['directory', 'show-ids']
1906
takes_options = ['show-ids']
1991
1908
@display_command
1992
def run(self, show_ids=False, directory=u'.'):
1993
tree = WorkingTree.open_containing(directory)[0]
1994
self.add_cleanup(tree.lock_read().unlock)
1995
old = tree.basis_tree()
1996
self.add_cleanup(old.lock_read().unlock)
1997
for path, ie in old.inventory.iter_entries():
1998
if not tree.has_id(ie.file_id):
1999
self.outf.write(path)
2001
self.outf.write(' ')
2002
self.outf.write(ie.file_id)
2003
self.outf.write('\n')
1909
def run(self, show_ids=False):
1910
tree = WorkingTree.open_containing(u'.')[0]
1913
old = tree.basis_tree()
1916
for path, ie in old.inventory.iter_entries():
1917
if not tree.has_id(ie.file_id):
1918
self.outf.write(path)
1920
self.outf.write(' ')
1921
self.outf.write(ie.file_id)
1922
self.outf.write('\n')
2006
1929
class cmd_modified(Command):
2007
__doc__ = """List files modified in working tree.
1930
"""List files modified in working tree.
2011
1934
_see_also = ['status', 'ls']
2012
takes_options = ['directory', 'null']
1937
help='Write an ascii NUL (\\0) separator '
1938
'between files rather than a newline.')
2014
1941
@display_command
2015
def run(self, null=False, directory=u'.'):
2016
tree = WorkingTree.open_containing(directory)[0]
1942
def run(self, null=False):
1943
tree = WorkingTree.open_containing(u'.')[0]
2017
1944
td = tree.changes_from(tree.basis_tree())
2018
1945
for path, id, kind, text_modified, meta_modified in td.modified:
2025
1952
class cmd_added(Command):
2026
__doc__ = """List files added in working tree.
1953
"""List files added in working tree.
2030
1957
_see_also = ['status', 'ls']
2031
takes_options = ['directory', 'null']
1960
help='Write an ascii NUL (\\0) separator '
1961
'between files rather than a newline.')
2033
1964
@display_command
2034
def run(self, null=False, directory=u'.'):
2035
wt = WorkingTree.open_containing(directory)[0]
2036
self.add_cleanup(wt.lock_read().unlock)
2037
basis = wt.basis_tree()
2038
self.add_cleanup(basis.lock_read().unlock)
2039
basis_inv = basis.inventory
2042
if file_id in basis_inv:
2044
if inv.is_root(file_id) and len(basis_inv) == 0:
2046
path = inv.id2path(file_id)
2047
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2050
self.outf.write(path + '\0')
2052
self.outf.write(osutils.quotefn(path) + '\n')
1965
def run(self, null=False):
1966
wt = WorkingTree.open_containing(u'.')[0]
1969
basis = wt.basis_tree()
1972
basis_inv = basis.inventory
1975
if file_id in basis_inv:
1977
if inv.is_root(file_id) and len(basis_inv) == 0:
1979
path = inv.id2path(file_id)
1980
if not os.access(osutils.abspath(path), os.F_OK):
1983
self.outf.write(path + '\0')
1985
self.outf.write(osutils.quotefn(path) + '\n')
2055
1992
class cmd_root(Command):
2056
__doc__ = """Show the tree root directory.
1993
"""Show the tree root directory.
2058
1995
The root is the nearest enclosing directory with a .bzr control
2370
2293
diff_type = 'full'
2372
# Build the log formatter
2373
if log_format is None:
2374
log_format = log.log_formatter_registry.get_default(b)
2375
# Make a non-encoding output to include the diffs - bug 328007
2376
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2377
lf = log_format(show_ids=show_ids, to_file=self.outf,
2378
to_exact_file=unencoded_output,
2379
show_timezone=timezone,
2380
delta_format=get_verbosity_level(),
2382
show_advice=levels is None,
2383
author_list_handler=authors)
2385
# Choose the algorithm for doing the logging. It's annoying
2386
# having multiple code paths like this but necessary until
2387
# the underlying repository format is faster at generating
2388
# deltas or can provide everything we need from the indices.
2389
# The default algorithm - match-using-deltas - works for
2390
# multiple files and directories and is faster for small
2391
# amounts of history (200 revisions say). However, it's too
2392
# slow for logging a single file in a repository with deep
2393
# history, i.e. > 10K revisions. In the spirit of "do no
2394
# evil when adding features", we continue to use the
2395
# original algorithm - per-file-graph - for the "single
2396
# file that isn't a directory without showing a delta" case.
2397
partial_history = revision and b.repository._format.supports_chks
2398
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2399
or delta_type or partial_history)
2401
# Build the LogRequest and execute it
2402
if len(file_ids) == 0:
2404
rqst = make_log_request_dict(
2405
direction=direction, specific_fileids=file_ids,
2406
start_revision=rev1, end_revision=rev2, limit=limit,
2407
message_search=message, delta_type=delta_type,
2408
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2409
exclude_common_ancestry=exclude_common_ancestry,
2411
Logger(b, rqst).show(lf)
2297
# Build the log formatter
2298
if log_format is None:
2299
log_format = log.log_formatter_registry.get_default(b)
2300
lf = log_format(show_ids=show_ids, to_file=self.outf,
2301
show_timezone=timezone,
2302
delta_format=get_verbosity_level(),
2304
show_advice=levels is None)
2306
# Choose the algorithm for doing the logging. It's annoying
2307
# having multiple code paths like this but necessary until
2308
# the underlying repository format is faster at generating
2309
# deltas or can provide everything we need from the indices.
2310
# The default algorithm - match-using-deltas - works for
2311
# multiple files and directories and is faster for small
2312
# amounts of history (200 revisions say). However, it's too
2313
# slow for logging a single file in a repository with deep
2314
# history, i.e. > 10K revisions. In the spirit of "do no
2315
# evil when adding features", we continue to use the
2316
# original algorithm - per-file-graph - for the "single
2317
# file that isn't a directory without showing a delta" case.
2318
partial_history = revision and b.repository._format.supports_chks
2319
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2320
or delta_type or partial_history)
2322
# Build the LogRequest and execute it
2323
if len(file_ids) == 0:
2325
rqst = make_log_request_dict(
2326
direction=direction, specific_fileids=file_ids,
2327
start_revision=rev1, end_revision=rev2, limit=limit,
2328
message_search=message, delta_type=delta_type,
2329
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2330
Logger(b, rqst).show(lf)
2414
2335
def _get_revision_range(revisionspec_list, branch, command_name):
2503
2418
help='Recurse into subdirectories.'),
2504
2419
Option('from-root',
2505
2420
help='Print paths relative to the root of the branch.'),
2506
Option('unknown', short_name='u',
2507
help='Print unknown files.'),
2421
Option('unknown', help='Print unknown files.'),
2508
2422
Option('versioned', help='Print versioned files.',
2509
2423
short_name='V'),
2510
Option('ignored', short_name='i',
2511
help='Print ignored files.'),
2512
Option('kind', short_name='k',
2424
Option('ignored', help='Print ignored files.'),
2426
help='Write an ascii NUL (\\0) separator '
2427
'between files rather than a newline.'),
2513
2429
help='List entries of a particular kind: file, directory, symlink.',
2519
2433
@display_command
2520
2434
def run(self, revision=None, verbose=False,
2521
2435
recursive=False, from_root=False,
2522
2436
unknown=False, versioned=False, ignored=False,
2523
null=False, kind=None, show_ids=False, path=None, directory=None):
2437
null=False, kind=None, show_ids=False, path=None):
2525
2439
if kind and kind not in ('file', 'directory', 'symlink'):
2526
2440
raise errors.BzrCommandError('invalid kind specified')
2560
2474
view_str = views.view_display_str(view_files)
2561
2475
note("Ignoring files outside view. View is %s" % view_str)
2563
self.add_cleanup(tree.lock_read().unlock)
2564
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2565
from_dir=relpath, recursive=recursive):
2566
# Apply additional masking
2567
if not all and not selection[fc]:
2569
if kind is not None and fkind != kind:
2574
fullpath = osutils.pathjoin(relpath, fp)
2577
views.check_path_in_view(tree, fullpath)
2578
except errors.FileOutsideView:
2479
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2480
from_dir=relpath, recursive=recursive):
2481
# Apply additional masking
2482
if not all and not selection[fc]:
2484
if kind is not None and fkind != kind:
2489
fullpath = osutils.pathjoin(relpath, fp)
2492
views.check_path_in_view(tree, fullpath)
2493
except errors.FileOutsideView:
2583
fp = osutils.pathjoin(prefix, fp)
2584
kindch = entry.kind_character()
2585
outstring = fp + kindch
2586
ui.ui_factory.clear_term()
2588
outstring = '%-8s %s' % (fc, outstring)
2589
if show_ids and fid is not None:
2590
outstring = "%-50s %s" % (outstring, fid)
2591
self.outf.write(outstring + '\n')
2593
self.outf.write(fp + '\0')
2596
self.outf.write(fid)
2597
self.outf.write('\0')
2605
self.outf.write('%-50s %s\n' % (outstring, my_id))
2498
fp = osutils.pathjoin(prefix, fp)
2499
kindch = entry.kind_character()
2500
outstring = fp + kindch
2501
ui.ui_factory.clear_term()
2503
outstring = '%-8s %s' % (fc, outstring)
2504
if show_ids and fid is not None:
2505
outstring = "%-50s %s" % (outstring, fid)
2607
2506
self.outf.write(outstring + '\n')
2508
self.outf.write(fp + '\0')
2511
self.outf.write(fid)
2512
self.outf.write('\0')
2520
self.outf.write('%-50s %s\n' % (outstring, my_id))
2522
self.outf.write(outstring + '\n')
2610
2527
class cmd_unknowns(Command):
2611
__doc__ = """List unknown files.
2528
"""List unknown files.
2615
2532
_see_also = ['ls']
2616
takes_options = ['directory']
2618
2534
@display_command
2619
def run(self, directory=u'.'):
2620
for f in WorkingTree.open_containing(directory)[0].unknowns():
2536
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2621
2537
self.outf.write(osutils.quotefn(f) + '\n')
2624
2540
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2541
"""Ignore specified files or patterns.
2627
2543
See ``bzr help patterns`` for details on the syntax of patterns.
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2635
2545
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2546
After adding, editing or deleting that file either indirectly by
2637
2547
using this command or directly by using an editor, be sure to commit
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2653
2550
Note: ignore patterns containing shell wildcards must be quoted from
2654
2551
the shell on Unix.
2677
2570
Ignore everything but the "debian" toplevel directory::
2679
2572
bzr ignore "RE:(?!debian/).*"
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2685
bzr ignore "!./local"
2689
2575
_see_also = ['status', 'ignored', 'patterns']
2690
2576
takes_args = ['name_pattern*']
2691
takes_options = ['directory',
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2578
Option('old-default-rules',
2579
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None,
2582
def run(self, name_pattern_list=None, old_default_rules=None):
2698
2583
from bzrlib import ignores
2699
if default_rules is not None:
2700
# dump the default rules and exit
2701
for pattern in ignores.USER_DEFAULTS:
2702
self.outf.write("%s\n" % pattern)
2584
if old_default_rules is not None:
2585
# dump the rules and exit
2586
for pattern in ignores.OLD_DEFAULTS:
2704
2589
if not name_pattern_list:
2705
2590
raise errors.BzrCommandError("ignore requires at least one "
2706
"NAME_PATTERN or --default-rules.")
2591
"NAME_PATTERN or --old-default-rules")
2707
2592
name_pattern_list = [globbing.normalize_pattern(p)
2708
2593
for p in name_pattern_list]
2709
2594
for name_pattern in name_pattern_list:
2744
2629
encoding_type = 'replace'
2745
2630
_see_also = ['ignore', 'ls']
2746
takes_options = ['directory']
2748
2632
@display_command
2749
def run(self, directory=u'.'):
2750
tree = WorkingTree.open_containing(directory)[0]
2751
self.add_cleanup(tree.lock_read().unlock)
2752
for path, file_class, kind, file_id, entry in tree.list_files():
2753
if file_class != 'I':
2755
## XXX: Slightly inefficient since this was already calculated
2756
pat = tree.is_ignored(path)
2757
self.outf.write('%-50s %s\n' % (path, pat))
2634
tree = WorkingTree.open_containing(u'.')[0]
2637
for path, file_class, kind, file_id, entry in tree.list_files():
2638
if file_class != 'I':
2640
## XXX: Slightly inefficient since this was already calculated
2641
pat = tree.is_ignored(path)
2642
self.outf.write('%-50s %s\n' % (path, pat))
2760
2647
class cmd_lookup_revision(Command):
2761
__doc__ = """Lookup the revision-id from a revision-number
2648
"""Lookup the revision-id from a revision-number
2764
2651
bzr lookup-revision 33
2767
2654
takes_args = ['revno']
2768
takes_options = ['directory']
2770
2656
@display_command
2771
def run(self, revno, directory=u'.'):
2657
def run(self, revno):
2773
2659
revno = int(revno)
2774
2660
except ValueError:
2775
raise errors.BzrCommandError("not a valid revision-number: %r"
2777
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2778
self.outf.write("%s\n" % revid)
2661
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2663
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2781
2666
class cmd_export(Command):
2782
__doc__ = """Export current or past revision to a destination directory or archive.
2667
"""Export current or past revision to a destination directory or archive.
2784
2669
If no revision is specified this exports the last committed revision.
2863
2744
@display_command
2864
2745
def run(self, filename, revision=None, name_from_revision=False,
2865
filters=False, directory=None):
2866
2747
if revision is not None and len(revision) != 1:
2867
2748
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2868
2749
" one revision specifier")
2869
2750
tree, branch, relpath = \
2870
_open_directory_or_containing_tree_or_branch(filename, directory)
2871
self.add_cleanup(branch.lock_read().unlock)
2872
return self._run(tree, branch, relpath, filename, revision,
2873
name_from_revision, filters)
2751
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2754
return self._run(tree, branch, relpath, filename, revision,
2755
name_from_revision, filters)
2875
2759
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2877
2761
if tree is None:
2878
2762
tree = b.basis_tree()
2879
2763
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2880
self.add_cleanup(rev_tree.lock_read().unlock)
2882
2765
old_file_id = rev_tree.path2id(relpath)
3121
2991
if local and not tree.branch.get_bound_location():
3122
2992
raise errors.LocalRequiresBoundBranch()
3124
if message is not None:
3126
file_exists = osutils.lexists(message)
3127
except UnicodeError:
3128
# The commit message contains unicode characters that can't be
3129
# represented in the filesystem encoding, so that can't be a
3134
'The commit message is a file name: "%(f)s".\n'
3135
'(use --file "%(f)s" to take commit message from that file)'
3137
ui.ui_factory.show_warning(warning_msg)
3139
message = message.replace('\r\n', '\n')
3140
message = message.replace('\r', '\n')
3142
raise errors.BzrCommandError(
3143
"please specify either --message or --file")
3145
2994
def get_message(commit_obj):
3146
2995
"""Callback to get commit message"""
3148
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3150
my_message = f.read()
3153
elif message is not None:
3154
my_message = message
3156
# No message supplied: make one up.
3157
# text is the status of the tree
3158
text = make_commit_message_template_encoded(tree,
2996
my_message = message
2997
if my_message is None and not file:
2998
t = make_commit_message_template_encoded(tree,
3159
2999
selected_list, diff=show_diff,
3160
3000
output_encoding=osutils.get_user_encoding())
3161
# start_message is the template generated from hooks
3162
# XXX: Warning - looks like hooks return unicode,
3163
# make_commit_message_template_encoded returns user encoding.
3164
# We probably want to be using edit_commit_message instead to
3166
3001
start_message = generate_commit_message_template(commit_obj)
3167
my_message = edit_commit_message_encoded(text,
3002
my_message = edit_commit_message_encoded(t,
3168
3003
start_message=start_message)
3169
3004
if my_message is None:
3170
3005
raise errors.BzrCommandError("please specify a commit"
3171
3006
" message with either --message or --file")
3007
elif my_message and file:
3008
raise errors.BzrCommandError(
3009
"please specify either --message or --file")
3011
my_message = codecs.open(file, 'rt',
3012
osutils.get_user_encoding()).read()
3172
3013
if my_message == "":
3173
3014
raise errors.BzrCommandError("empty commit message specified")
3174
3015
return my_message
3176
# The API permits a commit with a filter of [] to mean 'select nothing'
3177
# but the command line should not do that.
3178
if not selected_list:
3179
selected_list = None
3181
3018
tree.commit(message_callback=get_message,
3182
3019
specific_files=selected_list,
3183
3020
allow_pointless=unchanged, strict=strict, local=local,
3184
3021
reporter=None, verbose=verbose, revprops=properties,
3185
authors=author, timestamp=commit_stamp,
3187
3023
exclude=safe_relpath_files(tree, exclude))
3188
3024
except PointlessCommit:
3025
# FIXME: This should really happen before the file is read in;
3026
# perhaps prepare the commit; get the message; then actually commit
3189
3027
raise errors.BzrCommandError("No changes to commit."
3190
3028
" Use --unchanged to commit anyhow.")
3191
3029
except ConflictsInTree:
3608
3430
verbose = not is_quiet()
3609
3431
# TODO: should possibly lock the history file...
3610
3432
benchfile = open(".perf_history", "at", buffering=1)
3611
self.add_cleanup(benchfile.close)
3613
3434
test_suite_factory = None
3614
3435
benchfile = None
3615
selftest_kwargs = {"verbose": verbose,
3617
"stop_on_failure": one,
3618
"transport": transport,
3619
"test_suite_factory": test_suite_factory,
3620
"lsprof_timed": lsprof_timed,
3621
"lsprof_tests": lsprof_tests,
3622
"bench_history": benchfile,
3623
"matching_tests_first": first,
3624
"list_only": list_only,
3625
"random_seed": randomize,
3626
"exclude_pattern": exclude,
3628
"load_list": load_list,
3629
"debug_flags": debugflag,
3630
"starting_with": starting_with
3632
selftest_kwargs.update(self.additional_selftest_args)
3633
result = selftest(**selftest_kwargs)
3437
selftest_kwargs = {"verbose": verbose,
3439
"stop_on_failure": one,
3440
"transport": transport,
3441
"test_suite_factory": test_suite_factory,
3442
"lsprof_timed": lsprof_timed,
3443
"bench_history": benchfile,
3444
"matching_tests_first": first,
3445
"list_only": list_only,
3446
"random_seed": randomize,
3447
"exclude_pattern": exclude,
3449
"load_list": load_list,
3450
"debug_flags": debugflag,
3451
"starting_with": starting_with
3453
selftest_kwargs.update(self.additional_selftest_args)
3454
result = selftest(**selftest_kwargs)
3456
if benchfile is not None:
3634
3458
return int(not result)
3637
3461
class cmd_version(Command):
3638
__doc__ = """Show version of bzr."""
3462
"""Show version of bzr."""
3640
3464
encoding_type = 'replace'
3641
3465
takes_options = [
3801
3615
verified = 'inapplicable'
3802
3616
tree = WorkingTree.open_containing(directory)[0]
3618
# die as quickly as possible if there are uncommitted changes
3805
3620
basis_tree = tree.revision_tree(tree.last_revision())
3806
3621
except errors.NoSuchRevision:
3807
3622
basis_tree = tree.basis_tree()
3809
# die as quickly as possible if there are uncommitted changes
3811
if tree.has_changes():
3624
changes = tree.changes_from(basis_tree)
3625
if changes.has_changed():
3812
3626
raise errors.UncommittedChanges(tree)
3814
3628
view_info = _get_view_info_for_change_reporter(tree)
3815
3629
change_reporter = delta._ChangeReporter(
3816
3630
unversioned_filter=tree.is_ignored, view_info=view_info)
3817
pb = ui.ui_factory.nested_progress_bar()
3818
self.add_cleanup(pb.finished)
3819
self.add_cleanup(tree.lock_write().unlock)
3820
if location is not None:
3822
mergeable = bundle.read_mergeable_from_url(location,
3823
possible_transports=possible_transports)
3824
except errors.NotABundle:
3633
pb = ui.ui_factory.nested_progress_bar()
3634
cleanups.append(pb.finished)
3636
cleanups.append(tree.unlock)
3637
if location is not None:
3639
mergeable = bundle.read_mergeable_from_url(location,
3640
possible_transports=possible_transports)
3641
except errors.NotABundle:
3645
raise errors.BzrCommandError('Cannot use --uncommitted'
3646
' with bundles or merge directives.')
3648
if revision is not None:
3649
raise errors.BzrCommandError(
3650
'Cannot use -r with merge directives or bundles')
3651
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3654
if merger is None and uncommitted:
3655
if revision is not None and len(revision) > 0:
3656
raise errors.BzrCommandError('Cannot use --uncommitted and'
3657
' --revision at the same time.')
3658
merger = self.get_merger_from_uncommitted(tree, location, pb,
3660
allow_pending = False
3663
merger, allow_pending = self._get_merger_from_branch(tree,
3664
location, revision, remember, possible_transports, pb)
3666
merger.merge_type = merge_type
3667
merger.reprocess = reprocess
3668
merger.show_base = show_base
3669
self.sanity_check_merger(merger)
3670
if (merger.base_rev_id == merger.other_rev_id and
3671
merger.other_rev_id is not None):
3672
note('Nothing to do.')
3675
if merger.interesting_files is not None:
3676
raise errors.BzrCommandError('Cannot pull individual files')
3677
if (merger.base_rev_id == tree.last_revision()):
3678
result = tree.pull(merger.other_branch, False,
3679
merger.other_rev_id)
3680
result.report(self.outf)
3682
merger.check_basis(False)
3684
return self._do_preview(merger)
3828
raise errors.BzrCommandError('Cannot use --uncommitted'
3829
' with bundles or merge directives.')
3831
if revision is not None:
3832
raise errors.BzrCommandError(
3833
'Cannot use -r with merge directives or bundles')
3834
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3837
if merger is None and uncommitted:
3838
if revision is not None and len(revision) > 0:
3839
raise errors.BzrCommandError('Cannot use --uncommitted and'
3840
' --revision at the same time.')
3841
merger = self.get_merger_from_uncommitted(tree, location, None)
3842
allow_pending = False
3845
merger, allow_pending = self._get_merger_from_branch(tree,
3846
location, revision, remember, possible_transports, None)
3848
merger.merge_type = merge_type
3849
merger.reprocess = reprocess
3850
merger.show_base = show_base
3851
self.sanity_check_merger(merger)
3852
if (merger.base_rev_id == merger.other_rev_id and
3853
merger.other_rev_id is not None):
3854
note('Nothing to do.')
3857
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
3859
if (merger.base_rev_id == tree.last_revision()):
3860
result = tree.pull(merger.other_branch, False,
3861
merger.other_rev_id)
3862
result.report(self.outf)
3864
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
3866
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
3869
return self._do_preview(merger)
3871
return self._do_interactive(merger)
3873
return self._do_merge(merger, change_reporter, allow_pending,
3876
def _get_preview(self, merger):
3686
return self._do_merge(merger, change_reporter, allow_pending,
3689
for cleanup in reversed(cleanups):
3692
def _do_preview(self, merger):
3693
from bzrlib.diff import show_diff_trees
3877
3694
tree_merger = merger.make_merger()
3878
3695
tt = tree_merger.make_preview_transform()
3879
self.add_cleanup(tt.finalize)
3880
result_tree = tt.get_preview_tree()
3883
def _do_preview(self, merger):
3884
from bzrlib.diff import show_diff_trees
3885
result_tree = self._get_preview(merger)
3886
show_diff_trees(merger.this_tree, result_tree, self.outf,
3887
old_label='', new_label='')
3697
result_tree = tt.get_preview_tree()
3698
show_diff_trees(merger.this_tree, result_tree, self.outf,
3699
old_label='', new_label='')
3889
3703
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3890
3704
merger.change_reporter = change_reporter
4075
3873
def run(self, file_list=None, merge_type=None, show_base=False,
4076
3874
reprocess=False):
4077
from bzrlib.conflicts import restore
4078
3875
if merge_type is None:
4079
3876
merge_type = _mod_merge.Merge3Merger
4080
3877
tree, file_list = tree_files(file_list)
4081
self.add_cleanup(tree.lock_write().unlock)
4082
parents = tree.get_parent_ids()
4083
if len(parents) != 2:
4084
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4085
" merges. Not cherrypicking or"
4087
repository = tree.branch.repository
4088
interesting_ids = None
4090
conflicts = tree.conflicts()
4091
if file_list is not None:
4092
interesting_ids = set()
4093
for filename in file_list:
4094
file_id = tree.path2id(filename)
4096
raise errors.NotVersionedError(filename)
4097
interesting_ids.add(file_id)
4098
if tree.kind(file_id) != "directory":
3880
parents = tree.get_parent_ids()
3881
if len(parents) != 2:
3882
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3883
" merges. Not cherrypicking or"
3885
repository = tree.branch.repository
3886
interesting_ids = None
3888
conflicts = tree.conflicts()
3889
if file_list is not None:
3890
interesting_ids = set()
3891
for filename in file_list:
3892
file_id = tree.path2id(filename)
3894
raise errors.NotVersionedError(filename)
3895
interesting_ids.add(file_id)
3896
if tree.kind(file_id) != "directory":
4101
for name, ie in tree.inventory.iter_entries(file_id):
4102
interesting_ids.add(ie.file_id)
4103
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4105
# Remerge only supports resolving contents conflicts
4106
allowed_conflicts = ('text conflict', 'contents conflict')
4107
restore_files = [c.path for c in conflicts
4108
if c.typestring in allowed_conflicts]
4109
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4110
tree.set_conflicts(ConflictList(new_conflicts))
4111
if file_list is not None:
4112
restore_files = file_list
4113
for filename in restore_files:
3899
for name, ie in tree.inventory.iter_entries(file_id):
3900
interesting_ids.add(ie.file_id)
3901
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3903
# Remerge only supports resolving contents conflicts
3904
allowed_conflicts = ('text conflict', 'contents conflict')
3905
restore_files = [c.path for c in conflicts
3906
if c.typestring in allowed_conflicts]
3907
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3908
tree.set_conflicts(ConflictList(new_conflicts))
3909
if file_list is not None:
3910
restore_files = file_list
3911
for filename in restore_files:
3913
restore(tree.abspath(filename))
3914
except errors.NotConflicted:
3916
# Disable pending merges, because the file texts we are remerging
3917
# have not had those merges performed. If we use the wrong parents
3918
# list, we imply that the working tree text has seen and rejected
3919
# all the changes from the other tree, when in fact those changes
3920
# have not yet been seen.
3921
pb = ui.ui_factory.nested_progress_bar()
3922
tree.set_parent_ids(parents[:1])
4115
restore(tree.abspath(filename))
4116
except errors.NotConflicted:
4118
# Disable pending merges, because the file texts we are remerging
4119
# have not had those merges performed. If we use the wrong parents
4120
# list, we imply that the working tree text has seen and rejected
4121
# all the changes from the other tree, when in fact those changes
4122
# have not yet been seen.
4123
tree.set_parent_ids(parents[:1])
4125
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4126
merger.interesting_ids = interesting_ids
4127
merger.merge_type = merge_type
4128
merger.show_base = show_base
4129
merger.reprocess = reprocess
4130
conflicts = merger.do_merge()
3924
merger = _mod_merge.Merger.from_revision_ids(pb,
3926
merger.interesting_ids = interesting_ids
3927
merger.merge_type = merge_type
3928
merger.show_base = show_base
3929
merger.reprocess = reprocess
3930
conflicts = merger.do_merge()
3932
tree.set_parent_ids(parents)
4132
tree.set_parent_ids(parents)
4133
3936
if conflicts > 0:
4157
3960
name. If you name a directory, all the contents of that directory will be
4160
If you have newly added files since the target revision, they will be
4161
removed. If the files to be removed have been changed, backups will be
4162
created as above. Directories containing unknown files will not be
3963
Any files that have been newly added since that revision will be deleted,
3964
with a backup kept if appropriate. Directories containing unknown files
3965
will not be deleted.
4165
The working tree contains a list of revisions that have been merged but
4166
not yet committed. These revisions will be included as additional parents
4167
of the next commit. Normally, using revert clears that list as well as
4168
reverting the files. If any files are specified, revert leaves the list
4169
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4170
.`` in the tree root to revert all files but keep the recorded merges,
4171
and ``bzr revert --forget-merges`` to clear the pending merge list without
3967
The working tree contains a list of pending merged revisions, which will
3968
be included as parents in the next commit. Normally, revert clears that
3969
list as well as reverting the files. If any files are specified, revert
3970
leaves the pending merge list alone and reverts only the files. Use "bzr
3971
revert ." in the tree root to revert all files but keep the merge record,
3972
and "bzr revert --forget-merges" to clear the pending merge list without
4172
3973
reverting any files.
4174
Using "bzr revert --forget-merges", it is possible to apply all of the
4175
changes from a branch in a single revision. To do this, perform the merge
4176
as desired. Then doing revert with the "--forget-merges" option will keep
4177
the content of the tree as it was, but it will clear the list of pending
4178
merges. The next commit will then contain all of the changes that are
4179
present in the other branch, but without any other parent revisions.
4180
Because this technique forgets where these changes originated, it may
4181
cause additional conflicts on later merges involving the same source and
4185
3976
_see_also = ['cat', 'export']
4194
3985
def run(self, revision=None, no_backup=False, file_list=None,
4195
3986
forget_merges=None):
4196
3987
tree, file_list = tree_files(file_list)
4197
self.add_cleanup(tree.lock_tree_write().unlock)
4199
tree.set_parent_ids(tree.get_parent_ids()[:1])
4201
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3991
tree.set_parent_ids(tree.get_parent_ids()[:1])
3993
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4204
3998
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4205
3999
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4206
tree.revert(file_list, rev_tree, not no_backup, None,
4207
report_changes=True)
4000
pb = ui.ui_factory.nested_progress_bar()
4002
tree.revert(file_list, rev_tree, not no_backup, pb,
4003
report_changes=True)
4210
4008
class cmd_assert_fail(Command):
4211
__doc__ = """Test reporting of assertion failures"""
4009
"""Test reporting of assertion failures"""
4212
4010
# intended just for use in testing
4363
4153
_get_revision_range(revision,
4364
4154
remote_branch, self.name()))
4366
local_extra, remote_extra = find_unmerged(
4367
local_branch, remote_branch, restrict,
4368
backward=not reverse,
4369
include_merges=include_merges,
4370
local_revid_range=local_revid_range,
4371
remote_revid_range=remote_revid_range)
4373
if log_format is None:
4374
registry = log.log_formatter_registry
4375
log_format = registry.get_default(local_branch)
4376
lf = log_format(to_file=self.outf,
4378
show_timezone='original')
4381
if local_extra and not theirs_only:
4382
message("You have %d extra revision(s):\n" %
4384
for revision in iter_log_revisions(local_extra,
4385
local_branch.repository,
4387
lf.log_revision(revision)
4388
printed_local = True
4391
printed_local = False
4393
if remote_extra and not mine_only:
4394
if printed_local is True:
4396
message("You are missing %d revision(s):\n" %
4398
for revision in iter_log_revisions(remote_extra,
4399
remote_branch.repository,
4401
lf.log_revision(revision)
4404
if mine_only and not local_extra:
4405
# We checked local, and found nothing extra
4406
message('This branch is up to date.\n')
4407
elif theirs_only and not remote_extra:
4408
# We checked remote, and found nothing extra
4409
message('Other branch is up to date.\n')
4410
elif not (mine_only or theirs_only or local_extra or
4412
# We checked both branches, and neither one had extra
4414
message("Branches are up to date.\n")
4156
local_branch.lock_read()
4158
remote_branch.lock_read()
4160
local_extra, remote_extra = find_unmerged(
4161
local_branch, remote_branch, restrict,
4162
backward=not reverse,
4163
include_merges=include_merges,
4164
local_revid_range=local_revid_range,
4165
remote_revid_range=remote_revid_range)
4167
if log_format is None:
4168
registry = log.log_formatter_registry
4169
log_format = registry.get_default(local_branch)
4170
lf = log_format(to_file=self.outf,
4172
show_timezone='original')
4175
if local_extra and not theirs_only:
4176
message("You have %d extra revision(s):\n" %
4178
for revision in iter_log_revisions(local_extra,
4179
local_branch.repository,
4181
lf.log_revision(revision)
4182
printed_local = True
4185
printed_local = False
4187
if remote_extra and not mine_only:
4188
if printed_local is True:
4190
message("You are missing %d revision(s):\n" %
4192
for revision in iter_log_revisions(remote_extra,
4193
remote_branch.repository,
4195
lf.log_revision(revision)
4198
if mine_only and not local_extra:
4199
# We checked local, and found nothing extra
4200
message('This branch is up to date.\n')
4201
elif theirs_only and not remote_extra:
4202
# We checked remote, and found nothing extra
4203
message('Other branch is up to date.\n')
4204
elif not (mine_only or theirs_only or local_extra or
4206
# We checked both branches, and neither one had extra
4208
message("Branches are up to date.\n")
4210
remote_branch.unlock()
4212
local_branch.unlock()
4416
4213
if not status_code and parent is None and other_branch is not None:
4417
self.add_cleanup(local_branch.lock_write().unlock)
4418
# handle race conditions - a parent might be set while we run.
4419
if local_branch.get_parent() is None:
4420
local_branch.set_parent(remote_branch.base)
4214
local_branch.lock_write()
4216
# handle race conditions - a parent might be set while we run.
4217
if local_branch.get_parent() is None:
4218
local_branch.set_parent(remote_branch.base)
4220
local_branch.unlock()
4421
4221
return status_code
4424
4224
class cmd_pack(Command):
4425
__doc__ = """Compress the data within a repository.
4427
This operation compresses the data within a bazaar repository. As
4428
bazaar supports automatic packing of repository, this operation is
4429
normally not required to be done manually.
4431
During the pack operation, bazaar takes a backup of existing repository
4432
data, i.e. pack files. This backup is eventually removed by bazaar
4433
automatically when it is safe to do so. To save disk space by removing
4434
the backed up pack files, the --clean-obsolete-packs option may be
4437
Warning: If you use --clean-obsolete-packs and your machine crashes
4438
during or immediately after repacking, you may be left with a state
4439
where the deletion has been written to disk but the new packs have not
4440
been. In this case the repository may be unusable.
4225
"""Compress the data within a repository."""
4443
4227
_see_also = ['repositories']
4444
4228
takes_args = ['branch_or_repo?']
4446
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4449
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4230
def run(self, branch_or_repo='.'):
4450
4231
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4452
4233
branch = dir.open_branch()
4453
4234
repository = branch.repository
4454
4235
except errors.NotBranchError:
4455
4236
repository = dir.open_repository()
4456
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4459
4240
class cmd_plugins(Command):
4460
__doc__ = """List the installed plugins.
4241
"""List the installed plugins.
4462
4243
This command displays the list of installed plugins including
4463
4244
version of plugin and a short description of each.
4550
4334
Option('long', help='Show commit date in annotations.'),
4555
4338
encoding_type = 'exact'
4557
4340
@display_command
4558
4341
def run(self, filename, all=False, long=False, revision=None,
4559
show_ids=False, directory=None):
4560
4343
from bzrlib.annotate import annotate_file, annotate_file_tree
4561
4344
wt, branch, relpath = \
4562
_open_directory_or_containing_tree_or_branch(filename, directory)
4564
self.add_cleanup(wt.lock_read().unlock)
4566
self.add_cleanup(branch.lock_read().unlock)
4567
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4568
self.add_cleanup(tree.lock_read().unlock)
4570
file_id = wt.path2id(relpath)
4572
file_id = tree.path2id(relpath)
4574
raise errors.NotVersionedError(filename)
4575
file_version = tree.inventory[file_id].revision
4576
if wt is not None and revision is None:
4577
# If there is a tree and we're not annotating historical
4578
# versions, annotate the working tree's content.
4579
annotate_file_tree(wt, file_id, self.outf, long, all,
4582
annotate_file(branch, file_version, file_id, long, all, self.outf,
4345
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4351
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4353
file_id = wt.path2id(relpath)
4355
file_id = tree.path2id(relpath)
4357
raise errors.NotVersionedError(filename)
4358
file_version = tree.inventory[file_id].revision
4359
if wt is not None and revision is None:
4360
# If there is a tree and we're not annotating historical
4361
# versions, annotate the working tree's content.
4362
annotate_file_tree(wt, file_id, self.outf, long, all,
4365
annotate_file(branch, file_version, file_id, long, all, self.outf,
4586
4374
class cmd_re_sign(Command):
4587
__doc__ = """Create a digital signature for an existing revision."""
4375
"""Create a digital signature for an existing revision."""
4588
4376
# TODO be able to replace existing ones.
4590
4378
hidden = True # is this right ?
4591
4379
takes_args = ['revision_id*']
4592
takes_options = ['directory', 'revision']
4380
takes_options = ['revision']
4594
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4382
def run(self, revision_id_list=None, revision=None):
4595
4383
if revision_id_list is not None and revision is not None:
4596
4384
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4597
4385
if revision_id_list is None and revision is None:
4598
4386
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4599
b = WorkingTree.open_containing(directory)[0].branch
4600
self.add_cleanup(b.lock_write().unlock)
4601
return self._run(b, revision_id_list, revision)
4387
b = WorkingTree.open_containing(u'.')[0].branch
4390
return self._run(b, revision_id_list, revision)
4603
4394
def _run(self, b, revision_id_list, revision):
4604
4395
import bzrlib.gpg as gpg
4794
4588
end_revision=last_revno)
4797
self.outf.write('Dry-run, pretending to remove'
4798
' the above revisions.\n')
4591
print 'Dry-run, pretending to remove the above revisions.'
4593
val = raw_input('Press <enter> to continue')
4800
self.outf.write('The above revision(s) will be removed.\n')
4803
if not ui.ui_factory.get_boolean('Are you sure'):
4804
self.outf.write('Canceled')
4595
print 'The above revision(s) will be removed.'
4597
val = raw_input('Are you sure [y/N]? ')
4598
if val.lower() not in ('y', 'yes'):
4807
4602
mutter('Uncommitting from {%s} to {%s}',
4808
4603
last_rev_id, rev_id)
4809
4604
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4810
4605
revno=revno, local=local)
4811
self.outf.write('You can restore the old tip by running:\n'
4812
' bzr pull . -r revid:%s\n' % last_rev_id)
4606
note('You can restore the old tip by running:\n'
4607
' bzr pull . -r revid:%s', last_rev_id)
4815
4610
class cmd_break_lock(Command):
4816
__doc__ = """Break a dead lock on a repository, branch or working directory.
4611
"""Break a dead lock on a repository, branch or working directory.
4818
4613
CAUTION: Locks should only be broken when you are sure that the process
4819
4614
holding the lock has been stopped.
4821
You can get information on what locks are open via the 'bzr info
4822
[location]' command.
4616
You can get information on what locks are open via the 'bzr info' command.
4826
bzr break-lock bzr+ssh://example.com/bzr/foo
4828
4621
takes_args = ['location?']
5100
4890
directly from the merge directive, without retrieving data from a
5103
`bzr send` creates a compact data set that, when applied using bzr
5104
merge, has the same effect as merging from the source branch.
5106
By default the merge directive is self-contained and can be applied to any
5107
branch containing submit_branch in its ancestory without needing access to
5110
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5111
revisions, but only a structured request to merge from the
5112
public_location. In that case the public_branch is needed and it must be
5113
up-to-date and accessible to the recipient. The public_branch is always
5114
included if known, so that people can check it later.
5116
The submit branch defaults to the parent of the source branch, but can be
5117
overridden. Both submit branch and public branch will be remembered in
5118
branch.conf the first time they are used for a particular branch. The
5119
source branch defaults to that containing the working directory, but can
5120
be changed using --from.
5122
In order to calculate those changes, bzr must analyse the submit branch.
5123
Therefore it is most efficient for the submit branch to be a local mirror.
5124
If a public location is known for the submit_branch, that location is used
5125
in the merge directive.
5127
The default behaviour is to send the merge directive by mail, unless -o is
5128
given, in which case it is sent to a file.
4893
If --no-bundle is specified, then public_branch is needed (and must be
4894
up-to-date), so that the receiver can perform the merge using the
4895
public_branch. The public_branch is always included if known, so that
4896
people can check it later.
4898
The submit branch defaults to the parent, but can be overridden. Both
4899
submit branch and public branch will be remembered if supplied.
4901
If a public_branch is known for the submit_branch, that public submit
4902
branch is used in the merge instructions. This means that a local mirror
4903
can be used as your actual submit branch, once you have set public_branch
5130
4906
Mail is sent using your preferred mail program. This should be transparent
5131
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4907
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5132
4908
If the preferred client can't be found (or used), your editor will be used.
5134
4910
To use a specific mail program, set the mail_client configuration option.
5135
4911
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5136
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5137
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5138
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4912
specific clients are "claws", "evolution", "kmail", "mutt", and
4913
"thunderbird"; generic options are "default", "editor", "emacsclient",
4914
"mapi", and "xdg-email". Plugins may also add supported clients.
5141
4916
If mail is being sent, a to address is required. This can be supplied
5142
4917
either on the commandline, by setting the submit_to configuration
5176
4947
short_name='f',
5178
4949
Option('output', short_name='o',
5179
help='Write merge directive to this file or directory; '
4950
help='Write merge directive to this file; '
5180
4951
'use - for stdout.',
5183
help='Refuse to send if there are uncommitted changes in'
5184
' the working tree, --no-strict disables the check.'),
5185
4953
Option('mail-to', help='Mail the request to this address.',
5189
4957
Option('body', help='Body for the email.', type=unicode),
5190
4958
RegistryOption('format',
5191
help='Use the specified output format.',
5192
lazy_registry=('bzrlib.send', 'format_registry')),
4959
help='Use the specified output format.',
4960
lazy_registry=('bzrlib.send', 'format_registry'))
5195
4963
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5196
4964
no_patch=False, revision=None, remember=False, output=None,
5197
format=None, mail_to=None, message=None, body=None,
5198
strict=None, **kwargs):
4965
format=None, mail_to=None, message=None, body=None, **kwargs):
5199
4966
from bzrlib.send import send
5200
4967
return send(submit_branch, revision, public_branch, remember,
5201
format, no_bundle, no_patch, output,
5202
kwargs.get('from', '.'), mail_to, message, body,
4968
format, no_bundle, no_patch, output,
4969
kwargs.get('from', '.'), mail_to, message, body,
5207
4973
class cmd_bundle_revisions(cmd_send):
5208
__doc__ = """Create a merge-directive for submitting changes.
4974
"""Create a merge-directive for submitting changes.
5210
4976
A merge directive provides many things needed for requesting merges:
5268
5031
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5269
5032
no_patch=False, revision=None, remember=False, output=None,
5270
format=None, strict=None, **kwargs):
5033
format=None, **kwargs):
5271
5034
if output is None:
5273
5036
from bzrlib.send import send
5274
5037
return send(submit_branch, revision, public_branch, remember,
5275
5038
format, no_bundle, no_patch, output,
5276
5039
kwargs.get('from', '.'), None, None, None,
5277
self.outf, strict=strict)
5280
5043
class cmd_tag(Command):
5281
__doc__ = """Create, remove or modify a tag naming a revision.
5044
"""Create, remove or modify a tag naming a revision.
5283
5046
Tags give human-meaningful names to revisions. Commands that take a -r
5284
5047
(--revision) option can be given -rtag:X, where X is any previously
5293
5056
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5294
5057
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5296
If no tag name is specified it will be determined through the
5297
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5298
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5302
5060
_see_also = ['commit', 'tags']
5303
takes_args = ['tag_name?']
5061
takes_args = ['tag_name']
5304
5062
takes_options = [
5305
5063
Option('delete',
5306
5064
help='Delete this tag rather than placing it.',
5308
custom_help('directory',
5309
help='Branch in which to place the tag.'),
5067
help='Branch in which to place the tag.',
5310
5071
Option('force',
5311
5072
help='Replace existing tags.',
5316
def run(self, tag_name=None,
5077
def run(self, tag_name,
5322
5083
branch, relpath = Branch.open_containing(directory)
5323
self.add_cleanup(branch.lock_write().unlock)
5325
if tag_name is None:
5326
raise errors.BzrCommandError("No tag specified to delete.")
5327
branch.tags.delete_tag(tag_name)
5328
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
if len(revision) != 1:
5332
raise errors.BzrCommandError(
5333
"Tags can only be placed on a single revision, "
5335
revision_id = revision[0].as_revision_id(branch)
5087
branch.tags.delete_tag(tag_name)
5088
self.outf.write('Deleted tag %s.\n' % tag_name)
5337
revision_id = branch.last_revision()
5338
if tag_name is None:
5339
tag_name = branch.automatic_tag_name(revision_id)
5340
if tag_name is None:
5341
raise errors.BzrCommandError(
5342
"Please specify a tag name.")
5343
if (not force) and branch.tags.has_tag(tag_name):
5344
raise errors.TagAlreadyExists(tag_name)
5345
branch.tags.set_tag(tag_name, revision_id)
5346
self.outf.write('Created tag %s.\n' % tag_name)
5091
if len(revision) != 1:
5092
raise errors.BzrCommandError(
5093
"Tags can only be placed on a single revision, "
5095
revision_id = revision[0].as_revision_id(branch)
5097
revision_id = branch.last_revision()
5098
if (not force) and branch.tags.has_tag(tag_name):
5099
raise errors.TagAlreadyExists(tag_name)
5100
branch.tags.set_tag(tag_name, revision_id)
5101
self.outf.write('Created tag %s.\n' % tag_name)
5349
5106
class cmd_tags(Command):
5350
__doc__ = """List tags.
5352
5109
This command shows a table of tag names and the revisions they reference.
5355
5112
_see_also = ['tag']
5356
5113
takes_options = [
5357
custom_help('directory',
5358
help='Branch whose tags should be displayed.'),
5115
help='Branch whose tags should be displayed.',
5359
5119
RegistryOption.from_kwargs('sort',
5360
5120
'Sort tags by different criteria.', title='Sorting',
5361
5121
alpha='Sort tags lexicographically (default).',
5381
self.add_cleanup(branch.lock_read().unlock)
5383
graph = branch.repository.get_graph()
5384
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5385
revid1, revid2 = rev1.rev_id, rev2.rev_id
5386
# only show revisions between revid1 and revid2 (inclusive)
5387
tags = [(tag, revid) for tag, revid in tags if
5388
graph.is_between(revid, revid1, revid2)]
5391
elif sort == 'time':
5393
for tag, revid in tags:
5395
revobj = branch.repository.get_revision(revid)
5396
except errors.NoSuchRevision:
5397
timestamp = sys.maxint # place them at the end
5399
timestamp = revobj.timestamp
5400
timestamps[revid] = timestamp
5401
tags.sort(key=lambda x: timestamps[x[1]])
5403
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5404
for index, (tag, revid) in enumerate(tags):
5406
revno = branch.revision_id_to_dotted_revno(revid)
5407
if isinstance(revno, tuple):
5408
revno = '.'.join(map(str, revno))
5409
except errors.NoSuchRevision:
5410
# Bad tag data/merges can lead to tagged revisions
5411
# which are not in this branch. Fail gracefully ...
5413
tags[index] = (tag, revno)
5144
graph = branch.repository.get_graph()
5145
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5146
revid1, revid2 = rev1.rev_id, rev2.rev_id
5147
# only show revisions between revid1 and revid2 (inclusive)
5148
tags = [(tag, revid) for tag, revid in tags if
5149
graph.is_between(revid, revid1, revid2)]
5152
elif sort == 'time':
5154
for tag, revid in tags:
5156
revobj = branch.repository.get_revision(revid)
5157
except errors.NoSuchRevision:
5158
timestamp = sys.maxint # place them at the end
5160
timestamp = revobj.timestamp
5161
timestamps[revid] = timestamp
5162
tags.sort(key=lambda x: timestamps[x[1]])
5164
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5165
for index, (tag, revid) in enumerate(tags):
5167
revno = branch.revision_id_to_dotted_revno(revid)
5168
if isinstance(revno, tuple):
5169
revno = '.'.join(map(str, revno))
5170
except errors.NoSuchRevision:
5171
# Bad tag data/merges can lead to tagged revisions
5172
# which are not in this branch. Fail gracefully ...
5174
tags[index] = (tag, revno)
5415
5177
for tag, revspec in tags:
5416
5178
self.outf.write('%-20s %s\n' % (tag, revspec))
5419
5181
class cmd_reconfigure(Command):
5420
__doc__ = """Reconfigure the type of a bzr directory.
5182
"""Reconfigure the type of a bzr directory.
5422
5184
A target configuration must be specified.
5454
5216
Option('bind-to', help='Branch to bind checkout to.', type=str),
5455
5217
Option('force',
5456
help='Perform reconfiguration even if local changes'
5458
Option('stacked-on',
5459
help='Reconfigure a branch to be stacked on another branch.',
5463
help='Reconfigure a branch to be unstacked. This '
5464
'may require copying substantial data into it.',
5218
help='Perform reconfiguration even if local changes'
5468
def run(self, location=None, target_type=None, bind_to=None, force=False,
5222
def run(self, location=None, target_type=None, bind_to=None, force=False):
5471
5223
directory = bzrdir.BzrDir.open(location)
5472
if stacked_on and unstacked:
5473
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5474
elif stacked_on is not None:
5475
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5477
reconfigure.ReconfigureUnstacked().apply(directory)
5478
# At the moment you can use --stacked-on and a different
5479
# reconfiguration shape at the same time; there seems no good reason
5481
5224
if target_type is None:
5482
if stacked_on or unstacked:
5485
raise errors.BzrCommandError('No target configuration '
5225
raise errors.BzrCommandError('No target configuration specified')
5487
5226
elif target_type == 'branch':
5488
5227
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5489
5228
elif target_type == 'tree':
5526
5265
/path/to/newbranch.
5528
5267
Bound branches use the nickname of its master branch unless it is set
5529
locally, in which case switching will update the local nickname to be
5268
locally, in which case switching will update the the local nickname to be
5530
5269
that of the master.
5533
takes_args = ['to_location?']
5272
takes_args = ['to_location']
5534
5273
takes_options = [Option('force',
5535
help='Switch even if local commits will be lost.'),
5537
Option('create-branch', short_name='b',
5538
help='Create the target branch from this one before'
5539
' switching to it.'),
5274
help='Switch even if local commits will be lost.')
5542
def run(self, to_location=None, force=False, create_branch=False,
5277
def run(self, to_location, force=False):
5544
5278
from bzrlib import switch
5545
5279
tree_location = '.'
5546
revision = _get_one_revision('switch', revision)
5547
5280
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5548
if to_location is None:
5549
if revision is None:
5550
raise errors.BzrCommandError('You must supply either a'
5551
' revision or a location')
5554
5282
branch = control_dir.open_branch()
5555
5283
had_explicit_nick = branch.get_config().has_explicit_nickname()
5556
5284
except errors.NotBranchError:
5558
5285
had_explicit_nick = False
5561
raise errors.BzrCommandError('cannot create branch without'
5563
to_location = directory_service.directories.dereference(
5565
if '/' not in to_location and '\\' not in to_location:
5566
# This path is meant to be relative to the existing branch
5567
this_url = self._get_branch_location(control_dir)
5568
to_location = urlutils.join(this_url, '..', to_location)
5569
to_branch = branch.bzrdir.sprout(to_location,
5570
possible_transports=[branch.bzrdir.root_transport],
5571
source_branch=branch).open_branch()
5574
to_branch = Branch.open(to_location)
5575
except errors.NotBranchError:
5576
this_url = self._get_branch_location(control_dir)
5577
to_branch = Branch.open(
5578
urlutils.join(this_url, '..', to_location))
5579
if revision is not None:
5580
revision = revision.as_revision_id(to_branch)
5581
switch.switch(control_dir, to_branch, force, revision_id=revision)
5287
to_branch = Branch.open(to_location)
5288
except errors.NotBranchError:
5289
this_url = self._get_branch_location(control_dir)
5290
to_branch = Branch.open(
5291
urlutils.join(this_url, '..', to_location))
5292
switch.switch(control_dir, to_branch, force)
5582
5293
if had_explicit_nick:
5583
5294
branch = control_dir.open_branch() #get the new branch!
5584
5295
branch.nick = to_branch.nick
5851
5537
if writer is None:
5852
5538
writer = bzrlib.option.diff_writer_registry.get()
5854
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5855
file_list, message, destroy=destroy)
5540
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5541
message, destroy=destroy).run()
5860
5542
except errors.UserAbort:
5863
5545
def run_for_list(self):
5864
5546
tree = WorkingTree.open_containing('.')[0]
5865
self.add_cleanup(tree.lock_read().unlock)
5866
manager = tree.get_shelf_manager()
5867
shelves = manager.active_shelves()
5868
if len(shelves) == 0:
5869
note('No shelved changes.')
5871
for shelf_id in reversed(shelves):
5872
message = manager.get_metadata(shelf_id).get('message')
5874
message = '<no message>'
5875
self.outf.write('%3d: %s\n' % (shelf_id, message))
5549
manager = tree.get_shelf_manager()
5550
shelves = manager.active_shelves()
5551
if len(shelves) == 0:
5552
note('No shelved changes.')
5554
for shelf_id in reversed(shelves):
5555
message = manager.get_metadata(shelf_id).get('message')
5557
message = '<no message>'
5558
self.outf.write('%3d: %s\n' % (shelf_id, message))
5879
5564
class cmd_unshelve(Command):
5880
__doc__ = """Restore shelved changes.
5565
"""Restore shelved changes.
5882
5567
By default, the most recently shelved changes are restored. However if you
5883
5568
specify a shelf by id those changes will be restored instead. This works
5933
5610
' deleting them.'),
5934
5611
Option('force', help='Do not prompt before deleting.')]
5935
5612
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5936
force=False, directory=u'.'):
5937
5614
from bzrlib.clean_tree import clean_tree
5938
5615
if not (unknown or ignored or detritus):
5942
clean_tree(directory, unknown=unknown, ignored=ignored,
5943
detritus=detritus, dry_run=dry_run, no_prompt=force)
5619
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5620
dry_run=dry_run, no_prompt=force)
5946
5623
class cmd_reference(Command):
5947
__doc__ = """list, view and set branch locations for nested trees.
5624
"""list, view and set branch locations for nested trees.
5949
5626
If no arguments are provided, lists the branch locations for nested trees.
5950
5627
If one argument is provided, display the branch location for that tree.
5990
5667
self.outf.write('%s %s\n' % (path, location))
5993
def _register_lazy_builtins():
5994
# register lazy builtins from other modules; called at startup and should
5995
# be only called once.
5996
for (name, aliases, module_name) in [
5997
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5998
('cmd_dpush', [], 'bzrlib.foreign'),
5999
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6000
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6001
('cmd_conflicts', [], 'bzrlib.conflicts'),
6002
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6004
builtin_command_registry.register_lazy(name, aliases, module_name)
5670
# these get imported and then picked up by the scan for cmd_*
5671
# TODO: Some more consistent way to split command definitions across files;
5672
# we do need to load at least some information about them to know of
5673
# aliases. ideally we would avoid loading the implementation until the
5674
# details were needed.
5675
from bzrlib.cmd_version_info import cmd_version_info
5676
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5677
from bzrlib.bundle.commands import (
5680
from bzrlib.foreign import cmd_dpush
5681
from bzrlib.sign_my_commits import cmd_sign_my_commits
5682
from bzrlib.weave_commands import cmd_versionedfile_list, \
5683
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
