74
68
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
77
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
71
def tree_files(file_list, default_branch=u'.', canonicalize=True,
80
return internal_tree_files(file_list, default_branch, canonicalize,
74
return internal_tree_files(file_list, default_branch, canonicalize,
76
except errors.FileInWrongBranch, e:
77
raise errors.BzrCommandError("%s is not in the same branch as %s" %
78
(e.path, file_list[0]))
84
81
def tree_files_for_add(file_list):
86
Return a tree and list of absolute paths from a file list.
88
Similar to tree_files, but add handles files a bit differently, so it a
89
custom implementation. In particular, MutableTreeTree.smart_add expects
90
absolute paths, which it immediately converts to relative paths.
92
# FIXME Would be nice to just return the relative paths like
93
# internal_tree_files does, but there are a large number of unit tests
94
# that assume the current interface to mutabletree.smart_add
82
"""Add handles files a bit differently so it a custom implementation."""
96
tree, relpath = WorkingTree.open_containing(file_list[0])
84
tree = WorkingTree.open_containing(file_list[0])[0]
97
85
if tree.supports_views():
98
86
view_files = tree.views.lookup_view()
100
88
for filename in file_list:
101
89
if not osutils.is_inside_any(view_files, filename):
102
90
raise errors.FileOutsideView(filename, view_files)
103
file_list = file_list[:]
104
file_list[0] = tree.abspath(relpath)
106
92
tree = WorkingTree.open_containing(u'.')[0]
107
93
if tree.supports_views():
171
145
:return: workingtree, [relative_paths]
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
147
if file_list is None or len(file_list) == 0:
148
tree = WorkingTree.open_containing(default_branch)[0]
149
if tree.supports_views() and apply_view:
150
view_files = tree.views.lookup_view()
152
file_list = view_files
153
view_str = views.view_display_str(view_files)
154
note("Ignoring files outside view. View is %s" % view_str)
155
return tree, file_list
156
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
157
return tree, safe_relpath_files(tree, file_list, canonicalize,
158
apply_view=apply_view)
161
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
162
"""Convert file_list into a list of relpaths in tree.
164
:param tree: A tree to operate on.
165
:param file_list: A list of user provided paths or None.
166
:param apply_view: if True and a view is set, apply it or check that
167
specified files are within it
168
:return: A list of relative paths.
169
:raises errors.PathNotChild: When a provided path is in a different tree
172
if file_list is None:
174
if tree.supports_views() and apply_view:
175
view_files = tree.views.lookup_view()
179
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
180
# doesn't - fix that up here before we enter the loop.
182
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
185
for filename in file_list:
187
relpath = fixer(osutils.dereference_path(filename))
188
if view_files and not osutils.is_inside_any(view_files, relpath):
189
raise errors.FileOutsideView(filename, view_files)
190
new_list.append(relpath)
191
except errors.PathNotChild:
192
raise errors.FileInWrongBranch(tree.branch, filename)
179
196
def _get_view_info_for_change_reporter(tree):
306
311
takes_args = ['revision_id?']
307
takes_options = ['directory', 'revision']
312
takes_options = ['revision']
308
313
# cat-revision is more for frontends so should be exact
309
314
encoding = 'strict'
311
def print_revision(self, revisions, revid):
312
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
313
record = stream.next()
314
if record.storage_kind == 'absent':
315
raise errors.NoSuchRevision(revisions, revid)
316
revtext = record.get_bytes_as('fulltext')
317
self.outf.write(revtext.decode('utf-8'))
320
def run(self, revision_id=None, revision=None, directory=u'.'):
317
def run(self, revision_id=None, revision=None):
321
318
if revision_id is not None and revision is not None:
322
319
raise errors.BzrCommandError('You can only supply one of'
323
320
' revision_id or --revision')
324
321
if revision_id is None and revision is None:
325
322
raise errors.BzrCommandError('You must supply either'
326
323
' --revision or a revision_id')
327
b = WorkingTree.open_containing(directory)[0].branch
329
revisions = b.repository.revisions
330
if revisions is None:
331
raise errors.BzrCommandError('Repository %r does not support '
332
'access to raw revision texts')
334
b.repository.lock_read()
336
# TODO: jam 20060112 should cat-revision always output utf-8?
337
if revision_id is not None:
338
revision_id = osutils.safe_revision_id(revision_id, warn=False)
340
self.print_revision(revisions, revision_id)
341
except errors.NoSuchRevision:
342
msg = "The repository %s contains no revision %s." % (
343
b.repository.base, revision_id)
344
raise errors.BzrCommandError(msg)
345
elif revision is not None:
348
raise errors.BzrCommandError(
349
'You cannot specify a NULL revision.')
350
rev_id = rev.as_revision_id(b)
351
self.print_revision(revisions, rev_id)
353
b.repository.unlock()
324
b = WorkingTree.open_containing(u'.')[0].branch
326
# TODO: jam 20060112 should cat-revision always output utf-8?
327
if revision_id is not None:
328
revision_id = osutils.safe_revision_id(revision_id, warn=False)
330
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
331
except errors.NoSuchRevision:
332
msg = "The repository %s contains no revision %s." % (b.repository.base,
334
raise errors.BzrCommandError(msg)
335
elif revision is not None:
338
raise errors.BzrCommandError('You cannot specify a NULL'
340
rev_id = rev.as_revision_id(b)
341
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
356
344
class cmd_dump_btree(Command):
357
__doc__ = """Dump the contents of a btree index file to stdout.
345
"""Dump the contents of a btree index file to stdout.
359
347
PATH is a btree index file, it can be any URL. This includes things like
360
348
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
443
424
To re-create the working tree, use "bzr checkout".
445
426
_see_also = ['checkout', 'working-trees']
446
takes_args = ['location*']
427
takes_args = ['location?']
447
428
takes_options = [
449
430
help='Remove the working tree even if it has '
450
'uncommitted or shelved changes.'),
431
'uncommitted changes.'),
453
def run(self, location_list, force=False):
454
if not location_list:
457
for location in location_list:
458
d = bzrdir.BzrDir.open(location)
461
working = d.open_workingtree()
462
except errors.NoWorkingTree:
463
raise errors.BzrCommandError("No working tree to remove")
464
except errors.NotLocalUrl:
465
raise errors.BzrCommandError("You cannot remove the working tree"
468
if (working.has_changes()):
469
raise errors.UncommittedChanges(working)
470
if working.get_shelf_manager().last_shelf() is not None:
471
raise errors.ShelvedChanges(working)
473
if working.user_url != working.branch.user_url:
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
477
d.destroy_workingtree()
434
def run(self, location='.', force=False):
435
d = bzrdir.BzrDir.open(location)
438
working = d.open_workingtree()
439
except errors.NoWorkingTree:
440
raise errors.BzrCommandError("No working tree to remove")
441
except errors.NotLocalUrl:
442
raise errors.BzrCommandError("You cannot remove the working tree of a "
445
changes = working.changes_from(working.basis_tree())
446
if changes.has_changed():
447
raise errors.UncommittedChanges(working)
449
working_path = working.bzrdir.root_transport.base
450
branch_path = working.branch.bzrdir.root_transport.base
451
if working_path != branch_path:
452
raise errors.BzrCommandError("You cannot remove the working tree from "
453
"a lightweight checkout")
455
d.destroy_workingtree()
480
458
class cmd_revno(Command):
481
__doc__ = """Show current revision number.
459
"""Show current revision number.
483
461
This is equal to the number of revisions on this branch.
486
464
_see_also = ['info']
487
465
takes_args = ['location?']
489
Option('tree', help='Show revno of working tree'),
493
def run(self, tree=False, location=u'.'):
496
wt = WorkingTree.open_containing(location)[0]
497
self.add_cleanup(wt.lock_read().unlock)
498
except (errors.NoWorkingTree, errors.NotLocalUrl):
499
raise errors.NoWorkingTree(location)
500
revid = wt.last_revision()
502
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
503
except errors.NoSuchRevision:
505
revno = ".".join(str(n) for n in revno_t)
507
b = Branch.open_containing(location)[0]
508
self.add_cleanup(b.lock_read().unlock)
511
self.outf.write(str(revno) + '\n')
468
def run(self, location=u'.'):
469
self.outf.write(str(Branch.open_containing(location)[0].revno()))
470
self.outf.write('\n')
514
473
class cmd_revision_info(Command):
515
__doc__ = """Show revision number and revision id for a given revision identifier.
474
"""Show revision number and revision id for a given revision identifier.
518
477
takes_args = ['revision_info*']
519
478
takes_options = [
521
custom_help('directory',
522
481
help='Branch to examine, '
523
'rather than the one containing the working directory.'),
524
Option('tree', help='Show revno of working tree'),
482
'rather than the one containing the working directory.',
528
def run(self, revision=None, directory=u'.', tree=False,
529
revision_info_list=[]):
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
532
wt = WorkingTree.open_containing(directory)[0]
534
self.add_cleanup(wt.lock_read().unlock)
535
except (errors.NoWorkingTree, errors.NotLocalUrl):
537
b = Branch.open_containing(directory)[0]
538
self.add_cleanup(b.lock_read().unlock)
540
492
if revision is not None:
541
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
493
revs.extend(revision)
542
494
if revision_info_list is not None:
543
for rev_str in revision_info_list:
544
rev_spec = RevisionSpec.from_string(rev_str)
545
revision_ids.append(rev_spec.as_revision_id(b))
546
# No arguments supplied, default to the last revision
547
if len(revision_ids) == 0:
550
raise errors.NoWorkingTree(directory)
551
revision_ids.append(wt.last_revision())
553
revision_ids.append(b.last_revision())
557
for revision_id in revision_ids:
495
for rev in revision_info_list:
496
revs.append(RevisionSpec.from_string(rev))
498
b = Branch.open_containing(directory)[0]
501
revs.append(RevisionSpec.from_string('-1'))
504
revision_id = rev.as_revision_id(b)
559
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
560
revno = '.'.join(str(i) for i in dotted_revno)
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
561
507
except errors.NoSuchRevision:
563
maxlen = max(maxlen, len(revno))
564
revinfos.append([revno, revision_id])
568
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
508
dotted_map = b.get_revision_id_to_revno_map()
509
revno = '.'.join(str(i) for i in dotted_map[revision_id])
510
print '%s %s' % (revno, revision_id)
571
513
class cmd_add(Command):
572
__doc__ = """Add specified files or directories.
514
"""Add specified files or directories.
574
516
In non-recursive mode, all the named items are added, regardless
575
517
of whether they were previously ignored. A warning is given if
717
662
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
719
664
revision = _get_one_revision('inventory', revision)
720
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
721
self.add_cleanup(work_tree.lock_read().unlock)
722
if revision is not None:
723
tree = revision.as_tree(work_tree.branch)
725
extra_trees = [work_tree]
726
self.add_cleanup(tree.lock_read().unlock)
731
if file_list is not None:
732
file_ids = tree.paths2ids(file_list, trees=extra_trees,
733
require_versioned=True)
734
# find_ids_across_trees may include some paths that don't
736
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
737
for file_id in file_ids if file_id in tree)
739
entries = tree.inventory.entries()
665
work_tree, file_list = tree_files(file_list)
666
work_tree.lock_read()
668
if revision is not None:
669
tree = revision.as_tree(work_tree.branch)
671
extra_trees = [work_tree]
677
if file_list is not None:
678
file_ids = tree.paths2ids(file_list, trees=extra_trees,
679
require_versioned=True)
680
# find_ids_across_trees may include some paths that don't
682
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
683
for file_id in file_ids if file_id in tree)
685
entries = tree.inventory.entries()
688
if tree is not work_tree:
742
691
for path, entry in entries:
743
692
if kind and kind != entry.kind:
881
834
dest = osutils.pathjoin(dest_parent, dest_tail)
882
835
mutter("attempting to move %s => %s", src, dest)
883
836
tree.rename_one(src, dest, after=after)
885
self.outf.write("%s => %s\n" % (src, dest))
837
self.outf.write("%s => %s\n" % (src, dest))
888
840
class cmd_pull(Command):
889
__doc__ = """Turn this branch into a mirror of another branch.
841
"""Turn this branch into a mirror of another branch.
891
By default, this command only works on branches that have not diverged.
892
Branches are considered diverged if the destination branch's most recent
893
commit is one that has not been merged (directly or indirectly) into the
843
This command only works on branches that have not diverged. Branches are
844
considered diverged if the destination branch's most recent commit is one
845
that has not been merged (directly or indirectly) into the parent.
896
847
If branches have diverged, you can use 'bzr merge' to integrate the changes
897
848
from one into the other. Once one branch has merged, the other should
898
849
be able to pull it again.
900
If you want to replace your local changes and just want your branch to
901
match the remote one, use pull --overwrite. This will work even if the two
902
branches have diverged.
851
If you want to forget your local changes and just update your branch to
852
match the remote one, use pull --overwrite.
904
854
If there is no default location set, the first pull will set it. After
905
855
that, you can omit the location to use the default. To change the
987
929
if revision is not None:
988
930
revision_id = revision.as_revision_id(branch_from)
990
if tree_to is not None:
991
view_info = _get_view_info_for_change_reporter(tree_to)
992
change_reporter = delta._ChangeReporter(
993
unversioned_filter=tree_to.is_ignored,
995
result = tree_to.pull(
996
branch_from, overwrite, revision_id, change_reporter,
997
possible_transports=possible_transports, local=local)
999
result = branch_to.pull(
1000
branch_from, overwrite, revision_id, local=local)
932
branch_to.lock_write()
934
if tree_to is not None:
935
view_info = _get_view_info_for_change_reporter(tree_to)
936
change_reporter = delta._ChangeReporter(
937
unversioned_filter=tree_to.is_ignored, view_info=view_info)
938
result = tree_to.pull(branch_from, overwrite, revision_id,
940
possible_transports=possible_transports)
942
result = branch_to.pull(branch_from, overwrite, revision_id)
1002
result.report(self.outf)
1003
if verbose and result.old_revid != result.new_revid:
1004
log.show_branch_change(
1005
branch_to, self.outf, result.old_revno,
944
result.report(self.outf)
945
if verbose and result.old_revid != result.new_revid:
946
log.show_branch_change(branch_to, self.outf, result.old_revno,
1009
952
class cmd_push(Command):
1010
__doc__ = """Update a mirror of this branch.
953
"""Update a mirror of this branch.
1012
955
The target branch will not have its working tree populated because this
1013
956
is both expensive, and is not supported on remote file systems.
1135
1072
_see_also = ['checkout']
1136
1073
takes_args = ['from_location', 'to_location?']
1137
takes_options = ['revision',
1138
Option('hardlink', help='Hard-link working tree files where possible.'),
1139
Option('files-from', type=str,
1140
help="Get file contents from this tree."),
1074
takes_options = ['revision', Option('hardlink',
1075
help='Hard-link working tree files where possible.'),
1141
1076
Option('no-tree',
1142
1077
help="Create a branch without a working-tree."),
1144
help="Switch the checkout in the current directory "
1145
"to the new branch."),
1146
1078
Option('stacked',
1147
1079
help='Create a stacked branch referring to the source branch. '
1148
1080
'The new branch will depend on the availability of the source '
1149
1081
'branch for all operations.'),
1150
1082
Option('standalone',
1151
1083
help='Do not use a shared repository, even if available.'),
1152
Option('use-existing-dir',
1153
help='By default branch will fail if the target'
1154
' directory exists, but does not already'
1155
' have a control directory. This flag will'
1156
' allow branch to proceed.'),
1158
help="Bind new branch to from location."),
1160
1085
aliases = ['get', 'clone']
1162
1087
def run(self, from_location, to_location=None, revision=None,
1163
hardlink=False, stacked=False, standalone=False, no_tree=False,
1164
use_existing_dir=False, switch=False, bind=False,
1166
from bzrlib import switch as _mod_switch
1088
hardlink=False, stacked=False, standalone=False, no_tree=False):
1167
1089
from bzrlib.tag import _merge_tags_if_possible
1168
1091
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1170
if not (hardlink or files_from):
1171
# accelerator_tree is usually slower because you have to read N
1172
# files (no readahead, lots of seeks, etc), but allow the user to
1173
# explicitly request it
1174
accelerator_tree = None
1175
if files_from is not None and files_from != from_location:
1176
accelerator_tree = WorkingTree.open(files_from)
1177
1093
revision = _get_one_revision('branch', revision)
1178
self.add_cleanup(br_from.lock_read().unlock)
1179
if revision is not None:
1180
revision_id = revision.as_revision_id(br_from)
1182
# FIXME - wt.last_revision, fallback to branch, fall back to
1183
# None or perhaps NULL_REVISION to mean copy nothing
1185
revision_id = br_from.last_revision()
1186
if to_location is None:
1187
to_location = urlutils.derive_to_location(from_location)
1188
to_transport = transport.get_transport(to_location)
1190
to_transport.mkdir('.')
1191
except errors.FileExists:
1192
if not use_existing_dir:
1193
raise errors.BzrCommandError('Target directory "%s" '
1194
'already exists.' % to_location)
1096
if revision is not None:
1097
revision_id = revision.as_revision_id(br_from)
1197
bzrdir.BzrDir.open_from_transport(to_transport)
1198
except errors.NotBranchError:
1201
raise errors.AlreadyBranchError(to_location)
1202
except errors.NoSuchFile:
1203
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1206
# preserve whatever source format we have.
1207
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1208
possible_transports=[to_transport],
1209
accelerator_tree=accelerator_tree,
1210
hardlink=hardlink, stacked=stacked,
1211
force_new_repo=standalone,
1212
create_tree_if_local=not no_tree,
1213
source_branch=br_from)
1214
branch = dir.open_branch()
1215
except errors.NoSuchRevision:
1216
to_transport.delete_tree('.')
1217
msg = "The branch %s has no revision %s." % (from_location,
1219
raise errors.BzrCommandError(msg)
1220
_merge_tags_if_possible(br_from, branch)
1221
# If the source branch is stacked, the new branch may
1222
# be stacked whether we asked for that explicitly or not.
1223
# We therefore need a try/except here and not just 'if stacked:'
1225
note('Created new stacked branch referring to %s.' %
1226
branch.get_stacked_on_url())
1227
except (errors.NotStacked, errors.UnstackableBranchFormat,
1228
errors.UnstackableRepositoryFormat), e:
1229
note('Branched %d revision(s).' % branch.revno())
1231
# Bind to the parent
1232
parent_branch = Branch.open(from_location)
1233
branch.bind(parent_branch)
1234
note('New branch bound to %s' % from_location)
1236
# Switch to the new branch
1237
wt, _ = WorkingTree.open_containing('.')
1238
_mod_switch.switch(wt.bzrdir, branch)
1239
note('Switched to branch: %s',
1240
urlutils.unescape_for_display(branch.base, 'utf-8'))
1099
# FIXME - wt.last_revision, fallback to branch, fall back to
1100
# None or perhaps NULL_REVISION to mean copy nothing
1102
revision_id = br_from.last_revision()
1103
if to_location is None:
1104
to_location = urlutils.derive_to_location(from_location)
1105
to_transport = transport.get_transport(to_location)
1107
to_transport.mkdir('.')
1108
except errors.FileExists:
1109
raise errors.BzrCommandError('Target directory "%s" already'
1110
' exists.' % to_location)
1111
except errors.NoSuchFile:
1112
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1115
# preserve whatever source format we have.
1116
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1117
possible_transports=[to_transport],
1118
accelerator_tree=accelerator_tree,
1119
hardlink=hardlink, stacked=stacked,
1120
force_new_repo=standalone,
1121
create_tree_if_local=not no_tree,
1122
source_branch=br_from)
1123
branch = dir.open_branch()
1124
except errors.NoSuchRevision:
1125
to_transport.delete_tree('.')
1126
msg = "The branch %s has no revision %s." % (from_location,
1128
raise errors.BzrCommandError(msg)
1129
_merge_tags_if_possible(br_from, branch)
1130
# If the source branch is stacked, the new branch may
1131
# be stacked whether we asked for that explicitly or not.
1132
# We therefore need a try/except here and not just 'if stacked:'
1134
note('Created new stacked branch referring to %s.' %
1135
branch.get_stacked_on_url())
1136
except (errors.NotStacked, errors.UnstackableBranchFormat,
1137
errors.UnstackableRepositoryFormat), e:
1138
note('Branched %d revision(s).' % branch.revno())
1243
1143
class cmd_checkout(Command):
1244
__doc__ = """Create a new checkout of an existing branch.
1144
"""Create a new checkout of an existing branch.
1246
1146
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1247
1147
the branch found in '.'. This is useful if you have removed the working tree
1326
1221
@display_command
1327
1222
def run(self, dir=u'.'):
1328
1223
tree = WorkingTree.open_containing(dir)[0]
1329
self.add_cleanup(tree.lock_read().unlock)
1330
new_inv = tree.inventory
1331
old_tree = tree.basis_tree()
1332
self.add_cleanup(old_tree.lock_read().unlock)
1333
old_inv = old_tree.inventory
1335
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1336
for f, paths, c, v, p, n, k, e in iterator:
1337
if paths[0] == paths[1]:
1341
renames.append(paths)
1343
for old_name, new_name in renames:
1344
self.outf.write("%s => %s\n" % (old_name, new_name))
1226
new_inv = tree.inventory
1227
old_tree = tree.basis_tree()
1228
old_tree.lock_read()
1230
old_inv = old_tree.inventory
1232
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1233
for f, paths, c, v, p, n, k, e in iterator:
1234
if paths[0] == paths[1]:
1238
renames.append(paths)
1240
for old_name, new_name in renames:
1241
self.outf.write("%s => %s\n" % (old_name, new_name))
1347
1248
class cmd_update(Command):
1348
__doc__ = """Update a tree to have the latest code committed to its branch.
1249
"""Update a tree to have the latest code committed to its branch.
1350
1251
This will perform a merge into the working tree, and may generate
1351
1252
conflicts. If you have any local changes, you will still
1354
1255
If you want to discard your local changes, you can just do a
1355
1256
'bzr revert' instead of 'bzr commit' after the update.
1357
If you want to restore a file that has been removed locally, use
1358
'bzr revert' instead of 'bzr update'.
1360
If the tree's branch is bound to a master branch, it will also update
1361
the branch from the master.
1364
1259
_see_also = ['pull', 'working-trees', 'status-flags']
1365
1260
takes_args = ['dir?']
1366
takes_options = ['revision']
1367
1261
aliases = ['up']
1369
def run(self, dir='.', revision=None):
1370
if revision is not None and len(revision) != 1:
1371
raise errors.BzrCommandError(
1372
"bzr update --revision takes exactly one revision")
1263
def run(self, dir='.'):
1373
1264
tree = WorkingTree.open_containing(dir)[0]
1374
branch = tree.branch
1375
1265
possible_transports = []
1376
master = branch.get_master_branch(
1266
master = tree.branch.get_master_branch(
1377
1267
possible_transports=possible_transports)
1378
1268
if master is not None:
1379
branch_location = master.base
1380
1269
tree.lock_write()
1382
branch_location = tree.branch.base
1383
1271
tree.lock_tree_write()
1384
self.add_cleanup(tree.unlock)
1385
# get rid of the final '/' and be ready for display
1386
branch_location = urlutils.unescape_for_display(
1387
branch_location.rstrip('/'),
1389
existing_pending_merges = tree.get_parent_ids()[1:]
1393
# may need to fetch data into a heavyweight checkout
1394
# XXX: this may take some time, maybe we should display a
1396
old_tip = branch.update(possible_transports)
1397
if revision is not None:
1398
revision_id = revision[0].as_revision_id(branch)
1400
revision_id = branch.last_revision()
1401
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1402
revno = branch.revision_id_to_dotted_revno(revision_id)
1403
note("Tree is up to date at revision %s of branch %s" %
1404
('.'.join(map(str, revno)), branch_location))
1406
view_info = _get_view_info_for_change_reporter(tree)
1407
change_reporter = delta._ChangeReporter(
1408
unversioned_filter=tree.is_ignored,
1409
view_info=view_info)
1273
existing_pending_merges = tree.get_parent_ids()[1:]
1274
last_rev = _mod_revision.ensure_null(tree.last_revision())
1275
if last_rev == _mod_revision.ensure_null(
1276
tree.branch.last_revision()):
1277
# may be up to date, check master too.
1278
if master is None or last_rev == _mod_revision.ensure_null(
1279
master.last_revision()):
1280
revno = tree.branch.revision_id_to_revno(last_rev)
1281
note("Tree is up to date at revision %d." % (revno,))
1283
view_info = _get_view_info_for_change_reporter(tree)
1411
1284
conflicts = tree.update(
1413
possible_transports=possible_transports,
1414
revision=revision_id,
1416
except errors.NoSuchRevision, e:
1417
raise errors.BzrCommandError(
1418
"branch has no revision %s\n"
1419
"bzr update --revision only works"
1420
" for a revision in the branch history"
1422
revno = tree.branch.revision_id_to_dotted_revno(
1423
_mod_revision.ensure_null(tree.last_revision()))
1424
note('Updated to revision %s of branch %s' %
1425
('.'.join(map(str, revno)), branch_location))
1426
parent_ids = tree.get_parent_ids()
1427
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1428
note('Your local commits will now show as pending merges with '
1429
"'bzr status', and can be committed with 'bzr commit'.")
1285
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1286
view_info=view_info), possible_transports=possible_transports)
1287
revno = tree.branch.revision_id_to_revno(
1288
_mod_revision.ensure_null(tree.last_revision()))
1289
note('Updated to revision %d.' % (revno,))
1290
if tree.get_parent_ids()[1:] != existing_pending_merges:
1291
note('Your local commits will now show as pending merges with '
1292
"'bzr status', and can be committed with 'bzr commit'.")
1436
1301
class cmd_info(Command):
1437
__doc__ = """Show information about a working tree, branch or repository.
1302
"""Show information about a working tree, branch or repository.
1439
1304
This command will show all known locations and formats associated to the
1440
1305
tree, branch or repository.
1502
1367
def run(self, file_list, verbose=False, new=False,
1503
1368
file_deletion_strategy='safe'):
1504
tree, file_list = WorkingTree.open_containing_paths(file_list)
1369
tree, file_list = tree_files(file_list)
1506
1371
if file_list is not None:
1507
1372
file_list = [f for f in file_list]
1509
self.add_cleanup(tree.lock_write().unlock)
1510
# Heuristics should probably all move into tree.remove_smart or
1513
added = tree.changes_from(tree.basis_tree(),
1514
specific_files=file_list).added
1515
file_list = sorted([f[0] for f in added], reverse=True)
1516
if len(file_list) == 0:
1517
raise errors.BzrCommandError('No matching files.')
1518
elif file_list is None:
1519
# missing files show up in iter_changes(basis) as
1520
# versioned-with-no-kind.
1522
for change in tree.iter_changes(tree.basis_tree()):
1523
# Find paths in the working tree that have no kind:
1524
if change[1][1] is not None and change[6][1] is None:
1525
missing.append(change[1][1])
1526
file_list = sorted(missing, reverse=True)
1527
file_deletion_strategy = 'keep'
1528
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1529
keep_files=file_deletion_strategy=='keep',
1530
force=file_deletion_strategy=='force')
1376
# Heuristics should probably all move into tree.remove_smart or
1379
added = tree.changes_from(tree.basis_tree(),
1380
specific_files=file_list).added
1381
file_list = sorted([f[0] for f in added], reverse=True)
1382
if len(file_list) == 0:
1383
raise errors.BzrCommandError('No matching files.')
1384
elif file_list is None:
1385
# missing files show up in iter_changes(basis) as
1386
# versioned-with-no-kind.
1388
for change in tree.iter_changes(tree.basis_tree()):
1389
# Find paths in the working tree that have no kind:
1390
if change[1][1] is not None and change[6][1] is None:
1391
missing.append(change[1][1])
1392
file_list = sorted(missing, reverse=True)
1393
file_deletion_strategy = 'keep'
1394
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1395
keep_files=file_deletion_strategy=='keep',
1396
force=file_deletion_strategy=='force')
1533
1401
class cmd_file_id(Command):
1534
__doc__ = """Print file_id of a particular file or directory.
1402
"""Print file_id of a particular file or directory.
1536
1404
The file_id is assigned when the file is first added and remains the
1537
1405
same through all revisions where the file exists, even when it is
1947
1780
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1948
1781
' one or two revision specifiers')
1950
if using is not None and format is not None:
1951
raise errors.BzrCommandError('--using and --format are mutually '
1954
(old_tree, new_tree,
1955
old_branch, new_branch,
1956
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1957
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1958
# GNU diff on Windows uses ANSI encoding for filenames
1959
path_encoding = osutils.get_diff_header_encoding()
1783
old_tree, new_tree, specific_files, extra_trees = \
1784
_get_trees_to_diff(file_list, revision, old, new,
1960
1786
return show_diff_trees(old_tree, new_tree, sys.stdout,
1961
1787
specific_files=specific_files,
1962
1788
external_diff_options=diff_options,
1963
1789
old_label=old_label, new_label=new_label,
1964
extra_trees=extra_trees,
1965
path_encoding=path_encoding,
1790
extra_trees=extra_trees, using=using)
1970
1793
class cmd_deleted(Command):
1971
__doc__ = """List files deleted in the working tree.
1794
"""List files deleted in the working tree.
1973
1796
# TODO: Show files deleted since a previous revision, or
1974
1797
# between two revisions.
1977
1800
# level of effort but possibly much less IO. (Or possibly not,
1978
1801
# if the directories are very large...)
1979
1802
_see_also = ['status', 'ls']
1980
takes_options = ['directory', 'show-ids']
1803
takes_options = ['show-ids']
1982
1805
@display_command
1983
def run(self, show_ids=False, directory=u'.'):
1984
tree = WorkingTree.open_containing(directory)[0]
1985
self.add_cleanup(tree.lock_read().unlock)
1986
old = tree.basis_tree()
1987
self.add_cleanup(old.lock_read().unlock)
1988
for path, ie in old.inventory.iter_entries():
1989
if not tree.has_id(ie.file_id):
1990
self.outf.write(path)
1992
self.outf.write(' ')
1993
self.outf.write(ie.file_id)
1994
self.outf.write('\n')
1806
def run(self, show_ids=False):
1807
tree = WorkingTree.open_containing(u'.')[0]
1810
old = tree.basis_tree()
1813
for path, ie in old.inventory.iter_entries():
1814
if not tree.has_id(ie.file_id):
1815
self.outf.write(path)
1817
self.outf.write(' ')
1818
self.outf.write(ie.file_id)
1819
self.outf.write('\n')
1997
1826
class cmd_modified(Command):
1998
__doc__ = """List files modified in working tree.
1827
"""List files modified in working tree.
2002
1831
_see_also = ['status', 'ls']
2003
takes_options = ['directory', 'null']
1834
help='Write an ascii NUL (\\0) separator '
1835
'between files rather than a newline.')
2005
1838
@display_command
2006
def run(self, null=False, directory=u'.'):
2007
tree = WorkingTree.open_containing(directory)[0]
1839
def run(self, null=False):
1840
tree = WorkingTree.open_containing(u'.')[0]
2008
1841
td = tree.changes_from(tree.basis_tree())
2009
1842
for path, id, kind, text_modified, meta_modified in td.modified:
2016
1849
class cmd_added(Command):
2017
__doc__ = """List files added in working tree.
1850
"""List files added in working tree.
2021
1854
_see_also = ['status', 'ls']
2022
takes_options = ['directory', 'null']
1857
help='Write an ascii NUL (\\0) separator '
1858
'between files rather than a newline.')
2024
1861
@display_command
2025
def run(self, null=False, directory=u'.'):
2026
wt = WorkingTree.open_containing(directory)[0]
2027
self.add_cleanup(wt.lock_read().unlock)
2028
basis = wt.basis_tree()
2029
self.add_cleanup(basis.lock_read().unlock)
2030
basis_inv = basis.inventory
2033
if file_id in basis_inv:
2035
if inv.is_root(file_id) and len(basis_inv) == 0:
2037
path = inv.id2path(file_id)
2038
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2041
self.outf.write(path + '\0')
2043
self.outf.write(osutils.quotefn(path) + '\n')
1862
def run(self, null=False):
1863
wt = WorkingTree.open_containing(u'.')[0]
1866
basis = wt.basis_tree()
1869
basis_inv = basis.inventory
1872
if file_id in basis_inv:
1874
if inv.is_root(file_id) and len(basis_inv) == 0:
1876
path = inv.id2path(file_id)
1877
if not os.access(osutils.abspath(path), os.F_OK):
1880
self.outf.write(path + '\0')
1882
self.outf.write(osutils.quotefn(path) + '\n')
2046
1889
class cmd_root(Command):
2047
__doc__ = """Show the tree root directory.
1890
"""Show the tree root directory.
2049
1892
The root is the nearest enclosing directory with a .bzr control
2361
2181
diff_type = 'full'
2363
# Build the log formatter
2364
if log_format is None:
2365
log_format = log.log_formatter_registry.get_default(b)
2366
# Make a non-encoding output to include the diffs - bug 328007
2367
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2368
lf = log_format(show_ids=show_ids, to_file=self.outf,
2369
to_exact_file=unencoded_output,
2370
show_timezone=timezone,
2371
delta_format=get_verbosity_level(),
2373
show_advice=levels is None,
2374
author_list_handler=authors)
2376
# Choose the algorithm for doing the logging. It's annoying
2377
# having multiple code paths like this but necessary until
2378
# the underlying repository format is faster at generating
2379
# deltas or can provide everything we need from the indices.
2380
# The default algorithm - match-using-deltas - works for
2381
# multiple files and directories and is faster for small
2382
# amounts of history (200 revisions say). However, it's too
2383
# slow for logging a single file in a repository with deep
2384
# history, i.e. > 10K revisions. In the spirit of "do no
2385
# evil when adding features", we continue to use the
2386
# original algorithm - per-file-graph - for the "single
2387
# file that isn't a directory without showing a delta" case.
2388
partial_history = revision and b.repository._format.supports_chks
2389
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2390
or delta_type or partial_history)
2392
# Build the LogRequest and execute it
2393
if len(file_ids) == 0:
2395
rqst = make_log_request_dict(
2396
direction=direction, specific_fileids=file_ids,
2397
start_revision=rev1, end_revision=rev2, limit=limit,
2398
message_search=message, delta_type=delta_type,
2399
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2400
exclude_common_ancestry=exclude_common_ancestry,
2402
Logger(b, rqst).show(lf)
2185
# Build the log formatter
2186
if log_format is None:
2187
log_format = log.log_formatter_registry.get_default(b)
2188
lf = log_format(show_ids=show_ids, to_file=self.outf,
2189
show_timezone=timezone,
2190
delta_format=get_verbosity_level(),
2193
# Choose the algorithm for doing the logging. It's annoying
2194
# having multiple code paths like this but necessary until
2195
# the underlying repository format is faster at generating
2196
# deltas or can provide everything we need from the indices.
2197
# The default algorithm - match-using-deltas - works for
2198
# multiple files and directories and is faster for small
2199
# amounts of history (200 revisions say). However, it's too
2200
# slow for logging a single file in a repository with deep
2201
# history, i.e. > 10K revisions. In the spirit of "do no
2202
# evil when adding features", we continue to use the
2203
# original algorithm - per-file-graph - for the "single
2204
# file that isn't a directory without showing a delta" case.
2205
partial_history = revision and b.repository._format.supports_chks
2206
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2207
or delta_type or partial_history)
2209
# Build the LogRequest and execute it
2210
if len(file_ids) == 0:
2212
rqst = make_log_request_dict(
2213
direction=direction, specific_fileids=file_ids,
2214
start_revision=rev1, end_revision=rev2, limit=limit,
2215
message_search=message, delta_type=delta_type,
2216
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2217
Logger(b, rqst).show(lf)
2405
2222
def _get_revision_range(revisionspec_list, branch, command_name):
2473
2286
@display_command
2474
2287
def run(self, filename):
2475
2288
tree, relpath = WorkingTree.open_containing(filename)
2476
2290
file_id = tree.path2id(relpath)
2478
self.add_cleanup(b.lock_read().unlock)
2479
touching_revs = log.find_touching_revisions(b, file_id)
2480
for revno, revision_id, what in touching_revs:
2291
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2481
2292
self.outf.write("%6d %s\n" % (revno, what))
2484
2295
class cmd_ls(Command):
2485
__doc__ = """List files in a tree.
2296
"""List files in a tree.
2488
2299
_see_also = ['status', 'cat']
2489
2300
takes_args = ['path?']
2301
# TODO: Take a revision or remote path and list that tree instead.
2490
2302
takes_options = [
2493
Option('recursive', short_name='R',
2494
help='Recurse into subdirectories.'),
2305
Option('non-recursive',
2306
help='Don\'t recurse into subdirectories.'),
2495
2307
Option('from-root',
2496
2308
help='Print paths relative to the root of the branch.'),
2497
Option('unknown', short_name='u',
2498
help='Print unknown files.'),
2309
Option('unknown', help='Print unknown files.'),
2499
2310
Option('versioned', help='Print versioned files.',
2500
2311
short_name='V'),
2501
Option('ignored', short_name='i',
2502
help='Print ignored files.'),
2503
Option('kind', short_name='k',
2312
Option('ignored', help='Print ignored files.'),
2314
help='Write an ascii NUL (\\0) separator '
2315
'between files rather than a newline.'),
2504
2317
help='List entries of a particular kind: file, directory, symlink.',
2510
2321
@display_command
2511
2322
def run(self, revision=None, verbose=False,
2512
recursive=False, from_root=False,
2323
non_recursive=False, from_root=False,
2513
2324
unknown=False, versioned=False, ignored=False,
2514
null=False, kind=None, show_ids=False, path=None, directory=None):
2325
null=False, kind=None, show_ids=False, path=None):
2516
2327
if kind and kind not in ('file', 'directory', 'symlink'):
2517
2328
raise errors.BzrCommandError('invalid kind specified')
2551
2359
view_str = views.view_display_str(view_files)
2552
2360
note("Ignoring files outside view. View is %s" % view_str)
2554
self.add_cleanup(tree.lock_read().unlock)
2555
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2556
from_dir=relpath, recursive=recursive):
2557
# Apply additional masking
2558
if not all and not selection[fc]:
2560
if kind is not None and fkind != kind:
2565
fullpath = osutils.pathjoin(relpath, fp)
2568
views.check_path_in_view(tree, fullpath)
2569
except errors.FileOutsideView:
2574
fp = osutils.pathjoin(prefix, fp)
2575
kindch = entry.kind_character()
2576
outstring = fp + kindch
2577
ui.ui_factory.clear_term()
2579
outstring = '%-8s %s' % (fc, outstring)
2580
if show_ids and fid is not None:
2581
outstring = "%-50s %s" % (outstring, fid)
2582
self.outf.write(outstring + '\n')
2584
self.outf.write(fp + '\0')
2587
self.outf.write(fid)
2588
self.outf.write('\0')
2596
self.outf.write('%-50s %s\n' % (outstring, my_id))
2598
self.outf.write(outstring + '\n')
2364
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2365
if fp.startswith(relpath):
2366
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2367
if non_recursive and '/' in fp:
2369
if not all and not selection[fc]:
2371
if kind is not None and fkind != kind:
2375
views.check_path_in_view(tree, fp)
2376
except errors.FileOutsideView:
2378
kindch = entry.kind_character()
2379
outstring = fp + kindch
2381
outstring = '%-8s %s' % (fc, outstring)
2382
if show_ids and fid is not None:
2383
outstring = "%-50s %s" % (outstring, fid)
2384
self.outf.write(outstring + '\n')
2386
self.outf.write(fp + '\0')
2389
self.outf.write(fid)
2390
self.outf.write('\0')
2398
self.outf.write('%-50s %s\n' % (outstring, my_id))
2400
self.outf.write(outstring + '\n')
2601
2405
class cmd_unknowns(Command):
2602
__doc__ = """List unknown files.
2406
"""List unknown files.
2606
2410
_see_also = ['ls']
2607
takes_options = ['directory']
2609
2412
@display_command
2610
def run(self, directory=u'.'):
2611
for f in WorkingTree.open_containing(directory)[0].unknowns():
2414
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2612
2415
self.outf.write(osutils.quotefn(f) + '\n')
2615
2418
class cmd_ignore(Command):
2616
__doc__ = """Ignore specified files or patterns.
2419
"""Ignore specified files or patterns.
2618
2421
See ``bzr help patterns`` for details on the syntax of patterns.
2620
If a .bzrignore file does not exist, the ignore command
2621
will create one and add the specified files or patterns to the newly
2622
created file. The ignore command will also automatically add the
2623
.bzrignore file to be versioned. Creating a .bzrignore file without
2624
the use of the ignore command will require an explicit add command.
2626
2423
To remove patterns from the ignore list, edit the .bzrignore file.
2627
2424
After adding, editing or deleting that file either indirectly by
2628
2425
using this command or directly by using an editor, be sure to commit
2631
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2632
the global ignore file can be found in the application data directory as
2633
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2634
Global ignores are not touched by this command. The global ignore file
2635
can be edited directly using an editor.
2637
Patterns prefixed with '!' are exceptions to ignore patterns and take
2638
precedence over regular ignores. Such exceptions are used to specify
2639
files that should be versioned which would otherwise be ignored.
2641
Patterns prefixed with '!!' act as regular ignore patterns, but have
2642
precedence over the '!' exception patterns.
2644
2428
Note: ignore patterns containing shell wildcards must be quoted from
2645
2429
the shell on Unix.
2668
2448
Ignore everything but the "debian" toplevel directory::
2670
2450
bzr ignore "RE:(?!debian/).*"
2672
Ignore everything except the "local" toplevel directory,
2673
but always ignore "*~" autosave files, even under local/::
2676
bzr ignore "!./local"
2680
2453
_see_also = ['status', 'ignored', 'patterns']
2681
2454
takes_args = ['name_pattern*']
2682
takes_options = ['directory',
2683
Option('default-rules',
2684
help='Display the default ignore rules that bzr uses.')
2456
Option('old-default-rules',
2457
help='Write out the ignore rules bzr < 0.9 always used.')
2687
def run(self, name_pattern_list=None, default_rules=None,
2460
def run(self, name_pattern_list=None, old_default_rules=None):
2689
2461
from bzrlib import ignores
2690
if default_rules is not None:
2691
# dump the default rules and exit
2692
for pattern in ignores.USER_DEFAULTS:
2693
self.outf.write("%s\n" % pattern)
2462
if old_default_rules is not None:
2463
# dump the rules and exit
2464
for pattern in ignores.OLD_DEFAULTS:
2695
2467
if not name_pattern_list:
2696
2468
raise errors.BzrCommandError("ignore requires at least one "
2697
"NAME_PATTERN or --default-rules.")
2469
"NAME_PATTERN or --old-default-rules")
2698
2470
name_pattern_list = [globbing.normalize_pattern(p)
2699
2471
for p in name_pattern_list]
2701
for p in name_pattern_list:
2702
if not globbing.Globster.is_pattern_valid(p):
2703
bad_patterns += ('\n %s' % p)
2705
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2706
ui.ui_factory.show_error(msg)
2707
raise errors.InvalidPattern('')
2708
2472
for name_pattern in name_pattern_list:
2709
2473
if (name_pattern[0] == '/' or
2710
2474
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
2475
raise errors.BzrCommandError(
2712
2476
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(directory)
2477
tree, relpath = WorkingTree.open_containing(u'.')
2714
2478
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
2479
ignored = globbing.Globster(name_pattern_list)
2717
self.add_cleanup(tree.lock_read().unlock)
2718
2482
for entry in tree.list_files():
2720
2484
if id is not None:
2721
2485
filename = entry[0]
2722
2486
if ignored.match(filename):
2723
matches.append(filename)
2487
matches.append(filename.encode('utf-8'))
2724
2489
if len(matches) > 0:
2725
self.outf.write("Warning: the following files are version controlled and"
2726
" match your ignore pattern:\n%s"
2727
"\nThese files will continue to be version controlled"
2728
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2490
print "Warning: the following files are version controlled and" \
2491
" match your ignore pattern:\n%s" \
2492
"\nThese files will continue to be version controlled" \
2493
" unless you 'bzr remove' them." % ("\n".join(matches),)
2731
2496
class cmd_ignored(Command):
2732
__doc__ = """List ignored files and the patterns that matched them.
2497
"""List ignored files and the patterns that matched them.
2734
2499
List all the ignored files and the ignore pattern that caused the file to
2742
2507
encoding_type = 'replace'
2743
2508
_see_also = ['ignore', 'ls']
2744
takes_options = ['directory']
2746
2510
@display_command
2747
def run(self, directory=u'.'):
2748
tree = WorkingTree.open_containing(directory)[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2750
for path, file_class, kind, file_id, entry in tree.list_files():
2751
if file_class != 'I':
2753
## XXX: Slightly inefficient since this was already calculated
2754
pat = tree.is_ignored(path)
2755
self.outf.write('%-50s %s\n' % (path, pat))
2512
tree = WorkingTree.open_containing(u'.')[0]
2515
for path, file_class, kind, file_id, entry in tree.list_files():
2516
if file_class != 'I':
2518
## XXX: Slightly inefficient since this was already calculated
2519
pat = tree.is_ignored(path)
2520
self.outf.write('%-50s %s\n' % (path, pat))
2758
2525
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2526
"""Lookup the revision-id from a revision-number
2762
2529
bzr lookup-revision 33
2765
2532
takes_args = ['revno']
2766
takes_options = ['directory']
2768
2534
@display_command
2769
def run(self, revno, directory=u'.'):
2535
def run(self, revno):
2771
2537
revno = int(revno)
2772
2538
except ValueError:
2773
raise errors.BzrCommandError("not a valid revision-number: %r"
2775
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2776
self.outf.write("%s\n" % revid)
2539
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2541
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2779
2544
class cmd_export(Command):
2780
__doc__ = """Export current or past revision to a destination directory or archive.
2545
"""Export current or past revision to a destination directory or archive.
2782
2547
If no revision is specified this exports the last committed revision.
2861
2622
@display_command
2862
2623
def run(self, filename, revision=None, name_from_revision=False,
2863
filters=False, directory=None):
2864
2625
if revision is not None and len(revision) != 1:
2865
2626
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2866
2627
" one revision specifier")
2867
2628
tree, branch, relpath = \
2868
_open_directory_or_containing_tree_or_branch(filename, directory)
2869
self.add_cleanup(branch.lock_read().unlock)
2870
return self._run(tree, branch, relpath, filename, revision,
2871
name_from_revision, filters)
2629
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2632
return self._run(tree, branch, relpath, filename, revision,
2633
name_from_revision, filters)
2873
2637
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2875
2639
if tree is None:
2876
2640
tree = b.basis_tree()
2877
2641
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2878
self.add_cleanup(rev_tree.lock_read().unlock)
2880
2643
old_file_id = rev_tree.path2id(relpath)
2916
2679
chunks = content.splitlines(True)
2917
2680
content = filtered_output_bytes(chunks, filters,
2918
2681
ContentFilterContext(relpath, rev_tree))
2920
2682
self.outf.writelines(content)
2923
2684
self.outf.write(content)
2926
2687
class cmd_local_time_offset(Command):
2927
__doc__ = """Show the offset in seconds from GMT to local time."""
2688
"""Show the offset in seconds from GMT to local time."""
2929
2690
@display_command
2931
self.outf.write("%s\n" % osutils.local_time_offset())
2692
print osutils.local_time_offset()
2935
2696
class cmd_commit(Command):
2936
__doc__ = """Commit changes into a new revision.
2938
An explanatory message needs to be given for each commit. This is
2939
often done by using the --message option (getting the message from the
2940
command line) or by using the --file option (getting the message from
2941
a file). If neither of these options is given, an editor is opened for
2942
the user to enter the message. To see the changed files in the
2943
boilerplate text loaded into the editor, use the --show-diff option.
2945
By default, the entire tree is committed and the person doing the
2946
commit is assumed to be the author. These defaults can be overridden
2951
If selected files are specified, only changes to those files are
2952
committed. If a directory is specified then the directory and
2953
everything within it is committed.
2955
When excludes are given, they take precedence over selected files.
2956
For example, to commit only changes within foo, but not changes
2959
bzr commit foo -x foo/bar
2961
A selective commit after a merge is not yet supported.
2965
If the author of the change is not the same person as the committer,
2966
you can specify the author's name using the --author option. The
2967
name should be in the same format as a committer-id, e.g.
2968
"John Doe <jdoe@example.com>". If there is more than one author of
2969
the change you can specify the option multiple times, once for each
2974
A common mistake is to forget to add a new file or directory before
2975
running the commit command. The --strict option checks for unknown
2976
files and aborts the commit if any are found. More advanced pre-commit
2977
checks can be implemented by defining hooks. See ``bzr help hooks``
2982
If you accidentially commit the wrong changes or make a spelling
2983
mistake in the commit message say, you can use the uncommit command
2984
to undo it. See ``bzr help uncommit`` for details.
2986
Hooks can also be configured to run after a commit. This allows you
2987
to trigger updates to external systems like bug trackers. The --fixes
2988
option can be used to record the association between a revision and
2989
one or more bugs. See ``bzr help bugs`` for details.
2991
A selective commit may fail in some cases where the committed
2992
tree would be invalid. Consider::
2997
bzr commit foo -m "committing foo"
2998
bzr mv foo/bar foo/baz
3001
bzr commit foo/bar -m "committing bar but not baz"
3003
In the example above, the last commit will fail by design. This gives
3004
the user the opportunity to decide whether they want to commit the
3005
rename at the same time, separately first, or not at all. (As a general
3006
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2697
"""Commit changes into a new revision.
2699
If no arguments are given, the entire tree is committed.
2701
If selected files are specified, only changes to those files are
2702
committed. If a directory is specified then the directory and everything
2703
within it is committed.
2705
When excludes are given, they take precedence over selected files.
2706
For example, too commit only changes within foo, but not changes within
2709
bzr commit foo -x foo/bar
2711
If author of the change is not the same person as the committer, you can
2712
specify the author's name using the --author option. The name should be
2713
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2714
If there is more than one author of the change you can specify the option
2715
multiple times, once for each author.
2717
A selected-file commit may fail in some cases where the committed
2718
tree would be invalid. Consider::
2723
bzr commit foo -m "committing foo"
2724
bzr mv foo/bar foo/baz
2727
bzr commit foo/bar -m "committing bar but not baz"
2729
In the example above, the last commit will fail by design. This gives
2730
the user the opportunity to decide whether they want to commit the
2731
rename at the same time, separately first, or not at all. (As a general
2732
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2734
Note: A selected-file commit after a merge is not yet supported.
3008
2736
# TODO: Run hooks on tree to-be-committed, and after commit.
3119
2836
if local and not tree.branch.get_bound_location():
3120
2837
raise errors.LocalRequiresBoundBranch()
3122
if message is not None:
3124
file_exists = osutils.lexists(message)
3125
except UnicodeError:
3126
# The commit message contains unicode characters that can't be
3127
# represented in the filesystem encoding, so that can't be a
3132
'The commit message is a file name: "%(f)s".\n'
3133
'(use --file "%(f)s" to take commit message from that file)'
3135
ui.ui_factory.show_warning(warning_msg)
3137
message = message.replace('\r\n', '\n')
3138
message = message.replace('\r', '\n')
3140
raise errors.BzrCommandError(
3141
"please specify either --message or --file")
3143
2839
def get_message(commit_obj):
3144
2840
"""Callback to get commit message"""
3148
my_message = f.read().decode(osutils.get_user_encoding())
3151
elif message is not None:
3152
my_message = message
3154
# No message supplied: make one up.
3155
# text is the status of the tree
3156
text = make_commit_message_template_encoded(tree,
2841
my_message = message
2842
if my_message is None and not file:
2843
t = make_commit_message_template_encoded(tree,
3157
2844
selected_list, diff=show_diff,
3158
2845
output_encoding=osutils.get_user_encoding())
3159
# start_message is the template generated from hooks
3160
# XXX: Warning - looks like hooks return unicode,
3161
# make_commit_message_template_encoded returns user encoding.
3162
# We probably want to be using edit_commit_message instead to
3164
2846
start_message = generate_commit_message_template(commit_obj)
3165
my_message = edit_commit_message_encoded(text,
2847
my_message = edit_commit_message_encoded(t,
3166
2848
start_message=start_message)
3167
2849
if my_message is None:
3168
2850
raise errors.BzrCommandError("please specify a commit"
3169
2851
" message with either --message or --file")
2852
elif my_message and file:
2853
raise errors.BzrCommandError(
2854
"please specify either --message or --file")
2856
my_message = codecs.open(file, 'rt',
2857
osutils.get_user_encoding()).read()
3170
2858
if my_message == "":
3171
2859
raise errors.BzrCommandError("empty commit message specified")
3172
2860
return my_message
3174
# The API permits a commit with a filter of [] to mean 'select nothing'
3175
# but the command line should not do that.
3176
if not selected_list:
3177
selected_list = None
3179
2863
tree.commit(message_callback=get_message,
3180
2864
specific_files=selected_list,
3181
2865
allow_pointless=unchanged, strict=strict, local=local,
3182
2866
reporter=None, verbose=verbose, revprops=properties,
3183
authors=author, timestamp=commit_stamp,
3185
exclude=tree.safe_relpath_files(exclude))
2868
exclude=safe_relpath_files(tree, exclude))
3186
2869
except PointlessCommit:
3187
raise errors.BzrCommandError("No changes to commit."
3188
" Use --unchanged to commit anyhow.")
2870
# FIXME: This should really happen before the file is read in;
2871
# perhaps prepare the commit; get the message; then actually commit
2872
raise errors.BzrCommandError("no changes to commit."
2873
" use --unchanged to commit anyhow")
3189
2874
except ConflictsInTree:
3190
2875
raise errors.BzrCommandError('Conflicts detected in working '
3191
2876
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3210
2894
The working tree and branch checks will only give output if a problem is
3211
2895
detected. The output fields of the repository check are:
3214
This is just the number of revisions checked. It doesn't
3218
This is just the number of versionedfiles checked. It
3219
doesn't indicate a problem.
3221
unreferenced ancestors
3222
Texts that are ancestors of other texts, but
3223
are not properly referenced by the revision ancestry. This is a
3224
subtle problem that Bazaar can work around.
3227
This is the total number of unique file contents
3228
seen in the checked revisions. It does not indicate a problem.
3231
This is the total number of repeated texts seen
3232
in the checked revisions. Texts can be repeated when their file
3233
entries are modified, but the file contents are not. It does not
2897
revisions: This is just the number of revisions checked. It doesn't
2899
versionedfiles: This is just the number of versionedfiles checked. It
2900
doesn't indicate a problem.
2901
unreferenced ancestors: Texts that are ancestors of other texts, but
2902
are not properly referenced by the revision ancestry. This is a
2903
subtle problem that Bazaar can work around.
2904
unique file texts: This is the total number of unique file contents
2905
seen in the checked revisions. It does not indicate a problem.
2906
repeated file texts: This is the total number of repeated texts seen
2907
in the checked revisions. Texts can be repeated when their file
2908
entries are modified, but the file contents are not. It does not
3236
2911
If no restrictions are specified, all Bazaar data that is found at the given
3237
2912
location will be checked.
3572
3233
def run(self, testspecs_list=None, verbose=False, one=False,
3573
3234
transport=None, benchmark=None,
3235
lsprof_timed=None, cache_dir=None,
3575
3236
first=False, list_only=False,
3576
3237
randomize=None, exclude=None, strict=False,
3577
3238
load_list=None, debugflag=None, starting_with=None, subunit=False,
3578
parallel=None, lsprof_tests=False):
3579
from bzrlib import tests
3240
from bzrlib.tests import selftest
3241
import bzrlib.benchmarks as benchmarks
3242
from bzrlib.benchmarks import tree_creator
3244
# Make deprecation warnings visible, unless -Werror is set
3245
symbol_versioning.activate_deprecation_warnings(override=False)
3247
if cache_dir is not None:
3248
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3250
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
3251
print ' %s (%s python%s)' % (
3253
bzrlib.version_string,
3254
bzrlib._format_version_tuple(sys.version_info),
3581
3257
if testspecs_list is not None:
3582
3258
pattern = '|'.join(testspecs_list)
3589
3265
raise errors.BzrCommandError("subunit not available. subunit "
3590
3266
"needs to be installed to use --subunit.")
3591
3267
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3592
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3593
# stdout, which would corrupt the subunit stream.
3594
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3595
# following code can be deleted when it's sufficiently deployed
3596
# -- vila/mgz 20100514
3597
if (sys.platform == "win32"
3598
and getattr(sys.stdout, 'fileno', None) is not None):
3600
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3602
3269
self.additional_selftest_args.setdefault(
3603
3270
'suite_decorators', []).append(parallel)
3605
raise errors.BzrCommandError(
3606
"--benchmark is no longer supported from bzr 2.2; "
3607
"use bzr-usertest instead")
3608
test_suite_factory = None
3609
selftest_kwargs = {"verbose": verbose,
3611
"stop_on_failure": one,
3612
"transport": transport,
3613
"test_suite_factory": test_suite_factory,
3614
"lsprof_timed": lsprof_timed,
3615
"lsprof_tests": lsprof_tests,
3616
"matching_tests_first": first,
3617
"list_only": list_only,
3618
"random_seed": randomize,
3619
"exclude_pattern": exclude,
3621
"load_list": load_list,
3622
"debug_flags": debugflag,
3623
"starting_with": starting_with
3625
selftest_kwargs.update(self.additional_selftest_args)
3627
# Make deprecation warnings visible, unless -Werror is set
3628
cleanup = symbol_versioning.activate_deprecation_warnings(
3272
test_suite_factory = benchmarks.test_suite
3273
# Unless user explicitly asks for quiet, be verbose in benchmarks
3274
verbose = not is_quiet()
3275
# TODO: should possibly lock the history file...
3276
benchfile = open(".perf_history", "at", buffering=1)
3278
test_suite_factory = None
3631
result = tests.selftest(**selftest_kwargs)
3281
selftest_kwargs = {"verbose": verbose,
3283
"stop_on_failure": one,
3284
"transport": transport,
3285
"test_suite_factory": test_suite_factory,
3286
"lsprof_timed": lsprof_timed,
3287
"bench_history": benchfile,
3288
"matching_tests_first": first,
3289
"list_only": list_only,
3290
"random_seed": randomize,
3291
"exclude_pattern": exclude,
3293
"load_list": load_list,
3294
"debug_flags": debugflag,
3295
"starting_with": starting_with
3297
selftest_kwargs.update(self.additional_selftest_args)
3298
result = selftest(**selftest_kwargs)
3300
if benchfile is not None:
3303
note('tests passed')
3305
note('tests failed')
3634
3306
return int(not result)
3637
3309
class cmd_version(Command):
3638
__doc__ = """Show version of bzr."""
3310
"""Show version of bzr."""
3640
3312
encoding_type = 'replace'
3641
3313
takes_options = [
3801
3463
verified = 'inapplicable'
3802
3464
tree = WorkingTree.open_containing(directory)[0]
3466
# die as quickly as possible if there are uncommitted changes
3805
3468
basis_tree = tree.revision_tree(tree.last_revision())
3806
3469
except errors.NoSuchRevision:
3807
3470
basis_tree = tree.basis_tree()
3809
# die as quickly as possible if there are uncommitted changes
3811
if tree.has_changes():
3472
changes = tree.changes_from(basis_tree)
3473
if changes.has_changed():
3812
3474
raise errors.UncommittedChanges(tree)
3814
3476
view_info = _get_view_info_for_change_reporter(tree)
3815
3477
change_reporter = delta._ChangeReporter(
3816
3478
unversioned_filter=tree.is_ignored, view_info=view_info)
3817
pb = ui.ui_factory.nested_progress_bar()
3818
self.add_cleanup(pb.finished)
3819
self.add_cleanup(tree.lock_write().unlock)
3820
if location is not None:
3822
mergeable = bundle.read_mergeable_from_url(location,
3823
possible_transports=possible_transports)
3824
except errors.NotABundle:
3481
pb = ui.ui_factory.nested_progress_bar()
3482
cleanups.append(pb.finished)
3484
cleanups.append(tree.unlock)
3485
if location is not None:
3487
mergeable = bundle.read_mergeable_from_url(location,
3488
possible_transports=possible_transports)
3489
except errors.NotABundle:
3493
raise errors.BzrCommandError('Cannot use --uncommitted'
3494
' with bundles or merge directives.')
3496
if revision is not None:
3497
raise errors.BzrCommandError(
3498
'Cannot use -r with merge directives or bundles')
3499
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3502
if merger is None and uncommitted:
3503
if revision is not None and len(revision) > 0:
3504
raise errors.BzrCommandError('Cannot use --uncommitted and'
3505
' --revision at the same time.')
3506
location = self._select_branch_location(tree, location)[0]
3507
other_tree, other_path = WorkingTree.open_containing(location)
3508
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3510
allow_pending = False
3511
if other_path != '':
3512
merger.interesting_files = [other_path]
3515
merger, allow_pending = self._get_merger_from_branch(tree,
3516
location, revision, remember, possible_transports, pb)
3518
merger.merge_type = merge_type
3519
merger.reprocess = reprocess
3520
merger.show_base = show_base
3521
self.sanity_check_merger(merger)
3522
if (merger.base_rev_id == merger.other_rev_id and
3523
merger.other_rev_id is not None):
3524
note('Nothing to do.')
3527
if merger.interesting_files is not None:
3528
raise errors.BzrCommandError('Cannot pull individual files')
3529
if (merger.base_rev_id == tree.last_revision()):
3530
result = tree.pull(merger.other_branch, False,
3531
merger.other_rev_id)
3532
result.report(self.outf)
3534
merger.check_basis(False)
3536
return self._do_preview(merger)
3828
raise errors.BzrCommandError('Cannot use --uncommitted'
3829
' with bundles or merge directives.')
3831
if revision is not None:
3832
raise errors.BzrCommandError(
3833
'Cannot use -r with merge directives or bundles')
3834
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3837
if merger is None and uncommitted:
3838
if revision is not None and len(revision) > 0:
3839
raise errors.BzrCommandError('Cannot use --uncommitted and'
3840
' --revision at the same time.')
3841
merger = self.get_merger_from_uncommitted(tree, location, None)
3842
allow_pending = False
3845
merger, allow_pending = self._get_merger_from_branch(tree,
3846
location, revision, remember, possible_transports, None)
3848
merger.merge_type = merge_type
3849
merger.reprocess = reprocess
3850
merger.show_base = show_base
3851
self.sanity_check_merger(merger)
3852
if (merger.base_rev_id == merger.other_rev_id and
3853
merger.other_rev_id is not None):
3854
note('Nothing to do.')
3857
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
3859
if (merger.base_rev_id == tree.last_revision()):
3860
result = tree.pull(merger.other_branch, False,
3861
merger.other_rev_id)
3862
result.report(self.outf)
3864
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
3866
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
3869
return self._do_preview(merger)
3871
return self._do_interactive(merger)
3873
return self._do_merge(merger, change_reporter, allow_pending,
3876
def _get_preview(self, merger):
3538
return self._do_merge(merger, change_reporter, allow_pending,
3541
for cleanup in reversed(cleanups):
3544
def _do_preview(self, merger):
3545
from bzrlib.diff import show_diff_trees
3877
3546
tree_merger = merger.make_merger()
3878
3547
tt = tree_merger.make_preview_transform()
3879
self.add_cleanup(tt.finalize)
3880
result_tree = tt.get_preview_tree()
3883
def _do_preview(self, merger):
3884
from bzrlib.diff import show_diff_trees
3885
result_tree = self._get_preview(merger)
3886
path_encoding = osutils.get_diff_header_encoding()
3887
show_diff_trees(merger.this_tree, result_tree, self.outf,
3888
old_label='', new_label='',
3889
path_encoding=path_encoding)
3549
result_tree = tt.get_preview_tree()
3550
show_diff_trees(merger.this_tree, result_tree, self.outf,
3551
old_label='', new_label='')
3891
3555
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3892
3556
merger.change_reporter = change_reporter
4077
3709
def run(self, file_list=None, merge_type=None, show_base=False,
4078
3710
reprocess=False):
4079
from bzrlib.conflicts import restore
4080
3711
if merge_type is None:
4081
3712
merge_type = _mod_merge.Merge3Merger
4082
tree, file_list = WorkingTree.open_containing_paths(file_list)
4083
self.add_cleanup(tree.lock_write().unlock)
4084
parents = tree.get_parent_ids()
4085
if len(parents) != 2:
4086
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4087
" merges. Not cherrypicking or"
4089
repository = tree.branch.repository
4090
interesting_ids = None
4092
conflicts = tree.conflicts()
4093
if file_list is not None:
4094
interesting_ids = set()
4095
for filename in file_list:
4096
file_id = tree.path2id(filename)
4098
raise errors.NotVersionedError(filename)
4099
interesting_ids.add(file_id)
4100
if tree.kind(file_id) != "directory":
3713
tree, file_list = tree_files(file_list)
3716
parents = tree.get_parent_ids()
3717
if len(parents) != 2:
3718
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3719
" merges. Not cherrypicking or"
3721
repository = tree.branch.repository
3722
interesting_ids = None
3724
conflicts = tree.conflicts()
3725
if file_list is not None:
3726
interesting_ids = set()
3727
for filename in file_list:
3728
file_id = tree.path2id(filename)
3730
raise errors.NotVersionedError(filename)
3731
interesting_ids.add(file_id)
3732
if tree.kind(file_id) != "directory":
4103
for name, ie in tree.inventory.iter_entries(file_id):
4104
interesting_ids.add(ie.file_id)
4105
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4107
# Remerge only supports resolving contents conflicts
4108
allowed_conflicts = ('text conflict', 'contents conflict')
4109
restore_files = [c.path for c in conflicts
4110
if c.typestring in allowed_conflicts]
4111
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4112
tree.set_conflicts(ConflictList(new_conflicts))
4113
if file_list is not None:
4114
restore_files = file_list
4115
for filename in restore_files:
3735
for name, ie in tree.inventory.iter_entries(file_id):
3736
interesting_ids.add(ie.file_id)
3737
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3739
# Remerge only supports resolving contents conflicts
3740
allowed_conflicts = ('text conflict', 'contents conflict')
3741
restore_files = [c.path for c in conflicts
3742
if c.typestring in allowed_conflicts]
3743
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3744
tree.set_conflicts(ConflictList(new_conflicts))
3745
if file_list is not None:
3746
restore_files = file_list
3747
for filename in restore_files:
3749
restore(tree.abspath(filename))
3750
except errors.NotConflicted:
3752
# Disable pending merges, because the file texts we are remerging
3753
# have not had those merges performed. If we use the wrong parents
3754
# list, we imply that the working tree text has seen and rejected
3755
# all the changes from the other tree, when in fact those changes
3756
# have not yet been seen.
3757
pb = ui.ui_factory.nested_progress_bar()
3758
tree.set_parent_ids(parents[:1])
4117
restore(tree.abspath(filename))
4118
except errors.NotConflicted:
4120
# Disable pending merges, because the file texts we are remerging
4121
# have not had those merges performed. If we use the wrong parents
4122
# list, we imply that the working tree text has seen and rejected
4123
# all the changes from the other tree, when in fact those changes
4124
# have not yet been seen.
4125
tree.set_parent_ids(parents[:1])
4127
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4128
merger.interesting_ids = interesting_ids
4129
merger.merge_type = merge_type
4130
merger.show_base = show_base
4131
merger.reprocess = reprocess
4132
conflicts = merger.do_merge()
3760
merger = _mod_merge.Merger.from_revision_ids(pb,
3762
merger.interesting_ids = interesting_ids
3763
merger.merge_type = merge_type
3764
merger.show_base = show_base
3765
merger.reprocess = reprocess
3766
conflicts = merger.do_merge()
3768
tree.set_parent_ids(parents)
4134
tree.set_parent_ids(parents)
4135
3772
if conflicts > 0:
4159
3796
name. If you name a directory, all the contents of that directory will be
4162
If you have newly added files since the target revision, they will be
4163
removed. If the files to be removed have been changed, backups will be
4164
created as above. Directories containing unknown files will not be
3799
Any files that have been newly added since that revision will be deleted,
3800
with a backup kept if appropriate. Directories containing unknown files
3801
will not be deleted.
4167
The working tree contains a list of revisions that have been merged but
4168
not yet committed. These revisions will be included as additional parents
4169
of the next commit. Normally, using revert clears that list as well as
4170
reverting the files. If any files are specified, revert leaves the list
4171
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4172
.`` in the tree root to revert all files but keep the recorded merges,
4173
and ``bzr revert --forget-merges`` to clear the pending merge list without
3803
The working tree contains a list of pending merged revisions, which will
3804
be included as parents in the next commit. Normally, revert clears that
3805
list as well as reverting the files. If any files are specified, revert
3806
leaves the pending merge list alone and reverts only the files. Use "bzr
3807
revert ." in the tree root to revert all files but keep the merge record,
3808
and "bzr revert --forget-merges" to clear the pending merge list without
4174
3809
reverting any files.
4176
Using "bzr revert --forget-merges", it is possible to apply all of the
4177
changes from a branch in a single revision. To do this, perform the merge
4178
as desired. Then doing revert with the "--forget-merges" option will keep
4179
the content of the tree as it was, but it will clear the list of pending
4180
merges. The next commit will then contain all of the changes that are
4181
present in the other branch, but without any other parent revisions.
4182
Because this technique forgets where these changes originated, it may
4183
cause additional conflicts on later merges involving the same source and
4187
3812
_see_also = ['cat', 'export']
4196
3821
def run(self, revision=None, no_backup=False, file_list=None,
4197
3822
forget_merges=None):
4198
tree, file_list = WorkingTree.open_containing_paths(file_list)
4199
self.add_cleanup(tree.lock_tree_write().unlock)
4201
tree.set_parent_ids(tree.get_parent_ids()[:1])
4203
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3823
tree, file_list = tree_files(file_list)
3827
tree.set_parent_ids(tree.get_parent_ids()[:1])
3829
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4206
3834
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4207
3835
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4208
tree.revert(file_list, rev_tree, not no_backup, None,
4209
report_changes=True)
3836
pb = ui.ui_factory.nested_progress_bar()
3838
tree.revert(file_list, rev_tree, not no_backup, pb,
3839
report_changes=True)
4212
3844
class cmd_assert_fail(Command):
4213
__doc__ = """Test reporting of assertion failures"""
3845
"""Test reporting of assertion failures"""
4214
3846
# intended just for use in testing
4367
3989
_get_revision_range(revision,
4368
3990
remote_branch, self.name()))
4370
local_extra, remote_extra = find_unmerged(
4371
local_branch, remote_branch, restrict,
4372
backward=not reverse,
4373
include_merges=include_merges,
4374
local_revid_range=local_revid_range,
4375
remote_revid_range=remote_revid_range)
4377
if log_format is None:
4378
registry = log.log_formatter_registry
4379
log_format = registry.get_default(local_branch)
4380
lf = log_format(to_file=self.outf,
4382
show_timezone='original')
4385
if local_extra and not theirs_only:
4386
message("You have %d extra revision(s):\n" %
4388
for revision in iter_log_revisions(local_extra,
4389
local_branch.repository,
4391
lf.log_revision(revision)
4392
printed_local = True
4395
printed_local = False
4397
if remote_extra and not mine_only:
4398
if printed_local is True:
4400
message("You are missing %d revision(s):\n" %
4402
for revision in iter_log_revisions(remote_extra,
4403
remote_branch.repository,
4405
lf.log_revision(revision)
4408
if mine_only and not local_extra:
4409
# We checked local, and found nothing extra
4410
message('This branch is up to date.\n')
4411
elif theirs_only and not remote_extra:
4412
# We checked remote, and found nothing extra
4413
message('Other branch is up to date.\n')
4414
elif not (mine_only or theirs_only or local_extra or
4416
# We checked both branches, and neither one had extra
4418
message("Branches are up to date.\n")
3992
local_branch.lock_read()
3994
remote_branch.lock_read()
3996
local_extra, remote_extra = find_unmerged(
3997
local_branch, remote_branch, restrict,
3998
backward=not reverse,
3999
include_merges=include_merges,
4000
local_revid_range=local_revid_range,
4001
remote_revid_range=remote_revid_range)
4003
if log_format is None:
4004
registry = log.log_formatter_registry
4005
log_format = registry.get_default(local_branch)
4006
lf = log_format(to_file=self.outf,
4008
show_timezone='original')
4011
if local_extra and not theirs_only:
4012
message("You have %d extra revision(s):\n" %
4014
for revision in iter_log_revisions(local_extra,
4015
local_branch.repository,
4017
lf.log_revision(revision)
4018
printed_local = True
4021
printed_local = False
4023
if remote_extra and not mine_only:
4024
if printed_local is True:
4026
message("You are missing %d revision(s):\n" %
4028
for revision in iter_log_revisions(remote_extra,
4029
remote_branch.repository,
4031
lf.log_revision(revision)
4034
if mine_only and not local_extra:
4035
# We checked local, and found nothing extra
4036
message('This branch is up to date.\n')
4037
elif theirs_only and not remote_extra:
4038
# We checked remote, and found nothing extra
4039
message('Other branch is up to date.\n')
4040
elif not (mine_only or theirs_only or local_extra or
4042
# We checked both branches, and neither one had extra
4044
message("Branches are up to date.\n")
4046
remote_branch.unlock()
4048
local_branch.unlock()
4420
4049
if not status_code and parent is None and other_branch is not None:
4421
self.add_cleanup(local_branch.lock_write().unlock)
4422
# handle race conditions - a parent might be set while we run.
4423
if local_branch.get_parent() is None:
4424
local_branch.set_parent(remote_branch.base)
4050
local_branch.lock_write()
4052
# handle race conditions - a parent might be set while we run.
4053
if local_branch.get_parent() is None:
4054
local_branch.set_parent(remote_branch.base)
4056
local_branch.unlock()
4425
4057
return status_code
4428
4060
class cmd_pack(Command):
4429
__doc__ = """Compress the data within a repository.
4431
This operation compresses the data within a bazaar repository. As
4432
bazaar supports automatic packing of repository, this operation is
4433
normally not required to be done manually.
4435
During the pack operation, bazaar takes a backup of existing repository
4436
data, i.e. pack files. This backup is eventually removed by bazaar
4437
automatically when it is safe to do so. To save disk space by removing
4438
the backed up pack files, the --clean-obsolete-packs option may be
4441
Warning: If you use --clean-obsolete-packs and your machine crashes
4442
during or immediately after repacking, you may be left with a state
4443
where the deletion has been written to disk but the new packs have not
4444
been. In this case the repository may be unusable.
4061
"""Compress the data within a repository."""
4447
4063
_see_also = ['repositories']
4448
4064
takes_args = ['branch_or_repo?']
4450
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4453
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4066
def run(self, branch_or_repo='.'):
4454
4067
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4456
4069
branch = dir.open_branch()
4457
4070
repository = branch.repository
4458
4071
except errors.NotBranchError:
4459
4072
repository = dir.open_repository()
4460
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4463
4076
class cmd_plugins(Command):
4464
__doc__ = """List the installed plugins.
4077
"""List the installed plugins.
4466
4079
This command displays the list of installed plugins including
4467
4080
version of plugin and a short description of each.
4554
4170
Option('long', help='Show commit date in annotations.'),
4559
4174
encoding_type = 'exact'
4561
4176
@display_command
4562
4177
def run(self, filename, all=False, long=False, revision=None,
4563
show_ids=False, directory=None):
4564
4179
from bzrlib.annotate import annotate_file, annotate_file_tree
4565
4180
wt, branch, relpath = \
4566
_open_directory_or_containing_tree_or_branch(filename, directory)
4568
self.add_cleanup(wt.lock_read().unlock)
4570
self.add_cleanup(branch.lock_read().unlock)
4571
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4572
self.add_cleanup(tree.lock_read().unlock)
4574
file_id = wt.path2id(relpath)
4576
file_id = tree.path2id(relpath)
4578
raise errors.NotVersionedError(filename)
4579
file_version = tree.inventory[file_id].revision
4580
if wt is not None and revision is None:
4581
# If there is a tree and we're not annotating historical
4582
# versions, annotate the working tree's content.
4583
annotate_file_tree(wt, file_id, self.outf, long, all,
4586
annotate_file(branch, file_version, file_id, long, all, self.outf,
4181
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4187
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4189
file_id = wt.path2id(relpath)
4191
file_id = tree.path2id(relpath)
4193
raise errors.NotVersionedError(filename)
4194
file_version = tree.inventory[file_id].revision
4195
if wt is not None and revision is None:
4196
# If there is a tree and we're not annotating historical
4197
# versions, annotate the working tree's content.
4198
annotate_file_tree(wt, file_id, self.outf, long, all,
4201
annotate_file(branch, file_version, file_id, long, all, self.outf,
4590
4210
class cmd_re_sign(Command):
4591
__doc__ = """Create a digital signature for an existing revision."""
4211
"""Create a digital signature for an existing revision."""
4592
4212
# TODO be able to replace existing ones.
4594
4214
hidden = True # is this right ?
4595
4215
takes_args = ['revision_id*']
4596
takes_options = ['directory', 'revision']
4216
takes_options = ['revision']
4598
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4218
def run(self, revision_id_list=None, revision=None):
4599
4219
if revision_id_list is not None and revision is not None:
4600
4220
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4601
4221
if revision_id_list is None and revision is None:
4602
4222
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4603
b = WorkingTree.open_containing(directory)[0].branch
4604
self.add_cleanup(b.lock_write().unlock)
4605
return self._run(b, revision_id_list, revision)
4223
b = WorkingTree.open_containing(u'.')[0].branch
4226
return self._run(b, revision_id_list, revision)
4607
4230
def _run(self, b, revision_id_list, revision):
4608
4231
import bzrlib.gpg as gpg
4798
4424
end_revision=last_revno)
4801
self.outf.write('Dry-run, pretending to remove'
4802
' the above revisions.\n')
4427
print 'Dry-run, pretending to remove the above revisions.'
4429
val = raw_input('Press <enter> to continue')
4804
self.outf.write('The above revision(s) will be removed.\n')
4807
if not ui.ui_factory.confirm_action(
4808
'Uncommit these revisions',
4809
'bzrlib.builtins.uncommit',
4811
self.outf.write('Canceled\n')
4431
print 'The above revision(s) will be removed.'
4433
val = raw_input('Are you sure [y/N]? ')
4434
if val.lower() not in ('y', 'yes'):
4814
4438
mutter('Uncommitting from {%s} to {%s}',
4815
4439
last_rev_id, rev_id)
4816
4440
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4817
4441
revno=revno, local=local)
4818
self.outf.write('You can restore the old tip by running:\n'
4819
' bzr pull . -r revid:%s\n' % last_rev_id)
4442
note('You can restore the old tip by running:\n'
4443
' bzr pull . -r revid:%s', last_rev_id)
4822
4446
class cmd_break_lock(Command):
4823
__doc__ = """Break a dead lock.
4825
This command breaks a lock on a repository, branch, working directory or
4447
"""Break a dead lock on a repository, branch or working directory.
4828
4449
CAUTION: Locks should only be broken when you are sure that the process
4829
4450
holding the lock has been stopped.
4831
You can get information on what locks are open via the 'bzr info
4832
[location]' command.
4452
You can get information on what locks are open via the 'bzr info' command.
4836
bzr break-lock bzr+ssh://example.com/bzr/foo
4837
bzr break-lock --conf ~/.bazaar
4840
4457
takes_args = ['location?']
4843
help='LOCATION is the directory where the config lock is.'),
4845
help='Do not ask for confirmation before breaking the lock.'),
4848
def run(self, location=None, config=False, force=False):
4459
def run(self, location=None, show=False):
4849
4460
if location is None:
4850
4461
location = u'.'
4852
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4854
{'bzrlib.lockdir.break': True})
4856
conf = _mod_config.LockableConfig(file_name=location)
4859
control, relpath = bzrdir.BzrDir.open_containing(location)
4861
control.break_lock()
4862
except NotImplementedError:
4462
control, relpath = bzrdir.BzrDir.open_containing(location)
4464
control.break_lock()
4465
except NotImplementedError:
4866
4469
class cmd_wait_until_signalled(Command):
4867
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4470
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4869
4472
This just prints a line to signal when it is ready, then blocks on stdin.
4880
4483
class cmd_serve(Command):
4881
__doc__ = """Run the bzr server."""
4484
"""Run the bzr server."""
4883
4486
aliases = ['server']
4885
4488
takes_options = [
4887
4490
help='Serve on stdin/out for use from inetd or sshd.'),
4888
RegistryOption('protocol',
4889
help="Protocol to serve.",
4890
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4891
value_switches=True),
4893
4492
help='Listen for connections on nominated port of the form '
4894
4493
'[hostname:]portnumber. Passing 0 as the port number will '
4895
'result in a dynamically allocated port. The default port '
4896
'depends on the protocol.',
4494
'result in a dynamically allocated port. The default port is '
4898
custom_help('directory',
4899
help='Serve contents of this directory.'),
4498
help='Serve contents of this directory.',
4900
4500
Option('allow-writes',
4901
4501
help='By default the server is a readonly server. Supplying '
4902
4502
'--allow-writes enables write access to the contents of '
4903
'the served directory and below. Note that ``bzr serve`` '
4904
'does not perform authentication, so unless some form of '
4905
'external authentication is arranged supplying this '
4906
'option leads to global uncontrolled write access to your '
4503
'the served directory and below.'
4507
def run_smart_server(self, smart_server):
4508
"""Run 'smart_server' forever, with no UI output at all."""
4509
# For the duration of this server, no UI output is permitted. note
4510
# that this may cause problems with blackbox tests. This should be
4511
# changed with care though, as we dont want to use bandwidth sending
4512
# progress over stderr to smart server clients!
4513
from bzrlib import lockdir
4514
old_factory = ui.ui_factory
4515
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4517
ui.ui_factory = ui.SilentUIFactory()
4518
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4519
smart_server.serve()
4521
ui.ui_factory = old_factory
4522
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4911
4524
def get_host_and_port(self, port):
4912
4525
"""Return the host and port to run the smart server on.
4914
If 'port' is None, None will be returned for the host and port.
4527
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4528
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4916
4530
If 'port' has a colon in it, the string before the colon will be
4917
4531
interpreted as the host.
4920
4534
:return: A tuple of (host, port), where 'host' is a host name or IP,
4921
4535
and port is an integer TCP/IP port.
4924
if port is not None:
4537
from bzrlib.smart import medium
4538
host = medium.BZR_DEFAULT_INTERFACE
4540
port = medium.BZR_DEFAULT_PORT
4925
4542
if ':' in port:
4926
4543
host, port = port.split(':')
4927
4544
port = int(port)
4928
4545
return host, port
4930
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4932
from bzrlib import transport
4547
def get_smart_server(self, transport, inet, port):
4548
"""Construct a smart server.
4550
:param transport: The base transport from which branches will be
4552
:param inet: If True, serve over stdin and stdout. Used for running
4554
:param port: The port to listen on. By default, it's `
4555
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4557
:return: A smart server.
4559
from bzrlib.smart import medium, server
4561
smart_server = medium.SmartServerPipeStreamMedium(
4562
sys.stdin, sys.stdout, transport)
4564
host, port = self.get_host_and_port(port)
4565
smart_server = server.SmartTCPServer(
4566
transport, host=host, port=port)
4567
note('listening on port: %s' % smart_server.port)
4570
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4571
from bzrlib.transport import get_transport
4572
from bzrlib.transport.chroot import ChrootServer
4933
4573
if directory is None:
4934
4574
directory = os.getcwd()
4935
if protocol is None:
4936
protocol = transport.transport_server_registry.get()
4937
host, port = self.get_host_and_port(port)
4938
4575
url = urlutils.local_path_to_url(directory)
4939
4576
if not allow_writes:
4940
4577
url = 'readonly+' + url
4941
t = transport.get_transport(url)
4942
protocol(t, host, port, inet)
4578
chroot_server = ChrootServer(get_transport(url))
4579
chroot_server.setUp()
4580
t = get_transport(chroot_server.get_url())
4581
smart_server = self.get_smart_server(t, inet, port)
4582
self.run_smart_server(smart_server)
4945
4585
class cmd_join(Command):
4946
__doc__ = """Combine a tree into its containing tree.
4586
"""Combine a subtree into its containing tree.
4948
This command requires the target tree to be in a rich-root format.
4588
This command is for experimental use only. It requires the target tree
4589
to be in dirstate-with-subtree format, which cannot be converted into
4950
4592
The TREE argument should be an independent tree, inside another tree, but
4951
4593
not part of it. (Such trees can be produced by "bzr split", but also by
4952
4594
running "bzr branch" with the target inside a tree.)
4954
The result is a combined tree, with the subtree no longer an independent
4596
The result is a combined tree, with the subtree no longer an independant
4955
4597
part. This is marked as a merge of the subtree into the containing tree,
4956
4598
and all history is preserved.
4600
If --reference is specified, the subtree retains its independence. It can
4601
be branched by itself, and can be part of multiple projects at the same
4602
time. But operations performed in the containing tree, such as commit
4603
and merge, will recurse into the subtree.
4959
4606
_see_also = ['split']
4960
4607
takes_args = ['tree']
4961
4608
takes_options = [
4962
Option('reference', help='Join by reference.', hidden=True),
4609
Option('reference', help='Join by reference.'),
4965
4613
def run(self, tree, reference=False):
4966
4614
sub_tree = WorkingTree.open(tree)
5128
4775
directly from the merge directive, without retrieving data from a
5131
`bzr send` creates a compact data set that, when applied using bzr
5132
merge, has the same effect as merging from the source branch.
5134
By default the merge directive is self-contained and can be applied to any
5135
branch containing submit_branch in its ancestory without needing access to
5138
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5139
revisions, but only a structured request to merge from the
5140
public_location. In that case the public_branch is needed and it must be
5141
up-to-date and accessible to the recipient. The public_branch is always
5142
included if known, so that people can check it later.
5144
The submit branch defaults to the parent of the source branch, but can be
5145
overridden. Both submit branch and public branch will be remembered in
5146
branch.conf the first time they are used for a particular branch. The
5147
source branch defaults to that containing the working directory, but can
5148
be changed using --from.
5150
In order to calculate those changes, bzr must analyse the submit branch.
5151
Therefore it is most efficient for the submit branch to be a local mirror.
5152
If a public location is known for the submit_branch, that location is used
5153
in the merge directive.
5155
The default behaviour is to send the merge directive by mail, unless -o is
5156
given, in which case it is sent to a file.
4778
If --no-bundle is specified, then public_branch is needed (and must be
4779
up-to-date), so that the receiver can perform the merge using the
4780
public_branch. The public_branch is always included if known, so that
4781
people can check it later.
4783
The submit branch defaults to the parent, but can be overridden. Both
4784
submit branch and public branch will be remembered if supplied.
4786
If a public_branch is known for the submit_branch, that public submit
4787
branch is used in the merge instructions. This means that a local mirror
4788
can be used as your actual submit branch, once you have set public_branch
5158
4791
Mail is sent using your preferred mail program. This should be transparent
5159
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4792
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5160
4793
If the preferred client can't be found (or used), your editor will be used.
5162
4795
To use a specific mail program, set the mail_client configuration option.
5163
4796
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5164
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5165
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5166
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4797
specific clients are "claws", "evolution", "kmail", "mutt", and
4798
"thunderbird"; generic options are "default", "editor", "emacsclient",
4799
"mapi", and "xdg-email". Plugins may also add supported clients.
5169
4801
If mail is being sent, a to address is required. This can be supplied
5170
4802
either on the commandline, by setting the submit_to configuration
5204
4832
short_name='f',
5206
4834
Option('output', short_name='o',
5207
help='Write merge directive to this file or directory; '
4835
help='Write merge directive to this file; '
5208
4836
'use - for stdout.',
5211
help='Refuse to send if there are uncommitted changes in'
5212
' the working tree, --no-strict disables the check.'),
5213
4838
Option('mail-to', help='Mail the request to this address.',
5217
4842
Option('body', help='Body for the email.', type=unicode),
5218
RegistryOption('format',
5219
help='Use the specified output format.',
5220
lazy_registry=('bzrlib.send', 'format_registry')),
4843
RegistryOption.from_kwargs('format',
4844
'Use the specified output format.',
4845
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4846
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5223
4849
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5224
4850
no_patch=False, revision=None, remember=False, output=None,
5225
format=None, mail_to=None, message=None, body=None,
5226
strict=None, **kwargs):
5227
from bzrlib.send import send
5228
return send(submit_branch, revision, public_branch, remember,
5229
format, no_bundle, no_patch, output,
5230
kwargs.get('from', '.'), mail_to, message, body,
4851
format='4', mail_to=None, message=None, body=None, **kwargs):
4852
return self._run(submit_branch, revision, public_branch, remember,
4853
format, no_bundle, no_patch, output,
4854
kwargs.get('from', '.'), mail_to, message, body)
4856
def _run(self, submit_branch, revision, public_branch, remember, format,
4857
no_bundle, no_patch, output, from_, mail_to, message, body):
4858
from bzrlib.revision import NULL_REVISION
4859
branch = Branch.open_containing(from_)[0]
4861
outfile = cStringIO.StringIO()
4865
outfile = open(output, 'wb')
4866
# we may need to write data into branch's repository to calculate
4871
config = branch.get_config()
4873
mail_to = config.get_user_option('submit_to')
4874
mail_client = config.get_mail_client()
4875
if (not getattr(mail_client, 'supports_body', False)
4876
and body is not None):
4877
raise errors.BzrCommandError(
4878
'Mail client "%s" does not support specifying body' %
4879
mail_client.__class__.__name__)
4880
if remember and submit_branch is None:
4881
raise errors.BzrCommandError(
4882
'--remember requires a branch to be specified.')
4883
stored_submit_branch = branch.get_submit_branch()
4884
remembered_submit_branch = None
4885
if submit_branch is None:
4886
submit_branch = stored_submit_branch
4887
remembered_submit_branch = "submit"
4889
if stored_submit_branch is None or remember:
4890
branch.set_submit_branch(submit_branch)
4891
if submit_branch is None:
4892
submit_branch = branch.get_parent()
4893
remembered_submit_branch = "parent"
4894
if submit_branch is None:
4895
raise errors.BzrCommandError('No submit branch known or'
4897
if remembered_submit_branch is not None:
4898
note('Using saved %s location "%s" to determine what '
4899
'changes to submit.', remembered_submit_branch,
4903
submit_config = Branch.open(submit_branch).get_config()
4904
mail_to = submit_config.get_user_option("child_submit_to")
4906
stored_public_branch = branch.get_public_branch()
4907
if public_branch is None:
4908
public_branch = stored_public_branch
4909
elif stored_public_branch is None or remember:
4910
branch.set_public_branch(public_branch)
4911
if no_bundle and public_branch is None:
4912
raise errors.BzrCommandError('No public branch specified or'
4914
base_revision_id = None
4916
if revision is not None:
4917
if len(revision) > 2:
4918
raise errors.BzrCommandError('bzr send takes '
4919
'at most two one revision identifiers')
4920
revision_id = revision[-1].as_revision_id(branch)
4921
if len(revision) == 2:
4922
base_revision_id = revision[0].as_revision_id(branch)
4923
if revision_id is None:
4924
revision_id = branch.last_revision()
4925
if revision_id == NULL_REVISION:
4926
raise errors.BzrCommandError('No revisions to submit.')
4928
directive = merge_directive.MergeDirective2.from_objects(
4929
branch.repository, revision_id, time.time(),
4930
osutils.local_time_offset(), submit_branch,
4931
public_branch=public_branch, include_patch=not no_patch,
4932
include_bundle=not no_bundle, message=message,
4933
base_revision_id=base_revision_id)
4934
elif format == '0.9':
4937
patch_type = 'bundle'
4939
raise errors.BzrCommandError('Format 0.9 does not'
4940
' permit bundle with no patch')
4946
directive = merge_directive.MergeDirective.from_objects(
4947
branch.repository, revision_id, time.time(),
4948
osutils.local_time_offset(), submit_branch,
4949
public_branch=public_branch, patch_type=patch_type,
4952
outfile.writelines(directive.to_lines())
4954
subject = '[MERGE] '
4955
if message is not None:
4958
revision = branch.repository.get_revision(revision_id)
4959
subject += revision.get_summary()
4960
basename = directive.get_disk_name(branch)
4961
mail_client.compose_merge_request(mail_to, subject,
5235
4970
class cmd_bundle_revisions(cmd_send):
5236
__doc__ = """Create a merge-directive for submitting changes.
4972
"""Create a merge-directive for submitting changes.
5238
4974
A merge directive provides many things needed for requesting merges:
5296
5030
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5297
5031
no_patch=False, revision=None, remember=False, output=None,
5298
format=None, strict=None, **kwargs):
5032
format='4', **kwargs):
5299
5033
if output is None:
5301
from bzrlib.send import send
5302
return send(submit_branch, revision, public_branch, remember,
5035
return self._run(submit_branch, revision, public_branch, remember,
5303
5036
format, no_bundle, no_patch, output,
5304
kwargs.get('from', '.'), None, None, None,
5305
self.outf, strict=strict)
5037
kwargs.get('from', '.'), None, None, None)
5308
5040
class cmd_tag(Command):
5309
__doc__ = """Create, remove or modify a tag naming a revision.
5041
"""Create, remove or modify a tag naming a revision.
5311
5043
Tags give human-meaningful names to revisions. Commands that take a -r
5312
5044
(--revision) option can be given -rtag:X, where X is any previously
5321
5053
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5322
5054
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5324
If no tag name is specified it will be determined through the
5325
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5326
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5330
5057
_see_also = ['commit', 'tags']
5331
takes_args = ['tag_name?']
5058
takes_args = ['tag_name']
5332
5059
takes_options = [
5333
5060
Option('delete',
5334
5061
help='Delete this tag rather than placing it.',
5336
custom_help('directory',
5337
help='Branch in which to place the tag.'),
5064
help='Branch in which to place the tag.',
5338
5068
Option('force',
5339
5069
help='Replace existing tags.',
5344
def run(self, tag_name=None,
5074
def run(self, tag_name,
5350
5080
branch, relpath = Branch.open_containing(directory)
5351
self.add_cleanup(branch.lock_write().unlock)
5353
if tag_name is None:
5354
raise errors.BzrCommandError("No tag specified to delete.")
5355
branch.tags.delete_tag(tag_name)
5356
self.outf.write('Deleted tag %s.\n' % tag_name)
5359
if len(revision) != 1:
5360
raise errors.BzrCommandError(
5361
"Tags can only be placed on a single revision, "
5363
revision_id = revision[0].as_revision_id(branch)
5084
branch.tags.delete_tag(tag_name)
5085
self.outf.write('Deleted tag %s.\n' % tag_name)
5365
revision_id = branch.last_revision()
5366
if tag_name is None:
5367
tag_name = branch.automatic_tag_name(revision_id)
5368
if tag_name is None:
5369
raise errors.BzrCommandError(
5370
"Please specify a tag name.")
5371
if (not force) and branch.tags.has_tag(tag_name):
5372
raise errors.TagAlreadyExists(tag_name)
5373
branch.tags.set_tag(tag_name, revision_id)
5374
self.outf.write('Created tag %s.\n' % tag_name)
5088
if len(revision) != 1:
5089
raise errors.BzrCommandError(
5090
"Tags can only be placed on a single revision, "
5092
revision_id = revision[0].as_revision_id(branch)
5094
revision_id = branch.last_revision()
5095
if (not force) and branch.tags.has_tag(tag_name):
5096
raise errors.TagAlreadyExists(tag_name)
5097
branch.tags.set_tag(tag_name, revision_id)
5098
self.outf.write('Created tag %s.\n' % tag_name)
5377
5103
class cmd_tags(Command):
5378
__doc__ = """List tags.
5380
5106
This command shows a table of tag names and the revisions they reference.
5383
5109
_see_also = ['tag']
5384
5110
takes_options = [
5385
custom_help('directory',
5386
help='Branch whose tags should be displayed.'),
5112
help='Branch whose tags should be displayed.',
5387
5116
RegistryOption.from_kwargs('sort',
5388
5117
'Sort tags by different criteria.', title='Sorting',
5389
5118
alpha='Sort tags lexicographically (default).',
5482
5206
Option('bind-to', help='Branch to bind checkout to.', type=str),
5483
5207
Option('force',
5484
help='Perform reconfiguration even if local changes'
5486
Option('stacked-on',
5487
help='Reconfigure a branch to be stacked on another branch.',
5491
help='Reconfigure a branch to be unstacked. This '
5492
'may require copying substantial data into it.',
5208
help='Perform reconfiguration even if local changes'
5496
def run(self, location=None, target_type=None, bind_to=None, force=False,
5212
def run(self, location=None, target_type=None, bind_to=None, force=False):
5499
5213
directory = bzrdir.BzrDir.open(location)
5500
if stacked_on and unstacked:
5501
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5502
elif stacked_on is not None:
5503
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5505
reconfigure.ReconfigureUnstacked().apply(directory)
5506
# At the moment you can use --stacked-on and a different
5507
# reconfiguration shape at the same time; there seems no good reason
5509
5214
if target_type is None:
5510
if stacked_on or unstacked:
5513
raise errors.BzrCommandError('No target configuration '
5215
raise errors.BzrCommandError('No target configuration specified')
5515
5216
elif target_type == 'branch':
5516
5217
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5517
5218
elif target_type == 'tree':
5554
5255
/path/to/newbranch.
5556
5257
Bound branches use the nickname of its master branch unless it is set
5557
locally, in which case switching will update the local nickname to be
5258
locally, in which case switching will update the the local nickname to be
5558
5259
that of the master.
5561
takes_args = ['to_location?']
5562
takes_options = ['directory',
5564
help='Switch even if local commits will be lost.'),
5566
Option('create-branch', short_name='b',
5567
help='Create the target branch from this one before'
5568
' switching to it.'),
5262
takes_args = ['to_location']
5263
takes_options = [Option('force',
5264
help='Switch even if local commits will be lost.')
5571
def run(self, to_location=None, force=False, create_branch=False,
5572
revision=None, directory=u'.'):
5267
def run(self, to_location, force=False):
5573
5268
from bzrlib import switch
5574
tree_location = directory
5575
revision = _get_one_revision('switch', revision)
5576
5270
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5577
if to_location is None:
5578
if revision is None:
5579
raise errors.BzrCommandError('You must supply either a'
5580
' revision or a location')
5581
to_location = tree_location
5271
branch = control_dir.open_branch()
5583
branch = control_dir.open_branch()
5584
had_explicit_nick = branch.get_config().has_explicit_nickname()
5273
to_branch = Branch.open(to_location)
5585
5274
except errors.NotBranchError:
5587
had_explicit_nick = False
5590
raise errors.BzrCommandError('cannot create branch without'
5592
to_location = directory_service.directories.dereference(
5594
if '/' not in to_location and '\\' not in to_location:
5595
# This path is meant to be relative to the existing branch
5596
this_url = self._get_branch_location(control_dir)
5597
to_location = urlutils.join(this_url, '..', to_location)
5598
to_branch = branch.bzrdir.sprout(to_location,
5599
possible_transports=[branch.bzrdir.root_transport],
5600
source_branch=branch).open_branch()
5603
to_branch = Branch.open(to_location)
5604
except errors.NotBranchError:
5605
this_url = self._get_branch_location(control_dir)
5606
to_branch = Branch.open(
5607
urlutils.join(this_url, '..', to_location))
5608
if revision is not None:
5609
revision = revision.as_revision_id(to_branch)
5610
switch.switch(control_dir, to_branch, force, revision_id=revision)
5611
if had_explicit_nick:
5275
this_branch = control_dir.open_branch()
5276
# This may be a heavy checkout, where we want the master branch
5277
this_url = this_branch.get_bound_location()
5278
# If not, use a local sibling
5279
if this_url is None:
5280
this_url = this_branch.base
5281
to_branch = Branch.open(
5282
urlutils.join(this_url, '..', to_location))
5283
switch.switch(control_dir, to_branch, force)
5284
if branch.get_config().has_explicit_nickname():
5612
5285
branch = control_dir.open_branch() #get the new branch!
5613
5286
branch.nick = to_branch.nick
5614
5287
note('Switched to branch: %s',
5615
5288
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5617
def _get_branch_location(self, control_dir):
5618
"""Return location of branch for this control dir."""
5620
this_branch = control_dir.open_branch()
5621
# This may be a heavy checkout, where we want the master branch
5622
master_location = this_branch.get_bound_location()
5623
if master_location is not None:
5624
return master_location
5625
# If not, use a local sibling
5626
return this_branch.base
5627
except errors.NotBranchError:
5628
format = control_dir.find_branch_format()
5629
if getattr(format, 'get_reference', None) is not None:
5630
return format.get_reference(control_dir)
5632
return control_dir.root_transport.base
5635
5291
class cmd_view(Command):
5636
__doc__ = """Manage filtered views.
5292
"""Manage filtered views.
5638
5294
Views provide a mask over the tree so that users can focus on
5639
5295
a subset of a tree when doing their work. After creating a view,
5875
5504
_see_also = ['unshelve']
5877
5506
def run(self, revision=None, all=False, file_list=None, message=None,
5878
writer=None, list=False, destroy=False, directory=u'.'):
5507
writer=None, list=False, destroy=False):
5880
5509
return self.run_for_list()
5881
5510
from bzrlib.shelf_ui import Shelver
5882
5511
if writer is None:
5883
5512
writer = bzrlib.option.diff_writer_registry.get()
5885
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5886
file_list, message, destroy=destroy, directory=directory)
5514
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5515
message, destroy=destroy).run()
5891
5516
except errors.UserAbort:
5894
5519
def run_for_list(self):
5895
5520
tree = WorkingTree.open_containing('.')[0]
5896
self.add_cleanup(tree.lock_read().unlock)
5897
manager = tree.get_shelf_manager()
5898
shelves = manager.active_shelves()
5899
if len(shelves) == 0:
5900
note('No shelved changes.')
5902
for shelf_id in reversed(shelves):
5903
message = manager.get_metadata(shelf_id).get('message')
5905
message = '<no message>'
5906
self.outf.write('%3d: %s\n' % (shelf_id, message))
5523
manager = tree.get_shelf_manager()
5524
shelves = manager.active_shelves()
5525
if len(shelves) == 0:
5526
note('No shelved changes.')
5528
for shelf_id in reversed(shelves):
5529
message = manager.get_metadata(shelf_id).get('message')
5531
message = '<no message>'
5532
self.outf.write('%3d: %s\n' % (shelf_id, message))
5910
5538
class cmd_unshelve(Command):
5911
__doc__ = """Restore shelved changes.
5539
"""Restore shelved changes.
5913
5541
By default, the most recently shelved changes are restored. However if you
5914
5542
specify a shelf by id those changes will be restored instead. This works
5918
5546
takes_args = ['shelf_id?']
5919
5547
takes_options = [
5921
5548
RegistryOption.from_kwargs(
5922
5549
'action', help="The action to perform.",
5923
5550
enum_switch=False, value_switches=True,
5924
5551
apply="Apply changes and remove from the shelf.",
5925
5552
dry_run="Show changes, but do not apply or remove them.",
5926
preview="Instead of unshelving the changes, show the diff that "
5927
"would result from unshelving.",
5928
delete_only="Delete changes without applying them.",
5929
keep="Apply changes but don't delete them.",
5553
delete_only="Delete changes without applying them."
5932
5556
_see_also = ['shelve']
5934
def run(self, shelf_id=None, action='apply', directory=u'.'):
5558
def run(self, shelf_id=None, action='apply'):
5935
5559
from bzrlib.shelf_ui import Unshelver
5936
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5940
unshelver.tree.unlock()
5560
Unshelver.from_args(shelf_id, action).run()
5943
5563
class cmd_clean_tree(Command):
5944
__doc__ = """Remove unwanted files from working tree.
5564
"""Remove unwanted files from working tree.
5946
5566
By default, only unknown files, not ignored files, are deleted. Versioned
5947
5567
files are never deleted.
5965
5584
' deleting them.'),
5966
5585
Option('force', help='Do not prompt before deleting.')]
5967
5586
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5968
force=False, directory=u'.'):
5969
5588
from bzrlib.clean_tree import clean_tree
5970
5589
if not (unknown or ignored or detritus):
5974
clean_tree(directory, unknown=unknown, ignored=ignored,
5975
detritus=detritus, dry_run=dry_run, no_prompt=force)
5978
class cmd_reference(Command):
5979
__doc__ = """list, view and set branch locations for nested trees.
5981
If no arguments are provided, lists the branch locations for nested trees.
5982
If one argument is provided, display the branch location for that tree.
5983
If two arguments are provided, set the branch location for that tree.
5988
takes_args = ['path?', 'location?']
5990
def run(self, path=None, location=None):
5992
if path is not None:
5994
tree, branch, relpath =(
5995
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5996
if path is not None:
5999
tree = branch.basis_tree()
6001
info = branch._get_all_reference_info().iteritems()
6002
self._display_reference_info(tree, branch, info)
5593
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5594
dry_run=dry_run, no_prompt=force)
5597
def _create_prefix(cur_transport):
5598
needed = [cur_transport]
5599
# Recurse upwards until we can create a directory successfully
5601
new_transport = cur_transport.clone('..')
5602
if new_transport.base == cur_transport.base:
5603
raise errors.BzrCommandError(
5604
"Failed to create path prefix for %s."
5605
% cur_transport.base)
5607
new_transport.mkdir('.')
5608
except errors.NoSuchFile:
5609
needed.append(new_transport)
5610
cur_transport = new_transport
6004
file_id = tree.path2id(path)
6006
raise errors.NotVersionedError(path)
6007
if location is None:
6008
info = [(file_id, branch.get_reference_info(file_id))]
6009
self._display_reference_info(tree, branch, info)
6011
branch.set_reference_info(file_id, path, location)
6013
def _display_reference_info(self, tree, branch, info):
6015
for file_id, (path, location) in info:
6017
path = tree.id2path(file_id)
6018
except errors.NoSuchId:
6020
ref_list.append((path, location))
6021
for path, location in sorted(ref_list):
6022
self.outf.write('%s %s\n' % (path, location))
6025
def _register_lazy_builtins():
6026
# register lazy builtins from other modules; called at startup and should
6027
# be only called once.
6028
for (name, aliases, module_name) in [
6029
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6030
('cmd_dpush', [], 'bzrlib.foreign'),
6031
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6032
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6033
('cmd_conflicts', [], 'bzrlib.conflicts'),
6034
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6036
builtin_command_registry.register_lazy(name, aliases, module_name)
5613
# Now we only need to create child directories
5615
cur_transport = needed.pop()
5616
cur_transport.ensure_base()
5619
# these get imported and then picked up by the scan for cmd_*
5620
# TODO: Some more consistent way to split command definitions across files;
5621
# we do need to load at least some information about them to know of
5622
# aliases. ideally we would avoid loading the implementation until the
5623
# details were needed.
5624
from bzrlib.cmd_version_info import cmd_version_info
5625
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5626
from bzrlib.bundle.commands import (
5629
from bzrlib.sign_my_commits import cmd_sign_my_commits
5630
from bzrlib.weave_commands import cmd_versionedfile_list, \
5631
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
