72
69
_parse_revision_str,
74
71
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
81
74
def tree_files(file_list, default_branch=u'.', canonicalize=True,
83
return internal_tree_files(file_list, default_branch, canonicalize,
77
return internal_tree_files(file_list, default_branch, canonicalize,
79
except errors.FileInWrongBranch, e:
80
raise errors.BzrCommandError("%s is not in the same branch as %s" %
81
(e.path, file_list[0]))
87
84
def tree_files_for_add(file_list):
152
149
# XXX: Bad function name; should possibly also be a class method of
153
150
# WorkingTree rather than a function.
154
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
151
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
152
apply_view=True):
157
153
"""Convert command-line paths to a WorkingTree and relative paths.
159
Deprecated: use WorkingTree.open_containing_paths instead.
161
155
This is typically used for command-line processors that take one or
162
156
more filenames, and infer the workingtree that contains them.
174
168
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
170
if file_list is None or len(file_list) == 0:
171
tree = WorkingTree.open_containing(default_branch)[0]
172
if tree.supports_views() and apply_view:
173
view_files = tree.views.lookup_view()
175
file_list = view_files
176
view_str = views.view_display_str(view_files)
177
note("Ignoring files outside view. View is %s" % view_str)
178
return tree, file_list
179
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
180
return tree, safe_relpath_files(tree, file_list, canonicalize,
181
apply_view=apply_view)
184
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
185
"""Convert file_list into a list of relpaths in tree.
187
:param tree: A tree to operate on.
188
:param file_list: A list of user provided paths or None.
189
:param apply_view: if True and a view is set, apply it or check that
190
specified files are within it
191
:return: A list of relative paths.
192
:raises errors.PathNotChild: When a provided path is in a different tree
195
if file_list is None:
197
if tree.supports_views() and apply_view:
198
view_files = tree.views.lookup_view()
202
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
203
# doesn't - fix that up here before we enter the loop.
205
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
208
for filename in file_list:
210
relpath = fixer(osutils.dereference_path(filename))
211
if view_files and not osutils.is_inside_any(view_files, relpath):
212
raise errors.FileOutsideView(filename, view_files)
213
new_list.append(relpath)
214
except errors.PathNotChild:
215
raise errors.FileInWrongBranch(tree.branch, filename)
182
219
def _get_view_info_for_change_reporter(tree):
194
def _open_directory_or_containing_tree_or_branch(filename, directory):
195
"""Open the tree or branch containing the specified file, unless
196
the --directory option is used to specify a different branch."""
197
if directory is not None:
198
return (None, Branch.open(directory), filename)
199
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
202
231
# TODO: Make sure no commands unconditionally use the working directory as a
203
232
# branch. If a filename argument is used, the first of them should be used to
204
233
# specify the branch. (Perhaps this can be factored out into some kind of
233
262
Not versioned and not matching an ignore pattern.
235
Additionally for directories, symlinks and files with a changed
236
executable bit, Bazaar indicates their type using a trailing
237
character: '/', '@' or '*' respectively. These decorations can be
238
disabled using the '--no-classify' option.
264
Additionally for directories, symlinks and files with an executable
265
bit, Bazaar indicates their type using a trailing character: '/', '@'
240
268
To see ignored files use 'bzr ignored'. For details on the
241
269
changes to file texts, use 'bzr diff'.
254
282
To skip the display of pending merge information altogether, use
255
283
the no-pending option or specify a file/directory.
257
To compare the working directory to a specific revision, pass a
258
single revision to the revision argument.
260
To see which files have changed in a specific revision, or between
261
two revisions, pass a revision range to the revision argument.
262
This will produce the same results as calling 'bzr diff --summarize'.
285
If a revision argument is given, the status is calculated against
286
that revision, or between two revisions if two are provided.
265
289
# TODO: --no-recurse, --recurse options
285
306
def run(self, show_ids=False, file_list=None, revision=None, short=False,
286
versioned=False, no_pending=False, verbose=False,
307
versioned=False, no_pending=False, verbose=False):
288
308
from bzrlib.status import show_tree_status
290
310
if revision and len(revision) > 2:
291
311
raise errors.BzrCommandError('bzr status --revision takes exactly'
292
312
' one or two revision specifiers')
294
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
314
tree, relfile_list = tree_files(file_list)
295
315
# Avoid asking for specific files when that is not needed.
296
316
if relfile_list == ['']:
297
317
relfile_list = None
304
324
show_tree_status(tree, show_ids=show_ids,
305
325
specific_files=relfile_list, revision=revision,
306
326
to_file=self.outf, short=short, versioned=versioned,
307
show_pending=(not no_pending), verbose=verbose,
308
classify=not no_classify)
327
show_pending=(not no_pending), verbose=verbose)
311
330
class cmd_cat_revision(Command):
312
__doc__ = """Write out metadata for a revision.
331
"""Write out metadata for a revision.
314
333
The revision to print can either be specified by a specific
315
334
revision identifier, or you can use --revision.
319
338
takes_args = ['revision_id?']
320
takes_options = ['directory', 'revision']
339
takes_options = ['revision']
321
340
# cat-revision is more for frontends so should be exact
322
341
encoding = 'strict'
324
def print_revision(self, revisions, revid):
325
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
326
record = stream.next()
327
if record.storage_kind == 'absent':
328
raise errors.NoSuchRevision(revisions, revid)
329
revtext = record.get_bytes_as('fulltext')
330
self.outf.write(revtext.decode('utf-8'))
333
def run(self, revision_id=None, revision=None, directory=u'.'):
344
def run(self, revision_id=None, revision=None):
334
345
if revision_id is not None and revision is not None:
335
346
raise errors.BzrCommandError('You can only supply one of'
336
347
' revision_id or --revision')
337
348
if revision_id is None and revision is None:
338
349
raise errors.BzrCommandError('You must supply either'
339
350
' --revision or a revision_id')
341
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
343
revisions = b.repository.revisions
344
if revisions is None:
345
raise errors.BzrCommandError('Repository %r does not support '
346
'access to raw revision texts')
348
b.repository.lock_read()
350
# TODO: jam 20060112 should cat-revision always output utf-8?
351
if revision_id is not None:
352
revision_id = osutils.safe_revision_id(revision_id, warn=False)
354
self.print_revision(revisions, revision_id)
355
except errors.NoSuchRevision:
356
msg = "The repository %s contains no revision %s." % (
357
b.repository.base, revision_id)
358
raise errors.BzrCommandError(msg)
359
elif revision is not None:
362
raise errors.BzrCommandError(
363
'You cannot specify a NULL revision.')
364
rev_id = rev.as_revision_id(b)
365
self.print_revision(revisions, rev_id)
367
b.repository.unlock()
351
b = WorkingTree.open_containing(u'.')[0].branch
353
# TODO: jam 20060112 should cat-revision always output utf-8?
354
if revision_id is not None:
355
revision_id = osutils.safe_revision_id(revision_id, warn=False)
357
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
358
except errors.NoSuchRevision:
359
msg = "The repository %s contains no revision %s." % (b.repository.base,
361
raise errors.BzrCommandError(msg)
362
elif revision is not None:
365
raise errors.BzrCommandError('You cannot specify a NULL'
367
rev_id = rev.as_revision_id(b)
368
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
371
class cmd_dump_btree(Command):
371
__doc__ = """Dump the contents of a btree index file to stdout.
372
"""Dump the contents of a btree index file to stdout.
373
374
PATH is a btree index file, it can be any URL. This includes things like
374
375
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
441
439
for node in bt.iter_all_entries():
442
440
# Node is made up of:
443
441
# (index, key, value, [references])
447
refs_as_tuples = None
449
refs_as_tuples = static_tuple.as_tuples(refs)
442
refs_as_tuples = static_tuple.as_tuples(node[3])
450
443
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
451
444
self.outf.write('%s\n' % (as_tuple,))
454
447
class cmd_remove_tree(Command):
455
__doc__ = """Remove the working tree from a given branch/checkout.
448
"""Remove the working tree from a given branch/checkout.
457
450
Since a lightweight checkout is little more than a working tree
458
451
this will refuse to run against one.
485
478
if (working.has_changes()):
486
479
raise errors.UncommittedChanges(working)
487
if working.get_shelf_manager().last_shelf() is not None:
488
raise errors.ShelvedChanges(working)
490
if working.user_url != working.branch.user_url:
481
working_path = working.bzrdir.root_transport.base
482
branch_path = working.branch.bzrdir.root_transport.base
483
if working_path != branch_path:
491
484
raise errors.BzrCommandError("You cannot remove the working tree"
492
485
" from a lightweight checkout")
494
487
d.destroy_workingtree()
497
class cmd_repair_workingtree(Command):
498
__doc__ = """Reset the working tree state file.
500
This is not meant to be used normally, but more as a way to recover from
501
filesystem corruption, etc. This rebuilds the working inventory back to a
502
'known good' state. Any new modifications (adding a file, renaming, etc)
503
will be lost, though modified files will still be detected as such.
505
Most users will want something more like "bzr revert" or "bzr update"
506
unless the state file has become corrupted.
508
By default this attempts to recover the current state by looking at the
509
headers of the state file. If the state file is too corrupted to even do
510
that, you can supply --revision to force the state of the tree.
513
takes_options = ['revision', 'directory',
515
help='Reset the tree even if it doesn\'t appear to be'
520
def run(self, revision=None, directory='.', force=False):
521
tree, _ = WorkingTree.open_containing(directory)
522
self.add_cleanup(tree.lock_tree_write().unlock)
526
except errors.BzrError:
527
pass # There seems to be a real error here, so we'll reset
530
raise errors.BzrCommandError(
531
'The tree does not appear to be corrupt. You probably'
532
' want "bzr revert" instead. Use "--force" if you are'
533
' sure you want to reset the working tree.')
537
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
539
tree.reset_state(revision_ids)
540
except errors.BzrError, e:
541
if revision_ids is None:
542
extra = (', the header appears corrupt, try passing -r -1'
543
' to set the state to the last commit')
546
raise errors.BzrCommandError('failed to reset the tree state'
550
490
class cmd_revno(Command):
551
__doc__ = """Show current revision number.
491
"""Show current revision number.
553
493
This is equal to the number of revisions on this branch.
575
516
revno = ".".join(str(n) for n in revno_t)
577
518
b = Branch.open_containing(location)[0]
578
self.add_cleanup(b.lock_read().unlock)
520
self.add_cleanup(b.unlock)
579
521
revno = b.revno()
580
522
self.cleanup_now()
581
523
self.outf.write(str(revno) + '\n')
584
526
class cmd_revision_info(Command):
585
__doc__ = """Show revision number and revision id for a given revision identifier.
527
"""Show revision number and revision id for a given revision identifier.
588
530
takes_args = ['revision_info*']
589
531
takes_options = [
591
custom_help('directory',
592
534
help='Branch to examine, '
593
'rather than the one containing the working directory.'),
535
'rather than the one containing the working directory.',
594
539
Option('tree', help='Show revno of working tree'),
787
730
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
789
732
revision = _get_one_revision('inventory', revision)
790
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
791
self.add_cleanup(work_tree.lock_read().unlock)
733
work_tree, file_list = tree_files(file_list)
734
work_tree.lock_read()
735
self.add_cleanup(work_tree.unlock)
792
736
if revision is not None:
793
737
tree = revision.as_tree(work_tree.branch)
795
739
extra_trees = [work_tree]
796
self.add_cleanup(tree.lock_read().unlock)
741
self.add_cleanup(tree.unlock)
860
804
if len(names_list) < 2:
861
805
raise errors.BzrCommandError("missing file argument")
862
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
863
self.add_cleanup(tree.lock_tree_write().unlock)
806
tree, rel_names = tree_files(names_list, canonicalize=False)
807
tree.lock_tree_write()
808
self.add_cleanup(tree.unlock)
864
809
self._run(tree, names_list, rel_names, after)
866
811
def run_auto(self, names_list, after, dry_run):
871
816
raise errors.BzrCommandError('--after cannot be specified with'
873
work_tree, file_list = WorkingTree.open_containing_paths(
874
names_list, default_directory='.')
875
self.add_cleanup(work_tree.lock_tree_write().unlock)
818
work_tree, file_list = tree_files(names_list, default_branch='.')
819
work_tree.lock_tree_write()
820
self.add_cleanup(work_tree.unlock)
876
821
rename_map.RenameMap.guess_renames(work_tree, dry_run)
878
823
def _run(self, tree, names_list, rel_names, after):
972
917
match the remote one, use pull --overwrite. This will work even if the two
973
918
branches have diverged.
975
If there is no default location set, the first pull will set it (use
976
--no-remember to avoid settting it). After that, you can omit the
977
location to use the default. To change the default, use --remember. The
978
value will only be saved if the remote location can be accessed.
920
If there is no default location set, the first pull will set it. After
921
that, you can omit the location to use the default. To change the
922
default, use --remember. The value will only be saved if the remote
923
location can be accessed.
980
925
Note: The location can be specified either in the form of a branch,
981
926
or in the form of a path to a file containing a merge directive generated
986
931
takes_options = ['remember', 'overwrite', 'revision',
987
932
custom_help('verbose',
988
933
help='Show logs of pulled revisions.'),
989
custom_help('directory',
990
935
help='Branch to pull into, '
991
'rather than the one containing the working directory.'),
936
'rather than the one containing the working directory.',
993
941
help="Perform a local pull in a bound "
994
942
"branch. Local pulls are not applied to "
995
943
"the master branch."
998
help="Show base revision text in conflicts.")
1000
946
takes_args = ['location?']
1001
947
encoding_type = 'replace'
1003
def run(self, location=None, remember=None, overwrite=False,
949
def run(self, location=None, remember=False, overwrite=False,
1004
950
revision=None, verbose=False,
1005
directory=None, local=False,
951
directory=None, local=False):
1007
952
# FIXME: too much stuff is in the command class
1008
953
revision_id = None
1009
954
mergeable = None
1057
997
branch_from = Branch.open(location,
1058
998
possible_transports=possible_transports)
1059
self.add_cleanup(branch_from.lock_read().unlock)
1060
# Remembers if asked explicitly or no previous location is set
1062
or (remember is None and branch_to.get_parent() is None)):
1000
if branch_to.get_parent() is None or remember:
1063
1001
branch_to.set_parent(branch_from.base)
1003
if branch_from is not branch_to:
1004
branch_from.lock_read()
1005
self.add_cleanup(branch_from.unlock)
1065
1006
if revision is not None:
1066
1007
revision_id = revision.as_revision_id(branch_from)
1009
branch_to.lock_write()
1010
self.add_cleanup(branch_to.unlock)
1068
1011
if tree_to is not None:
1069
1012
view_info = _get_view_info_for_change_reporter(tree_to)
1070
1013
change_reporter = delta._ChangeReporter(
1109
1047
do a merge (see bzr help merge) from the other branch, and commit that.
1110
1048
After that you will be able to do a push without '--overwrite'.
1112
If there is no default push location set, the first push will set it (use
1113
--no-remember to avoid settting it). After that, you can omit the
1114
location to use the default. To change the default, use --remember. The
1115
value will only be saved if the remote location can be accessed.
1050
If there is no default push location set, the first push will set it.
1051
After that, you can omit the location to use the default. To change the
1052
default, use --remember. The value will only be saved if the remote
1053
location can be accessed.
1118
1056
_see_also = ['pull', 'update', 'working-trees']
1120
1058
Option('create-prefix',
1121
1059
help='Create the path leading up to the branch '
1122
1060
'if it does not already exist.'),
1123
custom_help('directory',
1124
1062
help='Branch to push from, '
1125
'rather than the one containing the working directory.'),
1063
'rather than the one containing the working directory.',
1126
1067
Option('use-existing-dir',
1127
1068
help='By default push will fail if the target'
1128
1069
' directory exists, but does not already'
1139
1080
Option('strict',
1140
1081
help='Refuse to push if there are uncommitted changes in'
1141
1082
' the working tree, --no-strict disables the check.'),
1143
help="Don't populate the working tree, even for protocols"
1144
" that support it."),
1146
1084
takes_args = ['location?']
1147
1085
encoding_type = 'replace'
1149
def run(self, location=None, remember=None, overwrite=False,
1087
def run(self, location=None, remember=False, overwrite=False,
1150
1088
create_prefix=False, verbose=False, revision=None,
1151
1089
use_existing_dir=False, directory=None, stacked_on=None,
1152
stacked=False, strict=None, no_tree=False):
1090
stacked=False, strict=None):
1153
1091
from bzrlib.push import _show_push_branch
1155
1093
if directory is None:
1157
1095
# Get the source branch
1158
1096
(tree, br_from,
1159
1097
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1099
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1100
if strict is None: strict = True # default value
1160
1101
# Get the tip's revision_id
1161
1102
revision = _get_one_revision('push', revision)
1162
1103
if revision is not None:
1163
1104
revision_id = revision.in_history(br_from).rev_id
1165
1106
revision_id = None
1166
if tree is not None and revision_id is None:
1167
tree.check_changed_or_out_of_date(
1168
strict, 'push_strict',
1169
more_error='Use --no-strict to force the push.',
1170
more_warning='Uncommitted changes will not be pushed.')
1107
if strict and tree is not None and revision_id is None:
1108
if (tree.has_changes()):
1109
raise errors.UncommittedChanges(
1110
tree, more='Use --no-strict to force the push.')
1111
if tree.last_revision() != tree.branch.last_revision():
1112
# The tree has lost sync with its branch, there is little
1113
# chance that the user is aware of it but he can still force
1114
# the push with --no-strict
1115
raise errors.OutOfDateTree(
1116
tree, more='Use --no-strict to force the push.')
1171
1118
# Get the stacked_on branch, if any
1172
1119
if stacked_on is not None:
1173
1120
stacked_on = urlutils.normalize_url(stacked_on)
1196
1143
display_url = urlutils.unescape_for_display(stored_loc,
1197
1144
self.outf.encoding)
1198
note("Using saved push location: %s" % display_url)
1145
self.outf.write("Using saved push location: %s\n" % display_url)
1199
1146
location = stored_loc
1201
1148
_show_push_branch(br_from, revision_id, location, self.outf,
1202
1149
verbose=verbose, overwrite=overwrite, remember=remember,
1203
1150
stacked_on=stacked_on, create_prefix=create_prefix,
1204
use_existing_dir=use_existing_dir, no_tree=no_tree)
1151
use_existing_dir=use_existing_dir)
1207
1154
class cmd_branch(Command):
1208
__doc__ = """Create a new branch that is a copy of an existing branch.
1155
"""Create a new branch that is a copy of an existing branch.
1210
1157
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1211
1158
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1217
1164
To retrieve the branch as of a particular revision, supply the --revision
1218
1165
parameter, as in "branch foo/bar -r 5".
1220
The synonyms 'clone' and 'get' for this command are deprecated.
1223
1168
_see_also = ['checkout']
1224
1169
takes_args = ['from_location', 'to_location?']
1225
takes_options = ['revision',
1226
Option('hardlink', help='Hard-link working tree files where possible.'),
1227
Option('files-from', type=str,
1228
help="Get file contents from this tree."),
1170
takes_options = ['revision', Option('hardlink',
1171
help='Hard-link working tree files where possible.'),
1229
1172
Option('no-tree',
1230
1173
help="Create a branch without a working-tree."),
1231
1174
Option('switch',
1250
1193
def run(self, from_location, to_location=None, revision=None,
1251
1194
hardlink=False, stacked=False, standalone=False, no_tree=False,
1252
use_existing_dir=False, switch=False, bind=False,
1195
use_existing_dir=False, switch=False, bind=False):
1254
1196
from bzrlib import switch as _mod_switch
1255
1197
from bzrlib.tag import _merge_tags_if_possible
1256
if self.invoked_as in ['get', 'clone']:
1257
ui.ui_factory.show_user_warning(
1258
'deprecated_command',
1259
deprecated_name=self.invoked_as,
1260
recommended_name='branch',
1261
deprecated_in_version='2.4')
1262
1198
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1264
if not (hardlink or files_from):
1265
# accelerator_tree is usually slower because you have to read N
1266
# files (no readahead, lots of seeks, etc), but allow the user to
1267
# explicitly request it
1268
accelerator_tree = None
1269
if files_from is not None and files_from != from_location:
1270
accelerator_tree = WorkingTree.open(files_from)
1271
1200
revision = _get_one_revision('branch', revision)
1272
self.add_cleanup(br_from.lock_read().unlock)
1202
self.add_cleanup(br_from.unlock)
1273
1203
if revision is not None:
1274
1204
revision_id = revision.as_revision_id(br_from)
1380
1310
to_location = branch_location
1381
1311
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1382
1312
branch_location)
1383
if not (hardlink or files_from):
1384
# accelerator_tree is usually slower because you have to read N
1385
# files (no readahead, lots of seeks, etc), but allow the user to
1386
# explicitly request it
1387
accelerator_tree = None
1388
1313
revision = _get_one_revision('checkout', revision)
1389
if files_from is not None and files_from != branch_location:
1314
if files_from is not None:
1390
1315
accelerator_tree = WorkingTree.open(files_from)
1391
1316
if revision is not None:
1392
1317
revision_id = revision.as_revision_id(source)
1448
1375
If you want to discard your local changes, you can just do a
1449
1376
'bzr revert' instead of 'bzr commit' after the update.
1451
If you want to restore a file that has been removed locally, use
1452
'bzr revert' instead of 'bzr update'.
1454
1378
If the tree's branch is bound to a master branch, it will also update
1455
1379
the branch from the master.
1458
1382
_see_also = ['pull', 'working-trees', 'status-flags']
1459
1383
takes_args = ['dir?']
1460
takes_options = ['revision',
1462
help="Show base revision text in conflicts."),
1384
takes_options = ['revision']
1464
1385
aliases = ['up']
1466
def run(self, dir='.', revision=None, show_base=None):
1387
def run(self, dir='.', revision=None):
1467
1388
if revision is not None and len(revision) != 1:
1468
1389
raise errors.BzrCommandError(
1469
1390
"bzr update --revision takes exactly one revision")
1473
1394
master = branch.get_master_branch(
1474
1395
possible_transports=possible_transports)
1475
1396
if master is not None:
1476
1398
branch_location = master.base
1400
tree.lock_tree_write()
1479
1401
branch_location = tree.branch.base
1480
tree.lock_tree_write()
1481
1402
self.add_cleanup(tree.unlock)
1482
1403
# get rid of the final '/' and be ready for display
1483
branch_location = urlutils.unescape_for_display(
1484
branch_location.rstrip('/'),
1404
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1486
1406
existing_pending_merges = tree.get_parent_ids()[1:]
1487
1407
if master is None:
1497
1417
revision_id = branch.last_revision()
1498
1418
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1499
revno = branch.revision_id_to_dotted_revno(revision_id)
1500
note("Tree is up to date at revision %s of branch %s" %
1501
('.'.join(map(str, revno)), branch_location))
1419
revno = branch.revision_id_to_revno(revision_id)
1420
note("Tree is up to date at revision %d of branch %s" %
1421
(revno, branch_location))
1503
1423
view_info = _get_view_info_for_change_reporter(tree)
1504
1424
change_reporter = delta._ChangeReporter(
1509
1429
change_reporter,
1510
1430
possible_transports=possible_transports,
1511
1431
revision=revision_id,
1513
show_base=show_base)
1514
1433
except errors.NoSuchRevision, e:
1515
1434
raise errors.BzrCommandError(
1516
1435
"branch has no revision %s\n"
1517
1436
"bzr update --revision only works"
1518
1437
" for a revision in the branch history"
1519
1438
% (e.revision))
1520
revno = tree.branch.revision_id_to_dotted_revno(
1439
revno = tree.branch.revision_id_to_revno(
1521
1440
_mod_revision.ensure_null(tree.last_revision()))
1522
note('Updated to revision %s of branch %s' %
1523
('.'.join(map(str, revno)), branch_location))
1524
parent_ids = tree.get_parent_ids()
1525
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1441
note('Updated to revision %d of branch %s' %
1442
(revno, branch_location))
1443
if tree.get_parent_ids()[1:] != existing_pending_merges:
1526
1444
note('Your local commits will now show as pending merges with '
1527
1445
"'bzr status', and can be committed with 'bzr commit'.")
1528
1446
if conflicts != 0:
1578
1496
class cmd_remove(Command):
1579
__doc__ = """Remove files or directories.
1497
"""Remove files or directories.
1581
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1582
delete them if they can easily be recovered using revert otherwise they
1583
will be backed up (adding an extention of the form .~#~). If no options or
1584
parameters are given Bazaar will scan for files that are being tracked by
1585
Bazaar but missing in your tree and stop tracking them for you.
1499
This makes bzr stop tracking changes to the specified files. bzr will delete
1500
them if they can easily be recovered using revert. If no options or
1501
parameters are given bzr will scan for files that are being tracked by bzr
1502
but missing in your tree and stop tracking them for you.
1587
1504
takes_args = ['file*']
1588
1505
takes_options = ['verbose',
1590
1507
RegistryOption.from_kwargs('file-deletion-strategy',
1591
1508
'The file deletion mode to be used.',
1592
1509
title='Deletion Strategy', value_switches=True, enum_switch=False,
1593
safe='Backup changed files (default).',
1510
safe='Only delete files if they can be'
1511
' safely recovered (default).',
1594
1512
keep='Delete from bzr but leave the working copy.',
1595
no_backup='Don\'t backup changed files.',
1596
1513
force='Delete all the specified files, even if they can not be '
1597
'recovered and even if they are non-empty directories. '
1598
'(deprecated, use no-backup)')]
1514
'recovered and even if they are non-empty directories.')]
1599
1515
aliases = ['rm', 'del']
1600
1516
encoding_type = 'replace'
1602
1518
def run(self, file_list, verbose=False, new=False,
1603
1519
file_deletion_strategy='safe'):
1604
if file_deletion_strategy == 'force':
1605
note("(The --force option is deprecated, rather use --no-backup "
1607
file_deletion_strategy = 'no-backup'
1609
tree, file_list = WorkingTree.open_containing_paths(file_list)
1520
tree, file_list = tree_files(file_list)
1611
1522
if file_list is not None:
1612
1523
file_list = [f for f in file_list]
1614
self.add_cleanup(tree.lock_write().unlock)
1526
self.add_cleanup(tree.unlock)
1615
1527
# Heuristics should probably all move into tree.remove_smart or
1632
1544
file_deletion_strategy = 'keep'
1633
1545
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1634
1546
keep_files=file_deletion_strategy=='keep',
1635
force=(file_deletion_strategy=='no-backup'))
1547
force=file_deletion_strategy=='force')
1638
1550
class cmd_file_id(Command):
1639
__doc__ = """Print file_id of a particular file or directory.
1551
"""Print file_id of a particular file or directory.
1641
1553
The file_id is assigned when the file is first added and remains the
1642
1554
same through all revisions where the file exists, even when it is
1701
1613
_see_also = ['check']
1702
1614
takes_args = ['branch?']
1704
Option('canonicalize-chks',
1705
help='Make sure CHKs are in canonical form (repairs '
1710
def run(self, branch=".", canonicalize_chks=False):
1616
def run(self, branch="."):
1711
1617
from bzrlib.reconcile import reconcile
1712
1618
dir = bzrdir.BzrDir.open(branch)
1713
reconcile(dir, canonicalize_chks=canonicalize_chks)
1716
1622
class cmd_revision_history(Command):
1717
__doc__ = """Display the list of revision ids on a branch."""
1623
"""Display the list of revision ids on a branch."""
1719
1625
_see_also = ['log']
1720
1626
takes_args = ['location?']
1749
1655
last_revision = wt.last_revision()
1751
self.add_cleanup(b.repository.lock_read().unlock)
1752
graph = b.repository.get_graph()
1753
revisions = [revid for revid, parents in
1754
graph.iter_ancestry([last_revision])]
1755
for revision_id in reversed(revisions):
1756
if _mod_revision.is_null(revision_id):
1657
revision_ids = b.repository.get_ancestry(last_revision)
1659
for revision_id in revision_ids:
1758
1660
self.outf.write(revision_id + '\n')
1761
1663
class cmd_init(Command):
1762
__doc__ = """Make a directory into a versioned branch.
1664
"""Make a directory into a versioned branch.
1764
1666
Use this to create an empty branch, or before importing an
1765
1667
existing project.
1798
1700
Option('append-revisions-only',
1799
1701
help='Never change revnos or the existing log.'
1800
' Append revisions to it only.'),
1802
'Create a branch without a working tree.')
1702
' Append revisions to it only.')
1804
1704
def run(self, location=None, format=None, append_revisions_only=False,
1805
create_prefix=False, no_tree=False):
1705
create_prefix=False):
1806
1706
if format is None:
1807
1707
format = bzrdir.format_registry.make_bzrdir('default')
1808
1708
if location is None:
2044
1922
help='Use this command to compare files.',
2047
RegistryOption('format',
2049
help='Diff format to use.',
2050
lazy_registry=('bzrlib.diff', 'format_registry'),
2051
title='Diff format'),
2053
1926
aliases = ['di', 'dif']
2054
1927
encoding_type = 'exact'
2056
1929
@display_command
2057
1930
def run(self, revision=None, file_list=None, diff_options=None,
2058
prefix=None, old=None, new=None, using=None, format=None):
2059
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1931
prefix=None, old=None, new=None, using=None):
1932
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
2062
1934
if (prefix is None) or (prefix == '0'):
2063
1935
# diff -p0 format
2077
1949
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2078
1950
' one or two revision specifiers')
2080
if using is not None and format is not None:
2081
raise errors.BzrCommandError('--using and --format are mutually '
2084
1952
(old_tree, new_tree,
2085
1953
old_branch, new_branch,
2086
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2087
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2088
# GNU diff on Windows uses ANSI encoding for filenames
2089
path_encoding = osutils.get_diff_header_encoding()
1954
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1955
file_list, revision, old, new, apply_view=True)
2090
1956
return show_diff_trees(old_tree, new_tree, sys.stdout,
2091
1957
specific_files=specific_files,
2092
1958
external_diff_options=diff_options,
2093
1959
old_label=old_label, new_label=new_label,
2094
extra_trees=extra_trees,
2095
path_encoding=path_encoding,
1960
extra_trees=extra_trees, using=using)
2100
1963
class cmd_deleted(Command):
2101
__doc__ = """List files deleted in the working tree.
1964
"""List files deleted in the working tree.
2103
1966
# TODO: Show files deleted since a previous revision, or
2104
1967
# between two revisions.
2107
1970
# level of effort but possibly much less IO. (Or possibly not,
2108
1971
# if the directories are very large...)
2109
1972
_see_also = ['status', 'ls']
2110
takes_options = ['directory', 'show-ids']
1973
takes_options = ['show-ids']
2112
1975
@display_command
2113
def run(self, show_ids=False, directory=u'.'):
2114
tree = WorkingTree.open_containing(directory)[0]
2115
self.add_cleanup(tree.lock_read().unlock)
1976
def run(self, show_ids=False):
1977
tree = WorkingTree.open_containing(u'.')[0]
1979
self.add_cleanup(tree.unlock)
2116
1980
old = tree.basis_tree()
2117
self.add_cleanup(old.lock_read().unlock)
1982
self.add_cleanup(old.unlock)
2118
1983
for path, ie in old.inventory.iter_entries():
2119
1984
if not tree.has_id(ie.file_id):
2120
1985
self.outf.write(path)
2127
1992
class cmd_modified(Command):
2128
__doc__ = """List files modified in working tree.
1993
"""List files modified in working tree.
2132
1997
_see_also = ['status', 'ls']
2133
takes_options = ['directory', 'null']
2000
help='Write an ascii NUL (\\0) separator '
2001
'between files rather than a newline.')
2135
2004
@display_command
2136
def run(self, null=False, directory=u'.'):
2137
tree = WorkingTree.open_containing(directory)[0]
2138
self.add_cleanup(tree.lock_read().unlock)
2005
def run(self, null=False):
2006
tree = WorkingTree.open_containing(u'.')[0]
2139
2007
td = tree.changes_from(tree.basis_tree())
2141
2008
for path, id, kind, text_modified, meta_modified in td.modified:
2143
2010
self.outf.write(path + '\0')
2148
2015
class cmd_added(Command):
2149
__doc__ = """List files added in working tree.
2016
"""List files added in working tree.
2153
2020
_see_also = ['status', 'ls']
2154
takes_options = ['directory', 'null']
2023
help='Write an ascii NUL (\\0) separator '
2024
'between files rather than a newline.')
2156
2027
@display_command
2157
def run(self, null=False, directory=u'.'):
2158
wt = WorkingTree.open_containing(directory)[0]
2159
self.add_cleanup(wt.lock_read().unlock)
2028
def run(self, null=False):
2029
wt = WorkingTree.open_containing(u'.')[0]
2031
self.add_cleanup(wt.unlock)
2160
2032
basis = wt.basis_tree()
2161
self.add_cleanup(basis.lock_read().unlock)
2034
self.add_cleanup(basis.unlock)
2162
2035
basis_inv = basis.inventory
2163
2036
inv = wt.inventory
2164
2037
for file_id in inv:
2165
if basis_inv.has_id(file_id):
2038
if file_id in basis_inv:
2167
2040
if inv.is_root(file_id) and len(basis_inv) == 0:
2169
2042
path = inv.id2path(file_id)
2170
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2043
if not os.access(osutils.abspath(path), os.F_OK):
2173
2046
self.outf.write(path + '\0')
2376
2246
help='Show just the specified revision.'
2377
2247
' See also "help revisionspec".'),
2379
RegistryOption('authors',
2380
'What names to list as authors - first, all or committer.',
2382
lazy_registry=('bzrlib.log', 'author_list_registry'),
2384
2249
Option('levels',
2385
2250
short_name='n',
2386
2251
help='Number of levels to display - 0 for all, 1 for flat.',
2388
2253
type=_parse_levels),
2389
2254
Option('message',
2390
2256
help='Show revisions whose message matches this '
2391
2257
'regular expression.',
2394
2259
Option('limit',
2395
2260
short_name='l',
2396
2261
help='Limit the output to the first N revisions.',
2401
2266
help='Show changes made in each revision as a patch.'),
2402
2267
Option('include-merges',
2403
2268
help='Show merged revisions like --levels 0 does.'),
2404
Option('exclude-common-ancestry',
2405
help='Display only the revisions that are not part'
2406
' of both ancestries (require -rX..Y)'
2408
Option('signatures',
2409
help='Show digital signature validity'),
2412
help='Show revisions whose properties match this '
2415
ListOption('match-message',
2416
help='Show revisions whose message matches this '
2419
ListOption('match-committer',
2420
help='Show revisions whose committer matches this '
2423
ListOption('match-author',
2424
help='Show revisions whose authors match this '
2427
ListOption('match-bugs',
2428
help='Show revisions whose bugs match this '
2432
2270
encoding_type = 'replace'
2509
2335
dir, relpath = bzrdir.BzrDir.open_containing(location)
2510
2336
b = dir.open_branch()
2511
self.add_cleanup(b.lock_read().unlock)
2338
self.add_cleanup(b.unlock)
2512
2339
rev1, rev2 = _get_revision_range(revision, b, self.name())
2514
if b.get_config().validate_signatures_in_log():
2518
if not gpg.GPGStrategy.verify_signatures_available():
2519
raise errors.GpgmeNotInstalled(None)
2521
2341
# Decide on the type of delta & diff filtering to use
2522
2342
# TODO: add an --all-files option to make this configurable & consistent
2523
2343
if not verbose:
2579
2386
direction=direction, specific_fileids=file_ids,
2580
2387
start_revision=rev1, end_revision=rev2, limit=limit,
2581
2388
message_search=message, delta_type=delta_type,
2582
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2583
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2584
signature=signatures
2389
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2586
2390
Logger(b, rqst).show(lf)
2607
2411
raise errors.BzrCommandError(
2608
2412
"bzr %s doesn't accept two revisions in different"
2609
2413
" branches." % command_name)
2610
if start_spec.spec is None:
2611
# Avoid loading all the history.
2612
rev1 = RevisionInfo(branch, None, None)
2614
rev1 = start_spec.in_history(branch)
2414
rev1 = start_spec.in_history(branch)
2615
2415
# Avoid loading all of history when we know a missing
2616
2416
# end of range means the last revision ...
2617
2417
if end_spec.spec is None:
2659
2459
tree, relpath = WorkingTree.open_containing(filename)
2660
2460
file_id = tree.path2id(relpath)
2661
2461
b = tree.branch
2662
self.add_cleanup(b.lock_read().unlock)
2463
self.add_cleanup(b.unlock)
2663
2464
touching_revs = log.find_touching_revisions(b, file_id)
2664
2465
for revno, revision_id, what in touching_revs:
2665
2466
self.outf.write("%6d %s\n" % (revno, what))
2668
2469
class cmd_ls(Command):
2669
__doc__ = """List files in a tree.
2470
"""List files in a tree.
2672
2473
_see_also = ['status', 'cat']
2678
2479
help='Recurse into subdirectories.'),
2679
2480
Option('from-root',
2680
2481
help='Print paths relative to the root of the branch.'),
2681
Option('unknown', short_name='u',
2682
help='Print unknown files.'),
2482
Option('unknown', help='Print unknown files.'),
2683
2483
Option('versioned', help='Print versioned files.',
2684
2484
short_name='V'),
2685
Option('ignored', short_name='i',
2686
help='Print ignored files.'),
2687
Option('kind', short_name='k',
2485
Option('ignored', help='Print ignored files.'),
2487
help='Write an ascii NUL (\\0) separator '
2488
'between files rather than a newline.'),
2688
2490
help='List entries of a particular kind: file, directory, symlink.',
2694
2494
@display_command
2695
2495
def run(self, revision=None, verbose=False,
2696
2496
recursive=False, from_root=False,
2697
2497
unknown=False, versioned=False, ignored=False,
2698
null=False, kind=None, show_ids=False, path=None, directory=None):
2498
null=False, kind=None, show_ids=False, path=None):
2700
2500
if kind and kind not in ('file', 'directory', 'symlink'):
2701
2501
raise errors.BzrCommandError('invalid kind specified')
2785
2586
class cmd_unknowns(Command):
2786
__doc__ = """List unknown files.
2587
"""List unknown files.
2790
2591
_see_also = ['ls']
2791
takes_options = ['directory']
2793
2593
@display_command
2794
def run(self, directory=u'.'):
2795
for f in WorkingTree.open_containing(directory)[0].unknowns():
2595
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2796
2596
self.outf.write(osutils.quotefn(f) + '\n')
2799
2599
class cmd_ignore(Command):
2800
__doc__ = """Ignore specified files or patterns.
2600
"""Ignore specified files or patterns.
2802
2602
See ``bzr help patterns`` for details on the syntax of patterns.
2873
2658
_see_also = ['status', 'ignored', 'patterns']
2874
2659
takes_args = ['name_pattern*']
2875
takes_options = ['directory',
2876
Option('default-rules',
2877
help='Display the default ignore rules that bzr uses.')
2661
Option('old-default-rules',
2662
help='Write out the ignore rules bzr < 0.9 always used.')
2880
def run(self, name_pattern_list=None, default_rules=None,
2665
def run(self, name_pattern_list=None, old_default_rules=None):
2882
2666
from bzrlib import ignores
2883
if default_rules is not None:
2884
# dump the default rules and exit
2885
for pattern in ignores.USER_DEFAULTS:
2886
self.outf.write("%s\n" % pattern)
2667
if old_default_rules is not None:
2668
# dump the rules and exit
2669
for pattern in ignores.OLD_DEFAULTS:
2888
2672
if not name_pattern_list:
2889
2673
raise errors.BzrCommandError("ignore requires at least one "
2890
"NAME_PATTERN or --default-rules.")
2674
"NAME_PATTERN or --old-default-rules")
2891
2675
name_pattern_list = [globbing.normalize_pattern(p)
2892
2676
for p in name_pattern_list]
2894
for p in name_pattern_list:
2895
if not globbing.Globster.is_pattern_valid(p):
2896
bad_patterns += ('\n %s' % p)
2898
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2899
ui.ui_factory.show_error(msg)
2900
raise errors.InvalidPattern('')
2901
2677
for name_pattern in name_pattern_list:
2902
2678
if (name_pattern[0] == '/' or
2903
2679
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2904
2680
raise errors.BzrCommandError(
2905
2681
"NAME_PATTERN should not be an absolute path")
2906
tree, relpath = WorkingTree.open_containing(directory)
2682
tree, relpath = WorkingTree.open_containing(u'.')
2907
2683
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2908
2684
ignored = globbing.Globster(name_pattern_list)
2910
self.add_cleanup(tree.lock_read().unlock)
2911
2687
for entry in tree.list_files():
2913
2689
if id is not None:
2914
2690
filename = entry[0]
2915
2691
if ignored.match(filename):
2916
matches.append(filename)
2692
matches.append(filename.encode('utf-8'))
2917
2694
if len(matches) > 0:
2918
self.outf.write("Warning: the following files are version controlled and"
2919
" match your ignore pattern:\n%s"
2920
"\nThese files will continue to be version controlled"
2921
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2695
print "Warning: the following files are version controlled and" \
2696
" match your ignore pattern:\n%s" \
2697
"\nThese files will continue to be version controlled" \
2698
" unless you 'bzr remove' them." % ("\n".join(matches),)
2924
2701
class cmd_ignored(Command):
2925
__doc__ = """List ignored files and the patterns that matched them.
2702
"""List ignored files and the patterns that matched them.
2927
2704
List all the ignored files and the ignore pattern that caused the file to
2935
2712
encoding_type = 'replace'
2936
2713
_see_also = ['ignore', 'ls']
2937
takes_options = ['directory']
2939
2715
@display_command
2940
def run(self, directory=u'.'):
2941
tree = WorkingTree.open_containing(directory)[0]
2942
self.add_cleanup(tree.lock_read().unlock)
2717
tree = WorkingTree.open_containing(u'.')[0]
2719
self.add_cleanup(tree.unlock)
2943
2720
for path, file_class, kind, file_id, entry in tree.list_files():
2944
2721
if file_class != 'I':
2951
2728
class cmd_lookup_revision(Command):
2952
__doc__ = """Lookup the revision-id from a revision-number
2729
"""Lookup the revision-id from a revision-number
2955
2732
bzr lookup-revision 33
2958
2735
takes_args = ['revno']
2959
takes_options = ['directory']
2961
2737
@display_command
2962
def run(self, revno, directory=u'.'):
2738
def run(self, revno):
2964
2740
revno = int(revno)
2965
2741
except ValueError:
2966
raise errors.BzrCommandError("not a valid revision-number: %r"
2968
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2969
self.outf.write("%s\n" % revid)
2742
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2744
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2972
2747
class cmd_export(Command):
2973
__doc__ = """Export current or past revision to a destination directory or archive.
2748
"""Export current or past revision to a destination directory or archive.
2975
2750
If no revision is specified this exports the last committed revision.
3011
2785
help="Name of the root directory inside the exported file."),
3012
Option('per-file-timestamps',
3013
help='Set modification time of files to that of the last '
3014
'revision in which it was changed.'),
3016
2787
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3017
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2788
root=None, filters=False):
3018
2789
from bzrlib.export import export
3020
2791
if branch_or_subdir is None:
3021
tree = WorkingTree.open_containing(directory)[0]
2792
tree = WorkingTree.open_containing(u'.')[0]
3022
2793
b = tree.branch
3028
2799
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3030
export(rev_tree, dest, format, root, subdir, filtered=filters,
3031
per_file_timestamps=per_file_timestamps)
2801
export(rev_tree, dest, format, root, subdir, filtered=filters)
3032
2802
except errors.NoSuchExportFormat, e:
3033
2803
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3036
2806
class cmd_cat(Command):
3037
__doc__ = """Write the contents of a file as of a given revision to standard output.
2807
"""Write the contents of a file as of a given revision to standard output.
3039
2809
If no revision is nominated, the last revision is used.
3055
2825
@display_command
3056
2826
def run(self, filename, revision=None, name_from_revision=False,
3057
filters=False, directory=None):
3058
2828
if revision is not None and len(revision) != 1:
3059
2829
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3060
2830
" one revision specifier")
3061
2831
tree, branch, relpath = \
3062
_open_directory_or_containing_tree_or_branch(filename, directory)
3063
self.add_cleanup(branch.lock_read().unlock)
2832
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2834
self.add_cleanup(branch.unlock)
3064
2835
return self._run(tree, branch, relpath, filename, revision,
3065
2836
name_from_revision, filters)
3084
2852
"%r is not present in revision %s" % (
3085
2853
filename, rev_tree.get_revision_id()))
3087
actual_file_id = old_file_id
2855
content = rev_tree.get_file_text(old_file_id)
3089
2857
cur_file_id = tree.path2id(relpath)
3090
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3091
actual_file_id = cur_file_id
3092
elif old_file_id is not None:
3093
actual_file_id = old_file_id
2859
if cur_file_id is not None:
2860
# Then try with the actual file id
2862
content = rev_tree.get_file_text(cur_file_id)
2864
except errors.NoSuchId:
2865
# The actual file id didn't exist at that time
2867
if not found and old_file_id is not None:
2868
# Finally try with the old file id
2869
content = rev_tree.get_file_text(old_file_id)
2872
# Can't be found anywhere
3095
2873
raise errors.BzrCommandError(
3096
2874
"%r is not present in revision %s" % (
3097
2875
filename, rev_tree.get_revision_id()))
3099
from bzrlib.filter_tree import ContentFilterTree
3100
filter_tree = ContentFilterTree(rev_tree,
3101
rev_tree._content_filter_stack)
3102
content = filter_tree.get_file_text(actual_file_id)
2877
from bzrlib.filters import (
2878
ContentFilterContext,
2879
filtered_output_bytes,
2881
filters = rev_tree._content_filter_stack(relpath)
2882
chunks = content.splitlines(True)
2883
content = filtered_output_bytes(chunks, filters,
2884
ContentFilterContext(relpath, rev_tree))
2886
self.outf.writelines(content)
3104
content = rev_tree.get_file_text(actual_file_id)
3106
self.outf.write(content)
2889
self.outf.write(content)
3109
2892
class cmd_local_time_offset(Command):
3110
__doc__ = """Show the offset in seconds from GMT to local time."""
2893
"""Show the offset in seconds from GMT to local time."""
3112
2895
@display_command
3114
self.outf.write("%s\n" % osutils.local_time_offset())
2897
print osutils.local_time_offset()
3118
2901
class cmd_commit(Command):
3119
__doc__ = """Commit changes into a new revision.
2902
"""Commit changes into a new revision.
3121
2904
An explanatory message needs to be given for each commit. This is
3122
2905
often done by using the --message option (getting the message from the
3170
2953
to trigger updates to external systems like bug trackers. The --fixes
3171
2954
option can be used to record the association between a revision and
3172
2955
one or more bugs. See ``bzr help bugs`` for details.
2957
A selective commit may fail in some cases where the committed
2958
tree would be invalid. Consider::
2963
bzr commit foo -m "committing foo"
2964
bzr mv foo/bar foo/baz
2967
bzr commit foo/bar -m "committing bar but not baz"
2969
In the example above, the last commit will fail by design. This gives
2970
the user the opportunity to decide whether they want to commit the
2971
rename at the same time, separately first, or not at all. (As a general
2972
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2974
# TODO: Run hooks on tree to-be-committed, and after commit.
2976
# TODO: Strict commit that fails if there are deleted files.
2977
# (what does "deleted files" mean ??)
2979
# TODO: Give better message for -s, --summary, used by tla people
2981
# XXX: verbose currently does nothing
3175
2983
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3176
2984
takes_args = ['selected*']
3237
3041
def run(self, message=None, file=None, verbose=False, selected_list=None,
3238
3042
unchanged=False, strict=False, local=False, fixes=None,
3239
author=None, show_diff=False, exclude=None, commit_time=None,
3043
author=None, show_diff=False, exclude=None, commit_time=None):
3241
3044
from bzrlib.errors import (
3242
3045
PointlessCommit,
3243
3046
ConflictsInTree,
3258
3060
raise errors.BzrCommandError(
3259
3061
"Could not parse --commit-time: " + str(e))
3063
# TODO: Need a blackbox test for invoking the external editor; may be
3064
# slightly problematic to run this cross-platform.
3066
# TODO: do more checks that the commit will succeed before
3067
# spending the user's valuable time typing a commit message.
3261
3069
properties = {}
3263
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3071
tree, selected_list = tree_files(selected_list)
3264
3072
if selected_list == ['']:
3265
3073
# workaround - commit of root of tree should be exactly the same
3266
3074
# as just default commit in that tree, and succeed even though
3291
3099
'(use --file "%(f)s" to take commit message from that file)'
3292
3100
% { 'f': message })
3293
3101
ui.ui_factory.show_warning(warning_msg)
3295
message = message.replace('\r\n', '\n')
3296
message = message.replace('\r', '\n')
3298
raise errors.BzrCommandError(
3299
"please specify either --message or --file")
3301
3103
def get_message(commit_obj):
3302
3104
"""Callback to get commit message"""
3306
my_message = f.read().decode(osutils.get_user_encoding())
3309
elif message is not None:
3310
my_message = message
3312
# No message supplied: make one up.
3313
# text is the status of the tree
3314
text = make_commit_message_template_encoded(tree,
3105
my_message = message
3106
if my_message is not None and '\r' in my_message:
3107
my_message = my_message.replace('\r\n', '\n')
3108
my_message = my_message.replace('\r', '\n')
3109
if my_message is None and not file:
3110
t = make_commit_message_template_encoded(tree,
3315
3111
selected_list, diff=show_diff,
3316
3112
output_encoding=osutils.get_user_encoding())
3317
# start_message is the template generated from hooks
3318
# XXX: Warning - looks like hooks return unicode,
3319
# make_commit_message_template_encoded returns user encoding.
3320
# We probably want to be using edit_commit_message instead to
3322
my_message = set_commit_message(commit_obj)
3323
if my_message is None:
3324
start_message = generate_commit_message_template(commit_obj)
3325
my_message = edit_commit_message_encoded(text,
3326
start_message=start_message)
3113
start_message = generate_commit_message_template(commit_obj)
3114
my_message = edit_commit_message_encoded(t,
3115
start_message=start_message)
3327
3116
if my_message is None:
3328
3117
raise errors.BzrCommandError("please specify a commit"
3329
3118
" message with either --message or --file")
3119
elif my_message and file:
3120
raise errors.BzrCommandError(
3121
"please specify either --message or --file")
3123
my_message = codecs.open(file, 'rt',
3124
osutils.get_user_encoding()).read()
3330
3125
if my_message == "":
3331
raise errors.BzrCommandError("Empty commit message specified."
3332
" Please specify a commit message with either"
3333
" --message or --file or leave a blank message"
3334
" with --message \"\".")
3126
raise errors.BzrCommandError("empty commit message specified")
3335
3127
return my_message
3337
3129
# The API permits a commit with a filter of [] to mean 'select nothing'
3345
3137
reporter=None, verbose=verbose, revprops=properties,
3346
3138
authors=author, timestamp=commit_stamp,
3347
3139
timezone=offset,
3348
exclude=tree.safe_relpath_files(exclude),
3140
exclude=safe_relpath_files(tree, exclude))
3350
3141
except PointlessCommit:
3142
# FIXME: This should really happen before the file is read in;
3143
# perhaps prepare the commit; get the message; then actually commit
3351
3144
raise errors.BzrCommandError("No changes to commit."
3352
" Please 'bzr add' the files you want to commit, or use"
3353
" --unchanged to force an empty commit.")
3145
" Use --unchanged to commit anyhow.")
3354
3146
except ConflictsInTree:
3355
3147
raise errors.BzrCommandError('Conflicts detected in working '
3356
3148
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3359
3151
raise errors.BzrCommandError("Commit refused because there are"
3360
3152
" unknown files in the working tree.")
3361
3153
except errors.BoundBranchOutOfDate, e:
3362
e.extra_help = ("\n"
3363
'To commit to master branch, run update and then commit.\n'
3364
'You can also pass --local to commit to continue working '
3154
raise errors.BzrCommandError(str(e) + "\n"
3155
'To commit to master branch, run update and then commit.\n'
3156
'You can also pass --local to commit to continue working '
3369
3160
class cmd_check(Command):
3370
__doc__ = """Validate working tree structure, branch consistency and repository history.
3161
"""Validate working tree structure, branch consistency and repository history.
3372
3163
This command checks various invariants about branch and repository storage
3373
3164
to detect data corruption or bzr bugs.
3439
3230
class cmd_upgrade(Command):
3440
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3442
When the default format has changed after a major new release of
3443
Bazaar, you may be informed during certain operations that you
3444
should upgrade. Upgrading to a newer format may improve performance
3445
or make new features available. It may however limit interoperability
3446
with older repositories or with older versions of Bazaar.
3448
If you wish to upgrade to a particular format rather than the
3449
current default, that can be specified using the --format option.
3450
As a consequence, you can use the upgrade command this way to
3451
"downgrade" to an earlier format, though some conversions are
3452
a one way process (e.g. changing from the 1.x default to the
3453
2.x default) so downgrading is not always possible.
3455
A backup.bzr.~#~ directory is created at the start of the conversion
3456
process (where # is a number). By default, this is left there on
3457
completion. If the conversion fails, delete the new .bzr directory
3458
and rename this one back in its place. Use the --clean option to ask
3459
for the backup.bzr directory to be removed on successful conversion.
3460
Alternatively, you can delete it by hand if everything looks good
3463
If the location given is a shared repository, dependent branches
3464
are also converted provided the repository converts successfully.
3465
If the conversion of a branch fails, remaining branches are still
3468
For more information on upgrades, see the Bazaar Upgrade Guide,
3469
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3231
"""Upgrade branch storage to current format.
3233
The check command or bzr developers may sometimes advise you to run
3234
this command. When the default format has changed you may also be warned
3235
during other operations to upgrade.
3472
_see_also = ['check', 'reconcile', 'formats']
3238
_see_also = ['check']
3473
3239
takes_args = ['url?']
3474
3240
takes_options = [
3475
RegistryOption('format',
3476
help='Upgrade to a specific format. See "bzr help'
3477
' formats" for details.',
3478
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3479
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3480
value_switches=True, title='Branch format'),
3482
help='Remove the backup.bzr directory if successful.'),
3484
help="Show what would be done, but don't actually do anything."),
3241
RegistryOption('format',
3242
help='Upgrade to a specific format. See "bzr help'
3243
' formats" for details.',
3244
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3245
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3246
value_switches=True, title='Branch format'),
3487
def run(self, url='.', format=None, clean=False, dry_run=False):
3249
def run(self, url='.', format=None):
3488
3250
from bzrlib.upgrade import upgrade
3489
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3491
if len(exceptions) == 1:
3492
# Compatibility with historical behavior
3251
upgrade(url, format)
3498
3254
class cmd_whoami(Command):
3499
__doc__ = """Show or set bzr user id.
3255
"""Show or set bzr user id.
3502
3258
Show the email of the current user::
3518
3273
encoding_type = 'replace'
3520
3275
@display_command
3521
def run(self, email=False, branch=False, name=None, directory=None):
3276
def run(self, email=False, branch=False, name=None):
3522
3277
if name is None:
3523
if directory is None:
3524
# use branch if we're inside one; otherwise global config
3526
c = Branch.open_containing(u'.')[0].get_config()
3527
except errors.NotBranchError:
3528
c = _mod_config.GlobalConfig()
3530
c = Branch.open(directory).get_config()
3278
# use branch if we're inside one; otherwise global config
3280
c = Branch.open_containing('.')[0].get_config()
3281
except errors.NotBranchError:
3282
c = config.GlobalConfig()
3532
3284
self.outf.write(c.user_email() + '\n')
3534
3286
self.outf.write(c.username() + '\n')
3538
raise errors.BzrCommandError("--email can only be used to display existing "
3541
3289
# display a warning if an email address isn't included in the given name.
3543
_mod_config.extract_email_address(name)
3291
config.extract_email_address(name)
3544
3292
except errors.NoEmailInUsername, e:
3545
3293
warning('"%s" does not seem to contain an email address. '
3546
3294
'This is allowed, but not recommended.', name)
3548
3296
# use global config unless --branch given
3550
if directory is None:
3551
c = Branch.open_containing(u'.')[0].get_config()
3553
c = Branch.open(directory).get_config()
3298
c = Branch.open_containing('.')[0].get_config()
3555
c = _mod_config.GlobalConfig()
3300
c = config.GlobalConfig()
3556
3301
c.set_user_option('email', name)
3559
3304
class cmd_nick(Command):
3560
__doc__ = """Print or set the branch nickname.
3305
"""Print or set the branch nickname.
3562
3307
If unset, the tree root directory name is used as the nickname.
3563
3308
To print the current nickname, execute with no argument.
3625
3369
'bzr alias --remove expects an alias to remove.')
3626
3370
# If alias is not found, print something like:
3627
3371
# unalias: foo: not found
3628
c = _mod_config.GlobalConfig()
3372
c = config.GlobalConfig()
3629
3373
c.unset_alias(alias_name)
3631
3375
@display_command
3632
3376
def print_aliases(self):
3633
3377
"""Print out the defined aliases in a similar format to bash."""
3634
aliases = _mod_config.GlobalConfig().get_aliases()
3378
aliases = config.GlobalConfig().get_aliases()
3635
3379
for key, value in sorted(aliases.iteritems()):
3636
3380
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3648
3392
def set_alias(self, alias_name, alias_command):
3649
3393
"""Save the alias in the global config."""
3650
c = _mod_config.GlobalConfig()
3394
c = config.GlobalConfig()
3651
3395
c.set_alias(alias_name, alias_command)
3654
3398
class cmd_selftest(Command):
3655
__doc__ = """Run internal test suite.
3399
"""Run internal test suite.
3657
3401
If arguments are given, they are regular expressions that say which tests
3658
3402
should run. Tests matching any expression are run, and other tests are
3707
3448
if typestring == "sftp":
3708
3449
from bzrlib.tests import stub_sftp
3709
3450
return stub_sftp.SFTPAbsoluteServer
3710
elif typestring == "memory":
3451
if typestring == "memory":
3711
3452
from bzrlib.tests import test_server
3712
3453
return memory.MemoryServer
3713
elif typestring == "fakenfs":
3454
if typestring == "fakenfs":
3714
3455
from bzrlib.tests import test_server
3715
3456
return test_server.FakeNFSServer
3716
3457
msg = "No known transport type %s. Supported types are: sftp\n" %\
3729
3470
'throughout the test suite.',
3730
3471
type=get_transport_type),
3731
3472
Option('benchmark',
3732
help='Run the benchmarks rather than selftests.',
3473
help='Run the benchmarks rather than selftests.'),
3734
3474
Option('lsprof-timed',
3735
3475
help='Generate lsprof output for benchmarked'
3736
3476
' sections of code.'),
3737
3477
Option('lsprof-tests',
3738
3478
help='Generate lsprof output for each test.'),
3479
Option('cache-dir', type=str,
3480
help='Cache intermediate benchmark output in this '
3739
3482
Option('first',
3740
3483
help='Run all tests, but run specified tests first.',
3741
3484
short_name='f',
3750
3493
Option('randomize', type=str, argname="SEED",
3751
3494
help='Randomize the order of tests using the given'
3752
3495
' seed or "now" for the current time.'),
3753
ListOption('exclude', type=str, argname="PATTERN",
3755
help='Exclude tests that match this regular'
3496
Option('exclude', type=str, argname="PATTERN",
3498
help='Exclude tests that match this regular'
3757
3500
Option('subunit',
3758
3501
help='Output test progress via subunit.'),
3759
3502
Option('strict', help='Fail on missing dependencies or '
3776
3519
def run(self, testspecs_list=None, verbose=False, one=False,
3777
3520
transport=None, benchmark=None,
3521
lsprof_timed=None, cache_dir=None,
3779
3522
first=False, list_only=False,
3780
3523
randomize=None, exclude=None, strict=False,
3781
3524
load_list=None, debugflag=None, starting_with=None, subunit=False,
3782
3525
parallel=None, lsprof_tests=False):
3783
from bzrlib import tests
3526
from bzrlib.tests import selftest
3527
import bzrlib.benchmarks as benchmarks
3528
from bzrlib.benchmarks import tree_creator
3530
# Make deprecation warnings visible, unless -Werror is set
3531
symbol_versioning.activate_deprecation_warnings(override=False)
3533
if cache_dir is not None:
3534
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3785
3535
if testspecs_list is not None:
3786
3536
pattern = '|'.join(testspecs_list)
3793
3543
raise errors.BzrCommandError("subunit not available. subunit "
3794
3544
"needs to be installed to use --subunit.")
3795
3545
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3796
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3797
# stdout, which would corrupt the subunit stream.
3798
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3799
# following code can be deleted when it's sufficiently deployed
3800
# -- vila/mgz 20100514
3801
if (sys.platform == "win32"
3802
and getattr(sys.stdout, 'fileno', None) is not None):
3804
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3806
3547
self.additional_selftest_args.setdefault(
3807
3548
'suite_decorators', []).append(parallel)
3809
raise errors.BzrCommandError(
3810
"--benchmark is no longer supported from bzr 2.2; "
3811
"use bzr-usertest instead")
3812
test_suite_factory = None
3814
exclude_pattern = None
3550
test_suite_factory = benchmarks.test_suite
3551
# Unless user explicitly asks for quiet, be verbose in benchmarks
3552
verbose = not is_quiet()
3553
# TODO: should possibly lock the history file...
3554
benchfile = open(".perf_history", "at", buffering=1)
3555
self.add_cleanup(benchfile.close)
3816
exclude_pattern = '(' + '|'.join(exclude) + ')'
3557
test_suite_factory = None
3817
3559
selftest_kwargs = {"verbose": verbose,
3818
3560
"pattern": pattern,
3819
3561
"stop_on_failure": one,
3821
3563
"test_suite_factory": test_suite_factory,
3822
3564
"lsprof_timed": lsprof_timed,
3823
3565
"lsprof_tests": lsprof_tests,
3566
"bench_history": benchfile,
3824
3567
"matching_tests_first": first,
3825
3568
"list_only": list_only,
3826
3569
"random_seed": randomize,
3827
"exclude_pattern": exclude_pattern,
3570
"exclude_pattern": exclude,
3828
3571
"strict": strict,
3829
3572
"load_list": load_list,
3830
3573
"debug_flags": debugflag,
3831
3574
"starting_with": starting_with
3833
3576
selftest_kwargs.update(self.additional_selftest_args)
3835
# Make deprecation warnings visible, unless -Werror is set
3836
cleanup = symbol_versioning.activate_deprecation_warnings(
3839
result = tests.selftest(**selftest_kwargs)
3577
result = selftest(**selftest_kwargs)
3842
3578
return int(not result)
3845
3581
class cmd_version(Command):
3846
__doc__ = """Show version of bzr."""
3582
"""Show version of bzr."""
3848
3584
encoding_type = 'replace'
3849
3585
takes_options = [
3862
3598
class cmd_rocks(Command):
3863
__doc__ = """Statement of optimism."""
3599
"""Statement of optimism."""
3867
3603
@display_command
3869
self.outf.write("It sure does!\n")
3605
print "It sure does!"
3872
3608
class cmd_find_merge_base(Command):
3873
__doc__ = """Find and print a base revision for merging two branches."""
3609
"""Find and print a base revision for merging two branches."""
3874
3610
# TODO: Options to specify revisions on either side, as if
3875
3611
# merging only part of the history.
3876
3612
takes_args = ['branch', 'other']
3883
3619
branch1 = Branch.open_containing(branch)[0]
3884
3620
branch2 = Branch.open_containing(other)[0]
3885
self.add_cleanup(branch1.lock_read().unlock)
3886
self.add_cleanup(branch2.lock_read().unlock)
3622
self.add_cleanup(branch1.unlock)
3624
self.add_cleanup(branch2.unlock)
3887
3625
last1 = ensure_null(branch1.last_revision())
3888
3626
last2 = ensure_null(branch2.last_revision())
3890
3628
graph = branch1.repository.get_graph(branch2.repository)
3891
3629
base_rev_id = graph.find_unique_lca(last1, last2)
3893
self.outf.write('merge base is revision %s\n' % base_rev_id)
3631
print 'merge base is revision %s' % base_rev_id
3896
3634
class cmd_merge(Command):
3897
__doc__ = """Perform a three-way merge.
3635
"""Perform a three-way merge.
3899
3637
The source of the merge can be specified either in the form of a branch,
3900
3638
or in the form of a path to a file containing a merge directive generated
3901
3639
with bzr send. If neither is specified, the default is the upstream branch
3902
or the branch most recently merged using --remember. The source of the
3903
merge may also be specified in the form of a path to a file in another
3904
branch: in this case, only the modifications to that file are merged into
3905
the current working tree.
3907
When merging from a branch, by default bzr will try to merge in all new
3908
work from the other branch, automatically determining an appropriate base
3909
revision. If this fails, you may need to give an explicit base.
3911
To pick a different ending revision, pass "--revision OTHER". bzr will
3912
try to merge in all new work up to and including revision OTHER.
3914
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3915
through OTHER, excluding BASE but including OTHER, will be merged. If this
3916
causes some revisions to be skipped, i.e. if the destination branch does
3917
not already contain revision BASE, such a merge is commonly referred to as
3918
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3919
cherrypicks. The changes look like a normal commit, and the history of the
3920
changes from the other branch is not stored in the commit.
3922
Revision numbers are always relative to the source branch.
3640
or the branch most recently merged using --remember.
3642
When merging a branch, by default the tip will be merged. To pick a different
3643
revision, pass --revision. If you specify two values, the first will be used as
3644
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3645
available revisions, like this is commonly referred to as "cherrypicking".
3647
Revision numbers are always relative to the branch being merged.
3649
By default, bzr will try to merge in all new work from the other
3650
branch, automatically determining an appropriate base. If this
3651
fails, you may need to give an explicit base.
3924
3653
Merge will do its best to combine the changes in two branches, but there
3925
3654
are some kinds of problems only a human can fix. When it encounters those,
3929
3658
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3931
If there is no default branch set, the first merge will set it (use
3932
--no-remember to avoid settting it). After that, you can omit the branch
3933
to use the default. To change the default, use --remember. The value will
3934
only be saved if the remote location can be accessed.
3660
If there is no default branch set, the first merge will set it. After
3661
that, you can omit the branch to use the default. To change the
3662
default, use --remember. The value will only be saved if the remote
3663
location can be accessed.
3936
3665
The results of the merge are placed into the destination working
3937
3666
directory, where they can be reviewed (with bzr diff), tested, and then
3938
3667
committed to record the result of the merge.
3940
3669
merge refuses to run if there are any uncommitted changes, unless
3941
--force is given. If --force is given, then the changes from the source
3942
will be merged with the current working tree, including any uncommitted
3943
changes in the tree. The --force option can also be used to create a
3670
--force is given. The --force option can also be used to create a
3944
3671
merge revision which has more than two parents.
3946
3673
If one would like to merge changes from the working tree of the other
3994
3721
' completely merged into the source, pull from the'
3995
3722
' source rather than merging. When this happens,'
3996
3723
' you do not need to commit the result.'),
3997
custom_help('directory',
3998
3725
help='Branch to merge into, '
3999
'rather than the one containing the working directory.'),
3726
'rather than the one containing the working directory.',
4000
3730
Option('preview', help='Instead of merging, show a diff of the'
4002
3732
Option('interactive', help='Select changes interactively.',
4074
3801
self.sanity_check_merger(merger)
4075
3802
if (merger.base_rev_id == merger.other_rev_id and
4076
3803
merger.other_rev_id is not None):
4077
# check if location is a nonexistent file (and not a branch) to
4078
# disambiguate the 'Nothing to do'
4079
if merger.interesting_files:
4080
if not merger.other_tree.has_filename(
4081
merger.interesting_files[0]):
4082
note("merger: " + str(merger))
4083
raise errors.PathsDoNotExist([location])
4084
3804
note('Nothing to do.')
4086
if pull and not preview:
4087
3807
if merger.interesting_files is not None:
4088
3808
raise errors.BzrCommandError('Cannot pull individual files')
4089
3809
if (merger.base_rev_id == tree.last_revision()):
4113
3833
def _do_preview(self, merger):
4114
3834
from bzrlib.diff import show_diff_trees
4115
3835
result_tree = self._get_preview(merger)
4116
path_encoding = osutils.get_diff_header_encoding()
4117
3836
show_diff_trees(merger.this_tree, result_tree, self.outf,
4118
old_label='', new_label='',
4119
path_encoding=path_encoding)
3837
old_label='', new_label='')
4121
3839
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4122
3840
merger.change_reporter = change_reporter
4198
3916
if other_revision_id is None:
4199
3917
other_revision_id = _mod_revision.ensure_null(
4200
3918
other_branch.last_revision())
4201
# Remember where we merge from. We need to remember if:
4202
# - user specify a location (and we don't merge from the parent
4204
# - user ask to remember or there is no previous location set to merge
4205
# from and user didn't ask to *not* remember
4206
if (user_location is not None
4208
or (remember is None
4209
and tree.branch.get_submit_branch() is None)))):
3919
# Remember where we merge from
3920
if ((remember or tree.branch.get_submit_branch() is None) and
3921
user_location is not None):
4210
3922
tree.branch.set_submit_branch(other_branch.base)
4211
# Merge tags (but don't set them in the master branch yet, the user
4212
# might revert this merge). Commit will propagate them.
4213
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3923
_merge_tags_if_possible(other_branch, tree.branch)
4214
3924
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4215
3925
other_revision_id, base_revision_id, other_branch, base_branch)
4216
3926
if other_path != '':
4315
4025
def run(self, file_list=None, merge_type=None, show_base=False,
4316
4026
reprocess=False):
4317
from bzrlib.conflicts import restore
4318
4027
if merge_type is None:
4319
4028
merge_type = _mod_merge.Merge3Merger
4320
tree, file_list = WorkingTree.open_containing_paths(file_list)
4321
self.add_cleanup(tree.lock_write().unlock)
4029
tree, file_list = tree_files(file_list)
4031
self.add_cleanup(tree.unlock)
4322
4032
parents = tree.get_parent_ids()
4323
4033
if len(parents) != 2:
4324
4034
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4379
4089
class cmd_revert(Command):
4380
__doc__ = """Revert files to a previous revision.
4090
"""Revert files to a previous revision.
4382
4092
Giving a list of files will revert only those files. Otherwise, all files
4383
4093
will be reverted. If the revision is not specified with '--revision', the
4384
4094
last committed revision is used.
4386
4096
To remove only some changes, without reverting to a prior version, use
4387
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4388
will remove the changes introduced by the second last commit (-2), without
4389
affecting the changes introduced by the last commit (-1). To remove
4390
certain changes on a hunk-by-hunk basis, see the shelve command.
4097
merge instead. For example, "merge . --revision -2..-3" will remove the
4098
changes introduced by -2, without affecting the changes introduced by -1.
4099
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4392
4101
By default, any files that have been manually changed will be backed up
4393
4102
first. (Files changed only by merge are not backed up.) Backup files have
4558
4267
theirs_only=False,
4559
4268
log_format=None, long=False, short=False, line=False,
4560
4269
show_ids=False, verbose=False, this=False, other=False,
4561
include_merges=False, revision=None, my_revision=None,
4270
include_merges=False, revision=None, my_revision=None):
4563
4271
from bzrlib.missing import find_unmerged, iter_log_revisions
4564
4272
def message(s):
4565
4273
if not is_quiet():
4595
4301
remote_branch = Branch.open(other_branch)
4596
4302
if remote_branch.base == local_branch.base:
4597
4303
remote_branch = local_branch
4599
self.add_cleanup(remote_branch.lock_read().unlock)
4305
local_branch.lock_read()
4306
self.add_cleanup(local_branch.unlock)
4601
4307
local_revid_range = _revision_range_to_revid_range(
4602
4308
_get_revision_range(my_revision, local_branch,
4311
remote_branch.lock_read()
4312
self.add_cleanup(remote_branch.unlock)
4605
4313
remote_revid_range = _revision_range_to_revid_range(
4606
4314
_get_revision_range(revision,
4607
4315
remote_branch, self.name()))
4667
4376
class cmd_pack(Command):
4668
__doc__ = """Compress the data within a repository.
4670
This operation compresses the data within a bazaar repository. As
4671
bazaar supports automatic packing of repository, this operation is
4672
normally not required to be done manually.
4674
During the pack operation, bazaar takes a backup of existing repository
4675
data, i.e. pack files. This backup is eventually removed by bazaar
4676
automatically when it is safe to do so. To save disk space by removing
4677
the backed up pack files, the --clean-obsolete-packs option may be
4680
Warning: If you use --clean-obsolete-packs and your machine crashes
4681
during or immediately after repacking, you may be left with a state
4682
where the deletion has been written to disk but the new packs have not
4683
been. In this case the repository may be unusable.
4377
"""Compress the data within a repository."""
4686
4379
_see_also = ['repositories']
4687
4380
takes_args = ['branch_or_repo?']
4689
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4692
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4382
def run(self, branch_or_repo='.'):
4693
4383
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4695
4385
branch = dir.open_branch()
4696
4386
repository = branch.repository
4697
4387
except errors.NotBranchError:
4698
4388
repository = dir.open_repository()
4699
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4702
4392
class cmd_plugins(Command):
4703
__doc__ = """List the installed plugins.
4393
"""List the installed plugins.
4705
4395
This command displays the list of installed plugins including
4706
4396
version of plugin and a short description of each.
4723
4413
@display_command
4724
4414
def run(self, verbose=False):
4725
from bzrlib import plugin
4726
# Don't give writelines a generator as some codecs don't like that
4727
self.outf.writelines(
4728
list(plugin.describe_plugins(show_paths=verbose)))
4415
import bzrlib.plugin
4416
from inspect import getdoc
4418
for name, plugin in bzrlib.plugin.plugins().items():
4419
version = plugin.__version__
4420
if version == 'unknown':
4422
name_ver = '%s %s' % (name, version)
4423
d = getdoc(plugin.module)
4425
doc = d.split('\n')[0]
4427
doc = '(no description)'
4428
result.append((name_ver, doc, plugin.path()))
4429
for name_ver, doc, path in sorted(result):
4731
4437
class cmd_testament(Command):
4732
__doc__ = """Show testament (signing-form) of a revision."""
4438
"""Show testament (signing-form) of a revision."""
4733
4439
takes_options = [
4735
4441
Option('long', help='Produce long-format testament.'),
4777
4484
Option('long', help='Show commit date in annotations.'),
4782
4488
encoding_type = 'exact'
4784
4490
@display_command
4785
4491
def run(self, filename, all=False, long=False, revision=None,
4786
show_ids=False, directory=None):
4787
from bzrlib.annotate import (
4493
from bzrlib.annotate import annotate_file, annotate_file_tree
4790
4494
wt, branch, relpath = \
4791
_open_directory_or_containing_tree_or_branch(filename, directory)
4495
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4792
4496
if wt is not None:
4793
self.add_cleanup(wt.lock_read().unlock)
4498
self.add_cleanup(wt.unlock)
4795
self.add_cleanup(branch.lock_read().unlock)
4501
self.add_cleanup(branch.unlock)
4796
4502
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4797
self.add_cleanup(tree.lock_read().unlock)
4798
if wt is not None and revision is None:
4504
self.add_cleanup(tree.unlock)
4799
4506
file_id = wt.path2id(relpath)
4801
4508
file_id = tree.path2id(relpath)
4802
4509
if file_id is None:
4803
4510
raise errors.NotVersionedError(filename)
4511
file_version = tree.inventory[file_id].revision
4804
4512
if wt is not None and revision is None:
4805
4513
# If there is a tree and we're not annotating historical
4806
4514
# versions, annotate the working tree's content.
4807
4515
annotate_file_tree(wt, file_id, self.outf, long, all,
4808
4516
show_ids=show_ids)
4810
annotate_file_tree(tree, file_id, self.outf, long, all,
4811
show_ids=show_ids, branch=branch)
4518
annotate_file(branch, file_version, file_id, long, all, self.outf,
4814
4522
class cmd_re_sign(Command):
4815
__doc__ = """Create a digital signature for an existing revision."""
4523
"""Create a digital signature for an existing revision."""
4816
4524
# TODO be able to replace existing ones.
4818
4526
hidden = True # is this right ?
4819
4527
takes_args = ['revision_id*']
4820
takes_options = ['directory', 'revision']
4528
takes_options = ['revision']
4822
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4530
def run(self, revision_id_list=None, revision=None):
4823
4531
if revision_id_list is not None and revision is not None:
4824
4532
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4825
4533
if revision_id_list is None and revision is None:
4826
4534
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4827
b = WorkingTree.open_containing(directory)[0].branch
4828
self.add_cleanup(b.lock_write().unlock)
4535
b = WorkingTree.open_containing(u'.')[0].branch
4537
self.add_cleanup(b.unlock)
4829
4538
return self._run(b, revision_id_list, revision)
4831
4540
def _run(self, b, revision_id_list, revision):
4927
4635
_see_also = ['checkouts', 'bind']
4928
4636
takes_args = []
4929
takes_options = ['directory']
4931
def run(self, directory=u'.'):
4932
b, relpath = Branch.open_containing(directory)
4640
b, relpath = Branch.open_containing(u'.')
4933
4641
if not b.unbind():
4934
4642
raise errors.BzrCommandError('Local branch is not bound')
4937
4645
class cmd_uncommit(Command):
4938
__doc__ = """Remove the last committed revision.
4646
"""Remove the last committed revision.
4940
4648
--verbose will print out what is being removed.
4941
4649
--dry-run will go through all the motions, but not actually
4981
4689
b = control.open_branch()
4983
4691
if tree is not None:
4984
self.add_cleanup(tree.lock_write().unlock)
4693
self.add_cleanup(tree.unlock)
4986
self.add_cleanup(b.lock_write().unlock)
4696
self.add_cleanup(b.unlock)
4987
4697
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4989
4699
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5022
4733
end_revision=last_revno)
5025
self.outf.write('Dry-run, pretending to remove'
5026
' the above revisions.\n')
4736
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
5028
self.outf.write('The above revision(s) will be removed.\n')
4738
ui.ui_factory.note('The above revision(s) will be removed.')
5031
if not ui.ui_factory.confirm_action(
5032
u'Uncommit these revisions',
5033
'bzrlib.builtins.uncommit',
5035
self.outf.write('Canceled\n')
4741
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4742
ui.ui_factory.note('Canceled')
5038
4745
mutter('Uncommitting from {%s} to {%s}',
5039
4746
last_rev_id, rev_id)
5040
4747
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5041
4748
revno=revno, local=local)
5042
self.outf.write('You can restore the old tip by running:\n'
5043
' bzr pull . -r revid:%s\n' % last_rev_id)
4749
ui.ui_factory.note('You can restore the old tip by running:\n'
4750
' bzr pull . -r revid:%s' % last_rev_id)
5046
4753
class cmd_break_lock(Command):
5047
__doc__ = """Break a dead lock.
5049
This command breaks a lock on a repository, branch, working directory or
4754
"""Break a dead lock on a repository, branch or working directory.
5052
4756
CAUTION: Locks should only be broken when you are sure that the process
5053
4757
holding the lock has been stopped.
5060
4764
bzr break-lock bzr+ssh://example.com/bzr/foo
5061
bzr break-lock --conf ~/.bazaar
5064
4766
takes_args = ['location?']
5067
help='LOCATION is the directory where the config lock is.'),
5069
help='Do not ask for confirmation before breaking the lock.'),
5072
def run(self, location=None, config=False, force=False):
4768
def run(self, location=None, show=False):
5073
4769
if location is None:
5074
4770
location = u'.'
5076
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5078
{'bzrlib.lockdir.break': True})
5080
conf = _mod_config.LockableConfig(file_name=location)
5083
control, relpath = bzrdir.BzrDir.open_containing(location)
5085
control.break_lock()
5086
except NotImplementedError:
4771
control, relpath = bzrdir.BzrDir.open_containing(location)
4773
control.break_lock()
4774
except NotImplementedError:
5090
4778
class cmd_wait_until_signalled(Command):
5091
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4779
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5093
4781
This just prints a line to signal when it is ready, then blocks on stdin.
5154
4843
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5155
4844
protocol=None):
5156
from bzrlib import transport
4845
from bzrlib.transport import get_transport, transport_server_registry
5157
4846
if directory is None:
5158
4847
directory = os.getcwd()
5159
4848
if protocol is None:
5160
protocol = transport.transport_server_registry.get()
4849
protocol = transport_server_registry.get()
5161
4850
host, port = self.get_host_and_port(port)
5162
4851
url = urlutils.local_path_to_url(directory)
5163
4852
if not allow_writes:
5164
4853
url = 'readonly+' + url
5165
t = transport.get_transport(url)
5166
protocol(t, host, port, inet)
4854
transport = get_transport(url)
4855
protocol(transport, host, port, inet)
5169
4858
class cmd_join(Command):
5170
__doc__ = """Combine a tree into its containing tree.
4859
"""Combine a tree into its containing tree.
5172
4861
This command requires the target tree to be in a rich-root format.
5281
4969
encoding_type = 'exact'
5283
4971
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5284
sign=False, revision=None, mail_to=None, message=None,
4972
sign=False, revision=None, mail_to=None, message=None):
5286
4973
from bzrlib.revision import ensure_null, NULL_REVISION
5287
4974
include_patch, include_bundle = {
5288
4975
'plain': (False, False),
5289
4976
'diff': (True, False),
5290
4977
'bundle': (True, True),
5292
branch = Branch.open(directory)
4979
branch = Branch.open('.')
5293
4980
stored_submit_branch = branch.get_submit_branch()
5294
4981
if submit_branch is None:
5295
4982
submit_branch = stored_submit_branch
5371
5058
source branch defaults to that containing the working directory, but can
5372
5059
be changed using --from.
5374
Both the submit branch and the public branch follow the usual behavior with
5375
respect to --remember: If there is no default location set, the first send
5376
will set it (use --no-remember to avoid settting it). After that, you can
5377
omit the location to use the default. To change the default, use
5378
--remember. The value will only be saved if the location can be accessed.
5380
5061
In order to calculate those changes, bzr must analyse the submit branch.
5381
5062
Therefore it is most efficient for the submit branch to be a local mirror.
5382
5063
If a public location is known for the submit_branch, that location is used
5453
5134
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5454
no_patch=False, revision=None, remember=None, output=None,
5135
no_patch=False, revision=None, remember=False, output=None,
5455
5136
format=None, mail_to=None, message=None, body=None,
5456
5137
strict=None, **kwargs):
5457
5138
from bzrlib.send import send
5551
5232
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5552
5233
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5554
If no tag name is specified it will be determined through the
5555
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5556
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5560
5236
_see_also = ['commit', 'tags']
5561
takes_args = ['tag_name?']
5237
takes_args = ['tag_name']
5562
5238
takes_options = [
5563
5239
Option('delete',
5564
5240
help='Delete this tag rather than placing it.',
5566
custom_help('directory',
5567
help='Branch in which to place the tag.'),
5243
help='Branch in which to place the tag.',
5568
5247
Option('force',
5569
5248
help='Replace existing tags.',
5574
def run(self, tag_name=None,
5253
def run(self, tag_name,
5580
5259
branch, relpath = Branch.open_containing(directory)
5581
self.add_cleanup(branch.lock_write().unlock)
5261
self.add_cleanup(branch.unlock)
5583
if tag_name is None:
5584
raise errors.BzrCommandError("No tag specified to delete.")
5585
5263
branch.tags.delete_tag(tag_name)
5586
note('Deleted tag %s.' % tag_name)
5264
self.outf.write('Deleted tag %s.\n' % tag_name)
5589
5267
if len(revision) != 1:
5593
5271
revision_id = revision[0].as_revision_id(branch)
5595
5273
revision_id = branch.last_revision()
5596
if tag_name is None:
5597
tag_name = branch.automatic_tag_name(revision_id)
5598
if tag_name is None:
5599
raise errors.BzrCommandError(
5600
"Please specify a tag name.")
5601
5274
if (not force) and branch.tags.has_tag(tag_name):
5602
5275
raise errors.TagAlreadyExists(tag_name)
5603
5276
branch.tags.set_tag(tag_name, revision_id)
5604
note('Created tag %s.' % tag_name)
5277
self.outf.write('Created tag %s.\n' % tag_name)
5607
5280
class cmd_tags(Command):
5608
__doc__ = """List tags.
5610
5283
This command shows a table of tag names and the revisions they reference.
5613
5286
_see_also = ['tag']
5614
5287
takes_options = [
5615
custom_help('directory',
5616
help='Branch whose tags should be displayed.'),
5617
RegistryOption('sort',
5289
help='Branch whose tags should be displayed.',
5293
RegistryOption.from_kwargs('sort',
5618
5294
'Sort tags by different criteria.', title='Sorting',
5619
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5295
alpha='Sort tags lexicographically (default).',
5296
time='Sort tags chronologically.',
5625
5302
@display_command
5626
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5627
from bzrlib.tag import tag_sort_methods
5628
5309
branch, relpath = Branch.open_containing(directory)
5630
5311
tags = branch.tags.get_tag_dict().items()
5634
self.add_cleanup(branch.lock_read().unlock)
5316
self.add_cleanup(branch.unlock)
5636
5318
graph = branch.repository.get_graph()
5637
5319
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5639
5321
# only show revisions between revid1 and revid2 (inclusive)
5640
5322
tags = [(tag, revid) for tag, revid in tags if
5641
5323
graph.is_between(revid, revid1, revid2)]
5643
sort = tag_sort_methods.get()
5326
elif sort == 'time':
5328
for tag, revid in tags:
5330
revobj = branch.repository.get_revision(revid)
5331
except errors.NoSuchRevision:
5332
timestamp = sys.maxint # place them at the end
5334
timestamp = revobj.timestamp
5335
timestamps[revid] = timestamp
5336
tags.sort(key=lambda x: timestamps[x[1]])
5645
5337
if not show_ids:
5646
5338
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5647
5339
for index, (tag, revid) in enumerate(tags):
5786
5477
def run(self, to_location=None, force=False, create_branch=False,
5787
revision=None, directory=u'.'):
5788
5479
from bzrlib import switch
5789
tree_location = directory
5790
5481
revision = _get_one_revision('switch', revision)
5791
5482
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5792
5483
if to_location is None:
5793
5484
if revision is None:
5794
5485
raise errors.BzrCommandError('You must supply either a'
5795
5486
' revision or a location')
5796
to_location = tree_location
5798
5489
branch = control_dir.open_branch()
5799
5490
had_explicit_nick = branch.get_config().has_explicit_nickname()
6022
5712
self.outf.write(" <no hooks installed>\n")
6025
class cmd_remove_branch(Command):
6026
__doc__ = """Remove a branch.
6028
This will remove the branch from the specified location but
6029
will keep any working tree or repository in place.
6033
Remove the branch at repo/trunk::
6035
bzr remove-branch repo/trunk
6039
takes_args = ["location?"]
6041
aliases = ["rmbranch"]
6043
def run(self, location=None):
6044
if location is None:
6046
branch = Branch.open_containing(location)[0]
6047
branch.bzrdir.destroy_branch()
6050
5715
class cmd_shelve(Command):
6051
__doc__ = """Temporarily set aside some changes from the current tree.
5716
"""Temporarily set aside some changes from the current tree.
6053
5718
Shelve allows you to temporarily put changes you've made "on the shelf",
6054
5719
ie. out of the way, until a later time when you can bring them back from
6071
5736
You can put multiple items on the shelf, and by default, 'unshelve' will
6072
5737
restore the most recently shelved changes.
6074
For complicated changes, it is possible to edit the changes in a separate
6075
editor program to decide what the file remaining in the working copy
6076
should look like. To do this, add the configuration option
6078
change_editor = PROGRAM @new_path @old_path
6080
where @new_path is replaced with the path of the new version of the
6081
file and @old_path is replaced with the path of the old version of
6082
the file. The PROGRAM should save the new file with the desired
6083
contents of the file in the working tree.
6087
5740
takes_args = ['file*']
6089
5742
takes_options = [
6092
5744
Option('all', help='Shelve all changes.'),
6099
5751
Option('destroy',
6100
5752
help='Destroy removed changes instead of shelving them.'),
6102
_see_also = ['unshelve', 'configuration']
5754
_see_also = ['unshelve']
6104
5756
def run(self, revision=None, all=False, file_list=None, message=None,
6105
writer=None, list=False, destroy=False, directory=None):
5757
writer=None, list=False, destroy=False):
6107
return self.run_for_list(directory=directory)
5759
return self.run_for_list()
6108
5760
from bzrlib.shelf_ui import Shelver
6109
5761
if writer is None:
6110
5762
writer = bzrlib.option.diff_writer_registry.get()
6112
5764
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6113
file_list, message, destroy=destroy, directory=directory)
5765
file_list, message, destroy=destroy)
6185
5835
To check what clean-tree will do, use --dry-run.
6187
takes_options = ['directory',
6188
Option('ignored', help='Delete all ignored files.'),
6189
Option('detritus', help='Delete conflict files, merge and revert'
5837
takes_options = [Option('ignored', help='Delete all ignored files.'),
5838
Option('detritus', help='Delete conflict files, merge'
6190
5839
' backups, and failed selftest dirs.'),
6191
5840
Option('unknown',
6192
5841
help='Delete files unknown to bzr (default).'),
6194
5843
' deleting them.'),
6195
5844
Option('force', help='Do not prompt before deleting.')]
6196
5845
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6197
force=False, directory=u'.'):
6198
5847
from bzrlib.clean_tree import clean_tree
6199
5848
if not (unknown or ignored or detritus):
6203
clean_tree(directory, unknown=unknown, ignored=ignored,
6204
detritus=detritus, dry_run=dry_run, no_prompt=force)
5852
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5853
dry_run=dry_run, no_prompt=force)
6207
5856
class cmd_reference(Command):
6208
__doc__ = """list, view and set branch locations for nested trees.
5857
"""list, view and set branch locations for nested trees.
6210
5859
If no arguments are provided, lists the branch locations for nested trees.
6211
5860
If one argument is provided, display the branch location for that tree.
6251
5900
self.outf.write('%s %s\n' % (path, location))
6254
class cmd_export_pot(Command):
6255
__doc__ = """Export command helps and error messages in po format."""
6260
from bzrlib.export_pot import export_pot
6261
export_pot(self.outf)
6264
def _register_lazy_builtins():
6265
# register lazy builtins from other modules; called at startup and should
6266
# be only called once.
6267
for (name, aliases, module_name) in [
6268
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6269
('cmd_config', [], 'bzrlib.config'),
6270
('cmd_dpush', [], 'bzrlib.foreign'),
6271
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6272
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6273
('cmd_conflicts', [], 'bzrlib.conflicts'),
6274
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6275
('cmd_verify_signatures', [],
6276
'bzrlib.commit_signature_commands'),
6277
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6279
builtin_command_registry.register_lazy(name, aliases, module_name)
5903
# these get imported and then picked up by the scan for cmd_*
5904
# TODO: Some more consistent way to split command definitions across files;
5905
# we do need to load at least some information about them to know of
5906
# aliases. ideally we would avoid loading the implementation until the
5907
# details were needed.
5908
from bzrlib.cmd_version_info import cmd_version_info
5909
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5910
from bzrlib.bundle.commands import (
5913
from bzrlib.foreign import cmd_dpush
5914
from bzrlib.sign_my_commits import cmd_sign_my_commits
added
removed
bzrlib/builtins.py
