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):
2488
2286
@display_command
2489
2287
def run(self, filename):
2490
2288
tree, relpath = WorkingTree.open_containing(filename)
2491
2290
file_id = tree.path2id(relpath)
2493
self.add_cleanup(b.lock_read().unlock)
2494
touching_revs = log.find_touching_revisions(b, file_id)
2495
for revno, revision_id, what in touching_revs:
2291
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2496
2292
self.outf.write("%6d %s\n" % (revno, what))
2499
2295
class cmd_ls(Command):
2500
__doc__ = """List files in a tree.
2296
"""List files in a tree.
2503
2299
_see_also = ['status', 'cat']
2504
2300
takes_args = ['path?']
2301
# TODO: Take a revision or remote path and list that tree instead.
2505
2302
takes_options = [
2508
Option('recursive', short_name='R',
2509
help='Recurse into subdirectories.'),
2305
Option('non-recursive',
2306
help='Don\'t recurse into subdirectories.'),
2510
2307
Option('from-root',
2511
2308
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2309
Option('unknown', help='Print unknown files.'),
2514
2310
Option('versioned', help='Print versioned files.',
2515
2311
short_name='V'),
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2312
Option('ignored', help='Print ignored files.'),
2314
help='Write an ascii NUL (\\0) separator '
2315
'between files rather than a newline.'),
2519
2317
help='List entries of a particular kind: file, directory, symlink.',
2525
2321
@display_command
2526
2322
def run(self, revision=None, verbose=False,
2527
recursive=False, from_root=False,
2323
non_recursive=False, from_root=False,
2528
2324
unknown=False, versioned=False, ignored=False,
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
2325
null=False, kind=None, show_ids=False, path=None):
2531
2327
if kind and kind not in ('file', 'directory', 'symlink'):
2532
2328
raise errors.BzrCommandError('invalid kind specified')
2566
2359
view_str = views.view_display_str(view_files)
2567
2360
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')
2364
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2365
if fp.startswith(relpath):
2366
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2367
if non_recursive and '/' in fp:
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]
2715
2472
for name_pattern in name_pattern_list:
2717
2474
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2718
2475
raise errors.BzrCommandError(
2719
2476
"NAME_PATTERN should not be an absolute path")
2720
tree, relpath = WorkingTree.open_containing(directory)
2477
tree, relpath = WorkingTree.open_containing(u'.')
2721
2478
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2722
2479
ignored = globbing.Globster(name_pattern_list)
2724
self.add_cleanup(tree.lock_read().unlock)
2725
2482
for entry in tree.list_files():
2727
2484
if id is not None:
2728
2485
filename = entry[0]
2729
2486
if ignored.match(filename):
2730
matches.append(filename)
2487
matches.append(filename.encode('utf-8'))
2731
2489
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
2734
"\nThese files will continue to be version controlled"
2735
" 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),)
2738
2496
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2497
"""List ignored files and the patterns that matched them.
2741
2499
List all the ignored files and the ignore pattern that caused the file to
2749
2507
encoding_type = 'replace'
2750
2508
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2753
2510
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2757
for path, file_class, kind, file_id, entry in tree.list_files():
2758
if file_class != 'I':
2760
## XXX: Slightly inefficient since this was already calculated
2761
pat = tree.is_ignored(path)
2762
self.outf.write('%-50s %s\n' % (path, pat))
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))
2765
2525
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2526
"""Lookup the revision-id from a revision-number
2769
2529
bzr lookup-revision 33
2772
2532
takes_args = ['revno']
2773
takes_options = ['directory']
2775
2534
@display_command
2776
def run(self, revno, directory=u'.'):
2535
def run(self, revno):
2778
2537
revno = int(revno)
2779
2538
except ValueError:
2780
raise errors.BzrCommandError("not a valid revision-number: %r"
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2783
self.outf.write("%s\n" % revid)
2539
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2541
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2786
2544
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2545
"""Export current or past revision to a destination directory or archive.
2789
2547
If no revision is specified this exports the last committed revision.
2868
2622
@display_command
2869
2623
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2871
2625
if revision is not None and len(revision) != 1:
2872
2626
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2627
" one revision specifier")
2874
2628
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2877
return self._run(tree, branch, relpath, filename, revision,
2878
name_from_revision, filters)
2629
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2632
return self._run(tree, branch, relpath, filename, revision,
2633
name_from_revision, filters)
2880
2637
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2882
2639
if tree is None:
2883
2640
tree = b.basis_tree()
2884
2641
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2887
2643
old_file_id = rev_tree.path2id(relpath)
2923
2679
chunks = content.splitlines(True)
2924
2680
content = filtered_output_bytes(chunks, filters,
2925
2681
ContentFilterContext(relpath, rev_tree))
2927
2682
self.outf.writelines(content)
2930
2684
self.outf.write(content)
2933
2687
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2688
"""Show the offset in seconds from GMT to local time."""
2936
2690
@display_command
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2692
print osutils.local_time_offset()
2942
2696
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2945
An explanatory message needs to be given for each commit. This is
2946
often done by using the --message option (getting the message from the
2947
command line) or by using the --file option (getting the message from
2948
a file). If neither of these options is given, an editor is opened for
2949
the user to enter the message. To see the changed files in the
2950
boilerplate text loaded into the editor, use the --show-diff option.
2952
By default, the entire tree is committed and the person doing the
2953
commit is assumed to be the author. These defaults can be overridden
2958
If selected files are specified, only changes to those files are
2959
committed. If a directory is specified then the directory and
2960
everything within it is committed.
2962
When excludes are given, they take precedence over selected files.
2963
For example, to commit only changes within foo, but not changes
2966
bzr commit foo -x foo/bar
2968
A selective commit after a merge is not yet supported.
2972
If the author of the change is not the same person as the committer,
2973
you can specify the author's name using the --author option. The
2974
name should be in the same format as a committer-id, e.g.
2975
"John Doe <jdoe@example.com>". If there is more than one author of
2976
the change you can specify the option multiple times, once for each
2981
A common mistake is to forget to add a new file or directory before
2982
running the commit command. The --strict option checks for unknown
2983
files and aborts the commit if any are found. More advanced pre-commit
2984
checks can be implemented by defining hooks. See ``bzr help hooks``
2989
If you accidentially commit the wrong changes or make a spelling
2990
mistake in the commit message say, you can use the uncommit command
2991
to undo it. See ``bzr help uncommit`` for details.
2993
Hooks can also be configured to run after a commit. This allows you
2994
to trigger updates to external systems like bug trackers. The --fixes
2995
option can be used to record the association between a revision and
2996
one or more bugs. See ``bzr help bugs`` for details.
2998
A selective commit may fail in some cases where the committed
2999
tree would be invalid. Consider::
3004
bzr commit foo -m "committing foo"
3005
bzr mv foo/bar foo/baz
3008
bzr commit foo/bar -m "committing bar but not baz"
3010
In the example above, the last commit will fail by design. This gives
3011
the user the opportunity to decide whether they want to commit the
3012
rename at the same time, separately first, or not at all. (As a general
3013
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.
3015
2736
# TODO: Run hooks on tree to-be-committed, and after commit.
3126
2836
if local and not tree.branch.get_bound_location():
3127
2837
raise errors.LocalRequiresBoundBranch()
3129
if message is not None:
3131
file_exists = osutils.lexists(message)
3132
except UnicodeError:
3133
# The commit message contains unicode characters that can't be
3134
# represented in the filesystem encoding, so that can't be a
3139
'The commit message is a file name: "%(f)s".\n'
3140
'(use --file "%(f)s" to take commit message from that file)'
3142
ui.ui_factory.show_warning(warning_msg)
3144
message = message.replace('\r\n', '\n')
3145
message = message.replace('\r', '\n')
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3150
2839
def get_message(commit_obj):
3151
2840
"""Callback to get commit message"""
3153
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3155
my_message = f.read()
3158
elif message is not None:
3159
my_message = message
3161
# No message supplied: make one up.
3162
# text is the status of the tree
3163
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,
3164
2844
selected_list, diff=show_diff,
3165
2845
output_encoding=osutils.get_user_encoding())
3166
# start_message is the template generated from hooks
3167
# XXX: Warning - looks like hooks return unicode,
3168
# make_commit_message_template_encoded returns user encoding.
3169
# We probably want to be using edit_commit_message instead to
3171
2846
start_message = generate_commit_message_template(commit_obj)
3172
my_message = edit_commit_message_encoded(text,
2847
my_message = edit_commit_message_encoded(t,
3173
2848
start_message=start_message)
3174
2849
if my_message is None:
3175
2850
raise errors.BzrCommandError("please specify a commit"
3176
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()
3177
2858
if my_message == "":
3178
2859
raise errors.BzrCommandError("empty commit message specified")
3179
2860
return my_message
3181
# The API permits a commit with a filter of [] to mean 'select nothing'
3182
# but the command line should not do that.
3183
if not selected_list:
3184
selected_list = None
3186
2863
tree.commit(message_callback=get_message,
3187
2864
specific_files=selected_list,
3188
2865
allow_pointless=unchanged, strict=strict, local=local,
3189
2866
reporter=None, verbose=verbose, revprops=properties,
3190
authors=author, timestamp=commit_stamp,
3192
2868
exclude=safe_relpath_files(tree, exclude))
3193
2869
except PointlessCommit:
3194
raise errors.BzrCommandError("No changes to commit."
3195
" 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")
3196
2874
except ConflictsInTree:
3197
2875
raise errors.BzrCommandError('Conflicts detected in working '
3198
2876
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3217
2894
The working tree and branch checks will only give output if a problem is
3218
2895
detected. The output fields of the repository check are:
3221
This is just the number of revisions checked. It doesn't
3225
This is just the number of versionedfiles checked. It
3226
doesn't indicate a problem.
3228
unreferenced ancestors
3229
Texts that are ancestors of other texts, but
3230
are not properly referenced by the revision ancestry. This is a
3231
subtle problem that Bazaar can work around.
3234
This is the total number of unique file contents
3235
seen in the checked revisions. It does not indicate a problem.
3238
This is the total number of repeated texts seen
3239
in the checked revisions. Texts can be repeated when their file
3240
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
3243
2911
If no restrictions are specified, all Bazaar data that is found at the given
3244
2912
location will be checked.
3620
3274
verbose = not is_quiet()
3621
3275
# TODO: should possibly lock the history file...
3622
3276
benchfile = open(".perf_history", "at", buffering=1)
3623
self.add_cleanup(benchfile.close)
3625
3278
test_suite_factory = None
3626
3279
benchfile = None
3627
selftest_kwargs = {"verbose": verbose,
3629
"stop_on_failure": one,
3630
"transport": transport,
3631
"test_suite_factory": test_suite_factory,
3632
"lsprof_timed": lsprof_timed,
3633
"lsprof_tests": lsprof_tests,
3634
"bench_history": benchfile,
3635
"matching_tests_first": first,
3636
"list_only": list_only,
3637
"random_seed": randomize,
3638
"exclude_pattern": exclude,
3640
"load_list": load_list,
3641
"debug_flags": debugflag,
3642
"starting_with": starting_with
3644
selftest_kwargs.update(self.additional_selftest_args)
3645
result = selftest(**selftest_kwargs)
3281
selftest_kwargs = {"verbose": verbose,
3283
"stop_on_failure": one,
3284
"transport": transport,
3285
"test_suite_factory": test_suite_factory,
3286
"lsprof_timed": lsprof_timed,
3287
"bench_history": benchfile,
3288
"matching_tests_first": first,
3289
"list_only": list_only,
3290
"random_seed": randomize,
3291
"exclude_pattern": exclude,
3293
"load_list": load_list,
3294
"debug_flags": debugflag,
3295
"starting_with": starting_with
3297
selftest_kwargs.update(self.additional_selftest_args)
3298
result = selftest(**selftest_kwargs)
3300
if benchfile is not None:
3303
note('tests passed')
3305
note('tests failed')
3646
3306
return int(not result)
3649
3309
class cmd_version(Command):
3650
__doc__ = """Show version of bzr."""
3310
"""Show version of bzr."""
3652
3312
encoding_type = 'replace'
3653
3313
takes_options = [
3813
3463
verified = 'inapplicable'
3814
3464
tree = WorkingTree.open_containing(directory)[0]
3466
# die as quickly as possible if there are uncommitted changes
3817
3468
basis_tree = tree.revision_tree(tree.last_revision())
3818
3469
except errors.NoSuchRevision:
3819
3470
basis_tree = tree.basis_tree()
3821
# die as quickly as possible if there are uncommitted changes
3823
if tree.has_changes():
3472
changes = tree.changes_from(basis_tree)
3473
if changes.has_changed():
3824
3474
raise errors.UncommittedChanges(tree)
3826
3476
view_info = _get_view_info_for_change_reporter(tree)
3827
3477
change_reporter = delta._ChangeReporter(
3828
3478
unversioned_filter=tree.is_ignored, view_info=view_info)
3829
pb = ui.ui_factory.nested_progress_bar()
3830
self.add_cleanup(pb.finished)
3831
self.add_cleanup(tree.lock_write().unlock)
3832
if location is not None:
3834
mergeable = bundle.read_mergeable_from_url(location,
3835
possible_transports=possible_transports)
3836
except errors.NotABundle:
3481
pb = ui.ui_factory.nested_progress_bar()
3482
cleanups.append(pb.finished)
3484
cleanups.append(tree.unlock)
3485
if location is not None:
3487
mergeable = bundle.read_mergeable_from_url(location,
3488
possible_transports=possible_transports)
3489
except errors.NotABundle:
3493
raise errors.BzrCommandError('Cannot use --uncommitted'
3494
' with bundles or merge directives.')
3496
if revision is not None:
3497
raise errors.BzrCommandError(
3498
'Cannot use -r with merge directives or bundles')
3499
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3502
if merger is None and uncommitted:
3503
if revision is not None and len(revision) > 0:
3504
raise errors.BzrCommandError('Cannot use --uncommitted and'
3505
' --revision at the same time.')
3506
location = self._select_branch_location(tree, location)[0]
3507
other_tree, other_path = WorkingTree.open_containing(location)
3508
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3510
allow_pending = False
3511
if other_path != '':
3512
merger.interesting_files = [other_path]
3515
merger, allow_pending = self._get_merger_from_branch(tree,
3516
location, revision, remember, possible_transports, pb)
3518
merger.merge_type = merge_type
3519
merger.reprocess = reprocess
3520
merger.show_base = show_base
3521
self.sanity_check_merger(merger)
3522
if (merger.base_rev_id == merger.other_rev_id and
3523
merger.other_rev_id is not None):
3524
note('Nothing to do.')
3527
if merger.interesting_files is not None:
3528
raise errors.BzrCommandError('Cannot pull individual files')
3529
if (merger.base_rev_id == tree.last_revision()):
3530
result = tree.pull(merger.other_branch, False,
3531
merger.other_rev_id)
3532
result.report(self.outf)
3534
merger.check_basis(False)
3536
return self._do_preview(merger)
3840
raise errors.BzrCommandError('Cannot use --uncommitted'
3841
' with bundles or merge directives.')
3843
if revision is not None:
3844
raise errors.BzrCommandError(
3845
'Cannot use -r with merge directives or bundles')
3846
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3849
if merger is None and uncommitted:
3850
if revision is not None and len(revision) > 0:
3851
raise errors.BzrCommandError('Cannot use --uncommitted and'
3852
' --revision at the same time.')
3853
merger = self.get_merger_from_uncommitted(tree, location, None)
3854
allow_pending = False
3857
merger, allow_pending = self._get_merger_from_branch(tree,
3858
location, revision, remember, possible_transports, None)
3860
merger.merge_type = merge_type
3861
merger.reprocess = reprocess
3862
merger.show_base = show_base
3863
self.sanity_check_merger(merger)
3864
if (merger.base_rev_id == merger.other_rev_id and
3865
merger.other_rev_id is not None):
3866
note('Nothing to do.')
3869
if merger.interesting_files is not None:
3870
raise errors.BzrCommandError('Cannot pull individual files')
3871
if (merger.base_rev_id == tree.last_revision()):
3872
result = tree.pull(merger.other_branch, False,
3873
merger.other_rev_id)
3874
result.report(self.outf)
3876
if merger.this_basis is None:
3877
raise errors.BzrCommandError(
3878
"This branch has no commits."
3879
" (perhaps you would prefer 'bzr pull')")
3881
return self._do_preview(merger)
3883
return self._do_interactive(merger)
3885
return self._do_merge(merger, change_reporter, allow_pending,
3888
def _get_preview(self, merger):
3538
return self._do_merge(merger, change_reporter, allow_pending,
3541
for cleanup in reversed(cleanups):
3544
def _do_preview(self, merger):
3545
from bzrlib.diff import show_diff_trees
3889
3546
tree_merger = merger.make_merger()
3890
3547
tt = tree_merger.make_preview_transform()
3891
self.add_cleanup(tt.finalize)
3892
result_tree = tt.get_preview_tree()
3895
def _do_preview(self, merger):
3896
from bzrlib.diff import show_diff_trees
3897
result_tree = self._get_preview(merger)
3898
path_encoding = osutils.get_diff_header_encoding()
3899
show_diff_trees(merger.this_tree, result_tree, self.outf,
3900
old_label='', new_label='',
3901
path_encoding=path_encoding)
3549
result_tree = tt.get_preview_tree()
3550
show_diff_trees(merger.this_tree, result_tree, self.outf,
3551
old_label='', new_label='')
3903
3555
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3904
3556
merger.change_reporter = change_reporter
4089
3709
def run(self, file_list=None, merge_type=None, show_base=False,
4090
3710
reprocess=False):
4091
from bzrlib.conflicts import restore
4092
3711
if merge_type is None:
4093
3712
merge_type = _mod_merge.Merge3Merger
4094
3713
tree, file_list = tree_files(file_list)
4095
self.add_cleanup(tree.lock_write().unlock)
4096
parents = tree.get_parent_ids()
4097
if len(parents) != 2:
4098
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4099
" merges. Not cherrypicking or"
4101
repository = tree.branch.repository
4102
interesting_ids = None
4104
conflicts = tree.conflicts()
4105
if file_list is not None:
4106
interesting_ids = set()
4107
for filename in file_list:
4108
file_id = tree.path2id(filename)
4110
raise errors.NotVersionedError(filename)
4111
interesting_ids.add(file_id)
4112
if tree.kind(file_id) != "directory":
3716
parents = tree.get_parent_ids()
3717
if len(parents) != 2:
3718
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3719
" merges. Not cherrypicking or"
3721
repository = tree.branch.repository
3722
interesting_ids = None
3724
conflicts = tree.conflicts()
3725
if file_list is not None:
3726
interesting_ids = set()
3727
for filename in file_list:
3728
file_id = tree.path2id(filename)
3730
raise errors.NotVersionedError(filename)
3731
interesting_ids.add(file_id)
3732
if tree.kind(file_id) != "directory":
4115
for name, ie in tree.inventory.iter_entries(file_id):
4116
interesting_ids.add(ie.file_id)
4117
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4119
# Remerge only supports resolving contents conflicts
4120
allowed_conflicts = ('text conflict', 'contents conflict')
4121
restore_files = [c.path for c in conflicts
4122
if c.typestring in allowed_conflicts]
4123
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4124
tree.set_conflicts(ConflictList(new_conflicts))
4125
if file_list is not None:
4126
restore_files = file_list
4127
for filename in restore_files:
3735
for name, ie in tree.inventory.iter_entries(file_id):
3736
interesting_ids.add(ie.file_id)
3737
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3739
# Remerge only supports resolving contents conflicts
3740
allowed_conflicts = ('text conflict', 'contents conflict')
3741
restore_files = [c.path for c in conflicts
3742
if c.typestring in allowed_conflicts]
3743
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3744
tree.set_conflicts(ConflictList(new_conflicts))
3745
if file_list is not None:
3746
restore_files = file_list
3747
for filename in restore_files:
3749
restore(tree.abspath(filename))
3750
except errors.NotConflicted:
3752
# Disable pending merges, because the file texts we are remerging
3753
# have not had those merges performed. If we use the wrong parents
3754
# list, we imply that the working tree text has seen and rejected
3755
# all the changes from the other tree, when in fact those changes
3756
# have not yet been seen.
3757
pb = ui.ui_factory.nested_progress_bar()
3758
tree.set_parent_ids(parents[:1])
4129
restore(tree.abspath(filename))
4130
except errors.NotConflicted:
4132
# Disable pending merges, because the file texts we are remerging
4133
# have not had those merges performed. If we use the wrong parents
4134
# list, we imply that the working tree text has seen and rejected
4135
# all the changes from the other tree, when in fact those changes
4136
# have not yet been seen.
4137
tree.set_parent_ids(parents[:1])
4139
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4140
merger.interesting_ids = interesting_ids
4141
merger.merge_type = merge_type
4142
merger.show_base = show_base
4143
merger.reprocess = reprocess
4144
conflicts = merger.do_merge()
3760
merger = _mod_merge.Merger.from_revision_ids(pb,
3762
merger.interesting_ids = interesting_ids
3763
merger.merge_type = merge_type
3764
merger.show_base = show_base
3765
merger.reprocess = reprocess
3766
conflicts = merger.do_merge()
3768
tree.set_parent_ids(parents)
4146
tree.set_parent_ids(parents)
4147
3772
if conflicts > 0:
4171
3796
name. If you name a directory, all the contents of that directory will be
4174
If you have newly added files since the target revision, they will be
4175
removed. If the files to be removed have been changed, backups will be
4176
created as above. Directories containing unknown files will not be
3799
Any files that have been newly added since that revision will be deleted,
3800
with a backup kept if appropriate. Directories containing unknown files
3801
will not be deleted.
4179
The working tree contains a list of revisions that have been merged but
4180
not yet committed. These revisions will be included as additional parents
4181
of the next commit. Normally, using revert clears that list as well as
4182
reverting the files. If any files are specified, revert leaves the list
4183
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4184
.`` in the tree root to revert all files but keep the recorded merges,
4185
and ``bzr revert --forget-merges`` to clear the pending merge list without
3803
The working tree contains a list of pending merged revisions, which will
3804
be included as parents in the next commit. Normally, revert clears that
3805
list as well as reverting the files. If any files are specified, revert
3806
leaves the pending merge list alone and reverts only the files. Use "bzr
3807
revert ." in the tree root to revert all files but keep the merge record,
3808
and "bzr revert --forget-merges" to clear the pending merge list without
4186
3809
reverting any files.
4188
Using "bzr revert --forget-merges", it is possible to apply all of the
4189
changes from a branch in a single revision. To do this, perform the merge
4190
as desired. Then doing revert with the "--forget-merges" option will keep
4191
the content of the tree as it was, but it will clear the list of pending
4192
merges. The next commit will then contain all of the changes that are
4193
present in the other branch, but without any other parent revisions.
4194
Because this technique forgets where these changes originated, it may
4195
cause additional conflicts on later merges involving the same source and
4199
3812
_see_also = ['cat', 'export']
4208
3821
def run(self, revision=None, no_backup=False, file_list=None,
4209
3822
forget_merges=None):
4210
3823
tree, file_list = tree_files(file_list)
4211
self.add_cleanup(tree.lock_tree_write().unlock)
4213
tree.set_parent_ids(tree.get_parent_ids()[:1])
4215
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3827
tree.set_parent_ids(tree.get_parent_ids()[:1])
3829
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4218
3834
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4219
3835
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4220
tree.revert(file_list, rev_tree, not no_backup, None,
4221
report_changes=True)
3836
pb = ui.ui_factory.nested_progress_bar()
3838
tree.revert(file_list, rev_tree, not no_backup, pb,
3839
report_changes=True)
4224
3844
class cmd_assert_fail(Command):
4225
__doc__ = """Test reporting of assertion failures"""
3845
"""Test reporting of assertion failures"""
4226
3846
# intended just for use in testing
4379
3989
_get_revision_range(revision,
4380
3990
remote_branch, self.name()))
4382
local_extra, remote_extra = find_unmerged(
4383
local_branch, remote_branch, restrict,
4384
backward=not reverse,
4385
include_merges=include_merges,
4386
local_revid_range=local_revid_range,
4387
remote_revid_range=remote_revid_range)
4389
if log_format is None:
4390
registry = log.log_formatter_registry
4391
log_format = registry.get_default(local_branch)
4392
lf = log_format(to_file=self.outf,
4394
show_timezone='original')
4397
if local_extra and not theirs_only:
4398
message("You have %d extra revision(s):\n" %
4400
for revision in iter_log_revisions(local_extra,
4401
local_branch.repository,
4403
lf.log_revision(revision)
4404
printed_local = True
4407
printed_local = False
4409
if remote_extra and not mine_only:
4410
if printed_local is True:
4412
message("You are missing %d revision(s):\n" %
4414
for revision in iter_log_revisions(remote_extra,
4415
remote_branch.repository,
4417
lf.log_revision(revision)
4420
if mine_only and not local_extra:
4421
# We checked local, and found nothing extra
4422
message('This branch is up to date.\n')
4423
elif theirs_only and not remote_extra:
4424
# We checked remote, and found nothing extra
4425
message('Other branch is up to date.\n')
4426
elif not (mine_only or theirs_only or local_extra or
4428
# We checked both branches, and neither one had extra
4430
message("Branches are up to date.\n")
3992
local_branch.lock_read()
3994
remote_branch.lock_read()
3996
local_extra, remote_extra = find_unmerged(
3997
local_branch, remote_branch, restrict,
3998
backward=not reverse,
3999
include_merges=include_merges,
4000
local_revid_range=local_revid_range,
4001
remote_revid_range=remote_revid_range)
4003
if log_format is None:
4004
registry = log.log_formatter_registry
4005
log_format = registry.get_default(local_branch)
4006
lf = log_format(to_file=self.outf,
4008
show_timezone='original')
4011
if local_extra and not theirs_only:
4012
message("You have %d extra revision(s):\n" %
4014
for revision in iter_log_revisions(local_extra,
4015
local_branch.repository,
4017
lf.log_revision(revision)
4018
printed_local = True
4021
printed_local = False
4023
if remote_extra and not mine_only:
4024
if printed_local is True:
4026
message("You are missing %d revision(s):\n" %
4028
for revision in iter_log_revisions(remote_extra,
4029
remote_branch.repository,
4031
lf.log_revision(revision)
4034
if mine_only and not local_extra:
4035
# We checked local, and found nothing extra
4036
message('This branch is up to date.\n')
4037
elif theirs_only and not remote_extra:
4038
# We checked remote, and found nothing extra
4039
message('Other branch is up to date.\n')
4040
elif not (mine_only or theirs_only or local_extra or
4042
# We checked both branches, and neither one had extra
4044
message("Branches are up to date.\n")
4046
remote_branch.unlock()
4048
local_branch.unlock()
4432
4049
if not status_code and parent is None and other_branch is not None:
4433
self.add_cleanup(local_branch.lock_write().unlock)
4434
# handle race conditions - a parent might be set while we run.
4435
if local_branch.get_parent() is None:
4436
local_branch.set_parent(remote_branch.base)
4050
local_branch.lock_write()
4052
# handle race conditions - a parent might be set while we run.
4053
if local_branch.get_parent() is None:
4054
local_branch.set_parent(remote_branch.base)
4056
local_branch.unlock()
4437
4057
return status_code
4440
4060
class cmd_pack(Command):
4441
__doc__ = """Compress the data within a repository.
4443
This operation compresses the data within a bazaar repository. As
4444
bazaar supports automatic packing of repository, this operation is
4445
normally not required to be done manually.
4447
During the pack operation, bazaar takes a backup of existing repository
4448
data, i.e. pack files. This backup is eventually removed by bazaar
4449
automatically when it is safe to do so. To save disk space by removing
4450
the backed up pack files, the --clean-obsolete-packs option may be
4453
Warning: If you use --clean-obsolete-packs and your machine crashes
4454
during or immediately after repacking, you may be left with a state
4455
where the deletion has been written to disk but the new packs have not
4456
been. In this case the repository may be unusable.
4061
"""Compress the data within a repository."""
4459
4063
_see_also = ['repositories']
4460
4064
takes_args = ['branch_or_repo?']
4462
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4465
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4066
def run(self, branch_or_repo='.'):
4466
4067
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4468
4069
branch = dir.open_branch()
4469
4070
repository = branch.repository
4470
4071
except errors.NotBranchError:
4471
4072
repository = dir.open_repository()
4472
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4475
4076
class cmd_plugins(Command):
4476
__doc__ = """List the installed plugins.
4077
"""List the installed plugins.
4478
4079
This command displays the list of installed plugins including
4479
4080
version of plugin and a short description of each.
4566
4170
Option('long', help='Show commit date in annotations.'),
4571
4174
encoding_type = 'exact'
4573
4176
@display_command
4574
4177
def run(self, filename, all=False, long=False, revision=None,
4575
show_ids=False, directory=None):
4576
4179
from bzrlib.annotate import annotate_file, annotate_file_tree
4577
4180
wt, branch, relpath = \
4578
_open_directory_or_containing_tree_or_branch(filename, directory)
4580
self.add_cleanup(wt.lock_read().unlock)
4582
self.add_cleanup(branch.lock_read().unlock)
4583
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4584
self.add_cleanup(tree.lock_read().unlock)
4586
file_id = wt.path2id(relpath)
4588
file_id = tree.path2id(relpath)
4590
raise errors.NotVersionedError(filename)
4591
file_version = tree.inventory[file_id].revision
4592
if wt is not None and revision is None:
4593
# If there is a tree and we're not annotating historical
4594
# versions, annotate the working tree's content.
4595
annotate_file_tree(wt, file_id, self.outf, long, all,
4598
annotate_file(branch, file_version, file_id, long, all, self.outf,
4181
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4187
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4189
file_id = wt.path2id(relpath)
4191
file_id = tree.path2id(relpath)
4193
raise errors.NotVersionedError(filename)
4194
file_version = tree.inventory[file_id].revision
4195
if wt is not None and revision is None:
4196
# If there is a tree and we're not annotating historical
4197
# versions, annotate the working tree's content.
4198
annotate_file_tree(wt, file_id, self.outf, long, all,
4201
annotate_file(branch, file_version, file_id, long, all, self.outf,
4602
4210
class cmd_re_sign(Command):
4603
__doc__ = """Create a digital signature for an existing revision."""
4211
"""Create a digital signature for an existing revision."""
4604
4212
# TODO be able to replace existing ones.
4606
4214
hidden = True # is this right ?
4607
4215
takes_args = ['revision_id*']
4608
takes_options = ['directory', 'revision']
4216
takes_options = ['revision']
4610
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4218
def run(self, revision_id_list=None, revision=None):
4611
4219
if revision_id_list is not None and revision is not None:
4612
4220
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4613
4221
if revision_id_list is None and revision is None:
4614
4222
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4615
b = WorkingTree.open_containing(directory)[0].branch
4616
self.add_cleanup(b.lock_write().unlock)
4617
return self._run(b, revision_id_list, revision)
4223
b = WorkingTree.open_containing(u'.')[0].branch
4226
return self._run(b, revision_id_list, revision)
4619
4230
def _run(self, b, revision_id_list, revision):
4620
4231
import bzrlib.gpg as gpg
4810
4424
end_revision=last_revno)
4813
self.outf.write('Dry-run, pretending to remove'
4814
' the above revisions.\n')
4427
print 'Dry-run, pretending to remove the above revisions.'
4429
val = raw_input('Press <enter> to continue')
4816
self.outf.write('The above revision(s) will be removed.\n')
4819
if not ui.ui_factory.get_boolean('Are you sure'):
4820
self.outf.write('Canceled')
4431
print 'The above revision(s) will be removed.'
4433
val = raw_input('Are you sure [y/N]? ')
4434
if val.lower() not in ('y', 'yes'):
4823
4438
mutter('Uncommitting from {%s} to {%s}',
4824
4439
last_rev_id, rev_id)
4825
4440
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4826
4441
revno=revno, local=local)
4827
self.outf.write('You can restore the old tip by running:\n'
4828
' bzr pull . -r revid:%s\n' % last_rev_id)
4442
note('You can restore the old tip by running:\n'
4443
' bzr pull . -r revid:%s', last_rev_id)
4831
4446
class cmd_break_lock(Command):
4832
__doc__ = """Break a dead lock on a repository, branch or working directory.
4447
"""Break a dead lock on a repository, branch or working directory.
4834
4449
CAUTION: Locks should only be broken when you are sure that the process
4835
4450
holding the lock has been stopped.
4837
You can get information on what locks are open via the 'bzr info
4838
[location]' command.
4452
You can get information on what locks are open via the 'bzr info' command.
4842
bzr break-lock bzr+ssh://example.com/bzr/foo
4844
4457
takes_args = ['location?']
4870
4483
class cmd_serve(Command):
4871
__doc__ = """Run the bzr server."""
4484
"""Run the bzr server."""
4873
4486
aliases = ['server']
4875
4488
takes_options = [
4877
4490
help='Serve on stdin/out for use from inetd or sshd.'),
4878
RegistryOption('protocol',
4879
help="Protocol to serve.",
4880
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4881
value_switches=True),
4883
4492
help='Listen for connections on nominated port of the form '
4884
4493
'[hostname:]portnumber. Passing 0 as the port number will '
4885
'result in a dynamically allocated port. The default port '
4886
'depends on the protocol.',
4494
'result in a dynamically allocated port. The default port is '
4888
custom_help('directory',
4889
help='Serve contents of this directory.'),
4498
help='Serve contents of this directory.',
4890
4500
Option('allow-writes',
4891
4501
help='By default the server is a readonly server. Supplying '
4892
4502
'--allow-writes enables write access to the contents of '
4893
'the served directory and below. Note that ``bzr serve`` '
4894
'does not perform authentication, so unless some form of '
4895
'external authentication is arranged supplying this '
4896
'option leads to global uncontrolled write access to your '
4503
'the served directory and below.'
4507
def run_smart_server(self, smart_server):
4508
"""Run 'smart_server' forever, with no UI output at all."""
4509
# For the duration of this server, no UI output is permitted. note
4510
# that this may cause problems with blackbox tests. This should be
4511
# changed with care though, as we dont want to use bandwidth sending
4512
# progress over stderr to smart server clients!
4513
from bzrlib import lockdir
4514
old_factory = ui.ui_factory
4515
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4517
ui.ui_factory = ui.SilentUIFactory()
4518
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4519
smart_server.serve()
4521
ui.ui_factory = old_factory
4522
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4901
4524
def get_host_and_port(self, port):
4902
4525
"""Return the host and port to run the smart server on.
4904
If 'port' is None, None will be returned for the host and port.
4527
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4528
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4906
4530
If 'port' has a colon in it, the string before the colon will be
4907
4531
interpreted as the host.
4910
4534
:return: A tuple of (host, port), where 'host' is a host name or IP,
4911
4535
and port is an integer TCP/IP port.
4914
if port is not None:
4537
from bzrlib.smart import medium
4538
host = medium.BZR_DEFAULT_INTERFACE
4540
port = medium.BZR_DEFAULT_PORT
4915
4542
if ':' in port:
4916
4543
host, port = port.split(':')
4917
4544
port = int(port)
4918
4545
return host, port
4920
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4922
from bzrlib import transport
4547
def get_smart_server(self, transport, inet, port):
4548
"""Construct a smart server.
4550
:param transport: The base transport from which branches will be
4552
:param inet: If True, serve over stdin and stdout. Used for running
4554
:param port: The port to listen on. By default, it's `
4555
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4557
:return: A smart server.
4559
from bzrlib.smart import medium, server
4561
smart_server = medium.SmartServerPipeStreamMedium(
4562
sys.stdin, sys.stdout, transport)
4564
host, port = self.get_host_and_port(port)
4565
smart_server = server.SmartTCPServer(
4566
transport, host=host, port=port)
4567
note('listening on port: %s' % smart_server.port)
4570
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4571
from bzrlib.transport import get_transport
4572
from bzrlib.transport.chroot import ChrootServer
4923
4573
if directory is None:
4924
4574
directory = os.getcwd()
4925
if protocol is None:
4926
protocol = transport.transport_server_registry.get()
4927
host, port = self.get_host_and_port(port)
4928
4575
url = urlutils.local_path_to_url(directory)
4929
4576
if not allow_writes:
4930
4577
url = 'readonly+' + url
4931
t = transport.get_transport(url)
4932
protocol(t, host, port, inet)
4578
chroot_server = ChrootServer(get_transport(url))
4579
chroot_server.setUp()
4580
t = get_transport(chroot_server.get_url())
4581
smart_server = self.get_smart_server(t, inet, port)
4582
self.run_smart_server(smart_server)
4935
4585
class cmd_join(Command):
4936
__doc__ = """Combine a tree into its containing tree.
4586
"""Combine a subtree into its containing tree.
4938
This command requires the target tree to be in a rich-root format.
4588
This command is for experimental use only. It requires the target tree
4589
to be in dirstate-with-subtree format, which cannot be converted into
4940
4592
The TREE argument should be an independent tree, inside another tree, but
4941
4593
not part of it. (Such trees can be produced by "bzr split", but also by
5118
4775
directly from the merge directive, without retrieving data from a
5121
`bzr send` creates a compact data set that, when applied using bzr
5122
merge, has the same effect as merging from the source branch.
5124
By default the merge directive is self-contained and can be applied to any
5125
branch containing submit_branch in its ancestory without needing access to
5128
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5129
revisions, but only a structured request to merge from the
5130
public_location. In that case the public_branch is needed and it must be
5131
up-to-date and accessible to the recipient. The public_branch is always
5132
included if known, so that people can check it later.
5134
The submit branch defaults to the parent of the source branch, but can be
5135
overridden. Both submit branch and public branch will be remembered in
5136
branch.conf the first time they are used for a particular branch. The
5137
source branch defaults to that containing the working directory, but can
5138
be changed using --from.
5140
In order to calculate those changes, bzr must analyse the submit branch.
5141
Therefore it is most efficient for the submit branch to be a local mirror.
5142
If a public location is known for the submit_branch, that location is used
5143
in the merge directive.
5145
The default behaviour is to send the merge directive by mail, unless -o is
5146
given, in which case it is sent to a file.
4778
If --no-bundle is specified, then public_branch is needed (and must be
4779
up-to-date), so that the receiver can perform the merge using the
4780
public_branch. The public_branch is always included if known, so that
4781
people can check it later.
4783
The submit branch defaults to the parent, but can be overridden. Both
4784
submit branch and public branch will be remembered if supplied.
4786
If a public_branch is known for the submit_branch, that public submit
4787
branch is used in the merge instructions. This means that a local mirror
4788
can be used as your actual submit branch, once you have set public_branch
5148
4791
Mail is sent using your preferred mail program. This should be transparent
5149
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4792
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5150
4793
If the preferred client can't be found (or used), your editor will be used.
5152
4795
To use a specific mail program, set the mail_client configuration option.
5153
4796
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5154
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5155
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5156
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4797
specific clients are "claws", "evolution", "kmail", "mutt", and
4798
"thunderbird"; generic options are "default", "editor", "emacsclient",
4799
"mapi", and "xdg-email". Plugins may also add supported clients.
5159
4801
If mail is being sent, a to address is required. This can be supplied
5160
4802
either on the commandline, by setting the submit_to configuration
5194
4832
short_name='f',
5196
4834
Option('output', short_name='o',
5197
help='Write merge directive to this file or directory; '
4835
help='Write merge directive to this file; '
5198
4836
'use - for stdout.',
5201
help='Refuse to send if there are uncommitted changes in'
5202
' the working tree, --no-strict disables the check.'),
5203
4838
Option('mail-to', help='Mail the request to this address.',
5207
4842
Option('body', help='Body for the email.', type=unicode),
5208
RegistryOption('format',
5209
help='Use the specified output format.',
5210
lazy_registry=('bzrlib.send', 'format_registry')),
4843
RegistryOption.from_kwargs('format',
4844
'Use the specified output format.',
4845
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4846
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5213
4849
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5214
4850
no_patch=False, revision=None, remember=False, output=None,
5215
format=None, mail_to=None, message=None, body=None,
5216
strict=None, **kwargs):
5217
from bzrlib.send import send
5218
return send(submit_branch, revision, public_branch, remember,
5219
format, no_bundle, no_patch, output,
5220
kwargs.get('from', '.'), mail_to, message, body,
4851
format='4', mail_to=None, message=None, body=None, **kwargs):
4852
return self._run(submit_branch, revision, public_branch, remember,
4853
format, no_bundle, no_patch, output,
4854
kwargs.get('from', '.'), mail_to, message, body)
4856
def _run(self, submit_branch, revision, public_branch, remember, format,
4857
no_bundle, no_patch, output, from_, mail_to, message, body):
4858
from bzrlib.revision import NULL_REVISION
4859
branch = Branch.open_containing(from_)[0]
4861
outfile = cStringIO.StringIO()
4865
outfile = open(output, 'wb')
4866
# we may need to write data into branch's repository to calculate
4871
config = branch.get_config()
4873
mail_to = config.get_user_option('submit_to')
4874
mail_client = config.get_mail_client()
4875
if (not getattr(mail_client, 'supports_body', False)
4876
and body is not None):
4877
raise errors.BzrCommandError(
4878
'Mail client "%s" does not support specifying body' %
4879
mail_client.__class__.__name__)
4880
if remember and submit_branch is None:
4881
raise errors.BzrCommandError(
4882
'--remember requires a branch to be specified.')
4883
stored_submit_branch = branch.get_submit_branch()
4884
remembered_submit_branch = None
4885
if submit_branch is None:
4886
submit_branch = stored_submit_branch
4887
remembered_submit_branch = "submit"
4889
if stored_submit_branch is None or remember:
4890
branch.set_submit_branch(submit_branch)
4891
if submit_branch is None:
4892
submit_branch = branch.get_parent()
4893
remembered_submit_branch = "parent"
4894
if submit_branch is None:
4895
raise errors.BzrCommandError('No submit branch known or'
4897
if remembered_submit_branch is not None:
4898
note('Using saved %s location "%s" to determine what '
4899
'changes to submit.', remembered_submit_branch,
4903
submit_config = Branch.open(submit_branch).get_config()
4904
mail_to = submit_config.get_user_option("child_submit_to")
4906
stored_public_branch = branch.get_public_branch()
4907
if public_branch is None:
4908
public_branch = stored_public_branch
4909
elif stored_public_branch is None or remember:
4910
branch.set_public_branch(public_branch)
4911
if no_bundle and public_branch is None:
4912
raise errors.BzrCommandError('No public branch specified or'
4914
base_revision_id = None
4916
if revision is not None:
4917
if len(revision) > 2:
4918
raise errors.BzrCommandError('bzr send takes '
4919
'at most two one revision identifiers')
4920
revision_id = revision[-1].as_revision_id(branch)
4921
if len(revision) == 2:
4922
base_revision_id = revision[0].as_revision_id(branch)
4923
if revision_id is None:
4924
revision_id = branch.last_revision()
4925
if revision_id == NULL_REVISION:
4926
raise errors.BzrCommandError('No revisions to submit.')
4928
directive = merge_directive.MergeDirective2.from_objects(
4929
branch.repository, revision_id, time.time(),
4930
osutils.local_time_offset(), submit_branch,
4931
public_branch=public_branch, include_patch=not no_patch,
4932
include_bundle=not no_bundle, message=message,
4933
base_revision_id=base_revision_id)
4934
elif format == '0.9':
4937
patch_type = 'bundle'
4939
raise errors.BzrCommandError('Format 0.9 does not'
4940
' permit bundle with no patch')
4946
directive = merge_directive.MergeDirective.from_objects(
4947
branch.repository, revision_id, time.time(),
4948
osutils.local_time_offset(), submit_branch,
4949
public_branch=public_branch, patch_type=patch_type,
4952
outfile.writelines(directive.to_lines())
4954
subject = '[MERGE] '
4955
if message is not None:
4958
revision = branch.repository.get_revision(revision_id)
4959
subject += revision.get_summary()
4960
basename = directive.get_disk_name(branch)
4961
mail_client.compose_merge_request(mail_to, subject,
5225
4970
class cmd_bundle_revisions(cmd_send):
5226
__doc__ = """Create a merge-directive for submitting changes.
4972
"""Create a merge-directive for submitting changes.
5228
4974
A merge directive provides many things needed for requesting merges:
5286
5030
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5287
5031
no_patch=False, revision=None, remember=False, output=None,
5288
format=None, strict=None, **kwargs):
5032
format='4', **kwargs):
5289
5033
if output is None:
5291
from bzrlib.send import send
5292
return send(submit_branch, revision, public_branch, remember,
5035
return self._run(submit_branch, revision, public_branch, remember,
5293
5036
format, no_bundle, no_patch, output,
5294
kwargs.get('from', '.'), None, None, None,
5295
self.outf, strict=strict)
5037
kwargs.get('from', '.'), None, None, None)
5298
5040
class cmd_tag(Command):
5299
__doc__ = """Create, remove or modify a tag naming a revision.
5041
"""Create, remove or modify a tag naming a revision.
5301
5043
Tags give human-meaningful names to revisions. Commands that take a -r
5302
5044
(--revision) option can be given -rtag:X, where X is any previously
5311
5053
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5312
5054
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5314
If no tag name is specified it will be determined through the
5315
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5316
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5320
5057
_see_also = ['commit', 'tags']
5321
takes_args = ['tag_name?']
5058
takes_args = ['tag_name']
5322
5059
takes_options = [
5323
5060
Option('delete',
5324
5061
help='Delete this tag rather than placing it.',
5326
custom_help('directory',
5327
help='Branch in which to place the tag.'),
5064
help='Branch in which to place the tag.',
5328
5068
Option('force',
5329
5069
help='Replace existing tags.',
5334
def run(self, tag_name=None,
5074
def run(self, tag_name,
5340
5080
branch, relpath = Branch.open_containing(directory)
5341
self.add_cleanup(branch.lock_write().unlock)
5343
if tag_name is None:
5344
raise errors.BzrCommandError("No tag specified to delete.")
5345
branch.tags.delete_tag(tag_name)
5346
self.outf.write('Deleted tag %s.\n' % tag_name)
5349
if len(revision) != 1:
5350
raise errors.BzrCommandError(
5351
"Tags can only be placed on a single revision, "
5353
revision_id = revision[0].as_revision_id(branch)
5084
branch.tags.delete_tag(tag_name)
5085
self.outf.write('Deleted tag %s.\n' % tag_name)
5355
revision_id = branch.last_revision()
5356
if tag_name is None:
5357
tag_name = branch.automatic_tag_name(revision_id)
5358
if tag_name is None:
5359
raise errors.BzrCommandError(
5360
"Please specify a tag name.")
5361
if (not force) and branch.tags.has_tag(tag_name):
5362
raise errors.TagAlreadyExists(tag_name)
5363
branch.tags.set_tag(tag_name, revision_id)
5364
self.outf.write('Created tag %s.\n' % tag_name)
5088
if len(revision) != 1:
5089
raise errors.BzrCommandError(
5090
"Tags can only be placed on a single revision, "
5092
revision_id = revision[0].as_revision_id(branch)
5094
revision_id = branch.last_revision()
5095
if (not force) and branch.tags.has_tag(tag_name):
5096
raise errors.TagAlreadyExists(tag_name)
5097
branch.tags.set_tag(tag_name, revision_id)
5098
self.outf.write('Created tag %s.\n' % tag_name)
5367
5103
class cmd_tags(Command):
5368
__doc__ = """List tags.
5370
5106
This command shows a table of tag names and the revisions they reference.
5373
5109
_see_also = ['tag']
5374
5110
takes_options = [
5375
custom_help('directory',
5376
help='Branch whose tags should be displayed.'),
5112
help='Branch whose tags should be displayed.',
5377
5116
RegistryOption.from_kwargs('sort',
5378
5117
'Sort tags by different criteria.', title='Sorting',
5379
5118
alpha='Sort tags lexicographically (default).',
5419
5161
tags.sort(key=lambda x: timestamps[x[1]])
5420
5162
if not show_ids:
5421
5163
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5422
for index, (tag, revid) in enumerate(tags):
5424
revno = branch.revision_id_to_dotted_revno(revid)
5425
if isinstance(revno, tuple):
5426
revno = '.'.join(map(str, revno))
5427
except errors.NoSuchRevision:
5428
# Bad tag data/merges can lead to tagged revisions
5429
# which are not in this branch. Fail gracefully ...
5431
tags[index] = (tag, revno)
5164
revno_map = branch.get_revision_id_to_revno_map()
5165
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5166
for tag, revid in tags ]
5433
5167
for tag, revspec in tags:
5434
5168
self.outf.write('%-20s %s\n' % (tag, revspec))
5437
5171
class cmd_reconfigure(Command):
5438
__doc__ = """Reconfigure the type of a bzr directory.
5172
"""Reconfigure the type of a bzr directory.
5440
5174
A target configuration must be specified.
5472
5206
Option('bind-to', help='Branch to bind checkout to.', type=str),
5473
5207
Option('force',
5474
help='Perform reconfiguration even if local changes'
5476
Option('stacked-on',
5477
help='Reconfigure a branch to be stacked on another branch.',
5481
help='Reconfigure a branch to be unstacked. This '
5482
'may require copying substantial data into it.',
5208
help='Perform reconfiguration even if local changes'
5486
def run(self, location=None, target_type=None, bind_to=None, force=False,
5212
def run(self, location=None, target_type=None, bind_to=None, force=False):
5489
5213
directory = bzrdir.BzrDir.open(location)
5490
if stacked_on and unstacked:
5491
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5492
elif stacked_on is not None:
5493
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5495
reconfigure.ReconfigureUnstacked().apply(directory)
5496
# At the moment you can use --stacked-on and a different
5497
# reconfiguration shape at the same time; there seems no good reason
5499
5214
if target_type is None:
5500
if stacked_on or unstacked:
5503
raise errors.BzrCommandError('No target configuration '
5215
raise errors.BzrCommandError('No target configuration specified')
5505
5216
elif target_type == 'branch':
5506
5217
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5507
5218
elif target_type == 'tree':
5544
5255
/path/to/newbranch.
5546
5257
Bound branches use the nickname of its master branch unless it is set
5547
locally, in which case switching will update the local nickname to be
5258
locally, in which case switching will update the the local nickname to be
5548
5259
that of the master.
5551
takes_args = ['to_location?']
5552
takes_options = ['directory',
5554
help='Switch even if local commits will be lost.'),
5556
Option('create-branch', short_name='b',
5557
help='Create the target branch from this one before'
5558
' switching to it.'),
5262
takes_args = ['to_location']
5263
takes_options = [Option('force',
5264
help='Switch even if local commits will be lost.')
5561
def run(self, to_location=None, force=False, create_branch=False,
5562
revision=None, directory=u'.'):
5267
def run(self, to_location, force=False):
5563
5268
from bzrlib import switch
5564
tree_location = directory
5565
revision = _get_one_revision('switch', revision)
5566
5270
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5567
if to_location is None:
5568
if revision is None:
5569
raise errors.BzrCommandError('You must supply either a'
5570
' revision or a location')
5571
to_location = tree_location
5271
branch = control_dir.open_branch()
5573
branch = control_dir.open_branch()
5574
had_explicit_nick = branch.get_config().has_explicit_nickname()
5273
to_branch = Branch.open(to_location)
5575
5274
except errors.NotBranchError:
5577
had_explicit_nick = False
5580
raise errors.BzrCommandError('cannot create branch without'
5582
to_location = directory_service.directories.dereference(
5584
if '/' not in to_location and '\\' not in to_location:
5585
# This path is meant to be relative to the existing branch
5586
this_url = self._get_branch_location(control_dir)
5587
to_location = urlutils.join(this_url, '..', to_location)
5588
to_branch = branch.bzrdir.sprout(to_location,
5589
possible_transports=[branch.bzrdir.root_transport],
5590
source_branch=branch).open_branch()
5593
to_branch = Branch.open(to_location)
5594
except errors.NotBranchError:
5595
this_url = self._get_branch_location(control_dir)
5596
to_branch = Branch.open(
5597
urlutils.join(this_url, '..', to_location))
5598
if revision is not None:
5599
revision = revision.as_revision_id(to_branch)
5600
switch.switch(control_dir, to_branch, force, revision_id=revision)
5601
if had_explicit_nick:
5275
this_branch = control_dir.open_branch()
5276
# This may be a heavy checkout, where we want the master branch
5277
this_url = this_branch.get_bound_location()
5278
# If not, use a local sibling
5279
if this_url is None:
5280
this_url = this_branch.base
5281
to_branch = Branch.open(
5282
urlutils.join(this_url, '..', to_location))
5283
switch.switch(control_dir, to_branch, force)
5284
if branch.get_config().has_explicit_nickname():
5602
5285
branch = control_dir.open_branch() #get the new branch!
5603
5286
branch.nick = to_branch.nick
5604
5287
note('Switched to branch: %s',
5605
5288
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5607
def _get_branch_location(self, control_dir):
5608
"""Return location of branch for this control dir."""
5610
this_branch = control_dir.open_branch()
5611
# This may be a heavy checkout, where we want the master branch
5612
master_location = this_branch.get_bound_location()
5613
if master_location is not None:
5614
return master_location
5615
# If not, use a local sibling
5616
return this_branch.base
5617
except errors.NotBranchError:
5618
format = control_dir.find_branch_format()
5619
if getattr(format, 'get_reference', None) is not None:
5620
return format.get_reference(control_dir)
5622
return control_dir.root_transport.base
5625
5291
class cmd_view(Command):
5626
__doc__ = """Manage filtered views.
5292
"""Manage filtered views.
5628
5294
Views provide a mask over the tree so that users can focus on
5629
5295
a subset of a tree when doing their work. After creating a view,
5864
5504
_see_also = ['unshelve']
5866
5506
def run(self, revision=None, all=False, file_list=None, message=None,
5867
writer=None, list=False, destroy=False, directory=u'.'):
5507
writer=None, list=False, destroy=False):
5869
5509
return self.run_for_list()
5870
5510
from bzrlib.shelf_ui import Shelver
5871
5511
if writer is None:
5872
5512
writer = bzrlib.option.diff_writer_registry.get()
5874
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5875
file_list, message, destroy=destroy, directory=directory)
5514
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5515
message, destroy=destroy).run()
5880
5516
except errors.UserAbort:
5883
5519
def run_for_list(self):
5884
5520
tree = WorkingTree.open_containing('.')[0]
5885
self.add_cleanup(tree.lock_read().unlock)
5886
manager = tree.get_shelf_manager()
5887
shelves = manager.active_shelves()
5888
if len(shelves) == 0:
5889
note('No shelved changes.')
5891
for shelf_id in reversed(shelves):
5892
message = manager.get_metadata(shelf_id).get('message')
5894
message = '<no message>'
5895
self.outf.write('%3d: %s\n' % (shelf_id, message))
5523
manager = tree.get_shelf_manager()
5524
shelves = manager.active_shelves()
5525
if len(shelves) == 0:
5526
note('No shelved changes.')
5528
for shelf_id in reversed(shelves):
5529
message = manager.get_metadata(shelf_id).get('message')
5531
message = '<no message>'
5532
self.outf.write('%3d: %s\n' % (shelf_id, message))
5899
5538
class cmd_unshelve(Command):
5900
__doc__ = """Restore shelved changes.
5539
"""Restore shelved changes.
5902
5541
By default, the most recently shelved changes are restored. However if you
5903
5542
specify a shelf by id those changes will be restored instead. This works
5907
5546
takes_args = ['shelf_id?']
5908
5547
takes_options = [
5910
5548
RegistryOption.from_kwargs(
5911
5549
'action', help="The action to perform.",
5912
5550
enum_switch=False, value_switches=True,
5913
5551
apply="Apply changes and remove from the shelf.",
5914
5552
dry_run="Show changes, but do not apply or remove them.",
5915
preview="Instead of unshelving the changes, show the diff that "
5916
"would result from unshelving.",
5917
delete_only="Delete changes without applying them.",
5918
keep="Apply changes but don't delete them.",
5553
delete_only="Delete changes without applying them."
5921
5556
_see_also = ['shelve']
5923
def run(self, shelf_id=None, action='apply', directory=u'.'):
5558
def run(self, shelf_id=None, action='apply'):
5924
5559
from bzrlib.shelf_ui import Unshelver
5925
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5929
unshelver.tree.unlock()
5560
Unshelver.from_args(shelf_id, action).run()
5932
5563
class cmd_clean_tree(Command):
5933
__doc__ = """Remove unwanted files from working tree.
5564
"""Remove unwanted files from working tree.
5935
5566
By default, only unknown files, not ignored files, are deleted. Versioned
5936
5567
files are never deleted.
5954
5584
' deleting them.'),
5955
5585
Option('force', help='Do not prompt before deleting.')]
5956
5586
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5957
force=False, directory=u'.'):
5958
5588
from bzrlib.clean_tree import clean_tree
5959
5589
if not (unknown or ignored or detritus):
5963
clean_tree(directory, unknown=unknown, ignored=ignored,
5964
detritus=detritus, dry_run=dry_run, no_prompt=force)
5967
class cmd_reference(Command):
5968
__doc__ = """list, view and set branch locations for nested trees.
5970
If no arguments are provided, lists the branch locations for nested trees.
5971
If one argument is provided, display the branch location for that tree.
5972
If two arguments are provided, set the branch location for that tree.
5977
takes_args = ['path?', 'location?']
5979
def run(self, path=None, location=None):
5981
if path is not None:
5983
tree, branch, relpath =(
5984
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5985
if path is not None:
5988
tree = branch.basis_tree()
5990
info = branch._get_all_reference_info().iteritems()
5991
self._display_reference_info(tree, branch, info)
5593
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5594
dry_run=dry_run, no_prompt=force)
5597
def _create_prefix(cur_transport):
5598
needed = [cur_transport]
5599
# Recurse upwards until we can create a directory successfully
5601
new_transport = cur_transport.clone('..')
5602
if new_transport.base == cur_transport.base:
5603
raise errors.BzrCommandError(
5604
"Failed to create path prefix for %s."
5605
% cur_transport.base)
5607
new_transport.mkdir('.')
5608
except errors.NoSuchFile:
5609
needed.append(new_transport)
5610
cur_transport = new_transport
5993
file_id = tree.path2id(path)
5995
raise errors.NotVersionedError(path)
5996
if location is None:
5997
info = [(file_id, branch.get_reference_info(file_id))]
5998
self._display_reference_info(tree, branch, info)
6000
branch.set_reference_info(file_id, path, location)
6002
def _display_reference_info(self, tree, branch, info):
6004
for file_id, (path, location) in info:
6006
path = tree.id2path(file_id)
6007
except errors.NoSuchId:
6009
ref_list.append((path, location))
6010
for path, location in sorted(ref_list):
6011
self.outf.write('%s %s\n' % (path, location))
6014
def _register_lazy_builtins():
6015
# register lazy builtins from other modules; called at startup and should
6016
# be only called once.
6017
for (name, aliases, module_name) in [
6018
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6019
('cmd_dpush', [], 'bzrlib.foreign'),
6020
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6021
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6022
('cmd_conflicts', [], 'bzrlib.conflicts'),
6023
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6025
builtin_command_registry.register_lazy(name, aliases, module_name)
5613
# Now we only need to create child directories
5615
cur_transport = needed.pop()
5616
cur_transport.ensure_base()
5619
# these get imported and then picked up by the scan for cmd_*
5620
# TODO: Some more consistent way to split command definitions across files;
5621
# we do need to load at least some information about them to know of
5622
# aliases. ideally we would avoid loading the implementation until the
5623
# details were needed.
5624
from bzrlib.cmd_version_info import cmd_version_info
5625
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5626
from bzrlib.bundle.commands import (
5629
from bzrlib.sign_my_commits import cmd_sign_my_commits
5630
from bzrlib.weave_commands import cmd_versionedfile_list, \
5631
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
