171
156
:return: workingtree, [relative_paths]
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
158
if file_list is None or len(file_list) == 0:
159
tree = WorkingTree.open_containing(default_branch)[0]
160
if tree.supports_views() and apply_view:
161
view_files = tree.views.lookup_view()
163
file_list = view_files
164
view_str = views.view_display_str(view_files)
165
note("Ignoring files outside view. View is %s" % view_str)
166
return tree, file_list
167
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
168
return tree, safe_relpath_files(tree, file_list, canonicalize,
169
apply_view=apply_view)
172
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
173
"""Convert file_list into a list of relpaths in tree.
175
:param tree: A tree to operate on.
176
:param file_list: A list of user provided paths or None.
177
:param apply_view: if True and a view is set, apply it or check that
178
specified files are within it
179
:return: A list of relative paths.
180
:raises errors.PathNotChild: When a provided path is in a different tree
183
if file_list is None:
185
if tree.supports_views() and apply_view:
186
view_files = tree.views.lookup_view()
190
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
191
# doesn't - fix that up here before we enter the loop.
193
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
196
for filename in file_list:
198
relpath = fixer(osutils.dereference_path(filename))
199
if view_files and not osutils.is_inside_any(view_files, relpath):
200
raise errors.FileOutsideView(filename, view_files)
201
new_list.append(relpath)
202
except errors.PathNotChild:
203
raise errors.FileInWrongBranch(tree.branch, filename)
179
207
def _get_view_info_for_change_reporter(tree):
306
322
takes_args = ['revision_id?']
307
takes_options = ['directory', 'revision']
323
takes_options = ['revision']
308
324
# cat-revision is more for frontends so should be exact
309
325
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'.'):
328
def run(self, revision_id=None, revision=None):
321
329
if revision_id is not None and revision is not None:
322
330
raise errors.BzrCommandError('You can only supply one of'
323
331
' revision_id or --revision')
324
332
if revision_id is None and revision is None:
325
333
raise errors.BzrCommandError('You must supply either'
326
334
' --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()
335
b = WorkingTree.open_containing(u'.')[0].branch
337
# TODO: jam 20060112 should cat-revision always output utf-8?
338
if revision_id is not None:
339
revision_id = osutils.safe_revision_id(revision_id, warn=False)
341
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
342
except errors.NoSuchRevision:
343
msg = "The repository %s contains no revision %s." % (b.repository.base,
345
raise errors.BzrCommandError(msg)
346
elif revision is not None:
349
raise errors.BzrCommandError('You cannot specify a NULL'
351
rev_id = rev.as_revision_id(b)
352
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
356
355
class cmd_dump_btree(Command):
357
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
359
358
PATH is a btree index file, it can be any URL. This includes things like
360
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
443
435
To re-create the working tree, use "bzr checkout".
445
437
_see_also = ['checkout', 'working-trees']
446
takes_args = ['location*']
438
takes_args = ['location?']
447
439
takes_options = [
449
441
help='Remove the working tree even if it has '
450
'uncommitted or shelved changes.'),
442
'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()
445
def run(self, location='.', force=False):
446
d = bzrdir.BzrDir.open(location)
449
working = d.open_workingtree()
450
except errors.NoWorkingTree:
451
raise errors.BzrCommandError("No working tree to remove")
452
except errors.NotLocalUrl:
453
raise errors.BzrCommandError("You cannot remove the working tree of a "
456
changes = working.changes_from(working.basis_tree())
457
if changes.has_changed():
458
raise errors.UncommittedChanges(working)
460
working_path = working.bzrdir.root_transport.base
461
branch_path = working.branch.bzrdir.root_transport.base
462
if working_path != branch_path:
463
raise errors.BzrCommandError("You cannot remove the working tree from "
464
"a lightweight checkout")
466
d.destroy_workingtree()
480
469
class cmd_revno(Command):
481
__doc__ = """Show current revision number.
470
"""Show current revision number.
483
472
This is equal to the number of revisions on this branch.
486
475
_see_also = ['info']
487
476
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')
479
def run(self, location=u'.'):
480
self.outf.write(str(Branch.open_containing(location)[0].revno()))
481
self.outf.write('\n')
514
484
class cmd_revision_info(Command):
515
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
518
488
takes_args = ['revision_info*']
519
489
takes_options = [
521
custom_help('directory',
522
492
help='Branch to examine, '
523
'rather than the one containing the working directory.'),
524
Option('tree', help='Show revno of working tree'),
493
'rather than the one containing the working directory.',
528
def run(self, revision=None, directory=u'.', tree=False,
529
revision_info_list=[]):
500
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
503
if revision is not None:
541
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
542
505
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:
506
for rev in revision_info_list:
507
revs.append(RevisionSpec.from_string(rev))
509
b = Branch.open_containing(directory)[0]
512
revs.append(RevisionSpec.from_string('-1'))
515
revision_id = rev.as_revision_id(b)
559
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
560
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
561
518
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]))
519
dotted_map = b.get_revision_id_to_revno_map()
520
revno = '.'.join(str(i) for i in dotted_map[revision_id])
521
print '%s %s' % (revno, revision_id)
571
524
class cmd_add(Command):
572
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
574
527
In non-recursive mode, all the named items are added, regardless
575
528
of whether they were previously ignored. A warning is given if
640
590
should_print=(not is_quiet()))
643
self.add_cleanup(base_tree.lock_read().unlock)
644
tree, file_list = tree_files_for_add(file_list)
645
added, ignored = tree.smart_add(file_list, not
646
no_recurse, action=action, save=not dry_run)
593
base_tree.lock_read()
595
file_list = self._maybe_expand_globs(file_list)
596
tree, file_list = tree_files_for_add(file_list)
597
added, ignored = tree.smart_add(file_list, not
598
no_recurse, action=action, save=not dry_run)
600
if base_tree is not None:
648
602
if len(ignored) > 0:
650
604
for glob in sorted(ignored.keys()):
651
605
for path in ignored[glob]:
652
606
self.outf.write("ignored %s matching \"%s\"\n"
610
for glob, paths in ignored.items():
611
match_len += len(paths)
612
self.outf.write("ignored %d file(s).\n" % match_len)
613
self.outf.write("If you wish to add ignored files, "
614
"please add them explicitly by name. "
615
"(\"bzr ignored\" gives a list)\n")
656
618
class cmd_mkdir(Command):
657
__doc__ = """Create a new versioned directory.
619
"""Create a new versioned directory.
659
621
This is equivalent to creating the directory and then adding it.
717
674
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
719
676
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()
677
work_tree, file_list = tree_files(file_list)
678
work_tree.lock_read()
680
if revision is not None:
681
tree = revision.as_tree(work_tree.branch)
683
extra_trees = [work_tree]
689
if file_list is not None:
690
file_ids = tree.paths2ids(file_list, trees=extra_trees,
691
require_versioned=True)
692
# find_ids_across_trees may include some paths that don't
694
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
695
for file_id in file_ids if file_id in tree)
697
entries = tree.inventory.entries()
700
if tree is not work_tree:
742
703
for path, entry in entries:
743
704
if kind and kind != entry.kind:
881
846
dest = osutils.pathjoin(dest_parent, dest_tail)
882
847
mutter("attempting to move %s => %s", src, dest)
883
848
tree.rename_one(src, dest, after=after)
885
self.outf.write("%s => %s\n" % (src, dest))
849
self.outf.write("%s => %s\n" % (src, dest))
888
852
class cmd_pull(Command):
889
__doc__ = """Turn this branch into a mirror of another branch.
853
"""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
855
This command only works on branches that have not diverged. Branches are
856
considered diverged if the destination branch's most recent commit is one
857
that has not been merged (directly or indirectly) into the parent.
896
859
If branches have diverged, you can use 'bzr merge' to integrate the changes
897
860
from one into the other. Once one branch has merged, the other should
898
861
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.
863
If you want to forget your local changes and just update your branch to
864
match the remote one, use pull --overwrite.
904
866
If there is no default location set, the first pull will set it. After
905
867
that, you can omit the location to use the default. To change the
980
943
branch_from = Branch.open(location,
981
944
possible_transports=possible_transports)
982
self.add_cleanup(branch_from.lock_read().unlock)
984
946
if branch_to.get_parent() is None or remember:
985
947
branch_to.set_parent(branch_from.base)
987
if revision is not None:
988
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)
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,
949
if branch_from is not branch_to:
950
branch_from.lock_read()
952
if revision is not None:
953
revision_id = revision.as_revision_id(branch_from)
955
branch_to.lock_write()
957
if tree_to is not None:
958
view_info = _get_view_info_for_change_reporter(tree_to)
959
change_reporter = delta._ChangeReporter(
960
unversioned_filter=tree_to.is_ignored,
962
result = tree_to.pull(
963
branch_from, overwrite, revision_id, change_reporter,
964
possible_transports=possible_transports, local=local)
966
result = branch_to.pull(
967
branch_from, overwrite, revision_id, local=local)
969
result.report(self.outf)
970
if verbose and result.old_revid != result.new_revid:
971
log.show_branch_change(
972
branch_to, self.outf, result.old_revno,
977
if branch_from is not branch_to:
1009
981
class cmd_push(Command):
1010
__doc__ = """Update a mirror of this branch.
982
"""Update a mirror of this branch.
1012
984
The target branch will not have its working tree populated because this
1013
985
is both expensive, and is not supported on remote file systems.
1135
1120
_see_also = ['checkout']
1136
1121
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."),
1122
takes_options = ['revision', Option('hardlink',
1123
help='Hard-link working tree files where possible.'),
1141
1124
Option('no-tree',
1142
1125
help="Create a branch without a working-tree."),
1144
help="Switch the checkout in the current directory "
1145
"to the new branch."),
1146
1126
Option('stacked',
1147
1127
help='Create a stacked branch referring to the source branch. '
1148
1128
'The new branch will depend on the availability of the source '
1149
1129
'branch for all operations.'),
1150
1130
Option('standalone',
1151
1131
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
1133
aliases = ['get', 'clone']
1162
1135
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
1136
hardlink=False, stacked=False, standalone=False, no_tree=False):
1167
1137
from bzrlib.tag import _merge_tags_if_possible
1168
1139
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
1141
if (accelerator_tree is not None and
1142
accelerator_tree.supports_content_filtering()):
1174
1143
accelerator_tree = None
1175
if files_from is not None and files_from != from_location:
1176
accelerator_tree = WorkingTree.open(files_from)
1177
1144
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)
1147
if revision is not None:
1148
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'))
1150
# FIXME - wt.last_revision, fallback to branch, fall back to
1151
# None or perhaps NULL_REVISION to mean copy nothing
1153
revision_id = br_from.last_revision()
1154
if to_location is None:
1155
to_location = urlutils.derive_to_location(from_location)
1156
to_transport = transport.get_transport(to_location)
1158
to_transport.mkdir('.')
1159
except errors.FileExists:
1160
raise errors.BzrCommandError('Target directory "%s" already'
1161
' exists.' % to_location)
1162
except errors.NoSuchFile:
1163
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1166
# preserve whatever source format we have.
1167
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1168
possible_transports=[to_transport],
1169
accelerator_tree=accelerator_tree,
1170
hardlink=hardlink, stacked=stacked,
1171
force_new_repo=standalone,
1172
create_tree_if_local=not no_tree,
1173
source_branch=br_from)
1174
branch = dir.open_branch()
1175
except errors.NoSuchRevision:
1176
to_transport.delete_tree('.')
1177
msg = "The branch %s has no revision %s." % (from_location,
1179
raise errors.BzrCommandError(msg)
1180
_merge_tags_if_possible(br_from, branch)
1181
# If the source branch is stacked, the new branch may
1182
# be stacked whether we asked for that explicitly or not.
1183
# We therefore need a try/except here and not just 'if stacked:'
1185
note('Created new stacked branch referring to %s.' %
1186
branch.get_stacked_on_url())
1187
except (errors.NotStacked, errors.UnstackableBranchFormat,
1188
errors.UnstackableRepositoryFormat), e:
1189
note('Branched %d revision(s).' % branch.revno())
1243
1194
class cmd_checkout(Command):
1244
__doc__ = """Create a new checkout of an existing branch.
1195
"""Create a new checkout of an existing branch.
1246
1197
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1247
1198
the branch found in '.'. This is useful if you have removed the working tree
1326
1272
@display_command
1327
1273
def run(self, dir=u'.'):
1328
1274
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))
1277
new_inv = tree.inventory
1278
old_tree = tree.basis_tree()
1279
old_tree.lock_read()
1281
old_inv = old_tree.inventory
1283
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1284
for f, paths, c, v, p, n, k, e in iterator:
1285
if paths[0] == paths[1]:
1289
renames.append(paths)
1291
for old_name, new_name in renames:
1292
self.outf.write("%s => %s\n" % (old_name, new_name))
1347
1299
class cmd_update(Command):
1348
__doc__ = """Update a tree to have the latest code committed to its branch.
1300
"""Update a tree to have the latest code committed to its branch.
1350
1302
This will perform a merge into the working tree, and may generate
1351
1303
conflicts. If you have any local changes, you will still
1354
1306
If you want to discard your local changes, you can just do a
1355
1307
'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
1310
_see_also = ['pull', 'working-trees', 'status-flags']
1365
1311
takes_args = ['dir?']
1366
takes_options = ['revision']
1367
1312
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")
1314
def run(self, dir='.'):
1373
1315
tree = WorkingTree.open_containing(dir)[0]
1374
branch = tree.branch
1375
1316
possible_transports = []
1376
master = branch.get_master_branch(
1317
master = tree.branch.get_master_branch(
1377
1318
possible_transports=possible_transports)
1378
1319
if master is not None:
1379
branch_location = master.base
1380
1320
tree.lock_write()
1382
branch_location = tree.branch.base
1383
1322
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)
1324
existing_pending_merges = tree.get_parent_ids()[1:]
1325
last_rev = _mod_revision.ensure_null(tree.last_revision())
1326
if last_rev == _mod_revision.ensure_null(
1327
tree.branch.last_revision()):
1328
# may be up to date, check master too.
1329
if master is None or last_rev == _mod_revision.ensure_null(
1330
master.last_revision()):
1331
revno = tree.branch.revision_id_to_revno(last_rev)
1332
note("Tree is up to date at revision %d." % (revno,))
1334
view_info = _get_view_info_for_change_reporter(tree)
1411
1335
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'.")
1336
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1337
view_info=view_info), possible_transports=possible_transports)
1338
revno = tree.branch.revision_id_to_revno(
1339
_mod_revision.ensure_null(tree.last_revision()))
1340
note('Updated to revision %d.' % (revno,))
1341
if tree.get_parent_ids()[1:] != existing_pending_merges:
1342
note('Your local commits will now show as pending merges with '
1343
"'bzr status', and can be committed with 'bzr commit'.")
1436
1352
class cmd_info(Command):
1437
__doc__ = """Show information about a working tree, branch or repository.
1353
"""Show information about a working tree, branch or repository.
1439
1355
This command will show all known locations and formats associated to the
1440
1356
tree, branch or repository.
1502
1418
def run(self, file_list, verbose=False, new=False,
1503
1419
file_deletion_strategy='safe'):
1504
tree, file_list = WorkingTree.open_containing_paths(file_list)
1420
tree, file_list = tree_files(file_list)
1506
1422
if file_list is not None:
1507
1423
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')
1427
# Heuristics should probably all move into tree.remove_smart or
1430
added = tree.changes_from(tree.basis_tree(),
1431
specific_files=file_list).added
1432
file_list = sorted([f[0] for f in added], reverse=True)
1433
if len(file_list) == 0:
1434
raise errors.BzrCommandError('No matching files.')
1435
elif file_list is None:
1436
# missing files show up in iter_changes(basis) as
1437
# versioned-with-no-kind.
1439
for change in tree.iter_changes(tree.basis_tree()):
1440
# Find paths in the working tree that have no kind:
1441
if change[1][1] is not None and change[6][1] is None:
1442
missing.append(change[1][1])
1443
file_list = sorted(missing, reverse=True)
1444
file_deletion_strategy = 'keep'
1445
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1446
keep_files=file_deletion_strategy=='keep',
1447
force=file_deletion_strategy=='force')
1533
1452
class cmd_file_id(Command):
1534
__doc__ = """Print file_id of a particular file or directory.
1453
"""Print file_id of a particular file or directory.
1536
1455
The file_id is assigned when the file is first added and remains the
1537
1456
same through all revisions where the file exists, even when it is
1947
1831
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1948
1832
' 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()
1834
old_tree, new_tree, specific_files, extra_trees = \
1835
_get_trees_to_diff(file_list, revision, old, new,
1960
1837
return show_diff_trees(old_tree, new_tree, sys.stdout,
1961
1838
specific_files=specific_files,
1962
1839
external_diff_options=diff_options,
1963
1840
old_label=old_label, new_label=new_label,
1964
extra_trees=extra_trees,
1965
path_encoding=path_encoding,
1841
extra_trees=extra_trees, using=using)
1970
1844
class cmd_deleted(Command):
1971
__doc__ = """List files deleted in the working tree.
1845
"""List files deleted in the working tree.
1973
1847
# TODO: Show files deleted since a previous revision, or
1974
1848
# between two revisions.
1977
1851
# level of effort but possibly much less IO. (Or possibly not,
1978
1852
# if the directories are very large...)
1979
1853
_see_also = ['status', 'ls']
1980
takes_options = ['directory', 'show-ids']
1854
takes_options = ['show-ids']
1982
1856
@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')
1857
def run(self, show_ids=False):
1858
tree = WorkingTree.open_containing(u'.')[0]
1861
old = tree.basis_tree()
1864
for path, ie in old.inventory.iter_entries():
1865
if not tree.has_id(ie.file_id):
1866
self.outf.write(path)
1868
self.outf.write(' ')
1869
self.outf.write(ie.file_id)
1870
self.outf.write('\n')
1997
1877
class cmd_modified(Command):
1998
__doc__ = """List files modified in working tree.
1878
"""List files modified in working tree.
2002
1882
_see_also = ['status', 'ls']
2003
takes_options = ['directory', 'null']
1885
help='Write an ascii NUL (\\0) separator '
1886
'between files rather than a newline.')
2005
1889
@display_command
2006
def run(self, null=False, directory=u'.'):
2007
tree = WorkingTree.open_containing(directory)[0]
1890
def run(self, null=False):
1891
tree = WorkingTree.open_containing(u'.')[0]
2008
1892
td = tree.changes_from(tree.basis_tree())
2009
1893
for path, id, kind, text_modified, meta_modified in td.modified:
2016
1900
class cmd_added(Command):
2017
__doc__ = """List files added in working tree.
1901
"""List files added in working tree.
2021
1905
_see_also = ['status', 'ls']
2022
takes_options = ['directory', 'null']
1908
help='Write an ascii NUL (\\0) separator '
1909
'between files rather than a newline.')
2024
1912
@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')
1913
def run(self, null=False):
1914
wt = WorkingTree.open_containing(u'.')[0]
1917
basis = wt.basis_tree()
1920
basis_inv = basis.inventory
1923
if file_id in basis_inv:
1925
if inv.is_root(file_id) and len(basis_inv) == 0:
1927
path = inv.id2path(file_id)
1928
if not os.access(osutils.abspath(path), os.F_OK):
1931
self.outf.write(path + '\0')
1933
self.outf.write(osutils.quotefn(path) + '\n')
2046
1940
class cmd_root(Command):
2047
__doc__ = """Show the tree root directory.
1941
"""Show the tree root directory.
2049
1943
The root is the nearest enclosing directory with a .bzr control
2361
2241
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)
2245
# Build the log formatter
2246
if log_format is None:
2247
log_format = log.log_formatter_registry.get_default(b)
2248
lf = log_format(show_ids=show_ids, to_file=self.outf,
2249
show_timezone=timezone,
2250
delta_format=get_verbosity_level(),
2252
show_advice=levels is None)
2254
# Choose the algorithm for doing the logging. It's annoying
2255
# having multiple code paths like this but necessary until
2256
# the underlying repository format is faster at generating
2257
# deltas or can provide everything we need from the indices.
2258
# The default algorithm - match-using-deltas - works for
2259
# multiple files and directories and is faster for small
2260
# amounts of history (200 revisions say). However, it's too
2261
# slow for logging a single file in a repository with deep
2262
# history, i.e. > 10K revisions. In the spirit of "do no
2263
# evil when adding features", we continue to use the
2264
# original algorithm - per-file-graph - for the "single
2265
# file that isn't a directory without showing a delta" case.
2266
partial_history = revision and b.repository._format.supports_chks
2267
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2268
or delta_type or partial_history)
2270
# Build the LogRequest and execute it
2271
if len(file_ids) == 0:
2273
rqst = make_log_request_dict(
2274
direction=direction, specific_fileids=file_ids,
2275
start_revision=rev1, end_revision=rev2, limit=limit,
2276
message_search=message, delta_type=delta_type,
2277
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2278
Logger(b, rqst).show(lf)
2405
2283
def _get_revision_range(revisionspec_list, branch, command_name):
2494
2366
help='Recurse into subdirectories.'),
2495
2367
Option('from-root',
2496
2368
help='Print paths relative to the root of the branch.'),
2497
Option('unknown', short_name='u',
2498
help='Print unknown files.'),
2369
Option('unknown', help='Print unknown files.'),
2499
2370
Option('versioned', help='Print versioned files.',
2500
2371
short_name='V'),
2501
Option('ignored', short_name='i',
2502
help='Print ignored files.'),
2503
Option('kind', short_name='k',
2372
Option('ignored', help='Print ignored files.'),
2374
help='Write an ascii NUL (\\0) separator '
2375
'between files rather than a newline.'),
2504
2377
help='List entries of a particular kind: file, directory, symlink.',
2510
2381
@display_command
2511
2382
def run(self, revision=None, verbose=False,
2512
2383
recursive=False, from_root=False,
2513
2384
unknown=False, versioned=False, ignored=False,
2514
null=False, kind=None, show_ids=False, path=None, directory=None):
2385
null=False, kind=None, show_ids=False, path=None):
2516
2387
if kind and kind not in ('file', 'directory', 'symlink'):
2517
2388
raise errors.BzrCommandError('invalid kind specified')
2551
2419
view_str = views.view_display_str(view_files)
2552
2420
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')
2424
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2425
if fp.startswith(relpath):
2426
rp = fp[len(relpath):]
2427
fp = osutils.pathjoin(prefix, rp)
2428
if not recursive and '/' in rp:
2430
if not all and not selection[fc]:
2432
if kind is not None and fkind != kind:
2436
views.check_path_in_view(tree, fp)
2437
except errors.FileOutsideView:
2439
kindch = entry.kind_character()
2440
outstring = fp + kindch
2441
ui.ui_factory.clear_term()
2443
outstring = '%-8s %s' % (fc, outstring)
2444
if show_ids and fid is not None:
2445
outstring = "%-50s %s" % (outstring, fid)
2446
self.outf.write(outstring + '\n')
2448
self.outf.write(fp + '\0')
2451
self.outf.write(fid)
2452
self.outf.write('\0')
2460
self.outf.write('%-50s %s\n' % (outstring, my_id))
2462
self.outf.write(outstring + '\n')
2601
2467
class cmd_unknowns(Command):
2602
__doc__ = """List unknown files.
2468
"""List unknown files.
2606
2472
_see_also = ['ls']
2607
takes_options = ['directory']
2609
2474
@display_command
2610
def run(self, directory=u'.'):
2611
for f in WorkingTree.open_containing(directory)[0].unknowns():
2476
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2612
2477
self.outf.write(osutils.quotefn(f) + '\n')
2615
2480
class cmd_ignore(Command):
2616
__doc__ = """Ignore specified files or patterns.
2481
"""Ignore specified files or patterns.
2618
2483
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
2485
To remove patterns from the ignore list, edit the .bzrignore file.
2627
2486
After adding, editing or deleting that file either indirectly by
2628
2487
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
2490
Note: ignore patterns containing shell wildcards must be quoted from
2645
2491
the shell on Unix.
2668
2510
Ignore everything but the "debian" toplevel directory::
2670
2512
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
2515
_see_also = ['status', 'ignored', 'patterns']
2681
2516
takes_args = ['name_pattern*']
2682
takes_options = ['directory',
2683
Option('default-rules',
2684
help='Display the default ignore rules that bzr uses.')
2518
Option('old-default-rules',
2519
help='Write out the ignore rules bzr < 0.9 always used.')
2687
def run(self, name_pattern_list=None, default_rules=None,
2522
def run(self, name_pattern_list=None, old_default_rules=None):
2689
2523
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)
2524
if old_default_rules is not None:
2525
# dump the rules and exit
2526
for pattern in ignores.OLD_DEFAULTS:
2695
2529
if not name_pattern_list:
2696
2530
raise errors.BzrCommandError("ignore requires at least one "
2697
"NAME_PATTERN or --default-rules.")
2531
"NAME_PATTERN or --old-default-rules")
2698
2532
name_pattern_list = [globbing.normalize_pattern(p)
2699
2533
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
2534
for name_pattern in name_pattern_list:
2709
2535
if (name_pattern[0] == '/' or
2710
2536
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
2537
raise errors.BzrCommandError(
2712
2538
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(directory)
2539
tree, relpath = WorkingTree.open_containing(u'.')
2714
2540
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
2541
ignored = globbing.Globster(name_pattern_list)
2717
self.add_cleanup(tree.lock_read().unlock)
2718
2544
for entry in tree.list_files():
2720
2546
if id is not None:
2721
2547
filename = entry[0]
2722
2548
if ignored.match(filename):
2723
matches.append(filename)
2549
matches.append(filename.encode('utf-8'))
2724
2551
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),))
2552
print "Warning: the following files are version controlled and" \
2553
" match your ignore pattern:\n%s" \
2554
"\nThese files will continue to be version controlled" \
2555
" unless you 'bzr remove' them." % ("\n".join(matches),)
2731
2558
class cmd_ignored(Command):
2732
__doc__ = """List ignored files and the patterns that matched them.
2559
"""List ignored files and the patterns that matched them.
2734
2561
List all the ignored files and the ignore pattern that caused the file to
2742
2569
encoding_type = 'replace'
2743
2570
_see_also = ['ignore', 'ls']
2744
takes_options = ['directory']
2746
2572
@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))
2574
tree = WorkingTree.open_containing(u'.')[0]
2577
for path, file_class, kind, file_id, entry in tree.list_files():
2578
if file_class != 'I':
2580
## XXX: Slightly inefficient since this was already calculated
2581
pat = tree.is_ignored(path)
2582
self.outf.write('%-50s %s\n' % (path, pat))
2758
2587
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2588
"""Lookup the revision-id from a revision-number
2762
2591
bzr lookup-revision 33
2765
2594
takes_args = ['revno']
2766
takes_options = ['directory']
2768
2596
@display_command
2769
def run(self, revno, directory=u'.'):
2597
def run(self, revno):
2771
2599
revno = int(revno)
2772
2600
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)
2601
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2603
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2779
2606
class cmd_export(Command):
2780
__doc__ = """Export current or past revision to a destination directory or archive.
2607
"""Export current or past revision to a destination directory or archive.
2782
2609
If no revision is specified this exports the last committed revision.
2861
2684
@display_command
2862
2685
def run(self, filename, revision=None, name_from_revision=False,
2863
filters=False, directory=None):
2864
2687
if revision is not None and len(revision) != 1:
2865
2688
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2866
2689
" one revision specifier")
2867
2690
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)
2691
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2694
return self._run(tree, branch, relpath, filename, revision,
2695
name_from_revision, filters)
2873
2699
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2875
2701
if tree is None:
2876
2702
tree = b.basis_tree()
2877
2703
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2878
self.add_cleanup(rev_tree.lock_read().unlock)
2880
2705
old_file_id = rev_tree.path2id(relpath)
3119
2931
if local and not tree.branch.get_bound_location():
3120
2932
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
2934
def get_message(commit_obj):
3144
2935
"""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,
2936
my_message = message
2937
if my_message is None and not file:
2938
t = make_commit_message_template_encoded(tree,
3157
2939
selected_list, diff=show_diff,
3158
2940
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
2941
start_message = generate_commit_message_template(commit_obj)
3165
my_message = edit_commit_message_encoded(text,
2942
my_message = edit_commit_message_encoded(t,
3166
2943
start_message=start_message)
3167
2944
if my_message is None:
3168
2945
raise errors.BzrCommandError("please specify a commit"
3169
2946
" message with either --message or --file")
2947
elif my_message and file:
2948
raise errors.BzrCommandError(
2949
"please specify either --message or --file")
2951
my_message = codecs.open(file, 'rt',
2952
osutils.get_user_encoding()).read()
3170
2953
if my_message == "":
3171
2954
raise errors.BzrCommandError("empty commit message specified")
3172
2955
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
2958
tree.commit(message_callback=get_message,
3180
2959
specific_files=selected_list,
3181
2960
allow_pointless=unchanged, strict=strict, local=local,
3182
2961
reporter=None, verbose=verbose, revprops=properties,
3183
authors=author, timestamp=commit_stamp,
3185
exclude=tree.safe_relpath_files(exclude))
2963
exclude=safe_relpath_files(tree, exclude))
3186
2964
except PointlessCommit:
2965
# FIXME: This should really happen before the file is read in;
2966
# perhaps prepare the commit; get the message; then actually commit
3187
2967
raise errors.BzrCommandError("No changes to commit."
3188
2968
" Use --unchanged to commit anyhow.")
3189
2969
except ConflictsInTree:
3210
2989
The working tree and branch checks will only give output if a problem is
3211
2990
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
2992
revisions: This is just the number of revisions checked. It doesn't
2994
versionedfiles: This is just the number of versionedfiles checked. It
2995
doesn't indicate a problem.
2996
unreferenced ancestors: Texts that are ancestors of other texts, but
2997
are not properly referenced by the revision ancestry. This is a
2998
subtle problem that Bazaar can work around.
2999
unique file texts: This is the total number of unique file contents
3000
seen in the checked revisions. It does not indicate a problem.
3001
repeated file texts: This is the total number of repeated texts seen
3002
in the checked revisions. Texts can be repeated when their file
3003
entries are modified, but the file contents are not. It does not
3236
3006
If no restrictions are specified, all Bazaar data that is found at the given
3237
3007
location will be checked.
3589
3352
raise errors.BzrCommandError("subunit not available. subunit "
3590
3353
"needs to be installed to use --subunit.")
3591
3354
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
3356
self.additional_selftest_args.setdefault(
3603
3357
'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(
3359
test_suite_factory = benchmarks.test_suite
3360
# Unless user explicitly asks for quiet, be verbose in benchmarks
3361
verbose = not is_quiet()
3362
# TODO: should possibly lock the history file...
3363
benchfile = open(".perf_history", "at", buffering=1)
3365
test_suite_factory = None
3631
result = tests.selftest(**selftest_kwargs)
3368
selftest_kwargs = {"verbose": verbose,
3370
"stop_on_failure": one,
3371
"transport": transport,
3372
"test_suite_factory": test_suite_factory,
3373
"lsprof_timed": lsprof_timed,
3374
"bench_history": benchfile,
3375
"matching_tests_first": first,
3376
"list_only": list_only,
3377
"random_seed": randomize,
3378
"exclude_pattern": exclude,
3380
"load_list": load_list,
3381
"debug_flags": debugflag,
3382
"starting_with": starting_with
3384
selftest_kwargs.update(self.additional_selftest_args)
3385
result = selftest(**selftest_kwargs)
3387
if benchfile is not None:
3634
3389
return int(not result)
3637
3392
class cmd_version(Command):
3638
__doc__ = """Show version of bzr."""
3393
"""Show version of bzr."""
3640
3395
encoding_type = 'replace'
3641
3396
takes_options = [
3801
3546
verified = 'inapplicable'
3802
3547
tree = WorkingTree.open_containing(directory)[0]
3549
# die as quickly as possible if there are uncommitted changes
3805
3551
basis_tree = tree.revision_tree(tree.last_revision())
3806
3552
except errors.NoSuchRevision:
3807
3553
basis_tree = tree.basis_tree()
3809
# die as quickly as possible if there are uncommitted changes
3811
if tree.has_changes():
3555
changes = tree.changes_from(basis_tree)
3556
if changes.has_changed():
3812
3557
raise errors.UncommittedChanges(tree)
3814
3559
view_info = _get_view_info_for_change_reporter(tree)
3815
3560
change_reporter = delta._ChangeReporter(
3816
3561
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:
3564
pb = ui.ui_factory.nested_progress_bar()
3565
cleanups.append(pb.finished)
3567
cleanups.append(tree.unlock)
3568
if location is not None:
3570
mergeable = bundle.read_mergeable_from_url(location,
3571
possible_transports=possible_transports)
3572
except errors.NotABundle:
3576
raise errors.BzrCommandError('Cannot use --uncommitted'
3577
' with bundles or merge directives.')
3579
if revision is not None:
3580
raise errors.BzrCommandError(
3581
'Cannot use -r with merge directives or bundles')
3582
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3585
if merger is None and uncommitted:
3586
if revision is not None and len(revision) > 0:
3587
raise errors.BzrCommandError('Cannot use --uncommitted and'
3588
' --revision at the same time.')
3589
location = self._select_branch_location(tree, location)[0]
3590
other_tree, other_path = WorkingTree.open_containing(location)
3591
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3593
allow_pending = False
3594
if other_path != '':
3595
merger.interesting_files = [other_path]
3598
merger, allow_pending = self._get_merger_from_branch(tree,
3599
location, revision, remember, possible_transports, pb)
3601
merger.merge_type = merge_type
3602
merger.reprocess = reprocess
3603
merger.show_base = show_base
3604
self.sanity_check_merger(merger)
3605
if (merger.base_rev_id == merger.other_rev_id and
3606
merger.other_rev_id is not None):
3607
note('Nothing to do.')
3610
if merger.interesting_files is not None:
3611
raise errors.BzrCommandError('Cannot pull individual files')
3612
if (merger.base_rev_id == tree.last_revision()):
3613
result = tree.pull(merger.other_branch, False,
3614
merger.other_rev_id)
3615
result.report(self.outf)
3617
merger.check_basis(False)
3619
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):
3621
return self._do_merge(merger, change_reporter, allow_pending,
3624
for cleanup in reversed(cleanups):
3627
def _do_preview(self, merger):
3628
from bzrlib.diff import show_diff_trees
3877
3629
tree_merger = merger.make_merger()
3878
3630
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)
3632
result_tree = tt.get_preview_tree()
3633
show_diff_trees(merger.this_tree, result_tree, self.outf,
3634
old_label='', new_label='')
3891
3638
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3892
3639
merger.change_reporter = change_reporter
4077
3792
def run(self, file_list=None, merge_type=None, show_base=False,
4078
3793
reprocess=False):
4079
from bzrlib.conflicts import restore
4080
3794
if merge_type is None:
4081
3795
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":
3796
tree, file_list = tree_files(file_list)
3799
parents = tree.get_parent_ids()
3800
if len(parents) != 2:
3801
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3802
" merges. Not cherrypicking or"
3804
repository = tree.branch.repository
3805
interesting_ids = None
3807
conflicts = tree.conflicts()
3808
if file_list is not None:
3809
interesting_ids = set()
3810
for filename in file_list:
3811
file_id = tree.path2id(filename)
3813
raise errors.NotVersionedError(filename)
3814
interesting_ids.add(file_id)
3815
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:
3818
for name, ie in tree.inventory.iter_entries(file_id):
3819
interesting_ids.add(ie.file_id)
3820
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3822
# Remerge only supports resolving contents conflicts
3823
allowed_conflicts = ('text conflict', 'contents conflict')
3824
restore_files = [c.path for c in conflicts
3825
if c.typestring in allowed_conflicts]
3826
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3827
tree.set_conflicts(ConflictList(new_conflicts))
3828
if file_list is not None:
3829
restore_files = file_list
3830
for filename in restore_files:
3832
restore(tree.abspath(filename))
3833
except errors.NotConflicted:
3835
# Disable pending merges, because the file texts we are remerging
3836
# have not had those merges performed. If we use the wrong parents
3837
# list, we imply that the working tree text has seen and rejected
3838
# all the changes from the other tree, when in fact those changes
3839
# have not yet been seen.
3840
pb = ui.ui_factory.nested_progress_bar()
3841
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()
3843
merger = _mod_merge.Merger.from_revision_ids(pb,
3845
merger.interesting_ids = interesting_ids
3846
merger.merge_type = merge_type
3847
merger.show_base = show_base
3848
merger.reprocess = reprocess
3849
conflicts = merger.do_merge()
3851
tree.set_parent_ids(parents)
4134
tree.set_parent_ids(parents)
4135
3855
if conflicts > 0:
4159
3879
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
3882
Any files that have been newly added since that revision will be deleted,
3883
with a backup kept if appropriate. Directories containing unknown files
3884
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
3886
The working tree contains a list of pending merged revisions, which will
3887
be included as parents in the next commit. Normally, revert clears that
3888
list as well as reverting the files. If any files are specified, revert
3889
leaves the pending merge list alone and reverts only the files. Use "bzr
3890
revert ." in the tree root to revert all files but keep the merge record,
3891
and "bzr revert --forget-merges" to clear the pending merge list without
4174
3892
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
3895
_see_also = ['cat', 'export']
4196
3904
def run(self, revision=None, no_backup=False, file_list=None,
4197
3905
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)
3906
tree, file_list = tree_files(file_list)
3910
tree.set_parent_ids(tree.get_parent_ids()[:1])
3912
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4206
3917
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4207
3918
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)
3919
pb = ui.ui_factory.nested_progress_bar()
3921
tree.revert(file_list, rev_tree, not no_backup, pb,
3922
report_changes=True)
4212
3927
class cmd_assert_fail(Command):
4213
__doc__ = """Test reporting of assertion failures"""
3928
"""Test reporting of assertion failures"""
4214
3929
# intended just for use in testing
4367
4072
_get_revision_range(revision,
4368
4073
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")
4075
local_branch.lock_read()
4077
remote_branch.lock_read()
4079
local_extra, remote_extra = find_unmerged(
4080
local_branch, remote_branch, restrict,
4081
backward=not reverse,
4082
include_merges=include_merges,
4083
local_revid_range=local_revid_range,
4084
remote_revid_range=remote_revid_range)
4086
if log_format is None:
4087
registry = log.log_formatter_registry
4088
log_format = registry.get_default(local_branch)
4089
lf = log_format(to_file=self.outf,
4091
show_timezone='original')
4094
if local_extra and not theirs_only:
4095
message("You have %d extra revision(s):\n" %
4097
for revision in iter_log_revisions(local_extra,
4098
local_branch.repository,
4100
lf.log_revision(revision)
4101
printed_local = True
4104
printed_local = False
4106
if remote_extra and not mine_only:
4107
if printed_local is True:
4109
message("You are missing %d revision(s):\n" %
4111
for revision in iter_log_revisions(remote_extra,
4112
remote_branch.repository,
4114
lf.log_revision(revision)
4117
if mine_only and not local_extra:
4118
# We checked local, and found nothing extra
4119
message('This branch is up to date.\n')
4120
elif theirs_only and not remote_extra:
4121
# We checked remote, and found nothing extra
4122
message('Other branch is up to date.\n')
4123
elif not (mine_only or theirs_only or local_extra or
4125
# We checked both branches, and neither one had extra
4127
message("Branches are up to date.\n")
4129
remote_branch.unlock()
4131
local_branch.unlock()
4420
4132
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)
4133
local_branch.lock_write()
4135
# handle race conditions - a parent might be set while we run.
4136
if local_branch.get_parent() is None:
4137
local_branch.set_parent(remote_branch.base)
4139
local_branch.unlock()
4425
4140
return status_code
4428
4143
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.
4144
"""Compress the data within a repository."""
4447
4146
_see_also = ['repositories']
4448
4147
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):
4149
def run(self, branch_or_repo='.'):
4454
4150
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4456
4152
branch = dir.open_branch()
4457
4153
repository = branch.repository
4458
4154
except errors.NotBranchError:
4459
4155
repository = dir.open_repository()
4460
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4463
4159
class cmd_plugins(Command):
4464
__doc__ = """List the installed plugins.
4160
"""List the installed plugins.
4466
4162
This command displays the list of installed plugins including
4467
4163
version of plugin and a short description of each.
4554
4253
Option('long', help='Show commit date in annotations.'),
4559
4257
encoding_type = 'exact'
4561
4259
@display_command
4562
4260
def run(self, filename, all=False, long=False, revision=None,
4563
show_ids=False, directory=None):
4564
4262
from bzrlib.annotate import annotate_file, annotate_file_tree
4565
4263
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,
4264
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4270
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4272
file_id = wt.path2id(relpath)
4274
file_id = tree.path2id(relpath)
4276
raise errors.NotVersionedError(filename)
4277
file_version = tree.inventory[file_id].revision
4278
if wt is not None and revision is None:
4279
# If there is a tree and we're not annotating historical
4280
# versions, annotate the working tree's content.
4281
annotate_file_tree(wt, file_id, self.outf, long, all,
4284
annotate_file(branch, file_version, file_id, long, all, self.outf,
4590
4293
class cmd_re_sign(Command):
4591
__doc__ = """Create a digital signature for an existing revision."""
4294
"""Create a digital signature for an existing revision."""
4592
4295
# TODO be able to replace existing ones.
4594
4297
hidden = True # is this right ?
4595
4298
takes_args = ['revision_id*']
4596
takes_options = ['directory', 'revision']
4299
takes_options = ['revision']
4598
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4301
def run(self, revision_id_list=None, revision=None):
4599
4302
if revision_id_list is not None and revision is not None:
4600
4303
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4601
4304
if revision_id_list is None and revision is None:
4602
4305
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)
4306
b = WorkingTree.open_containing(u'.')[0].branch
4309
return self._run(b, revision_id_list, revision)
4607
4313
def _run(self, b, revision_id_list, revision):
4608
4314
import bzrlib.gpg as gpg
4798
4507
end_revision=last_revno)
4801
self.outf.write('Dry-run, pretending to remove'
4802
' the above revisions.\n')
4510
print 'Dry-run, pretending to remove the above revisions.'
4512
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')
4514
print 'The above revision(s) will be removed.'
4516
val = raw_input('Are you sure [y/N]? ')
4517
if val.lower() not in ('y', 'yes'):
4814
4521
mutter('Uncommitting from {%s} to {%s}',
4815
4522
last_rev_id, rev_id)
4816
4523
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4817
4524
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)
4525
note('You can restore the old tip by running:\n'
4526
' bzr pull . -r revid:%s', last_rev_id)
4822
4529
class cmd_break_lock(Command):
4823
__doc__ = """Break a dead lock.
4825
This command breaks a lock on a repository, branch, working directory or
4530
"""Break a dead lock on a repository, branch or working directory.
4828
4532
CAUTION: Locks should only be broken when you are sure that the process
4829
4533
holding the lock has been stopped.
4831
You can get information on what locks are open via the 'bzr info
4832
[location]' command.
4535
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
4540
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):
4542
def run(self, location=None, show=False):
4849
4543
if location is None:
4850
4544
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:
4545
control, relpath = bzrdir.BzrDir.open_containing(location)
4547
control.break_lock()
4548
except NotImplementedError:
4866
4552
class cmd_wait_until_signalled(Command):
4867
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4553
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4869
4555
This just prints a line to signal when it is ready, then blocks on stdin.
5128
4809
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.
4812
If --no-bundle is specified, then public_branch is needed (and must be
4813
up-to-date), so that the receiver can perform the merge using the
4814
public_branch. The public_branch is always included if known, so that
4815
people can check it later.
4817
The submit branch defaults to the parent, but can be overridden. Both
4818
submit branch and public branch will be remembered if supplied.
4820
If a public_branch is known for the submit_branch, that public submit
4821
branch is used in the merge instructions. This means that a local mirror
4822
can be used as your actual submit branch, once you have set public_branch
5158
4825
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.
4826
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5160
4827
If the preferred client can't be found (or used), your editor will be used.
5162
4829
To use a specific mail program, set the mail_client configuration option.
5163
4830
(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
4831
specific clients are "claws", "evolution", "kmail", "mutt", and
4832
"thunderbird"; generic options are "default", "editor", "emacsclient",
4833
"mapi", and "xdg-email". Plugins may also add supported clients.
5169
4835
If mail is being sent, a to address is required. This can be supplied
5170
4836
either on the commandline, by setting the submit_to configuration
5204
4866
short_name='f',
5206
4868
Option('output', short_name='o',
5207
help='Write merge directive to this file or directory; '
4869
help='Write merge directive to this file; '
5208
4870
'use - for stdout.',
5211
help='Refuse to send if there are uncommitted changes in'
5212
' the working tree, --no-strict disables the check.'),
5213
4872
Option('mail-to', help='Mail the request to this address.',
5217
4876
Option('body', help='Body for the email.', type=unicode),
5218
4877
RegistryOption('format',
5219
help='Use the specified output format.',
5220
lazy_registry=('bzrlib.send', 'format_registry')),
4878
help='Use the specified output format.',
4879
lazy_registry=('bzrlib.send', 'format_registry'))
5223
4882
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5224
4883
no_patch=False, revision=None, remember=False, output=None,
5225
format=None, mail_to=None, message=None, body=None,
5226
strict=None, **kwargs):
4884
format=None, mail_to=None, message=None, body=None, **kwargs):
5227
4885
from bzrlib.send import send
5228
4886
return send(submit_branch, revision, public_branch, remember,
5229
format, no_bundle, no_patch, output,
5230
kwargs.get('from', '.'), mail_to, message, body,
4887
format, no_bundle, no_patch, output,
4888
kwargs.get('from', '.'), mail_to, message, body,
5235
4892
class cmd_bundle_revisions(cmd_send):
5236
__doc__ = """Create a merge-directive for submitting changes.
4893
"""Create a merge-directive for submitting changes.
5238
4895
A merge directive provides many things needed for requesting merges:
5321
4975
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5322
4976
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
4979
_see_also = ['commit', 'tags']
5331
takes_args = ['tag_name?']
4980
takes_args = ['tag_name']
5332
4981
takes_options = [
5333
4982
Option('delete',
5334
4983
help='Delete this tag rather than placing it.',
5336
custom_help('directory',
5337
help='Branch in which to place the tag.'),
4986
help='Branch in which to place the tag.',
5338
4990
Option('force',
5339
4991
help='Replace existing tags.',
5344
def run(self, tag_name=None,
4996
def run(self, tag_name,
5350
5002
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)
5006
branch.tags.delete_tag(tag_name)
5007
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)
5010
if len(revision) != 1:
5011
raise errors.BzrCommandError(
5012
"Tags can only be placed on a single revision, "
5014
revision_id = revision[0].as_revision_id(branch)
5016
revision_id = branch.last_revision()
5017
if (not force) and branch.tags.has_tag(tag_name):
5018
raise errors.TagAlreadyExists(tag_name)
5019
branch.tags.set_tag(tag_name, revision_id)
5020
self.outf.write('Created tag %s.\n' % tag_name)
5377
5025
class cmd_tags(Command):
5378
__doc__ = """List tags.
5380
5028
This command shows a table of tag names and the revisions they reference.
5383
5031
_see_also = ['tag']
5384
5032
takes_options = [
5385
custom_help('directory',
5386
help='Branch whose tags should be displayed.'),
5034
help='Branch whose tags should be displayed.',
5387
5038
RegistryOption.from_kwargs('sort',
5388
5039
'Sort tags by different criteria.', title='Sorting',
5389
5040
alpha='Sort tags lexicographically (default).',
5409
self.add_cleanup(branch.lock_read().unlock)
5411
graph = branch.repository.get_graph()
5412
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5413
revid1, revid2 = rev1.rev_id, rev2.rev_id
5414
# only show revisions between revid1 and revid2 (inclusive)
5415
tags = [(tag, revid) for tag, revid in tags if
5416
graph.is_between(revid, revid1, revid2)]
5419
elif sort == 'time':
5421
for tag, revid in tags:
5423
revobj = branch.repository.get_revision(revid)
5424
except errors.NoSuchRevision:
5425
timestamp = sys.maxint # place them at the end
5427
timestamp = revobj.timestamp
5428
timestamps[revid] = timestamp
5429
tags.sort(key=lambda x: timestamps[x[1]])
5431
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5432
for index, (tag, revid) in enumerate(tags):
5434
revno = branch.revision_id_to_dotted_revno(revid)
5435
if isinstance(revno, tuple):
5436
revno = '.'.join(map(str, revno))
5437
except errors.NoSuchRevision:
5438
# Bad tag data/merges can lead to tagged revisions
5439
# which are not in this branch. Fail gracefully ...
5441
tags[index] = (tag, revno)
5063
graph = branch.repository.get_graph()
5064
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5065
revid1, revid2 = rev1.rev_id, rev2.rev_id
5066
# only show revisions between revid1 and revid2 (inclusive)
5067
tags = [(tag, revid) for tag, revid in tags if
5068
graph.is_between(revid, revid1, revid2)]
5071
elif sort == 'time':
5073
for tag, revid in tags:
5075
revobj = branch.repository.get_revision(revid)
5076
except errors.NoSuchRevision:
5077
timestamp = sys.maxint # place them at the end
5079
timestamp = revobj.timestamp
5080
timestamps[revid] = timestamp
5081
tags.sort(key=lambda x: timestamps[x[1]])
5083
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5084
for index, (tag, revid) in enumerate(tags):
5086
revno = branch.revision_id_to_dotted_revno(revid)
5087
if isinstance(revno, tuple):
5088
revno = '.'.join(map(str, revno))
5089
except errors.NoSuchRevision:
5090
# Bad tag data/merges can lead to tagged revisions
5091
# which are not in this branch. Fail gracefully ...
5093
tags[index] = (tag, revno)
5443
5096
for tag, revspec in tags:
5444
5097
self.outf.write('%-20s %s\n' % (tag, revspec))
5447
5100
class cmd_reconfigure(Command):
5448
__doc__ = """Reconfigure the type of a bzr directory.
5101
"""Reconfigure the type of a bzr directory.
5450
5103
A target configuration must be specified.
5482
5135
Option('bind-to', help='Branch to bind checkout to.', type=str),
5483
5136
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.',
5137
help='Perform reconfiguration even if local changes'
5496
def run(self, location=None, target_type=None, bind_to=None, force=False,
5141
def run(self, location=None, target_type=None, bind_to=None, force=False):
5499
5142
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
5143
if target_type is None:
5510
if stacked_on or unstacked:
5513
raise errors.BzrCommandError('No target configuration '
5144
raise errors.BzrCommandError('No target configuration specified')
5515
5145
elif target_type == 'branch':
5516
5146
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5517
5147
elif target_type == 'tree':
5554
5184
/path/to/newbranch.
5556
5186
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
5187
locally, in which case switching will update the the local nickname to be
5558
5188
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.'),
5191
takes_args = ['to_location']
5192
takes_options = [Option('force',
5193
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'.'):
5196
def run(self, to_location, force=False):
5573
5197
from bzrlib import switch
5574
tree_location = directory
5575
revision = _get_one_revision('switch', revision)
5576
5199
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
5583
5201
branch = control_dir.open_branch()
5584
5202
had_explicit_nick = branch.get_config().has_explicit_nickname()
5585
5203
except errors.NotBranchError:
5587
5204
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)
5206
to_branch = Branch.open(to_location)
5207
except errors.NotBranchError:
5208
this_url = self._get_branch_location(control_dir)
5209
to_branch = Branch.open(
5210
urlutils.join(this_url, '..', to_location))
5211
switch.switch(control_dir, to_branch, force)
5611
5212
if had_explicit_nick:
5612
5213
branch = control_dir.open_branch() #get the new branch!
5613
5214
branch.nick = to_branch.nick
5875
5449
_see_also = ['unshelve']
5877
5451
def run(self, revision=None, all=False, file_list=None, message=None,
5878
writer=None, list=False, destroy=False, directory=u'.'):
5452
writer=None, list=False, destroy=False):
5880
5454
return self.run_for_list()
5881
5455
from bzrlib.shelf_ui import Shelver
5882
5456
if writer is None:
5883
5457
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)
5459
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5460
message, destroy=destroy).run()
5891
5461
except errors.UserAbort:
5894
5464
def run_for_list(self):
5895
5465
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))
5468
manager = tree.get_shelf_manager()
5469
shelves = manager.active_shelves()
5470
if len(shelves) == 0:
5471
note('No shelved changes.')
5473
for shelf_id in reversed(shelves):
5474
message = manager.get_metadata(shelf_id).get('message')
5476
message = '<no message>'
5477
self.outf.write('%3d: %s\n' % (shelf_id, message))
5910
5483
class cmd_unshelve(Command):
5911
__doc__ = """Restore shelved changes.
5484
"""Restore shelved changes.
5913
5486
By default, the most recently shelved changes are restored. However if you
5914
5487
specify a shelf by id those changes will be restored instead. This works
5918
5491
takes_args = ['shelf_id?']
5919
5492
takes_options = [
5921
5493
RegistryOption.from_kwargs(
5922
5494
'action', help="The action to perform.",
5923
5495
enum_switch=False, value_switches=True,
5924
5496
apply="Apply changes and remove from the shelf.",
5925
5497
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.",
5498
delete_only="Delete changes without applying them."
5932
5501
_see_also = ['shelve']
5934
def run(self, shelf_id=None, action='apply', directory=u'.'):
5503
def run(self, shelf_id=None, action='apply'):
5935
5504
from bzrlib.shelf_ui import Unshelver
5936
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5940
unshelver.tree.unlock()
5505
Unshelver.from_args(shelf_id, action).run()
5943
5508
class cmd_clean_tree(Command):
5944
__doc__ = """Remove unwanted files from working tree.
5509
"""Remove unwanted files from working tree.
5946
5511
By default, only unknown files, not ignored files, are deleted. Versioned
5947
5512
files are never deleted.
6022
5586
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)
5589
# these get imported and then picked up by the scan for cmd_*
5590
# TODO: Some more consistent way to split command definitions across files;
5591
# we do need to load at least some information about them to know of
5592
# aliases. ideally we would avoid loading the implementation until the
5593
# details were needed.
5594
from bzrlib.cmd_version_info import cmd_version_info
5595
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5596
from bzrlib.bundle.commands import (
5599
from bzrlib.foreign import cmd_dpush
5600
from bzrlib.sign_my_commits import cmd_sign_my_commits
5601
from bzrlib.weave_commands import cmd_versionedfile_list, \
5602
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
