88
80
def tree_files_for_add(file_list):
90
Return a tree and list of absolute paths from a file list.
92
Similar to tree_files, but add handles files a bit differently, so it a
93
custom implementation. In particular, MutableTreeTree.smart_add expects
94
absolute paths, which it immediately converts to relative paths.
96
# FIXME Would be nice to just return the relative paths like
97
# internal_tree_files does, but there are a large number of unit tests
98
# that assume the current interface to mutabletree.smart_add
81
"""Add handles files a bit differently so it a custom implementation."""
100
tree, relpath = WorkingTree.open_containing(file_list[0])
83
tree = WorkingTree.open_containing(file_list[0])[0]
101
84
if tree.supports_views():
102
85
view_files = tree.views.lookup_view()
104
for filename in file_list:
105
if not osutils.is_inside_any(view_files, filename):
106
raise errors.FileOutsideView(filename, view_files)
107
file_list = file_list[:]
108
file_list[0] = tree.abspath(relpath)
86
for filename in file_list:
87
if not osutils.is_inside_any(view_files, filename):
88
raise errors.FileOutsideView(filename, view_files)
110
90
tree = WorkingTree.open_containing(u'.')[0]
111
91
if tree.supports_views():
362
321
' --revision or a revision_id')
363
322
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')
324
# TODO: jam 20060112 should cat-revision always output utf-8?
325
if revision_id is not None:
326
revision_id = osutils.safe_revision_id(revision_id, warn=False)
328
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
329
except errors.NoSuchRevision:
330
msg = "The repository %s contains no revision %s." % (b.repository.base,
332
raise errors.BzrCommandError(msg)
333
elif revision is not None:
336
raise errors.BzrCommandError('You cannot specify a NULL'
338
rev_id = rev.as_revision_id(b)
339
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
342
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
343
"""Dump the contents of a btree index file to stdout.
395
345
PATH is a btree index file, it can be any URL. This includes things like
396
346
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
422
To re-create the working tree, use "bzr checkout".
481
424
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
425
takes_args = ['location?']
483
426
takes_options = [
485
428
help='Remove the working tree even if it has '
486
429
'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()
432
def run(self, location='.', force=False):
433
d = bzrdir.BzrDir.open(location)
436
working = d.open_workingtree()
437
except errors.NoWorkingTree:
438
raise errors.BzrCommandError("No working tree to remove")
439
except errors.NotLocalUrl:
440
raise errors.BzrCommandError("You cannot remove the working tree of a "
443
changes = working.changes_from(working.basis_tree())
444
if changes.has_changed():
445
raise errors.UncommittedChanges(working)
447
working_path = working.bzrdir.root_transport.base
448
branch_path = working.branch.bzrdir.root_transport.base
449
if working_path != branch_path:
450
raise errors.BzrCommandError("You cannot remove the working tree from "
451
"a lightweight checkout")
453
d.destroy_workingtree()
514
456
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
457
"""Show current revision number.
517
459
This is equal to the number of revisions on this branch.
520
462
_see_also = ['info']
521
463
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')
466
def run(self, location=u'.'):
467
self.outf.write(str(Branch.open_containing(location)[0].revno()))
468
self.outf.write('\n')
548
471
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
472
"""Show revision number and revision id for a given revision identifier.
552
475
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=[]):
487
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
490
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
491
revs.extend(revision)
579
492
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:
493
for rev in revision_info_list:
494
revs.append(RevisionSpec.from_string(rev))
496
b = Branch.open_containing(directory)[0]
499
revs.append(RevisionSpec.from_string('-1'))
502
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)
504
revno = '%4d' % (b.revision_id_to_revno(revision_id))
598
505
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]))
506
dotted_map = b.get_revision_id_to_revno_map()
507
revno = '.'.join(str(i) for i in dotted_map[revision_id])
508
print '%s %s' % (revno, revision_id)
608
511
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
512
"""Add specified files or directories.
611
514
In non-recursive mode, all the named items are added, regardless
612
515
of whether they were previously ignored. A warning is given if
677
577
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)
580
base_tree.lock_read()
582
file_list = self._maybe_expand_globs(file_list)
583
tree, file_list = tree_files_for_add(file_list)
584
added, ignored = tree.smart_add(file_list, not
585
no_recurse, action=action, save=not dry_run)
587
if base_tree is not None:
685
589
if len(ignored) > 0:
687
591
for glob in sorted(ignored.keys()):
688
592
for path in ignored[glob]:
689
593
self.outf.write("ignored %s matching \"%s\"\n"
597
for glob, paths in ignored.items():
598
match_len += len(paths)
599
self.outf.write("ignored %d file(s).\n" % match_len)
600
self.outf.write("If you wish to add some of these files,"
601
" please add them by name.\n")
693
604
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
605
"""Create a new versioned directory.
696
607
This is equivalent to creating the directory and then adding it.
756
662
revision = _get_one_revision('inventory', revision)
757
663
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()
664
work_tree.lock_read()
666
if revision is not None:
667
tree = revision.as_tree(work_tree.branch)
669
extra_trees = [work_tree]
675
if file_list is not None:
676
file_ids = tree.paths2ids(file_list, trees=extra_trees,
677
require_versioned=True)
678
# find_ids_across_trees may include some paths that don't
680
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
681
for file_id in file_ids if file_id in tree)
683
entries = tree.inventory.entries()
686
if tree is not work_tree:
779
689
for path, entry in entries:
780
690
if kind and kind != entry.kind:
810
720
takes_args = ['names*']
811
721
takes_options = [Option("after", help="Move only the bzr identifier"
812
722
" of the file, because the file has already been moved."),
813
Option('auto', help='Automatically guess renames.'),
814
Option('dry-run', help='Avoid making changes when guessing renames.'),
816
724
aliases = ['move', 'rename']
817
725
encoding_type = 'replace'
819
def run(self, names_list, after=False, auto=False, dry_run=False):
821
return self.run_auto(names_list, after, dry_run)
823
raise errors.BzrCommandError('--dry-run requires --auto.')
727
def run(self, names_list, after=False):
824
728
if names_list is None:
826
731
if len(names_list) < 2:
827
732
raise errors.BzrCommandError("missing file argument")
828
733
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
832
def run_auto(self, names_list, after, dry_run):
833
if names_list is not None and len(names_list) > 1:
834
raise errors.BzrCommandError('Only one path may be specified to'
837
raise errors.BzrCommandError('--after cannot be specified with'
839
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
736
self._run(tree, names_list, rel_names, after)
843
740
def _run(self, tree, names_list, rel_names, after):
844
741
into_existing = osutils.isdir(names_list[-1])
917
813
dest = osutils.pathjoin(dest_parent, dest_tail)
918
814
mutter("attempting to move %s => %s", src, dest)
919
815
tree.rename_one(src, dest, after=after)
921
self.outf.write("%s => %s\n" % (src, dest))
816
self.outf.write("%s => %s\n" % (src, dest))
924
819
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
820
"""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
822
This command only works on branches that have not diverged. Branches are
823
considered diverged if the destination branch's most recent commit is one
824
that has not been merged (directly or indirectly) into the parent.
932
826
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
827
from one into the other. Once one branch has merged, the other should
934
828
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.
830
If you want to forget your local changes and just update your branch to
831
match the remote one, use pull --overwrite.
940
833
If there is no default location set, the first pull will set it. After
941
834
that, you can omit the location to use the default. To change the
1026
908
if revision is not None:
1027
909
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)
911
branch_to.lock_write()
913
if tree_to is not None:
914
view_info = _get_view_info_for_change_reporter(tree_to)
915
change_reporter = delta._ChangeReporter(
916
unversioned_filter=tree_to.is_ignored, view_info=view_info)
917
result = tree_to.pull(branch_from, overwrite, revision_id,
919
possible_transports=possible_transports)
921
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,
923
result.report(self.outf)
924
if verbose and result.old_revid != result.new_revid:
925
log.show_branch_change(branch_to, self.outf, result.old_revno,
1048
931
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
932
"""Update a mirror of this branch.
1051
934
The target branch will not have its working tree populated because this
1052
935
is both expensive, and is not supported on remote file systems.
1105
985
def run(self, location=None, remember=False, overwrite=False,
1106
986
create_prefix=False, verbose=False, revision=None,
1107
987
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1109
989
from bzrlib.push import _show_push_branch
991
# Get the source branch and revision_id
1111
992
if directory is None:
1113
# Get the source branch
1115
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1116
# Get the tip's revision_id
994
br_from = Branch.open_containing(directory)[0]
1117
995
revision = _get_one_revision('push', revision)
1118
996
if revision is not None:
1119
997
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.')
999
revision_id = br_from.last_revision()
1127
1001
# Get the stacked_on branch, if any
1128
1002
if stacked_on is not None:
1129
1003
stacked_on = urlutils.normalize_url(stacked_on)
1180
1054
help='Hard-link working tree files where possible.'),
1181
1055
Option('no-tree',
1182
1056
help="Create a branch without a working-tree."),
1184
help="Switch the checkout in the current directory "
1185
"to the new branch."),
1186
1057
Option('stacked',
1187
1058
help='Create a stacked branch referring to the source branch. '
1188
1059
'The new branch will depend on the availability of the source '
1189
1060
'branch for all operations.'),
1190
1061
Option('standalone',
1191
1062
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
1064
aliases = ['get', 'clone']
1202
1066
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
1067
hardlink=False, stacked=False, standalone=False, no_tree=False):
1206
1068
from bzrlib.tag import _merge_tags_if_possible
1207
1070
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1072
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)
1075
if revision is not None:
1076
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'))
1078
# FIXME - wt.last_revision, fallback to branch, fall back to
1079
# None or perhaps NULL_REVISION to mean copy nothing
1081
revision_id = br_from.last_revision()
1082
if to_location is None:
1083
to_location = urlutils.derive_to_location(from_location)
1084
to_transport = transport.get_transport(to_location)
1086
to_transport.mkdir('.')
1087
except errors.FileExists:
1088
raise errors.BzrCommandError('Target directory "%s" already'
1089
' exists.' % to_location)
1090
except errors.NoSuchFile:
1091
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1094
# preserve whatever source format we have.
1095
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1096
possible_transports=[to_transport],
1097
accelerator_tree=accelerator_tree,
1098
hardlink=hardlink, stacked=stacked,
1099
force_new_repo=standalone,
1100
create_tree_if_local=not no_tree,
1101
source_branch=br_from)
1102
branch = dir.open_branch()
1103
except errors.NoSuchRevision:
1104
to_transport.delete_tree('.')
1105
msg = "The branch %s has no revision %s." % (from_location,
1107
raise errors.BzrCommandError(msg)
1108
_merge_tags_if_possible(br_from, branch)
1109
# If the source branch is stacked, the new branch may
1110
# be stacked whether we asked for that explicitly or not.
1111
# We therefore need a try/except here and not just 'if stacked:'
1113
note('Created new stacked branch referring to %s.' %
1114
branch.get_stacked_on_url())
1115
except (errors.NotStacked, errors.UnstackableBranchFormat,
1116
errors.UnstackableRepositoryFormat), e:
1117
note('Branched %d revision(s).' % branch.revno())
1275
1122
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1123
"""Create a new checkout of an existing branch.
1278
1125
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1126
the branch found in '.'. This is useful if you have removed the working tree
1353
1200
@display_command
1354
1201
def run(self, dir=u'.'):
1355
1202
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))
1205
new_inv = tree.inventory
1206
old_tree = tree.basis_tree()
1207
old_tree.lock_read()
1209
old_inv = old_tree.inventory
1211
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1212
for f, paths, c, v, p, n, k, e in iterator:
1213
if paths[0] == paths[1]:
1217
renames.append(paths)
1219
for old_name, new_name in renames:
1220
self.outf.write("%s => %s\n" % (old_name, new_name))
1374
1227
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1228
"""Update a tree to have the latest code committed to its branch.
1377
1230
This will perform a merge into the working tree, and may generate
1378
1231
conflicts. If you have any local changes, you will still
1381
1234
If you want to discard your local changes, you can just do a
1382
1235
'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
1238
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1239
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1240
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")
1242
def run(self, dir='.'):
1397
1243
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1244
possible_transports = []
1400
master = branch.get_master_branch(
1245
master = tree.branch.get_master_branch(
1401
1246
possible_transports=possible_transports)
1402
1247
if master is not None:
1403
branch_location = master.base
1404
1248
tree.lock_write()
1406
branch_location = tree.branch.base
1407
1250
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)
1252
existing_pending_merges = tree.get_parent_ids()[1:]
1253
last_rev = _mod_revision.ensure_null(tree.last_revision())
1254
if last_rev == _mod_revision.ensure_null(
1255
tree.branch.last_revision()):
1256
# may be up to date, check master too.
1257
if master is None or last_rev == _mod_revision.ensure_null(
1258
master.last_revision()):
1259
revno = tree.branch.revision_id_to_revno(last_rev)
1260
note("Tree is up to date at revision %d." % (revno,))
1262
view_info = _get_view_info_for_change_reporter(tree)
1435
1263
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'.")
1264
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1265
view_info=view_info), possible_transports=possible_transports)
1266
revno = tree.branch.revision_id_to_revno(
1267
_mod_revision.ensure_null(tree.last_revision()))
1268
note('Updated to revision %d.' % (revno,))
1269
if tree.get_parent_ids()[1:] != existing_pending_merges:
1270
note('Your local commits will now show as pending merges with '
1271
"'bzr status', and can be committed with 'bzr commit'.")
1460
1280
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1281
"""Show information about a working tree, branch or repository.
1463
1283
This command will show all known locations and formats associated to the
1464
1284
tree, branch or repository.
1530
1350
if file_list is not None:
1531
1351
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')
1355
# Heuristics should probably all move into tree.remove_smart or
1358
added = tree.changes_from(tree.basis_tree(),
1359
specific_files=file_list).added
1360
file_list = sorted([f[0] for f in added], reverse=True)
1361
if len(file_list) == 0:
1362
raise errors.BzrCommandError('No matching files.')
1363
elif file_list is None:
1364
# missing files show up in iter_changes(basis) as
1365
# versioned-with-no-kind.
1367
for change in tree.iter_changes(tree.basis_tree()):
1368
# Find paths in the working tree that have no kind:
1369
if change[1][1] is not None and change[6][1] is None:
1370
missing.append(change[1][1])
1371
file_list = sorted(missing, reverse=True)
1372
file_deletion_strategy = 'keep'
1373
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1374
keep_files=file_deletion_strategy=='keep',
1375
force=file_deletion_strategy=='force')
1557
1380
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1381
"""Print file_id of a particular file or directory.
1560
1383
The file_id is assigned when the file is first added and remains the
1561
1384
same through all revisions where the file exists, even when it is
1961
1759
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1760
' 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)
1762
old_tree, new_tree, specific_files, extra_trees = \
1763
_get_trees_to_diff(file_list, revision, old, new,
1972
1765
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1766
specific_files=specific_files,
1974
1767
external_diff_options=diff_options,
1975
1768
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1769
extra_trees=extra_trees, using=using)
1980
1772
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1773
"""List files deleted in the working tree.
1983
1775
# TODO: Show files deleted since a previous revision, or
1984
1776
# between two revisions.
2209
2019
:Tips & tricks:
2211
2021
GUI tools and IDEs are often better at exploring history than command
2212
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2022
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2023
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2024
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2026
Web interfaces are often better at exploring history than command line
2027
tools, particularly for branches on servers. You may prefer Loggerhead
2028
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2217
2030
You may find it useful to add the aliases below to ``bazaar.conf``::
2221
top = log -l10 --line
2034
top = log -r-10.. --short --forward
2035
show = log -v -p -n1 --long
2224
2037
``bzr tip`` will then show the latest revision while ``bzr top``
2225
2038
will show the last 10 mainline revisions. To see the details of a
2226
2039
particular revision X, ``bzr show -rX``.
2228
If you are interested in looking deeper into a particular merge X,
2229
use ``bzr log -n0 -rX``.
2041
As many GUI tools and Web interfaces do, you may prefer viewing
2042
history collapsed initially. If you are interested in looking deeper
2043
into a particular merge X, use ``bzr log -n0 -rX``. If you like
2044
working this way, you may wish to either:
2046
* change your default log format to short (or line)
2047
* add this alias: log = log -n1
2231
2049
``bzr log -v`` on a branch with lots of history is currently
2232
2050
very slow. A fix for this issue is currently under development.
2357
2146
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
2147
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
2151
rev1, rev2 = _get_revision_range(revision, b, self.name())
2362
# Decide on the type of delta & diff filtering to use
2363
# TODO: add an --all-files option to make this configurable & consistent
2371
diff_type = 'partial'
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)
2152
if log_format is None:
2153
log_format = log.log_formatter_registry.get_default(b)
2155
lf = log_format(show_ids=show_ids, to_file=self.outf,
2156
show_timezone=timezone,
2157
delta_format=get_verbosity_level(),
2164
direction=direction,
2165
start_revision=rev1,
2169
show_diff=show_diff)
2416
2174
def _get_revision_range(revisionspec_list, branch, command_name):
2417
2175
"""Take the input of a revision option and turn it into a revision range.
2419
2177
It returns RevisionInfo objects which can be used to obtain the rev_id's
2420
of the desired revisions. It does some user input validations.
2178
of the desired revisons. It does some user input validations.
2422
2180
if revisionspec_list is None:
2560
2310
apply_view = True
2561
2311
view_str = views.view_display_str(view_files)
2562
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')
2312
note("ignoring files outside view: %s" % view_str)
2316
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2317
if fp.startswith(relpath):
2318
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2319
if non_recursive and '/' in fp:
2321
if not all and not selection[fc]:
2323
if kind is not None and fkind != kind:
2327
views.check_path_in_view(tree, fp)
2328
except errors.FileOutsideView:
2330
kindch = entry.kind_character()
2331
outstring = fp + kindch
2333
outstring = '%-8s %s' % (fc, outstring)
2334
if show_ids and fid is not None:
2335
outstring = "%-50s %s" % (outstring, fid)
2336
self.outf.write(outstring + '\n')
2338
self.outf.write(fp + '\0')
2341
self.outf.write(fid)
2342
self.outf.write('\0')
2350
self.outf.write('%-50s %s\n' % (outstring, my_id))
2352
self.outf.write(outstring + '\n')
2611
2357
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2358
"""List unknown files.
2624
2370
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2371
"""Ignore specified files or patterns.
2627
2373
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
2375
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2376
After adding, editing or deleting that file either indirectly by
2637
2377
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
2380
Note: ignore patterns containing shell wildcards must be quoted from
2654
2381
the shell on Unix.
2677
2400
Ignore everything but the "debian" toplevel directory::
2679
2402
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
2405
_see_also = ['status', 'ignored', 'patterns']
2690
2406
takes_args = ['name_pattern*']
2691
2407
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2408
Option('old-default-rules',
2409
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2412
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2413
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)
2414
if old_default_rules is not None:
2415
# dump the rules and exit
2416
for pattern in ignores.OLD_DEFAULTS:
2703
2419
if not name_pattern_list:
2704
2420
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2421
"NAME_PATTERN or --old-default-rules")
2706
2422
name_pattern_list = [globbing.normalize_pattern(p)
2707
2423
for p in name_pattern_list]
2708
2424
for name_pattern in name_pattern_list:
2915
2631
chunks = content.splitlines(True)
2916
2632
content = filtered_output_bytes(chunks, filters,
2917
2633
ContentFilterContext(relpath, rev_tree))
2919
2634
self.outf.writelines(content)
2922
2636
self.outf.write(content)
2925
2639
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2640
"""Show the offset in seconds from GMT to local time."""
2928
2642
@display_command
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2644
print osutils.local_time_offset()
2934
2648
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.)
2649
"""Commit changes into a new revision.
2651
If no arguments are given, the entire tree is committed.
2653
If selected files are specified, only changes to those files are
2654
committed. If a directory is specified then the directory and everything
2655
within it is committed.
2657
When excludes are given, they take precedence over selected files.
2658
For example, too commit only changes within foo, but not changes within
2661
bzr commit foo -x foo/bar
2663
If author of the change is not the same person as the committer, you can
2664
specify the author's name using the --author option. The name should be
2665
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2666
If there is more than one author of the change you can specify the option
2667
multiple times, once for each author.
2669
A selected-file commit may fail in some cases where the committed
2670
tree would be invalid. Consider::
2675
bzr commit foo -m "committing foo"
2676
bzr mv foo/bar foo/baz
2679
bzr commit foo/bar -m "committing bar but not baz"
2681
In the example above, the last commit will fail by design. This gives
2682
the user the opportunity to decide whether they want to commit the
2683
rename at the same time, separately first, or not at all. (As a general
2684
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2686
Note: A selected-file commit after a merge is not yet supported.
3007
2688
# TODO: Run hooks on tree to-be-committed, and after commit.
3118
2788
if local and not tree.branch.get_bound_location():
3119
2789
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
2791
def get_message(commit_obj):
3143
2792
"""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,
2793
my_message = message
2794
if my_message is None and not file:
2795
t = make_commit_message_template_encoded(tree,
3153
2796
selected_list, diff=show_diff,
3154
2797
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
2798
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
2799
my_message = edit_commit_message_encoded(t,
3162
2800
start_message=start_message)
3163
2801
if my_message is None:
3164
2802
raise errors.BzrCommandError("please specify a commit"
3165
2803
" message with either --message or --file")
2804
elif my_message and file:
2805
raise errors.BzrCommandError(
2806
"please specify either --message or --file")
2808
my_message = codecs.open(file, 'rt',
2809
osutils.get_user_encoding()).read()
3166
2810
if my_message == "":
3167
2811
raise errors.BzrCommandError("empty commit message specified")
3168
2812
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
2815
tree.commit(message_callback=get_message,
3176
2816
specific_files=selected_list,
3177
2817
allow_pointless=unchanged, strict=strict, local=local,
3178
2818
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3181
2820
exclude=safe_relpath_files(tree, exclude))
3182
2821
except PointlessCommit:
3183
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
2822
# FIXME: This should really happen before the file is read in;
2823
# perhaps prepare the commit; get the message; then actually commit
2824
raise errors.BzrCommandError("no changes to commit."
2825
" use --unchanged to commit anyhow")
3185
2826
except ConflictsInTree:
3186
2827
raise errors.BzrCommandError('Conflicts detected in working '
3187
2828
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3206
2846
The working tree and branch checks will only give output if a problem is
3207
2847
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
2849
revisions: This is just the number of revisions checked. It doesn't
2851
versionedfiles: This is just the number of versionedfiles checked. It
2852
doesn't indicate a problem.
2853
unreferenced ancestors: Texts that are ancestors of other texts, but
2854
are not properly referenced by the revision ancestry. This is a
2855
subtle problem that Bazaar can work around.
2856
unique file texts: This is the total number of unique file contents
2857
seen in the checked revisions. It does not indicate a problem.
2858
repeated file texts: This is the total number of repeated texts seen
2859
in the checked revisions. Texts can be repeated when their file
2860
entries are modified, but the file contents are not. It does not
3232
2863
If no restrictions are specified, all Bazaar data that is found at the given
3233
2864
location will be checked.
3583
3213
raise errors.BzrCommandError("subunit not available. subunit "
3584
3214
"needs to be installed to use --subunit.")
3585
3215
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
self.additional_selftest_args.setdefault(
3593
'suite_decorators', []).append(parallel)
3595
3217
test_suite_factory = benchmarks.test_suite
3596
3218
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
3219
verbose = not is_quiet()
3598
3220
# TODO: should possibly lock the history file...
3599
3221
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
3223
test_suite_factory = None
3603
3224
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)
3226
selftest_kwargs = {"verbose": verbose,
3228
"stop_on_failure": one,
3229
"transport": transport,
3230
"test_suite_factory": test_suite_factory,
3231
"lsprof_timed": lsprof_timed,
3232
"bench_history": benchfile,
3233
"matching_tests_first": first,
3234
"list_only": list_only,
3235
"random_seed": randomize,
3236
"exclude_pattern": exclude,
3238
"load_list": load_list,
3239
"debug_flags": debugflag,
3240
"starting_with": starting_with
3242
selftest_kwargs.update(self.additional_selftest_args)
3243
result = selftest(**selftest_kwargs)
3245
if benchfile is not None:
3248
note('tests passed')
3250
note('tests failed')
3623
3251
return int(not result)
3626
3254
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3255
"""Show version of bzr."""
3629
3257
encoding_type = 'replace'
3630
3258
takes_options = [
3793
3408
verified = 'inapplicable'
3794
3409
tree = WorkingTree.open_containing(directory)[0]
3411
# die as quickly as possible if there are uncommitted changes
3797
3413
basis_tree = tree.revision_tree(tree.last_revision())
3798
3414
except errors.NoSuchRevision:
3799
3415
basis_tree = tree.basis_tree()
3801
# die as quickly as possible if there are uncommitted changes
3803
if tree.has_changes():
3417
changes = tree.changes_from(basis_tree)
3418
if changes.has_changed():
3804
3419
raise errors.UncommittedChanges(tree)
3806
3421
view_info = _get_view_info_for_change_reporter(tree)
3807
3422
change_reporter = delta._ChangeReporter(
3808
3423
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:
3426
pb = ui.ui_factory.nested_progress_bar()
3427
cleanups.append(pb.finished)
3429
cleanups.append(tree.unlock)
3430
if location is not None:
3432
mergeable = bundle.read_mergeable_from_url(location,
3433
possible_transports=possible_transports)
3434
except errors.NotABundle:
3438
raise errors.BzrCommandError('Cannot use --uncommitted'
3439
' with bundles or merge directives.')
3441
if revision is not None:
3442
raise errors.BzrCommandError(
3443
'Cannot use -r with merge directives or bundles')
3444
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3447
if merger is None and uncommitted:
3448
if revision is not None and len(revision) > 0:
3449
raise errors.BzrCommandError('Cannot use --uncommitted and'
3450
' --revision at the same time.')
3451
location = self._select_branch_location(tree, location)[0]
3452
other_tree, other_path = WorkingTree.open_containing(location)
3453
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3455
allow_pending = False
3456
if other_path != '':
3457
merger.interesting_files = [other_path]
3460
merger, allow_pending = self._get_merger_from_branch(tree,
3461
location, revision, remember, possible_transports, pb)
3463
merger.merge_type = merge_type
3464
merger.reprocess = reprocess
3465
merger.show_base = show_base
3466
self.sanity_check_merger(merger)
3467
if (merger.base_rev_id == merger.other_rev_id and
3468
merger.other_rev_id is not None):
3469
note('Nothing to do.')
3472
if merger.interesting_files is not None:
3473
raise errors.BzrCommandError('Cannot pull individual files')
3474
if (merger.base_rev_id == tree.last_revision()):
3475
result = tree.pull(merger.other_branch, False,
3476
merger.other_rev_id)
3477
result.report(self.outf)
3479
merger.check_basis(False)
3481
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):
3483
return self._do_merge(merger, change_reporter, allow_pending,
3486
for cleanup in reversed(cleanups):
3489
def _do_preview(self, merger):
3490
from bzrlib.diff import show_diff_trees
3869
3491
tree_merger = merger.make_merger()
3870
3492
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='')
3494
result_tree = tt.get_preview_tree()
3495
show_diff_trees(merger.this_tree, result_tree, self.outf,
3496
old_label='', new_label='')
3881
3500
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3501
merger.change_reporter = change_reporter
4067
3654
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3655
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3656
if merge_type is None:
4071
3657
merge_type = _mod_merge.Merge3Merger
4072
3658
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":
3661
parents = tree.get_parent_ids()
3662
if len(parents) != 2:
3663
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3664
" merges. Not cherrypicking or"
3666
repository = tree.branch.repository
3667
interesting_ids = None
3669
conflicts = tree.conflicts()
3670
if file_list is not None:
3671
interesting_ids = set()
3672
for filename in file_list:
3673
file_id = tree.path2id(filename)
3675
raise errors.NotVersionedError(filename)
3676
interesting_ids.add(file_id)
3677
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:
3680
for name, ie in tree.inventory.iter_entries(file_id):
3681
interesting_ids.add(ie.file_id)
3682
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3684
# Remerge only supports resolving contents conflicts
3685
allowed_conflicts = ('text conflict', 'contents conflict')
3686
restore_files = [c.path for c in conflicts
3687
if c.typestring in allowed_conflicts]
3688
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3689
tree.set_conflicts(ConflictList(new_conflicts))
3690
if file_list is not None:
3691
restore_files = file_list
3692
for filename in restore_files:
3694
restore(tree.abspath(filename))
3695
except errors.NotConflicted:
3697
# Disable pending merges, because the file texts we are remerging
3698
# have not had those merges performed. If we use the wrong parents
3699
# list, we imply that the working tree text has seen and rejected
3700
# all the changes from the other tree, when in fact those changes
3701
# have not yet been seen.
3702
pb = ui.ui_factory.nested_progress_bar()
3703
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()
3705
merger = _mod_merge.Merger.from_revision_ids(pb,
3707
merger.interesting_ids = interesting_ids
3708
merger.merge_type = merge_type
3709
merger.show_base = show_base
3710
merger.reprocess = reprocess
3711
conflicts = merger.do_merge()
3713
tree.set_parent_ids(parents)
4124
tree.set_parent_ids(parents)
4125
3717
if conflicts > 0:
4149
3741
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
3744
Any files that have been newly added since that revision will be deleted,
3745
with a backup kept if appropriate. Directories containing unknown files
3746
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
3748
The working tree contains a list of pending merged revisions, which will
3749
be included as parents in the next commit. Normally, revert clears that
3750
list as well as reverting the files. If any files are specified, revert
3751
leaves the pending merge list alone and reverts only the files. Use "bzr
3752
revert ." in the tree root to revert all files but keep the merge record,
3753
and "bzr revert --forget-merges" to clear the pending merge list without
4164
3754
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
3757
_see_also = ['cat', 'export']
4186
3766
def run(self, revision=None, no_backup=False, file_list=None,
4187
3767
forget_merges=None):
4188
3768
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)
3772
tree.set_parent_ids(tree.get_parent_ids()[:1])
3774
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4196
3779
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
3780
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)
3781
pb = ui.ui_factory.nested_progress_bar()
3783
tree.revert(file_list, rev_tree, not no_backup, pb,
3784
report_changes=True)
4202
3789
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
3790
"""Test reporting of assertion failures"""
4204
3791
# intended just for use in testing
4355
3933
_get_revision_range(revision,
4356
3934
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")
3936
local_branch.lock_read()
3938
remote_branch.lock_read()
3940
local_extra, remote_extra = find_unmerged(
3941
local_branch, remote_branch, restrict,
3942
backward=not reverse,
3943
include_merges=include_merges,
3944
local_revid_range=local_revid_range,
3945
remote_revid_range=remote_revid_range)
3947
if log_format is None:
3948
registry = log.log_formatter_registry
3949
log_format = registry.get_default(local_branch)
3950
lf = log_format(to_file=self.outf,
3952
show_timezone='original')
3955
if local_extra and not theirs_only:
3956
message("You have %d extra revision(s):\n" %
3958
for revision in iter_log_revisions(local_extra,
3959
local_branch.repository,
3961
lf.log_revision(revision)
3962
printed_local = True
3965
printed_local = False
3967
if remote_extra and not mine_only:
3968
if printed_local is True:
3970
message("You are missing %d revision(s):\n" %
3972
for revision in iter_log_revisions(remote_extra,
3973
remote_branch.repository,
3975
lf.log_revision(revision)
3978
if mine_only and not local_extra:
3979
# We checked local, and found nothing extra
3980
message('This branch is up to date.\n')
3981
elif theirs_only and not remote_extra:
3982
# We checked remote, and found nothing extra
3983
message('Other branch is up to date.\n')
3984
elif not (mine_only or theirs_only or local_extra or
3986
# We checked both branches, and neither one had extra
3988
message("Branches are up to date.\n")
3990
remote_branch.unlock()
3992
local_branch.unlock()
4408
3993
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)
3994
local_branch.lock_write()
3996
# handle race conditions - a parent might be set while we run.
3997
if local_branch.get_parent() is None:
3998
local_branch.set_parent(remote_branch.base)
4000
local_branch.unlock()
4413
4001
return status_code
4416
4004
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.
4005
"""Compress the data within a repository."""
4435
4007
_see_also = ['repositories']
4436
4008
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):
4010
def run(self, branch_or_repo='.'):
4442
4011
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
4013
branch = dir.open_branch()
4445
4014
repository = branch.repository
4446
4015
except errors.NotBranchError:
4447
4016
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
4020
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4021
"""List the installed plugins.
4454
4023
This command displays the list of installed plugins including
4455
4024
version of plugin and a short description of each.
4552
4124
wt, branch, relpath = \
4553
4125
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4126
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,
4131
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4133
file_id = wt.path2id(relpath)
4135
file_id = tree.path2id(relpath)
4137
raise errors.NotVersionedError(filename)
4138
file_version = tree.inventory[file_id].revision
4139
if wt is not None and revision is None:
4140
# If there is a tree and we're not annotating historical
4141
# versions, annotate the working tree's content.
4142
annotate_file_tree(wt, file_id, self.outf, long, all,
4145
annotate_file(branch, file_version, file_id, long, all, self.outf,
4577
4154
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4155
"""Create a digital signature for an existing revision."""
4579
4156
# TODO be able to replace existing ones.
4581
4158
hidden = True # is this right ?
4785
4368
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4371
print 'Dry-run, pretending to remove the above revisions.'
4373
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')
4375
print 'The above revision(s) will be removed.'
4377
val = raw_input('Are you sure [y/N]? ')
4378
if val.lower() not in ('y', 'yes'):
4798
4382
mutter('Uncommitting from {%s} to {%s}',
4799
4383
last_rev_id, rev_id)
4800
4384
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4385
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)
4386
note('You can restore the old tip by running:\n'
4387
' bzr pull . -r revid:%s', last_rev_id)
4806
4390
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4391
"""Break a dead lock on a repository, branch or working directory.
4809
4393
CAUTION: Locks should only be broken when you are sure that the process
4810
4394
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4396
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
4401
takes_args = ['location?']
4866
4444
Option('allow-writes',
4867
4445
help='By default the server is a readonly server. Supplying '
4868
4446
'--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 '
4447
'the served directory and below.'
4451
def run_smart_server(self, smart_server):
4452
"""Run 'smart_server' forever, with no UI output at all."""
4453
# For the duration of this server, no UI output is permitted. note
4454
# that this may cause problems with blackbox tests. This should be
4455
# changed with care though, as we dont want to use bandwidth sending
4456
# progress over stderr to smart server clients!
4457
from bzrlib import lockdir
4458
old_factory = ui.ui_factory
4459
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4461
ui.ui_factory = ui.SilentUIFactory()
4462
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4463
smart_server.serve()
4465
ui.ui_factory = old_factory
4466
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4877
4468
def get_host_and_port(self, port):
4878
4469
"""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.
4471
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4472
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4882
4474
If 'port' has a colon in it, the string before the colon will be
4883
4475
interpreted as the host.
4886
4478
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
4479
and port is an integer TCP/IP port.
4890
if port is not None:
4481
from bzrlib.smart import medium
4482
host = medium.BZR_DEFAULT_INTERFACE
4484
port = medium.BZR_DEFAULT_PORT
4891
4486
if ':' in port:
4892
4487
host, port = port.split(':')
4893
4488
port = int(port)
4894
4489
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
4491
def get_smart_server(self, transport, inet, port):
4492
"""Construct a smart server.
4494
:param transport: The base transport from which branches will be
4496
:param inet: If True, serve over stdin and stdout. Used for running
4498
:param port: The port to listen on. By default, it's `
4499
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4501
:return: A smart server.
4503
from bzrlib.smart import medium, server
4505
smart_server = medium.SmartServerPipeStreamMedium(
4506
sys.stdin, sys.stdout, transport)
4508
host, port = self.get_host_and_port(port)
4509
smart_server = server.SmartTCPServer(
4510
transport, host=host, port=port)
4511
note('listening on port: %s' % smart_server.port)
4514
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4515
from bzrlib.transport import get_transport
4516
from bzrlib.transport.chroot import ChrootServer
4899
4517
if directory is None:
4900
4518
directory = os.getcwd()
4901
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
4519
url = urlutils.local_path_to_url(directory)
4905
4520
if not allow_writes:
4906
4521
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
4522
chroot_server = ChrootServer(get_transport(url))
4523
chroot_server.setUp()
4524
t = get_transport(chroot_server.get_url())
4525
smart_server = self.get_smart_server(t, inet, port)
4526
self.run_smart_server(smart_server)
4911
4529
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4530
"""Combine a subtree into its containing tree.
4914
This command requires the target tree to be in a rich-root format.
4532
This command is for experimental use only. It requires the target tree
4533
to be in dirstate-with-subtree format, which cannot be converted into
4916
4536
The TREE argument should be an independent tree, inside another tree, but
4917
4537
not part of it. (Such trees can be produced by "bzr split", but also by
5092
4719
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.
4722
If --no-bundle is specified, then public_branch is needed (and must be
4723
up-to-date), so that the receiver can perform the merge using the
4724
public_branch. The public_branch is always included if known, so that
4725
people can check it later.
4727
The submit branch defaults to the parent, but can be overridden. Both
4728
submit branch and public branch will be remembered if supplied.
4730
If a public_branch is known for the submit_branch, that public submit
4731
branch is used in the merge instructions. This means that a local mirror
4732
can be used as your actual submit branch, once you have set public_branch
5122
4735
Mail is sent using your preferred mail program. This should be transparent
5123
4736
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5168
4776
short_name='f',
5170
4778
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
4779
help='Write merge directive to this file; '
5172
4780
'use - for stdout.',
5175
help='Refuse to send if there are uncommitted changes in'
5176
' the working tree, --no-strict disables the check.'),
5177
4782
Option('mail-to', help='Mail the request to this address.',
5181
4786
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')),
4787
RegistryOption.from_kwargs('format',
4788
'Use the specified output format.',
4789
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4790
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5187
4793
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
4794
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,
4795
format='4', mail_to=None, message=None, body=None, **kwargs):
4796
return self._run(submit_branch, revision, public_branch, remember,
4797
format, no_bundle, no_patch, output,
4798
kwargs.get('from', '.'), mail_to, message, body)
4800
def _run(self, submit_branch, revision, public_branch, remember, format,
4801
no_bundle, no_patch, output, from_, mail_to, message, body):
4802
from bzrlib.revision import NULL_REVISION
4803
branch = Branch.open_containing(from_)[0]
4805
outfile = cStringIO.StringIO()
4809
outfile = open(output, 'wb')
4810
# we may need to write data into branch's repository to calculate
4815
config = branch.get_config()
4817
mail_to = config.get_user_option('submit_to')
4818
mail_client = config.get_mail_client()
4819
if (not getattr(mail_client, 'supports_body', False)
4820
and body is not None):
4821
raise errors.BzrCommandError(
4822
'Mail client "%s" does not support specifying body' %
4823
mail_client.__class__.__name__)
4824
if remember and submit_branch is None:
4825
raise errors.BzrCommandError(
4826
'--remember requires a branch to be specified.')
4827
stored_submit_branch = branch.get_submit_branch()
4828
remembered_submit_branch = None
4829
if submit_branch is None:
4830
submit_branch = stored_submit_branch
4831
remembered_submit_branch = "submit"
4833
if stored_submit_branch is None or remember:
4834
branch.set_submit_branch(submit_branch)
4835
if submit_branch is None:
4836
submit_branch = branch.get_parent()
4837
remembered_submit_branch = "parent"
4838
if submit_branch is None:
4839
raise errors.BzrCommandError('No submit branch known or'
4841
if remembered_submit_branch is not None:
4842
note('Using saved %s location "%s" to determine what '
4843
'changes to submit.', remembered_submit_branch,
4847
submit_config = Branch.open(submit_branch).get_config()
4848
mail_to = submit_config.get_user_option("child_submit_to")
4850
stored_public_branch = branch.get_public_branch()
4851
if public_branch is None:
4852
public_branch = stored_public_branch
4853
elif stored_public_branch is None or remember:
4854
branch.set_public_branch(public_branch)
4855
if no_bundle and public_branch is None:
4856
raise errors.BzrCommandError('No public branch specified or'
4858
base_revision_id = None
4860
if revision is not None:
4861
if len(revision) > 2:
4862
raise errors.BzrCommandError('bzr send takes '
4863
'at most two one revision identifiers')
4864
revision_id = revision[-1].as_revision_id(branch)
4865
if len(revision) == 2:
4866
base_revision_id = revision[0].as_revision_id(branch)
4867
if revision_id is None:
4868
revision_id = branch.last_revision()
4869
if revision_id == NULL_REVISION:
4870
raise errors.BzrCommandError('No revisions to submit.')
4872
directive = merge_directive.MergeDirective2.from_objects(
4873
branch.repository, revision_id, time.time(),
4874
osutils.local_time_offset(), submit_branch,
4875
public_branch=public_branch, include_patch=not no_patch,
4876
include_bundle=not no_bundle, message=message,
4877
base_revision_id=base_revision_id)
4878
elif format == '0.9':
4881
patch_type = 'bundle'
4883
raise errors.BzrCommandError('Format 0.9 does not'
4884
' permit bundle with no patch')
4890
directive = merge_directive.MergeDirective.from_objects(
4891
branch.repository, revision_id, time.time(),
4892
osutils.local_time_offset(), submit_branch,
4893
public_branch=public_branch, patch_type=patch_type,
4896
outfile.writelines(directive.to_lines())
4898
subject = '[MERGE] '
4899
if message is not None:
4902
revision = branch.repository.get_revision(revision_id)
4903
subject += revision.get_summary()
4904
basename = directive.get_disk_name(branch)
4905
mail_client.compose_merge_request(mail_to, subject,
5199
4914
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
4916
"""Create a merge-directive for submitting changes.
5202
4918
A merge directive provides many things needed for requesting merges:
5260
4974
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5261
4975
no_patch=False, revision=None, remember=False, output=None,
5262
format=None, strict=None, **kwargs):
4976
format='4', **kwargs):
5263
4977
if output is None:
5265
from bzrlib.send import send
5266
return send(submit_branch, revision, public_branch, remember,
4979
return self._run(submit_branch, revision, public_branch, remember,
5267
4980
format, no_bundle, no_patch, output,
5268
kwargs.get('from', '.'), None, None, None,
5269
self.outf, strict=strict)
4981
kwargs.get('from', '.'), None, None, None)
5272
4984
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
4985
"""Create, remove or modify a tag naming a revision.
5275
4987
Tags give human-meaningful names to revisions. Commands that take a -r
5276
4988
(--revision) option can be given -rtag:X, where X is any previously
5311
def run(self, tag_name=None,
5018
def run(self, tag_name,
5317
5024
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)
5028
branch.tags.delete_tag(tag_name)
5029
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)
5032
if len(revision) != 1:
5033
raise errors.BzrCommandError(
5034
"Tags can only be placed on a single revision, "
5036
revision_id = revision[0].as_revision_id(branch)
5038
revision_id = branch.last_revision()
5039
if (not force) and branch.tags.has_tag(tag_name):
5040
raise errors.TagAlreadyExists(tag_name)
5041
branch.tags.set_tag(tag_name, revision_id)
5042
self.outf.write('Created tag %s.\n' % tag_name)
5344
5047
class cmd_tags(Command):
5345
__doc__ = """List tags.
5347
5050
This command shows a table of tag names and the revisions they reference.
5399
5105
tags.sort(key=lambda x: timestamps[x[1]])
5400
5106
if not show_ids:
5401
5107
# [ (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)
5108
revno_map = branch.get_revision_id_to_revno_map()
5109
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5110
for tag, revid in tags ]
5413
5111
for tag, revspec in tags:
5414
5112
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5115
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5116
"""Reconfigure the type of a bzr directory.
5420
5118
A target configuration must be specified.
5452
5150
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5151
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.',
5152
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5156
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5157
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
5158
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5159
raise errors.BzrCommandError('No target configuration specified')
5485
5160
elif target_type == 'branch':
5486
5161
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5162
elif target_type == 'tree':
5524
5199
/path/to/newbranch.
5526
5201
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
5202
locally, in which case switching will update the the local nickname to be
5528
5203
that of the master.
5531
takes_args = ['to_location?']
5206
takes_args = ['to_location']
5532
5207
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.'),
5208
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5211
def run(self, to_location, force=False):
5542
5212
from bzrlib import switch
5543
5213
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5214
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')
5215
branch = control_dir.open_branch()
5552
branch = control_dir.open_branch()
5553
had_explicit_nick = branch.get_config().has_explicit_nickname()
5217
to_branch = Branch.open(to_location)
5554
5218
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:
5219
this_branch = control_dir.open_branch()
5220
# This may be a heavy checkout, where we want the master branch
5221
this_url = this_branch.get_bound_location()
5222
# If not, use a local sibling
5223
if this_url is None:
5224
this_url = this_branch.base
5225
to_branch = Branch.open(
5226
urlutils.join(this_url, '..', to_location))
5227
switch.switch(control_dir, to_branch, force)
5228
if branch.get_config().has_explicit_nickname():
5581
5229
branch = control_dir.open_branch() #get the new branch!
5582
5230
branch.nick = to_branch.nick
5583
5231
note('Switched to branch: %s',
5584
5232
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
5235
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5236
"""Manage filtered views.
5607
5238
Views provide a mask over the tree so that users can focus on
5608
5239
a subset of a tree when doing their work. After creating a view,
5849
5455
if writer is None:
5850
5456
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5458
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5459
message, destroy=destroy).run()
5858
5460
except errors.UserAbort:
5861
5463
def run_for_list(self):
5862
5464
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))
5467
manager = tree.get_shelf_manager()
5468
shelves = manager.active_shelves()
5469
if len(shelves) == 0:
5470
note('No shelved changes.')
5472
for shelf_id in reversed(shelves):
5473
message = manager.get_metadata(shelf_id).get('message')
5475
message = '<no message>'
5476
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5482
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5483
"""Restore shelved changes.
5880
5485
By default, the most recently shelved changes are restored. However if you
5881
5486
specify a shelf by id those changes will be restored instead. This works
5940
5538
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)
5541
def _create_prefix(cur_transport):
5542
needed = [cur_transport]
5543
# Recurse upwards until we can create a directory successfully
5545
new_transport = cur_transport.clone('..')
5546
if new_transport.base == cur_transport.base:
5547
raise errors.BzrCommandError(
5548
"Failed to create path prefix for %s."
5549
% cur_transport.base)
5551
new_transport.mkdir('.')
5552
except errors.NoSuchFile:
5553
needed.append(new_transport)
5554
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)
5557
# Now we only need to create child directories
5559
cur_transport = needed.pop()
5560
cur_transport.ensure_base()
5563
# these get imported and then picked up by the scan for cmd_*
5564
# TODO: Some more consistent way to split command definitions across files;
5565
# we do need to load at least some information about them to know of
5566
# aliases. ideally we would avoid loading the implementation until the
5567
# details were needed.
5568
from bzrlib.cmd_version_info import cmd_version_info
5569
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5570
from bzrlib.bundle.commands import (
5573
from bzrlib.sign_my_commits import cmd_sign_my_commits
5574
from bzrlib.weave_commands import cmd_versionedfile_list, \
5575
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
