350
322
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
323
takes_options = ['revision']
352
324
# cat-revision is more for frontends so should be exact
353
325
encoding = 'strict'
355
def print_revision(self, revisions, revid):
356
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
357
record = stream.next()
358
if record.storage_kind == 'absent':
359
raise errors.NoSuchRevision(revisions, revid)
360
revtext = record.get_bytes_as('fulltext')
361
self.outf.write(revtext.decode('utf-8'))
364
def run(self, revision_id=None, revision=None, directory=u'.'):
328
def run(self, revision_id=None, revision=None):
365
329
if revision_id is not None and revision is not None:
366
330
raise errors.BzrCommandError('You can only supply one of'
367
331
' revision_id or --revision')
368
332
if revision_id is None and revision is None:
369
333
raise errors.BzrCommandError('You must supply either'
370
334
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
373
revisions = b.repository.revisions
374
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
378
b.repository.lock_read()
380
# TODO: jam 20060112 should cat-revision always output utf-8?
381
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
384
self.print_revision(revisions, revision_id)
385
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
389
elif revision is not None:
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
394
rev_id = rev.as_revision_id(b)
395
self.print_revision(revisions, rev_id)
397
b.repository.unlock()
335
b = WorkingTree.open_containing(u'.')[0].branch
337
# TODO: jam 20060112 should cat-revision always output utf-8?
338
if revision_id is not None:
339
revision_id = osutils.safe_revision_id(revision_id, warn=False)
341
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
342
except errors.NoSuchRevision:
343
msg = "The repository %s contains no revision %s." % (b.repository.base,
345
raise errors.BzrCommandError(msg)
346
elif revision is not None:
349
raise errors.BzrCommandError('You cannot specify a NULL'
351
rev_id = rev.as_revision_id(b)
352
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
400
355
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
403
358
PATH is a btree index file, it can be any URL. This includes things like
404
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
487
435
To re-create the working tree, use "bzr checkout".
489
437
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
438
takes_args = ['location?']
491
439
takes_options = [
493
441
help='Remove the working tree even if it has '
494
442
'uncommitted changes.'),
497
def run(self, location_list, force=False):
498
if not location_list:
501
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
505
working = d.open_workingtree()
506
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
508
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
512
if (working.has_changes()):
513
raise errors.UncommittedChanges(working)
515
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
519
d.destroy_workingtree()
445
def run(self, location='.', force=False):
446
d = bzrdir.BzrDir.open(location)
449
working = d.open_workingtree()
450
except errors.NoWorkingTree:
451
raise errors.BzrCommandError("No working tree to remove")
452
except errors.NotLocalUrl:
453
raise errors.BzrCommandError("You cannot remove the working tree of a "
456
changes = working.changes_from(working.basis_tree())
457
if changes.has_changed():
458
raise errors.UncommittedChanges(working)
460
working_path = working.bzrdir.root_transport.base
461
branch_path = working.branch.bzrdir.root_transport.base
462
if working_path != branch_path:
463
raise errors.BzrCommandError("You cannot remove the working tree from "
464
"a lightweight checkout")
466
d.destroy_workingtree()
522
469
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
470
"""Show current revision number.
525
472
This is equal to the number of revisions on this branch.
528
475
_see_also = ['info']
529
476
takes_args = ['location?']
531
Option('tree', help='Show revno of working tree'),
535
def run(self, tree=False, location=u'.'):
538
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
540
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
raise errors.NoWorkingTree(location)
542
revid = wt.last_revision()
544
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
545
except errors.NoSuchRevision:
547
revno = ".".join(str(n) for n in revno_t)
549
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
553
self.outf.write(str(revno) + '\n')
479
def run(self, location=u'.'):
480
self.outf.write(str(Branch.open_containing(location)[0].revno()))
481
self.outf.write('\n')
556
484
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
560
488
takes_args = ['revision_info*']
561
489
takes_options = [
563
custom_help('directory',
564
492
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
566
Option('tree', help='Show revno of working tree'),
493
'rather than the one containing the working directory.',
570
def run(self, revision=None, directory=u'.', tree=False,
571
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
574
wt = WorkingTree.open_containing(directory)[0]
576
self.add_cleanup(wt.lock_read().unlock)
577
except (errors.NoWorkingTree, errors.NotLocalUrl):
579
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
582
503
if revision is not None:
583
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
584
505
if revision_info_list is not None:
585
for rev_str in revision_info_list:
586
rev_spec = RevisionSpec.from_string(rev_str)
587
revision_ids.append(rev_spec.as_revision_id(b))
588
# No arguments supplied, default to the last revision
589
if len(revision_ids) == 0:
592
raise errors.NoWorkingTree(directory)
593
revision_ids.append(wt.last_revision())
595
revision_ids.append(b.last_revision())
599
for revision_id in revision_ids:
506
for rev in revision_info_list:
507
revs.append(RevisionSpec.from_string(rev))
509
b = Branch.open_containing(directory)[0]
512
revs.append(RevisionSpec.from_string('-1'))
515
revision_id = rev.as_revision_id(b)
601
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
602
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
603
518
except errors.NoSuchRevision:
605
maxlen = max(maxlen, len(revno))
606
revinfos.append([revno, revision_id])
610
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
519
dotted_map = b.get_revision_id_to_revno_map()
520
revno = '.'.join(str(i) for i in dotted_map[revision_id])
521
print '%s %s' % (revno, revision_id)
613
524
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
616
527
In non-recursive mode, all the named items are added, regardless
617
528
of whether they were previously ignored. A warning is given if
682
590
should_print=(not is_quiet()))
685
self.add_cleanup(base_tree.lock_read().unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
593
base_tree.lock_read()
595
file_list = self._maybe_expand_globs(file_list)
596
tree, file_list = tree_files_for_add(file_list)
597
added, ignored = tree.smart_add(file_list, not
598
no_recurse, action=action, save=not dry_run)
600
if base_tree is not None:
690
602
if len(ignored) > 0:
692
604
for glob in sorted(ignored.keys()):
693
605
for path in ignored[glob]:
694
606
self.outf.write("ignored %s matching \"%s\"\n"
610
for glob, paths in ignored.items():
611
match_len += len(paths)
612
self.outf.write("ignored %d file(s).\n" % match_len)
613
self.outf.write("If you wish to add some of these files,"
614
" please add them by name.\n")
698
617
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
618
"""Create a new versioned directory.
701
620
This is equivalent to creating the directory and then adding it.
761
675
revision = _get_one_revision('inventory', revision)
762
676
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
764
if revision is not None:
765
tree = revision.as_tree(work_tree.branch)
767
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
773
if file_list is not None:
774
file_ids = tree.paths2ids(file_list, trees=extra_trees,
775
require_versioned=True)
776
# find_ids_across_trees may include some paths that don't
778
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
779
for file_id in file_ids if file_id in tree)
781
entries = tree.inventory.entries()
677
work_tree.lock_read()
679
if revision is not None:
680
tree = revision.as_tree(work_tree.branch)
682
extra_trees = [work_tree]
688
if file_list is not None:
689
file_ids = tree.paths2ids(file_list, trees=extra_trees,
690
require_versioned=True)
691
# find_ids_across_trees may include some paths that don't
693
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
694
for file_id in file_ids if file_id in tree)
696
entries = tree.inventory.entries()
699
if tree is not work_tree:
784
702
for path, entry in entries:
785
703
if kind and kind != entry.kind:
922
845
dest = osutils.pathjoin(dest_parent, dest_tail)
923
846
mutter("attempting to move %s => %s", src, dest)
924
847
tree.rename_one(src, dest, after=after)
926
self.outf.write("%s => %s\n" % (src, dest))
848
self.outf.write("%s => %s\n" % (src, dest))
929
851
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
852
"""Turn this branch into a mirror of another branch.
932
By default, this command only works on branches that have not diverged.
933
Branches are considered diverged if the destination branch's most recent
934
commit is one that has not been merged (directly or indirectly) into the
854
This command only works on branches that have not diverged. Branches are
855
considered diverged if the destination branch's most recent commit is one
856
that has not been merged (directly or indirectly) into the parent.
937
858
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
859
from one into the other. Once one branch has merged, the other should
939
860
be able to pull it again.
941
If you want to replace your local changes and just want your branch to
942
match the remote one, use pull --overwrite. This will work even if the two
943
branches have diverged.
862
If you want to forget your local changes and just update your branch to
863
match the remote one, use pull --overwrite.
945
865
If there is no default location set, the first pull will set it. After
946
866
that, you can omit the location to use the default. To change the
1028
948
if revision is not None:
1029
949
revision_id = revision.as_revision_id(branch_from)
1031
if tree_to is not None:
1032
view_info = _get_view_info_for_change_reporter(tree_to)
1033
change_reporter = delta._ChangeReporter(
1034
unversioned_filter=tree_to.is_ignored,
1035
view_info=view_info)
1036
result = tree_to.pull(
1037
branch_from, overwrite, revision_id, change_reporter,
1038
possible_transports=possible_transports, local=local)
1040
result = branch_to.pull(
1041
branch_from, overwrite, revision_id, local=local)
951
branch_to.lock_write()
953
if tree_to is not None:
954
view_info = _get_view_info_for_change_reporter(tree_to)
955
change_reporter = delta._ChangeReporter(
956
unversioned_filter=tree_to.is_ignored, view_info=view_info)
957
result = tree_to.pull(branch_from, overwrite, revision_id,
959
possible_transports=possible_transports,
962
result = branch_to.pull(branch_from, overwrite, revision_id,
1043
result.report(self.outf)
1044
if verbose and result.old_revid != result.new_revid:
1045
log.show_branch_change(
1046
branch_to, self.outf, result.old_revno,
965
result.report(self.outf)
966
if verbose and result.old_revid != result.new_revid:
967
log.show_branch_change(branch_to, self.outf, result.old_revno,
1050
973
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
974
"""Update a mirror of this branch.
1053
976
The target branch will not have its working tree populated because this
1054
977
is both expensive, and is not supported on remote file systems.
1104
1027
def run(self, location=None, remember=False, overwrite=False,
1105
1028
create_prefix=False, verbose=False, revision=None,
1106
1029
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1108
1031
from bzrlib.push import _show_push_branch
1033
# Get the source branch and revision_id
1110
1034
if directory is None:
1111
1035
directory = '.'
1112
# Get the source branch
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1115
# Get the tip's revision_id
1036
br_from = Branch.open_containing(directory)[0]
1116
1037
revision = _get_one_revision('push', revision)
1117
1038
if revision is not None:
1118
1039
revision_id = revision.in_history(br_from).rev_id
1120
1041
revision_id = None
1121
if tree is not None and revision_id is None:
1122
tree.check_changed_or_out_of_date(
1123
strict, 'push_strict',
1124
more_error='Use --no-strict to force the push.',
1125
more_warning='Uncommitted changes will not be pushed.')
1126
1043
# Get the stacked_on branch, if any
1127
1044
if stacked_on is not None:
1128
1045
stacked_on = urlutils.normalize_url(stacked_on)
1179
1096
help='Hard-link working tree files where possible.'),
1180
1097
Option('no-tree',
1181
1098
help="Create a branch without a working-tree."),
1183
help="Switch the checkout in the current directory "
1184
"to the new branch."),
1185
1099
Option('stacked',
1186
1100
help='Create a stacked branch referring to the source branch. '
1187
1101
'The new branch will depend on the availability of the source '
1188
1102
'branch for all operations.'),
1189
1103
Option('standalone',
1190
1104
help='Do not use a shared repository, even if available.'),
1191
Option('use-existing-dir',
1192
help='By default branch will fail if the target'
1193
' directory exists, but does not already'
1194
' have a control directory. This flag will'
1195
' allow branch to proceed.'),
1197
help="Bind new branch to from location."),
1199
1106
aliases = ['get', 'clone']
1201
1108
def run(self, from_location, to_location=None, revision=None,
1202
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1204
from bzrlib import switch as _mod_switch
1109
hardlink=False, stacked=False, standalone=False, no_tree=False):
1205
1110
from bzrlib.tag import _merge_tags_if_possible
1206
1112
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1114
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1221
to_transport.mkdir('.')
1222
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1117
if revision is not None:
1118
revision_id = revision.as_revision_id(br_from)
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1262
# Bind to the parent
1263
parent_branch = Branch.open(from_location)
1264
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1267
# Switch to the new branch
1268
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1271
urlutils.unescape_for_display(branch.base, 'utf-8'))
1120
# FIXME - wt.last_revision, fallback to branch, fall back to
1121
# None or perhaps NULL_REVISION to mean copy nothing
1123
revision_id = br_from.last_revision()
1124
if to_location is None:
1125
to_location = urlutils.derive_to_location(from_location)
1126
to_transport = transport.get_transport(to_location)
1128
to_transport.mkdir('.')
1129
except errors.FileExists:
1130
raise errors.BzrCommandError('Target directory "%s" already'
1131
' exists.' % to_location)
1132
except errors.NoSuchFile:
1133
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1136
# preserve whatever source format we have.
1137
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1138
possible_transports=[to_transport],
1139
accelerator_tree=accelerator_tree,
1140
hardlink=hardlink, stacked=stacked,
1141
force_new_repo=standalone,
1142
create_tree_if_local=not no_tree,
1143
source_branch=br_from)
1144
branch = dir.open_branch()
1145
except errors.NoSuchRevision:
1146
to_transport.delete_tree('.')
1147
msg = "The branch %s has no revision %s." % (from_location,
1149
raise errors.BzrCommandError(msg)
1150
_merge_tags_if_possible(br_from, branch)
1151
# If the source branch is stacked, the new branch may
1152
# be stacked whether we asked for that explicitly or not.
1153
# We therefore need a try/except here and not just 'if stacked:'
1155
note('Created new stacked branch referring to %s.' %
1156
branch.get_stacked_on_url())
1157
except (errors.NotStacked, errors.UnstackableBranchFormat,
1158
errors.UnstackableRepositoryFormat), e:
1159
note('Branched %d revision(s).' % branch.revno())
1274
1164
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1165
"""Create a new checkout of an existing branch.
1277
1167
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1168
the branch found in '.'. This is useful if you have removed the working tree
1352
1242
@display_command
1353
1243
def run(self, dir=u'.'):
1354
1244
tree = WorkingTree.open_containing(dir)[0]
1355
self.add_cleanup(tree.lock_read().unlock)
1356
new_inv = tree.inventory
1357
old_tree = tree.basis_tree()
1358
self.add_cleanup(old_tree.lock_read().unlock)
1359
old_inv = old_tree.inventory
1361
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1362
for f, paths, c, v, p, n, k, e in iterator:
1363
if paths[0] == paths[1]:
1367
renames.append(paths)
1369
for old_name, new_name in renames:
1370
self.outf.write("%s => %s\n" % (old_name, new_name))
1247
new_inv = tree.inventory
1248
old_tree = tree.basis_tree()
1249
old_tree.lock_read()
1251
old_inv = old_tree.inventory
1253
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1254
for f, paths, c, v, p, n, k, e in iterator:
1255
if paths[0] == paths[1]:
1259
renames.append(paths)
1261
for old_name, new_name in renames:
1262
self.outf.write("%s => %s\n" % (old_name, new_name))
1373
1269
class cmd_update(Command):
1374
__doc__ = """Update a tree to have the latest code committed to its branch.
1270
"""Update a tree to have the latest code committed to its branch.
1376
1272
This will perform a merge into the working tree, and may generate
1377
1273
conflicts. If you have any local changes, you will still
1380
1276
If you want to discard your local changes, you can just do a
1381
1277
'bzr revert' instead of 'bzr commit' after the update.
1383
If the tree's branch is bound to a master branch, it will also update
1384
the branch from the master.
1387
1280
_see_also = ['pull', 'working-trees', 'status-flags']
1388
1281
takes_args = ['dir?']
1389
takes_options = ['revision']
1390
1282
aliases = ['up']
1392
def run(self, dir='.', revision=None):
1393
if revision is not None and len(revision) != 1:
1394
raise errors.BzrCommandError(
1395
"bzr update --revision takes exactly one revision")
1284
def run(self, dir='.'):
1396
1285
tree = WorkingTree.open_containing(dir)[0]
1397
branch = tree.branch
1398
1286
possible_transports = []
1399
master = branch.get_master_branch(
1287
master = tree.branch.get_master_branch(
1400
1288
possible_transports=possible_transports)
1401
1289
if master is not None:
1402
branch_location = master.base
1403
1290
tree.lock_write()
1405
branch_location = tree.branch.base
1406
1292
tree.lock_tree_write()
1407
self.add_cleanup(tree.unlock)
1408
# get rid of the final '/' and be ready for display
1409
branch_location = urlutils.unescape_for_display(
1410
branch_location.rstrip('/'),
1412
existing_pending_merges = tree.get_parent_ids()[1:]
1416
# may need to fetch data into a heavyweight checkout
1417
# XXX: this may take some time, maybe we should display a
1419
old_tip = branch.update(possible_transports)
1420
if revision is not None:
1421
revision_id = revision[0].as_revision_id(branch)
1423
revision_id = branch.last_revision()
1424
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1425
revno = branch.revision_id_to_dotted_revno(revision_id)
1426
note("Tree is up to date at revision %s of branch %s" %
1427
('.'.join(map(str, revno)), branch_location))
1429
view_info = _get_view_info_for_change_reporter(tree)
1430
change_reporter = delta._ChangeReporter(
1431
unversioned_filter=tree.is_ignored,
1432
view_info=view_info)
1294
existing_pending_merges = tree.get_parent_ids()[1:]
1295
last_rev = _mod_revision.ensure_null(tree.last_revision())
1296
if last_rev == _mod_revision.ensure_null(
1297
tree.branch.last_revision()):
1298
# may be up to date, check master too.
1299
if master is None or last_rev == _mod_revision.ensure_null(
1300
master.last_revision()):
1301
revno = tree.branch.revision_id_to_revno(last_rev)
1302
note("Tree is up to date at revision %d." % (revno,))
1304
view_info = _get_view_info_for_change_reporter(tree)
1434
1305
conflicts = tree.update(
1436
possible_transports=possible_transports,
1437
revision=revision_id,
1439
except errors.NoSuchRevision, e:
1440
raise errors.BzrCommandError(
1441
"branch has no revision %s\n"
1442
"bzr update --revision only works"
1443
" for a revision in the branch history"
1445
revno = tree.branch.revision_id_to_dotted_revno(
1446
_mod_revision.ensure_null(tree.last_revision()))
1447
note('Updated to revision %s of branch %s' %
1448
('.'.join(map(str, revno)), branch_location))
1449
parent_ids = tree.get_parent_ids()
1450
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1451
note('Your local commits will now show as pending merges with '
1452
"'bzr status', and can be committed with 'bzr commit'.")
1306
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1307
view_info=view_info), possible_transports=possible_transports)
1308
revno = tree.branch.revision_id_to_revno(
1309
_mod_revision.ensure_null(tree.last_revision()))
1310
note('Updated to revision %d.' % (revno,))
1311
if tree.get_parent_ids()[1:] != existing_pending_merges:
1312
note('Your local commits will now show as pending merges with '
1313
"'bzr status', and can be committed with 'bzr commit'.")
1459
1322
class cmd_info(Command):
1460
__doc__ = """Show information about a working tree, branch or repository.
1323
"""Show information about a working tree, branch or repository.
1462
1325
This command will show all known locations and formats associated to the
1463
1326
tree, branch or repository.
1529
1392
if file_list is not None:
1530
1393
file_list = [f for f in file_list]
1532
self.add_cleanup(tree.lock_write().unlock)
1533
# Heuristics should probably all move into tree.remove_smart or
1536
added = tree.changes_from(tree.basis_tree(),
1537
specific_files=file_list).added
1538
file_list = sorted([f[0] for f in added], reverse=True)
1539
if len(file_list) == 0:
1540
raise errors.BzrCommandError('No matching files.')
1541
elif file_list is None:
1542
# missing files show up in iter_changes(basis) as
1543
# versioned-with-no-kind.
1545
for change in tree.iter_changes(tree.basis_tree()):
1546
# Find paths in the working tree that have no kind:
1547
if change[1][1] is not None and change[6][1] is None:
1548
missing.append(change[1][1])
1549
file_list = sorted(missing, reverse=True)
1550
file_deletion_strategy = 'keep'
1551
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1552
keep_files=file_deletion_strategy=='keep',
1553
force=file_deletion_strategy=='force')
1397
# Heuristics should probably all move into tree.remove_smart or
1400
added = tree.changes_from(tree.basis_tree(),
1401
specific_files=file_list).added
1402
file_list = sorted([f[0] for f in added], reverse=True)
1403
if len(file_list) == 0:
1404
raise errors.BzrCommandError('No matching files.')
1405
elif file_list is None:
1406
# missing files show up in iter_changes(basis) as
1407
# versioned-with-no-kind.
1409
for change in tree.iter_changes(tree.basis_tree()):
1410
# Find paths in the working tree that have no kind:
1411
if change[1][1] is not None and change[6][1] is None:
1412
missing.append(change[1][1])
1413
file_list = sorted(missing, reverse=True)
1414
file_deletion_strategy = 'keep'
1415
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1416
keep_files=file_deletion_strategy=='keep',
1417
force=file_deletion_strategy=='force')
1556
1422
class cmd_file_id(Command):
1557
__doc__ = """Print file_id of a particular file or directory.
1423
"""Print file_id of a particular file or directory.
1559
1425
The file_id is assigned when the file is first added and remains the
1560
1426
same through all revisions where the file exists, even when it is
1960
1801
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1961
1802
' one or two revision specifiers')
1963
if using is not None and format is not None:
1964
raise errors.BzrCommandError('--using and --format are mutually '
1967
(old_tree, new_tree,
1968
old_branch, new_branch,
1969
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1970
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1804
old_tree, new_tree, specific_files, extra_trees = \
1805
_get_trees_to_diff(file_list, revision, old, new,
1971
1807
return show_diff_trees(old_tree, new_tree, sys.stdout,
1972
1808
specific_files=specific_files,
1973
1809
external_diff_options=diff_options,
1974
1810
old_label=old_label, new_label=new_label,
1975
extra_trees=extra_trees, using=using,
1811
extra_trees=extra_trees, using=using)
1979
1814
class cmd_deleted(Command):
1980
__doc__ = """List files deleted in the working tree.
1815
"""List files deleted in the working tree.
1982
1817
# TODO: Show files deleted since a previous revision, or
1983
1818
# between two revisions.
1986
1821
# level of effort but possibly much less IO. (Or possibly not,
1987
1822
# if the directories are very large...)
1988
1823
_see_also = ['status', 'ls']
1989
takes_options = ['directory', 'show-ids']
1824
takes_options = ['show-ids']
1991
1826
@display_command
1992
def run(self, show_ids=False, directory=u'.'):
1993
tree = WorkingTree.open_containing(directory)[0]
1994
self.add_cleanup(tree.lock_read().unlock)
1995
old = tree.basis_tree()
1996
self.add_cleanup(old.lock_read().unlock)
1997
for path, ie in old.inventory.iter_entries():
1998
if not tree.has_id(ie.file_id):
1999
self.outf.write(path)
2001
self.outf.write(' ')
2002
self.outf.write(ie.file_id)
2003
self.outf.write('\n')
1827
def run(self, show_ids=False):
1828
tree = WorkingTree.open_containing(u'.')[0]
1831
old = tree.basis_tree()
1834
for path, ie in old.inventory.iter_entries():
1835
if not tree.has_id(ie.file_id):
1836
self.outf.write(path)
1838
self.outf.write(' ')
1839
self.outf.write(ie.file_id)
1840
self.outf.write('\n')
2006
1847
class cmd_modified(Command):
2007
__doc__ = """List files modified in working tree.
1848
"""List files modified in working tree.
2011
1852
_see_also = ['status', 'ls']
2012
takes_options = ['directory', 'null']
1855
help='Write an ascii NUL (\\0) separator '
1856
'between files rather than a newline.')
2014
1859
@display_command
2015
def run(self, null=False, directory=u'.'):
2016
tree = WorkingTree.open_containing(directory)[0]
1860
def run(self, null=False):
1861
tree = WorkingTree.open_containing(u'.')[0]
2017
1862
td = tree.changes_from(tree.basis_tree())
2018
1863
for path, id, kind, text_modified, meta_modified in td.modified:
2025
1870
class cmd_added(Command):
2026
__doc__ = """List files added in working tree.
1871
"""List files added in working tree.
2030
1875
_see_also = ['status', 'ls']
2031
takes_options = ['directory', 'null']
1878
help='Write an ascii NUL (\\0) separator '
1879
'between files rather than a newline.')
2033
1882
@display_command
2034
def run(self, null=False, directory=u'.'):
2035
wt = WorkingTree.open_containing(directory)[0]
2036
self.add_cleanup(wt.lock_read().unlock)
2037
basis = wt.basis_tree()
2038
self.add_cleanup(basis.lock_read().unlock)
2039
basis_inv = basis.inventory
2042
if file_id in basis_inv:
2044
if inv.is_root(file_id) and len(basis_inv) == 0:
2046
path = inv.id2path(file_id)
2047
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2050
self.outf.write(path + '\0')
2052
self.outf.write(osutils.quotefn(path) + '\n')
1883
def run(self, null=False):
1884
wt = WorkingTree.open_containing(u'.')[0]
1887
basis = wt.basis_tree()
1890
basis_inv = basis.inventory
1893
if file_id in basis_inv:
1895
if inv.is_root(file_id) and len(basis_inv) == 0:
1897
path = inv.id2path(file_id)
1898
if not os.access(osutils.abspath(path), os.F_OK):
1901
self.outf.write(path + '\0')
1903
self.outf.write(osutils.quotefn(path) + '\n')
2055
1910
class cmd_root(Command):
2056
__doc__ = """Show the tree root directory.
1911
"""Show the tree root directory.
2058
1913
The root is the nearest enclosing directory with a .bzr control
2370
2211
diff_type = 'full'
2372
# Build the log formatter
2373
if log_format is None:
2374
log_format = log.log_formatter_registry.get_default(b)
2375
# Make a non-encoding output to include the diffs - bug 328007
2376
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2377
lf = log_format(show_ids=show_ids, to_file=self.outf,
2378
to_exact_file=unencoded_output,
2379
show_timezone=timezone,
2380
delta_format=get_verbosity_level(),
2382
show_advice=levels is None,
2383
author_list_handler=authors)
2385
# Choose the algorithm for doing the logging. It's annoying
2386
# having multiple code paths like this but necessary until
2387
# the underlying repository format is faster at generating
2388
# deltas or can provide everything we need from the indices.
2389
# The default algorithm - match-using-deltas - works for
2390
# multiple files and directories and is faster for small
2391
# amounts of history (200 revisions say). However, it's too
2392
# slow for logging a single file in a repository with deep
2393
# history, i.e. > 10K revisions. In the spirit of "do no
2394
# evil when adding features", we continue to use the
2395
# original algorithm - per-file-graph - for the "single
2396
# file that isn't a directory without showing a delta" case.
2397
partial_history = revision and b.repository._format.supports_chks
2398
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2399
or delta_type or partial_history)
2401
# Build the LogRequest and execute it
2402
if len(file_ids) == 0:
2404
rqst = make_log_request_dict(
2405
direction=direction, specific_fileids=file_ids,
2406
start_revision=rev1, end_revision=rev2, limit=limit,
2407
message_search=message, delta_type=delta_type,
2408
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2409
exclude_common_ancestry=exclude_common_ancestry,
2411
Logger(b, rqst).show(lf)
2215
# Build the log formatter
2216
if log_format is None:
2217
log_format = log.log_formatter_registry.get_default(b)
2218
lf = log_format(show_ids=show_ids, to_file=self.outf,
2219
show_timezone=timezone,
2220
delta_format=get_verbosity_level(),
2222
show_advice=levels is None)
2224
# Choose the algorithm for doing the logging. It's annoying
2225
# having multiple code paths like this but necessary until
2226
# the underlying repository format is faster at generating
2227
# deltas or can provide everything we need from the indices.
2228
# The default algorithm - match-using-deltas - works for
2229
# multiple files and directories and is faster for small
2230
# amounts of history (200 revisions say). However, it's too
2231
# slow for logging a single file in a repository with deep
2232
# history, i.e. > 10K revisions. In the spirit of "do no
2233
# evil when adding features", we continue to use the
2234
# original algorithm - per-file-graph - for the "single
2235
# file that isn't a directory without showing a delta" case.
2236
partial_history = revision and b.repository._format.supports_chks
2237
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2238
or delta_type or partial_history)
2240
# Build the LogRequest and execute it
2241
if len(file_ids) == 0:
2243
rqst = make_log_request_dict(
2244
direction=direction, specific_fileids=file_ids,
2245
start_revision=rev1, end_revision=rev2, limit=limit,
2246
message_search=message, delta_type=delta_type,
2247
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2248
Logger(b, rqst).show(lf)
2414
2253
def _get_revision_range(revisionspec_list, branch, command_name):
2503
2336
help='Recurse into subdirectories.'),
2504
2337
Option('from-root',
2505
2338
help='Print paths relative to the root of the branch.'),
2506
Option('unknown', short_name='u',
2507
help='Print unknown files.'),
2339
Option('unknown', help='Print unknown files.'),
2508
2340
Option('versioned', help='Print versioned files.',
2509
2341
short_name='V'),
2510
Option('ignored', short_name='i',
2511
help='Print ignored files.'),
2512
Option('kind', short_name='k',
2342
Option('ignored', help='Print ignored files.'),
2344
help='Write an ascii NUL (\\0) separator '
2345
'between files rather than a newline.'),
2513
2347
help='List entries of a particular kind: file, directory, symlink.',
2519
2351
@display_command
2520
2352
def run(self, revision=None, verbose=False,
2521
2353
recursive=False, from_root=False,
2522
2354
unknown=False, versioned=False, ignored=False,
2523
null=False, kind=None, show_ids=False, path=None, directory=None):
2355
null=False, kind=None, show_ids=False, path=None):
2525
2357
if kind and kind not in ('file', 'directory', 'symlink'):
2526
2358
raise errors.BzrCommandError('invalid kind specified')
2560
2389
view_str = views.view_display_str(view_files)
2561
2390
note("Ignoring files outside view. View is %s" % view_str)
2563
self.add_cleanup(tree.lock_read().unlock)
2564
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2565
from_dir=relpath, recursive=recursive):
2566
# Apply additional masking
2567
if not all and not selection[fc]:
2569
if kind is not None and fkind != kind:
2574
fullpath = osutils.pathjoin(relpath, fp)
2577
views.check_path_in_view(tree, fullpath)
2578
except errors.FileOutsideView:
2583
fp = osutils.pathjoin(prefix, fp)
2584
kindch = entry.kind_character()
2585
outstring = fp + kindch
2586
ui.ui_factory.clear_term()
2588
outstring = '%-8s %s' % (fc, outstring)
2589
if show_ids and fid is not None:
2590
outstring = "%-50s %s" % (outstring, fid)
2591
self.outf.write(outstring + '\n')
2593
self.outf.write(fp + '\0')
2596
self.outf.write(fid)
2597
self.outf.write('\0')
2605
self.outf.write('%-50s %s\n' % (outstring, my_id))
2607
self.outf.write(outstring + '\n')
2394
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2395
if fp.startswith(relpath):
2396
rp = fp[len(relpath):]
2397
fp = osutils.pathjoin(prefix, rp)
2398
if not recursive and '/' in rp:
2400
if not all and not selection[fc]:
2402
if kind is not None and fkind != kind:
2406
views.check_path_in_view(tree, fp)
2407
except errors.FileOutsideView:
2409
kindch = entry.kind_character()
2410
outstring = fp + kindch
2412
outstring = '%-8s %s' % (fc, outstring)
2413
if show_ids and fid is not None:
2414
outstring = "%-50s %s" % (outstring, fid)
2415
self.outf.write(outstring + '\n')
2417
self.outf.write(fp + '\0')
2420
self.outf.write(fid)
2421
self.outf.write('\0')
2429
self.outf.write('%-50s %s\n' % (outstring, my_id))
2431
self.outf.write(outstring + '\n')
2610
2436
class cmd_unknowns(Command):
2611
__doc__ = """List unknown files.
2437
"""List unknown files.
2615
2441
_see_also = ['ls']
2616
takes_options = ['directory']
2618
2443
@display_command
2619
def run(self, directory=u'.'):
2620
for f in WorkingTree.open_containing(directory)[0].unknowns():
2445
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2621
2446
self.outf.write(osutils.quotefn(f) + '\n')
2624
2449
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2450
"""Ignore specified files or patterns.
2627
2452
See ``bzr help patterns`` for details on the syntax of patterns.
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2635
2454
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2455
After adding, editing or deleting that file either indirectly by
2637
2456
using this command or directly by using an editor, be sure to commit
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2653
2459
Note: ignore patterns containing shell wildcards must be quoted from
2654
2460
the shell on Unix.
2677
2479
Ignore everything but the "debian" toplevel directory::
2679
2481
bzr ignore "RE:(?!debian/).*"
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2685
bzr ignore "!./local"
2689
2484
_see_also = ['status', 'ignored', 'patterns']
2690
2485
takes_args = ['name_pattern*']
2691
takes_options = ['directory',
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2487
Option('old-default-rules',
2488
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None,
2491
def run(self, name_pattern_list=None, old_default_rules=None):
2698
2492
from bzrlib import ignores
2699
if default_rules is not None:
2700
# dump the default rules and exit
2701
for pattern in ignores.USER_DEFAULTS:
2702
self.outf.write("%s\n" % pattern)
2493
if old_default_rules is not None:
2494
# dump the rules and exit
2495
for pattern in ignores.OLD_DEFAULTS:
2704
2498
if not name_pattern_list:
2705
2499
raise errors.BzrCommandError("ignore requires at least one "
2706
"NAME_PATTERN or --default-rules.")
2500
"NAME_PATTERN or --old-default-rules")
2707
2501
name_pattern_list = [globbing.normalize_pattern(p)
2708
2502
for p in name_pattern_list]
2709
2503
for name_pattern in name_pattern_list:
2744
2538
encoding_type = 'replace'
2745
2539
_see_also = ['ignore', 'ls']
2746
takes_options = ['directory']
2748
2541
@display_command
2749
def run(self, directory=u'.'):
2750
tree = WorkingTree.open_containing(directory)[0]
2751
self.add_cleanup(tree.lock_read().unlock)
2752
for path, file_class, kind, file_id, entry in tree.list_files():
2753
if file_class != 'I':
2755
## XXX: Slightly inefficient since this was already calculated
2756
pat = tree.is_ignored(path)
2757
self.outf.write('%-50s %s\n' % (path, pat))
2543
tree = WorkingTree.open_containing(u'.')[0]
2546
for path, file_class, kind, file_id, entry in tree.list_files():
2547
if file_class != 'I':
2549
## XXX: Slightly inefficient since this was already calculated
2550
pat = tree.is_ignored(path)
2551
self.outf.write('%-50s %s\n' % (path, pat))
2760
2556
class cmd_lookup_revision(Command):
2761
__doc__ = """Lookup the revision-id from a revision-number
2557
"""Lookup the revision-id from a revision-number
2764
2560
bzr lookup-revision 33
2767
2563
takes_args = ['revno']
2768
takes_options = ['directory']
2770
2565
@display_command
2771
def run(self, revno, directory=u'.'):
2566
def run(self, revno):
2773
2568
revno = int(revno)
2774
2569
except ValueError:
2775
raise errors.BzrCommandError("not a valid revision-number: %r"
2777
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2778
self.outf.write("%s\n" % revid)
2570
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2572
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2781
2575
class cmd_export(Command):
2782
__doc__ = """Export current or past revision to a destination directory or archive.
2576
"""Export current or past revision to a destination directory or archive.
2784
2578
If no revision is specified this exports the last committed revision.
2863
2653
@display_command
2864
2654
def run(self, filename, revision=None, name_from_revision=False,
2865
filters=False, directory=None):
2866
2656
if revision is not None and len(revision) != 1:
2867
2657
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2868
2658
" one revision specifier")
2869
2659
tree, branch, relpath = \
2870
_open_directory_or_containing_tree_or_branch(filename, directory)
2871
self.add_cleanup(branch.lock_read().unlock)
2872
return self._run(tree, branch, relpath, filename, revision,
2873
name_from_revision, filters)
2660
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2663
return self._run(tree, branch, relpath, filename, revision,
2664
name_from_revision, filters)
2875
2668
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2877
2670
if tree is None:
2878
2671
tree = b.basis_tree()
2879
2672
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2880
self.add_cleanup(rev_tree.lock_read().unlock)
2882
2674
old_file_id = rev_tree.path2id(relpath)
2918
2710
chunks = content.splitlines(True)
2919
2711
content = filtered_output_bytes(chunks, filters,
2920
2712
ContentFilterContext(relpath, rev_tree))
2922
2713
self.outf.writelines(content)
2925
2715
self.outf.write(content)
2928
2718
class cmd_local_time_offset(Command):
2929
__doc__ = """Show the offset in seconds from GMT to local time."""
2719
"""Show the offset in seconds from GMT to local time."""
2931
2721
@display_command
2933
self.outf.write("%s\n" % osutils.local_time_offset())
2723
print osutils.local_time_offset()
2937
2727
class cmd_commit(Command):
2938
__doc__ = """Commit changes into a new revision.
2940
An explanatory message needs to be given for each commit. This is
2941
often done by using the --message option (getting the message from the
2942
command line) or by using the --file option (getting the message from
2943
a file). If neither of these options is given, an editor is opened for
2944
the user to enter the message. To see the changed files in the
2945
boilerplate text loaded into the editor, use the --show-diff option.
2947
By default, the entire tree is committed and the person doing the
2948
commit is assumed to be the author. These defaults can be overridden
2953
If selected files are specified, only changes to those files are
2954
committed. If a directory is specified then the directory and
2955
everything within it is committed.
2957
When excludes are given, they take precedence over selected files.
2958
For example, to commit only changes within foo, but not changes
2961
bzr commit foo -x foo/bar
2963
A selective commit after a merge is not yet supported.
2967
If the author of the change is not the same person as the committer,
2968
you can specify the author's name using the --author option. The
2969
name should be in the same format as a committer-id, e.g.
2970
"John Doe <jdoe@example.com>". If there is more than one author of
2971
the change you can specify the option multiple times, once for each
2976
A common mistake is to forget to add a new file or directory before
2977
running the commit command. The --strict option checks for unknown
2978
files and aborts the commit if any are found. More advanced pre-commit
2979
checks can be implemented by defining hooks. See ``bzr help hooks``
2984
If you accidentially commit the wrong changes or make a spelling
2985
mistake in the commit message say, you can use the uncommit command
2986
to undo it. See ``bzr help uncommit`` for details.
2988
Hooks can also be configured to run after a commit. This allows you
2989
to trigger updates to external systems like bug trackers. The --fixes
2990
option can be used to record the association between a revision and
2991
one or more bugs. See ``bzr help bugs`` for details.
2993
A selective commit may fail in some cases where the committed
2994
tree would be invalid. Consider::
2999
bzr commit foo -m "committing foo"
3000
bzr mv foo/bar foo/baz
3003
bzr commit foo/bar -m "committing bar but not baz"
3005
In the example above, the last commit will fail by design. This gives
3006
the user the opportunity to decide whether they want to commit the
3007
rename at the same time, separately first, or not at all. (As a general
3008
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2728
"""Commit changes into a new revision.
2730
If no arguments are given, the entire tree is committed.
2732
If selected files are specified, only changes to those files are
2733
committed. If a directory is specified then the directory and everything
2734
within it is committed.
2736
When excludes are given, they take precedence over selected files.
2737
For example, too commit only changes within foo, but not changes within
2740
bzr commit foo -x foo/bar
2742
If author of the change is not the same person as the committer, you can
2743
specify the author's name using the --author option. The name should be
2744
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2745
If there is more than one author of the change you can specify the option
2746
multiple times, once for each author.
2748
A selected-file commit may fail in some cases where the committed
2749
tree would be invalid. Consider::
2754
bzr commit foo -m "committing foo"
2755
bzr mv foo/bar foo/baz
2758
bzr commit foo/bar -m "committing bar but not baz"
2760
In the example above, the last commit will fail by design. This gives
2761
the user the opportunity to decide whether they want to commit the
2762
rename at the same time, separately first, or not at all. (As a general
2763
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2765
Note: A selected-file commit after a merge is not yet supported.
3010
2767
# TODO: Run hooks on tree to-be-committed, and after commit.
3121
2867
if local and not tree.branch.get_bound_location():
3122
2868
raise errors.LocalRequiresBoundBranch()
3124
if message is not None:
3126
file_exists = osutils.lexists(message)
3127
except UnicodeError:
3128
# The commit message contains unicode characters that can't be
3129
# represented in the filesystem encoding, so that can't be a
3134
'The commit message is a file name: "%(f)s".\n'
3135
'(use --file "%(f)s" to take commit message from that file)'
3137
ui.ui_factory.show_warning(warning_msg)
3139
message = message.replace('\r\n', '\n')
3140
message = message.replace('\r', '\n')
3142
raise errors.BzrCommandError(
3143
"please specify either --message or --file")
3145
2870
def get_message(commit_obj):
3146
2871
"""Callback to get commit message"""
3148
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3150
my_message = f.read()
3153
elif message is not None:
3154
my_message = message
3156
# No message supplied: make one up.
3157
# text is the status of the tree
3158
text = make_commit_message_template_encoded(tree,
2872
my_message = message
2873
if my_message is None and not file:
2874
t = make_commit_message_template_encoded(tree,
3159
2875
selected_list, diff=show_diff,
3160
2876
output_encoding=osutils.get_user_encoding())
3161
# start_message is the template generated from hooks
3162
# XXX: Warning - looks like hooks return unicode,
3163
# make_commit_message_template_encoded returns user encoding.
3164
# We probably want to be using edit_commit_message instead to
3166
2877
start_message = generate_commit_message_template(commit_obj)
3167
my_message = edit_commit_message_encoded(text,
2878
my_message = edit_commit_message_encoded(t,
3168
2879
start_message=start_message)
3169
2880
if my_message is None:
3170
2881
raise errors.BzrCommandError("please specify a commit"
3171
2882
" message with either --message or --file")
2883
elif my_message and file:
2884
raise errors.BzrCommandError(
2885
"please specify either --message or --file")
2887
my_message = codecs.open(file, 'rt',
2888
osutils.get_user_encoding()).read()
3172
2889
if my_message == "":
3173
2890
raise errors.BzrCommandError("empty commit message specified")
3174
2891
return my_message
3176
# The API permits a commit with a filter of [] to mean 'select nothing'
3177
# but the command line should not do that.
3178
if not selected_list:
3179
selected_list = None
3181
2894
tree.commit(message_callback=get_message,
3182
2895
specific_files=selected_list,
3183
2896
allow_pointless=unchanged, strict=strict, local=local,
3184
2897
reporter=None, verbose=verbose, revprops=properties,
3185
authors=author, timestamp=commit_stamp,
3187
2899
exclude=safe_relpath_files(tree, exclude))
3188
2900
except PointlessCommit:
3189
raise errors.BzrCommandError("No changes to commit."
3190
" Use --unchanged to commit anyhow.")
2901
# FIXME: This should really happen before the file is read in;
2902
# perhaps prepare the commit; get the message; then actually commit
2903
raise errors.BzrCommandError("no changes to commit."
2904
" use --unchanged to commit anyhow")
3191
2905
except ConflictsInTree:
3192
2906
raise errors.BzrCommandError('Conflicts detected in working '
3193
2907
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3212
2925
The working tree and branch checks will only give output if a problem is
3213
2926
detected. The output fields of the repository check are:
3216
This is just the number of revisions checked. It doesn't
3220
This is just the number of versionedfiles checked. It
3221
doesn't indicate a problem.
3223
unreferenced ancestors
3224
Texts that are ancestors of other texts, but
3225
are not properly referenced by the revision ancestry. This is a
3226
subtle problem that Bazaar can work around.
3229
This is the total number of unique file contents
3230
seen in the checked revisions. It does not indicate a problem.
3233
This is the total number of repeated texts seen
3234
in the checked revisions. Texts can be repeated when their file
3235
entries are modified, but the file contents are not. It does not
2928
revisions: This is just the number of revisions checked. It doesn't
2930
versionedfiles: This is just the number of versionedfiles checked. It
2931
doesn't indicate a problem.
2932
unreferenced ancestors: Texts that are ancestors of other texts, but
2933
are not properly referenced by the revision ancestry. This is a
2934
subtle problem that Bazaar can work around.
2935
unique file texts: This is the total number of unique file contents
2936
seen in the checked revisions. It does not indicate a problem.
2937
repeated file texts: This is the total number of repeated texts seen
2938
in the checked revisions. Texts can be repeated when their file
2939
entries are modified, but the file contents are not. It does not
3238
2942
If no restrictions are specified, all Bazaar data that is found at the given
3239
2943
location will be checked.
3608
3297
verbose = not is_quiet()
3609
3298
# TODO: should possibly lock the history file...
3610
3299
benchfile = open(".perf_history", "at", buffering=1)
3611
self.add_cleanup(benchfile.close)
3613
3301
test_suite_factory = None
3614
3302
benchfile = None
3615
selftest_kwargs = {"verbose": verbose,
3617
"stop_on_failure": one,
3618
"transport": transport,
3619
"test_suite_factory": test_suite_factory,
3620
"lsprof_timed": lsprof_timed,
3621
"lsprof_tests": lsprof_tests,
3622
"bench_history": benchfile,
3623
"matching_tests_first": first,
3624
"list_only": list_only,
3625
"random_seed": randomize,
3626
"exclude_pattern": exclude,
3628
"load_list": load_list,
3629
"debug_flags": debugflag,
3630
"starting_with": starting_with
3632
selftest_kwargs.update(self.additional_selftest_args)
3633
result = selftest(**selftest_kwargs)
3304
selftest_kwargs = {"verbose": verbose,
3306
"stop_on_failure": one,
3307
"transport": transport,
3308
"test_suite_factory": test_suite_factory,
3309
"lsprof_timed": lsprof_timed,
3310
"bench_history": benchfile,
3311
"matching_tests_first": first,
3312
"list_only": list_only,
3313
"random_seed": randomize,
3314
"exclude_pattern": exclude,
3316
"load_list": load_list,
3317
"debug_flags": debugflag,
3318
"starting_with": starting_with
3320
selftest_kwargs.update(self.additional_selftest_args)
3321
result = selftest(**selftest_kwargs)
3323
if benchfile is not None:
3634
3325
return int(not result)
3637
3328
class cmd_version(Command):
3638
__doc__ = """Show version of bzr."""
3329
"""Show version of bzr."""
3640
3331
encoding_type = 'replace'
3641
3332
takes_options = [
3801
3482
verified = 'inapplicable'
3802
3483
tree = WorkingTree.open_containing(directory)[0]
3485
# die as quickly as possible if there are uncommitted changes
3805
3487
basis_tree = tree.revision_tree(tree.last_revision())
3806
3488
except errors.NoSuchRevision:
3807
3489
basis_tree = tree.basis_tree()
3809
# die as quickly as possible if there are uncommitted changes
3811
if tree.has_changes():
3491
changes = tree.changes_from(basis_tree)
3492
if changes.has_changed():
3812
3493
raise errors.UncommittedChanges(tree)
3814
3495
view_info = _get_view_info_for_change_reporter(tree)
3815
3496
change_reporter = delta._ChangeReporter(
3816
3497
unversioned_filter=tree.is_ignored, view_info=view_info)
3817
pb = ui.ui_factory.nested_progress_bar()
3818
self.add_cleanup(pb.finished)
3819
self.add_cleanup(tree.lock_write().unlock)
3820
if location is not None:
3822
mergeable = bundle.read_mergeable_from_url(location,
3823
possible_transports=possible_transports)
3824
except errors.NotABundle:
3500
pb = ui.ui_factory.nested_progress_bar()
3501
cleanups.append(pb.finished)
3503
cleanups.append(tree.unlock)
3504
if location is not None:
3506
mergeable = bundle.read_mergeable_from_url(location,
3507
possible_transports=possible_transports)
3508
except errors.NotABundle:
3512
raise errors.BzrCommandError('Cannot use --uncommitted'
3513
' with bundles or merge directives.')
3515
if revision is not None:
3516
raise errors.BzrCommandError(
3517
'Cannot use -r with merge directives or bundles')
3518
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3521
if merger is None and uncommitted:
3522
if revision is not None and len(revision) > 0:
3523
raise errors.BzrCommandError('Cannot use --uncommitted and'
3524
' --revision at the same time.')
3525
location = self._select_branch_location(tree, location)[0]
3526
other_tree, other_path = WorkingTree.open_containing(location)
3527
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3529
allow_pending = False
3530
if other_path != '':
3531
merger.interesting_files = [other_path]
3534
merger, allow_pending = self._get_merger_from_branch(tree,
3535
location, revision, remember, possible_transports, pb)
3537
merger.merge_type = merge_type
3538
merger.reprocess = reprocess
3539
merger.show_base = show_base
3540
self.sanity_check_merger(merger)
3541
if (merger.base_rev_id == merger.other_rev_id and
3542
merger.other_rev_id is not None):
3543
note('Nothing to do.')
3546
if merger.interesting_files is not None:
3547
raise errors.BzrCommandError('Cannot pull individual files')
3548
if (merger.base_rev_id == tree.last_revision()):
3549
result = tree.pull(merger.other_branch, False,
3550
merger.other_rev_id)
3551
result.report(self.outf)
3553
merger.check_basis(False)
3555
return self._do_preview(merger)
3828
raise errors.BzrCommandError('Cannot use --uncommitted'
3829
' with bundles or merge directives.')
3831
if revision is not None:
3832
raise errors.BzrCommandError(
3833
'Cannot use -r with merge directives or bundles')
3834
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3837
if merger is None and uncommitted:
3838
if revision is not None and len(revision) > 0:
3839
raise errors.BzrCommandError('Cannot use --uncommitted and'
3840
' --revision at the same time.')
3841
merger = self.get_merger_from_uncommitted(tree, location, None)
3842
allow_pending = False
3845
merger, allow_pending = self._get_merger_from_branch(tree,
3846
location, revision, remember, possible_transports, None)
3848
merger.merge_type = merge_type
3849
merger.reprocess = reprocess
3850
merger.show_base = show_base
3851
self.sanity_check_merger(merger)
3852
if (merger.base_rev_id == merger.other_rev_id and
3853
merger.other_rev_id is not None):
3854
note('Nothing to do.')
3857
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
3859
if (merger.base_rev_id == tree.last_revision()):
3860
result = tree.pull(merger.other_branch, False,
3861
merger.other_rev_id)
3862
result.report(self.outf)
3864
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
3866
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
3869
return self._do_preview(merger)
3871
return self._do_interactive(merger)
3873
return self._do_merge(merger, change_reporter, allow_pending,
3876
def _get_preview(self, merger):
3557
return self._do_merge(merger, change_reporter, allow_pending,
3560
for cleanup in reversed(cleanups):
3563
def _do_preview(self, merger):
3564
from bzrlib.diff import show_diff_trees
3877
3565
tree_merger = merger.make_merger()
3878
3566
tt = tree_merger.make_preview_transform()
3879
self.add_cleanup(tt.finalize)
3880
result_tree = tt.get_preview_tree()
3883
def _do_preview(self, merger):
3884
from bzrlib.diff import show_diff_trees
3885
result_tree = self._get_preview(merger)
3886
show_diff_trees(merger.this_tree, result_tree, self.outf,
3887
old_label='', new_label='')
3568
result_tree = tt.get_preview_tree()
3569
show_diff_trees(merger.this_tree, result_tree, self.outf,
3570
old_label='', new_label='')
3889
3574
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3890
3575
merger.change_reporter = change_reporter
4075
3728
def run(self, file_list=None, merge_type=None, show_base=False,
4076
3729
reprocess=False):
4077
from bzrlib.conflicts import restore
4078
3730
if merge_type is None:
4079
3731
merge_type = _mod_merge.Merge3Merger
4080
3732
tree, file_list = tree_files(file_list)
4081
self.add_cleanup(tree.lock_write().unlock)
4082
parents = tree.get_parent_ids()
4083
if len(parents) != 2:
4084
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4085
" merges. Not cherrypicking or"
4087
repository = tree.branch.repository
4088
interesting_ids = None
4090
conflicts = tree.conflicts()
4091
if file_list is not None:
4092
interesting_ids = set()
4093
for filename in file_list:
4094
file_id = tree.path2id(filename)
4096
raise errors.NotVersionedError(filename)
4097
interesting_ids.add(file_id)
4098
if tree.kind(file_id) != "directory":
3735
parents = tree.get_parent_ids()
3736
if len(parents) != 2:
3737
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3738
" merges. Not cherrypicking or"
3740
repository = tree.branch.repository
3741
interesting_ids = None
3743
conflicts = tree.conflicts()
3744
if file_list is not None:
3745
interesting_ids = set()
3746
for filename in file_list:
3747
file_id = tree.path2id(filename)
3749
raise errors.NotVersionedError(filename)
3750
interesting_ids.add(file_id)
3751
if tree.kind(file_id) != "directory":
4101
for name, ie in tree.inventory.iter_entries(file_id):
4102
interesting_ids.add(ie.file_id)
4103
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4105
# Remerge only supports resolving contents conflicts
4106
allowed_conflicts = ('text conflict', 'contents conflict')
4107
restore_files = [c.path for c in conflicts
4108
if c.typestring in allowed_conflicts]
4109
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4110
tree.set_conflicts(ConflictList(new_conflicts))
4111
if file_list is not None:
4112
restore_files = file_list
4113
for filename in restore_files:
3754
for name, ie in tree.inventory.iter_entries(file_id):
3755
interesting_ids.add(ie.file_id)
3756
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3758
# Remerge only supports resolving contents conflicts
3759
allowed_conflicts = ('text conflict', 'contents conflict')
3760
restore_files = [c.path for c in conflicts
3761
if c.typestring in allowed_conflicts]
3762
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3763
tree.set_conflicts(ConflictList(new_conflicts))
3764
if file_list is not None:
3765
restore_files = file_list
3766
for filename in restore_files:
3768
restore(tree.abspath(filename))
3769
except errors.NotConflicted:
3771
# Disable pending merges, because the file texts we are remerging
3772
# have not had those merges performed. If we use the wrong parents
3773
# list, we imply that the working tree text has seen and rejected
3774
# all the changes from the other tree, when in fact those changes
3775
# have not yet been seen.
3776
pb = ui.ui_factory.nested_progress_bar()
3777
tree.set_parent_ids(parents[:1])
4115
restore(tree.abspath(filename))
4116
except errors.NotConflicted:
4118
# Disable pending merges, because the file texts we are remerging
4119
# have not had those merges performed. If we use the wrong parents
4120
# list, we imply that the working tree text has seen and rejected
4121
# all the changes from the other tree, when in fact those changes
4122
# have not yet been seen.
4123
tree.set_parent_ids(parents[:1])
4125
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4126
merger.interesting_ids = interesting_ids
4127
merger.merge_type = merge_type
4128
merger.show_base = show_base
4129
merger.reprocess = reprocess
4130
conflicts = merger.do_merge()
3779
merger = _mod_merge.Merger.from_revision_ids(pb,
3781
merger.interesting_ids = interesting_ids
3782
merger.merge_type = merge_type
3783
merger.show_base = show_base
3784
merger.reprocess = reprocess
3785
conflicts = merger.do_merge()
3787
tree.set_parent_ids(parents)
4132
tree.set_parent_ids(parents)
4133
3791
if conflicts > 0:
4157
3815
name. If you name a directory, all the contents of that directory will be
4160
If you have newly added files since the target revision, they will be
4161
removed. If the files to be removed have been changed, backups will be
4162
created as above. Directories containing unknown files will not be
3818
Any files that have been newly added since that revision will be deleted,
3819
with a backup kept if appropriate. Directories containing unknown files
3820
will not be deleted.
4165
The working tree contains a list of revisions that have been merged but
4166
not yet committed. These revisions will be included as additional parents
4167
of the next commit. Normally, using revert clears that list as well as
4168
reverting the files. If any files are specified, revert leaves the list
4169
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4170
.`` in the tree root to revert all files but keep the recorded merges,
4171
and ``bzr revert --forget-merges`` to clear the pending merge list without
3822
The working tree contains a list of pending merged revisions, which will
3823
be included as parents in the next commit. Normally, revert clears that
3824
list as well as reverting the files. If any files are specified, revert
3825
leaves the pending merge list alone and reverts only the files. Use "bzr
3826
revert ." in the tree root to revert all files but keep the merge record,
3827
and "bzr revert --forget-merges" to clear the pending merge list without
4172
3828
reverting any files.
4174
Using "bzr revert --forget-merges", it is possible to apply all of the
4175
changes from a branch in a single revision. To do this, perform the merge
4176
as desired. Then doing revert with the "--forget-merges" option will keep
4177
the content of the tree as it was, but it will clear the list of pending
4178
merges. The next commit will then contain all of the changes that are
4179
present in the other branch, but without any other parent revisions.
4180
Because this technique forgets where these changes originated, it may
4181
cause additional conflicts on later merges involving the same source and
4185
3831
_see_also = ['cat', 'export']
4194
3840
def run(self, revision=None, no_backup=False, file_list=None,
4195
3841
forget_merges=None):
4196
3842
tree, file_list = tree_files(file_list)
4197
self.add_cleanup(tree.lock_tree_write().unlock)
4199
tree.set_parent_ids(tree.get_parent_ids()[:1])
4201
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3846
tree.set_parent_ids(tree.get_parent_ids()[:1])
3848
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4204
3853
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4205
3854
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4206
tree.revert(file_list, rev_tree, not no_backup, None,
4207
report_changes=True)
3855
pb = ui.ui_factory.nested_progress_bar()
3857
tree.revert(file_list, rev_tree, not no_backup, pb,
3858
report_changes=True)
4210
3863
class cmd_assert_fail(Command):
4211
__doc__ = """Test reporting of assertion failures"""
3864
"""Test reporting of assertion failures"""
4212
3865
# intended just for use in testing
4363
4008
_get_revision_range(revision,
4364
4009
remote_branch, self.name()))
4366
local_extra, remote_extra = find_unmerged(
4367
local_branch, remote_branch, restrict,
4368
backward=not reverse,
4369
include_merges=include_merges,
4370
local_revid_range=local_revid_range,
4371
remote_revid_range=remote_revid_range)
4373
if log_format is None:
4374
registry = log.log_formatter_registry
4375
log_format = registry.get_default(local_branch)
4376
lf = log_format(to_file=self.outf,
4378
show_timezone='original')
4381
if local_extra and not theirs_only:
4382
message("You have %d extra revision(s):\n" %
4384
for revision in iter_log_revisions(local_extra,
4385
local_branch.repository,
4387
lf.log_revision(revision)
4388
printed_local = True
4391
printed_local = False
4393
if remote_extra and not mine_only:
4394
if printed_local is True:
4396
message("You are missing %d revision(s):\n" %
4398
for revision in iter_log_revisions(remote_extra,
4399
remote_branch.repository,
4401
lf.log_revision(revision)
4404
if mine_only and not local_extra:
4405
# We checked local, and found nothing extra
4406
message('This branch is up to date.\n')
4407
elif theirs_only and not remote_extra:
4408
# We checked remote, and found nothing extra
4409
message('Other branch is up to date.\n')
4410
elif not (mine_only or theirs_only or local_extra or
4412
# We checked both branches, and neither one had extra
4414
message("Branches are up to date.\n")
4011
local_branch.lock_read()
4013
remote_branch.lock_read()
4015
local_extra, remote_extra = find_unmerged(
4016
local_branch, remote_branch, restrict,
4017
backward=not reverse,
4018
include_merges=include_merges,
4019
local_revid_range=local_revid_range,
4020
remote_revid_range=remote_revid_range)
4022
if log_format is None:
4023
registry = log.log_formatter_registry
4024
log_format = registry.get_default(local_branch)
4025
lf = log_format(to_file=self.outf,
4027
show_timezone='original')
4030
if local_extra and not theirs_only:
4031
message("You have %d extra revision(s):\n" %
4033
for revision in iter_log_revisions(local_extra,
4034
local_branch.repository,
4036
lf.log_revision(revision)
4037
printed_local = True
4040
printed_local = False
4042
if remote_extra and not mine_only:
4043
if printed_local is True:
4045
message("You are missing %d revision(s):\n" %
4047
for revision in iter_log_revisions(remote_extra,
4048
remote_branch.repository,
4050
lf.log_revision(revision)
4053
if mine_only and not local_extra:
4054
# We checked local, and found nothing extra
4055
message('This branch is up to date.\n')
4056
elif theirs_only and not remote_extra:
4057
# We checked remote, and found nothing extra
4058
message('Other branch is up to date.\n')
4059
elif not (mine_only or theirs_only or local_extra or
4061
# We checked both branches, and neither one had extra
4063
message("Branches are up to date.\n")
4065
remote_branch.unlock()
4067
local_branch.unlock()
4416
4068
if not status_code and parent is None and other_branch is not None:
4417
self.add_cleanup(local_branch.lock_write().unlock)
4418
# handle race conditions - a parent might be set while we run.
4419
if local_branch.get_parent() is None:
4420
local_branch.set_parent(remote_branch.base)
4069
local_branch.lock_write()
4071
# handle race conditions - a parent might be set while we run.
4072
if local_branch.get_parent() is None:
4073
local_branch.set_parent(remote_branch.base)
4075
local_branch.unlock()
4421
4076
return status_code
4424
4079
class cmd_pack(Command):
4425
__doc__ = """Compress the data within a repository.
4427
This operation compresses the data within a bazaar repository. As
4428
bazaar supports automatic packing of repository, this operation is
4429
normally not required to be done manually.
4431
During the pack operation, bazaar takes a backup of existing repository
4432
data, i.e. pack files. This backup is eventually removed by bazaar
4433
automatically when it is safe to do so. To save disk space by removing
4434
the backed up pack files, the --clean-obsolete-packs option may be
4437
Warning: If you use --clean-obsolete-packs and your machine crashes
4438
during or immediately after repacking, you may be left with a state
4439
where the deletion has been written to disk but the new packs have not
4440
been. In this case the repository may be unusable.
4080
"""Compress the data within a repository."""
4443
4082
_see_also = ['repositories']
4444
4083
takes_args = ['branch_or_repo?']
4446
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4449
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4085
def run(self, branch_or_repo='.'):
4450
4086
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4452
4088
branch = dir.open_branch()
4453
4089
repository = branch.repository
4454
4090
except errors.NotBranchError:
4455
4091
repository = dir.open_repository()
4456
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4459
4095
class cmd_plugins(Command):
4460
__doc__ = """List the installed plugins.
4096
"""List the installed plugins.
4462
4098
This command displays the list of installed plugins including
4463
4099
version of plugin and a short description of each.
4550
4189
Option('long', help='Show commit date in annotations.'),
4555
4193
encoding_type = 'exact'
4557
4195
@display_command
4558
4196
def run(self, filename, all=False, long=False, revision=None,
4559
show_ids=False, directory=None):
4560
4198
from bzrlib.annotate import annotate_file, annotate_file_tree
4561
4199
wt, branch, relpath = \
4562
_open_directory_or_containing_tree_or_branch(filename, directory)
4564
self.add_cleanup(wt.lock_read().unlock)
4566
self.add_cleanup(branch.lock_read().unlock)
4567
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4568
self.add_cleanup(tree.lock_read().unlock)
4570
file_id = wt.path2id(relpath)
4572
file_id = tree.path2id(relpath)
4574
raise errors.NotVersionedError(filename)
4575
file_version = tree.inventory[file_id].revision
4576
if wt is not None and revision is None:
4577
# If there is a tree and we're not annotating historical
4578
# versions, annotate the working tree's content.
4579
annotate_file_tree(wt, file_id, self.outf, long, all,
4582
annotate_file(branch, file_version, file_id, long, all, self.outf,
4200
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4206
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4208
file_id = wt.path2id(relpath)
4210
file_id = tree.path2id(relpath)
4212
raise errors.NotVersionedError(filename)
4213
file_version = tree.inventory[file_id].revision
4214
if wt is not None and revision is None:
4215
# If there is a tree and we're not annotating historical
4216
# versions, annotate the working tree's content.
4217
annotate_file_tree(wt, file_id, self.outf, long, all,
4220
annotate_file(branch, file_version, file_id, long, all, self.outf,
4586
4229
class cmd_re_sign(Command):
4587
__doc__ = """Create a digital signature for an existing revision."""
4230
"""Create a digital signature for an existing revision."""
4588
4231
# TODO be able to replace existing ones.
4590
4233
hidden = True # is this right ?
4591
4234
takes_args = ['revision_id*']
4592
takes_options = ['directory', 'revision']
4235
takes_options = ['revision']
4594
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4237
def run(self, revision_id_list=None, revision=None):
4595
4238
if revision_id_list is not None and revision is not None:
4596
4239
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4597
4240
if revision_id_list is None and revision is None:
4598
4241
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4599
b = WorkingTree.open_containing(directory)[0].branch
4600
self.add_cleanup(b.lock_write().unlock)
4601
return self._run(b, revision_id_list, revision)
4242
b = WorkingTree.open_containing(u'.')[0].branch
4245
return self._run(b, revision_id_list, revision)
4603
4249
def _run(self, b, revision_id_list, revision):
4604
4250
import bzrlib.gpg as gpg
4794
4443
end_revision=last_revno)
4797
self.outf.write('Dry-run, pretending to remove'
4798
' the above revisions.\n')
4446
print 'Dry-run, pretending to remove the above revisions.'
4448
val = raw_input('Press <enter> to continue')
4800
self.outf.write('The above revision(s) will be removed.\n')
4803
if not ui.ui_factory.get_boolean('Are you sure'):
4804
self.outf.write('Canceled')
4450
print 'The above revision(s) will be removed.'
4452
val = raw_input('Are you sure [y/N]? ')
4453
if val.lower() not in ('y', 'yes'):
4807
4457
mutter('Uncommitting from {%s} to {%s}',
4808
4458
last_rev_id, rev_id)
4809
4459
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4810
4460
revno=revno, local=local)
4811
self.outf.write('You can restore the old tip by running:\n'
4812
' bzr pull . -r revid:%s\n' % last_rev_id)
4461
note('You can restore the old tip by running:\n'
4462
' bzr pull . -r revid:%s', last_rev_id)
4815
4465
class cmd_break_lock(Command):
4816
__doc__ = """Break a dead lock on a repository, branch or working directory.
4466
"""Break a dead lock on a repository, branch or working directory.
4818
4468
CAUTION: Locks should only be broken when you are sure that the process
4819
4469
holding the lock has been stopped.
4821
You can get information on what locks are open via the 'bzr info
4822
[location]' command.
4471
You can get information on what locks are open via the 'bzr info' command.
4826
bzr break-lock bzr+ssh://example.com/bzr/foo
4828
4476
takes_args = ['location?']
4854
4502
class cmd_serve(Command):
4855
__doc__ = """Run the bzr server."""
4503
"""Run the bzr server."""
4857
4505
aliases = ['server']
4859
4507
takes_options = [
4861
4509
help='Serve on stdin/out for use from inetd or sshd.'),
4862
RegistryOption('protocol',
4863
help="Protocol to serve.",
4864
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4865
value_switches=True),
4867
4511
help='Listen for connections on nominated port of the form '
4868
4512
'[hostname:]portnumber. Passing 0 as the port number will '
4869
'result in a dynamically allocated port. The default port '
4870
'depends on the protocol.',
4513
'result in a dynamically allocated port. The default port is '
4872
custom_help('directory',
4873
help='Serve contents of this directory.'),
4517
help='Serve contents of this directory.',
4874
4519
Option('allow-writes',
4875
4520
help='By default the server is a readonly server. Supplying '
4876
4521
'--allow-writes enables write access to the contents of '
4877
'the served directory and below. Note that ``bzr serve`` '
4878
'does not perform authentication, so unless some form of '
4879
'external authentication is arranged supplying this '
4880
'option leads to global uncontrolled write access to your '
4522
'the served directory and below.'
4526
def run_smart_server(self, smart_server):
4527
"""Run 'smart_server' forever, with no UI output at all."""
4528
# For the duration of this server, no UI output is permitted. note
4529
# that this may cause problems with blackbox tests. This should be
4530
# changed with care though, as we dont want to use bandwidth sending
4531
# progress over stderr to smart server clients!
4532
from bzrlib import lockdir
4533
old_factory = ui.ui_factory
4534
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4536
ui.ui_factory = ui.SilentUIFactory()
4537
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4538
smart_server.serve()
4540
ui.ui_factory = old_factory
4541
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4885
4543
def get_host_and_port(self, port):
4886
4544
"""Return the host and port to run the smart server on.
4888
If 'port' is None, None will be returned for the host and port.
4546
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4547
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4890
4549
If 'port' has a colon in it, the string before the colon will be
4891
4550
interpreted as the host.
4894
4553
:return: A tuple of (host, port), where 'host' is a host name or IP,
4895
4554
and port is an integer TCP/IP port.
4898
if port is not None:
4556
from bzrlib.smart import medium
4557
host = medium.BZR_DEFAULT_INTERFACE
4559
port = medium.BZR_DEFAULT_PORT
4899
4561
if ':' in port:
4900
4562
host, port = port.split(':')
4901
4563
port = int(port)
4902
4564
return host, port
4904
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4906
from bzrlib.transport import get_transport, transport_server_registry
4566
def get_smart_server(self, transport, inet, port):
4567
"""Construct a smart server.
4569
:param transport: The base transport from which branches will be
4571
:param inet: If True, serve over stdin and stdout. Used for running
4573
:param port: The port to listen on. By default, it's `
4574
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4576
:return: A smart server.
4578
from bzrlib.smart import medium, server
4580
smart_server = medium.SmartServerPipeStreamMedium(
4581
sys.stdin, sys.stdout, transport)
4583
host, port = self.get_host_and_port(port)
4584
smart_server = server.SmartTCPServer(
4585
transport, host=host, port=port)
4586
note('listening on port: %s' % smart_server.port)
4589
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4590
from bzrlib.transport import get_transport
4591
from bzrlib.transport.chroot import ChrootServer
4907
4592
if directory is None:
4908
4593
directory = os.getcwd()
4909
if protocol is None:
4910
protocol = transport_server_registry.get()
4911
host, port = self.get_host_and_port(port)
4912
4594
url = urlutils.local_path_to_url(directory)
4913
4595
if not allow_writes:
4914
4596
url = 'readonly+' + url
4915
transport = get_transport(url)
4916
protocol(transport, host, port, inet)
4597
chroot_server = ChrootServer(get_transport(url))
4598
chroot_server.setUp()
4599
t = get_transport(chroot_server.get_url())
4600
smart_server = self.get_smart_server(t, inet, port)
4601
self.run_smart_server(smart_server)
4919
4604
class cmd_join(Command):
4920
__doc__ = """Combine a tree into its containing tree.
4605
"""Combine a tree into its containing tree.
4922
4607
This command requires the target tree to be in a rich-root format.
5100
4785
directly from the merge directive, without retrieving data from a
5103
`bzr send` creates a compact data set that, when applied using bzr
5104
merge, has the same effect as merging from the source branch.
5106
By default the merge directive is self-contained and can be applied to any
5107
branch containing submit_branch in its ancestory without needing access to
5110
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5111
revisions, but only a structured request to merge from the
5112
public_location. In that case the public_branch is needed and it must be
5113
up-to-date and accessible to the recipient. The public_branch is always
5114
included if known, so that people can check it later.
5116
The submit branch defaults to the parent of the source branch, but can be
5117
overridden. Both submit branch and public branch will be remembered in
5118
branch.conf the first time they are used for a particular branch. The
5119
source branch defaults to that containing the working directory, but can
5120
be changed using --from.
5122
In order to calculate those changes, bzr must analyse the submit branch.
5123
Therefore it is most efficient for the submit branch to be a local mirror.
5124
If a public location is known for the submit_branch, that location is used
5125
in the merge directive.
5127
The default behaviour is to send the merge directive by mail, unless -o is
5128
given, in which case it is sent to a file.
4788
If --no-bundle is specified, then public_branch is needed (and must be
4789
up-to-date), so that the receiver can perform the merge using the
4790
public_branch. The public_branch is always included if known, so that
4791
people can check it later.
4793
The submit branch defaults to the parent, but can be overridden. Both
4794
submit branch and public branch will be remembered if supplied.
4796
If a public_branch is known for the submit_branch, that public submit
4797
branch is used in the merge instructions. This means that a local mirror
4798
can be used as your actual submit branch, once you have set public_branch
5130
4801
Mail is sent using your preferred mail program. This should be transparent
5131
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4802
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5132
4803
If the preferred client can't be found (or used), your editor will be used.
5134
4805
To use a specific mail program, set the mail_client configuration option.
5135
4806
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5136
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5137
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5138
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4807
specific clients are "claws", "evolution", "kmail", "mutt", and
4808
"thunderbird"; generic options are "default", "editor", "emacsclient",
4809
"mapi", and "xdg-email". Plugins may also add supported clients.
5141
4811
If mail is being sent, a to address is required. This can be supplied
5142
4812
either on the commandline, by setting the submit_to configuration
5176
4842
short_name='f',
5178
4844
Option('output', short_name='o',
5179
help='Write merge directive to this file or directory; '
4845
help='Write merge directive to this file; '
5180
4846
'use - for stdout.',
5183
help='Refuse to send if there are uncommitted changes in'
5184
' the working tree, --no-strict disables the check.'),
5185
4848
Option('mail-to', help='Mail the request to this address.',
5189
4852
Option('body', help='Body for the email.', type=unicode),
5190
RegistryOption('format',
5191
help='Use the specified output format.',
5192
lazy_registry=('bzrlib.send', 'format_registry')),
4853
RegistryOption.from_kwargs('format',
4854
'Use the specified output format.',
4855
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4856
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5195
4859
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5196
4860
no_patch=False, revision=None, remember=False, output=None,
5197
format=None, mail_to=None, message=None, body=None,
5198
strict=None, **kwargs):
5199
from bzrlib.send import send
5200
return send(submit_branch, revision, public_branch, remember,
5201
format, no_bundle, no_patch, output,
5202
kwargs.get('from', '.'), mail_to, message, body,
4861
format='4', mail_to=None, message=None, body=None, **kwargs):
4862
return self._run(submit_branch, revision, public_branch, remember,
4863
format, no_bundle, no_patch, output,
4864
kwargs.get('from', '.'), mail_to, message, body)
4866
def _run(self, submit_branch, revision, public_branch, remember, format,
4867
no_bundle, no_patch, output, from_, mail_to, message, body):
4868
from bzrlib.revision import NULL_REVISION
4869
branch = Branch.open_containing(from_)[0]
4871
outfile = cStringIO.StringIO()
4875
outfile = open(output, 'wb')
4876
# we may need to write data into branch's repository to calculate
4881
config = branch.get_config()
4883
mail_to = config.get_user_option('submit_to')
4884
mail_client = config.get_mail_client()
4885
if (not getattr(mail_client, 'supports_body', False)
4886
and body is not None):
4887
raise errors.BzrCommandError(
4888
'Mail client "%s" does not support specifying body' %
4889
mail_client.__class__.__name__)
4890
if remember and submit_branch is None:
4891
raise errors.BzrCommandError(
4892
'--remember requires a branch to be specified.')
4893
stored_submit_branch = branch.get_submit_branch()
4894
remembered_submit_branch = None
4895
if submit_branch is None:
4896
submit_branch = stored_submit_branch
4897
remembered_submit_branch = "submit"
4899
if stored_submit_branch is None or remember:
4900
branch.set_submit_branch(submit_branch)
4901
if submit_branch is None:
4902
submit_branch = branch.get_parent()
4903
remembered_submit_branch = "parent"
4904
if submit_branch is None:
4905
raise errors.BzrCommandError('No submit branch known or'
4907
if remembered_submit_branch is not None:
4908
note('Using saved %s location "%s" to determine what '
4909
'changes to submit.', remembered_submit_branch,
4913
submit_config = Branch.open(submit_branch).get_config()
4914
mail_to = submit_config.get_user_option("child_submit_to")
4916
stored_public_branch = branch.get_public_branch()
4917
if public_branch is None:
4918
public_branch = stored_public_branch
4919
elif stored_public_branch is None or remember:
4920
branch.set_public_branch(public_branch)
4921
if no_bundle and public_branch is None:
4922
raise errors.BzrCommandError('No public branch specified or'
4924
base_revision_id = None
4926
if revision is not None:
4927
if len(revision) > 2:
4928
raise errors.BzrCommandError('bzr send takes '
4929
'at most two one revision identifiers')
4930
revision_id = revision[-1].as_revision_id(branch)
4931
if len(revision) == 2:
4932
base_revision_id = revision[0].as_revision_id(branch)
4933
if revision_id is None:
4934
revision_id = branch.last_revision()
4935
if revision_id == NULL_REVISION:
4936
raise errors.BzrCommandError('No revisions to submit.')
4938
directive = merge_directive.MergeDirective2.from_objects(
4939
branch.repository, revision_id, time.time(),
4940
osutils.local_time_offset(), submit_branch,
4941
public_branch=public_branch, include_patch=not no_patch,
4942
include_bundle=not no_bundle, message=message,
4943
base_revision_id=base_revision_id)
4944
elif format == '0.9':
4947
patch_type = 'bundle'
4949
raise errors.BzrCommandError('Format 0.9 does not'
4950
' permit bundle with no patch')
4956
directive = merge_directive.MergeDirective.from_objects(
4957
branch.repository, revision_id, time.time(),
4958
osutils.local_time_offset(), submit_branch,
4959
public_branch=public_branch, patch_type=patch_type,
4962
outfile.writelines(directive.to_lines())
4964
subject = '[MERGE] '
4965
if message is not None:
4968
revision = branch.repository.get_revision(revision_id)
4969
subject += revision.get_summary()
4970
basename = directive.get_disk_name(branch)
4971
mail_client.compose_merge_request(mail_to, subject,
5207
4980
class cmd_bundle_revisions(cmd_send):
5208
__doc__ = """Create a merge-directive for submitting changes.
4982
"""Create a merge-directive for submitting changes.
5210
4984
A merge directive provides many things needed for requesting merges:
5268
5040
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5269
5041
no_patch=False, revision=None, remember=False, output=None,
5270
format=None, strict=None, **kwargs):
5042
format='4', **kwargs):
5271
5043
if output is None:
5273
from bzrlib.send import send
5274
return send(submit_branch, revision, public_branch, remember,
5045
return self._run(submit_branch, revision, public_branch, remember,
5275
5046
format, no_bundle, no_patch, output,
5276
kwargs.get('from', '.'), None, None, None,
5277
self.outf, strict=strict)
5047
kwargs.get('from', '.'), None, None, None)
5280
5050
class cmd_tag(Command):
5281
__doc__ = """Create, remove or modify a tag naming a revision.
5051
"""Create, remove or modify a tag naming a revision.
5283
5053
Tags give human-meaningful names to revisions. Commands that take a -r
5284
5054
(--revision) option can be given -rtag:X, where X is any previously
5293
5063
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5294
5064
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5296
If no tag name is specified it will be determined through the
5297
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5298
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5302
5067
_see_also = ['commit', 'tags']
5303
takes_args = ['tag_name?']
5068
takes_args = ['tag_name']
5304
5069
takes_options = [
5305
5070
Option('delete',
5306
5071
help='Delete this tag rather than placing it.',
5308
custom_help('directory',
5309
help='Branch in which to place the tag.'),
5074
help='Branch in which to place the tag.',
5310
5078
Option('force',
5311
5079
help='Replace existing tags.',
5316
def run(self, tag_name=None,
5084
def run(self, tag_name,
5322
5090
branch, relpath = Branch.open_containing(directory)
5323
self.add_cleanup(branch.lock_write().unlock)
5325
if tag_name is None:
5326
raise errors.BzrCommandError("No tag specified to delete.")
5327
branch.tags.delete_tag(tag_name)
5328
self.outf.write('Deleted tag %s.\n' % tag_name)
5331
if len(revision) != 1:
5332
raise errors.BzrCommandError(
5333
"Tags can only be placed on a single revision, "
5335
revision_id = revision[0].as_revision_id(branch)
5094
branch.tags.delete_tag(tag_name)
5095
self.outf.write('Deleted tag %s.\n' % tag_name)
5337
revision_id = branch.last_revision()
5338
if tag_name is None:
5339
tag_name = branch.automatic_tag_name(revision_id)
5340
if tag_name is None:
5341
raise errors.BzrCommandError(
5342
"Please specify a tag name.")
5343
if (not force) and branch.tags.has_tag(tag_name):
5344
raise errors.TagAlreadyExists(tag_name)
5345
branch.tags.set_tag(tag_name, revision_id)
5346
self.outf.write('Created tag %s.\n' % tag_name)
5098
if len(revision) != 1:
5099
raise errors.BzrCommandError(
5100
"Tags can only be placed on a single revision, "
5102
revision_id = revision[0].as_revision_id(branch)
5104
revision_id = branch.last_revision()
5105
if (not force) and branch.tags.has_tag(tag_name):
5106
raise errors.TagAlreadyExists(tag_name)
5107
branch.tags.set_tag(tag_name, revision_id)
5108
self.outf.write('Created tag %s.\n' % tag_name)
5349
5113
class cmd_tags(Command):
5350
__doc__ = """List tags.
5352
5116
This command shows a table of tag names and the revisions they reference.
5355
5119
_see_also = ['tag']
5356
5120
takes_options = [
5357
custom_help('directory',
5358
help='Branch whose tags should be displayed.'),
5122
help='Branch whose tags should be displayed.',
5359
5126
RegistryOption.from_kwargs('sort',
5360
5127
'Sort tags by different criteria.', title='Sorting',
5361
5128
alpha='Sort tags lexicographically (default).',
5401
5171
tags.sort(key=lambda x: timestamps[x[1]])
5402
5172
if not show_ids:
5403
5173
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5404
for index, (tag, revid) in enumerate(tags):
5406
revno = branch.revision_id_to_dotted_revno(revid)
5407
if isinstance(revno, tuple):
5408
revno = '.'.join(map(str, revno))
5409
except errors.NoSuchRevision:
5410
# Bad tag data/merges can lead to tagged revisions
5411
# which are not in this branch. Fail gracefully ...
5413
tags[index] = (tag, revno)
5174
revno_map = branch.get_revision_id_to_revno_map()
5175
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5176
for tag, revid in tags ]
5415
5177
for tag, revspec in tags:
5416
5178
self.outf.write('%-20s %s\n' % (tag, revspec))
5419
5181
class cmd_reconfigure(Command):
5420
__doc__ = """Reconfigure the type of a bzr directory.
5182
"""Reconfigure the type of a bzr directory.
5422
5184
A target configuration must be specified.
5454
5216
Option('bind-to', help='Branch to bind checkout to.', type=str),
5455
5217
Option('force',
5456
help='Perform reconfiguration even if local changes'
5458
Option('stacked-on',
5459
help='Reconfigure a branch to be stacked on another branch.',
5463
help='Reconfigure a branch to be unstacked. This '
5464
'may require copying substantial data into it.',
5218
help='Perform reconfiguration even if local changes'
5468
def run(self, location=None, target_type=None, bind_to=None, force=False,
5222
def run(self, location=None, target_type=None, bind_to=None, force=False):
5471
5223
directory = bzrdir.BzrDir.open(location)
5472
if stacked_on and unstacked:
5473
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5474
elif stacked_on is not None:
5475
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5477
reconfigure.ReconfigureUnstacked().apply(directory)
5478
# At the moment you can use --stacked-on and a different
5479
# reconfiguration shape at the same time; there seems no good reason
5481
5224
if target_type is None:
5482
if stacked_on or unstacked:
5485
raise errors.BzrCommandError('No target configuration '
5225
raise errors.BzrCommandError('No target configuration specified')
5487
5226
elif target_type == 'branch':
5488
5227
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5489
5228
elif target_type == 'tree':
5526
5265
/path/to/newbranch.
5528
5267
Bound branches use the nickname of its master branch unless it is set
5529
locally, in which case switching will update the local nickname to be
5268
locally, in which case switching will update the the local nickname to be
5530
5269
that of the master.
5533
takes_args = ['to_location?']
5272
takes_args = ['to_location']
5534
5273
takes_options = [Option('force',
5535
help='Switch even if local commits will be lost.'),
5537
Option('create-branch', short_name='b',
5538
help='Create the target branch from this one before'
5539
' switching to it.'),
5274
help='Switch even if local commits will be lost.')
5542
def run(self, to_location=None, force=False, create_branch=False,
5277
def run(self, to_location, force=False):
5544
5278
from bzrlib import switch
5545
5279
tree_location = '.'
5546
revision = _get_one_revision('switch', revision)
5547
5280
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5548
if to_location is None:
5549
if revision is None:
5550
raise errors.BzrCommandError('You must supply either a'
5551
' revision or a location')
5281
branch = control_dir.open_branch()
5554
branch = control_dir.open_branch()
5555
had_explicit_nick = branch.get_config().has_explicit_nickname()
5283
to_branch = Branch.open(to_location)
5556
5284
except errors.NotBranchError:
5558
had_explicit_nick = False
5561
raise errors.BzrCommandError('cannot create branch without'
5563
to_location = directory_service.directories.dereference(
5565
if '/' not in to_location and '\\' not in to_location:
5566
# This path is meant to be relative to the existing branch
5567
this_url = self._get_branch_location(control_dir)
5568
to_location = urlutils.join(this_url, '..', to_location)
5569
to_branch = branch.bzrdir.sprout(to_location,
5570
possible_transports=[branch.bzrdir.root_transport],
5571
source_branch=branch).open_branch()
5574
to_branch = Branch.open(to_location)
5575
except errors.NotBranchError:
5576
this_url = self._get_branch_location(control_dir)
5577
to_branch = Branch.open(
5578
urlutils.join(this_url, '..', to_location))
5579
if revision is not None:
5580
revision = revision.as_revision_id(to_branch)
5581
switch.switch(control_dir, to_branch, force, revision_id=revision)
5582
if had_explicit_nick:
5285
this_branch = control_dir.open_branch()
5286
# This may be a heavy checkout, where we want the master branch
5287
this_url = this_branch.get_bound_location()
5288
# If not, use a local sibling
5289
if this_url is None:
5290
this_url = this_branch.base
5291
to_branch = Branch.open(
5292
urlutils.join(this_url, '..', to_location))
5293
switch.switch(control_dir, to_branch, force)
5294
if branch.get_config().has_explicit_nickname():
5583
5295
branch = control_dir.open_branch() #get the new branch!
5584
5296
branch.nick = to_branch.nick
5585
5297
note('Switched to branch: %s',
5586
5298
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5588
def _get_branch_location(self, control_dir):
5589
"""Return location of branch for this control dir."""
5591
this_branch = control_dir.open_branch()
5592
# This may be a heavy checkout, where we want the master branch
5593
master_location = this_branch.get_bound_location()
5594
if master_location is not None:
5595
return master_location
5596
# If not, use a local sibling
5597
return this_branch.base
5598
except errors.NotBranchError:
5599
format = control_dir.find_branch_format()
5600
if getattr(format, 'get_reference', None) is not None:
5601
return format.get_reference(control_dir)
5603
return control_dir.root_transport.base
5606
5301
class cmd_view(Command):
5607
__doc__ = """Manage filtered views.
5302
"""Manage filtered views.
5609
5304
Views provide a mask over the tree so that users can focus on
5610
5305
a subset of a tree when doing their work. After creating a view,
5851
5521
if writer is None:
5852
5522
writer = bzrlib.option.diff_writer_registry.get()
5854
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5855
file_list, message, destroy=destroy)
5524
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5525
message, destroy=destroy).run()
5860
5526
except errors.UserAbort:
5863
5529
def run_for_list(self):
5864
5530
tree = WorkingTree.open_containing('.')[0]
5865
self.add_cleanup(tree.lock_read().unlock)
5866
manager = tree.get_shelf_manager()
5867
shelves = manager.active_shelves()
5868
if len(shelves) == 0:
5869
note('No shelved changes.')
5871
for shelf_id in reversed(shelves):
5872
message = manager.get_metadata(shelf_id).get('message')
5874
message = '<no message>'
5875
self.outf.write('%3d: %s\n' % (shelf_id, message))
5533
manager = tree.get_shelf_manager()
5534
shelves = manager.active_shelves()
5535
if len(shelves) == 0:
5536
note('No shelved changes.')
5538
for shelf_id in reversed(shelves):
5539
message = manager.get_metadata(shelf_id).get('message')
5541
message = '<no message>'
5542
self.outf.write('%3d: %s\n' % (shelf_id, message))
5879
5548
class cmd_unshelve(Command):
5880
__doc__ = """Restore shelved changes.
5549
"""Restore shelved changes.
5882
5551
By default, the most recently shelved changes are restored. However if you
5883
5552
specify a shelf by id those changes will be restored instead. This works
5933
5594
' deleting them.'),
5934
5595
Option('force', help='Do not prompt before deleting.')]
5935
5596
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5936
force=False, directory=u'.'):
5937
5598
from bzrlib.clean_tree import clean_tree
5938
5599
if not (unknown or ignored or detritus):
5942
clean_tree(directory, unknown=unknown, ignored=ignored,
5943
detritus=detritus, dry_run=dry_run, no_prompt=force)
5603
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5604
dry_run=dry_run, no_prompt=force)
5946
5607
class cmd_reference(Command):
5947
__doc__ = """list, view and set branch locations for nested trees.
5608
"""list, view and set branch locations for nested trees.
5949
5610
If no arguments are provided, lists the branch locations for nested trees.
5950
5611
If one argument is provided, display the branch location for that tree.
5990
5651
self.outf.write('%s %s\n' % (path, location))
5993
def _register_lazy_builtins():
5994
# register lazy builtins from other modules; called at startup and should
5995
# be only called once.
5996
for (name, aliases, module_name) in [
5997
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5998
('cmd_dpush', [], 'bzrlib.foreign'),
5999
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6000
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6001
('cmd_conflicts', [], 'bzrlib.conflicts'),
6002
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6004
builtin_command_registry.register_lazy(name, aliases, module_name)
5654
# these get imported and then picked up by the scan for cmd_*
5655
# TODO: Some more consistent way to split command definitions across files;
5656
# we do need to load at least some information about them to know of
5657
# aliases. ideally we would avoid loading the implementation until the
5658
# details were needed.
5659
from bzrlib.cmd_version_info import cmd_version_info
5660
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5661
from bzrlib.bundle.commands import (
5664
from bzrlib.foreign import cmd_dpush
5665
from bzrlib.sign_my_commits import cmd_sign_my_commits
5666
from bzrlib.weave_commands import cmd_versionedfile_list, \
5667
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
