362
323
' --revision or a revision_id')
363
324
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
326
# TODO: jam 20060112 should cat-revision always output utf-8?
327
if revision_id is not None:
328
revision_id = osutils.safe_revision_id(revision_id, warn=False)
330
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
331
except errors.NoSuchRevision:
332
msg = "The repository %s contains no revision %s." % (b.repository.base,
334
raise errors.BzrCommandError(msg)
335
elif revision is not None:
338
raise errors.BzrCommandError('You cannot specify a NULL'
340
rev_id = rev.as_revision_id(b)
341
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
344
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
345
"""Dump the contents of a btree index file to stdout.
395
347
PATH is a btree index file, it can be any URL. This includes things like
396
348
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
424
To re-create the working tree, use "bzr checkout".
481
426
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
427
takes_args = ['location?']
483
428
takes_options = [
485
430
help='Remove the working tree even if it has '
486
431
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
434
def run(self, location='.', force=False):
435
d = bzrdir.BzrDir.open(location)
438
working = d.open_workingtree()
439
except errors.NoWorkingTree:
440
raise errors.BzrCommandError("No working tree to remove")
441
except errors.NotLocalUrl:
442
raise errors.BzrCommandError("You cannot remove the working tree of a "
445
changes = working.changes_from(working.basis_tree())
446
if changes.has_changed():
447
raise errors.UncommittedChanges(working)
449
working_path = working.bzrdir.root_transport.base
450
branch_path = working.branch.bzrdir.root_transport.base
451
if working_path != branch_path:
452
raise errors.BzrCommandError("You cannot remove the working tree from "
453
"a lightweight checkout")
455
d.destroy_workingtree()
514
458
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
459
"""Show current revision number.
517
461
This is equal to the number of revisions on this branch.
520
464
_see_also = ['info']
521
465
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
539
revno = ".".join(str(n) for n in revno_t)
541
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
545
self.outf.write(str(revno) + '\n')
468
def run(self, location=u'.'):
469
self.outf.write(str(Branch.open_containing(location)[0].revno()))
470
self.outf.write('\n')
548
473
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
474
"""Show revision number and revision id for a given revision identifier.
552
477
takes_args = ['revision_info*']
561
Option('tree', help='Show revno of working tree'),
565
def run(self, revision=None, directory=u'.', tree=False,
566
revision_info_list=[]):
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
569
wt = WorkingTree.open_containing(directory)[0]
571
self.add_cleanup(wt.lock_read().unlock)
572
except (errors.NoWorkingTree, errors.NotLocalUrl):
574
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
577
492
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
493
revs.extend(revision)
579
494
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
590
revision_ids.append(b.last_revision())
594
for revision_id in revision_ids:
495
for rev in revision_info_list:
496
revs.append(RevisionSpec.from_string(rev))
498
b = Branch.open_containing(directory)[0]
501
revs.append(RevisionSpec.from_string('-1'))
504
revision_id = rev.as_revision_id(b)
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
598
507
except errors.NoSuchRevision:
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
605
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
508
dotted_map = b.get_revision_id_to_revno_map()
509
revno = '.'.join(str(i) for i in dotted_map[revision_id])
510
print '%s %s' % (revno, revision_id)
608
513
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
514
"""Add specified files or directories.
611
516
In non-recursive mode, all the named items are added, regardless
612
517
of whether they were previously ignored. A warning is given if
677
579
should_print=(not is_quiet()))
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
582
base_tree.lock_read()
584
file_list = self._maybe_expand_globs(file_list)
585
tree, file_list = tree_files_for_add(file_list)
586
added, ignored = tree.smart_add(file_list, not
587
no_recurse, action=action, save=not dry_run)
589
if base_tree is not None:
685
591
if len(ignored) > 0:
687
593
for glob in sorted(ignored.keys()):
688
594
for path in ignored[glob]:
689
595
self.outf.write("ignored %s matching \"%s\"\n"
599
for glob, paths in ignored.items():
600
match_len += len(paths)
601
self.outf.write("ignored %d file(s).\n" % match_len)
602
self.outf.write("If you wish to add some of these files,"
603
" please add them by name.\n")
693
606
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
607
"""Create a new versioned directory.
696
609
This is equivalent to creating the directory and then adding it.
756
664
revision = _get_one_revision('inventory', revision)
757
665
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
776
entries = tree.inventory.entries()
666
work_tree.lock_read()
668
if revision is not None:
669
tree = revision.as_tree(work_tree.branch)
671
extra_trees = [work_tree]
677
if file_list is not None:
678
file_ids = tree.paths2ids(file_list, trees=extra_trees,
679
require_versioned=True)
680
# find_ids_across_trees may include some paths that don't
682
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
683
for file_id in file_ids if file_id in tree)
685
entries = tree.inventory.entries()
688
if tree is not work_tree:
779
691
for path, entry in entries:
780
692
if kind and kind != entry.kind:
917
834
dest = osutils.pathjoin(dest_parent, dest_tail)
918
835
mutter("attempting to move %s => %s", src, dest)
919
836
tree.rename_one(src, dest, after=after)
921
self.outf.write("%s => %s\n" % (src, dest))
837
self.outf.write("%s => %s\n" % (src, dest))
924
840
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
841
"""Turn this branch into a mirror of another branch.
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
843
This command only works on branches that have not diverged. Branches are
844
considered diverged if the destination branch's most recent commit is one
845
that has not been merged (directly or indirectly) into the parent.
932
847
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
848
from one into the other. Once one branch has merged, the other should
934
849
be able to pull it again.
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
851
If you want to forget your local changes and just update your branch to
852
match the remote one, use pull --overwrite.
940
854
If there is no default location set, the first pull will set it. After
941
855
that, you can omit the location to use the default. To change the
1026
929
if revision is not None:
1027
930
revision_id = revision.as_revision_id(branch_from)
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
932
branch_to.lock_write()
934
if tree_to is not None:
935
view_info = _get_view_info_for_change_reporter(tree_to)
936
change_reporter = delta._ChangeReporter(
937
unversioned_filter=tree_to.is_ignored, view_info=view_info)
938
result = tree_to.pull(branch_from, overwrite, revision_id,
940
possible_transports=possible_transports)
942
result = branch_to.pull(branch_from, overwrite, revision_id)
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
944
result.report(self.outf)
945
if verbose and result.old_revid != result.new_revid:
946
log.show_branch_change(branch_to, self.outf, result.old_revno,
1048
952
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
953
"""Update a mirror of this branch.
1051
955
The target branch will not have its working tree populated because this
1052
956
is both expensive, and is not supported on remote file systems.
1105
1006
def run(self, location=None, remember=False, overwrite=False,
1106
1007
create_prefix=False, verbose=False, revision=None,
1107
1008
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1109
1010
from bzrlib.push import _show_push_branch
1012
# Get the source branch and revision_id
1111
1013
if directory is None:
1112
1014
directory = '.'
1113
# Get the source branch
1115
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1116
# Get the tip's revision_id
1015
br_from = Branch.open_containing(directory)[0]
1117
1016
revision = _get_one_revision('push', revision)
1118
1017
if revision is not None:
1119
1018
revision_id = revision.in_history(br_from).rev_id
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1020
revision_id = br_from.last_revision()
1127
1022
# Get the stacked_on branch, if any
1128
1023
if stacked_on is not None:
1129
1024
stacked_on = urlutils.normalize_url(stacked_on)
1180
1075
help='Hard-link working tree files where possible.'),
1181
1076
Option('no-tree',
1182
1077
help="Create a branch without a working-tree."),
1184
help="Switch the checkout in the current directory "
1185
"to the new branch."),
1186
1078
Option('stacked',
1187
1079
help='Create a stacked branch referring to the source branch. '
1188
1080
'The new branch will depend on the availability of the source '
1189
1081
'branch for all operations.'),
1190
1082
Option('standalone',
1191
1083
help='Do not use a shared repository, even if available.'),
1192
Option('use-existing-dir',
1193
help='By default branch will fail if the target'
1194
' directory exists, but does not already'
1195
' have a control directory. This flag will'
1196
' allow branch to proceed.'),
1198
help="Bind new branch to from location."),
1200
1085
aliases = ['get', 'clone']
1202
1087
def run(self, from_location, to_location=None, revision=None,
1203
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1088
hardlink=False, stacked=False, standalone=False, no_tree=False):
1206
1089
from bzrlib.tag import _merge_tags_if_possible
1207
1091
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1093
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1096
if revision is not None:
1097
revision_id = revision.as_revision_id(br_from)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1099
# FIXME - wt.last_revision, fallback to branch, fall back to
1100
# None or perhaps NULL_REVISION to mean copy nothing
1102
revision_id = br_from.last_revision()
1103
if to_location is None:
1104
to_location = urlutils.derive_to_location(from_location)
1105
to_transport = transport.get_transport(to_location)
1107
to_transport.mkdir('.')
1108
except errors.FileExists:
1109
raise errors.BzrCommandError('Target directory "%s" already'
1110
' exists.' % to_location)
1111
except errors.NoSuchFile:
1112
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1115
# preserve whatever source format we have.
1116
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1117
possible_transports=[to_transport],
1118
accelerator_tree=accelerator_tree,
1119
hardlink=hardlink, stacked=stacked,
1120
force_new_repo=standalone,
1121
create_tree_if_local=not no_tree,
1122
source_branch=br_from)
1123
branch = dir.open_branch()
1124
except errors.NoSuchRevision:
1125
to_transport.delete_tree('.')
1126
msg = "The branch %s has no revision %s." % (from_location,
1128
raise errors.BzrCommandError(msg)
1129
_merge_tags_if_possible(br_from, branch)
1130
# If the source branch is stacked, the new branch may
1131
# be stacked whether we asked for that explicitly or not.
1132
# We therefore need a try/except here and not just 'if stacked:'
1134
note('Created new stacked branch referring to %s.' %
1135
branch.get_stacked_on_url())
1136
except (errors.NotStacked, errors.UnstackableBranchFormat,
1137
errors.UnstackableRepositoryFormat), e:
1138
note('Branched %d revision(s).' % branch.revno())
1275
1143
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1144
"""Create a new checkout of an existing branch.
1278
1146
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1147
the branch found in '.'. This is useful if you have removed the working tree
1353
1221
@display_command
1354
1222
def run(self, dir=u'.'):
1355
1223
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1368
renames.append(paths)
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1226
new_inv = tree.inventory
1227
old_tree = tree.basis_tree()
1228
old_tree.lock_read()
1230
old_inv = old_tree.inventory
1232
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1233
for f, paths, c, v, p, n, k, e in iterator:
1234
if paths[0] == paths[1]:
1238
renames.append(paths)
1240
for old_name, new_name in renames:
1241
self.outf.write("%s => %s\n" % (old_name, new_name))
1374
1248
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1249
"""Update a tree to have the latest code committed to its branch.
1377
1251
This will perform a merge into the working tree, and may generate
1378
1252
conflicts. If you have any local changes, you will still
1381
1255
If you want to discard your local changes, you can just do a
1382
1256
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1388
1259
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1260
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1261
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1263
def run(self, dir='.'):
1397
1264
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1265
possible_transports = []
1400
master = branch.get_master_branch(
1266
master = tree.branch.get_master_branch(
1401
1267
possible_transports=possible_transports)
1402
1268
if master is not None:
1403
branch_location = master.base
1404
1269
tree.lock_write()
1406
branch_location = tree.branch.base
1407
1271
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1273
existing_pending_merges = tree.get_parent_ids()[1:]
1274
last_rev = _mod_revision.ensure_null(tree.last_revision())
1275
if last_rev == _mod_revision.ensure_null(
1276
tree.branch.last_revision()):
1277
# may be up to date, check master too.
1278
if master is None or last_rev == _mod_revision.ensure_null(
1279
master.last_revision()):
1280
revno = tree.branch.revision_id_to_revno(last_rev)
1281
note("Tree is up to date at revision %d." % (revno,))
1283
view_info = _get_view_info_for_change_reporter(tree)
1435
1284
conflicts = tree.update(
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1285
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1286
view_info=view_info), possible_transports=possible_transports)
1287
revno = tree.branch.revision_id_to_revno(
1288
_mod_revision.ensure_null(tree.last_revision()))
1289
note('Updated to revision %d.' % (revno,))
1290
if tree.get_parent_ids()[1:] != existing_pending_merges:
1291
note('Your local commits will now show as pending merges with '
1292
"'bzr status', and can be committed with 'bzr commit'.")
1460
1301
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1302
"""Show information about a working tree, branch or repository.
1463
1304
This command will show all known locations and formats associated to the
1464
1305
tree, branch or repository.
1530
1371
if file_list is not None:
1531
1372
file_list = [f for f in file_list]
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1376
# Heuristics should probably all move into tree.remove_smart or
1379
added = tree.changes_from(tree.basis_tree(),
1380
specific_files=file_list).added
1381
file_list = sorted([f[0] for f in added], reverse=True)
1382
if len(file_list) == 0:
1383
raise errors.BzrCommandError('No matching files.')
1384
elif file_list is None:
1385
# missing files show up in iter_changes(basis) as
1386
# versioned-with-no-kind.
1388
for change in tree.iter_changes(tree.basis_tree()):
1389
# Find paths in the working tree that have no kind:
1390
if change[1][1] is not None and change[6][1] is None:
1391
missing.append(change[1][1])
1392
file_list = sorted(missing, reverse=True)
1393
file_deletion_strategy = 'keep'
1394
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1395
keep_files=file_deletion_strategy=='keep',
1396
force=file_deletion_strategy=='force')
1557
1401
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1402
"""Print file_id of a particular file or directory.
1560
1404
The file_id is assigned when the file is first added and remains the
1561
1405
same through all revisions where the file exists, even when it is
1961
1780
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1781
' one or two revision specifiers')
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1968
(old_tree, new_tree,
1969
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1783
old_tree, new_tree, specific_files, extra_trees = \
1784
_get_trees_to_diff(file_list, revision, old, new,
1972
1786
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1787
specific_files=specific_files,
1974
1788
external_diff_options=diff_options,
1975
1789
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1790
extra_trees=extra_trees, using=using)
1980
1793
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1794
"""List files deleted in the working tree.
1983
1796
# TODO: Show files deleted since a previous revision, or
1984
1797
# between two revisions.
2373
2181
diff_type = 'full'
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2385
show_advice=levels is None)
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2413
Logger(b, rqst).show(lf)
2185
# Build the log formatter
2186
if log_format is None:
2187
log_format = log.log_formatter_registry.get_default(b)
2188
lf = log_format(show_ids=show_ids, to_file=self.outf,
2189
show_timezone=timezone,
2190
delta_format=get_verbosity_level(),
2193
# Choose the algorithm for doing the logging. It's annoying
2194
# having multiple code paths like this but necessary until
2195
# the underlying repository format is faster at generating
2196
# deltas or can provide everything we need from the indices.
2197
# The default algorithm - match-using-deltas - works for
2198
# multiple files and directories and is faster for small
2199
# amounts of history (200 revisions say). However, it's too
2200
# slow for logging a single file in a repository with deep
2201
# history, i.e. > 10K revisions. In the spirit of "do no
2202
# evil when adding features", we continue to use the
2203
# original algorithm - per-file-graph - for the "single
2204
# file that isn't a directory without showing a delta" case.
2205
partial_history = revision and b.repository._format.supports_chks
2206
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2207
or delta_type or partial_history)
2209
# Build the LogRequest and execute it
2210
if len(file_ids) == 0:
2212
rqst = make_log_request_dict(
2213
direction=direction, specific_fileids=file_ids,
2214
start_revision=rev1, end_revision=rev2, limit=limit,
2215
message_search=message, delta_type=delta_type,
2216
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2217
Logger(b, rqst).show(lf)
2416
2222
def _get_revision_range(revisionspec_list, branch, command_name):
2561
2358
view_str = views.view_display_str(view_files)
2562
2359
note("Ignoring files outside view. View is %s" % view_str)
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2570
if kind is not None and fkind != kind:
2575
fullpath = osutils.pathjoin(relpath, fp)
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2594
self.outf.write(fp + '\0')
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2608
self.outf.write(outstring + '\n')
2363
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2364
if fp.startswith(relpath):
2365
rp = fp[len(relpath):]
2366
fp = osutils.pathjoin(prefix, rp)
2367
if not recursive and '/' in rp:
2369
if not all and not selection[fc]:
2371
if kind is not None and fkind != kind:
2375
views.check_path_in_view(tree, fp)
2376
except errors.FileOutsideView:
2378
kindch = entry.kind_character()
2379
outstring = fp + kindch
2381
outstring = '%-8s %s' % (fc, outstring)
2382
if show_ids and fid is not None:
2383
outstring = "%-50s %s" % (outstring, fid)
2384
self.outf.write(outstring + '\n')
2386
self.outf.write(fp + '\0')
2389
self.outf.write(fid)
2390
self.outf.write('\0')
2398
self.outf.write('%-50s %s\n' % (outstring, my_id))
2400
self.outf.write(outstring + '\n')
2611
2405
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2406
"""List unknown files.
2624
2418
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2419
"""Ignore specified files or patterns.
2627
2421
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
2423
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2424
After adding, editing or deleting that file either indirectly by
2637
2425
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
2428
Note: ignore patterns containing shell wildcards must be quoted from
2654
2429
the shell on Unix.
2677
2448
Ignore everything but the "debian" toplevel directory::
2679
2450
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
2453
_see_also = ['status', 'ignored', 'patterns']
2690
2454
takes_args = ['name_pattern*']
2691
2455
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2456
Option('old-default-rules',
2457
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2460
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2461
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2462
if old_default_rules is not None:
2463
# dump the rules and exit
2464
for pattern in ignores.OLD_DEFAULTS:
2703
2467
if not name_pattern_list:
2704
2468
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2469
"NAME_PATTERN or --old-default-rules")
2706
2470
name_pattern_list = [globbing.normalize_pattern(p)
2707
2471
for p in name_pattern_list]
2708
2472
for name_pattern in name_pattern_list:
2915
2679
chunks = content.splitlines(True)
2916
2680
content = filtered_output_bytes(chunks, filters,
2917
2681
ContentFilterContext(relpath, rev_tree))
2919
2682
self.outf.writelines(content)
2922
2684
self.outf.write(content)
2925
2687
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2688
"""Show the offset in seconds from GMT to local time."""
2928
2690
@display_command
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2692
print osutils.local_time_offset()
2934
2696
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2937
An explanatory message needs to be given for each commit. This is
2938
often done by using the --message option (getting the message from the
2939
command line) or by using the --file option (getting the message from
2940
a file). If neither of these options is given, an editor is opened for
2941
the user to enter the message. To see the changed files in the
2942
boilerplate text loaded into the editor, use the --show-diff option.
2944
By default, the entire tree is committed and the person doing the
2945
commit is assumed to be the author. These defaults can be overridden
2950
If selected files are specified, only changes to those files are
2951
committed. If a directory is specified then the directory and
2952
everything within it is committed.
2954
When excludes are given, they take precedence over selected files.
2955
For example, to commit only changes within foo, but not changes
2958
bzr commit foo -x foo/bar
2960
A selective commit after a merge is not yet supported.
2964
If the author of the change is not the same person as the committer,
2965
you can specify the author's name using the --author option. The
2966
name should be in the same format as a committer-id, e.g.
2967
"John Doe <jdoe@example.com>". If there is more than one author of
2968
the change you can specify the option multiple times, once for each
2973
A common mistake is to forget to add a new file or directory before
2974
running the commit command. The --strict option checks for unknown
2975
files and aborts the commit if any are found. More advanced pre-commit
2976
checks can be implemented by defining hooks. See ``bzr help hooks``
2981
If you accidentially commit the wrong changes or make a spelling
2982
mistake in the commit message say, you can use the uncommit command
2983
to undo it. See ``bzr help uncommit`` for details.
2985
Hooks can also be configured to run after a commit. This allows you
2986
to trigger updates to external systems like bug trackers. The --fixes
2987
option can be used to record the association between a revision and
2988
one or more bugs. See ``bzr help bugs`` for details.
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
3000
bzr commit foo/bar -m "committing bar but not baz"
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2697
"""Commit changes into a new revision.
2699
If no arguments are given, the entire tree is committed.
2701
If selected files are specified, only changes to those files are
2702
committed. If a directory is specified then the directory and everything
2703
within it is committed.
2705
When excludes are given, they take precedence over selected files.
2706
For example, too commit only changes within foo, but not changes within
2709
bzr commit foo -x foo/bar
2711
If author of the change is not the same person as the committer, you can
2712
specify the author's name using the --author option. The name should be
2713
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2714
If there is more than one author of the change you can specify the option
2715
multiple times, once for each author.
2717
A selected-file commit may fail in some cases where the committed
2718
tree would be invalid. Consider::
2723
bzr commit foo -m "committing foo"
2724
bzr mv foo/bar foo/baz
2727
bzr commit foo/bar -m "committing bar but not baz"
2729
In the example above, the last commit will fail by design. This gives
2730
the user the opportunity to decide whether they want to commit the
2731
rename at the same time, separately first, or not at all. (As a general
2732
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2734
Note: A selected-file commit after a merge is not yet supported.
3007
2736
# TODO: Run hooks on tree to-be-committed, and after commit.
3118
2836
if local and not tree.branch.get_bound_location():
3119
2837
raise errors.LocalRequiresBoundBranch()
3121
if message is not None:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3134
ui.ui_factory.show_warning(warning_msg)
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3142
2839
def get_message(commit_obj):
3143
2840
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
2841
my_message = message
2842
if my_message is None and not file:
2843
t = make_commit_message_template_encoded(tree,
3153
2844
selected_list, diff=show_diff,
3154
2845
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3160
2846
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
2847
my_message = edit_commit_message_encoded(t,
3162
2848
start_message=start_message)
3163
2849
if my_message is None:
3164
2850
raise errors.BzrCommandError("please specify a commit"
3165
2851
" message with either --message or --file")
2852
elif my_message and file:
2853
raise errors.BzrCommandError(
2854
"please specify either --message or --file")
2856
my_message = codecs.open(file, 'rt',
2857
osutils.get_user_encoding()).read()
3166
2858
if my_message == "":
3167
2859
raise errors.BzrCommandError("empty commit message specified")
3168
2860
return my_message
3170
# The API permits a commit with a filter of [] to mean 'select nothing'
3171
# but the command line should not do that.
3172
if not selected_list:
3173
selected_list = None
3175
2863
tree.commit(message_callback=get_message,
3176
2864
specific_files=selected_list,
3177
2865
allow_pointless=unchanged, strict=strict, local=local,
3178
2866
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3181
2868
exclude=safe_relpath_files(tree, exclude))
3182
2869
except PointlessCommit:
3183
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
2870
# FIXME: This should really happen before the file is read in;
2871
# perhaps prepare the commit; get the message; then actually commit
2872
raise errors.BzrCommandError("no changes to commit."
2873
" use --unchanged to commit anyhow")
3185
2874
except ConflictsInTree:
3186
2875
raise errors.BzrCommandError('Conflicts detected in working '
3187
2876
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3206
2894
The working tree and branch checks will only give output if a problem is
3207
2895
detected. The output fields of the repository check are:
3210
This is just the number of revisions checked. It doesn't
3214
This is just the number of versionedfiles checked. It
3215
doesn't indicate a problem.
3217
unreferenced ancestors
3218
Texts that are ancestors of other texts, but
3219
are not properly referenced by the revision ancestry. This is a
3220
subtle problem that Bazaar can work around.
3223
This is the total number of unique file contents
3224
seen in the checked revisions. It does not indicate a problem.
3227
This is the total number of repeated texts seen
3228
in the checked revisions. Texts can be repeated when their file
3229
entries are modified, but the file contents are not. It does not
2897
revisions: This is just the number of revisions checked. It doesn't
2899
versionedfiles: This is just the number of versionedfiles checked. It
2900
doesn't indicate a problem.
2901
unreferenced ancestors: Texts that are ancestors of other texts, but
2902
are not properly referenced by the revision ancestry. This is a
2903
subtle problem that Bazaar can work around.
2904
unique file texts: This is the total number of unique file contents
2905
seen in the checked revisions. It does not indicate a problem.
2906
repeated file texts: This is the total number of repeated texts seen
2907
in the checked revisions. Texts can be repeated when their file
2908
entries are modified, but the file contents are not. It does not
3232
2911
If no restrictions are specified, all Bazaar data that is found at the given
3233
2912
location will be checked.
3597
3266
verbose = not is_quiet()
3598
3267
# TODO: should possibly lock the history file...
3599
3268
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
3270
test_suite_factory = None
3603
3271
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3273
selftest_kwargs = {"verbose": verbose,
3275
"stop_on_failure": one,
3276
"transport": transport,
3277
"test_suite_factory": test_suite_factory,
3278
"lsprof_timed": lsprof_timed,
3279
"bench_history": benchfile,
3280
"matching_tests_first": first,
3281
"list_only": list_only,
3282
"random_seed": randomize,
3283
"exclude_pattern": exclude,
3285
"load_list": load_list,
3286
"debug_flags": debugflag,
3287
"starting_with": starting_with
3289
selftest_kwargs.update(self.additional_selftest_args)
3290
result = selftest(**selftest_kwargs)
3292
if benchfile is not None:
3623
3294
return int(not result)
3626
3297
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3298
"""Show version of bzr."""
3629
3300
encoding_type = 'replace'
3630
3301
takes_options = [
3793
3451
verified = 'inapplicable'
3794
3452
tree = WorkingTree.open_containing(directory)[0]
3454
# die as quickly as possible if there are uncommitted changes
3797
3456
basis_tree = tree.revision_tree(tree.last_revision())
3798
3457
except errors.NoSuchRevision:
3799
3458
basis_tree = tree.basis_tree()
3801
# die as quickly as possible if there are uncommitted changes
3803
if tree.has_changes():
3460
changes = tree.changes_from(basis_tree)
3461
if changes.has_changed():
3804
3462
raise errors.UncommittedChanges(tree)
3806
3464
view_info = _get_view_info_for_change_reporter(tree)
3807
3465
change_reporter = delta._ChangeReporter(
3808
3466
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3469
pb = ui.ui_factory.nested_progress_bar()
3470
cleanups.append(pb.finished)
3472
cleanups.append(tree.unlock)
3473
if location is not None:
3475
mergeable = bundle.read_mergeable_from_url(location,
3476
possible_transports=possible_transports)
3477
except errors.NotABundle:
3481
raise errors.BzrCommandError('Cannot use --uncommitted'
3482
' with bundles or merge directives.')
3484
if revision is not None:
3485
raise errors.BzrCommandError(
3486
'Cannot use -r with merge directives or bundles')
3487
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3490
if merger is None and uncommitted:
3491
if revision is not None and len(revision) > 0:
3492
raise errors.BzrCommandError('Cannot use --uncommitted and'
3493
' --revision at the same time.')
3494
location = self._select_branch_location(tree, location)[0]
3495
other_tree, other_path = WorkingTree.open_containing(location)
3496
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3498
allow_pending = False
3499
if other_path != '':
3500
merger.interesting_files = [other_path]
3503
merger, allow_pending = self._get_merger_from_branch(tree,
3504
location, revision, remember, possible_transports, pb)
3506
merger.merge_type = merge_type
3507
merger.reprocess = reprocess
3508
merger.show_base = show_base
3509
self.sanity_check_merger(merger)
3510
if (merger.base_rev_id == merger.other_rev_id and
3511
merger.other_rev_id is not None):
3512
note('Nothing to do.')
3515
if merger.interesting_files is not None:
3516
raise errors.BzrCommandError('Cannot pull individual files')
3517
if (merger.base_rev_id == tree.last_revision()):
3518
result = tree.pull(merger.other_branch, False,
3519
merger.other_rev_id)
3520
result.report(self.outf)
3522
merger.check_basis(False)
3524
return self._do_preview(merger)
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3861
return self._do_preview(merger)
3863
return self._do_interactive(merger)
3865
return self._do_merge(merger, change_reporter, allow_pending,
3868
def _get_preview(self, merger):
3526
return self._do_merge(merger, change_reporter, allow_pending,
3529
for cleanup in reversed(cleanups):
3532
def _do_preview(self, merger):
3533
from bzrlib.diff import show_diff_trees
3869
3534
tree_merger = merger.make_merger()
3870
3535
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3872
result_tree = tt.get_preview_tree()
3875
def _do_preview(self, merger):
3876
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3878
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
3537
result_tree = tt.get_preview_tree()
3538
show_diff_trees(merger.this_tree, result_tree, self.outf,
3539
old_label='', new_label='')
3881
3543
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3544
merger.change_reporter = change_reporter
4067
3697
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3698
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3699
if merge_type is None:
4071
3700
merge_type = _mod_merge.Merge3Merger
4072
3701
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4079
repository = tree.branch.repository
4080
interesting_ids = None
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
3704
parents = tree.get_parent_ids()
3705
if len(parents) != 2:
3706
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3707
" merges. Not cherrypicking or"
3709
repository = tree.branch.repository
3710
interesting_ids = None
3712
conflicts = tree.conflicts()
3713
if file_list is not None:
3714
interesting_ids = set()
3715
for filename in file_list:
3716
file_id = tree.path2id(filename)
3718
raise errors.NotVersionedError(filename)
3719
interesting_ids.add(file_id)
3720
if tree.kind(file_id) != "directory":
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3723
for name, ie in tree.inventory.iter_entries(file_id):
3724
interesting_ids.add(ie.file_id)
3725
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3727
# Remerge only supports resolving contents conflicts
3728
allowed_conflicts = ('text conflict', 'contents conflict')
3729
restore_files = [c.path for c in conflicts
3730
if c.typestring in allowed_conflicts]
3731
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3732
tree.set_conflicts(ConflictList(new_conflicts))
3733
if file_list is not None:
3734
restore_files = file_list
3735
for filename in restore_files:
3737
restore(tree.abspath(filename))
3738
except errors.NotConflicted:
3740
# Disable pending merges, because the file texts we are remerging
3741
# have not had those merges performed. If we use the wrong parents
3742
# list, we imply that the working tree text has seen and rejected
3743
# all the changes from the other tree, when in fact those changes
3744
# have not yet been seen.
3745
pb = ui.ui_factory.nested_progress_bar()
3746
tree.set_parent_ids(parents[:1])
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
3748
merger = _mod_merge.Merger.from_revision_ids(pb,
3750
merger.interesting_ids = interesting_ids
3751
merger.merge_type = merge_type
3752
merger.show_base = show_base
3753
merger.reprocess = reprocess
3754
conflicts = merger.do_merge()
3756
tree.set_parent_ids(parents)
4124
tree.set_parent_ids(parents)
4125
3760
if conflicts > 0:
4149
3784
name. If you name a directory, all the contents of that directory will be
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
3787
Any files that have been newly added since that revision will be deleted,
3788
with a backup kept if appropriate. Directories containing unknown files
3789
will not be deleted.
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
3791
The working tree contains a list of pending merged revisions, which will
3792
be included as parents in the next commit. Normally, revert clears that
3793
list as well as reverting the files. If any files are specified, revert
3794
leaves the pending merge list alone and reverts only the files. Use "bzr
3795
revert ." in the tree root to revert all files but keep the merge record,
3796
and "bzr revert --forget-merges" to clear the pending merge list without
4164
3797
reverting any files.
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4177
3800
_see_also = ['cat', 'export']
4186
3809
def run(self, revision=None, no_backup=False, file_list=None,
4187
3810
forget_merges=None):
4188
3811
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3815
tree.set_parent_ids(tree.get_parent_ids()[:1])
3817
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4196
3822
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
3823
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
3824
pb = ui.ui_factory.nested_progress_bar()
3826
tree.revert(file_list, rev_tree, not no_backup, pb,
3827
report_changes=True)
4202
3832
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
3833
"""Test reporting of assertion failures"""
4204
3834
# intended just for use in testing
4355
3977
_get_revision_range(revision,
4356
3978
remote_branch, self.name()))
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4370
show_timezone='original')
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4379
lf.log_revision(revision)
4380
printed_local = True
4383
printed_local = False
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4388
message("You are missing %d revision(s):\n" %
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4393
lf.log_revision(revision)
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4404
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
3980
local_branch.lock_read()
3982
remote_branch.lock_read()
3984
local_extra, remote_extra = find_unmerged(
3985
local_branch, remote_branch, restrict,
3986
backward=not reverse,
3987
include_merges=include_merges,
3988
local_revid_range=local_revid_range,
3989
remote_revid_range=remote_revid_range)
3991
if log_format is None:
3992
registry = log.log_formatter_registry
3993
log_format = registry.get_default(local_branch)
3994
lf = log_format(to_file=self.outf,
3996
show_timezone='original')
3999
if local_extra and not theirs_only:
4000
message("You have %d extra revision(s):\n" %
4002
for revision in iter_log_revisions(local_extra,
4003
local_branch.repository,
4005
lf.log_revision(revision)
4006
printed_local = True
4009
printed_local = False
4011
if remote_extra and not mine_only:
4012
if printed_local is True:
4014
message("You are missing %d revision(s):\n" %
4016
for revision in iter_log_revisions(remote_extra,
4017
remote_branch.repository,
4019
lf.log_revision(revision)
4022
if mine_only and not local_extra:
4023
# We checked local, and found nothing extra
4024
message('This branch is up to date.\n')
4025
elif theirs_only and not remote_extra:
4026
# We checked remote, and found nothing extra
4027
message('Other branch is up to date.\n')
4028
elif not (mine_only or theirs_only or local_extra or
4030
# We checked both branches, and neither one had extra
4032
message("Branches are up to date.\n")
4034
remote_branch.unlock()
4036
local_branch.unlock()
4408
4037
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4038
local_branch.lock_write()
4040
# handle race conditions - a parent might be set while we run.
4041
if local_branch.get_parent() is None:
4042
local_branch.set_parent(remote_branch.base)
4044
local_branch.unlock()
4413
4045
return status_code
4416
4048
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4049
"""Compress the data within a repository."""
4435
4051
_see_also = ['repositories']
4436
4052
takes_args = ['branch_or_repo?']
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4054
def run(self, branch_or_repo='.'):
4442
4055
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
4057
branch = dir.open_branch()
4445
4058
repository = branch.repository
4446
4059
except errors.NotBranchError:
4447
4060
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
4064
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4065
"""List the installed plugins.
4454
4067
This command displays the list of installed plugins including
4455
4068
version of plugin and a short description of each.
4552
4168
wt, branch, relpath = \
4553
4169
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4170
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4561
file_id = wt.path2id(relpath)
4563
file_id = tree.path2id(relpath)
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4175
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4177
file_id = wt.path2id(relpath)
4179
file_id = tree.path2id(relpath)
4181
raise errors.NotVersionedError(filename)
4182
file_version = tree.inventory[file_id].revision
4183
if wt is not None and revision is None:
4184
# If there is a tree and we're not annotating historical
4185
# versions, annotate the working tree's content.
4186
annotate_file_tree(wt, file_id, self.outf, long, all,
4189
annotate_file(branch, file_version, file_id, long, all, self.outf,
4577
4198
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4199
"""Create a digital signature for an existing revision."""
4579
4200
# TODO be able to replace existing ones.
4581
4202
hidden = True # is this right ?
4785
4412
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4415
print 'Dry-run, pretending to remove the above revisions.'
4417
val = raw_input('Press <enter> to continue')
4791
self.outf.write('The above revision(s) will be removed.\n')
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4419
print 'The above revision(s) will be removed.'
4421
val = raw_input('Are you sure [y/N]? ')
4422
if val.lower() not in ('y', 'yes'):
4798
4426
mutter('Uncommitting from {%s} to {%s}',
4799
4427
last_rev_id, rev_id)
4800
4428
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4429
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4430
note('You can restore the old tip by running:\n'
4431
' bzr pull . -r revid:%s', last_rev_id)
4806
4434
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4435
"""Break a dead lock on a repository, branch or working directory.
4809
4437
CAUTION: Locks should only be broken when you are sure that the process
4810
4438
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4440
You can get information on what locks are open via the 'bzr info' command.
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4819
4445
takes_args = ['location?']
4866
4488
Option('allow-writes',
4867
4489
help='By default the server is a readonly server. Supplying '
4868
4490
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
4870
'does not perform authentication, so unless some form of '
4871
'external authentication is arranged supplying this '
4872
'option leads to global uncontrolled write access to your '
4491
'the served directory and below.'
4495
def run_smart_server(self, smart_server):
4496
"""Run 'smart_server' forever, with no UI output at all."""
4497
# For the duration of this server, no UI output is permitted. note
4498
# that this may cause problems with blackbox tests. This should be
4499
# changed with care though, as we dont want to use bandwidth sending
4500
# progress over stderr to smart server clients!
4501
from bzrlib import lockdir
4502
old_factory = ui.ui_factory
4503
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4505
ui.ui_factory = ui.SilentUIFactory()
4506
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4507
smart_server.serve()
4509
ui.ui_factory = old_factory
4510
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4877
4512
def get_host_and_port(self, port):
4878
4513
"""Return the host and port to run the smart server on.
4880
If 'port' is None, None will be returned for the host and port.
4515
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4516
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4882
4518
If 'port' has a colon in it, the string before the colon will be
4883
4519
interpreted as the host.
4886
4522
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
4523
and port is an integer TCP/IP port.
4890
if port is not None:
4525
from bzrlib.smart import medium
4526
host = medium.BZR_DEFAULT_INTERFACE
4528
port = medium.BZR_DEFAULT_PORT
4891
4530
if ':' in port:
4892
4531
host, port = port.split(':')
4893
4532
port = int(port)
4894
4533
return host, port
4896
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4898
from bzrlib.transport import get_transport, transport_server_registry
4535
def get_smart_server(self, transport, inet, port):
4536
"""Construct a smart server.
4538
:param transport: The base transport from which branches will be
4540
:param inet: If True, serve over stdin and stdout. Used for running
4542
:param port: The port to listen on. By default, it's `
4543
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4545
:return: A smart server.
4547
from bzrlib.smart import medium, server
4549
smart_server = medium.SmartServerPipeStreamMedium(
4550
sys.stdin, sys.stdout, transport)
4552
host, port = self.get_host_and_port(port)
4553
smart_server = server.SmartTCPServer(
4554
transport, host=host, port=port)
4555
note('listening on port: %s' % smart_server.port)
4558
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4559
from bzrlib.transport import get_transport
4560
from bzrlib.transport.chroot import ChrootServer
4899
4561
if directory is None:
4900
4562
directory = os.getcwd()
4901
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
4563
url = urlutils.local_path_to_url(directory)
4905
4564
if not allow_writes:
4906
4565
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
4566
chroot_server = ChrootServer(get_transport(url))
4567
chroot_server.setUp()
4568
t = get_transport(chroot_server.get_url())
4569
smart_server = self.get_smart_server(t, inet, port)
4570
self.run_smart_server(smart_server)
4911
4573
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4574
"""Combine a tree into its containing tree.
4914
4576
This command requires the target tree to be in a rich-root format.
5092
4754
directly from the merge directive, without retrieving data from a
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4757
If --no-bundle is specified, then public_branch is needed (and must be
4758
up-to-date), so that the receiver can perform the merge using the
4759
public_branch. The public_branch is always included if known, so that
4760
people can check it later.
4762
The submit branch defaults to the parent, but can be overridden. Both
4763
submit branch and public branch will be remembered if supplied.
4765
If a public_branch is known for the submit_branch, that public submit
4766
branch is used in the merge instructions. This means that a local mirror
4767
can be used as your actual submit branch, once you have set public_branch
5122
4770
Mail is sent using your preferred mail program. This should be transparent
5123
4771
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5168
4811
short_name='f',
5170
4813
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
4814
help='Write merge directive to this file; '
5172
4815
'use - for stdout.',
5175
help='Refuse to send if there are uncommitted changes in'
5176
' the working tree, --no-strict disables the check.'),
5177
4817
Option('mail-to', help='Mail the request to this address.',
5181
4821
Option('body', help='Body for the email.', type=unicode),
5182
RegistryOption('format',
5183
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
4822
RegistryOption.from_kwargs('format',
4823
'Use the specified output format.',
4824
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4825
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5187
4828
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
4829
no_patch=False, revision=None, remember=False, output=None,
5189
format=None, mail_to=None, message=None, body=None,
5190
strict=None, **kwargs):
5191
from bzrlib.send import send
5192
return send(submit_branch, revision, public_branch, remember,
5193
format, no_bundle, no_patch, output,
5194
kwargs.get('from', '.'), mail_to, message, body,
4830
format='4', mail_to=None, message=None, body=None, **kwargs):
4831
return self._run(submit_branch, revision, public_branch, remember,
4832
format, no_bundle, no_patch, output,
4833
kwargs.get('from', '.'), mail_to, message, body)
4835
def _run(self, submit_branch, revision, public_branch, remember, format,
4836
no_bundle, no_patch, output, from_, mail_to, message, body):
4837
from bzrlib.revision import NULL_REVISION
4838
branch = Branch.open_containing(from_)[0]
4840
outfile = cStringIO.StringIO()
4844
outfile = open(output, 'wb')
4845
# we may need to write data into branch's repository to calculate
4850
config = branch.get_config()
4852
mail_to = config.get_user_option('submit_to')
4853
mail_client = config.get_mail_client()
4854
if (not getattr(mail_client, 'supports_body', False)
4855
and body is not None):
4856
raise errors.BzrCommandError(
4857
'Mail client "%s" does not support specifying body' %
4858
mail_client.__class__.__name__)
4859
if remember and submit_branch is None:
4860
raise errors.BzrCommandError(
4861
'--remember requires a branch to be specified.')
4862
stored_submit_branch = branch.get_submit_branch()
4863
remembered_submit_branch = None
4864
if submit_branch is None:
4865
submit_branch = stored_submit_branch
4866
remembered_submit_branch = "submit"
4868
if stored_submit_branch is None or remember:
4869
branch.set_submit_branch(submit_branch)
4870
if submit_branch is None:
4871
submit_branch = branch.get_parent()
4872
remembered_submit_branch = "parent"
4873
if submit_branch is None:
4874
raise errors.BzrCommandError('No submit branch known or'
4876
if remembered_submit_branch is not None:
4877
note('Using saved %s location "%s" to determine what '
4878
'changes to submit.', remembered_submit_branch,
4882
submit_config = Branch.open(submit_branch).get_config()
4883
mail_to = submit_config.get_user_option("child_submit_to")
4885
stored_public_branch = branch.get_public_branch()
4886
if public_branch is None:
4887
public_branch = stored_public_branch
4888
elif stored_public_branch is None or remember:
4889
branch.set_public_branch(public_branch)
4890
if no_bundle and public_branch is None:
4891
raise errors.BzrCommandError('No public branch specified or'
4893
base_revision_id = None
4895
if revision is not None:
4896
if len(revision) > 2:
4897
raise errors.BzrCommandError('bzr send takes '
4898
'at most two one revision identifiers')
4899
revision_id = revision[-1].as_revision_id(branch)
4900
if len(revision) == 2:
4901
base_revision_id = revision[0].as_revision_id(branch)
4902
if revision_id is None:
4903
revision_id = branch.last_revision()
4904
if revision_id == NULL_REVISION:
4905
raise errors.BzrCommandError('No revisions to submit.')
4907
directive = merge_directive.MergeDirective2.from_objects(
4908
branch.repository, revision_id, time.time(),
4909
osutils.local_time_offset(), submit_branch,
4910
public_branch=public_branch, include_patch=not no_patch,
4911
include_bundle=not no_bundle, message=message,
4912
base_revision_id=base_revision_id)
4913
elif format == '0.9':
4916
patch_type = 'bundle'
4918
raise errors.BzrCommandError('Format 0.9 does not'
4919
' permit bundle with no patch')
4925
directive = merge_directive.MergeDirective.from_objects(
4926
branch.repository, revision_id, time.time(),
4927
osutils.local_time_offset(), submit_branch,
4928
public_branch=public_branch, patch_type=patch_type,
4931
outfile.writelines(directive.to_lines())
4933
subject = '[MERGE] '
4934
if message is not None:
4937
revision = branch.repository.get_revision(revision_id)
4938
subject += revision.get_summary()
4939
basename = directive.get_disk_name(branch)
4940
mail_client.compose_merge_request(mail_to, subject,
5199
4949
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
4951
"""Create a merge-directive for submitting changes.
5202
4953
A merge directive provides many things needed for requesting merges:
5260
5009
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5261
5010
no_patch=False, revision=None, remember=False, output=None,
5262
format=None, strict=None, **kwargs):
5011
format='4', **kwargs):
5263
5012
if output is None:
5265
from bzrlib.send import send
5266
return send(submit_branch, revision, public_branch, remember,
5014
return self._run(submit_branch, revision, public_branch, remember,
5267
5015
format, no_bundle, no_patch, output,
5268
kwargs.get('from', '.'), None, None, None,
5269
self.outf, strict=strict)
5016
kwargs.get('from', '.'), None, None, None)
5272
5019
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5020
"""Create, remove or modify a tag naming a revision.
5275
5022
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5023
(--revision) option can be given -rtag:X, where X is any previously
5311
def run(self, tag_name=None,
5053
def run(self, tag_name,
5317
5059
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5330
revision_id = revision[0].as_revision_id(branch)
5063
branch.tags.delete_tag(tag_name)
5064
self.outf.write('Deleted tag %s.\n' % tag_name)
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5067
if len(revision) != 1:
5068
raise errors.BzrCommandError(
5069
"Tags can only be placed on a single revision, "
5071
revision_id = revision[0].as_revision_id(branch)
5073
revision_id = branch.last_revision()
5074
if (not force) and branch.tags.has_tag(tag_name):
5075
raise errors.TagAlreadyExists(tag_name)
5076
branch.tags.set_tag(tag_name, revision_id)
5077
self.outf.write('Created tag %s.\n' % tag_name)
5344
5082
class cmd_tags(Command):
5345
__doc__ = """List tags.
5347
5085
This command shows a table of tag names and the revisions they reference.
5399
5140
tags.sort(key=lambda x: timestamps[x[1]])
5400
5141
if not show_ids:
5401
5142
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5411
tags[index] = (tag, revno)
5143
revno_map = branch.get_revision_id_to_revno_map()
5144
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5145
for tag, revid in tags ]
5413
5146
for tag, revspec in tags:
5414
5147
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5150
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5151
"""Reconfigure the type of a bzr directory.
5420
5153
A target configuration must be specified.
5452
5185
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5186
Option('force',
5454
help='Perform reconfiguration even if local changes'
5456
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
5187
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5191
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5192
directory = bzrdir.BzrDir.open(location)
5470
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5472
elif stacked_on is not None:
5473
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5475
reconfigure.ReconfigureUnstacked().apply(directory)
5476
# At the moment you can use --stacked-on and a different
5477
# reconfiguration shape at the same time; there seems no good reason
5479
5193
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5194
raise errors.BzrCommandError('No target configuration specified')
5485
5195
elif target_type == 'branch':
5486
5196
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5197
elif target_type == 'tree':
5524
5234
/path/to/newbranch.
5526
5236
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5237
locally, in which case switching will update the the local nickname to be
5528
5238
that of the master.
5531
takes_args = ['to_location?']
5241
takes_args = ['to_location']
5532
5242
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
5535
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
5243
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5246
def run(self, to_location, force=False):
5542
5247
from bzrlib import switch
5543
5248
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5249
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5250
branch = control_dir.open_branch()
5552
branch = control_dir.open_branch()
5553
had_explicit_nick = branch.get_config().has_explicit_nickname()
5252
to_branch = Branch.open(to_location)
5554
5253
except errors.NotBranchError:
5556
had_explicit_nick = False
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
5573
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5580
if had_explicit_nick:
5254
this_branch = control_dir.open_branch()
5255
# This may be a heavy checkout, where we want the master branch
5256
this_url = this_branch.get_bound_location()
5257
# If not, use a local sibling
5258
if this_url is None:
5259
this_url = this_branch.base
5260
to_branch = Branch.open(
5261
urlutils.join(this_url, '..', to_location))
5262
switch.switch(control_dir, to_branch, force)
5263
if branch.get_config().has_explicit_nickname():
5581
5264
branch = control_dir.open_branch() #get the new branch!
5582
5265
branch.nick = to_branch.nick
5583
5266
note('Switched to branch: %s',
5584
5267
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5601
return control_dir.root_transport.base
5604
5270
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5271
"""Manage filtered views.
5607
5273
Views provide a mask over the tree so that users can focus on
5608
5274
a subset of a tree when doing their work. After creating a view,
5849
5490
if writer is None:
5850
5491
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5493
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5494
message, destroy=destroy).run()
5858
5495
except errors.UserAbort:
5861
5498
def run_for_list(self):
5862
5499
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5502
manager = tree.get_shelf_manager()
5503
shelves = manager.active_shelves()
5504
if len(shelves) == 0:
5505
note('No shelved changes.')
5507
for shelf_id in reversed(shelves):
5508
message = manager.get_metadata(shelf_id).get('message')
5510
message = '<no message>'
5511
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5517
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5518
"""Restore shelved changes.
5880
5520
By default, the most recently shelved changes are restored. However if you
5881
5521
specify a shelf by id those changes will be restored instead. This works
5940
5573
dry_run=dry_run, no_prompt=force)
5943
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5946
If no arguments are provided, lists the branch locations for nested trees.
5947
If one argument is provided, display the branch location for that tree.
5948
If two arguments are provided, set the branch location for that tree.
5953
takes_args = ['path?', 'location?']
5955
def run(self, path=None, location=None):
5957
if path is not None:
5959
tree, branch, relpath =(
5960
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5961
if path is not None:
5964
tree = branch.basis_tree()
5966
info = branch._get_all_reference_info().iteritems()
5967
self._display_reference_info(tree, branch, info)
5576
def _create_prefix(cur_transport):
5577
needed = [cur_transport]
5578
# Recurse upwards until we can create a directory successfully
5580
new_transport = cur_transport.clone('..')
5581
if new_transport.base == cur_transport.base:
5582
raise errors.BzrCommandError(
5583
"Failed to create path prefix for %s."
5584
% cur_transport.base)
5586
new_transport.mkdir('.')
5587
except errors.NoSuchFile:
5588
needed.append(new_transport)
5589
cur_transport = new_transport
5969
file_id = tree.path2id(path)
5971
raise errors.NotVersionedError(path)
5972
if location is None:
5973
info = [(file_id, branch.get_reference_info(file_id))]
5974
self._display_reference_info(tree, branch, info)
5976
branch.set_reference_info(file_id, path, location)
5978
def _display_reference_info(self, tree, branch, info):
5980
for file_id, (path, location) in info:
5982
path = tree.id2path(file_id)
5983
except errors.NoSuchId:
5985
ref_list.append((path, location))
5986
for path, location in sorted(ref_list):
5987
self.outf.write('%s %s\n' % (path, location))
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5592
# Now we only need to create child directories
5594
cur_transport = needed.pop()
5595
cur_transport.ensure_base()
5598
# these get imported and then picked up by the scan for cmd_*
5599
# TODO: Some more consistent way to split command definitions across files;
5600
# we do need to load at least some information about them to know of
5601
# aliases. ideally we would avoid loading the implementation until the
5602
# details were needed.
5603
from bzrlib.cmd_version_info import cmd_version_info
5604
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5605
from bzrlib.bundle.commands import (
5608
from bzrlib.sign_my_commits import cmd_sign_my_commits
5609
from bzrlib.weave_commands import cmd_versionedfile_list, \
5610
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
