350
311
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
312
takes_options = ['revision']
352
313
# cat-revision is more for frontends so should be exact
353
314
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'.'):
317
def run(self, revision_id=None, revision=None):
365
318
if revision_id is not None and revision is not None:
366
319
raise errors.BzrCommandError('You can only supply one of'
367
320
' revision_id or --revision')
368
321
if revision_id is None and revision is None:
369
322
raise errors.BzrCommandError('You must supply either'
370
323
' --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()
324
b = WorkingTree.open_containing(u'.')[0].branch
326
# TODO: jam 20060112 should cat-revision always output utf-8?
327
if revision_id is not None:
328
revision_id = osutils.safe_revision_id(revision_id, warn=False)
330
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
331
except errors.NoSuchRevision:
332
msg = "The repository %s contains no revision %s." % (b.repository.base,
334
raise errors.BzrCommandError(msg)
335
elif revision is not None:
338
raise errors.BzrCommandError('You cannot specify a NULL'
340
rev_id = rev.as_revision_id(b)
341
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
400
344
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
345
"""Dump the contents of a btree index file to stdout.
403
347
PATH is a btree index file, it can be any URL. This includes things like
404
348
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
487
424
To re-create the working tree, use "bzr checkout".
489
426
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
427
takes_args = ['location?']
491
428
takes_options = [
493
430
help='Remove the working tree even if it has '
494
'uncommitted or shelved changes.'),
431
'uncommitted changes.'),
497
def run(self, location_list, force=False):
498
if not location_list:
501
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
505
working = d.open_workingtree()
506
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
508
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
512
if (working.has_changes()):
513
raise errors.UncommittedChanges(working)
514
if working.get_shelf_manager().last_shelf() is not None:
515
raise errors.ShelvedChanges(working)
517
if working.user_url != working.branch.user_url:
518
raise errors.BzrCommandError("You cannot remove the working tree"
519
" from a lightweight checkout")
521
d.destroy_workingtree()
434
def run(self, location='.', force=False):
435
d = bzrdir.BzrDir.open(location)
438
working = d.open_workingtree()
439
except errors.NoWorkingTree:
440
raise errors.BzrCommandError("No working tree to remove")
441
except errors.NotLocalUrl:
442
raise errors.BzrCommandError("You cannot remove the working tree of a "
445
changes = working.changes_from(working.basis_tree())
446
if changes.has_changed():
447
raise errors.UncommittedChanges(working)
449
working_path = working.bzrdir.root_transport.base
450
branch_path = working.branch.bzrdir.root_transport.base
451
if working_path != branch_path:
452
raise errors.BzrCommandError("You cannot remove the working tree from "
453
"a lightweight checkout")
455
d.destroy_workingtree()
524
458
class cmd_revno(Command):
525
__doc__ = """Show current revision number.
459
"""Show current revision number.
527
461
This is equal to the number of revisions on this branch.
530
464
_see_also = ['info']
531
465
takes_args = ['location?']
533
Option('tree', help='Show revno of working tree'),
537
def run(self, tree=False, location=u'.'):
540
wt = WorkingTree.open_containing(location)[0]
541
self.add_cleanup(wt.lock_read().unlock)
542
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
raise errors.NoWorkingTree(location)
544
revid = wt.last_revision()
546
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
547
except errors.NoSuchRevision:
549
revno = ".".join(str(n) for n in revno_t)
551
b = Branch.open_containing(location)[0]
552
self.add_cleanup(b.lock_read().unlock)
555
self.outf.write(str(revno) + '\n')
468
def run(self, location=u'.'):
469
self.outf.write(str(Branch.open_containing(location)[0].revno()))
470
self.outf.write('\n')
558
473
class cmd_revision_info(Command):
559
__doc__ = """Show revision number and revision id for a given revision identifier.
474
"""Show revision number and revision id for a given revision identifier.
562
477
takes_args = ['revision_info*']
563
478
takes_options = [
565
custom_help('directory',
566
481
help='Branch to examine, '
567
'rather than the one containing the working directory.'),
568
Option('tree', help='Show revno of working tree'),
482
'rather than the one containing the working directory.',
572
def run(self, revision=None, directory=u'.', tree=False,
573
revision_info_list=[]):
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
576
wt = WorkingTree.open_containing(directory)[0]
578
self.add_cleanup(wt.lock_read().unlock)
579
except (errors.NoWorkingTree, errors.NotLocalUrl):
581
b = Branch.open_containing(directory)[0]
582
self.add_cleanup(b.lock_read().unlock)
584
492
if revision is not None:
585
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
493
revs.extend(revision)
586
494
if revision_info_list is not None:
587
for rev_str in revision_info_list:
588
rev_spec = RevisionSpec.from_string(rev_str)
589
revision_ids.append(rev_spec.as_revision_id(b))
590
# No arguments supplied, default to the last revision
591
if len(revision_ids) == 0:
594
raise errors.NoWorkingTree(directory)
595
revision_ids.append(wt.last_revision())
597
revision_ids.append(b.last_revision())
601
for revision_id in revision_ids:
495
for rev in revision_info_list:
496
revs.append(RevisionSpec.from_string(rev))
498
b = Branch.open_containing(directory)[0]
501
revs.append(RevisionSpec.from_string('-1'))
504
revision_id = rev.as_revision_id(b)
603
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
604
revno = '.'.join(str(i) for i in dotted_revno)
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
605
507
except errors.NoSuchRevision:
607
maxlen = max(maxlen, len(revno))
608
revinfos.append([revno, revision_id])
612
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
508
dotted_map = b.get_revision_id_to_revno_map()
509
revno = '.'.join(str(i) for i in dotted_map[revision_id])
510
print '%s %s' % (revno, revision_id)
615
513
class cmd_add(Command):
616
__doc__ = """Add specified files or directories.
514
"""Add specified files or directories.
618
516
In non-recursive mode, all the named items are added, regardless
619
517
of whether they were previously ignored. A warning is given if
684
579
should_print=(not is_quiet()))
687
self.add_cleanup(base_tree.lock_read().unlock)
688
tree, file_list = tree_files_for_add(file_list)
689
added, ignored = tree.smart_add(file_list, not
690
no_recurse, action=action, save=not dry_run)
582
base_tree.lock_read()
584
file_list = self._maybe_expand_globs(file_list)
585
tree, file_list = tree_files_for_add(file_list)
586
added, ignored = tree.smart_add(file_list, not
587
no_recurse, action=action, save=not dry_run)
589
if base_tree is not None:
692
591
if len(ignored) > 0:
694
593
for glob in sorted(ignored.keys()):
695
594
for path in ignored[glob]:
696
595
self.outf.write("ignored %s matching \"%s\"\n"
599
for glob, paths in ignored.items():
600
match_len += len(paths)
601
self.outf.write("ignored %d file(s).\n" % match_len)
602
self.outf.write("If you wish to add some of these files,"
603
" please add them by name.\n")
700
606
class cmd_mkdir(Command):
701
__doc__ = """Create a new versioned directory.
607
"""Create a new versioned directory.
703
609
This is equivalent to creating the directory and then adding it.
763
664
revision = _get_one_revision('inventory', revision)
764
665
work_tree, file_list = tree_files(file_list)
765
self.add_cleanup(work_tree.lock_read().unlock)
766
if revision is not None:
767
tree = revision.as_tree(work_tree.branch)
769
extra_trees = [work_tree]
770
self.add_cleanup(tree.lock_read().unlock)
775
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
778
# find_ids_across_trees may include some paths that don't
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
783
entries = tree.inventory.entries()
666
work_tree.lock_read()
668
if revision is not None:
669
tree = revision.as_tree(work_tree.branch)
671
extra_trees = [work_tree]
677
if file_list is not None:
678
file_ids = tree.paths2ids(file_list, trees=extra_trees,
679
require_versioned=True)
680
# find_ids_across_trees may include some paths that don't
682
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
683
for file_id in file_ids if file_id in tree)
685
entries = tree.inventory.entries()
688
if tree is not work_tree:
786
691
for path, entry in entries:
787
692
if kind and kind != entry.kind:
924
834
dest = osutils.pathjoin(dest_parent, dest_tail)
925
835
mutter("attempting to move %s => %s", src, dest)
926
836
tree.rename_one(src, dest, after=after)
928
self.outf.write("%s => %s\n" % (src, dest))
837
self.outf.write("%s => %s\n" % (src, dest))
931
840
class cmd_pull(Command):
932
__doc__ = """Turn this branch into a mirror of another branch.
841
"""Turn this branch into a mirror of another branch.
934
By default, this command only works on branches that have not diverged.
935
Branches are considered diverged if the destination branch's most recent
936
commit is one that has not been merged (directly or indirectly) into the
843
This command only works on branches that have not diverged. Branches are
844
considered diverged if the destination branch's most recent commit is one
845
that has not been merged (directly or indirectly) into the parent.
939
847
If branches have diverged, you can use 'bzr merge' to integrate the changes
940
848
from one into the other. Once one branch has merged, the other should
941
849
be able to pull it again.
943
If you want to replace your local changes and just want your branch to
944
match the remote one, use pull --overwrite. This will work even if the two
945
branches have diverged.
851
If you want to forget your local changes and just update your branch to
852
match the remote one, use pull --overwrite.
947
854
If there is no default location set, the first pull will set it. After
948
855
that, you can omit the location to use the default. To change the
1030
929
if revision is not None:
1031
930
revision_id = revision.as_revision_id(branch_from)
1033
if tree_to is not None:
1034
view_info = _get_view_info_for_change_reporter(tree_to)
1035
change_reporter = delta._ChangeReporter(
1036
unversioned_filter=tree_to.is_ignored,
1037
view_info=view_info)
1038
result = tree_to.pull(
1039
branch_from, overwrite, revision_id, change_reporter,
1040
possible_transports=possible_transports, local=local)
1042
result = branch_to.pull(
1043
branch_from, overwrite, revision_id, local=local)
932
branch_to.lock_write()
934
if tree_to is not None:
935
view_info = _get_view_info_for_change_reporter(tree_to)
936
change_reporter = delta._ChangeReporter(
937
unversioned_filter=tree_to.is_ignored, view_info=view_info)
938
result = tree_to.pull(branch_from, overwrite, revision_id,
940
possible_transports=possible_transports)
942
result = branch_to.pull(branch_from, overwrite, revision_id)
1045
result.report(self.outf)
1046
if verbose and result.old_revid != result.new_revid:
1047
log.show_branch_change(
1048
branch_to, self.outf, result.old_revno,
944
result.report(self.outf)
945
if verbose and result.old_revid != result.new_revid:
946
log.show_branch_change(branch_to, self.outf, result.old_revno,
1052
952
class cmd_push(Command):
1053
__doc__ = """Update a mirror of this branch.
953
"""Update a mirror of this branch.
1055
955
The target branch will not have its working tree populated because this
1056
956
is both expensive, and is not supported on remote file systems.
1106
1006
def run(self, location=None, remember=False, overwrite=False,
1107
1007
create_prefix=False, verbose=False, revision=None,
1108
1008
use_existing_dir=False, directory=None, stacked_on=None,
1109
stacked=False, strict=None):
1110
1010
from bzrlib.push import _show_push_branch
1012
# Get the source branch and revision_id
1112
1013
if directory is None:
1113
1014
directory = '.'
1114
# Get the source branch
1116
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1117
# Get the tip's revision_id
1015
br_from = Branch.open_containing(directory)[0]
1118
1016
revision = _get_one_revision('push', revision)
1119
1017
if revision is not None:
1120
1018
revision_id = revision.in_history(br_from).rev_id
1123
if tree is not None and revision_id is None:
1124
tree.check_changed_or_out_of_date(
1125
strict, 'push_strict',
1126
more_error='Use --no-strict to force the push.',
1127
more_warning='Uncommitted changes will not be pushed.')
1020
revision_id = br_from.last_revision()
1128
1022
# Get the stacked_on branch, if any
1129
1023
if stacked_on is not None:
1130
1024
stacked_on = urlutils.normalize_url(stacked_on)
1181
1075
help='Hard-link working tree files where possible.'),
1182
1076
Option('no-tree',
1183
1077
help="Create a branch without a working-tree."),
1185
help="Switch the checkout in the current directory "
1186
"to the new branch."),
1187
1078
Option('stacked',
1188
1079
help='Create a stacked branch referring to the source branch. '
1189
1080
'The new branch will depend on the availability of the source '
1190
1081
'branch for all operations.'),
1191
1082
Option('standalone',
1192
1083
help='Do not use a shared repository, even if available.'),
1193
Option('use-existing-dir',
1194
help='By default branch will fail if the target'
1195
' directory exists, but does not already'
1196
' have a control directory. This flag will'
1197
' allow branch to proceed.'),
1199
help="Bind new branch to from location."),
1201
1085
aliases = ['get', 'clone']
1203
1087
def run(self, from_location, to_location=None, revision=None,
1204
hardlink=False, stacked=False, standalone=False, no_tree=False,
1205
use_existing_dir=False, switch=False, bind=False):
1206
from bzrlib import switch as _mod_switch
1088
hardlink=False, stacked=False, standalone=False, no_tree=False):
1207
1089
from bzrlib.tag import _merge_tags_if_possible
1208
1091
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1210
1093
revision = _get_one_revision('branch', revision)
1211
self.add_cleanup(br_from.lock_read().unlock)
1212
if revision is not None:
1213
revision_id = revision.as_revision_id(br_from)
1215
# FIXME - wt.last_revision, fallback to branch, fall back to
1216
# None or perhaps NULL_REVISION to mean copy nothing
1218
revision_id = br_from.last_revision()
1219
if to_location is None:
1220
to_location = urlutils.derive_to_location(from_location)
1221
to_transport = transport.get_transport(to_location)
1223
to_transport.mkdir('.')
1224
except errors.FileExists:
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1096
if revision is not None:
1097
revision_id = revision.as_revision_id(br_from)
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1231
except errors.NotBranchError:
1234
raise errors.AlreadyBranchError(to_location)
1235
except errors.NoSuchFile:
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1254
# If the source branch is stacked, the new branch may
1255
# be stacked whether we asked for that explicitly or not.
1256
# We therefore need a try/except here and not just 'if stacked:'
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1264
# Bind to the parent
1265
parent_branch = Branch.open(from_location)
1266
branch.bind(parent_branch)
1267
note('New branch bound to %s' % from_location)
1269
# Switch to the new branch
1270
wt, _ = WorkingTree.open_containing('.')
1271
_mod_switch.switch(wt.bzrdir, branch)
1272
note('Switched to branch: %s',
1273
urlutils.unescape_for_display(branch.base, 'utf-8'))
1099
# FIXME - wt.last_revision, fallback to branch, fall back to
1100
# None or perhaps NULL_REVISION to mean copy nothing
1102
revision_id = br_from.last_revision()
1103
if to_location is None:
1104
to_location = urlutils.derive_to_location(from_location)
1105
to_transport = transport.get_transport(to_location)
1107
to_transport.mkdir('.')
1108
except errors.FileExists:
1109
raise errors.BzrCommandError('Target directory "%s" already'
1110
' exists.' % to_location)
1111
except errors.NoSuchFile:
1112
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1115
# preserve whatever source format we have.
1116
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1117
possible_transports=[to_transport],
1118
accelerator_tree=accelerator_tree,
1119
hardlink=hardlink, stacked=stacked,
1120
force_new_repo=standalone,
1121
create_tree_if_local=not no_tree,
1122
source_branch=br_from)
1123
branch = dir.open_branch()
1124
except errors.NoSuchRevision:
1125
to_transport.delete_tree('.')
1126
msg = "The branch %s has no revision %s." % (from_location,
1128
raise errors.BzrCommandError(msg)
1129
_merge_tags_if_possible(br_from, branch)
1130
# If the source branch is stacked, the new branch may
1131
# be stacked whether we asked for that explicitly or not.
1132
# We therefore need a try/except here and not just 'if stacked:'
1134
note('Created new stacked branch referring to %s.' %
1135
branch.get_stacked_on_url())
1136
except (errors.NotStacked, errors.UnstackableBranchFormat,
1137
errors.UnstackableRepositoryFormat), e:
1138
note('Branched %d revision(s).' % branch.revno())
1276
1143
class cmd_checkout(Command):
1277
__doc__ = """Create a new checkout of an existing branch.
1144
"""Create a new checkout of an existing branch.
1279
1146
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1280
1147
the branch found in '.'. This is useful if you have removed the working tree
1354
1221
@display_command
1355
1222
def run(self, dir=u'.'):
1356
1223
tree = WorkingTree.open_containing(dir)[0]
1357
self.add_cleanup(tree.lock_read().unlock)
1358
new_inv = tree.inventory
1359
old_tree = tree.basis_tree()
1360
self.add_cleanup(old_tree.lock_read().unlock)
1361
old_inv = old_tree.inventory
1363
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1364
for f, paths, c, v, p, n, k, e in iterator:
1365
if paths[0] == paths[1]:
1369
renames.append(paths)
1371
for old_name, new_name in renames:
1372
self.outf.write("%s => %s\n" % (old_name, new_name))
1226
new_inv = tree.inventory
1227
old_tree = tree.basis_tree()
1228
old_tree.lock_read()
1230
old_inv = old_tree.inventory
1232
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1233
for f, paths, c, v, p, n, k, e in iterator:
1234
if paths[0] == paths[1]:
1238
renames.append(paths)
1240
for old_name, new_name in renames:
1241
self.outf.write("%s => %s\n" % (old_name, new_name))
1375
1248
class cmd_update(Command):
1376
__doc__ = """Update a tree to have the latest code committed to its branch.
1249
"""Update a tree to have the latest code committed to its branch.
1378
1251
This will perform a merge into the working tree, and may generate
1379
1252
conflicts. If you have any local changes, you will still
1382
1255
If you want to discard your local changes, you can just do a
1383
1256
'bzr revert' instead of 'bzr commit' after the update.
1385
If the tree's branch is bound to a master branch, it will also update
1386
the branch from the master.
1389
1259
_see_also = ['pull', 'working-trees', 'status-flags']
1390
1260
takes_args = ['dir?']
1391
takes_options = ['revision']
1392
1261
aliases = ['up']
1394
def run(self, dir='.', revision=None):
1395
if revision is not None and len(revision) != 1:
1396
raise errors.BzrCommandError(
1397
"bzr update --revision takes exactly one revision")
1263
def run(self, dir='.'):
1398
1264
tree = WorkingTree.open_containing(dir)[0]
1399
branch = tree.branch
1400
1265
possible_transports = []
1401
master = branch.get_master_branch(
1266
master = tree.branch.get_master_branch(
1402
1267
possible_transports=possible_transports)
1403
1268
if master is not None:
1404
branch_location = master.base
1405
1269
tree.lock_write()
1407
branch_location = tree.branch.base
1408
1271
tree.lock_tree_write()
1409
self.add_cleanup(tree.unlock)
1410
# get rid of the final '/' and be ready for display
1411
branch_location = urlutils.unescape_for_display(
1412
branch_location.rstrip('/'),
1414
existing_pending_merges = tree.get_parent_ids()[1:]
1418
# may need to fetch data into a heavyweight checkout
1419
# XXX: this may take some time, maybe we should display a
1421
old_tip = branch.update(possible_transports)
1422
if revision is not None:
1423
revision_id = revision[0].as_revision_id(branch)
1425
revision_id = branch.last_revision()
1426
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1427
revno = branch.revision_id_to_dotted_revno(revision_id)
1428
note("Tree is up to date at revision %s of branch %s" %
1429
('.'.join(map(str, revno)), branch_location))
1431
view_info = _get_view_info_for_change_reporter(tree)
1432
change_reporter = delta._ChangeReporter(
1433
unversioned_filter=tree.is_ignored,
1434
view_info=view_info)
1273
existing_pending_merges = tree.get_parent_ids()[1:]
1274
last_rev = _mod_revision.ensure_null(tree.last_revision())
1275
if last_rev == _mod_revision.ensure_null(
1276
tree.branch.last_revision()):
1277
# may be up to date, check master too.
1278
if master is None or last_rev == _mod_revision.ensure_null(
1279
master.last_revision()):
1280
revno = tree.branch.revision_id_to_revno(last_rev)
1281
note("Tree is up to date at revision %d." % (revno,))
1283
view_info = _get_view_info_for_change_reporter(tree)
1436
1284
conflicts = tree.update(
1438
possible_transports=possible_transports,
1439
revision=revision_id,
1441
except errors.NoSuchRevision, e:
1442
raise errors.BzrCommandError(
1443
"branch has no revision %s\n"
1444
"bzr update --revision only works"
1445
" for a revision in the branch history"
1447
revno = tree.branch.revision_id_to_dotted_revno(
1448
_mod_revision.ensure_null(tree.last_revision()))
1449
note('Updated to revision %s of branch %s' %
1450
('.'.join(map(str, revno)), branch_location))
1451
parent_ids = tree.get_parent_ids()
1452
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1453
note('Your local commits will now show as pending merges with '
1454
"'bzr status', and can be committed with 'bzr commit'.")
1285
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1286
view_info=view_info), possible_transports=possible_transports)
1287
revno = tree.branch.revision_id_to_revno(
1288
_mod_revision.ensure_null(tree.last_revision()))
1289
note('Updated to revision %d.' % (revno,))
1290
if tree.get_parent_ids()[1:] != existing_pending_merges:
1291
note('Your local commits will now show as pending merges with '
1292
"'bzr status', and can be committed with 'bzr commit'.")
1461
1301
class cmd_info(Command):
1462
__doc__ = """Show information about a working tree, branch or repository.
1302
"""Show information about a working tree, branch or repository.
1464
1304
This command will show all known locations and formats associated to the
1465
1305
tree, branch or repository.
1531
1371
if file_list is not None:
1532
1372
file_list = [f for f in file_list]
1534
self.add_cleanup(tree.lock_write().unlock)
1535
# Heuristics should probably all move into tree.remove_smart or
1538
added = tree.changes_from(tree.basis_tree(),
1539
specific_files=file_list).added
1540
file_list = sorted([f[0] for f in added], reverse=True)
1541
if len(file_list) == 0:
1542
raise errors.BzrCommandError('No matching files.')
1543
elif file_list is None:
1544
# missing files show up in iter_changes(basis) as
1545
# versioned-with-no-kind.
1547
for change in tree.iter_changes(tree.basis_tree()):
1548
# Find paths in the working tree that have no kind:
1549
if change[1][1] is not None and change[6][1] is None:
1550
missing.append(change[1][1])
1551
file_list = sorted(missing, reverse=True)
1552
file_deletion_strategy = 'keep'
1553
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1554
keep_files=file_deletion_strategy=='keep',
1555
force=file_deletion_strategy=='force')
1376
# Heuristics should probably all move into tree.remove_smart or
1379
added = tree.changes_from(tree.basis_tree(),
1380
specific_files=file_list).added
1381
file_list = sorted([f[0] for f in added], reverse=True)
1382
if len(file_list) == 0:
1383
raise errors.BzrCommandError('No matching files.')
1384
elif file_list is None:
1385
# missing files show up in iter_changes(basis) as
1386
# versioned-with-no-kind.
1388
for change in tree.iter_changes(tree.basis_tree()):
1389
# Find paths in the working tree that have no kind:
1390
if change[1][1] is not None and change[6][1] is None:
1391
missing.append(change[1][1])
1392
file_list = sorted(missing, reverse=True)
1393
file_deletion_strategy = 'keep'
1394
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1395
keep_files=file_deletion_strategy=='keep',
1396
force=file_deletion_strategy=='force')
1558
1401
class cmd_file_id(Command):
1559
__doc__ = """Print file_id of a particular file or directory.
1402
"""Print file_id of a particular file or directory.
1561
1404
The file_id is assigned when the file is first added and remains the
1562
1405
same through all revisions where the file exists, even when it is
1962
1780
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1963
1781
' one or two revision specifiers')
1965
if using is not None and format is not None:
1966
raise errors.BzrCommandError('--using and --format are mutually '
1969
(old_tree, new_tree,
1970
old_branch, new_branch,
1971
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1972
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1973
# GNU diff on Windows uses ANSI encoding for filenames
1974
path_encoding = osutils.get_diff_header_encoding()
1783
old_tree, new_tree, specific_files, extra_trees = \
1784
_get_trees_to_diff(file_list, revision, old, new,
1975
1786
return show_diff_trees(old_tree, new_tree, sys.stdout,
1976
1787
specific_files=specific_files,
1977
1788
external_diff_options=diff_options,
1978
1789
old_label=old_label, new_label=new_label,
1979
extra_trees=extra_trees,
1980
path_encoding=path_encoding,
1790
extra_trees=extra_trees, using=using)
1985
1793
class cmd_deleted(Command):
1986
__doc__ = """List files deleted in the working tree.
1794
"""List files deleted in the working tree.
1988
1796
# TODO: Show files deleted since a previous revision, or
1989
1797
# between two revisions.
1992
1800
# level of effort but possibly much less IO. (Or possibly not,
1993
1801
# if the directories are very large...)
1994
1802
_see_also = ['status', 'ls']
1995
takes_options = ['directory', 'show-ids']
1803
takes_options = ['show-ids']
1997
1805
@display_command
1998
def run(self, show_ids=False, directory=u'.'):
1999
tree = WorkingTree.open_containing(directory)[0]
2000
self.add_cleanup(tree.lock_read().unlock)
2001
old = tree.basis_tree()
2002
self.add_cleanup(old.lock_read().unlock)
2003
for path, ie in old.inventory.iter_entries():
2004
if not tree.has_id(ie.file_id):
2005
self.outf.write(path)
2007
self.outf.write(' ')
2008
self.outf.write(ie.file_id)
2009
self.outf.write('\n')
1806
def run(self, show_ids=False):
1807
tree = WorkingTree.open_containing(u'.')[0]
1810
old = tree.basis_tree()
1813
for path, ie in old.inventory.iter_entries():
1814
if not tree.has_id(ie.file_id):
1815
self.outf.write(path)
1817
self.outf.write(' ')
1818
self.outf.write(ie.file_id)
1819
self.outf.write('\n')
2012
1826
class cmd_modified(Command):
2013
__doc__ = """List files modified in working tree.
1827
"""List files modified in working tree.
2017
1831
_see_also = ['status', 'ls']
2018
takes_options = ['directory', 'null']
1834
help='Write an ascii NUL (\\0) separator '
1835
'between files rather than a newline.')
2020
1838
@display_command
2021
def run(self, null=False, directory=u'.'):
2022
tree = WorkingTree.open_containing(directory)[0]
1839
def run(self, null=False):
1840
tree = WorkingTree.open_containing(u'.')[0]
2023
1841
td = tree.changes_from(tree.basis_tree())
2024
1842
for path, id, kind, text_modified, meta_modified in td.modified:
2031
1849
class cmd_added(Command):
2032
__doc__ = """List files added in working tree.
1850
"""List files added in working tree.
2036
1854
_see_also = ['status', 'ls']
2037
takes_options = ['directory', 'null']
1857
help='Write an ascii NUL (\\0) separator '
1858
'between files rather than a newline.')
2039
1861
@display_command
2040
def run(self, null=False, directory=u'.'):
2041
wt = WorkingTree.open_containing(directory)[0]
2042
self.add_cleanup(wt.lock_read().unlock)
2043
basis = wt.basis_tree()
2044
self.add_cleanup(basis.lock_read().unlock)
2045
basis_inv = basis.inventory
2048
if file_id in basis_inv:
2050
if inv.is_root(file_id) and len(basis_inv) == 0:
2052
path = inv.id2path(file_id)
2053
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2056
self.outf.write(path + '\0')
2058
self.outf.write(osutils.quotefn(path) + '\n')
1862
def run(self, null=False):
1863
wt = WorkingTree.open_containing(u'.')[0]
1866
basis = wt.basis_tree()
1869
basis_inv = basis.inventory
1872
if file_id in basis_inv:
1874
if inv.is_root(file_id) and len(basis_inv) == 0:
1876
path = inv.id2path(file_id)
1877
if not os.access(osutils.abspath(path), os.F_OK):
1880
self.outf.write(path + '\0')
1882
self.outf.write(osutils.quotefn(path) + '\n')
2061
1889
class cmd_root(Command):
2062
__doc__ = """Show the tree root directory.
1890
"""Show the tree root directory.
2064
1892
The root is the nearest enclosing directory with a .bzr control
2376
2181
diff_type = 'full'
2378
# Build the log formatter
2379
if log_format is None:
2380
log_format = log.log_formatter_registry.get_default(b)
2381
# Make a non-encoding output to include the diffs - bug 328007
2382
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2383
lf = log_format(show_ids=show_ids, to_file=self.outf,
2384
to_exact_file=unencoded_output,
2385
show_timezone=timezone,
2386
delta_format=get_verbosity_level(),
2388
show_advice=levels is None,
2389
author_list_handler=authors)
2391
# Choose the algorithm for doing the logging. It's annoying
2392
# having multiple code paths like this but necessary until
2393
# the underlying repository format is faster at generating
2394
# deltas or can provide everything we need from the indices.
2395
# The default algorithm - match-using-deltas - works for
2396
# multiple files and directories and is faster for small
2397
# amounts of history (200 revisions say). However, it's too
2398
# slow for logging a single file in a repository with deep
2399
# history, i.e. > 10K revisions. In the spirit of "do no
2400
# evil when adding features", we continue to use the
2401
# original algorithm - per-file-graph - for the "single
2402
# file that isn't a directory without showing a delta" case.
2403
partial_history = revision and b.repository._format.supports_chks
2404
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2405
or delta_type or partial_history)
2407
# Build the LogRequest and execute it
2408
if len(file_ids) == 0:
2410
rqst = make_log_request_dict(
2411
direction=direction, specific_fileids=file_ids,
2412
start_revision=rev1, end_revision=rev2, limit=limit,
2413
message_search=message, delta_type=delta_type,
2414
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2415
exclude_common_ancestry=exclude_common_ancestry,
2417
Logger(b, rqst).show(lf)
2185
# Build the log formatter
2186
if log_format is None:
2187
log_format = log.log_formatter_registry.get_default(b)
2188
lf = log_format(show_ids=show_ids, to_file=self.outf,
2189
show_timezone=timezone,
2190
delta_format=get_verbosity_level(),
2193
# Choose the algorithm for doing the logging. It's annoying
2194
# having multiple code paths like this but necessary until
2195
# the underlying repository format is faster at generating
2196
# deltas or can provide everything we need from the indices.
2197
# The default algorithm - match-using-deltas - works for
2198
# multiple files and directories and is faster for small
2199
# amounts of history (200 revisions say). However, it's too
2200
# slow for logging a single file in a repository with deep
2201
# history, i.e. > 10K revisions. In the spirit of "do no
2202
# evil when adding features", we continue to use the
2203
# original algorithm - per-file-graph - for the "single
2204
# file that isn't a directory without showing a delta" case.
2205
partial_history = revision and b.repository._format.supports_chks
2206
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2207
or delta_type or partial_history)
2209
# Build the LogRequest and execute it
2210
if len(file_ids) == 0:
2212
rqst = make_log_request_dict(
2213
direction=direction, specific_fileids=file_ids,
2214
start_revision=rev1, end_revision=rev2, limit=limit,
2215
message_search=message, delta_type=delta_type,
2216
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2217
Logger(b, rqst).show(lf)
2420
2222
def _get_revision_range(revisionspec_list, branch, command_name):
2509
2305
help='Recurse into subdirectories.'),
2510
2306
Option('from-root',
2511
2307
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2308
Option('unknown', help='Print unknown files.'),
2514
2309
Option('versioned', help='Print versioned files.',
2515
2310
short_name='V'),
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2311
Option('ignored', help='Print ignored files.'),
2313
help='Write an ascii NUL (\\0) separator '
2314
'between files rather than a newline.'),
2519
2316
help='List entries of a particular kind: file, directory, symlink.',
2525
2320
@display_command
2526
2321
def run(self, revision=None, verbose=False,
2527
2322
recursive=False, from_root=False,
2528
2323
unknown=False, versioned=False, ignored=False,
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
2324
null=False, kind=None, show_ids=False, path=None):
2531
2326
if kind and kind not in ('file', 'directory', 'symlink'):
2532
2327
raise errors.BzrCommandError('invalid kind specified')
2566
2358
view_str = views.view_display_str(view_files)
2567
2359
note("Ignoring files outside view. View is %s" % view_str)
2569
self.add_cleanup(tree.lock_read().unlock)
2570
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2571
from_dir=relpath, recursive=recursive):
2572
# Apply additional masking
2573
if not all and not selection[fc]:
2575
if kind is not None and fkind != kind:
2580
fullpath = osutils.pathjoin(relpath, fp)
2583
views.check_path_in_view(tree, fullpath)
2584
except errors.FileOutsideView:
2589
fp = osutils.pathjoin(prefix, fp)
2590
kindch = entry.kind_character()
2591
outstring = fp + kindch
2592
ui.ui_factory.clear_term()
2594
outstring = '%-8s %s' % (fc, outstring)
2595
if show_ids and fid is not None:
2596
outstring = "%-50s %s" % (outstring, fid)
2597
self.outf.write(outstring + '\n')
2599
self.outf.write(fp + '\0')
2602
self.outf.write(fid)
2603
self.outf.write('\0')
2611
self.outf.write('%-50s %s\n' % (outstring, my_id))
2613
self.outf.write(outstring + '\n')
2363
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2364
if fp.startswith(relpath):
2365
rp = fp[len(relpath):]
2366
fp = osutils.pathjoin(prefix, rp)
2367
if not recursive and '/' in rp:
2369
if not all and not selection[fc]:
2371
if kind is not None and fkind != kind:
2375
views.check_path_in_view(tree, fp)
2376
except errors.FileOutsideView:
2378
kindch = entry.kind_character()
2379
outstring = fp + kindch
2381
outstring = '%-8s %s' % (fc, outstring)
2382
if show_ids and fid is not None:
2383
outstring = "%-50s %s" % (outstring, fid)
2384
self.outf.write(outstring + '\n')
2386
self.outf.write(fp + '\0')
2389
self.outf.write(fid)
2390
self.outf.write('\0')
2398
self.outf.write('%-50s %s\n' % (outstring, my_id))
2400
self.outf.write(outstring + '\n')
2616
2405
class cmd_unknowns(Command):
2617
__doc__ = """List unknown files.
2406
"""List unknown files.
2621
2410
_see_also = ['ls']
2622
takes_options = ['directory']
2624
2412
@display_command
2625
def run(self, directory=u'.'):
2626
for f in WorkingTree.open_containing(directory)[0].unknowns():
2414
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2627
2415
self.outf.write(osutils.quotefn(f) + '\n')
2630
2418
class cmd_ignore(Command):
2631
__doc__ = """Ignore specified files or patterns.
2419
"""Ignore specified files or patterns.
2633
2421
See ``bzr help patterns`` for details on the syntax of patterns.
2635
If a .bzrignore file does not exist, the ignore command
2636
will create one and add the specified files or patterns to the newly
2637
created file. The ignore command will also automatically add the
2638
.bzrignore file to be versioned. Creating a .bzrignore file without
2639
the use of the ignore command will require an explicit add command.
2641
2423
To remove patterns from the ignore list, edit the .bzrignore file.
2642
2424
After adding, editing or deleting that file either indirectly by
2643
2425
using this command or directly by using an editor, be sure to commit
2646
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2647
the global ignore file can be found in the application data directory as
2648
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2649
Global ignores are not touched by this command. The global ignore file
2650
can be edited directly using an editor.
2652
Patterns prefixed with '!' are exceptions to ignore patterns and take
2653
precedence over regular ignores. Such exceptions are used to specify
2654
files that should be versioned which would otherwise be ignored.
2656
Patterns prefixed with '!!' act as regular ignore patterns, but have
2657
precedence over the '!' exception patterns.
2659
2428
Note: ignore patterns containing shell wildcards must be quoted from
2660
2429
the shell on Unix.
2683
2448
Ignore everything but the "debian" toplevel directory::
2685
2450
bzr ignore "RE:(?!debian/).*"
2687
Ignore everything except the "local" toplevel directory,
2688
but always ignore "*~" autosave files, even under local/::
2691
bzr ignore "!./local"
2695
2453
_see_also = ['status', 'ignored', 'patterns']
2696
2454
takes_args = ['name_pattern*']
2697
takes_options = ['directory',
2698
Option('default-rules',
2699
help='Display the default ignore rules that bzr uses.')
2456
Option('old-default-rules',
2457
help='Write out the ignore rules bzr < 0.9 always used.')
2702
def run(self, name_pattern_list=None, default_rules=None,
2460
def run(self, name_pattern_list=None, old_default_rules=None):
2704
2461
from bzrlib import ignores
2705
if default_rules is not None:
2706
# dump the default rules and exit
2707
for pattern in ignores.USER_DEFAULTS:
2708
self.outf.write("%s\n" % pattern)
2462
if old_default_rules is not None:
2463
# dump the rules and exit
2464
for pattern in ignores.OLD_DEFAULTS:
2710
2467
if not name_pattern_list:
2711
2468
raise errors.BzrCommandError("ignore requires at least one "
2712
"NAME_PATTERN or --default-rules.")
2469
"NAME_PATTERN or --old-default-rules")
2713
2470
name_pattern_list = [globbing.normalize_pattern(p)
2714
2471
for p in name_pattern_list]
2716
for p in name_pattern_list:
2717
if not globbing.Globster.is_pattern_valid(p):
2718
bad_patterns += ('\n %s' % p)
2720
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2721
ui.ui_factory.show_error(msg)
2722
raise errors.InvalidPattern('')
2723
2472
for name_pattern in name_pattern_list:
2724
2473
if (name_pattern[0] == '/' or
2725
2474
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2726
2475
raise errors.BzrCommandError(
2727
2476
"NAME_PATTERN should not be an absolute path")
2728
tree, relpath = WorkingTree.open_containing(directory)
2477
tree, relpath = WorkingTree.open_containing(u'.')
2729
2478
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2730
2479
ignored = globbing.Globster(name_pattern_list)
2732
self.add_cleanup(tree.lock_read().unlock)
2733
2482
for entry in tree.list_files():
2735
2484
if id is not None:
2736
2485
filename = entry[0]
2737
2486
if ignored.match(filename):
2738
matches.append(filename)
2487
matches.append(filename.encode('utf-8'))
2739
2489
if len(matches) > 0:
2740
self.outf.write("Warning: the following files are version controlled and"
2741
" match your ignore pattern:\n%s"
2742
"\nThese files will continue to be version controlled"
2743
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2490
print "Warning: the following files are version controlled and" \
2491
" match your ignore pattern:\n%s" \
2492
"\nThese files will continue to be version controlled" \
2493
" unless you 'bzr remove' them." % ("\n".join(matches),)
2746
2496
class cmd_ignored(Command):
2747
__doc__ = """List ignored files and the patterns that matched them.
2497
"""List ignored files and the patterns that matched them.
2749
2499
List all the ignored files and the ignore pattern that caused the file to
2757
2507
encoding_type = 'replace'
2758
2508
_see_also = ['ignore', 'ls']
2759
takes_options = ['directory']
2761
2510
@display_command
2762
def run(self, directory=u'.'):
2763
tree = WorkingTree.open_containing(directory)[0]
2764
self.add_cleanup(tree.lock_read().unlock)
2765
for path, file_class, kind, file_id, entry in tree.list_files():
2766
if file_class != 'I':
2768
## XXX: Slightly inefficient since this was already calculated
2769
pat = tree.is_ignored(path)
2770
self.outf.write('%-50s %s\n' % (path, pat))
2512
tree = WorkingTree.open_containing(u'.')[0]
2515
for path, file_class, kind, file_id, entry in tree.list_files():
2516
if file_class != 'I':
2518
## XXX: Slightly inefficient since this was already calculated
2519
pat = tree.is_ignored(path)
2520
self.outf.write('%-50s %s\n' % (path, pat))
2773
2525
class cmd_lookup_revision(Command):
2774
__doc__ = """Lookup the revision-id from a revision-number
2526
"""Lookup the revision-id from a revision-number
2777
2529
bzr lookup-revision 33
2780
2532
takes_args = ['revno']
2781
takes_options = ['directory']
2783
2534
@display_command
2784
def run(self, revno, directory=u'.'):
2535
def run(self, revno):
2786
2537
revno = int(revno)
2787
2538
except ValueError:
2788
raise errors.BzrCommandError("not a valid revision-number: %r"
2790
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2791
self.outf.write("%s\n" % revid)
2539
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2541
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2794
2544
class cmd_export(Command):
2795
__doc__ = """Export current or past revision to a destination directory or archive.
2545
"""Export current or past revision to a destination directory or archive.
2797
2547
If no revision is specified this exports the last committed revision.
2876
2622
@display_command
2877
2623
def run(self, filename, revision=None, name_from_revision=False,
2878
filters=False, directory=None):
2879
2625
if revision is not None and len(revision) != 1:
2880
2626
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2881
2627
" one revision specifier")
2882
2628
tree, branch, relpath = \
2883
_open_directory_or_containing_tree_or_branch(filename, directory)
2884
self.add_cleanup(branch.lock_read().unlock)
2885
return self._run(tree, branch, relpath, filename, revision,
2886
name_from_revision, filters)
2629
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2632
return self._run(tree, branch, relpath, filename, revision,
2633
name_from_revision, filters)
2888
2637
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2890
2639
if tree is None:
2891
2640
tree = b.basis_tree()
2892
2641
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2893
self.add_cleanup(rev_tree.lock_read().unlock)
2895
2643
old_file_id = rev_tree.path2id(relpath)
2931
2679
chunks = content.splitlines(True)
2932
2680
content = filtered_output_bytes(chunks, filters,
2933
2681
ContentFilterContext(relpath, rev_tree))
2935
2682
self.outf.writelines(content)
2938
2684
self.outf.write(content)
2941
2687
class cmd_local_time_offset(Command):
2942
__doc__ = """Show the offset in seconds from GMT to local time."""
2688
"""Show the offset in seconds from GMT to local time."""
2944
2690
@display_command
2946
self.outf.write("%s\n" % osutils.local_time_offset())
2692
print osutils.local_time_offset()
2950
2696
class cmd_commit(Command):
2951
__doc__ = """Commit changes into a new revision.
2953
An explanatory message needs to be given for each commit. This is
2954
often done by using the --message option (getting the message from the
2955
command line) or by using the --file option (getting the message from
2956
a file). If neither of these options is given, an editor is opened for
2957
the user to enter the message. To see the changed files in the
2958
boilerplate text loaded into the editor, use the --show-diff option.
2960
By default, the entire tree is committed and the person doing the
2961
commit is assumed to be the author. These defaults can be overridden
2966
If selected files are specified, only changes to those files are
2967
committed. If a directory is specified then the directory and
2968
everything within it is committed.
2970
When excludes are given, they take precedence over selected files.
2971
For example, to commit only changes within foo, but not changes
2974
bzr commit foo -x foo/bar
2976
A selective commit after a merge is not yet supported.
2980
If the author of the change is not the same person as the committer,
2981
you can specify the author's name using the --author option. The
2982
name should be in the same format as a committer-id, e.g.
2983
"John Doe <jdoe@example.com>". If there is more than one author of
2984
the change you can specify the option multiple times, once for each
2989
A common mistake is to forget to add a new file or directory before
2990
running the commit command. The --strict option checks for unknown
2991
files and aborts the commit if any are found. More advanced pre-commit
2992
checks can be implemented by defining hooks. See ``bzr help hooks``
2997
If you accidentially commit the wrong changes or make a spelling
2998
mistake in the commit message say, you can use the uncommit command
2999
to undo it. See ``bzr help uncommit`` for details.
3001
Hooks can also be configured to run after a commit. This allows you
3002
to trigger updates to external systems like bug trackers. The --fixes
3003
option can be used to record the association between a revision and
3004
one or more bugs. See ``bzr help bugs`` for details.
3006
A selective commit may fail in some cases where the committed
3007
tree would be invalid. Consider::
3012
bzr commit foo -m "committing foo"
3013
bzr mv foo/bar foo/baz
3016
bzr commit foo/bar -m "committing bar but not baz"
3018
In the example above, the last commit will fail by design. This gives
3019
the user the opportunity to decide whether they want to commit the
3020
rename at the same time, separately first, or not at all. (As a general
3021
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2697
"""Commit changes into a new revision.
2699
If no arguments are given, the entire tree is committed.
2701
If selected files are specified, only changes to those files are
2702
committed. If a directory is specified then the directory and everything
2703
within it is committed.
2705
When excludes are given, they take precedence over selected files.
2706
For example, too commit only changes within foo, but not changes within
2709
bzr commit foo -x foo/bar
2711
If author of the change is not the same person as the committer, you can
2712
specify the author's name using the --author option. The name should be
2713
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2714
If there is more than one author of the change you can specify the option
2715
multiple times, once for each author.
2717
A selected-file commit may fail in some cases where the committed
2718
tree would be invalid. Consider::
2723
bzr commit foo -m "committing foo"
2724
bzr mv foo/bar foo/baz
2727
bzr commit foo/bar -m "committing bar but not baz"
2729
In the example above, the last commit will fail by design. This gives
2730
the user the opportunity to decide whether they want to commit the
2731
rename at the same time, separately first, or not at all. (As a general
2732
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2734
Note: A selected-file commit after a merge is not yet supported.
3023
2736
# TODO: Run hooks on tree to-be-committed, and after commit.
3134
2836
if local and not tree.branch.get_bound_location():
3135
2837
raise errors.LocalRequiresBoundBranch()
3137
if message is not None:
3139
file_exists = osutils.lexists(message)
3140
except UnicodeError:
3141
# The commit message contains unicode characters that can't be
3142
# represented in the filesystem encoding, so that can't be a
3147
'The commit message is a file name: "%(f)s".\n'
3148
'(use --file "%(f)s" to take commit message from that file)'
3150
ui.ui_factory.show_warning(warning_msg)
3152
message = message.replace('\r\n', '\n')
3153
message = message.replace('\r', '\n')
3155
raise errors.BzrCommandError(
3156
"please specify either --message or --file")
3158
2839
def get_message(commit_obj):
3159
2840
"""Callback to get commit message"""
3161
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3163
my_message = f.read()
3166
elif message is not None:
3167
my_message = message
3169
# No message supplied: make one up.
3170
# text is the status of the tree
3171
text = make_commit_message_template_encoded(tree,
2841
my_message = message
2842
if my_message is None and not file:
2843
t = make_commit_message_template_encoded(tree,
3172
2844
selected_list, diff=show_diff,
3173
2845
output_encoding=osutils.get_user_encoding())
3174
# start_message is the template generated from hooks
3175
# XXX: Warning - looks like hooks return unicode,
3176
# make_commit_message_template_encoded returns user encoding.
3177
# We probably want to be using edit_commit_message instead to
3179
2846
start_message = generate_commit_message_template(commit_obj)
3180
my_message = edit_commit_message_encoded(text,
2847
my_message = edit_commit_message_encoded(t,
3181
2848
start_message=start_message)
3182
2849
if my_message is None:
3183
2850
raise errors.BzrCommandError("please specify a commit"
3184
2851
" message with either --message or --file")
2852
elif my_message and file:
2853
raise errors.BzrCommandError(
2854
"please specify either --message or --file")
2856
my_message = codecs.open(file, 'rt',
2857
osutils.get_user_encoding()).read()
3185
2858
if my_message == "":
3186
2859
raise errors.BzrCommandError("empty commit message specified")
3187
2860
return my_message
3189
# The API permits a commit with a filter of [] to mean 'select nothing'
3190
# but the command line should not do that.
3191
if not selected_list:
3192
selected_list = None
3194
2863
tree.commit(message_callback=get_message,
3195
2864
specific_files=selected_list,
3196
2865
allow_pointless=unchanged, strict=strict, local=local,
3197
2866
reporter=None, verbose=verbose, revprops=properties,
3198
authors=author, timestamp=commit_stamp,
3200
2868
exclude=safe_relpath_files(tree, exclude))
3201
2869
except PointlessCommit:
3202
raise errors.BzrCommandError("No changes to commit."
3203
" Use --unchanged to commit anyhow.")
2870
# FIXME: This should really happen before the file is read in;
2871
# perhaps prepare the commit; get the message; then actually commit
2872
raise errors.BzrCommandError("no changes to commit."
2873
" use --unchanged to commit anyhow")
3204
2874
except ConflictsInTree:
3205
2875
raise errors.BzrCommandError('Conflicts detected in working '
3206
2876
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3225
2894
The working tree and branch checks will only give output if a problem is
3226
2895
detected. The output fields of the repository check are:
3229
This is just the number of revisions checked. It doesn't
3233
This is just the number of versionedfiles checked. It
3234
doesn't indicate a problem.
3236
unreferenced ancestors
3237
Texts that are ancestors of other texts, but
3238
are not properly referenced by the revision ancestry. This is a
3239
subtle problem that Bazaar can work around.
3242
This is the total number of unique file contents
3243
seen in the checked revisions. It does not indicate a problem.
3246
This is the total number of repeated texts seen
3247
in the checked revisions. Texts can be repeated when their file
3248
entries are modified, but the file contents are not. It does not
2897
revisions: This is just the number of revisions checked. It doesn't
2899
versionedfiles: This is just the number of versionedfiles checked. It
2900
doesn't indicate a problem.
2901
unreferenced ancestors: Texts that are ancestors of other texts, but
2902
are not properly referenced by the revision ancestry. This is a
2903
subtle problem that Bazaar can work around.
2904
unique file texts: This is the total number of unique file contents
2905
seen in the checked revisions. It does not indicate a problem.
2906
repeated file texts: This is the total number of repeated texts seen
2907
in the checked revisions. Texts can be repeated when their file
2908
entries are modified, but the file contents are not. It does not
3251
2911
If no restrictions are specified, all Bazaar data that is found at the given
3252
2912
location will be checked.
3584
3233
def run(self, testspecs_list=None, verbose=False, one=False,
3585
3234
transport=None, benchmark=None,
3235
lsprof_timed=None, cache_dir=None,
3587
3236
first=False, list_only=False,
3588
3237
randomize=None, exclude=None, strict=False,
3589
3238
load_list=None, debugflag=None, starting_with=None, subunit=False,
3590
parallel=None, lsprof_tests=False):
3591
3240
from bzrlib.tests import selftest
3241
import bzrlib.benchmarks as benchmarks
3242
from bzrlib.benchmarks import tree_creator
3593
3244
# Make deprecation warnings visible, unless -Werror is set
3594
3245
symbol_versioning.activate_deprecation_warnings(override=False)
3247
if cache_dir is not None:
3248
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3596
3249
if testspecs_list is not None:
3597
3250
pattern = '|'.join(testspecs_list)
3604
3257
raise errors.BzrCommandError("subunit not available. subunit "
3605
3258
"needs to be installed to use --subunit.")
3606
3259
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3607
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3608
# stdout, which would corrupt the subunit stream.
3609
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3610
# following code can be deleted when it's sufficiently deployed
3611
# -- vila/mgz 20100514
3612
if (sys.platform == "win32"
3613
and getattr(sys.stdout, 'fileno', None) is not None):
3615
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3617
3261
self.additional_selftest_args.setdefault(
3618
3262
'suite_decorators', []).append(parallel)
3620
raise errors.BzrCommandError(
3621
"--benchmark is no longer supported from bzr 2.2; "
3622
"use bzr-usertest instead")
3623
test_suite_factory = None
3624
selftest_kwargs = {"verbose": verbose,
3626
"stop_on_failure": one,
3627
"transport": transport,
3628
"test_suite_factory": test_suite_factory,
3629
"lsprof_timed": lsprof_timed,
3630
"lsprof_tests": lsprof_tests,
3631
"matching_tests_first": first,
3632
"list_only": list_only,
3633
"random_seed": randomize,
3634
"exclude_pattern": exclude,
3636
"load_list": load_list,
3637
"debug_flags": debugflag,
3638
"starting_with": starting_with
3640
selftest_kwargs.update(self.additional_selftest_args)
3641
result = selftest(**selftest_kwargs)
3264
test_suite_factory = benchmarks.test_suite
3265
# Unless user explicitly asks for quiet, be verbose in benchmarks
3266
verbose = not is_quiet()
3267
# TODO: should possibly lock the history file...
3268
benchfile = open(".perf_history", "at", buffering=1)
3270
test_suite_factory = None
3273
selftest_kwargs = {"verbose": verbose,
3275
"stop_on_failure": one,
3276
"transport": transport,
3277
"test_suite_factory": test_suite_factory,
3278
"lsprof_timed": lsprof_timed,
3279
"bench_history": benchfile,
3280
"matching_tests_first": first,
3281
"list_only": list_only,
3282
"random_seed": randomize,
3283
"exclude_pattern": exclude,
3285
"load_list": load_list,
3286
"debug_flags": debugflag,
3287
"starting_with": starting_with
3289
selftest_kwargs.update(self.additional_selftest_args)
3290
result = selftest(**selftest_kwargs)
3292
if benchfile is not None:
3642
3294
return int(not result)
3645
3297
class cmd_version(Command):
3646
__doc__ = """Show version of bzr."""
3298
"""Show version of bzr."""
3648
3300
encoding_type = 'replace'
3649
3301
takes_options = [
3809
3451
verified = 'inapplicable'
3810
3452
tree = WorkingTree.open_containing(directory)[0]
3454
# die as quickly as possible if there are uncommitted changes
3813
3456
basis_tree = tree.revision_tree(tree.last_revision())
3814
3457
except errors.NoSuchRevision:
3815
3458
basis_tree = tree.basis_tree()
3817
# die as quickly as possible if there are uncommitted changes
3819
if tree.has_changes():
3460
changes = tree.changes_from(basis_tree)
3461
if changes.has_changed():
3820
3462
raise errors.UncommittedChanges(tree)
3822
3464
view_info = _get_view_info_for_change_reporter(tree)
3823
3465
change_reporter = delta._ChangeReporter(
3824
3466
unversioned_filter=tree.is_ignored, view_info=view_info)
3825
pb = ui.ui_factory.nested_progress_bar()
3826
self.add_cleanup(pb.finished)
3827
self.add_cleanup(tree.lock_write().unlock)
3828
if location is not None:
3830
mergeable = bundle.read_mergeable_from_url(location,
3831
possible_transports=possible_transports)
3832
except errors.NotABundle:
3469
pb = ui.ui_factory.nested_progress_bar()
3470
cleanups.append(pb.finished)
3472
cleanups.append(tree.unlock)
3473
if location is not None:
3475
mergeable = bundle.read_mergeable_from_url(location,
3476
possible_transports=possible_transports)
3477
except errors.NotABundle:
3481
raise errors.BzrCommandError('Cannot use --uncommitted'
3482
' with bundles or merge directives.')
3484
if revision is not None:
3485
raise errors.BzrCommandError(
3486
'Cannot use -r with merge directives or bundles')
3487
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3490
if merger is None and uncommitted:
3491
if revision is not None and len(revision) > 0:
3492
raise errors.BzrCommandError('Cannot use --uncommitted and'
3493
' --revision at the same time.')
3494
location = self._select_branch_location(tree, location)[0]
3495
other_tree, other_path = WorkingTree.open_containing(location)
3496
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3498
allow_pending = False
3499
if other_path != '':
3500
merger.interesting_files = [other_path]
3503
merger, allow_pending = self._get_merger_from_branch(tree,
3504
location, revision, remember, possible_transports, pb)
3506
merger.merge_type = merge_type
3507
merger.reprocess = reprocess
3508
merger.show_base = show_base
3509
self.sanity_check_merger(merger)
3510
if (merger.base_rev_id == merger.other_rev_id and
3511
merger.other_rev_id is not None):
3512
note('Nothing to do.')
3515
if merger.interesting_files is not None:
3516
raise errors.BzrCommandError('Cannot pull individual files')
3517
if (merger.base_rev_id == tree.last_revision()):
3518
result = tree.pull(merger.other_branch, False,
3519
merger.other_rev_id)
3520
result.report(self.outf)
3522
merger.check_basis(False)
3524
return self._do_preview(merger)
3836
raise errors.BzrCommandError('Cannot use --uncommitted'
3837
' with bundles or merge directives.')
3839
if revision is not None:
3840
raise errors.BzrCommandError(
3841
'Cannot use -r with merge directives or bundles')
3842
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3845
if merger is None and uncommitted:
3846
if revision is not None and len(revision) > 0:
3847
raise errors.BzrCommandError('Cannot use --uncommitted and'
3848
' --revision at the same time.')
3849
merger = self.get_merger_from_uncommitted(tree, location, None)
3850
allow_pending = False
3853
merger, allow_pending = self._get_merger_from_branch(tree,
3854
location, revision, remember, possible_transports, None)
3856
merger.merge_type = merge_type
3857
merger.reprocess = reprocess
3858
merger.show_base = show_base
3859
self.sanity_check_merger(merger)
3860
if (merger.base_rev_id == merger.other_rev_id and
3861
merger.other_rev_id is not None):
3862
note('Nothing to do.')
3865
if merger.interesting_files is not None:
3866
raise errors.BzrCommandError('Cannot pull individual files')
3867
if (merger.base_rev_id == tree.last_revision()):
3868
result = tree.pull(merger.other_branch, False,
3869
merger.other_rev_id)
3870
result.report(self.outf)
3872
if merger.this_basis is None:
3873
raise errors.BzrCommandError(
3874
"This branch has no commits."
3875
" (perhaps you would prefer 'bzr pull')")
3877
return self._do_preview(merger)
3879
return self._do_interactive(merger)
3881
return self._do_merge(merger, change_reporter, allow_pending,
3884
def _get_preview(self, merger):
3526
return self._do_merge(merger, change_reporter, allow_pending,
3529
for cleanup in reversed(cleanups):
3532
def _do_preview(self, merger):
3533
from bzrlib.diff import show_diff_trees
3885
3534
tree_merger = merger.make_merger()
3886
3535
tt = tree_merger.make_preview_transform()
3887
self.add_cleanup(tt.finalize)
3888
result_tree = tt.get_preview_tree()
3891
def _do_preview(self, merger):
3892
from bzrlib.diff import show_diff_trees
3893
result_tree = self._get_preview(merger)
3894
path_encoding = osutils.get_diff_header_encoding()
3895
show_diff_trees(merger.this_tree, result_tree, self.outf,
3896
old_label='', new_label='',
3897
path_encoding=path_encoding)
3537
result_tree = tt.get_preview_tree()
3538
show_diff_trees(merger.this_tree, result_tree, self.outf,
3539
old_label='', new_label='')
3899
3543
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3900
3544
merger.change_reporter = change_reporter
4085
3697
def run(self, file_list=None, merge_type=None, show_base=False,
4086
3698
reprocess=False):
4087
from bzrlib.conflicts import restore
4088
3699
if merge_type is None:
4089
3700
merge_type = _mod_merge.Merge3Merger
4090
3701
tree, file_list = tree_files(file_list)
4091
self.add_cleanup(tree.lock_write().unlock)
4092
parents = tree.get_parent_ids()
4093
if len(parents) != 2:
4094
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4095
" merges. Not cherrypicking or"
4097
repository = tree.branch.repository
4098
interesting_ids = None
4100
conflicts = tree.conflicts()
4101
if file_list is not None:
4102
interesting_ids = set()
4103
for filename in file_list:
4104
file_id = tree.path2id(filename)
4106
raise errors.NotVersionedError(filename)
4107
interesting_ids.add(file_id)
4108
if tree.kind(file_id) != "directory":
3704
parents = tree.get_parent_ids()
3705
if len(parents) != 2:
3706
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3707
" merges. Not cherrypicking or"
3709
repository = tree.branch.repository
3710
interesting_ids = None
3712
conflicts = tree.conflicts()
3713
if file_list is not None:
3714
interesting_ids = set()
3715
for filename in file_list:
3716
file_id = tree.path2id(filename)
3718
raise errors.NotVersionedError(filename)
3719
interesting_ids.add(file_id)
3720
if tree.kind(file_id) != "directory":
4111
for name, ie in tree.inventory.iter_entries(file_id):
4112
interesting_ids.add(ie.file_id)
4113
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4115
# Remerge only supports resolving contents conflicts
4116
allowed_conflicts = ('text conflict', 'contents conflict')
4117
restore_files = [c.path for c in conflicts
4118
if c.typestring in allowed_conflicts]
4119
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4120
tree.set_conflicts(ConflictList(new_conflicts))
4121
if file_list is not None:
4122
restore_files = file_list
4123
for filename in restore_files:
3723
for name, ie in tree.inventory.iter_entries(file_id):
3724
interesting_ids.add(ie.file_id)
3725
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3727
# Remerge only supports resolving contents conflicts
3728
allowed_conflicts = ('text conflict', 'contents conflict')
3729
restore_files = [c.path for c in conflicts
3730
if c.typestring in allowed_conflicts]
3731
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3732
tree.set_conflicts(ConflictList(new_conflicts))
3733
if file_list is not None:
3734
restore_files = file_list
3735
for filename in restore_files:
3737
restore(tree.abspath(filename))
3738
except errors.NotConflicted:
3740
# Disable pending merges, because the file texts we are remerging
3741
# have not had those merges performed. If we use the wrong parents
3742
# list, we imply that the working tree text has seen and rejected
3743
# all the changes from the other tree, when in fact those changes
3744
# have not yet been seen.
3745
pb = ui.ui_factory.nested_progress_bar()
3746
tree.set_parent_ids(parents[:1])
4125
restore(tree.abspath(filename))
4126
except errors.NotConflicted:
4128
# Disable pending merges, because the file texts we are remerging
4129
# have not had those merges performed. If we use the wrong parents
4130
# list, we imply that the working tree text has seen and rejected
4131
# all the changes from the other tree, when in fact those changes
4132
# have not yet been seen.
4133
tree.set_parent_ids(parents[:1])
4135
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4136
merger.interesting_ids = interesting_ids
4137
merger.merge_type = merge_type
4138
merger.show_base = show_base
4139
merger.reprocess = reprocess
4140
conflicts = merger.do_merge()
3748
merger = _mod_merge.Merger.from_revision_ids(pb,
3750
merger.interesting_ids = interesting_ids
3751
merger.merge_type = merge_type
3752
merger.show_base = show_base
3753
merger.reprocess = reprocess
3754
conflicts = merger.do_merge()
3756
tree.set_parent_ids(parents)
4142
tree.set_parent_ids(parents)
4143
3760
if conflicts > 0:
4167
3784
name. If you name a directory, all the contents of that directory will be
4170
If you have newly added files since the target revision, they will be
4171
removed. If the files to be removed have been changed, backups will be
4172
created as above. Directories containing unknown files will not be
3787
Any files that have been newly added since that revision will be deleted,
3788
with a backup kept if appropriate. Directories containing unknown files
3789
will not be deleted.
4175
The working tree contains a list of revisions that have been merged but
4176
not yet committed. These revisions will be included as additional parents
4177
of the next commit. Normally, using revert clears that list as well as
4178
reverting the files. If any files are specified, revert leaves the list
4179
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4180
.`` in the tree root to revert all files but keep the recorded merges,
4181
and ``bzr revert --forget-merges`` to clear the pending merge list without
3791
The working tree contains a list of pending merged revisions, which will
3792
be included as parents in the next commit. Normally, revert clears that
3793
list as well as reverting the files. If any files are specified, revert
3794
leaves the pending merge list alone and reverts only the files. Use "bzr
3795
revert ." in the tree root to revert all files but keep the merge record,
3796
and "bzr revert --forget-merges" to clear the pending merge list without
4182
3797
reverting any files.
4184
Using "bzr revert --forget-merges", it is possible to apply all of the
4185
changes from a branch in a single revision. To do this, perform the merge
4186
as desired. Then doing revert with the "--forget-merges" option will keep
4187
the content of the tree as it was, but it will clear the list of pending
4188
merges. The next commit will then contain all of the changes that are
4189
present in the other branch, but without any other parent revisions.
4190
Because this technique forgets where these changes originated, it may
4191
cause additional conflicts on later merges involving the same source and
4195
3800
_see_also = ['cat', 'export']
4204
3809
def run(self, revision=None, no_backup=False, file_list=None,
4205
3810
forget_merges=None):
4206
3811
tree, file_list = tree_files(file_list)
4207
self.add_cleanup(tree.lock_tree_write().unlock)
4209
tree.set_parent_ids(tree.get_parent_ids()[:1])
4211
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3815
tree.set_parent_ids(tree.get_parent_ids()[:1])
3817
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4214
3822
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4215
3823
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4216
tree.revert(file_list, rev_tree, not no_backup, None,
4217
report_changes=True)
3824
pb = ui.ui_factory.nested_progress_bar()
3826
tree.revert(file_list, rev_tree, not no_backup, pb,
3827
report_changes=True)
4220
3832
class cmd_assert_fail(Command):
4221
__doc__ = """Test reporting of assertion failures"""
3833
"""Test reporting of assertion failures"""
4222
3834
# intended just for use in testing
4375
3977
_get_revision_range(revision,
4376
3978
remote_branch, self.name()))
4378
local_extra, remote_extra = find_unmerged(
4379
local_branch, remote_branch, restrict,
4380
backward=not reverse,
4381
include_merges=include_merges,
4382
local_revid_range=local_revid_range,
4383
remote_revid_range=remote_revid_range)
4385
if log_format is None:
4386
registry = log.log_formatter_registry
4387
log_format = registry.get_default(local_branch)
4388
lf = log_format(to_file=self.outf,
4390
show_timezone='original')
4393
if local_extra and not theirs_only:
4394
message("You have %d extra revision(s):\n" %
4396
for revision in iter_log_revisions(local_extra,
4397
local_branch.repository,
4399
lf.log_revision(revision)
4400
printed_local = True
4403
printed_local = False
4405
if remote_extra and not mine_only:
4406
if printed_local is True:
4408
message("You are missing %d revision(s):\n" %
4410
for revision in iter_log_revisions(remote_extra,
4411
remote_branch.repository,
4413
lf.log_revision(revision)
4416
if mine_only and not local_extra:
4417
# We checked local, and found nothing extra
4418
message('This branch is up to date.\n')
4419
elif theirs_only and not remote_extra:
4420
# We checked remote, and found nothing extra
4421
message('Other branch is up to date.\n')
4422
elif not (mine_only or theirs_only or local_extra or
4424
# We checked both branches, and neither one had extra
4426
message("Branches are up to date.\n")
3980
local_branch.lock_read()
3982
remote_branch.lock_read()
3984
local_extra, remote_extra = find_unmerged(
3985
local_branch, remote_branch, restrict,
3986
backward=not reverse,
3987
include_merges=include_merges,
3988
local_revid_range=local_revid_range,
3989
remote_revid_range=remote_revid_range)
3991
if log_format is None:
3992
registry = log.log_formatter_registry
3993
log_format = registry.get_default(local_branch)
3994
lf = log_format(to_file=self.outf,
3996
show_timezone='original')
3999
if local_extra and not theirs_only:
4000
message("You have %d extra revision(s):\n" %
4002
for revision in iter_log_revisions(local_extra,
4003
local_branch.repository,
4005
lf.log_revision(revision)
4006
printed_local = True
4009
printed_local = False
4011
if remote_extra and not mine_only:
4012
if printed_local is True:
4014
message("You are missing %d revision(s):\n" %
4016
for revision in iter_log_revisions(remote_extra,
4017
remote_branch.repository,
4019
lf.log_revision(revision)
4022
if mine_only and not local_extra:
4023
# We checked local, and found nothing extra
4024
message('This branch is up to date.\n')
4025
elif theirs_only and not remote_extra:
4026
# We checked remote, and found nothing extra
4027
message('Other branch is up to date.\n')
4028
elif not (mine_only or theirs_only or local_extra or
4030
# We checked both branches, and neither one had extra
4032
message("Branches are up to date.\n")
4034
remote_branch.unlock()
4036
local_branch.unlock()
4428
4037
if not status_code and parent is None and other_branch is not None:
4429
self.add_cleanup(local_branch.lock_write().unlock)
4430
# handle race conditions - a parent might be set while we run.
4431
if local_branch.get_parent() is None:
4432
local_branch.set_parent(remote_branch.base)
4038
local_branch.lock_write()
4040
# handle race conditions - a parent might be set while we run.
4041
if local_branch.get_parent() is None:
4042
local_branch.set_parent(remote_branch.base)
4044
local_branch.unlock()
4433
4045
return status_code
4436
4048
class cmd_pack(Command):
4437
__doc__ = """Compress the data within a repository.
4439
This operation compresses the data within a bazaar repository. As
4440
bazaar supports automatic packing of repository, this operation is
4441
normally not required to be done manually.
4443
During the pack operation, bazaar takes a backup of existing repository
4444
data, i.e. pack files. This backup is eventually removed by bazaar
4445
automatically when it is safe to do so. To save disk space by removing
4446
the backed up pack files, the --clean-obsolete-packs option may be
4449
Warning: If you use --clean-obsolete-packs and your machine crashes
4450
during or immediately after repacking, you may be left with a state
4451
where the deletion has been written to disk but the new packs have not
4452
been. In this case the repository may be unusable.
4049
"""Compress the data within a repository."""
4455
4051
_see_also = ['repositories']
4456
4052
takes_args = ['branch_or_repo?']
4458
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4461
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4054
def run(self, branch_or_repo='.'):
4462
4055
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4464
4057
branch = dir.open_branch()
4465
4058
repository = branch.repository
4466
4059
except errors.NotBranchError:
4467
4060
repository = dir.open_repository()
4468
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4471
4064
class cmd_plugins(Command):
4472
__doc__ = """List the installed plugins.
4065
"""List the installed plugins.
4474
4067
This command displays the list of installed plugins including
4475
4068
version of plugin and a short description of each.
4562
4158
Option('long', help='Show commit date in annotations.'),
4567
4162
encoding_type = 'exact'
4569
4164
@display_command
4570
4165
def run(self, filename, all=False, long=False, revision=None,
4571
show_ids=False, directory=None):
4572
4167
from bzrlib.annotate import annotate_file, annotate_file_tree
4573
4168
wt, branch, relpath = \
4574
_open_directory_or_containing_tree_or_branch(filename, directory)
4576
self.add_cleanup(wt.lock_read().unlock)
4578
self.add_cleanup(branch.lock_read().unlock)
4579
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4580
self.add_cleanup(tree.lock_read().unlock)
4582
file_id = wt.path2id(relpath)
4584
file_id = tree.path2id(relpath)
4586
raise errors.NotVersionedError(filename)
4587
file_version = tree.inventory[file_id].revision
4588
if wt is not None and revision is None:
4589
# If there is a tree and we're not annotating historical
4590
# versions, annotate the working tree's content.
4591
annotate_file_tree(wt, file_id, self.outf, long, all,
4594
annotate_file(branch, file_version, file_id, long, all, self.outf,
4169
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4175
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4177
file_id = wt.path2id(relpath)
4179
file_id = tree.path2id(relpath)
4181
raise errors.NotVersionedError(filename)
4182
file_version = tree.inventory[file_id].revision
4183
if wt is not None and revision is None:
4184
# If there is a tree and we're not annotating historical
4185
# versions, annotate the working tree's content.
4186
annotate_file_tree(wt, file_id, self.outf, long, all,
4189
annotate_file(branch, file_version, file_id, long, all, self.outf,
4598
4198
class cmd_re_sign(Command):
4599
__doc__ = """Create a digital signature for an existing revision."""
4199
"""Create a digital signature for an existing revision."""
4600
4200
# TODO be able to replace existing ones.
4602
4202
hidden = True # is this right ?
4603
4203
takes_args = ['revision_id*']
4604
takes_options = ['directory', 'revision']
4204
takes_options = ['revision']
4606
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4206
def run(self, revision_id_list=None, revision=None):
4607
4207
if revision_id_list is not None and revision is not None:
4608
4208
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4609
4209
if revision_id_list is None and revision is None:
4610
4210
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4611
b = WorkingTree.open_containing(directory)[0].branch
4612
self.add_cleanup(b.lock_write().unlock)
4613
return self._run(b, revision_id_list, revision)
4211
b = WorkingTree.open_containing(u'.')[0].branch
4214
return self._run(b, revision_id_list, revision)
4615
4218
def _run(self, b, revision_id_list, revision):
4616
4219
import bzrlib.gpg as gpg
4806
4412
end_revision=last_revno)
4809
self.outf.write('Dry-run, pretending to remove'
4810
' the above revisions.\n')
4415
print 'Dry-run, pretending to remove the above revisions.'
4417
val = raw_input('Press <enter> to continue')
4812
self.outf.write('The above revision(s) will be removed.\n')
4815
if not ui.ui_factory.get_boolean('Are you sure'):
4816
self.outf.write('Canceled')
4419
print 'The above revision(s) will be removed.'
4421
val = raw_input('Are you sure [y/N]? ')
4422
if val.lower() not in ('y', 'yes'):
4819
4426
mutter('Uncommitting from {%s} to {%s}',
4820
4427
last_rev_id, rev_id)
4821
4428
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4822
4429
revno=revno, local=local)
4823
self.outf.write('You can restore the old tip by running:\n'
4824
' bzr pull . -r revid:%s\n' % last_rev_id)
4430
note('You can restore the old tip by running:\n'
4431
' bzr pull . -r revid:%s', last_rev_id)
4827
4434
class cmd_break_lock(Command):
4828
__doc__ = """Break a dead lock on a repository, branch or working directory.
4435
"""Break a dead lock on a repository, branch or working directory.
4830
4437
CAUTION: Locks should only be broken when you are sure that the process
4831
4438
holding the lock has been stopped.
4833
You can get information on what locks are open via the 'bzr info
4834
[location]' command.
4440
You can get information on what locks are open via the 'bzr info' command.
4838
bzr break-lock bzr+ssh://example.com/bzr/foo
4840
4445
takes_args = ['location?']
4866
4471
class cmd_serve(Command):
4867
__doc__ = """Run the bzr server."""
4472
"""Run the bzr server."""
4869
4474
aliases = ['server']
4871
4476
takes_options = [
4873
4478
help='Serve on stdin/out for use from inetd or sshd.'),
4874
RegistryOption('protocol',
4875
help="Protocol to serve.",
4876
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4877
value_switches=True),
4879
4480
help='Listen for connections on nominated port of the form '
4880
4481
'[hostname:]portnumber. Passing 0 as the port number will '
4881
'result in a dynamically allocated port. The default port '
4882
'depends on the protocol.',
4482
'result in a dynamically allocated port. The default port is '
4884
custom_help('directory',
4885
help='Serve contents of this directory.'),
4486
help='Serve contents of this directory.',
4886
4488
Option('allow-writes',
4887
4489
help='By default the server is a readonly server. Supplying '
4888
4490
'--allow-writes enables write access to the contents of '
4889
'the served directory and below. Note that ``bzr serve`` '
4890
'does not perform authentication, so unless some form of '
4891
'external authentication is arranged supplying this '
4892
'option leads to global uncontrolled write access to your '
4491
'the served directory and below.'
4495
def run_smart_server(self, smart_server):
4496
"""Run 'smart_server' forever, with no UI output at all."""
4497
# For the duration of this server, no UI output is permitted. note
4498
# that this may cause problems with blackbox tests. This should be
4499
# changed with care though, as we dont want to use bandwidth sending
4500
# progress over stderr to smart server clients!
4501
from bzrlib import lockdir
4502
old_factory = ui.ui_factory
4503
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4505
ui.ui_factory = ui.SilentUIFactory()
4506
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4507
smart_server.serve()
4509
ui.ui_factory = old_factory
4510
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4897
4512
def get_host_and_port(self, port):
4898
4513
"""Return the host and port to run the smart server on.
4900
If 'port' is None, None will be returned for the host and port.
4515
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4516
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4902
4518
If 'port' has a colon in it, the string before the colon will be
4903
4519
interpreted as the host.
4906
4522
:return: A tuple of (host, port), where 'host' is a host name or IP,
4907
4523
and port is an integer TCP/IP port.
4910
if port is not None:
4525
from bzrlib.smart import medium
4526
host = medium.BZR_DEFAULT_INTERFACE
4528
port = medium.BZR_DEFAULT_PORT
4911
4530
if ':' in port:
4912
4531
host, port = port.split(':')
4913
4532
port = int(port)
4914
4533
return host, port
4916
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4918
from bzrlib import transport
4535
def get_smart_server(self, transport, inet, port):
4536
"""Construct a smart server.
4538
:param transport: The base transport from which branches will be
4540
:param inet: If True, serve over stdin and stdout. Used for running
4542
:param port: The port to listen on. By default, it's `
4543
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4545
:return: A smart server.
4547
from bzrlib.smart import medium, server
4549
smart_server = medium.SmartServerPipeStreamMedium(
4550
sys.stdin, sys.stdout, transport)
4552
host, port = self.get_host_and_port(port)
4553
smart_server = server.SmartTCPServer(
4554
transport, host=host, port=port)
4555
note('listening on port: %s' % smart_server.port)
4558
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4559
from bzrlib.transport import get_transport
4560
from bzrlib.transport.chroot import ChrootServer
4919
4561
if directory is None:
4920
4562
directory = os.getcwd()
4921
if protocol is None:
4922
protocol = transport.transport_server_registry.get()
4923
host, port = self.get_host_and_port(port)
4924
4563
url = urlutils.local_path_to_url(directory)
4925
4564
if not allow_writes:
4926
4565
url = 'readonly+' + url
4927
t = transport.get_transport(url)
4928
protocol(t, host, port, inet)
4566
chroot_server = ChrootServer(get_transport(url))
4567
chroot_server.setUp()
4568
t = get_transport(chroot_server.get_url())
4569
smart_server = self.get_smart_server(t, inet, port)
4570
self.run_smart_server(smart_server)
4931
4573
class cmd_join(Command):
4932
__doc__ = """Combine a tree into its containing tree.
4574
"""Combine a tree into its containing tree.
4934
4576
This command requires the target tree to be in a rich-root format.
5114
4754
directly from the merge directive, without retrieving data from a
5117
`bzr send` creates a compact data set that, when applied using bzr
5118
merge, has the same effect as merging from the source branch.
5120
By default the merge directive is self-contained and can be applied to any
5121
branch containing submit_branch in its ancestory without needing access to
5124
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5125
revisions, but only a structured request to merge from the
5126
public_location. In that case the public_branch is needed and it must be
5127
up-to-date and accessible to the recipient. The public_branch is always
5128
included if known, so that people can check it later.
5130
The submit branch defaults to the parent of the source branch, but can be
5131
overridden. Both submit branch and public branch will be remembered in
5132
branch.conf the first time they are used for a particular branch. The
5133
source branch defaults to that containing the working directory, but can
5134
be changed using --from.
5136
In order to calculate those changes, bzr must analyse the submit branch.
5137
Therefore it is most efficient for the submit branch to be a local mirror.
5138
If a public location is known for the submit_branch, that location is used
5139
in the merge directive.
5141
The default behaviour is to send the merge directive by mail, unless -o is
5142
given, in which case it is sent to a file.
4757
If --no-bundle is specified, then public_branch is needed (and must be
4758
up-to-date), so that the receiver can perform the merge using the
4759
public_branch. The public_branch is always included if known, so that
4760
people can check it later.
4762
The submit branch defaults to the parent, but can be overridden. Both
4763
submit branch and public branch will be remembered if supplied.
4765
If a public_branch is known for the submit_branch, that public submit
4766
branch is used in the merge instructions. This means that a local mirror
4767
can be used as your actual submit branch, once you have set public_branch
5144
4770
Mail is sent using your preferred mail program. This should be transparent
5145
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4771
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5146
4772
If the preferred client can't be found (or used), your editor will be used.
5148
4774
To use a specific mail program, set the mail_client configuration option.
5149
4775
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5150
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5151
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5152
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4776
specific clients are "claws", "evolution", "kmail", "mutt", and
4777
"thunderbird"; generic options are "default", "editor", "emacsclient",
4778
"mapi", and "xdg-email". Plugins may also add supported clients.
5155
4780
If mail is being sent, a to address is required. This can be supplied
5156
4781
either on the commandline, by setting the submit_to configuration
5190
4811
short_name='f',
5192
4813
Option('output', short_name='o',
5193
help='Write merge directive to this file or directory; '
4814
help='Write merge directive to this file; '
5194
4815
'use - for stdout.',
5197
help='Refuse to send if there are uncommitted changes in'
5198
' the working tree, --no-strict disables the check.'),
5199
4817
Option('mail-to', help='Mail the request to this address.',
5203
4821
Option('body', help='Body for the email.', type=unicode),
5204
RegistryOption('format',
5205
help='Use the specified output format.',
5206
lazy_registry=('bzrlib.send', 'format_registry')),
4822
RegistryOption.from_kwargs('format',
4823
'Use the specified output format.',
4824
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4825
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5209
4828
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5210
4829
no_patch=False, revision=None, remember=False, output=None,
5211
format=None, mail_to=None, message=None, body=None,
5212
strict=None, **kwargs):
5213
from bzrlib.send import send
5214
return send(submit_branch, revision, public_branch, remember,
5215
format, no_bundle, no_patch, output,
5216
kwargs.get('from', '.'), mail_to, message, body,
4830
format='4', mail_to=None, message=None, body=None, **kwargs):
4831
return self._run(submit_branch, revision, public_branch, remember,
4832
format, no_bundle, no_patch, output,
4833
kwargs.get('from', '.'), mail_to, message, body)
4835
def _run(self, submit_branch, revision, public_branch, remember, format,
4836
no_bundle, no_patch, output, from_, mail_to, message, body):
4837
from bzrlib.revision import NULL_REVISION
4838
branch = Branch.open_containing(from_)[0]
4840
outfile = cStringIO.StringIO()
4844
outfile = open(output, 'wb')
4845
# we may need to write data into branch's repository to calculate
4850
config = branch.get_config()
4852
mail_to = config.get_user_option('submit_to')
4853
mail_client = config.get_mail_client()
4854
if (not getattr(mail_client, 'supports_body', False)
4855
and body is not None):
4856
raise errors.BzrCommandError(
4857
'Mail client "%s" does not support specifying body' %
4858
mail_client.__class__.__name__)
4859
if remember and submit_branch is None:
4860
raise errors.BzrCommandError(
4861
'--remember requires a branch to be specified.')
4862
stored_submit_branch = branch.get_submit_branch()
4863
remembered_submit_branch = None
4864
if submit_branch is None:
4865
submit_branch = stored_submit_branch
4866
remembered_submit_branch = "submit"
4868
if stored_submit_branch is None or remember:
4869
branch.set_submit_branch(submit_branch)
4870
if submit_branch is None:
4871
submit_branch = branch.get_parent()
4872
remembered_submit_branch = "parent"
4873
if submit_branch is None:
4874
raise errors.BzrCommandError('No submit branch known or'
4876
if remembered_submit_branch is not None:
4877
note('Using saved %s location "%s" to determine what '
4878
'changes to submit.', remembered_submit_branch,
4882
submit_config = Branch.open(submit_branch).get_config()
4883
mail_to = submit_config.get_user_option("child_submit_to")
4885
stored_public_branch = branch.get_public_branch()
4886
if public_branch is None:
4887
public_branch = stored_public_branch
4888
elif stored_public_branch is None or remember:
4889
branch.set_public_branch(public_branch)
4890
if no_bundle and public_branch is None:
4891
raise errors.BzrCommandError('No public branch specified or'
4893
base_revision_id = None
4895
if revision is not None:
4896
if len(revision) > 2:
4897
raise errors.BzrCommandError('bzr send takes '
4898
'at most two one revision identifiers')
4899
revision_id = revision[-1].as_revision_id(branch)
4900
if len(revision) == 2:
4901
base_revision_id = revision[0].as_revision_id(branch)
4902
if revision_id is None:
4903
revision_id = branch.last_revision()
4904
if revision_id == NULL_REVISION:
4905
raise errors.BzrCommandError('No revisions to submit.')
4907
directive = merge_directive.MergeDirective2.from_objects(
4908
branch.repository, revision_id, time.time(),
4909
osutils.local_time_offset(), submit_branch,
4910
public_branch=public_branch, include_patch=not no_patch,
4911
include_bundle=not no_bundle, message=message,
4912
base_revision_id=base_revision_id)
4913
elif format == '0.9':
4916
patch_type = 'bundle'
4918
raise errors.BzrCommandError('Format 0.9 does not'
4919
' permit bundle with no patch')
4925
directive = merge_directive.MergeDirective.from_objects(
4926
branch.repository, revision_id, time.time(),
4927
osutils.local_time_offset(), submit_branch,
4928
public_branch=public_branch, patch_type=patch_type,
4931
outfile.writelines(directive.to_lines())
4933
subject = '[MERGE] '
4934
if message is not None:
4937
revision = branch.repository.get_revision(revision_id)
4938
subject += revision.get_summary()
4939
basename = directive.get_disk_name(branch)
4940
mail_client.compose_merge_request(mail_to, subject,
5221
4949
class cmd_bundle_revisions(cmd_send):
5222
__doc__ = """Create a merge-directive for submitting changes.
4951
"""Create a merge-directive for submitting changes.
5224
4953
A merge directive provides many things needed for requesting merges:
5282
5009
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5283
5010
no_patch=False, revision=None, remember=False, output=None,
5284
format=None, strict=None, **kwargs):
5011
format='4', **kwargs):
5285
5012
if output is None:
5287
from bzrlib.send import send
5288
return send(submit_branch, revision, public_branch, remember,
5014
return self._run(submit_branch, revision, public_branch, remember,
5289
5015
format, no_bundle, no_patch, output,
5290
kwargs.get('from', '.'), None, None, None,
5291
self.outf, strict=strict)
5016
kwargs.get('from', '.'), None, None, None)
5294
5019
class cmd_tag(Command):
5295
__doc__ = """Create, remove or modify a tag naming a revision.
5020
"""Create, remove or modify a tag naming a revision.
5297
5022
Tags give human-meaningful names to revisions. Commands that take a -r
5298
5023
(--revision) option can be given -rtag:X, where X is any previously
5307
5032
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5308
5033
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5310
If no tag name is specified it will be determined through the
5311
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5312
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5316
5036
_see_also = ['commit', 'tags']
5317
takes_args = ['tag_name?']
5037
takes_args = ['tag_name']
5318
5038
takes_options = [
5319
5039
Option('delete',
5320
5040
help='Delete this tag rather than placing it.',
5322
custom_help('directory',
5323
help='Branch in which to place the tag.'),
5043
help='Branch in which to place the tag.',
5324
5047
Option('force',
5325
5048
help='Replace existing tags.',
5330
def run(self, tag_name=None,
5053
def run(self, tag_name,
5336
5059
branch, relpath = Branch.open_containing(directory)
5337
self.add_cleanup(branch.lock_write().unlock)
5339
if tag_name is None:
5340
raise errors.BzrCommandError("No tag specified to delete.")
5341
branch.tags.delete_tag(tag_name)
5342
self.outf.write('Deleted tag %s.\n' % tag_name)
5345
if len(revision) != 1:
5346
raise errors.BzrCommandError(
5347
"Tags can only be placed on a single revision, "
5349
revision_id = revision[0].as_revision_id(branch)
5063
branch.tags.delete_tag(tag_name)
5064
self.outf.write('Deleted tag %s.\n' % tag_name)
5351
revision_id = branch.last_revision()
5352
if tag_name is None:
5353
tag_name = branch.automatic_tag_name(revision_id)
5354
if tag_name is None:
5355
raise errors.BzrCommandError(
5356
"Please specify a tag name.")
5357
if (not force) and branch.tags.has_tag(tag_name):
5358
raise errors.TagAlreadyExists(tag_name)
5359
branch.tags.set_tag(tag_name, revision_id)
5360
self.outf.write('Created tag %s.\n' % tag_name)
5067
if len(revision) != 1:
5068
raise errors.BzrCommandError(
5069
"Tags can only be placed on a single revision, "
5071
revision_id = revision[0].as_revision_id(branch)
5073
revision_id = branch.last_revision()
5074
if (not force) and branch.tags.has_tag(tag_name):
5075
raise errors.TagAlreadyExists(tag_name)
5076
branch.tags.set_tag(tag_name, revision_id)
5077
self.outf.write('Created tag %s.\n' % tag_name)
5363
5082
class cmd_tags(Command):
5364
__doc__ = """List tags.
5366
5085
This command shows a table of tag names and the revisions they reference.
5369
5088
_see_also = ['tag']
5370
5089
takes_options = [
5371
custom_help('directory',
5372
help='Branch whose tags should be displayed.'),
5091
help='Branch whose tags should be displayed.',
5373
5095
RegistryOption.from_kwargs('sort',
5374
5096
'Sort tags by different criteria.', title='Sorting',
5375
5097
alpha='Sort tags lexicographically (default).',
5415
5140
tags.sort(key=lambda x: timestamps[x[1]])
5416
5141
if not show_ids:
5417
5142
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5418
for index, (tag, revid) in enumerate(tags):
5420
revno = branch.revision_id_to_dotted_revno(revid)
5421
if isinstance(revno, tuple):
5422
revno = '.'.join(map(str, revno))
5423
except errors.NoSuchRevision:
5424
# Bad tag data/merges can lead to tagged revisions
5425
# which are not in this branch. Fail gracefully ...
5427
tags[index] = (tag, revno)
5143
revno_map = branch.get_revision_id_to_revno_map()
5144
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5145
for tag, revid in tags ]
5429
5146
for tag, revspec in tags:
5430
5147
self.outf.write('%-20s %s\n' % (tag, revspec))
5433
5150
class cmd_reconfigure(Command):
5434
__doc__ = """Reconfigure the type of a bzr directory.
5151
"""Reconfigure the type of a bzr directory.
5436
5153
A target configuration must be specified.
5468
5185
Option('bind-to', help='Branch to bind checkout to.', type=str),
5469
5186
Option('force',
5470
help='Perform reconfiguration even if local changes'
5472
Option('stacked-on',
5473
help='Reconfigure a branch to be stacked on another branch.',
5477
help='Reconfigure a branch to be unstacked. This '
5478
'may require copying substantial data into it.',
5187
help='Perform reconfiguration even if local changes'
5482
def run(self, location=None, target_type=None, bind_to=None, force=False,
5191
def run(self, location=None, target_type=None, bind_to=None, force=False):
5485
5192
directory = bzrdir.BzrDir.open(location)
5486
if stacked_on and unstacked:
5487
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5488
elif stacked_on is not None:
5489
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5491
reconfigure.ReconfigureUnstacked().apply(directory)
5492
# At the moment you can use --stacked-on and a different
5493
# reconfiguration shape at the same time; there seems no good reason
5495
5193
if target_type is None:
5496
if stacked_on or unstacked:
5499
raise errors.BzrCommandError('No target configuration '
5194
raise errors.BzrCommandError('No target configuration specified')
5501
5195
elif target_type == 'branch':
5502
5196
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5503
5197
elif target_type == 'tree':
5540
5234
/path/to/newbranch.
5542
5236
Bound branches use the nickname of its master branch unless it is set
5543
locally, in which case switching will update the local nickname to be
5237
locally, in which case switching will update the the local nickname to be
5544
5238
that of the master.
5547
takes_args = ['to_location?']
5548
takes_options = ['directory',
5550
help='Switch even if local commits will be lost.'),
5552
Option('create-branch', short_name='b',
5553
help='Create the target branch from this one before'
5554
' switching to it.'),
5241
takes_args = ['to_location']
5242
takes_options = [Option('force',
5243
help='Switch even if local commits will be lost.')
5557
def run(self, to_location=None, force=False, create_branch=False,
5558
revision=None, directory=u'.'):
5246
def run(self, to_location, force=False):
5559
5247
from bzrlib import switch
5560
tree_location = directory
5561
revision = _get_one_revision('switch', revision)
5562
5249
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5563
if to_location is None:
5564
if revision is None:
5565
raise errors.BzrCommandError('You must supply either a'
5566
' revision or a location')
5567
to_location = tree_location
5250
branch = control_dir.open_branch()
5569
branch = control_dir.open_branch()
5570
had_explicit_nick = branch.get_config().has_explicit_nickname()
5252
to_branch = Branch.open(to_location)
5571
5253
except errors.NotBranchError:
5573
had_explicit_nick = False
5576
raise errors.BzrCommandError('cannot create branch without'
5578
to_location = directory_service.directories.dereference(
5580
if '/' not in to_location and '\\' not in to_location:
5581
# This path is meant to be relative to the existing branch
5582
this_url = self._get_branch_location(control_dir)
5583
to_location = urlutils.join(this_url, '..', to_location)
5584
to_branch = branch.bzrdir.sprout(to_location,
5585
possible_transports=[branch.bzrdir.root_transport],
5586
source_branch=branch).open_branch()
5589
to_branch = Branch.open(to_location)
5590
except errors.NotBranchError:
5591
this_url = self._get_branch_location(control_dir)
5592
to_branch = Branch.open(
5593
urlutils.join(this_url, '..', to_location))
5594
if revision is not None:
5595
revision = revision.as_revision_id(to_branch)
5596
switch.switch(control_dir, to_branch, force, revision_id=revision)
5597
if had_explicit_nick:
5254
this_branch = control_dir.open_branch()
5255
# This may be a heavy checkout, where we want the master branch
5256
this_url = this_branch.get_bound_location()
5257
# If not, use a local sibling
5258
if this_url is None:
5259
this_url = this_branch.base
5260
to_branch = Branch.open(
5261
urlutils.join(this_url, '..', to_location))
5262
switch.switch(control_dir, to_branch, force)
5263
if branch.get_config().has_explicit_nickname():
5598
5264
branch = control_dir.open_branch() #get the new branch!
5599
5265
branch.nick = to_branch.nick
5600
5266
note('Switched to branch: %s',
5601
5267
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5603
def _get_branch_location(self, control_dir):
5604
"""Return location of branch for this control dir."""
5606
this_branch = control_dir.open_branch()
5607
# This may be a heavy checkout, where we want the master branch
5608
master_location = this_branch.get_bound_location()
5609
if master_location is not None:
5610
return master_location
5611
# If not, use a local sibling
5612
return this_branch.base
5613
except errors.NotBranchError:
5614
format = control_dir.find_branch_format()
5615
if getattr(format, 'get_reference', None) is not None:
5616
return format.get_reference(control_dir)
5618
return control_dir.root_transport.base
5621
5270
class cmd_view(Command):
5622
__doc__ = """Manage filtered views.
5271
"""Manage filtered views.
5624
5273
Views provide a mask over the tree so that users can focus on
5625
5274
a subset of a tree when doing their work. After creating a view,
5860
5483
_see_also = ['unshelve']
5862
5485
def run(self, revision=None, all=False, file_list=None, message=None,
5863
writer=None, list=False, destroy=False, directory=u'.'):
5486
writer=None, list=False, destroy=False):
5865
5488
return self.run_for_list()
5866
5489
from bzrlib.shelf_ui import Shelver
5867
5490
if writer is None:
5868
5491
writer = bzrlib.option.diff_writer_registry.get()
5870
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5871
file_list, message, destroy=destroy, directory=directory)
5493
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5494
message, destroy=destroy).run()
5876
5495
except errors.UserAbort:
5879
5498
def run_for_list(self):
5880
5499
tree = WorkingTree.open_containing('.')[0]
5881
self.add_cleanup(tree.lock_read().unlock)
5882
manager = tree.get_shelf_manager()
5883
shelves = manager.active_shelves()
5884
if len(shelves) == 0:
5885
note('No shelved changes.')
5887
for shelf_id in reversed(shelves):
5888
message = manager.get_metadata(shelf_id).get('message')
5890
message = '<no message>'
5891
self.outf.write('%3d: %s\n' % (shelf_id, message))
5502
manager = tree.get_shelf_manager()
5503
shelves = manager.active_shelves()
5504
if len(shelves) == 0:
5505
note('No shelved changes.')
5507
for shelf_id in reversed(shelves):
5508
message = manager.get_metadata(shelf_id).get('message')
5510
message = '<no message>'
5511
self.outf.write('%3d: %s\n' % (shelf_id, message))
5895
5517
class cmd_unshelve(Command):
5896
__doc__ = """Restore shelved changes.
5518
"""Restore shelved changes.
5898
5520
By default, the most recently shelved changes are restored. However if you
5899
5521
specify a shelf by id those changes will be restored instead. This works
5903
5525
takes_args = ['shelf_id?']
5904
5526
takes_options = [
5906
5527
RegistryOption.from_kwargs(
5907
5528
'action', help="The action to perform.",
5908
5529
enum_switch=False, value_switches=True,
5909
5530
apply="Apply changes and remove from the shelf.",
5910
5531
dry_run="Show changes, but do not apply or remove them.",
5911
preview="Instead of unshelving the changes, show the diff that "
5912
"would result from unshelving.",
5913
delete_only="Delete changes without applying them.",
5914
keep="Apply changes but don't delete them.",
5532
delete_only="Delete changes without applying them."
5917
5535
_see_also = ['shelve']
5919
def run(self, shelf_id=None, action='apply', directory=u'.'):
5537
def run(self, shelf_id=None, action='apply'):
5920
5538
from bzrlib.shelf_ui import Unshelver
5921
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5925
unshelver.tree.unlock()
5539
Unshelver.from_args(shelf_id, action).run()
5928
5542
class cmd_clean_tree(Command):
5929
__doc__ = """Remove unwanted files from working tree.
5543
"""Remove unwanted files from working tree.
5931
5545
By default, only unknown files, not ignored files, are deleted. Versioned
5932
5546
files are never deleted.
5950
5563
' deleting them.'),
5951
5564
Option('force', help='Do not prompt before deleting.')]
5952
5565
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5953
force=False, directory=u'.'):
5954
5567
from bzrlib.clean_tree import clean_tree
5955
5568
if not (unknown or ignored or detritus):
5959
clean_tree(directory, unknown=unknown, ignored=ignored,
5960
detritus=detritus, dry_run=dry_run, no_prompt=force)
5963
class cmd_reference(Command):
5964
__doc__ = """list, view and set branch locations for nested trees.
5966
If no arguments are provided, lists the branch locations for nested trees.
5967
If one argument is provided, display the branch location for that tree.
5968
If two arguments are provided, set the branch location for that tree.
5973
takes_args = ['path?', 'location?']
5975
def run(self, path=None, location=None):
5977
if path is not None:
5979
tree, branch, relpath =(
5980
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5981
if path is not None:
5984
tree = branch.basis_tree()
5986
info = branch._get_all_reference_info().iteritems()
5987
self._display_reference_info(tree, branch, info)
5572
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5573
dry_run=dry_run, no_prompt=force)
5576
def _create_prefix(cur_transport):
5577
needed = [cur_transport]
5578
# Recurse upwards until we can create a directory successfully
5580
new_transport = cur_transport.clone('..')
5581
if new_transport.base == cur_transport.base:
5582
raise errors.BzrCommandError(
5583
"Failed to create path prefix for %s."
5584
% cur_transport.base)
5586
new_transport.mkdir('.')
5587
except errors.NoSuchFile:
5588
needed.append(new_transport)
5589
cur_transport = new_transport
5989
file_id = tree.path2id(path)
5991
raise errors.NotVersionedError(path)
5992
if location is None:
5993
info = [(file_id, branch.get_reference_info(file_id))]
5994
self._display_reference_info(tree, branch, info)
5996
branch.set_reference_info(file_id, path, location)
5998
def _display_reference_info(self, tree, branch, info):
6000
for file_id, (path, location) in info:
6002
path = tree.id2path(file_id)
6003
except errors.NoSuchId:
6005
ref_list.append((path, location))
6006
for path, location in sorted(ref_list):
6007
self.outf.write('%s %s\n' % (path, location))
6010
def _register_lazy_builtins():
6011
# register lazy builtins from other modules; called at startup and should
6012
# be only called once.
6013
for (name, aliases, module_name) in [
6014
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6015
('cmd_dpush', [], 'bzrlib.foreign'),
6016
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6017
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6018
('cmd_conflicts', [], 'bzrlib.conflicts'),
6019
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6021
builtin_command_registry.register_lazy(name, aliases, module_name)
5592
# Now we only need to create child directories
5594
cur_transport = needed.pop()
5595
cur_transport.ensure_base()
5598
# these get imported and then picked up by the scan for cmd_*
5599
# TODO: Some more consistent way to split command definitions across files;
5600
# we do need to load at least some information about them to know of
5601
# aliases. ideally we would avoid loading the implementation until the
5602
# details were needed.
5603
from bzrlib.cmd_version_info import cmd_version_info
5604
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5605
from bzrlib.bundle.commands import (
5608
from bzrlib.sign_my_commits import cmd_sign_my_commits
5609
from bzrlib.weave_commands import cmd_versionedfile_list, \
5610
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
