41
39
merge as _mod_merge,
46
43
revision as _mod_revision,
55
50
from bzrlib.branch import Branch
56
51
from bzrlib.conflicts import ConflictList
57
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
52
from bzrlib.revisionspec import RevisionSpec
58
53
from bzrlib.smtp_connection import SMTPConnection
59
54
from bzrlib.workingtree import WorkingTree
62
57
from bzrlib.commands import Command, display_command
63
from bzrlib.option import (
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
70
59
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
73
def tree_files(file_list, default_branch=u'.', canonicalize=True,
62
def tree_files(file_list, default_branch=u'.', canonicalize=True):
76
return internal_tree_files(file_list, default_branch, canonicalize,
64
return internal_tree_files(file_list, default_branch, canonicalize)
78
65
except errors.FileInWrongBranch, e:
79
66
raise errors.BzrCommandError("%s is not in the same branch as %s" %
80
67
(e.path, file_list[0]))
83
def tree_files_for_add(file_list):
85
Return a tree and list of absolute paths from a file list.
87
Similar to tree_files, but add handles files a bit differently, so it a
88
custom implementation. In particular, MutableTreeTree.smart_add expects
89
absolute paths, which it immediately converts to relative paths.
91
# FIXME Would be nice to just return the relative paths like
92
# internal_tree_files does, but there are a large number of unit tests
93
# that assume the current interface to mutabletree.smart_add
95
tree, relpath = WorkingTree.open_containing(file_list[0])
96
if tree.supports_views():
97
view_files = tree.views.lookup_view()
99
for filename in file_list:
100
if not osutils.is_inside_any(view_files, filename):
101
raise errors.FileOutsideView(filename, view_files)
102
file_list = file_list[:]
103
file_list[0] = tree.abspath(relpath)
105
tree = WorkingTree.open_containing(u'.')[0]
106
if tree.supports_views():
107
view_files = tree.views.lookup_view()
109
file_list = view_files
110
view_str = views.view_display_str(view_files)
111
note("Ignoring files outside view. View is %s" % view_str)
112
return tree, file_list
115
def _get_one_revision(command_name, revisions):
116
if revisions is None:
118
if len(revisions) != 1:
119
raise errors.BzrCommandError(
120
'bzr %s --revision takes exactly one revision identifier' % (
125
70
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
126
"""Get a revision tree. Not suitable for commands that change the tree.
128
Specifically, the basis tree in dirstate trees is coupled to the dirstate
129
and doing a commit/uncommit/pull will at best fail due to changing the
132
If tree is passed in, it should be already locked, for lifetime management
133
of the trees internal cached state.
135
71
if branch is None:
136
72
branch = tree.branch
137
73
if revisions is None:
157
95
The filenames given are not required to exist.
159
:param file_list: Filenames to convert.
97
:param file_list: Filenames to convert.
161
99
:param default_branch: Fallback tree path to use if file_list is empty or
164
:param apply_view: if True and a view is set, apply it or check that
165
specified files are within it
167
102
:return: workingtree, [relative_paths]
169
104
if file_list is None or len(file_list) == 0:
170
tree = WorkingTree.open_containing(default_branch)[0]
171
if tree.supports_views() and apply_view:
172
view_files = tree.views.lookup_view()
174
file_list = view_files
175
view_str = views.view_display_str(view_files)
176
note("Ignoring files outside view. View is %s" % view_str)
177
return tree, file_list
105
return WorkingTree.open_containing(default_branch)[0], file_list
178
106
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
179
return tree, safe_relpath_files(tree, file_list, canonicalize,
180
apply_view=apply_view)
183
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
107
return tree, safe_relpath_files(tree, file_list, canonicalize)
110
def safe_relpath_files(tree, file_list, canonicalize=True):
184
111
"""Convert file_list into a list of relpaths in tree.
186
113
:param tree: A tree to operate on.
187
114
:param file_list: A list of user provided paths or None.
188
:param apply_view: if True and a view is set, apply it or check that
189
specified files are within it
190
115
:return: A list of relative paths.
191
116
:raises errors.PathNotChild: When a provided path is in a different tree
194
119
if file_list is None:
196
if tree.supports_views() and apply_view:
197
view_files = tree.views.lookup_view()
201
122
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
202
123
# doesn't - fix that up here before we enter the loop.
534
Option('tree', help='Show revno of working tree'),
538
def run(self, revision=None, directory=u'.', tree=False,
539
revision_info_list=[]):
412
def run(self, revision=None, directory=u'.', revision_info_list=[]):
542
wt = WorkingTree.open_containing(directory)[0]
545
self.add_cleanup(wt.unlock)
546
except (errors.NoWorkingTree, errors.NotLocalUrl):
548
b = Branch.open_containing(directory)[0]
550
self.add_cleanup(b.unlock)
552
415
if revision is not None:
553
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
416
revs.extend(revision)
554
417
if revision_info_list is not None:
555
for rev_str in revision_info_list:
556
rev_spec = RevisionSpec.from_string(rev_str)
557
revision_ids.append(rev_spec.as_revision_id(b))
558
# No arguments supplied, default to the last revision
559
if len(revision_ids) == 0:
562
raise errors.NoWorkingTree(directory)
563
revision_ids.append(wt.last_revision())
565
revision_ids.append(b.last_revision())
569
for revision_id in revision_ids:
418
for rev in revision_info_list:
419
revs.append(RevisionSpec.from_string(rev))
421
b = Branch.open_containing(directory)[0]
424
revs.append(RevisionSpec.from_string('-1'))
427
revision_id = rev.as_revision_id(b)
571
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
572
revno = '.'.join(str(i) for i in dotted_revno)
429
revno = '%4d' % (b.revision_id_to_revno(revision_id))
573
430
except errors.NoSuchRevision:
575
maxlen = max(maxlen, len(revno))
576
revinfos.append([revno, revision_id])
580
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
431
dotted_map = b.get_revision_id_to_revno_map()
432
revno = '.'.join(str(i) for i in dotted_map[revision_id])
433
print '%s %s' % (revno, revision_id)
583
436
class cmd_add(Command):
584
437
"""Add specified files or directories.
724
587
if kind and kind not in ['file', 'directory', 'symlink']:
725
588
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
727
revision = _get_one_revision('inventory', revision)
728
590
work_tree, file_list = tree_files(file_list)
729
591
work_tree.lock_read()
730
self.add_cleanup(work_tree.unlock)
731
if revision is not None:
732
tree = revision.as_tree(work_tree.branch)
734
extra_trees = [work_tree]
736
self.add_cleanup(tree.unlock)
741
if file_list is not None:
742
file_ids = tree.paths2ids(file_list, trees=extra_trees,
743
require_versioned=True)
744
# find_ids_across_trees may include some paths that don't
746
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
747
for file_id in file_ids if file_id in tree)
749
entries = tree.inventory.entries()
593
if revision is not None:
594
if len(revision) > 1:
595
raise errors.BzrCommandError(
596
'bzr inventory --revision takes exactly one revision'
598
tree = revision[0].as_tree(work_tree.branch)
600
extra_trees = [work_tree]
606
if file_list is not None:
607
file_ids = tree.paths2ids(file_list, trees=extra_trees,
608
require_versioned=True)
609
# find_ids_across_trees may include some paths that don't
611
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
612
for file_id in file_ids if file_id in tree)
614
entries = tree.inventory.entries()
617
if tree is not work_tree:
752
620
for path, entry in entries:
753
621
if kind and kind != entry.kind:
783
651
takes_args = ['names*']
784
652
takes_options = [Option("after", help="Move only the bzr identifier"
785
653
" of the file, because the file has already been moved."),
786
Option('auto', help='Automatically guess renames.'),
787
Option('dry-run', help='Avoid making changes when guessing renames.'),
789
655
aliases = ['move', 'rename']
790
656
encoding_type = 'replace'
792
def run(self, names_list, after=False, auto=False, dry_run=False):
794
return self.run_auto(names_list, after, dry_run)
796
raise errors.BzrCommandError('--dry-run requires --auto.')
658
def run(self, names_list, after=False):
797
659
if names_list is None:
799
662
if len(names_list) < 2:
800
663
raise errors.BzrCommandError("missing file argument")
801
664
tree, rel_names = tree_files(names_list, canonicalize=False)
802
tree.lock_tree_write()
803
self.add_cleanup(tree.unlock)
804
self._run(tree, names_list, rel_names, after)
806
def run_auto(self, names_list, after, dry_run):
807
if names_list is not None and len(names_list) > 1:
808
raise errors.BzrCommandError('Only one path may be specified to'
811
raise errors.BzrCommandError('--after cannot be specified with'
813
work_tree, file_list = tree_files(names_list, default_branch='.')
814
work_tree.lock_tree_write()
815
self.add_cleanup(work_tree.unlock)
816
rename_map.RenameMap.guess_renames(work_tree, dry_run)
667
self._run(tree, names_list, rel_names, after)
818
671
def _run(self, tree, names_list, rel_names, after):
819
672
into_existing = osutils.isdir(names_list[-1])
995
835
if branch_to.get_parent() is None or remember:
996
836
branch_to.set_parent(branch_from.base)
998
if branch_from is not branch_to:
999
branch_from.lock_read()
1000
self.add_cleanup(branch_from.unlock)
1001
838
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
839
if len(revision) == 1:
840
revision_id = revision[0].as_revision_id(branch_from)
842
raise errors.BzrCommandError(
843
'bzr pull --revision takes one value.')
1004
845
branch_to.lock_write()
1005
self.add_cleanup(branch_to.unlock)
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
847
if tree_to is not None:
848
change_reporter = delta._ChangeReporter(
849
unversioned_filter=tree_to.is_ignored)
850
result = tree_to.pull(branch_from, overwrite, revision_id,
852
possible_transports=possible_transports)
854
result = branch_to.pull(branch_from, overwrite, revision_id)
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
856
result.report(self.outf)
857
if verbose and result.old_revid != result.new_revid:
858
log.show_branch_change(branch_to, self.outf, result.old_revno,
1025
864
class cmd_push(Command):
1026
865
"""Update a mirror of this branch.
1028
867
The target branch will not have its working tree populated because this
1029
868
is both expensive, and is not supported on remote file systems.
1031
870
Some smart servers or protocols *may* put the working tree in place in
1082
918
def run(self, location=None, remember=False, overwrite=False,
1083
919
create_prefix=False, verbose=False, revision=None,
1084
920
use_existing_dir=False, directory=None, stacked_on=None,
1085
stacked=False, strict=None):
1086
922
from bzrlib.push import _show_push_branch
924
# Get the source branch and revision_id
1088
925
if directory is None:
1090
# Get the source branch
1092
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1094
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1095
if strict is None: strict = True # default value
1096
# Get the tip's revision_id
1097
revision = _get_one_revision('push', revision)
927
br_from = Branch.open_containing(directory)[0]
1098
928
if revision is not None:
1099
revision_id = revision.in_history(br_from).rev_id
929
if len(revision) == 1:
930
revision_id = revision[0].in_history(br_from).rev_id
932
raise errors.BzrCommandError(
933
'bzr push --revision takes one value.')
1102
if strict and tree is not None and revision_id is None:
1103
if (tree.has_changes()):
1104
raise errors.UncommittedChanges(
1105
tree, more='Use --no-strict to force the push.')
1106
if tree.last_revision() != tree.branch.last_revision():
1107
# The tree has lost sync with its branch, there is little
1108
# chance that the user is aware of it but he can still force
1109
# the push with --no-strict
1110
raise errors.OutOfDateTree(
1111
tree, more='Use --no-strict to force the push.')
935
revision_id = br_from.last_revision()
1113
937
# Get the stacked_on branch, if any
1114
938
if stacked_on is not None:
1164
988
takes_args = ['from_location', 'to_location?']
1165
989
takes_options = ['revision', Option('hardlink',
1166
990
help='Hard-link working tree files where possible.'),
1168
help="Create a branch without a working-tree."),
1170
help="Switch the checkout in the current directory "
1171
"to the new branch."),
1172
991
Option('stacked',
1173
992
help='Create a stacked branch referring to the source branch. '
1174
993
'The new branch will depend on the availability of the source '
1175
994
'branch for all operations.'),
1176
995
Option('standalone',
1177
996
help='Do not use a shared repository, even if available.'),
1178
Option('use-existing-dir',
1179
help='By default branch will fail if the target'
1180
' directory exists, but does not already'
1181
' have a control directory. This flag will'
1182
' allow branch to proceed.'),
1184
help="Bind new branch to from location."),
1186
998
aliases = ['get', 'clone']
1188
1000
def run(self, from_location, to_location=None, revision=None,
1189
hardlink=False, stacked=False, standalone=False, no_tree=False,
1190
use_existing_dir=False, switch=False, bind=False):
1191
from bzrlib import switch as _mod_switch
1001
hardlink=False, stacked=False, standalone=False):
1192
1002
from bzrlib.tag import _merge_tags_if_possible
1003
if revision is None:
1005
elif len(revision) > 1:
1006
raise errors.BzrCommandError(
1007
'bzr branch --revision takes exactly 1 revision value')
1193
1009
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1195
revision = _get_one_revision('branch', revision)
1196
1011
br_from.lock_read()
1197
self.add_cleanup(br_from.unlock)
1198
if revision is not None:
1199
revision_id = revision.as_revision_id(br_from)
1201
# FIXME - wt.last_revision, fallback to branch, fall back to
1202
# None or perhaps NULL_REVISION to mean copy nothing
1204
revision_id = br_from.last_revision()
1205
if to_location is None:
1206
to_location = urlutils.derive_to_location(from_location)
1207
to_transport = transport.get_transport(to_location)
1209
to_transport.mkdir('.')
1210
except errors.FileExists:
1211
if not use_existing_dir:
1212
raise errors.BzrCommandError('Target directory "%s" '
1213
'already exists.' % to_location)
1013
if len(revision) == 1 and revision[0] is not None:
1014
revision_id = revision[0].as_revision_id(br_from)
1216
bzrdir.BzrDir.open_from_transport(to_transport)
1217
except errors.NotBranchError:
1220
raise errors.AlreadyBranchError(to_location)
1221
except errors.NoSuchFile:
1222
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1225
# preserve whatever source format we have.
1226
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1227
possible_transports=[to_transport],
1228
accelerator_tree=accelerator_tree,
1229
hardlink=hardlink, stacked=stacked,
1230
force_new_repo=standalone,
1231
create_tree_if_local=not no_tree,
1232
source_branch=br_from)
1233
branch = dir.open_branch()
1234
except errors.NoSuchRevision:
1235
to_transport.delete_tree('.')
1236
msg = "The branch %s has no revision %s." % (from_location,
1238
raise errors.BzrCommandError(msg)
1239
_merge_tags_if_possible(br_from, branch)
1240
# If the source branch is stacked, the new branch may
1241
# be stacked whether we asked for that explicitly or not.
1242
# We therefore need a try/except here and not just 'if stacked:'
1244
note('Created new stacked branch referring to %s.' %
1245
branch.get_stacked_on_url())
1246
except (errors.NotStacked, errors.UnstackableBranchFormat,
1247
errors.UnstackableRepositoryFormat), e:
1248
note('Branched %d revision(s).' % branch.revno())
1250
# Bind to the parent
1251
parent_branch = Branch.open(from_location)
1252
branch.bind(parent_branch)
1253
note('New branch bound to %s' % from_location)
1255
# Switch to the new branch
1256
wt, _ = WorkingTree.open_containing('.')
1257
_mod_switch.switch(wt.bzrdir, branch)
1258
note('Switched to branch: %s',
1259
urlutils.unescape_for_display(branch.base, 'utf-8'))
1016
# FIXME - wt.last_revision, fallback to branch, fall back to
1017
# None or perhaps NULL_REVISION to mean copy nothing
1019
revision_id = br_from.last_revision()
1020
if to_location is None:
1021
to_location = urlutils.derive_to_location(from_location)
1022
to_transport = transport.get_transport(to_location)
1024
to_transport.mkdir('.')
1025
except errors.FileExists:
1026
raise errors.BzrCommandError('Target directory "%s" already'
1027
' exists.' % to_location)
1028
except errors.NoSuchFile:
1029
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1032
# preserve whatever source format we have.
1033
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1034
possible_transports=[to_transport],
1035
accelerator_tree=accelerator_tree,
1036
hardlink=hardlink, stacked=stacked,
1037
force_new_repo=standalone,
1038
source_branch=br_from)
1039
branch = dir.open_branch()
1040
except errors.NoSuchRevision:
1041
to_transport.delete_tree('.')
1042
msg = "The branch %s has no revision %s." % (from_location,
1044
raise errors.BzrCommandError(msg)
1045
_merge_tags_if_possible(br_from, branch)
1046
# If the source branch is stacked, the new branch may
1047
# be stacked whether we asked for that explicitly or not.
1048
# We therefore need a try/except here and not just 'if stacked:'
1050
note('Created new stacked branch referring to %s.' %
1051
branch.get_stacked_on_url())
1052
except (errors.NotStacked, errors.UnstackableBranchFormat,
1053
errors.UnstackableRepositoryFormat), e:
1054
note('Branched %d revision(s).' % branch.revno())
1262
1059
class cmd_checkout(Command):
1341
1142
def run(self, dir=u'.'):
1342
1143
tree = WorkingTree.open_containing(dir)[0]
1343
1144
tree.lock_read()
1344
self.add_cleanup(tree.unlock)
1345
new_inv = tree.inventory
1346
old_tree = tree.basis_tree()
1347
old_tree.lock_read()
1348
self.add_cleanup(old_tree.unlock)
1349
old_inv = old_tree.inventory
1351
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1352
for f, paths, c, v, p, n, k, e in iterator:
1353
if paths[0] == paths[1]:
1357
renames.append(paths)
1359
for old_name, new_name in renames:
1360
self.outf.write("%s => %s\n" % (old_name, new_name))
1146
new_inv = tree.inventory
1147
old_tree = tree.basis_tree()
1148
old_tree.lock_read()
1150
old_inv = old_tree.inventory
1152
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1153
for f, paths, c, v, p, n, k, e in iterator:
1154
if paths[0] == paths[1]:
1158
renames.append(paths)
1160
for old_name, new_name in renames:
1161
self.outf.write("%s => %s\n" % (old_name, new_name))
1363
1168
class cmd_update(Command):
1364
1169
"""Update a tree to have the latest code committed to its branch.
1366
1171
This will perform a merge into the working tree, and may generate
1367
conflicts. If you have any local changes, you will still
1172
conflicts. If you have any local changes, you will still
1368
1173
need to commit them after the update for the update to be complete.
1370
If you want to discard your local changes, you can just do a
1175
If you want to discard your local changes, you can just do a
1371
1176
'bzr revert' instead of 'bzr commit' after the update.
1373
If the tree's branch is bound to a master branch, it will also update
1374
the branch from the master.
1377
1179
_see_also = ['pull', 'working-trees', 'status-flags']
1378
1180
takes_args = ['dir?']
1379
takes_options = ['revision']
1380
1181
aliases = ['up']
1382
def run(self, dir='.', revision=None):
1383
if revision is not None and len(revision) != 1:
1384
raise errors.BzrCommandError(
1385
"bzr update --revision takes exactly one revision")
1183
def run(self, dir='.'):
1386
1184
tree = WorkingTree.open_containing(dir)[0]
1387
branch = tree.branch
1388
1185
possible_transports = []
1389
master = branch.get_master_branch(
1186
master = tree.branch.get_master_branch(
1390
1187
possible_transports=possible_transports)
1391
1188
if master is not None:
1392
1189
tree.lock_write()
1393
branch_location = master.base
1395
1191
tree.lock_tree_write()
1396
branch_location = tree.branch.base
1397
self.add_cleanup(tree.unlock)
1398
# get rid of the final '/' and be ready for display
1399
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1401
existing_pending_merges = tree.get_parent_ids()[1:]
1405
# may need to fetch data into a heavyweight checkout
1406
# XXX: this may take some time, maybe we should display a
1408
old_tip = branch.update(possible_transports)
1409
if revision is not None:
1410
revision_id = revision[0].as_revision_id(branch)
1412
revision_id = branch.last_revision()
1413
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1414
revno = branch.revision_id_to_revno(revision_id)
1415
note("Tree is up to date at revision %d of branch %s" %
1416
(revno, branch_location))
1418
view_info = _get_view_info_for_change_reporter(tree)
1419
change_reporter = delta._ChangeReporter(
1420
unversioned_filter=tree.is_ignored,
1421
view_info=view_info)
1193
existing_pending_merges = tree.get_parent_ids()[1:]
1194
last_rev = _mod_revision.ensure_null(tree.last_revision())
1195
if last_rev == _mod_revision.ensure_null(
1196
tree.branch.last_revision()):
1197
# may be up to date, check master too.
1198
if master is None or last_rev == _mod_revision.ensure_null(
1199
master.last_revision()):
1200
revno = tree.branch.revision_id_to_revno(last_rev)
1201
note("Tree is up to date at revision %d." % (revno,))
1423
1203
conflicts = tree.update(
1425
possible_transports=possible_transports,
1426
revision=revision_id,
1428
except errors.NoSuchRevision, e:
1429
raise errors.BzrCommandError(
1430
"branch has no revision %s\n"
1431
"bzr update --revision only works"
1432
" for a revision in the branch history"
1434
revno = tree.branch.revision_id_to_revno(
1435
_mod_revision.ensure_null(tree.last_revision()))
1436
note('Updated to revision %d of branch %s' %
1437
(revno, branch_location))
1438
if tree.get_parent_ids()[1:] != existing_pending_merges:
1439
note('Your local commits will now show as pending merges with '
1440
"'bzr status', and can be committed with 'bzr commit'.")
1204
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1205
possible_transports=possible_transports)
1206
revno = tree.branch.revision_id_to_revno(
1207
_mod_revision.ensure_null(tree.last_revision()))
1208
note('Updated to revision %d.' % (revno,))
1209
if tree.get_parent_ids()[1:] != existing_pending_merges:
1210
note('Your local commits will now show as pending merges with '
1211
"'bzr status', and can be committed with 'bzr commit'.")
1447
1220
class cmd_info(Command):
1448
1221
"""Show information about a working tree, branch or repository.
1450
1223
This command will show all known locations and formats associated to the
1451
tree, branch or repository.
1453
In verbose mode, statistical information is included with each report.
1454
To see extended statistic information, use a verbosity level of 2 or
1455
higher by specifying the verbose option multiple times, e.g. -vv.
1224
tree, branch or repository. Statistical information is included with
1457
1227
Branches and working trees will also report any missing revisions.
1461
Display information on the format and related locations:
1465
Display the above together with extended format information and
1466
basic statistics (like the number of files in the working tree and
1467
number of revisions in the branch and repository):
1471
Display the above together with number of committers to the branch:
1475
1229
_see_also = ['revno', 'working-trees', 'repositories']
1476
1230
takes_args = ['location?']
1518
1272
file_list = [f for f in file_list]
1520
1274
tree.lock_write()
1521
self.add_cleanup(tree.unlock)
1522
# Heuristics should probably all move into tree.remove_smart or
1525
added = tree.changes_from(tree.basis_tree(),
1526
specific_files=file_list).added
1527
file_list = sorted([f[0] for f in added], reverse=True)
1528
if len(file_list) == 0:
1529
raise errors.BzrCommandError('No matching files.')
1530
elif file_list is None:
1531
# missing files show up in iter_changes(basis) as
1532
# versioned-with-no-kind.
1534
for change in tree.iter_changes(tree.basis_tree()):
1535
# Find paths in the working tree that have no kind:
1536
if change[1][1] is not None and change[6][1] is None:
1537
missing.append(change[1][1])
1538
file_list = sorted(missing, reverse=True)
1539
file_deletion_strategy = 'keep'
1540
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1541
keep_files=file_deletion_strategy=='keep',
1542
force=file_deletion_strategy=='force')
1276
# Heuristics should probably all move into tree.remove_smart or
1279
added = tree.changes_from(tree.basis_tree(),
1280
specific_files=file_list).added
1281
file_list = sorted([f[0] for f in added], reverse=True)
1282
if len(file_list) == 0:
1283
raise errors.BzrCommandError('No matching files.')
1284
elif file_list is None:
1285
# missing files show up in iter_changes(basis) as
1286
# versioned-with-no-kind.
1288
for change in tree.iter_changes(tree.basis_tree()):
1289
# Find paths in the working tree that have no kind:
1290
if change[1][1] is not None and change[6][1] is None:
1291
missing.append(change[1][1])
1292
file_list = sorted(missing, reverse=True)
1293
file_deletion_strategy = 'keep'
1294
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1295
keep_files=file_deletion_strategy=='keep',
1296
force=file_deletion_strategy=='force')
1545
1301
class cmd_file_id(Command):
1743
1499
branch.set_append_revisions_only(True)
1744
1500
except errors.UpgradeRequired:
1745
1501
raise errors.BzrCommandError('This branch format cannot be set'
1746
' to append-revisions-only. Try --default.')
1502
' to append-revisions-only. Try --experimental-branch6')
1747
1503
if not is_quiet():
1748
from bzrlib.info import describe_layout, describe_format
1750
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
1751
except (errors.NoWorkingTree, errors.NotLocalUrl):
1753
repository = branch.repository
1754
layout = describe_layout(repository, branch, tree).lower()
1755
format = describe_format(a_bzrdir, repository, branch, tree)
1756
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1757
if repository.is_shared():
1758
#XXX: maybe this can be refactored into transport.path_or_url()
1759
url = repository.bzrdir.root_transport.external_url()
1761
url = urlutils.local_path_from_url(url)
1762
except errors.InvalidURL:
1764
self.outf.write("Using shared repository: %s\n" % url)
1504
from bzrlib.info import show_bzrdir_info
1505
show_bzrdir_info(a_bzrdir, verbose=0, outfile=self.outf)
1767
1508
class cmd_init_repository(Command):
1768
"""Create a shared repository for branches to share storage space.
1509
"""Create a shared repository to hold branches.
1770
1511
New branches created under the repository directory will store their
1771
revisions in the repository, not in the branch directory. For branches
1772
with shared history, this reduces the amount of storage needed and
1773
speeds up the creation of new branches.
1512
revisions in the repository, not in the branch directory.
1775
If the --no-trees option is given then the branches in the repository
1776
will not have working trees by default. They will still exist as
1777
directories on disk, but they will not have separate copies of the
1778
files at a certain revision. This can be useful for repositories that
1779
store branches which are interacted with through checkouts or remote
1780
branches, such as on a server.
1514
If the --no-trees option is used then the branches in the repository
1515
will not have working trees by default.
1783
Create a shared repository holding just branches::
1518
Create a shared repositories holding just branches::
1785
1520
bzr init-repo --no-trees repo
1786
1521
bzr init repo/trunk
2065
1792
raise errors.BzrCommandError(msg)
2068
def _parse_levels(s):
2072
msg = "The levels argument must be an integer."
2073
raise errors.BzrCommandError(msg)
2076
1795
class cmd_log(Command):
2077
"""Show historical log for a branch or subset of a branch.
2079
log is bzr's default tool for exploring the history of a branch.
2080
The branch to use is taken from the first parameter. If no parameters
2081
are given, the branch containing the working directory is logged.
2082
Here are some simple examples::
2084
bzr log log the current branch
2085
bzr log foo.py log a file in its branch
2086
bzr log http://server/branch log a branch on a server
2088
The filtering, ordering and information shown for each revision can
2089
be controlled as explained below. By default, all revisions are
2090
shown sorted (topologically) so that newer revisions appear before
2091
older ones and descendants always appear before ancestors. If displayed,
2092
merged revisions are shown indented under the revision in which they
2097
The log format controls how information about each revision is
2098
displayed. The standard log formats are called ``long``, ``short``
2099
and ``line``. The default is long. See ``bzr help log-formats``
2100
for more details on log formats.
2102
The following options can be used to control what information is
2105
-l N display a maximum of N revisions
2106
-n N display N levels of revisions (0 for all, 1 for collapsed)
2107
-v display a status summary (delta) for each revision
2108
-p display a diff (patch) for each revision
2109
--show-ids display revision-ids (and file-ids), not just revnos
2111
Note that the default number of levels to display is a function of the
2112
log format. If the -n option is not used, the standard log formats show
2113
just the top level (mainline).
2115
Status summaries are shown using status flags like A, M, etc. To see
2116
the changes explained using words like ``added`` and ``modified``
2117
instead, use the -vv option.
2121
To display revisions from oldest to newest, use the --forward option.
2122
In most cases, using this option will have little impact on the total
2123
time taken to produce a log, though --forward does not incrementally
2124
display revisions like --reverse does when it can.
2126
:Revision filtering:
2128
The -r option can be used to specify what revision or range of revisions
2129
to filter against. The various forms are shown below::
2131
-rX display revision X
2132
-rX.. display revision X and later
2133
-r..Y display up to and including revision Y
2134
-rX..Y display from X to Y inclusive
2136
See ``bzr help revisionspec`` for details on how to specify X and Y.
2137
Some common examples are given below::
2139
-r-1 show just the tip
2140
-r-10.. show the last 10 mainline revisions
2141
-rsubmit:.. show what's new on this branch
2142
-rancestor:path.. show changes since the common ancestor of this
2143
branch and the one at location path
2144
-rdate:yesterday.. show changes since yesterday
2146
When logging a range of revisions using -rX..Y, log starts at
2147
revision Y and searches back in history through the primary
2148
("left-hand") parents until it finds X. When logging just the
2149
top level (using -n1), an error is reported if X is not found
2150
along the way. If multi-level logging is used (-n0), X may be
2151
a nested merge revision and the log will be truncated accordingly.
2155
If parameters are given and the first one is not a branch, the log
2156
will be filtered to show only those revisions that changed the
2157
nominated files or directories.
2159
Filenames are interpreted within their historical context. To log a
2160
deleted file, specify a revision range so that the file existed at
2161
the end or start of the range.
2163
Historical context is also important when interpreting pathnames of
2164
renamed files/directories. Consider the following example:
2166
* revision 1: add tutorial.txt
2167
* revision 2: modify tutorial.txt
2168
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
2172
* ``bzr log guide.txt`` will log the file added in revision 1
2174
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2176
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2177
the original file in revision 2.
2179
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2180
was no file called guide.txt in revision 2.
2182
Renames are always followed by log. By design, there is no need to
2183
explicitly ask for this (and no way to stop logging a file back
2184
until it was last renamed).
2188
The --message option can be used for finding revisions that match a
2189
regular expression in a commit message.
2193
GUI tools and IDEs are often better at exploring history than command
2194
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2195
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2196
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2198
Web interfaces are often better at exploring history than command line
2199
tools, particularly for branches on servers. You may prefer Loggerhead
2200
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2202
You may find it useful to add the aliases below to ``bazaar.conf``::
2206
top = log -l10 --line
2209
``bzr tip`` will then show the latest revision while ``bzr top``
2210
will show the last 10 mainline revisions. To see the details of a
2211
particular revision X, ``bzr show -rX``.
2213
If you are interested in looking deeper into a particular merge X,
2214
use ``bzr log -n0 -rX``.
2216
``bzr log -v`` on a branch with lots of history is currently
2217
very slow. A fix for this issue is currently under development.
2218
With or without that fix, it is recommended that a revision range
2219
be given when using the -v option.
2221
bzr has a generic full-text matching plugin, bzr-search, that can be
2222
used to find revisions matching user names, commit messages, etc.
2223
Among other features, this plugin can find all revisions containing
2224
a list of words but not others.
2226
When exploring non-mainline history on large projects with deep
2227
history, the performance of log can be greatly improved by installing
2228
the historycache plugin. This plugin buffers historical information
2229
trading disk space for faster speed.
1796
"""Show log of a branch, file, or directory.
1798
By default show the log of the branch containing the working directory.
1800
To request a range of logs, you can use the command -r begin..end
1801
-r revision requests a specific revision, -r ..end or -r begin.. are
1805
Log the current branch::
1813
Log the last 10 revisions of a branch::
1815
bzr log -r -10.. http://server/branch
2231
takes_args = ['file*']
2232
_see_also = ['log-formats', 'revisionspec']
1818
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1820
takes_args = ['location?']
2233
1821
takes_options = [
2234
1822
Option('forward',
2235
1823
help='Show from oldest to newest.'),
2333
1893
dir, relpath = bzrdir.BzrDir.open_containing(location)
2334
1894
b = dir.open_branch()
2336
self.add_cleanup(b.unlock)
2337
1898
rev1, rev2 = _get_revision_range(revision, b, self.name())
2339
# Decide on the type of delta & diff filtering to use
2340
# TODO: add an --all-files option to make this configurable & consistent
2348
diff_type = 'partial'
2352
# Build the log formatter
2353
if log_format is None:
2354
log_format = log.log_formatter_registry.get_default(b)
2355
# Make a non-encoding output to include the diffs - bug 328007
2356
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2357
lf = log_format(show_ids=show_ids, to_file=self.outf,
2358
to_exact_file=unencoded_output,
2359
show_timezone=timezone,
2360
delta_format=get_verbosity_level(),
2362
show_advice=levels is None)
2364
# Choose the algorithm for doing the logging. It's annoying
2365
# having multiple code paths like this but necessary until
2366
# the underlying repository format is faster at generating
2367
# deltas or can provide everything we need from the indices.
2368
# The default algorithm - match-using-deltas - works for
2369
# multiple files and directories and is faster for small
2370
# amounts of history (200 revisions say). However, it's too
2371
# slow for logging a single file in a repository with deep
2372
# history, i.e. > 10K revisions. In the spirit of "do no
2373
# evil when adding features", we continue to use the
2374
# original algorithm - per-file-graph - for the "single
2375
# file that isn't a directory without showing a delta" case.
2376
partial_history = revision and b.repository._format.supports_chks
2377
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2378
or delta_type or partial_history)
2380
# Build the LogRequest and execute it
2381
if len(file_ids) == 0:
2383
rqst = make_log_request_dict(
2384
direction=direction, specific_fileids=file_ids,
2385
start_revision=rev1, end_revision=rev2, limit=limit,
2386
message_search=message, delta_type=delta_type,
2387
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2388
Logger(b, rqst).show(lf)
1899
if log_format is None:
1900
log_format = log.log_formatter_registry.get_default(b)
1902
lf = log_format(show_ids=show_ids, to_file=self.outf,
1903
show_timezone=timezone,
1904
delta_format=get_verbosity_level())
1910
direction=direction,
1911
start_revision=rev1,
2391
1918
def _get_revision_range(revisionspec_list, branch, command_name):
2392
1919
"""Take the input of a revision option and turn it into a revision range.
2394
1921
It returns RevisionInfo objects which can be used to obtain the rev_id's
2395
of the desired revisions. It does some user input validations.
1922
of the desired revisons. It does some user input validations.
2397
1924
if revisionspec_list is None:
2400
1927
elif len(revisionspec_list) == 1:
2401
1928
rev1 = rev2 = revisionspec_list[0].in_history(branch)
2402
1929
elif len(revisionspec_list) == 2:
2403
start_spec = revisionspec_list[0]
2404
end_spec = revisionspec_list[1]
2405
if end_spec.get_branch() != start_spec.get_branch():
1930
if revisionspec_list[1].get_branch() != revisionspec_list[0
2406
1932
# b is taken from revision[0].get_branch(), and
2407
1933
# show_log will use its revision_history. Having
2408
1934
# different branches will lead to weird behaviors.
2409
1935
raise errors.BzrCommandError(
2410
1936
"bzr %s doesn't accept two revisions in different"
2411
1937
" branches." % command_name)
2412
rev1 = start_spec.in_history(branch)
2413
# Avoid loading all of history when we know a missing
2414
# end of range means the last revision ...
2415
if end_spec.spec is None:
2416
last_revno, last_revision_id = branch.last_revision_info()
2417
rev2 = RevisionInfo(branch, last_revno, last_revision_id)
2419
rev2 = end_spec.in_history(branch)
1938
rev1 = revisionspec_list[0].in_history(branch)
1939
rev2 = revisionspec_list[1].in_history(branch)
2421
1941
raise errors.BzrCommandError(
2422
1942
'bzr %s --revision takes one or two values.' % command_name)
2423
1943
return rev1, rev2
2426
def _revision_range_to_revid_range(revision_range):
2429
if revision_range[0] is not None:
2430
rev_id1 = revision_range[0].rev_id
2431
if revision_range[1] is not None:
2432
rev_id2 = revision_range[1].rev_id
2433
return rev_id1, rev_id2
2435
1945
def get_log_format(long=False, short=False, line=False, default='long'):
2436
1946
log_format = default
2507
2015
if path is None:
2511
2020
raise errors.BzrCommandError('cannot specify both --from-root'
2514
2024
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2517
# Calculate the prefix to use
2521
prefix = relpath + '/'
2522
elif fs_path != '.' and not fs_path.endswith('/'):
2523
prefix = fs_path + '/'
2525
2030
if revision is not None or tree is None:
2526
2031
tree = _get_one_revision_tree('ls', revision, branch=branch)
2529
if isinstance(tree, WorkingTree) and tree.supports_views():
2530
view_files = tree.views.lookup_view()
2533
view_str = views.view_display_str(view_files)
2534
note("Ignoring files outside view. View is %s" % view_str)
2536
2033
tree.lock_read()
2537
self.add_cleanup(tree.unlock)
2538
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2539
from_dir=relpath, recursive=recursive):
2540
# Apply additional masking
2541
if not all and not selection[fc]:
2543
if kind is not None and fkind != kind:
2548
fullpath = osutils.pathjoin(relpath, fp)
2551
views.check_path_in_view(tree, fullpath)
2552
except errors.FileOutsideView:
2557
fp = osutils.pathjoin(prefix, fp)
2558
kindch = entry.kind_character()
2559
outstring = fp + kindch
2560
ui.ui_factory.clear_term()
2562
outstring = '%-8s %s' % (fc, outstring)
2563
if show_ids and fid is not None:
2564
outstring = "%-50s %s" % (outstring, fid)
2565
self.outf.write(outstring + '\n')
2567
self.outf.write(fp + '\0')
2570
self.outf.write(fid)
2571
self.outf.write('\0')
2579
self.outf.write('%-50s %s\n' % (outstring, my_id))
2581
self.outf.write(outstring + '\n')
2035
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2036
if fp.startswith(relpath):
2037
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2038
if non_recursive and '/' in fp:
2040
if not all and not selection[fc]:
2042
if kind is not None and fkind != kind:
2044
kindch = entry.kind_character()
2045
outstring = fp + kindch
2047
outstring = '%-8s %s' % (fc, outstring)
2048
if show_ids and fid is not None:
2049
outstring = "%-50s %s" % (outstring, fid)
2050
self.outf.write(outstring + '\n')
2052
self.outf.write(fp + '\0')
2055
self.outf.write(fid)
2056
self.outf.write('\0')
2064
self.outf.write('%-50s %s\n' % (outstring, my_id))
2066
self.outf.write(outstring + '\n')
2584
2071
class cmd_unknowns(Command):
2789
2268
If no revision is nominated, the last revision is used.
2791
2270
Note: Take care to redirect standard output when using this command on a
2795
2274
_see_also = ['ls']
2796
2275
takes_options = [
2797
2276
Option('name-from-revision', help='The path name in the old tree.'),
2798
Option('filters', help='Apply content filters to display the '
2799
'convenience form.'),
2802
2279
takes_args = ['filename']
2803
2280
encoding_type = 'exact'
2805
2282
@display_command
2806
def run(self, filename, revision=None, name_from_revision=False,
2283
def run(self, filename, revision=None, name_from_revision=False):
2808
2284
if revision is not None and len(revision) != 1:
2809
2285
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2810
2286
" one revision specifier")
2811
2287
tree, branch, relpath = \
2812
2288
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2813
2289
branch.lock_read()
2814
self.add_cleanup(branch.unlock)
2815
return self._run(tree, branch, relpath, filename, revision,
2816
name_from_revision, filters)
2291
return self._run(tree, branch, relpath, filename, revision,
2818
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2296
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2820
2297
if tree is None:
2821
2298
tree = b.basis_tree()
2822
2299
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2823
rev_tree.lock_read()
2824
self.add_cleanup(rev_tree.unlock)
2301
cur_file_id = tree.path2id(relpath)
2826
2302
old_file_id = rev_tree.path2id(relpath)
2828
2304
if name_from_revision:
2829
# Try in revision if requested
2830
2305
if old_file_id is None:
2831
2306
raise errors.BzrCommandError(
2832
2307
"%r is not present in revision %s" % (
2833
2308
filename, rev_tree.get_revision_id()))
2835
2310
content = rev_tree.get_file_text(old_file_id)
2837
cur_file_id = tree.path2id(relpath)
2839
if cur_file_id is not None:
2840
# Then try with the actual file id
2842
content = rev_tree.get_file_text(cur_file_id)
2844
except errors.NoSuchId:
2845
# The actual file id didn't exist at that time
2847
if not found and old_file_id is not None:
2848
# Finally try with the old file id
2849
content = rev_tree.get_file_text(old_file_id)
2852
# Can't be found anywhere
2853
raise errors.BzrCommandError(
2854
"%r is not present in revision %s" % (
2855
filename, rev_tree.get_revision_id()))
2857
from bzrlib.filters import (
2858
ContentFilterContext,
2859
filtered_output_bytes,
2861
filters = rev_tree._content_filter_stack(relpath)
2862
chunks = content.splitlines(True)
2863
content = filtered_output_bytes(chunks, filters,
2864
ContentFilterContext(relpath, rev_tree))
2866
self.outf.writelines(content)
2869
self.outf.write(content)
2311
elif cur_file_id is not None:
2312
content = rev_tree.get_file_text(cur_file_id)
2313
elif old_file_id is not None:
2314
content = rev_tree.get_file_text(old_file_id)
2316
raise errors.BzrCommandError(
2317
"%r is not present in revision %s" % (
2318
filename, rev_tree.get_revision_id()))
2319
self.outf.write(content)
2872
2322
class cmd_local_time_offset(Command):
2873
2323
"""Show the offset in seconds from GMT to local time."""
2875
2325
@display_command
2877
2327
print osutils.local_time_offset()
2881
2331
class cmd_commit(Command):
2882
2332
"""Commit changes into a new revision.
2884
An explanatory message needs to be given for each commit. This is
2885
often done by using the --message option (getting the message from the
2886
command line) or by using the --file option (getting the message from
2887
a file). If neither of these options is given, an editor is opened for
2888
the user to enter the message. To see the changed files in the
2889
boilerplate text loaded into the editor, use the --show-diff option.
2891
By default, the entire tree is committed and the person doing the
2892
commit is assumed to be the author. These defaults can be overridden
2897
If selected files are specified, only changes to those files are
2898
committed. If a directory is specified then the directory and
2899
everything within it is committed.
2901
When excludes are given, they take precedence over selected files.
2902
For example, to commit only changes within foo, but not changes
2905
bzr commit foo -x foo/bar
2907
A selective commit after a merge is not yet supported.
2911
If the author of the change is not the same person as the committer,
2912
you can specify the author's name using the --author option. The
2913
name should be in the same format as a committer-id, e.g.
2914
"John Doe <jdoe@example.com>". If there is more than one author of
2915
the change you can specify the option multiple times, once for each
2920
A common mistake is to forget to add a new file or directory before
2921
running the commit command. The --strict option checks for unknown
2922
files and aborts the commit if any are found. More advanced pre-commit
2923
checks can be implemented by defining hooks. See ``bzr help hooks``
2928
If you accidentially commit the wrong changes or make a spelling
2929
mistake in the commit message say, you can use the uncommit command
2930
to undo it. See ``bzr help uncommit`` for details.
2932
Hooks can also be configured to run after a commit. This allows you
2933
to trigger updates to external systems like bug trackers. The --fixes
2934
option can be used to record the association between a revision and
2935
one or more bugs. See ``bzr help bugs`` for details.
2937
A selective commit may fail in some cases where the committed
2938
tree would be invalid. Consider::
2943
bzr commit foo -m "committing foo"
2944
bzr mv foo/bar foo/baz
2947
bzr commit foo/bar -m "committing bar but not baz"
2949
In the example above, the last commit will fail by design. This gives
2950
the user the opportunity to decide whether they want to commit the
2951
rename at the same time, separately first, or not at all. (As a general
2952
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2334
If no arguments are given, the entire tree is committed.
2336
If selected files are specified, only changes to those files are
2337
committed. If a directory is specified then the directory and everything
2338
within it is committed.
2340
When excludes are given, they take precedence over selected files.
2341
For example, too commit only changes within foo, but not changes within
2344
bzr commit foo -x foo/bar
2346
If author of the change is not the same person as the committer, you can
2347
specify the author's name using the --author option. The name should be
2348
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2350
A selected-file commit may fail in some cases where the committed
2351
tree would be invalid. Consider::
2356
bzr commit foo -m "committing foo"
2357
bzr mv foo/bar foo/baz
2360
bzr commit foo/bar -m "committing bar but not baz"
2362
In the example above, the last commit will fail by design. This gives
2363
the user the opportunity to decide whether they want to commit the
2364
rename at the same time, separately first, or not at all. (As a general
2365
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2367
Note: A selected-file commit after a merge is not yet supported.
2954
2369
# TODO: Run hooks on tree to-be-committed, and after commit.
2993
2404
"the master branch until a normal commit "
2994
2405
"is performed."
2997
help='When no message is supplied, show the diff along'
2998
' with the status summary in the message editor.'),
2408
help='When no message is supplied, show the diff along'
2409
' with the status summary in the message editor.'),
3000
2411
aliases = ['ci', 'checkin']
3002
def _iter_bug_fix_urls(self, fixes, branch):
2413
def _get_bug_fix_properties(self, fixes, branch):
3003
2415
# Configure the properties for bug fixing attributes.
3004
2416
for fixed_bug in fixes:
3005
2417
tokens = fixed_bug.split(':')
3006
2418
if len(tokens) != 2:
3007
2419
raise errors.BzrCommandError(
3008
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3009
"See \"bzr help bugs\" for more information on this "
3010
"feature.\nCommit refused." % fixed_bug)
2420
"Invalid bug %s. Must be in the form of 'tag:id'. "
2421
"Commit refused." % fixed_bug)
3011
2422
tag, bug_id = tokens
3013
yield bugtracker.get_bug_url(tag, branch, bug_id)
2424
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
3014
2425
except errors.UnknownBugTrackerAbbreviation:
3015
2426
raise errors.BzrCommandError(
3016
2427
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3017
except errors.MalformedBugIdentifier, e:
2428
except errors.MalformedBugIdentifier:
3018
2429
raise errors.BzrCommandError(
3019
"%s\nCommit refused." % (str(e),))
2430
"Invalid bug identifier for %s. Commit refused."
2432
properties.append('%s fixed' % bug_url)
2433
return '\n'.join(properties)
3021
2435
def run(self, message=None, file=None, verbose=False, selected_list=None,
3022
2436
unchanged=False, strict=False, local=False, fixes=None,
3023
author=None, show_diff=False, exclude=None, commit_time=None):
2437
author=None, show_diff=False, exclude=None):
3024
2438
from bzrlib.errors import (
3025
2439
PointlessCommit,
3026
2440
ConflictsInTree,
3513
2871
if cache_dir is not None:
3514
2872
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2874
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2875
print ' %s (%s python%s)' % (
2877
bzrlib.version_string,
2878
bzrlib._format_version_tuple(sys.version_info),
3515
2881
if testspecs_list is not None:
3516
2882
pattern = '|'.join(testspecs_list)
3521
from bzrlib.tests import SubUnitBzrRunner
3523
raise errors.BzrCommandError("subunit not available. subunit "
3524
"needs to be installed to use --subunit.")
3525
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3527
self.additional_selftest_args.setdefault(
3528
'suite_decorators', []).append(parallel)
3530
2886
test_suite_factory = benchmarks.test_suite
3531
2887
# Unless user explicitly asks for quiet, be verbose in benchmarks
3532
2888
verbose = not is_quiet()
3533
2889
# TODO: should possibly lock the history file...
3534
2890
benchfile = open(".perf_history", "at", buffering=1)
3535
self.add_cleanup(benchfile.close)
3537
2892
test_suite_factory = None
3538
2893
benchfile = None
3539
selftest_kwargs = {"verbose": verbose,
3541
"stop_on_failure": one,
3542
"transport": transport,
3543
"test_suite_factory": test_suite_factory,
3544
"lsprof_timed": lsprof_timed,
3545
"lsprof_tests": lsprof_tests,
3546
"bench_history": benchfile,
3547
"matching_tests_first": first,
3548
"list_only": list_only,
3549
"random_seed": randomize,
3550
"exclude_pattern": exclude,
3552
"load_list": load_list,
3553
"debug_flags": debugflag,
3554
"starting_with": starting_with
3556
selftest_kwargs.update(self.additional_selftest_args)
3557
result = selftest(**selftest_kwargs)
2895
result = selftest(verbose=verbose,
2897
stop_on_failure=one,
2898
transport=transport,
2899
test_suite_factory=test_suite_factory,
2900
lsprof_timed=lsprof_timed,
2901
bench_history=benchfile,
2902
matching_tests_first=first,
2903
list_only=list_only,
2904
random_seed=randomize,
2905
exclude_pattern=exclude,
2907
load_list=load_list,
2908
debug_flags=debugflag,
2909
starting_with=starting_with,
2912
if benchfile is not None:
2915
note('tests passed')
2917
note('tests failed')
3558
2918
return int(not result)
3717
3074
allow_pending = True
3718
3075
verified = 'inapplicable'
3719
3076
tree = WorkingTree.open_containing(directory)[0]
3077
change_reporter = delta._ChangeReporter(
3078
unversioned_filter=tree.is_ignored)
3722
basis_tree = tree.revision_tree(tree.last_revision())
3723
except errors.NoSuchRevision:
3724
basis_tree = tree.basis_tree()
3726
# die as quickly as possible if there are uncommitted changes
3728
if tree.has_changes():
3729
raise errors.UncommittedChanges(tree)
3731
view_info = _get_view_info_for_change_reporter(tree)
3732
change_reporter = delta._ChangeReporter(
3733
unversioned_filter=tree.is_ignored, view_info=view_info)
3734
pb = ui.ui_factory.nested_progress_bar()
3735
self.add_cleanup(pb.finished)
3737
self.add_cleanup(tree.unlock)
3738
if location is not None:
3740
mergeable = bundle.read_mergeable_from_url(location,
3741
possible_transports=possible_transports)
3742
except errors.NotABundle:
3081
pb = ui.ui_factory.nested_progress_bar()
3082
cleanups.append(pb.finished)
3084
cleanups.append(tree.unlock)
3085
if location is not None:
3087
mergeable = bundle.read_mergeable_from_url(location,
3088
possible_transports=possible_transports)
3089
except errors.NotABundle:
3093
raise errors.BzrCommandError('Cannot use --uncommitted'
3094
' with bundles or merge directives.')
3096
if revision is not None:
3097
raise errors.BzrCommandError(
3098
'Cannot use -r with merge directives or bundles')
3099
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3102
if merger is None and uncommitted:
3103
if revision is not None and len(revision) > 0:
3104
raise errors.BzrCommandError('Cannot use --uncommitted and'
3105
' --revision at the same time.')
3106
location = self._select_branch_location(tree, location)[0]
3107
other_tree, other_path = WorkingTree.open_containing(location)
3108
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3110
allow_pending = False
3111
if other_path != '':
3112
merger.interesting_files = [other_path]
3115
merger, allow_pending = self._get_merger_from_branch(tree,
3116
location, revision, remember, possible_transports, pb)
3118
merger.merge_type = merge_type
3119
merger.reprocess = reprocess
3120
merger.show_base = show_base
3121
self.sanity_check_merger(merger)
3122
if (merger.base_rev_id == merger.other_rev_id and
3123
merger.other_rev_id is not None):
3124
note('Nothing to do.')
3127
if merger.interesting_files is not None:
3128
raise errors.BzrCommandError('Cannot pull individual files')
3129
if (merger.base_rev_id == tree.last_revision()):
3130
result = tree.pull(merger.other_branch, False,
3131
merger.other_rev_id)
3132
result.report(self.outf)
3134
merger.check_basis(not force)
3136
return self._do_preview(merger)
3746
raise errors.BzrCommandError('Cannot use --uncommitted'
3747
' with bundles or merge directives.')
3749
if revision is not None:
3750
raise errors.BzrCommandError(
3751
'Cannot use -r with merge directives or bundles')
3752
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3755
if merger is None and uncommitted:
3756
if revision is not None and len(revision) > 0:
3757
raise errors.BzrCommandError('Cannot use --uncommitted and'
3758
' --revision at the same time.')
3759
merger = self.get_merger_from_uncommitted(tree, location, pb)
3760
allow_pending = False
3763
merger, allow_pending = self._get_merger_from_branch(tree,
3764
location, revision, remember, possible_transports, pb)
3766
merger.merge_type = merge_type
3767
merger.reprocess = reprocess
3768
merger.show_base = show_base
3769
self.sanity_check_merger(merger)
3770
if (merger.base_rev_id == merger.other_rev_id and
3771
merger.other_rev_id is not None):
3772
note('Nothing to do.')
3775
if merger.interesting_files is not None:
3776
raise errors.BzrCommandError('Cannot pull individual files')
3777
if (merger.base_rev_id == tree.last_revision()):
3778
result = tree.pull(merger.other_branch, False,
3779
merger.other_rev_id)
3780
result.report(self.outf)
3782
if merger.this_basis is None:
3783
raise errors.BzrCommandError(
3784
"This branch has no commits."
3785
" (perhaps you would prefer 'bzr pull')")
3787
return self._do_preview(merger)
3789
return self._do_interactive(merger)
3791
return self._do_merge(merger, change_reporter, allow_pending,
3794
def _get_preview(self, merger):
3138
return self._do_merge(merger, change_reporter, allow_pending,
3141
for cleanup in reversed(cleanups):
3144
def _do_preview(self, merger):
3145
from bzrlib.diff import show_diff_trees
3795
3146
tree_merger = merger.make_merger()
3796
3147
tt = tree_merger.make_preview_transform()
3797
self.add_cleanup(tt.finalize)
3798
result_tree = tt.get_preview_tree()
3801
def _do_preview(self, merger):
3802
from bzrlib.diff import show_diff_trees
3803
result_tree = self._get_preview(merger)
3804
show_diff_trees(merger.this_tree, result_tree, self.outf,
3805
old_label='', new_label='')
3149
result_tree = tt.get_preview_tree()
3150
show_diff_trees(merger.this_tree, result_tree, self.outf,
3151
old_label='', new_label='')
3807
3155
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3808
3156
merger.change_reporter = change_reporter
3996
3312
merge_type = _mod_merge.Merge3Merger
3997
3313
tree, file_list = tree_files(file_list)
3998
3314
tree.lock_write()
3999
self.add_cleanup(tree.unlock)
4000
parents = tree.get_parent_ids()
4001
if len(parents) != 2:
4002
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4003
" merges. Not cherrypicking or"
4005
repository = tree.branch.repository
4006
interesting_ids = None
4008
conflicts = tree.conflicts()
4009
if file_list is not None:
4010
interesting_ids = set()
4011
for filename in file_list:
4012
file_id = tree.path2id(filename)
4014
raise errors.NotVersionedError(filename)
4015
interesting_ids.add(file_id)
4016
if tree.kind(file_id) != "directory":
4019
for name, ie in tree.inventory.iter_entries(file_id):
4020
interesting_ids.add(ie.file_id)
4021
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4023
# Remerge only supports resolving contents conflicts
4024
allowed_conflicts = ('text conflict', 'contents conflict')
4025
restore_files = [c.path for c in conflicts
4026
if c.typestring in allowed_conflicts]
4027
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4028
tree.set_conflicts(ConflictList(new_conflicts))
4029
if file_list is not None:
4030
restore_files = file_list
4031
for filename in restore_files:
3316
parents = tree.get_parent_ids()
3317
if len(parents) != 2:
3318
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3319
" merges. Not cherrypicking or"
3321
repository = tree.branch.repository
3322
interesting_ids = None
3324
conflicts = tree.conflicts()
3325
if file_list is not None:
3326
interesting_ids = set()
3327
for filename in file_list:
3328
file_id = tree.path2id(filename)
3330
raise errors.NotVersionedError(filename)
3331
interesting_ids.add(file_id)
3332
if tree.kind(file_id) != "directory":
3335
for name, ie in tree.inventory.iter_entries(file_id):
3336
interesting_ids.add(ie.file_id)
3337
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3339
# Remerge only supports resolving contents conflicts
3340
allowed_conflicts = ('text conflict', 'contents conflict')
3341
restore_files = [c.path for c in conflicts
3342
if c.typestring in allowed_conflicts]
3343
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3344
tree.set_conflicts(ConflictList(new_conflicts))
3345
if file_list is not None:
3346
restore_files = file_list
3347
for filename in restore_files:
3349
restore(tree.abspath(filename))
3350
except errors.NotConflicted:
3352
# Disable pending merges, because the file texts we are remerging
3353
# have not had those merges performed. If we use the wrong parents
3354
# list, we imply that the working tree text has seen and rejected
3355
# all the changes from the other tree, when in fact those changes
3356
# have not yet been seen.
3357
pb = ui.ui_factory.nested_progress_bar()
3358
tree.set_parent_ids(parents[:1])
4033
restore(tree.abspath(filename))
4034
except errors.NotConflicted:
4036
# Disable pending merges, because the file texts we are remerging
4037
# have not had those merges performed. If we use the wrong parents
4038
# list, we imply that the working tree text has seen and rejected
4039
# all the changes from the other tree, when in fact those changes
4040
# have not yet been seen.
4041
pb = ui.ui_factory.nested_progress_bar()
4042
tree.set_parent_ids(parents[:1])
4044
merger = _mod_merge.Merger.from_revision_ids(pb,
4046
merger.interesting_ids = interesting_ids
4047
merger.merge_type = merge_type
4048
merger.show_base = show_base
4049
merger.reprocess = reprocess
4050
conflicts = merger.do_merge()
3360
merger = _mod_merge.Merger.from_revision_ids(pb,
3362
merger.interesting_ids = interesting_ids
3363
merger.merge_type = merge_type
3364
merger.show_base = show_base
3365
merger.reprocess = reprocess
3366
conflicts = merger.do_merge()
3368
tree.set_parent_ids(parents)
4052
tree.set_parent_ids(parents)
4054
3372
if conflicts > 0:
4179
3488
class cmd_missing(Command):
4180
3489
"""Show unmerged/unpulled revisions between two branches.
4182
3491
OTHER_BRANCH may be local or remote.
4184
To filter on a range of revisions, you can use the command -r begin..end
4185
-r revision requests a specific revision, -r ..end or -r begin.. are
4189
1 - some missing revisions
4190
0 - no missing revisions
4194
Determine the missing revisions between this and the branch at the
4195
remembered pull location::
4199
Determine the missing revisions between this and another branch::
4201
bzr missing http://server/branch
4203
Determine the missing revisions up to a specific revision on the other
4206
bzr missing -r ..-10
4208
Determine the missing revisions up to a specific revision on this
4211
bzr missing --my-revision ..-10
4214
3494
_see_also = ['merge', 'pull']
4215
3495
takes_args = ['other_branch?']
4216
3496
takes_options = [
4217
Option('reverse', 'Reverse the order of revisions.'),
4219
'Display changes in the local branch only.'),
4220
Option('this' , 'Same as --mine-only.'),
4221
Option('theirs-only',
4222
'Display changes in the remote branch only.'),
4223
Option('other', 'Same as --theirs-only.'),
4227
custom_help('revision',
4228
help='Filter on other branch revisions (inclusive). '
4229
'See "help revisionspec" for details.'),
4230
Option('my-revision',
4231
type=_parse_revision_str,
4232
help='Filter on local branch revisions (inclusive). '
4233
'See "help revisionspec" for details.'),
4234
Option('include-merges',
4235
'Show all revisions in addition to the mainline ones.'),
3497
Option('reverse', 'Reverse the order of revisions.'),
3499
'Display changes in the local branch only.'),
3500
Option('this' , 'Same as --mine-only.'),
3501
Option('theirs-only',
3502
'Display changes in the remote branch only.'),
3503
Option('other', 'Same as --theirs-only.'),
3507
Option('include-merges', 'Show merged revisions.'),
4237
3509
encoding_type = 'replace'
4239
3511
@display_command
4275
3547
remote_branch = Branch.open(other_branch)
4276
3548
if remote_branch.base == local_branch.base:
4277
3549
remote_branch = local_branch
4279
3550
local_branch.lock_read()
4280
self.add_cleanup(local_branch.unlock)
4281
local_revid_range = _revision_range_to_revid_range(
4282
_get_revision_range(my_revision, local_branch,
4285
remote_branch.lock_read()
4286
self.add_cleanup(remote_branch.unlock)
4287
remote_revid_range = _revision_range_to_revid_range(
4288
_get_revision_range(revision,
4289
remote_branch, self.name()))
4291
local_extra, remote_extra = find_unmerged(
4292
local_branch, remote_branch, restrict,
4293
backward=not reverse,
4294
include_merges=include_merges,
4295
local_revid_range=local_revid_range,
4296
remote_revid_range=remote_revid_range)
4298
if log_format is None:
4299
registry = log.log_formatter_registry
4300
log_format = registry.get_default(local_branch)
4301
lf = log_format(to_file=self.outf,
4303
show_timezone='original')
4306
if local_extra and not theirs_only:
4307
message("You have %d extra revision(s):\n" %
4309
for revision in iter_log_revisions(local_extra,
4310
local_branch.repository,
4312
lf.log_revision(revision)
4313
printed_local = True
4316
printed_local = False
4318
if remote_extra and not mine_only:
4319
if printed_local is True:
4321
message("You are missing %d revision(s):\n" %
4323
for revision in iter_log_revisions(remote_extra,
4324
remote_branch.repository,
4326
lf.log_revision(revision)
4329
if mine_only and not local_extra:
4330
# We checked local, and found nothing extra
4331
message('This branch is up to date.\n')
4332
elif theirs_only and not remote_extra:
4333
# We checked remote, and found nothing extra
4334
message('Other branch is up to date.\n')
4335
elif not (mine_only or theirs_only or local_extra or
4337
# We checked both branches, and neither one had extra
4339
message("Branches are up to date.\n")
3552
remote_branch.lock_read()
3554
local_extra, remote_extra = find_unmerged(
3555
local_branch, remote_branch, restrict,
3556
backward=not reverse,
3557
include_merges=include_merges)
3559
if log_format is None:
3560
registry = log.log_formatter_registry
3561
log_format = registry.get_default(local_branch)
3562
lf = log_format(to_file=self.outf,
3564
show_timezone='original')
3567
if local_extra and not theirs_only:
3568
message("You have %d extra revision(s):\n" %
3570
for revision in iter_log_revisions(local_extra,
3571
local_branch.repository,
3573
lf.log_revision(revision)
3574
printed_local = True
3577
printed_local = False
3579
if remote_extra and not mine_only:
3580
if printed_local is True:
3582
message("You are missing %d revision(s):\n" %
3584
for revision in iter_log_revisions(remote_extra,
3585
remote_branch.repository,
3587
lf.log_revision(revision)
3590
if mine_only and not local_extra:
3591
# We checked local, and found nothing extra
3592
message('This branch is up to date.\n')
3593
elif theirs_only and not remote_extra:
3594
# We checked remote, and found nothing extra
3595
message('Other branch is up to date.\n')
3596
elif not (mine_only or theirs_only or local_extra or
3598
# We checked both branches, and neither one had extra
3600
message("Branches are up to date.\n")
3602
remote_branch.unlock()
3604
local_branch.unlock()
4341
3605
if not status_code and parent is None and other_branch is not None:
4342
3606
local_branch.lock_write()
4343
self.add_cleanup(local_branch.unlock)
4344
# handle race conditions - a parent might be set while we run.
4345
if local_branch.get_parent() is None:
4346
local_branch.set_parent(remote_branch.base)
3608
# handle race conditions - a parent might be set while we run.
3609
if local_branch.get_parent() is None:
3610
local_branch.set_parent(remote_branch.base)
3612
local_branch.unlock()
4347
3613
return status_code
4469
3737
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4470
3738
if wt is not None:
4472
self.add_cleanup(wt.unlock)
4474
3741
branch.lock_read()
4475
self.add_cleanup(branch.unlock)
4476
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4478
self.add_cleanup(tree.unlock)
4480
file_id = wt.path2id(relpath)
4482
file_id = tree.path2id(relpath)
4484
raise errors.NotVersionedError(filename)
4485
file_version = tree.inventory[file_id].revision
4486
if wt is not None and revision is None:
4487
# If there is a tree and we're not annotating historical
4488
# versions, annotate the working tree's content.
4489
annotate_file_tree(wt, file_id, self.outf, long, all,
4492
annotate_file(branch, file_version, file_id, long, all, self.outf,
3743
tree = _get_one_revision_tree('annotate', revision, branch=branch)
3745
file_id = wt.path2id(relpath)
3747
file_id = tree.path2id(relpath)
3749
raise errors.NotVersionedError(filename)
3750
file_version = tree.inventory[file_id].revision
3751
if wt is not None and revision is None:
3752
# If there is a tree and we're not annotating historical
3753
# versions, annotate the working tree's content.
3754
annotate_file_tree(wt, file_id, self.outf, long, all,
3757
annotate_file(branch, file_version, file_id, long, all, self.outf,
4496
3766
class cmd_re_sign(Command):
4785
4056
Option('allow-writes',
4786
4057
help='By default the server is a readonly server. Supplying '
4787
4058
'--allow-writes enables write access to the contents of '
4788
'the served directory and below. Note that ``bzr serve`` '
4789
'does not perform authentication, so unless some form of '
4790
'external authentication is arranged supplying this '
4791
'option leads to global uncontrolled write access to your '
4059
'the served directory and below.'
4796
def get_host_and_port(self, port):
4797
"""Return the host and port to run the smart server on.
4799
If 'port' is None, None will be returned for the host and port.
4801
If 'port' has a colon in it, the string before the colon will be
4802
interpreted as the host.
4804
:param port: A string of the port to run the server on.
4805
:return: A tuple of (host, port), where 'host' is a host name or IP,
4806
and port is an integer TCP/IP port.
4809
if port is not None:
4811
host, port = port.split(':')
4815
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4817
from bzrlib.transport import get_transport, transport_server_registry
4063
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4064
from bzrlib import lockdir
4065
from bzrlib.smart import medium, server
4066
from bzrlib.transport import get_transport
4067
from bzrlib.transport.chroot import ChrootServer
4818
4068
if directory is None:
4819
4069
directory = os.getcwd()
4820
if protocol is None:
4821
protocol = transport_server_registry.get()
4822
host, port = self.get_host_and_port(port)
4823
4070
url = urlutils.local_path_to_url(directory)
4824
4071
if not allow_writes:
4825
4072
url = 'readonly+' + url
4826
transport = get_transport(url)
4827
protocol(transport, host, port, inet)
4073
chroot_server = ChrootServer(get_transport(url))
4074
chroot_server.setUp()
4075
t = get_transport(chroot_server.get_url())
4077
smart_server = medium.SmartServerPipeStreamMedium(
4078
sys.stdin, sys.stdout, t)
4080
host = medium.BZR_DEFAULT_INTERFACE
4082
port = medium.BZR_DEFAULT_PORT
4085
host, port = port.split(':')
4087
smart_server = server.SmartTCPServer(t, host=host, port=port)
4088
print 'listening on port: ', smart_server.port
4090
# for the duration of this server, no UI output is permitted.
4091
# note that this may cause problems with blackbox tests. This should
4092
# be changed with care though, as we dont want to use bandwidth sending
4093
# progress over stderr to smart server clients!
4094
old_factory = ui.ui_factory
4095
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4097
ui.ui_factory = ui.SilentUIFactory()
4098
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4099
smart_server.serve()
4101
ui.ui_factory = old_factory
4102
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4830
4105
class cmd_join(Command):
4831
"""Combine a tree into its containing tree.
4833
This command requires the target tree to be in a rich-root format.
4106
"""Combine a subtree into its containing tree.
4108
This command is for experimental use only. It requires the target tree
4109
to be in dirstate-with-subtree format, which cannot be converted into
4835
4112
The TREE argument should be an independent tree, inside another tree, but
4836
4113
not part of it. (Such trees can be produced by "bzr split", but also by
5011
4295
directly from the merge directive, without retrieving data from a
5014
`bzr send` creates a compact data set that, when applied using bzr
5015
merge, has the same effect as merging from the source branch.
5017
By default the merge directive is self-contained and can be applied to any
5018
branch containing submit_branch in its ancestory without needing access to
5021
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5022
revisions, but only a structured request to merge from the
5023
public_location. In that case the public_branch is needed and it must be
5024
up-to-date and accessible to the recipient. The public_branch is always
5025
included if known, so that people can check it later.
5027
The submit branch defaults to the parent of the source branch, but can be
5028
overridden. Both submit branch and public branch will be remembered in
5029
branch.conf the first time they are used for a particular branch. The
5030
source branch defaults to that containing the working directory, but can
5031
be changed using --from.
5033
In order to calculate those changes, bzr must analyse the submit branch.
5034
Therefore it is most efficient for the submit branch to be a local mirror.
5035
If a public location is known for the submit_branch, that location is used
5036
in the merge directive.
5038
The default behaviour is to send the merge directive by mail, unless -o is
5039
given, in which case it is sent to a file.
4298
If --no-bundle is specified, then public_branch is needed (and must be
4299
up-to-date), so that the receiver can perform the merge using the
4300
public_branch. The public_branch is always included if known, so that
4301
people can check it later.
4303
The submit branch defaults to the parent, but can be overridden. Both
4304
submit branch and public branch will be remembered if supplied.
4306
If a public_branch is known for the submit_branch, that public submit
4307
branch is used in the merge instructions. This means that a local mirror
4308
can be used as your actual submit branch, once you have set public_branch
5041
4311
Mail is sent using your preferred mail program. This should be transparent
5042
4312
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5043
4313
If the preferred client can't be found (or used), your editor will be used.
5045
4315
To use a specific mail program, set the mail_client configuration option.
5046
4316
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5047
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5048
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5049
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4317
specific clients are "claws", "evolution", "kmail", "mutt", and
4318
"thunderbird"; generic options are "default", "editor", "emacsclient",
4319
"mapi", and "xdg-email". Plugins may also add supported clients.
5052
4321
If mail is being sent, a to address is required. This can be supplied
5053
4322
either on the commandline, by setting the submit_to configuration
5054
option in the branch itself or the child_submit_to configuration option
4323
option in the branch itself or the child_submit_to configuration option
5055
4324
in the submit branch.
5057
4326
Two formats are currently supported: "4" uses revision bundle format 4 and
5090
4354
help='Write merge directive to this file; '
5091
4355
'use - for stdout.',
5094
help='Refuse to send if there are uncommitted changes in'
5095
' the working tree, --no-strict disables the check.'),
5096
4357
Option('mail-to', help='Mail the request to this address.',
5100
Option('body', help='Body for the email.', type=unicode),
5101
RegistryOption('format',
5102
help='Use the specified output format.',
5103
lazy_registry=('bzrlib.send', 'format_registry')),
4361
RegistryOption.from_kwargs('format',
4362
'Use the specified output format.',
4363
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4364
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5106
4367
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5107
4368
no_patch=False, revision=None, remember=False, output=None,
5108
format=None, mail_to=None, message=None, body=None,
5109
strict=None, **kwargs):
5110
from bzrlib.send import send
5111
return send(submit_branch, revision, public_branch, remember,
5112
format, no_bundle, no_patch, output,
5113
kwargs.get('from', '.'), mail_to, message, body,
4369
format='4', mail_to=None, message=None, **kwargs):
4370
return self._run(submit_branch, revision, public_branch, remember,
4371
format, no_bundle, no_patch, output,
4372
kwargs.get('from', '.'), mail_to, message)
4374
def _run(self, submit_branch, revision, public_branch, remember, format,
4375
no_bundle, no_patch, output, from_, mail_to, message):
4376
from bzrlib.revision import NULL_REVISION
4377
branch = Branch.open_containing(from_)[0]
4379
outfile = cStringIO.StringIO()
4383
outfile = open(output, 'wb')
4384
# we may need to write data into branch's repository to calculate
4389
config = branch.get_config()
4391
mail_to = config.get_user_option('submit_to')
4392
mail_client = config.get_mail_client()
4393
if remember and submit_branch is None:
4394
raise errors.BzrCommandError(
4395
'--remember requires a branch to be specified.')
4396
stored_submit_branch = branch.get_submit_branch()
4397
remembered_submit_branch = None
4398
if submit_branch is None:
4399
submit_branch = stored_submit_branch
4400
remembered_submit_branch = "submit"
4402
if stored_submit_branch is None or remember:
4403
branch.set_submit_branch(submit_branch)
4404
if submit_branch is None:
4405
submit_branch = branch.get_parent()
4406
remembered_submit_branch = "parent"
4407
if submit_branch is None:
4408
raise errors.BzrCommandError('No submit branch known or'
4410
if remembered_submit_branch is not None:
4411
note('Using saved %s location "%s" to determine what '
4412
'changes to submit.', remembered_submit_branch,
4416
submit_config = Branch.open(submit_branch).get_config()
4417
mail_to = submit_config.get_user_option("child_submit_to")
4419
stored_public_branch = branch.get_public_branch()
4420
if public_branch is None:
4421
public_branch = stored_public_branch
4422
elif stored_public_branch is None or remember:
4423
branch.set_public_branch(public_branch)
4424
if no_bundle and public_branch is None:
4425
raise errors.BzrCommandError('No public branch specified or'
4427
base_revision_id = None
4429
if revision is not None:
4430
if len(revision) > 2:
4431
raise errors.BzrCommandError('bzr send takes '
4432
'at most two one revision identifiers')
4433
revision_id = revision[-1].as_revision_id(branch)
4434
if len(revision) == 2:
4435
base_revision_id = revision[0].as_revision_id(branch)
4436
if revision_id is None:
4437
revision_id = branch.last_revision()
4438
if revision_id == NULL_REVISION:
4439
raise errors.BzrCommandError('No revisions to submit.')
4441
directive = merge_directive.MergeDirective2.from_objects(
4442
branch.repository, revision_id, time.time(),
4443
osutils.local_time_offset(), submit_branch,
4444
public_branch=public_branch, include_patch=not no_patch,
4445
include_bundle=not no_bundle, message=message,
4446
base_revision_id=base_revision_id)
4447
elif format == '0.9':
4450
patch_type = 'bundle'
4452
raise errors.BzrCommandError('Format 0.9 does not'
4453
' permit bundle with no patch')
4459
directive = merge_directive.MergeDirective.from_objects(
4460
branch.repository, revision_id, time.time(),
4461
osutils.local_time_offset(), submit_branch,
4462
public_branch=public_branch, patch_type=patch_type,
4465
outfile.writelines(directive.to_lines())
4467
subject = '[MERGE] '
4468
if message is not None:
4471
revision = branch.repository.get_revision(revision_id)
4472
subject += revision.get_summary()
4473
basename = directive.get_disk_name(branch)
4474
mail_client.compose_merge_request(mail_to, subject,
4475
outfile.getvalue(), basename)
5118
4482
class cmd_bundle_revisions(cmd_send):
5119
4484
"""Create a merge-directive for submitting changes.
5121
4486
A merge directive provides many things needed for requesting merges:
5340
4700
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
5341
4701
takes_args = ['location?']
5343
RegistryOption.from_kwargs(
5345
title='Target type',
5346
help='The type to reconfigure the directory to.',
5347
value_switches=True, enum_switch=False,
5348
branch='Reconfigure to be an unbound branch with no working tree.',
5349
tree='Reconfigure to be an unbound branch with a working tree.',
5350
checkout='Reconfigure to be a bound branch with a working tree.',
5351
lightweight_checkout='Reconfigure to be a lightweight'
5352
' checkout (with no local history).',
5353
standalone='Reconfigure to be a standalone branch '
5354
'(i.e. stop using shared repository).',
5355
use_shared='Reconfigure to use a shared repository.',
5356
with_trees='Reconfigure repository to create '
5357
'working trees on branches by default.',
5358
with_no_trees='Reconfigure repository to not create '
5359
'working trees on branches by default.'
5361
Option('bind-to', help='Branch to bind checkout to.', type=str),
5363
help='Perform reconfiguration even if local changes'
5365
Option('stacked-on',
5366
help='Reconfigure a branch to be stacked on another branch.',
5370
help='Reconfigure a branch to be unstacked. This '
5371
'may require copying substantial data into it.',
4702
takes_options = [RegistryOption.from_kwargs('target_type',
4703
title='Target type',
4704
help='The type to reconfigure the directory to.',
4705
value_switches=True, enum_switch=False,
4706
branch='Reconfigure to be an unbound branch '
4707
'with no working tree.',
4708
tree='Reconfigure to be an unbound branch '
4709
'with a working tree.',
4710
checkout='Reconfigure to be a bound branch '
4711
'with a working tree.',
4712
lightweight_checkout='Reconfigure to be a lightweight'
4713
' checkout (with no local history).',
4714
standalone='Reconfigure to be a standalone branch '
4715
'(i.e. stop using shared repository).',
4716
use_shared='Reconfigure to use a shared repository.'),
4717
Option('bind-to', help='Branch to bind checkout to.',
4720
help='Perform reconfiguration even if local changes'
5375
def run(self, location=None, target_type=None, bind_to=None, force=False,
4724
def run(self, location=None, target_type=None, bind_to=None, force=False):
5378
4725
directory = bzrdir.BzrDir.open(location)
5379
if stacked_on and unstacked:
5380
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5381
elif stacked_on is not None:
5382
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5384
reconfigure.ReconfigureUnstacked().apply(directory)
5385
# At the moment you can use --stacked-on and a different
5386
# reconfiguration shape at the same time; there seems no good reason
5388
4726
if target_type is None:
5389
if stacked_on or unstacked:
5392
raise errors.BzrCommandError('No target configuration '
4727
raise errors.BzrCommandError('No target configuration specified')
5394
4728
elif target_type == 'branch':
5395
4729
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5396
4730
elif target_type == 'tree':
5397
4731
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5398
4732
elif target_type == 'checkout':
5399
reconfiguration = reconfigure.Reconfigure.to_checkout(
4733
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
5401
4735
elif target_type == 'lightweight-checkout':
5402
4736
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5403
4737
directory, bind_to)
5433
4761
/path/to/newbranch.
5435
4763
Bound branches use the nickname of its master branch unless it is set
5436
locally, in which case switching will update the local nickname to be
4764
locally, in which case switching will update the the local nickname to be
5437
4765
that of the master.
5440
takes_args = ['to_location?']
4768
takes_args = ['to_location']
5441
4769
takes_options = [Option('force',
5442
help='Switch even if local commits will be lost.'),
5444
Option('create-branch', short_name='b',
5445
help='Create the target branch from this one before'
5446
' switching to it.'),
4770
help='Switch even if local commits will be lost.')
5449
def run(self, to_location=None, force=False, create_branch=False,
4773
def run(self, to_location, force=False):
5451
4774
from bzrlib import switch
5452
4775
tree_location = '.'
5453
revision = _get_one_revision('switch', revision)
5454
4776
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5455
if to_location is None:
5456
if revision is None:
5457
raise errors.BzrCommandError('You must supply either a'
5458
' revision or a location')
4777
branch = control_dir.open_branch()
5461
branch = control_dir.open_branch()
5462
had_explicit_nick = branch.get_config().has_explicit_nickname()
4779
to_branch = Branch.open(to_location)
5463
4780
except errors.NotBranchError:
5465
had_explicit_nick = False
5468
raise errors.BzrCommandError('cannot create branch without'
5470
to_location = directory_service.directories.dereference(
5472
if '/' not in to_location and '\\' not in to_location:
5473
# This path is meant to be relative to the existing branch
5474
this_url = self._get_branch_location(control_dir)
5475
to_location = urlutils.join(this_url, '..', to_location)
5476
to_branch = branch.bzrdir.sprout(to_location,
5477
possible_transports=[branch.bzrdir.root_transport],
5478
source_branch=branch).open_branch()
5481
to_branch = Branch.open(to_location)
5482
except errors.NotBranchError:
5483
this_url = self._get_branch_location(control_dir)
5484
to_branch = Branch.open(
5485
urlutils.join(this_url, '..', to_location))
5486
if revision is not None:
5487
revision = revision.as_revision_id(to_branch)
5488
switch.switch(control_dir, to_branch, force, revision_id=revision)
5489
if had_explicit_nick:
4781
this_branch = control_dir.open_branch()
4782
# This may be a heavy checkout, where we want the master branch
4783
this_url = this_branch.get_bound_location()
4784
# If not, use a local sibling
4785
if this_url is None:
4786
this_url = this_branch.base
4787
to_branch = Branch.open(
4788
urlutils.join(this_url, '..', to_location))
4789
switch.switch(control_dir, to_branch, force)
4790
if branch.get_config().has_explicit_nickname():
5490
4791
branch = control_dir.open_branch() #get the new branch!
5491
4792
branch.nick = to_branch.nick
5492
4793
note('Switched to branch: %s',
5493
4794
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5495
def _get_branch_location(self, control_dir):
5496
"""Return location of branch for this control dir."""
5498
this_branch = control_dir.open_branch()
5499
# This may be a heavy checkout, where we want the master branch
5500
master_location = this_branch.get_bound_location()
5501
if master_location is not None:
5502
return master_location
5503
# If not, use a local sibling
5504
return this_branch.base
5505
except errors.NotBranchError:
5506
format = control_dir.find_branch_format()
5507
if getattr(format, 'get_reference', None) is not None:
5508
return format.get_reference(control_dir)
5510
return control_dir.root_transport.base
5513
class cmd_view(Command):
5514
"""Manage filtered views.
5516
Views provide a mask over the tree so that users can focus on
5517
a subset of a tree when doing their work. After creating a view,
5518
commands that support a list of files - status, diff, commit, etc -
5519
effectively have that list of files implicitly given each time.
5520
An explicit list of files can still be given but those files
5521
must be within the current view.
5523
In most cases, a view has a short life-span: it is created to make
5524
a selected change and is deleted once that change is committed.
5525
At other times, you may wish to create one or more named views
5526
and switch between them.
5528
To disable the current view without deleting it, you can switch to
5529
the pseudo view called ``off``. This can be useful when you need
5530
to see the whole tree for an operation or two (e.g. merge) but
5531
want to switch back to your view after that.
5534
To define the current view::
5536
bzr view file1 dir1 ...
5538
To list the current view::
5542
To delete the current view::
5546
To disable the current view without deleting it::
5548
bzr view --switch off
5550
To define a named view and switch to it::
5552
bzr view --name view-name file1 dir1 ...
5554
To list a named view::
5556
bzr view --name view-name
5558
To delete a named view::
5560
bzr view --name view-name --delete
5562
To switch to a named view::
5564
bzr view --switch view-name
5566
To list all views defined::
5570
To delete all views::
5572
bzr view --delete --all
5576
takes_args = ['file*']
5579
help='Apply list or delete action to all views.',
5582
help='Delete the view.',
5585
help='Name of the view to define, list or delete.',
5589
help='Name of the view to switch to.',
5594
def run(self, file_list,
5600
tree, file_list = tree_files(file_list, apply_view=False)
5601
current_view, view_dict = tree.views.get_view_info()
5606
raise errors.BzrCommandError(
5607
"Both --delete and a file list specified")
5609
raise errors.BzrCommandError(
5610
"Both --delete and --switch specified")
5612
tree.views.set_view_info(None, {})
5613
self.outf.write("Deleted all views.\n")
5615
raise errors.BzrCommandError("No current view to delete")
5617
tree.views.delete_view(name)
5618
self.outf.write("Deleted '%s' view.\n" % name)
5621
raise errors.BzrCommandError(
5622
"Both --switch and a file list specified")
5624
raise errors.BzrCommandError(
5625
"Both --switch and --all specified")
5626
elif switch == 'off':
5627
if current_view is None:
5628
raise errors.BzrCommandError("No current view to disable")
5629
tree.views.set_view_info(None, view_dict)
5630
self.outf.write("Disabled '%s' view.\n" % (current_view))
5632
tree.views.set_view_info(switch, view_dict)
5633
view_str = views.view_display_str(tree.views.lookup_view())
5634
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
5637
self.outf.write('Views defined:\n')
5638
for view in sorted(view_dict):
5639
if view == current_view:
5643
view_str = views.view_display_str(view_dict[view])
5644
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5646
self.outf.write('No views defined.\n')
5649
# No name given and no current view set
5652
raise errors.BzrCommandError(
5653
"Cannot change the 'off' pseudo view")
5654
tree.views.set_view(name, sorted(file_list))
5655
view_str = views.view_display_str(tree.views.lookup_view())
5656
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
5660
# No name given and no current view set
5661
self.outf.write('No current view.\n')
5663
view_str = views.view_display_str(tree.views.lookup_view(name))
5664
self.outf.write("'%s' view is: %s\n" % (name, view_str))
5667
4797
class cmd_hooks(Command):
4798
"""Show a branch's currently registered hooks.
4802
takes_args = ['path?']
5673
for hook_key in sorted(hooks.known_hooks.keys()):
5674
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5675
self.outf.write("%s:\n" % type(some_hooks).__name__)
5676
for hook_name, hook_point in sorted(some_hooks.items()):
5677
self.outf.write(" %s:\n" % (hook_name,))
5678
found_hooks = list(hook_point)
5680
for hook in found_hooks:
5681
self.outf.write(" %s\n" %
5682
(some_hooks.get_hook_name(hook),))
5684
self.outf.write(" <no hooks installed>\n")
4804
def run(self, path=None):
4807
branch_hooks = Branch.open(path).hooks
4808
for hook_type in branch_hooks:
4809
hooks = branch_hooks[hook_type]
4810
self.outf.write("%s:\n" % (hook_type,))
4813
self.outf.write(" %s\n" %
4814
(branch_hooks.get_hook_name(hook),))
4816
self.outf.write(" <no hooks installed>\n")
5687
4819
class cmd_shelve(Command):
5720
4850
value_switches=True, enum_switch=False),
5722
4852
Option('list', help='List shelved changes.'),
5724
help='Destroy removed changes instead of shelving them.'),
5726
4854
_see_also = ['unshelve']
5728
4856
def run(self, revision=None, all=False, file_list=None, message=None,
5729
writer=None, list=False, destroy=False):
4857
writer=None, list=False):
5731
4859
return self.run_for_list()
5732
4860
from bzrlib.shelf_ui import Shelver
5733
4861
if writer is None:
5734
4862
writer = bzrlib.option.diff_writer_registry.get()
5736
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5737
file_list, message, destroy=destroy)
4864
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5742
4866
except errors.UserAbort:
5745
4869
def run_for_list(self):
5746
4870
tree = WorkingTree.open_containing('.')[0]
5747
4871
tree.lock_read()
5748
self.add_cleanup(tree.unlock)
5749
manager = tree.get_shelf_manager()
5750
shelves = manager.active_shelves()
5751
if len(shelves) == 0:
5752
note('No shelved changes.')
5754
for shelf_id in reversed(shelves):
5755
message = manager.get_metadata(shelf_id).get('message')
5757
message = '<no message>'
5758
self.outf.write('%3d: %s\n' % (shelf_id, message))
4873
manager = tree.get_shelf_manager()
4874
shelves = manager.active_shelves()
4875
if len(shelves) == 0:
4876
note('No shelved changes.')
4878
for shelf_id in reversed(shelves):
4879
message = manager.get_metadata(shelf_id).get('message')
4881
message = '<no message>'
4882
self.outf.write('%3d: %s\n' % (shelf_id, message))
5762
4888
class cmd_unshelve(Command):
5763
4889
"""Restore shelved changes.
5765
4891
By default, the most recently shelved changes are restored. However if you
5766
specify a shelf by id those changes will be restored instead. This works
5767
best when the changes don't depend on each other.
4892
specify a patch by name those changes will be restored instead. This
4893
works best when the changes don't depend on each other.
5770
4896
takes_args = ['shelf_id?']
5774
4900
enum_switch=False, value_switches=True,
5775
4901
apply="Apply changes and remove from the shelf.",
5776
4902
dry_run="Show changes, but do not apply or remove them.",
5777
preview="Instead of unshelving the changes, show the diff that "
5778
"would result from unshelving.",
5779
delete_only="Delete changes without applying them.",
5780
keep="Apply changes but don't delete them.",
4903
delete_only="Delete changes without applying them."
5783
4906
_see_also = ['shelve']
5785
4908
def run(self, shelf_id=None, action='apply'):
5786
4909
from bzrlib.shelf_ui import Unshelver
5787
unshelver = Unshelver.from_args(shelf_id, action)
4910
Unshelver.from_args(shelf_id, action).run()
4913
def _create_prefix(cur_transport):
4914
needed = [cur_transport]
4915
# Recurse upwards until we can create a directory successfully
4917
new_transport = cur_transport.clone('..')
4918
if new_transport.base == cur_transport.base:
4919
raise errors.BzrCommandError(
4920
"Failed to create path prefix for %s."
4921
% cur_transport.base)
5791
unshelver.tree.unlock()
5794
class cmd_clean_tree(Command):
5795
"""Remove unwanted files from working tree.
5797
By default, only unknown files, not ignored files, are deleted. Versioned
5798
files are never deleted.
5800
Another class is 'detritus', which includes files emitted by bzr during
5801
normal operations and selftests. (The value of these files decreases with
5804
If no options are specified, unknown files are deleted. Otherwise, option
5805
flags are respected, and may be combined.
5807
To check what clean-tree will do, use --dry-run.
5809
takes_options = [Option('ignored', help='Delete all ignored files.'),
5810
Option('detritus', help='Delete conflict files, merge'
5811
' backups, and failed selftest dirs.'),
5813
help='Delete files unknown to bzr (default).'),
5814
Option('dry-run', help='Show files to delete instead of'
5816
Option('force', help='Do not prompt before deleting.')]
5817
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5819
from bzrlib.clean_tree import clean_tree
5820
if not (unknown or ignored or detritus):
5824
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5825
dry_run=dry_run, no_prompt=force)
5828
class cmd_reference(Command):
5829
"""list, view and set branch locations for nested trees.
5831
If no arguments are provided, lists the branch locations for nested trees.
5832
If one argument is provided, display the branch location for that tree.
5833
If two arguments are provided, set the branch location for that tree.
5838
takes_args = ['path?', 'location?']
5840
def run(self, path=None, location=None):
5842
if path is not None:
5844
tree, branch, relpath =(
5845
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5846
if path is not None:
5849
tree = branch.basis_tree()
5851
info = branch._get_all_reference_info().iteritems()
5852
self._display_reference_info(tree, branch, info)
4923
new_transport.mkdir('.')
4924
except errors.NoSuchFile:
4925
needed.append(new_transport)
4926
cur_transport = new_transport
5854
file_id = tree.path2id(path)
5856
raise errors.NotVersionedError(path)
5857
if location is None:
5858
info = [(file_id, branch.get_reference_info(file_id))]
5859
self._display_reference_info(tree, branch, info)
5861
branch.set_reference_info(file_id, path, location)
5863
def _display_reference_info(self, tree, branch, info):
5865
for file_id, (path, location) in info:
5867
path = tree.id2path(file_id)
5868
except errors.NoSuchId:
5870
ref_list.append((path, location))
5871
for path, location in sorted(ref_list):
5872
self.outf.write('%s %s\n' % (path, location))
4929
# Now we only need to create child directories
4931
cur_transport = needed.pop()
4932
cur_transport.ensure_base()
5875
4935
# these get imported and then picked up by the scan for cmd_*
5876
4936
# TODO: Some more consistent way to split command definitions across files;
5877
# we do need to load at least some information about them to know of
4937
# we do need to load at least some information about them to know of
5878
4938
# aliases. ideally we would avoid loading the implementation until the
5879
4939
# details were needed.
5880
4940
from bzrlib.cmd_version_info import cmd_version_info
added
removed
bzrlib/builtins.py
