74
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
77
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
80
return internal_tree_files(file_list, default_branch, canonicalize,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
84
88
def tree_files_for_add(file_list):
149
153
# XXX: Bad function name; should possibly also be a class method of
150
154
# WorkingTree rather than a function.
151
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
152
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
153
156
apply_view=True):
154
157
"""Convert command-line paths to a WorkingTree and relative paths.
156
Deprecated: use WorkingTree.open_containing_paths instead.
158
159
This is typically used for command-line processors that take one or
159
160
more filenames, and infer the workingtree that contains them.
171
172
:return: workingtree, [relative_paths]
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
179
223
def _get_view_info_for_change_reporter(tree):
191
def _open_directory_or_containing_tree_or_branch(filename, directory):
192
"""Open the tree or branch containing the specified file, unless
193
the --directory option is used to specify a different branch."""
194
if directory is not None:
195
return (None, Branch.open(directory), filename)
196
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
199
235
# TODO: Make sure no commands unconditionally use the working directory as a
200
236
# branch. If a filename argument is used, the first of them should be used to
201
237
# specify the branch. (Perhaps this can be factored out into some kind of
250
286
To skip the display of pending merge information altogether, use
251
287
the no-pending option or specify a file/directory.
253
To compare the working directory to a specific revision, pass a
254
single revision to the revision argument.
256
To see which files have changed in a specific revision, or between
257
two revisions, pass a revision range to the revision argument.
258
This will produce the same results as calling 'bzr diff --summarize'.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
261
293
# TODO: --no-recurse, --recurse options
321
353
self.outf.write(revtext.decode('utf-8'))
324
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
325
357
if revision_id is not None and revision is not None:
326
358
raise errors.BzrCommandError('You can only supply one of'
327
359
' revision_id or --revision')
328
360
if revision_id is None and revision is None:
329
361
raise errors.BzrCommandError('You must supply either'
330
362
' --revision or a revision_id')
332
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
363
b = WorkingTree.open_containing(u'.')[0].branch
334
365
revisions = b.repository.revisions
335
366
if revisions is None:
485
511
d.destroy_workingtree()
488
class cmd_repair_workingtree(Command):
489
__doc__ = """Reset the working tree state file.
491
This is not meant to be used normally, but more as a way to recover from
492
filesystem corruption, etc. This rebuilds the working inventory back to a
493
'known good' state. Any new modifications (adding a file, renaming, etc)
494
will be lost, though modified files will still be detected as such.
496
Most users will want something more like "bzr revert" or "bzr update"
497
unless the state file has become corrupted.
499
By default this attempts to recover the current state by looking at the
500
headers of the state file. If the state file is too corrupted to even do
501
that, you can supply --revision to force the state of the tree.
504
takes_options = ['revision', 'directory',
506
help='Reset the tree even if it doesn\'t appear to be'
511
def run(self, revision=None, directory='.', force=False):
512
tree, _ = WorkingTree.open_containing(directory)
513
self.add_cleanup(tree.lock_tree_write().unlock)
517
except errors.BzrError:
518
pass # There seems to be a real error here, so we'll reset
521
raise errors.BzrCommandError(
522
'The tree does not appear to be corrupt. You probably'
523
' want "bzr revert" instead. Use "--force" if you are'
524
' sure you want to reset the working tree.')
528
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
530
tree.reset_state(revision_ids)
531
except errors.BzrError, e:
532
if revision_ids is None:
533
extra = (', the header appears corrupt, try passing -r -1'
534
' to set the state to the last commit')
537
raise errors.BzrCommandError('failed to reset the tree state'
541
514
class cmd_revno(Command):
542
515
__doc__ = """Show current revision number.
778
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
780
761
revision = _get_one_revision('inventory', revision)
781
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
782
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
783
765
if revision is not None:
784
766
tree = revision.as_tree(work_tree.branch)
786
768
extra_trees = [work_tree]
787
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
850
833
if len(names_list) < 2:
851
834
raise errors.BzrCommandError("missing file argument")
852
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
853
self.add_cleanup(tree.lock_tree_write().unlock)
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
854
838
self._run(tree, names_list, rel_names, after)
856
840
def run_auto(self, names_list, after, dry_run):
861
845
raise errors.BzrCommandError('--after cannot be specified with'
863
work_tree, file_list = WorkingTree.open_containing_paths(
864
names_list, default_directory='.')
865
self.add_cleanup(work_tree.lock_tree_write().unlock)
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
866
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
868
852
def _run(self, tree, names_list, rel_names, after):
976
960
takes_options = ['remember', 'overwrite', 'revision',
977
961
custom_help('verbose',
978
962
help='Show logs of pulled revisions.'),
979
custom_help('directory',
980
964
help='Branch to pull into, '
981
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
983
970
help="Perform a local pull in a bound "
984
971
"branch. Local pulls are not applied to "
985
972
"the master branch."
988
help="Show base revision text in conflicts.")
990
975
takes_args = ['location?']
991
976
encoding_type = 'replace'
993
978
def run(self, location=None, remember=False, overwrite=False,
994
979
revision=None, verbose=False,
995
directory=None, local=False,
980
directory=None, local=False):
997
981
# FIXME: too much stuff is in the command class
998
982
revision_id = None
1003
987
tree_to = WorkingTree.open_containing(directory)[0]
1004
988
branch_to = tree_to.branch
1005
self.add_cleanup(tree_to.lock_write().unlock)
990
self.add_cleanup(tree_to.unlock)
1006
991
except errors.NoWorkingTree:
1008
993
branch_to = Branch.open_containing(directory)[0]
1009
self.add_cleanup(branch_to.lock_write().unlock)
1011
if tree_to is None and show_base:
1012
raise errors.BzrCommandError("Need working tree for --show-base.")
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1014
997
if local and not branch_to.get_bound_location():
1015
998
raise errors.LocalRequiresBoundBranch()
1109
1088
Option('create-prefix',
1110
1089
help='Create the path leading up to the branch '
1111
1090
'if it does not already exist.'),
1112
custom_help('directory',
1113
1092
help='Branch to push from, '
1114
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1115
1097
Option('use-existing-dir',
1116
1098
help='By default push will fail if the target'
1117
1099
' directory exists, but does not already'
1138
1117
def run(self, location=None, remember=False, overwrite=False,
1139
1118
create_prefix=False, verbose=False, revision=None,
1140
1119
use_existing_dir=False, directory=None, stacked_on=None,
1141
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1142
1121
from bzrlib.push import _show_push_branch
1144
1123
if directory is None:
1190
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1191
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1192
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1193
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1196
1175
class cmd_branch(Command):
1210
1189
_see_also = ['checkout']
1211
1190
takes_args = ['from_location', 'to_location?']
1212
takes_options = ['revision',
1213
Option('hardlink', help='Hard-link working tree files where possible.'),
1214
Option('files-from', type=str,
1215
help="Get file contents from this tree."),
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1216
1193
Option('no-tree',
1217
1194
help="Create a branch without a working-tree."),
1218
1195
Option('switch',
1237
1214
def run(self, from_location, to_location=None, revision=None,
1238
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1239
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1241
1217
from bzrlib import switch as _mod_switch
1242
1218
from bzrlib.tag import _merge_tags_if_possible
1243
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1245
if not (hardlink or files_from):
1246
# accelerator_tree is usually slower because you have to read N
1247
# files (no readahead, lots of seeks, etc), but allow the user to
1248
# explicitly request it
1249
accelerator_tree = None
1250
if files_from is not None and files_from != from_location:
1251
accelerator_tree = WorkingTree.open(files_from)
1252
1221
revision = _get_one_revision('branch', revision)
1253
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1254
1224
if revision is not None:
1255
1225
revision_id = revision.as_revision_id(br_from)
1361
1331
to_location = branch_location
1362
1332
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1363
1333
branch_location)
1364
if not (hardlink or files_from):
1365
# accelerator_tree is usually slower because you have to read N
1366
# files (no readahead, lots of seeks, etc), but allow the user to
1367
# explicitly request it
1368
accelerator_tree = None
1369
1334
revision = _get_one_revision('checkout', revision)
1370
if files_from is not None and files_from != branch_location:
1335
if files_from is not None:
1371
1336
accelerator_tree = WorkingTree.open(files_from)
1372
1337
if revision is not None:
1373
1338
revision_id = revision.as_revision_id(source)
1429
1396
If you want to discard your local changes, you can just do a
1430
1397
'bzr revert' instead of 'bzr commit' after the update.
1432
If you want to restore a file that has been removed locally, use
1433
'bzr revert' instead of 'bzr update'.
1435
1399
If the tree's branch is bound to a master branch, it will also update
1436
1400
the branch from the master.
1439
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1440
1404
takes_args = ['dir?']
1441
takes_options = ['revision',
1443
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1445
1406
aliases = ['up']
1447
def run(self, dir='.', revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1448
1409
if revision is not None and len(revision) != 1:
1449
1410
raise errors.BzrCommandError(
1450
1411
"bzr update --revision takes exactly one revision")
1559
1519
class cmd_remove(Command):
1560
1520
__doc__ = """Remove files or directories.
1562
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1563
delete them if they can easily be recovered using revert otherwise they
1564
will be backed up (adding an extention of the form .~#~). If no options or
1565
parameters are given Bazaar will scan for files that are being tracked by
1566
Bazaar but missing in your tree and stop tracking them for you.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1568
1527
takes_args = ['file*']
1569
1528
takes_options = ['verbose',
1571
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1572
1531
'The file deletion mode to be used.',
1573
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1574
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1575
1535
keep='Delete from bzr but leave the working copy.',
1576
no_backup='Don\'t backup changed files.',
1577
1536
force='Delete all the specified files, even if they can not be '
1578
'recovered and even if they are non-empty directories. '
1579
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1580
1538
aliases = ['rm', 'del']
1581
1539
encoding_type = 'replace'
1583
1541
def run(self, file_list, verbose=False, new=False,
1584
1542
file_deletion_strategy='safe'):
1585
if file_deletion_strategy == 'force':
1586
note("(The --force option is deprecated, rather use --no-backup "
1588
file_deletion_strategy = 'no-backup'
1590
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1592
1545
if file_list is not None:
1593
1546
file_list = [f for f in file_list]
1595
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1596
1550
# Heuristics should probably all move into tree.remove_smart or
1682
1636
_see_also = ['check']
1683
1637
takes_args = ['branch?']
1685
Option('canonicalize-chks',
1686
help='Make sure CHKs are in canonical form (repairs '
1691
def run(self, branch=".", canonicalize_chks=False):
1639
def run(self, branch="."):
1692
1640
from bzrlib.reconcile import reconcile
1693
1641
dir = bzrdir.BzrDir.open(branch)
1694
reconcile(dir, canonicalize_chks=canonicalize_chks)
1697
1645
class cmd_revision_history(Command):
1775
1723
Option('append-revisions-only',
1776
1724
help='Never change revnos or the existing log.'
1777
' Append revisions to it only.'),
1779
'Create a branch without a working tree.')
1725
' Append revisions to it only.')
1781
1727
def run(self, location=None, format=None, append_revisions_only=False,
1782
create_prefix=False, no_tree=False):
1728
create_prefix=False):
1783
1729
if format is None:
1784
1730
format = bzrdir.format_registry.make_bzrdir('default')
1785
1731
if location is None:
2062
1985
old_branch, new_branch,
2063
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2064
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2065
# GNU diff on Windows uses ANSI encoding for filenames
2066
path_encoding = osutils.get_diff_header_encoding()
2067
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2068
1989
specific_files=specific_files,
2069
1990
external_diff_options=diff_options,
2070
1991
old_label=old_label, new_label=new_label,
2071
extra_trees=extra_trees,
2072
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2074
1993
format_cls=format)
2084
2003
# level of effort but possibly much less IO. (Or possibly not,
2085
2004
# if the directories are very large...)
2086
2005
_see_also = ['status', 'ls']
2087
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
2089
2008
@display_command
2090
def run(self, show_ids=False, directory=u'.'):
2091
tree = WorkingTree.open_containing(directory)[0]
2092
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2093
2013
old = tree.basis_tree()
2094
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2095
2016
for path, ie in old.inventory.iter_entries():
2096
2017
if not tree.has_id(ie.file_id):
2097
2018
self.outf.write(path)
2109
2030
_see_also = ['status', 'ls']
2110
takes_options = ['directory', 'null']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2112
2037
@display_command
2113
def run(self, null=False, directory=u'.'):
2114
tree = WorkingTree.open_containing(directory)[0]
2115
self.add_cleanup(tree.lock_read().unlock)
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2116
2040
td = tree.changes_from(tree.basis_tree())
2118
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2120
2043
self.outf.write(path + '\0')
2130
2053
_see_also = ['status', 'ls']
2131
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2133
2060
@display_command
2134
def run(self, null=False, directory=u'.'):
2135
wt = WorkingTree.open_containing(directory)[0]
2136
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2137
2065
basis = wt.basis_tree()
2138
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2139
2068
basis_inv = basis.inventory
2140
2069
inv = wt.inventory
2141
2070
for file_id in inv:
2603
2528
help='Recurse into subdirectories.'),
2604
2529
Option('from-root',
2605
2530
help='Print paths relative to the root of the branch.'),
2606
Option('unknown', short_name='u',
2607
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2608
2532
Option('versioned', help='Print versioned files.',
2609
2533
short_name='V'),
2610
Option('ignored', short_name='i',
2611
help='Print ignored files.'),
2612
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2613
2539
help='List entries of a particular kind: file, directory, symlink.',
2619
2543
@display_command
2620
2544
def run(self, revision=None, verbose=False,
2621
2545
recursive=False, from_root=False,
2622
2546
unknown=False, versioned=False, ignored=False,
2623
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2625
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2626
2550
raise errors.BzrCommandError('invalid kind specified')
2798
2713
_see_also = ['status', 'ignored', 'patterns']
2799
2714
takes_args = ['name_pattern*']
2800
takes_options = ['directory',
2801
2716
Option('default-rules',
2802
2717
help='Display the default ignore rules that bzr uses.')
2805
def run(self, name_pattern_list=None, default_rules=None,
2720
def run(self, name_pattern_list=None, default_rules=None):
2807
2721
from bzrlib import ignores
2808
2722
if default_rules is not None:
2809
2723
# dump the default rules and exit
2815
2729
"NAME_PATTERN or --default-rules.")
2816
2730
name_pattern_list = [globbing.normalize_pattern(p)
2817
2731
for p in name_pattern_list]
2819
for p in name_pattern_list:
2820
if not globbing.Globster.is_pattern_valid(p):
2821
bad_patterns += ('\n %s' % p)
2823
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2824
ui.ui_factory.show_error(msg)
2825
raise errors.InvalidPattern('')
2826
2732
for name_pattern in name_pattern_list:
2827
2733
if (name_pattern[0] == '/' or
2828
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2829
2735
raise errors.BzrCommandError(
2830
2736
"NAME_PATTERN should not be an absolute path")
2831
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2832
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2833
2739
ignored = globbing.Globster(name_pattern_list)
2835
self.add_cleanup(tree.lock_read().unlock)
2836
2742
for entry in tree.list_files():
2838
2744
if id is not None:
2839
2745
filename = entry[0]
2840
2746
if ignored.match(filename):
2841
2747
matches.append(filename)
2842
2749
if len(matches) > 0:
2843
2750
self.outf.write("Warning: the following files are version controlled and"
2844
2751
" match your ignore pattern:\n%s"
2860
2767
encoding_type = 'replace'
2861
2768
_see_also = ['ignore', 'ls']
2862
takes_options = ['directory']
2864
2770
@display_command
2865
def run(self, directory=u'.'):
2866
tree = WorkingTree.open_containing(directory)[0]
2867
self.add_cleanup(tree.lock_read().unlock)
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2868
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2869
2776
if file_class != 'I':
2938
2844
'revision in which it was changed.'),
2940
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2941
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
2942
2848
from bzrlib.export import export
2944
2850
if branch_or_subdir is None:
2945
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
2946
2852
b = tree.branch
2979
2885
@display_command
2980
2886
def run(self, filename, revision=None, name_from_revision=False,
2981
filters=False, directory=None):
2982
2888
if revision is not None and len(revision) != 1:
2983
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2984
2890
" one revision specifier")
2985
2891
tree, branch, relpath = \
2986
_open_directory_or_containing_tree_or_branch(filename, directory)
2987
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2988
2895
return self._run(tree, branch, relpath, filename, revision,
2989
2896
name_from_revision, filters)
3392
3297
class cmd_upgrade(Command):
3393
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3395
When the default format has changed after a major new release of
3396
Bazaar, you may be informed during certain operations that you
3397
should upgrade. Upgrading to a newer format may improve performance
3398
or make new features available. It may however limit interoperability
3399
with older repositories or with older versions of Bazaar.
3401
If you wish to upgrade to a particular format rather than the
3402
current default, that can be specified using the --format option.
3403
As a consequence, you can use the upgrade command this way to
3404
"downgrade" to an earlier format, though some conversions are
3405
a one way process (e.g. changing from the 1.x default to the
3406
2.x default) so downgrading is not always possible.
3408
A backup.bzr.~#~ directory is created at the start of the conversion
3409
process (where # is a number). By default, this is left there on
3410
completion. If the conversion fails, delete the new .bzr directory
3411
and rename this one back in its place. Use the --clean option to ask
3412
for the backup.bzr directory to be removed on successful conversion.
3413
Alternatively, you can delete it by hand if everything looks good
3416
If the location given is a shared repository, dependent branches
3417
are also converted provided the repository converts successfully.
3418
If the conversion of a branch fails, remaining branches are still
3421
For more information on upgrades, see the Bazaar Upgrade Guide,
3422
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3425
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3426
3306
takes_args = ['url?']
3427
3307
takes_options = [
3428
RegistryOption('format',
3429
help='Upgrade to a specific format. See "bzr help'
3430
' formats" for details.',
3431
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3432
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3433
value_switches=True, title='Branch format'),
3435
help='Remove the backup.bzr directory if successful.'),
3437
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3440
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3441
3317
from bzrlib.upgrade import upgrade
3442
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3444
if len(exceptions) == 1:
3445
# Compatibility with historical behavior
3318
upgrade(url, format)
3451
3321
class cmd_whoami(Command):
3471
3340
encoding_type = 'replace'
3473
3342
@display_command
3474
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3475
3344
if name is None:
3476
if directory is None:
3477
# use branch if we're inside one; otherwise global config
3479
c = Branch.open_containing(u'.')[0].get_config()
3480
except errors.NotBranchError:
3481
c = _mod_config.GlobalConfig()
3483
c = Branch.open(directory).get_config()
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3485
3351
self.outf.write(c.user_email() + '\n')
3487
3353
self.outf.write(c.username() + '\n')
3491
raise errors.BzrCommandError("--email can only be used to display existing "
3494
3356
# display a warning if an email address isn't included in the given name.
3496
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3497
3359
except errors.NoEmailInUsername, e:
3498
3360
warning('"%s" does not seem to contain an email address. '
3499
3361
'This is allowed, but not recommended.', name)
3501
3363
# use global config unless --branch given
3503
if directory is None:
3504
c = Branch.open_containing(u'.')[0].get_config()
3506
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3508
c = _mod_config.GlobalConfig()
3367
c = config.GlobalConfig()
3509
3368
c.set_user_option('email', name)
3578
3436
'bzr alias --remove expects an alias to remove.')
3579
3437
# If alias is not found, print something like:
3580
3438
# unalias: foo: not found
3581
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3582
3440
c.unset_alias(alias_name)
3584
3442
@display_command
3585
3443
def print_aliases(self):
3586
3444
"""Print out the defined aliases in a similar format to bash."""
3587
aliases = _mod_config.GlobalConfig().get_aliases()
3445
aliases = config.GlobalConfig().get_aliases()
3588
3446
for key, value in sorted(aliases.iteritems()):
3589
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3682
3537
'throughout the test suite.',
3683
3538
type=get_transport_type),
3684
3539
Option('benchmark',
3685
help='Run the benchmarks rather than selftests.',
3540
help='Run the benchmarks rather than selftests.'),
3687
3541
Option('lsprof-timed',
3688
3542
help='Generate lsprof output for benchmarked'
3689
3543
' sections of code.'),
3690
3544
Option('lsprof-tests',
3691
3545
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3692
3549
Option('first',
3693
3550
help='Run all tests, but run specified tests first.',
3694
3551
short_name='f',
3729
3586
def run(self, testspecs_list=None, verbose=False, one=False,
3730
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3732
3589
first=False, list_only=False,
3733
3590
randomize=None, exclude=None, strict=False,
3734
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3735
3592
parallel=None, lsprof_tests=False):
3736
from bzrlib import tests
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3738
3602
if testspecs_list is not None:
3739
3603
pattern = '|'.join(testspecs_list)
3748
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3749
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3750
3614
# stdout, which would corrupt the subunit stream.
3751
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3752
# following code can be deleted when it's sufficiently deployed
3753
# -- vila/mgz 20100514
3754
if (sys.platform == "win32"
3755
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3757
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3759
3619
self.additional_selftest_args.setdefault(
3760
3620
'suite_decorators', []).append(parallel)
3762
raise errors.BzrCommandError(
3763
"--benchmark is no longer supported from bzr 2.2; "
3764
"use bzr-usertest instead")
3765
test_suite_factory = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
test_suite_factory = None
3766
3631
selftest_kwargs = {"verbose": verbose,
3767
3632
"pattern": pattern,
3768
3633
"stop_on_failure": one,
3850
3711
with bzr send. If neither is specified, the default is the upstream branch
3851
3712
or the branch most recently merged using --remember.
3853
When merging from a branch, by default bzr will try to merge in all new
3854
work from the other branch, automatically determining an appropriate base
3855
revision. If this fails, you may need to give an explicit base.
3857
To pick a different ending revision, pass "--revision OTHER". bzr will
3858
try to merge in all new work up to and including revision OTHER.
3860
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3861
through OTHER, excluding BASE but including OTHER, will be merged. If this
3862
causes some revisions to be skipped, i.e. if the destination branch does
3863
not already contain revision BASE, such a merge is commonly referred to as
3866
Revision numbers are always relative to the source branch.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
3868
3725
Merge will do its best to combine the changes in two branches, but there
3869
3726
are some kinds of problems only a human can fix. When it encounters those,
3936
3793
' completely merged into the source, pull from the'
3937
3794
' source rather than merging. When this happens,'
3938
3795
' you do not need to commit the result.'),
3939
custom_help('directory',
3940
3797
help='Branch to merge into, '
3941
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
3942
3802
Option('preview', help='Instead of merging, show a diff of the'
3944
3804
Option('interactive', help='Select changes interactively.',
4044
3905
def _do_preview(self, merger):
4045
3906
from bzrlib.diff import show_diff_trees
4046
3907
result_tree = self._get_preview(merger)
4047
path_encoding = osutils.get_diff_header_encoding()
4048
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
4049
old_label='', new_label='',
4050
path_encoding=path_encoding)
3909
old_label='', new_label='')
4052
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4053
3912
merger.change_reporter = change_reporter
4133
3992
if ((remember or tree.branch.get_submit_branch() is None) and
4134
3993
user_location is not None):
4135
3994
tree.branch.set_submit_branch(other_branch.base)
4136
# Merge tags (but don't set them in the master branch yet, the user
4137
# might revert this merge). Commit will propagate them.
4138
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4139
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4140
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4141
3998
if other_path != '':
4309
4167
last committed revision is used.
4311
4169
To remove only some changes, without reverting to a prior version, use
4312
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4313
will remove the changes introduced by the second last commit (-2), without
4314
affecting the changes introduced by the last commit (-1). To remove
4315
certain changes on a hunk-by-hunk basis, see the shelve command.
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4317
4174
By default, any files that have been manually changed will be backed up
4318
4175
first. (Files changed only by merge are not backed up.) Backup files have
4483
4340
theirs_only=False,
4484
4341
log_format=None, long=False, short=False, line=False,
4485
4342
show_ids=False, verbose=False, this=False, other=False,
4486
include_merges=False, revision=None, my_revision=None,
4343
include_merges=False, revision=None, my_revision=None):
4488
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4489
4345
def message(s):
4490
4346
if not is_quiet():
4648
4507
@display_command
4649
4508
def run(self, verbose=False):
4650
from bzrlib import plugin
4651
self.outf.writelines(
4652
plugin.describe_plugins(show_paths=verbose))
4509
import bzrlib.plugin
4510
from inspect import getdoc
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4519
doc = d.split('\n')[0]
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4655
4531
class cmd_testament(Command):
4701
4578
Option('long', help='Show commit date in annotations.'),
4706
4582
encoding_type = 'exact'
4708
4584
@display_command
4709
4585
def run(self, filename, all=False, long=False, revision=None,
4710
show_ids=False, directory=None):
4711
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4712
4588
wt, branch, relpath = \
4713
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4714
4590
if wt is not None:
4715
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4717
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4718
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4719
self.add_cleanup(tree.lock_read().unlock)
4720
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
4721
4600
file_id = wt.path2id(relpath)
4723
4602
file_id = tree.path2id(relpath)
4724
4603
if file_id is None:
4725
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4726
4606
if wt is not None and revision is None:
4727
4607
# If there is a tree and we're not annotating historical
4728
4608
# versions, annotate the working tree's content.
4729
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4730
4610
show_ids=show_ids)
4732
file_version = tree.inventory[file_id].revision
4733
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4734
4613
show_ids=show_ids)
4741
4620
hidden = True # is this right ?
4742
4621
takes_args = ['revision_id*']
4743
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4745
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4746
4625
if revision_id_list is not None and revision is not None:
4747
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4748
4627
if revision_id_list is None and revision is None:
4749
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4750
b = WorkingTree.open_containing(directory)[0].branch
4751
self.add_cleanup(b.lock_write().unlock)
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4752
4632
return self._run(b, revision_id_list, revision)
4754
4634
def _run(self, b, revision_id_list, revision):
4814
4694
_see_also = ['checkouts', 'unbind']
4815
4695
takes_args = ['location?']
4816
takes_options = ['directory']
4818
def run(self, location=None, directory=u'.'):
4819
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4820
4700
if location is None:
4822
4702
location = b.get_old_bound_location()
4904
4784
b = control.open_branch()
4906
4786
if tree is not None:
4907
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
4909
self.add_cleanup(b.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4910
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4912
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4983
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4984
bzr break-lock --conf ~/.bazaar
4987
4861
takes_args = ['location?']
4990
help='LOCATION is the directory where the config lock is.'),
4992
help='Do not ask for confirmation before breaking the lock.'),
4995
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
4996
4864
if location is None:
4997
4865
location = u'.'
4999
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5001
{'bzrlib.lockdir.break': True})
5003
conf = _mod_config.LockableConfig(file_name=location)
5006
control, relpath = bzrdir.BzrDir.open_containing(location)
5008
control.break_lock()
5009
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5013
4873
class cmd_wait_until_signalled(Command):
5077
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5078
4939
protocol=None):
5079
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5080
4941
if directory is None:
5081
4942
directory = os.getcwd()
5082
4943
if protocol is None:
5083
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5084
4945
host, port = self.get_host_and_port(port)
5085
4946
url = urlutils.local_path_to_url(directory)
5086
4947
if not allow_writes:
5087
4948
url = 'readonly+' + url
5088
t = transport.get_transport(url)
5089
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5092
4953
class cmd_join(Command):
5204
5064
encoding_type = 'exact'
5206
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5207
sign=False, revision=None, mail_to=None, message=None,
5067
sign=False, revision=None, mail_to=None, message=None):
5209
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5210
5069
include_patch, include_bundle = {
5211
5070
'plain': (False, False),
5212
5071
'diff': (True, False),
5213
5072
'bundle': (True, True),
5215
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5216
5075
stored_submit_branch = branch.get_submit_branch()
5217
5076
if submit_branch is None:
5218
5077
submit_branch = stored_submit_branch
5530
5393
_see_also = ['tag']
5531
5394
takes_options = [
5532
custom_help('directory',
5533
help='Branch whose tags should be displayed.'),
5534
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5535
5401
'Sort tags by different criteria.', title='Sorting',
5536
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5542
5409
@display_command
5543
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5544
from bzrlib.tag import tag_sort_methods
5545
5416
branch, relpath = Branch.open_containing(directory)
5547
5418
tags = branch.tags.get_tag_dict().items()
5551
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5553
5425
graph = branch.repository.get_graph()
5554
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5556
5428
# only show revisions between revid1 and revid2 (inclusive)
5557
5429
tags = [(tag, revid) for tag, revid in tags if
5558
5430
graph.is_between(revid, revid1, revid2)]
5560
sort = tag_sort_methods.get()
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5562
5444
if not show_ids:
5563
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5564
5446
for index, (tag, revid) in enumerate(tags):
5703
5584
def run(self, to_location=None, force=False, create_branch=False,
5704
revision=None, directory=u'.'):
5705
5586
from bzrlib import switch
5706
tree_location = directory
5707
5588
revision = _get_one_revision('switch', revision)
5708
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5709
5590
if to_location is None:
5710
5591
if revision is None:
5711
5592
raise errors.BzrCommandError('You must supply either a'
5712
5593
' revision or a location')
5713
to_location = tree_location
5715
5596
branch = control_dir.open_branch()
5716
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5988
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
5989
5869
restore the most recently shelved changes.
5991
For complicated changes, it is possible to edit the changes in a separate
5992
editor program to decide what the file remaining in the working copy
5993
should look like. To do this, add the configuration option
5995
change_editor = PROGRAM @new_path @old_path
5997
where @new_path is replaced with the path of the new version of the
5998
file and @old_path is replaced with the path of the old version of
5999
the file. The PROGRAM should save the new file with the desired
6000
contents of the file in the working tree.
6004
5872
takes_args = ['file*']
6006
5874
takes_options = [
6009
5876
Option('all', help='Shelve all changes.'),
6016
5883
Option('destroy',
6017
5884
help='Destroy removed changes instead of shelving them.'),
6019
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6021
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6022
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6024
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6025
5892
from bzrlib.shelf_ui import Shelver
6026
5893
if writer is None:
6027
5894
writer = bzrlib.option.diff_writer_registry.get()
6029
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6030
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6102
5967
To check what clean-tree will do, use --dry-run.
6104
takes_options = ['directory',
6105
Option('ignored', help='Delete all ignored files.'),
6106
Option('detritus', help='Delete conflict files, merge and revert'
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6107
5971
' backups, and failed selftest dirs.'),
6108
5972
Option('unknown',
6109
5973
help='Delete files unknown to bzr (default).'),
6111
5975
' deleting them.'),
6112
5976
Option('force', help='Do not prompt before deleting.')]
6113
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6114
force=False, directory=u'.'):
6115
5979
from bzrlib.clean_tree import clean_tree
6116
5980
if not (unknown or ignored or detritus):
6120
clean_tree(directory, unknown=unknown, ignored=ignored,
6121
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6124
5988
class cmd_reference(Command):
6173
6037
# be only called once.
6174
6038
for (name, aliases, module_name) in [
6175
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6176
('cmd_config', [], 'bzrlib.config'),
6177
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6178
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6179
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6180
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6181
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6182
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6184
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
