54
55
from bzrlib.branch import Branch
55
56
from bzrlib.conflicts import ConflictList
56
from bzrlib.transport import memory
57
57
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
58
58
from bzrlib.smtp_connection import SMTPConnection
59
59
from bzrlib.workingtree import WorkingTree
62
from bzrlib.commands import (
64
builtin_command_registry,
62
from bzrlib.commands import Command, display_command
67
63
from bzrlib.option import (
74
70
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
77
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
73
def tree_files(file_list, default_branch=u'.', canonicalize=True,
80
return internal_tree_files(file_list, default_branch, canonicalize,
76
return internal_tree_files(file_list, default_branch, canonicalize,
78
except errors.FileInWrongBranch, e:
79
raise errors.BzrCommandError("%s is not in the same branch as %s" %
80
(e.path, file_list[0]))
84
83
def tree_files_for_add(file_list):
149
148
# XXX: Bad function name; should possibly also be a class method of
150
149
# WorkingTree rather than a function.
151
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
152
150
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
153
151
apply_view=True):
154
152
"""Convert command-line paths to a WorkingTree and relative paths.
156
Deprecated: use WorkingTree.open_containing_paths instead.
158
154
This is typically used for command-line processors that take one or
159
155
more filenames, and infer the workingtree that contains them.
171
167
:return: workingtree, [relative_paths]
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
169
if file_list is None or len(file_list) == 0:
170
tree = WorkingTree.open_containing(default_branch)[0]
171
if tree.supports_views() and apply_view:
172
view_files = tree.views.lookup_view()
174
file_list = view_files
175
view_str = views.view_display_str(view_files)
176
note("Ignoring files outside view. View is %s" % view_str)
177
return tree, file_list
178
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
179
return tree, safe_relpath_files(tree, file_list, canonicalize,
180
apply_view=apply_view)
183
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
184
"""Convert file_list into a list of relpaths in tree.
186
:param tree: A tree to operate on.
187
:param file_list: A list of user provided paths or None.
188
:param apply_view: if True and a view is set, apply it or check that
189
specified files are within it
190
:return: A list of relative paths.
191
:raises errors.PathNotChild: When a provided path is in a different tree
194
if file_list is None:
196
if tree.supports_views() and apply_view:
197
view_files = tree.views.lookup_view()
201
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
202
# doesn't - fix that up here before we enter the loop.
204
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
207
for filename in file_list:
209
relpath = fixer(osutils.dereference_path(filename))
210
if view_files and not osutils.is_inside_any(view_files, relpath):
211
raise errors.FileOutsideView(filename, view_files)
212
new_list.append(relpath)
213
except errors.PathNotChild:
214
raise errors.FileInWrongBranch(tree.branch, filename)
179
218
def _get_view_info_for_change_reporter(tree):
191
def _open_directory_or_containing_tree_or_branch(filename, directory):
192
"""Open the tree or branch containing the specified file, unless
193
the --directory option is used to specify a different branch."""
194
if directory is not None:
195
return (None, Branch.open(directory), filename)
196
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
199
230
# TODO: Make sure no commands unconditionally use the working directory as a
200
231
# branch. If a filename argument is used, the first of them should be used to
201
232
# specify the branch. (Perhaps this can be factored out into some kind of
306
337
takes_args = ['revision_id?']
307
takes_options = ['directory', 'revision']
338
takes_options = ['revision']
308
339
# cat-revision is more for frontends so should be exact
309
340
encoding = 'strict'
311
def print_revision(self, revisions, revid):
312
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
313
record = stream.next()
314
if record.storage_kind == 'absent':
315
raise errors.NoSuchRevision(revisions, revid)
316
revtext = record.get_bytes_as('fulltext')
317
self.outf.write(revtext.decode('utf-8'))
320
def run(self, revision_id=None, revision=None, directory=u'.'):
343
def run(self, revision_id=None, revision=None):
321
344
if revision_id is not None and revision is not None:
322
345
raise errors.BzrCommandError('You can only supply one of'
323
346
' revision_id or --revision')
324
347
if revision_id is None and revision is None:
325
348
raise errors.BzrCommandError('You must supply either'
326
349
' --revision or a revision_id')
327
b = WorkingTree.open_containing(directory)[0].branch
329
revisions = b.repository.revisions
330
if revisions is None:
331
raise errors.BzrCommandError('Repository %r does not support '
332
'access to raw revision texts')
334
b.repository.lock_read()
336
# TODO: jam 20060112 should cat-revision always output utf-8?
337
if revision_id is not None:
338
revision_id = osutils.safe_revision_id(revision_id, warn=False)
340
self.print_revision(revisions, revision_id)
341
except errors.NoSuchRevision:
342
msg = "The repository %s contains no revision %s." % (
343
b.repository.base, revision_id)
344
raise errors.BzrCommandError(msg)
345
elif revision is not None:
348
raise errors.BzrCommandError(
349
'You cannot specify a NULL revision.')
350
rev_id = rev.as_revision_id(b)
351
self.print_revision(revisions, rev_id)
353
b.repository.unlock()
350
b = WorkingTree.open_containing(u'.')[0].branch
352
# TODO: jam 20060112 should cat-revision always output utf-8?
353
if revision_id is not None:
354
revision_id = osutils.safe_revision_id(revision_id, warn=False)
356
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
357
except errors.NoSuchRevision:
358
msg = "The repository %s contains no revision %s." % (b.repository.base,
360
raise errors.BzrCommandError(msg)
361
elif revision is not None:
364
raise errors.BzrCommandError('You cannot specify a NULL'
366
rev_id = rev.as_revision_id(b)
367
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
356
370
class cmd_dump_btree(Command):
357
__doc__ = """Dump the contents of a btree index file to stdout.
371
"""Dump the contents of a btree index file to stdout.
359
373
PATH is a btree index file, it can be any URL. This includes things like
360
374
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
424
438
for node in bt.iter_all_entries():
425
439
# Node is made up of:
426
440
# (index, key, value, [references])
430
refs_as_tuples = None
432
refs_as_tuples = static_tuple.as_tuples(refs)
441
refs_as_tuples = static_tuple.as_tuples(node[3])
433
442
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
434
443
self.outf.write('%s\n' % (as_tuple,))
437
446
class cmd_remove_tree(Command):
438
__doc__ = """Remove the working tree from a given branch/checkout.
447
"""Remove the working tree from a given branch/checkout.
440
449
Since a lightweight checkout is little more than a working tree
441
450
this will refuse to run against one.
443
452
To re-create the working tree, use "bzr checkout".
445
454
_see_also = ['checkout', 'working-trees']
446
takes_args = ['location*']
455
takes_args = ['location?']
447
456
takes_options = [
449
458
help='Remove the working tree even if it has '
450
'uncommitted or shelved changes.'),
459
'uncommitted changes.'),
453
def run(self, location_list, force=False):
454
if not location_list:
457
for location in location_list:
458
d = bzrdir.BzrDir.open(location)
461
working = d.open_workingtree()
462
except errors.NoWorkingTree:
463
raise errors.BzrCommandError("No working tree to remove")
464
except errors.NotLocalUrl:
465
raise errors.BzrCommandError("You cannot remove the working tree"
468
if (working.has_changes()):
469
raise errors.UncommittedChanges(working)
470
if working.get_shelf_manager().last_shelf() is not None:
471
raise errors.ShelvedChanges(working)
473
if working.user_url != working.branch.user_url:
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
477
d.destroy_workingtree()
462
def run(self, location='.', force=False):
463
d = bzrdir.BzrDir.open(location)
466
working = d.open_workingtree()
467
except errors.NoWorkingTree:
468
raise errors.BzrCommandError("No working tree to remove")
469
except errors.NotLocalUrl:
470
raise errors.BzrCommandError("You cannot remove the working tree"
473
if (working.has_changes()):
474
raise errors.UncommittedChanges(working)
476
working_path = working.bzrdir.root_transport.base
477
branch_path = working.branch.bzrdir.root_transport.base
478
if working_path != branch_path:
479
raise errors.BzrCommandError("You cannot remove the working tree"
480
" from a lightweight checkout")
482
d.destroy_workingtree()
480
485
class cmd_revno(Command):
481
__doc__ = """Show current revision number.
486
"""Show current revision number.
483
488
This is equal to the number of revisions on this branch.
505
511
revno = ".".join(str(n) for n in revno_t)
507
513
b = Branch.open_containing(location)[0]
508
self.add_cleanup(b.lock_read().unlock)
515
self.add_cleanup(b.unlock)
509
516
revno = b.revno()
510
517
self.cleanup_now()
511
518
self.outf.write(str(revno) + '\n')
514
521
class cmd_revision_info(Command):
515
__doc__ = """Show revision number and revision id for a given revision identifier.
522
"""Show revision number and revision id for a given revision identifier.
518
525
takes_args = ['revision_info*']
519
526
takes_options = [
521
custom_help('directory',
522
529
help='Branch to examine, '
523
'rather than the one containing the working directory.'),
530
'rather than the one containing the working directory.',
524
534
Option('tree', help='Show revno of working tree'),
665
678
def run(self, dir_list):
666
679
for d in dir_list:
667
681
wt, dd = WorkingTree.open_containing(d)
668
base = os.path.dirname(dd)
669
id = wt.path2id(base)
673
self.outf.write('added %s\n' % d)
675
raise errors.NotVersionedError(path=base)
683
self.outf.write('added %s\n' % d)
678
686
class cmd_relpath(Command):
679
__doc__ = """Show path of a file relative to root"""
687
"""Show path of a file relative to root"""
681
689
takes_args = ['filename']
717
725
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
719
727
revision = _get_one_revision('inventory', revision)
720
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
721
self.add_cleanup(work_tree.lock_read().unlock)
728
work_tree, file_list = tree_files(file_list)
729
work_tree.lock_read()
730
self.add_cleanup(work_tree.unlock)
722
731
if revision is not None:
723
732
tree = revision.as_tree(work_tree.branch)
725
734
extra_trees = [work_tree]
726
self.add_cleanup(tree.lock_read().unlock)
736
self.add_cleanup(tree.unlock)
789
799
if len(names_list) < 2:
790
800
raise errors.BzrCommandError("missing file argument")
791
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
792
self.add_cleanup(tree.lock_tree_write().unlock)
801
tree, rel_names = tree_files(names_list, canonicalize=False)
802
tree.lock_tree_write()
803
self.add_cleanup(tree.unlock)
793
804
self._run(tree, names_list, rel_names, after)
795
806
def run_auto(self, names_list, after, dry_run):
800
811
raise errors.BzrCommandError('--after cannot be specified with'
802
work_tree, file_list = WorkingTree.open_containing_paths(
803
names_list, default_directory='.')
804
self.add_cleanup(work_tree.lock_tree_write().unlock)
813
work_tree, file_list = tree_files(names_list, default_branch='.')
814
work_tree.lock_tree_write()
815
self.add_cleanup(work_tree.unlock)
805
816
rename_map.RenameMap.guess_renames(work_tree, dry_run)
807
818
def _run(self, tree, names_list, rel_names, after):
915
926
takes_options = ['remember', 'overwrite', 'revision',
916
927
custom_help('verbose',
917
928
help='Show logs of pulled revisions.'),
918
custom_help('directory',
919
930
help='Branch to pull into, '
920
'rather than the one containing the working directory.'),
931
'rather than the one containing the working directory.',
922
936
help="Perform a local pull in a bound "
923
937
"branch. Local pulls are not applied to "
980
992
branch_from = Branch.open(location,
981
993
possible_transports=possible_transports)
982
self.add_cleanup(branch_from.lock_read().unlock)
984
995
if branch_to.get_parent() is None or remember:
985
996
branch_to.set_parent(branch_from.base)
998
if branch_from is not branch_to:
999
branch_from.lock_read()
1000
self.add_cleanup(branch_from.unlock)
987
1001
if revision is not None:
988
1002
revision_id = revision.as_revision_id(branch_from)
1004
branch_to.lock_write()
1005
self.add_cleanup(branch_to.unlock)
990
1006
if tree_to is not None:
991
1007
view_info = _get_view_info_for_change_reporter(tree_to)
992
1008
change_reporter = delta._ChangeReporter(
1037
1053
Option('create-prefix',
1038
1054
help='Create the path leading up to the branch '
1039
1055
'if it does not already exist.'),
1040
custom_help('directory',
1041
1057
help='Branch to push from, '
1042
'rather than the one containing the working directory.'),
1058
'rather than the one containing the working directory.',
1043
1062
Option('use-existing-dir',
1044
1063
help='By default push will fail if the target'
1045
1064
' directory exists, but does not already'
1071
1090
# Get the source branch
1072
1091
(tree, br_from,
1073
1092
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1094
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1095
if strict is None: strict = True # default value
1074
1096
# Get the tip's revision_id
1075
1097
revision = _get_one_revision('push', revision)
1076
1098
if revision is not None:
1077
1099
revision_id = revision.in_history(br_from).rev_id
1079
1101
revision_id = None
1080
if tree is not None and revision_id is None:
1081
tree.check_changed_or_out_of_date(
1082
strict, 'push_strict',
1083
more_error='Use --no-strict to force the push.',
1084
more_warning='Uncommitted changes will not be pushed.')
1102
if strict and tree is not None and revision_id is None:
1103
if (tree.has_changes()):
1104
raise errors.UncommittedChanges(
1105
tree, more='Use --no-strict to force the push.')
1106
if tree.last_revision() != tree.branch.last_revision():
1107
# The tree has lost sync with its branch, there is little
1108
# chance that the user is aware of it but he can still force
1109
# the push with --no-strict
1110
raise errors.OutOfDateTree(
1111
tree, more='Use --no-strict to force the push.')
1085
1113
# Get the stacked_on branch, if any
1086
1114
if stacked_on is not None:
1087
1115
stacked_on = urlutils.normalize_url(stacked_on)
1135
1163
_see_also = ['checkout']
1136
1164
takes_args = ['from_location', 'to_location?']
1137
takes_options = ['revision',
1138
Option('hardlink', help='Hard-link working tree files where possible.'),
1139
Option('files-from', type=str,
1140
help="Get file contents from this tree."),
1165
takes_options = ['revision', Option('hardlink',
1166
help='Hard-link working tree files where possible.'),
1141
1167
Option('no-tree',
1142
1168
help="Create a branch without a working-tree."),
1143
1169
Option('switch',
1162
1188
def run(self, from_location, to_location=None, revision=None,
1163
1189
hardlink=False, stacked=False, standalone=False, no_tree=False,
1164
use_existing_dir=False, switch=False, bind=False,
1190
use_existing_dir=False, switch=False, bind=False):
1166
1191
from bzrlib import switch as _mod_switch
1167
1192
from bzrlib.tag import _merge_tags_if_possible
1168
1193
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1170
if not (hardlink or files_from):
1171
# accelerator_tree is usually slower because you have to read N
1172
# files (no readahead, lots of seeks, etc), but allow the user to
1173
# explicitly request it
1174
accelerator_tree = None
1175
if files_from is not None and files_from != from_location:
1176
accelerator_tree = WorkingTree.open(files_from)
1177
1195
revision = _get_one_revision('branch', revision)
1178
self.add_cleanup(br_from.lock_read().unlock)
1197
self.add_cleanup(br_from.unlock)
1179
1198
if revision is not None:
1180
1199
revision_id = revision.as_revision_id(br_from)
1286
1305
to_location = branch_location
1287
1306
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1288
1307
branch_location)
1289
if not (hardlink or files_from):
1290
# accelerator_tree is usually slower because you have to read N
1291
# files (no readahead, lots of seeks, etc), but allow the user to
1292
# explicitly request it
1293
accelerator_tree = None
1294
1308
revision = _get_one_revision('checkout', revision)
1295
if files_from is not None and files_from != branch_location:
1309
if files_from is not None:
1296
1310
accelerator_tree = WorkingTree.open(files_from)
1297
1311
if revision is not None:
1298
1312
revision_id = revision.as_revision_id(source)
1373
1389
master = branch.get_master_branch(
1374
1390
possible_transports=possible_transports)
1375
1391
if master is not None:
1376
1393
branch_location = master.base
1395
tree.lock_tree_write()
1379
1396
branch_location = tree.branch.base
1380
tree.lock_tree_write()
1381
1397
self.add_cleanup(tree.unlock)
1382
1398
# get rid of the final '/' and be ready for display
1383
branch_location = urlutils.unescape_for_display(
1384
branch_location.rstrip('/'),
1399
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1386
1401
existing_pending_merges = tree.get_parent_ids()[1:]
1387
1402
if master is None:
1397
1412
revision_id = branch.last_revision()
1398
1413
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1399
revno = branch.revision_id_to_dotted_revno(revision_id)
1400
note("Tree is up to date at revision %s of branch %s" %
1401
('.'.join(map(str, revno)), branch_location))
1414
revno = branch.revision_id_to_revno(revision_id)
1415
note("Tree is up to date at revision %d of branch %s" %
1416
(revno, branch_location))
1403
1418
view_info = _get_view_info_for_change_reporter(tree)
1404
1419
change_reporter = delta._ChangeReporter(
1416
1431
"bzr update --revision only works"
1417
1432
" for a revision in the branch history"
1418
1433
% (e.revision))
1419
revno = tree.branch.revision_id_to_dotted_revno(
1434
revno = tree.branch.revision_id_to_revno(
1420
1435
_mod_revision.ensure_null(tree.last_revision()))
1421
note('Updated to revision %s of branch %s' %
1422
('.'.join(map(str, revno)), branch_location))
1423
parent_ids = tree.get_parent_ids()
1424
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1436
note('Updated to revision %d of branch %s' %
1437
(revno, branch_location))
1438
if tree.get_parent_ids()[1:] != existing_pending_merges:
1425
1439
note('Your local commits will now show as pending merges with '
1426
1440
"'bzr status', and can be committed with 'bzr commit'.")
1427
1441
if conflicts != 0:
1477
1491
class cmd_remove(Command):
1478
__doc__ = """Remove files or directories.
1492
"""Remove files or directories.
1480
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1481
delete them if they can easily be recovered using revert otherwise they
1482
will be backed up (adding an extention of the form .~#~). If no options or
1483
parameters are given Bazaar will scan for files that are being tracked by
1484
Bazaar but missing in your tree and stop tracking them for you.
1494
This makes bzr stop tracking changes to the specified files. bzr will delete
1495
them if they can easily be recovered using revert. If no options or
1496
parameters are given bzr will scan for files that are being tracked by bzr
1497
but missing in your tree and stop tracking them for you.
1486
1499
takes_args = ['file*']
1487
1500
takes_options = ['verbose',
1489
1502
RegistryOption.from_kwargs('file-deletion-strategy',
1490
1503
'The file deletion mode to be used.',
1491
1504
title='Deletion Strategy', value_switches=True, enum_switch=False,
1492
safe='Backup changed files (default).',
1505
safe='Only delete files if they can be'
1506
' safely recovered (default).',
1493
1507
keep='Delete from bzr but leave the working copy.',
1494
1508
force='Delete all the specified files, even if they can not be '
1495
1509
'recovered and even if they are non-empty directories.')]
1499
1513
def run(self, file_list, verbose=False, new=False,
1500
1514
file_deletion_strategy='safe'):
1501
tree, file_list = WorkingTree.open_containing_paths(file_list)
1515
tree, file_list = tree_files(file_list)
1503
1517
if file_list is not None:
1504
1518
file_list = [f for f in file_list]
1506
self.add_cleanup(tree.lock_write().unlock)
1521
self.add_cleanup(tree.unlock)
1507
1522
# Heuristics should probably all move into tree.remove_smart or
1593
1608
_see_also = ['check']
1594
1609
takes_args = ['branch?']
1596
Option('canonicalize-chks',
1597
help='Make sure CHKs are in canonical form (repairs '
1602
def run(self, branch=".", canonicalize_chks=False):
1611
def run(self, branch="."):
1603
1612
from bzrlib.reconcile import reconcile
1604
1613
dir = bzrdir.BzrDir.open(branch)
1605
reconcile(dir, canonicalize_chks=canonicalize_chks)
1608
1617
class cmd_revision_history(Command):
1609
__doc__ = """Display the list of revision ids on a branch."""
1618
"""Display the list of revision ids on a branch."""
1611
1620
_see_also = ['log']
1612
1621
takes_args = ['location?']
1912
1917
help='Use this command to compare files.',
1915
RegistryOption('format',
1916
help='Diff format to use.',
1917
lazy_registry=('bzrlib.diff', 'format_registry'),
1918
value_switches=False, title='Diff format'),
1920
1921
aliases = ['di', 'dif']
1921
1922
encoding_type = 'exact'
1923
1924
@display_command
1924
1925
def run(self, revision=None, file_list=None, diff_options=None,
1925
prefix=None, old=None, new=None, using=None, format=None):
1926
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1926
prefix=None, old=None, new=None, using=None):
1927
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1929
1929
if (prefix is None) or (prefix == '0'):
1930
1930
# diff -p0 format
1944
1944
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1945
1945
' one or two revision specifiers')
1947
if using is not None and format is not None:
1948
raise errors.BzrCommandError('--using and --format are mutually '
1951
1947
(old_tree, new_tree,
1952
1948
old_branch, new_branch,
1953
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1954
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1955
# GNU diff on Windows uses ANSI encoding for filenames
1956
path_encoding = osutils.get_diff_header_encoding()
1949
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1950
file_list, revision, old, new, apply_view=True)
1957
1951
return show_diff_trees(old_tree, new_tree, sys.stdout,
1958
1952
specific_files=specific_files,
1959
1953
external_diff_options=diff_options,
1960
1954
old_label=old_label, new_label=new_label,
1961
extra_trees=extra_trees,
1962
path_encoding=path_encoding,
1955
extra_trees=extra_trees, using=using)
1967
1958
class cmd_deleted(Command):
1968
__doc__ = """List files deleted in the working tree.
1959
"""List files deleted in the working tree.
1970
1961
# TODO: Show files deleted since a previous revision, or
1971
1962
# between two revisions.
1974
1965
# level of effort but possibly much less IO. (Or possibly not,
1975
1966
# if the directories are very large...)
1976
1967
_see_also = ['status', 'ls']
1977
takes_options = ['directory', 'show-ids']
1968
takes_options = ['show-ids']
1979
1970
@display_command
1980
def run(self, show_ids=False, directory=u'.'):
1981
tree = WorkingTree.open_containing(directory)[0]
1982
self.add_cleanup(tree.lock_read().unlock)
1971
def run(self, show_ids=False):
1972
tree = WorkingTree.open_containing(u'.')[0]
1974
self.add_cleanup(tree.unlock)
1983
1975
old = tree.basis_tree()
1984
self.add_cleanup(old.lock_read().unlock)
1977
self.add_cleanup(old.unlock)
1985
1978
for path, ie in old.inventory.iter_entries():
1986
1979
if not tree.has_id(ie.file_id):
1987
1980
self.outf.write(path)
1994
1987
class cmd_modified(Command):
1995
__doc__ = """List files modified in working tree.
1988
"""List files modified in working tree.
1999
1992
_see_also = ['status', 'ls']
2000
takes_options = ['directory', 'null']
1995
help='Write an ascii NUL (\\0) separator '
1996
'between files rather than a newline.')
2002
1999
@display_command
2003
def run(self, null=False, directory=u'.'):
2004
tree = WorkingTree.open_containing(directory)[0]
2000
def run(self, null=False):
2001
tree = WorkingTree.open_containing(u'.')[0]
2005
2002
td = tree.changes_from(tree.basis_tree())
2006
2003
for path, id, kind, text_modified, meta_modified in td.modified:
2013
2010
class cmd_added(Command):
2014
__doc__ = """List files added in working tree.
2011
"""List files added in working tree.
2018
2015
_see_also = ['status', 'ls']
2019
takes_options = ['directory', 'null']
2018
help='Write an ascii NUL (\\0) separator '
2019
'between files rather than a newline.')
2021
2022
@display_command
2022
def run(self, null=False, directory=u'.'):
2023
wt = WorkingTree.open_containing(directory)[0]
2024
self.add_cleanup(wt.lock_read().unlock)
2023
def run(self, null=False):
2024
wt = WorkingTree.open_containing(u'.')[0]
2026
self.add_cleanup(wt.unlock)
2025
2027
basis = wt.basis_tree()
2026
self.add_cleanup(basis.lock_read().unlock)
2029
self.add_cleanup(basis.unlock)
2027
2030
basis_inv = basis.inventory
2028
2031
inv = wt.inventory
2029
2032
for file_id in inv:
2188
2191
:Tips & tricks:
2190
2193
GUI tools and IDEs are often better at exploring history than command
2191
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2192
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2193
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2194
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2194
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2195
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2196
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2198
Web interfaces are often better at exploring history than command line
2199
tools, particularly for branches on servers. You may prefer Loggerhead
2200
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2196
2202
You may find it useful to add the aliases below to ``bazaar.conf``::
2238
2244
help='Show just the specified revision.'
2239
2245
' See also "help revisionspec".'),
2241
RegistryOption('authors',
2242
'What names to list as authors - first, all or committer.',
2244
lazy_registry=('bzrlib.log', 'author_list_registry'),
2246
2247
Option('levels',
2247
2248
short_name='n',
2248
2249
help='Number of levels to display - 0 for all, 1 for flat.',
2318
2308
# find the file ids to log and check for directory filtering
2319
2309
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2320
revision, file_list, self.add_cleanup)
2310
revision, file_list)
2311
self.add_cleanup(b.unlock)
2321
2312
for relpath, file_id, kind in file_info_list:
2322
2313
if file_id is None:
2323
2314
raise errors.BzrCommandError(
2393
2384
direction=direction, specific_fileids=file_ids,
2394
2385
start_revision=rev1, end_revision=rev2, limit=limit,
2395
2386
message_search=message, delta_type=delta_type,
2396
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2397
exclude_common_ancestry=exclude_common_ancestry,
2387
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2399
2388
Logger(b, rqst).show(lf)
2420
2409
raise errors.BzrCommandError(
2421
2410
"bzr %s doesn't accept two revisions in different"
2422
2411
" branches." % command_name)
2423
if start_spec.spec is None:
2424
# Avoid loading all the history.
2425
rev1 = RevisionInfo(branch, None, None)
2427
rev1 = start_spec.in_history(branch)
2412
rev1 = start_spec.in_history(branch)
2428
2413
# Avoid loading all of history when we know a missing
2429
2414
# end of range means the last revision ...
2430
2415
if end_spec.spec is None:
2472
2457
tree, relpath = WorkingTree.open_containing(filename)
2473
2458
file_id = tree.path2id(relpath)
2474
2459
b = tree.branch
2475
self.add_cleanup(b.lock_read().unlock)
2461
self.add_cleanup(b.unlock)
2476
2462
touching_revs = log.find_touching_revisions(b, file_id)
2477
2463
for revno, revision_id, what in touching_revs:
2478
2464
self.outf.write("%6d %s\n" % (revno, what))
2481
2467
class cmd_ls(Command):
2482
__doc__ = """List files in a tree.
2468
"""List files in a tree.
2485
2471
_see_also = ['status', 'cat']
2491
2477
help='Recurse into subdirectories.'),
2492
2478
Option('from-root',
2493
2479
help='Print paths relative to the root of the branch.'),
2494
Option('unknown', short_name='u',
2495
help='Print unknown files.'),
2480
Option('unknown', help='Print unknown files.'),
2496
2481
Option('versioned', help='Print versioned files.',
2497
2482
short_name='V'),
2498
Option('ignored', short_name='i',
2499
help='Print ignored files.'),
2500
Option('kind', short_name='k',
2483
Option('ignored', help='Print ignored files.'),
2485
help='Write an ascii NUL (\\0) separator '
2486
'between files rather than a newline.'),
2501
2488
help='List entries of a particular kind: file, directory, symlink.',
2507
2492
@display_command
2508
2493
def run(self, revision=None, verbose=False,
2509
2494
recursive=False, from_root=False,
2510
2495
unknown=False, versioned=False, ignored=False,
2511
null=False, kind=None, show_ids=False, path=None, directory=None):
2496
null=False, kind=None, show_ids=False, path=None):
2513
2498
if kind and kind not in ('file', 'directory', 'symlink'):
2514
2499
raise errors.BzrCommandError('invalid kind specified')
2548
2533
view_str = views.view_display_str(view_files)
2549
2534
note("Ignoring files outside view. View is %s" % view_str)
2551
self.add_cleanup(tree.lock_read().unlock)
2537
self.add_cleanup(tree.unlock)
2552
2538
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2553
2539
from_dir=relpath, recursive=recursive):
2554
2540
# Apply additional masking
2598
2584
class cmd_unknowns(Command):
2599
__doc__ = """List unknown files.
2585
"""List unknown files.
2603
2589
_see_also = ['ls']
2604
takes_options = ['directory']
2606
2591
@display_command
2607
def run(self, directory=u'.'):
2608
for f in WorkingTree.open_containing(directory)[0].unknowns():
2593
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2609
2594
self.outf.write(osutils.quotefn(f) + '\n')
2612
2597
class cmd_ignore(Command):
2613
__doc__ = """Ignore specified files or patterns.
2598
"""Ignore specified files or patterns.
2615
2600
See ``bzr help patterns`` for details on the syntax of patterns.
2625
2610
using this command or directly by using an editor, be sure to commit
2628
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2629
the global ignore file can be found in the application data directory as
2630
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2631
Global ignores are not touched by this command. The global ignore file
2632
can be edited directly using an editor.
2634
2613
Patterns prefixed with '!' are exceptions to ignore patterns and take
2635
2614
precedence over regular ignores. Such exceptions are used to specify
2636
2615
files that should be versioned which would otherwise be ignored.
2677
2656
_see_also = ['status', 'ignored', 'patterns']
2678
2657
takes_args = ['name_pattern*']
2679
takes_options = ['directory',
2680
Option('default-rules',
2681
help='Display the default ignore rules that bzr uses.')
2659
Option('old-default-rules',
2660
help='Write out the ignore rules bzr < 0.9 always used.')
2684
def run(self, name_pattern_list=None, default_rules=None,
2663
def run(self, name_pattern_list=None, old_default_rules=None):
2686
2664
from bzrlib import ignores
2687
if default_rules is not None:
2688
# dump the default rules and exit
2689
for pattern in ignores.USER_DEFAULTS:
2690
self.outf.write("%s\n" % pattern)
2665
if old_default_rules is not None:
2666
# dump the rules and exit
2667
for pattern in ignores.OLD_DEFAULTS:
2692
2670
if not name_pattern_list:
2693
2671
raise errors.BzrCommandError("ignore requires at least one "
2694
"NAME_PATTERN or --default-rules.")
2672
"NAME_PATTERN or --old-default-rules")
2695
2673
name_pattern_list = [globbing.normalize_pattern(p)
2696
2674
for p in name_pattern_list]
2698
for p in name_pattern_list:
2699
if not globbing.Globster.is_pattern_valid(p):
2700
bad_patterns += ('\n %s' % p)
2702
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2703
ui.ui_factory.show_error(msg)
2704
raise errors.InvalidPattern('')
2705
2675
for name_pattern in name_pattern_list:
2706
2676
if (name_pattern[0] == '/' or
2707
2677
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2708
2678
raise errors.BzrCommandError(
2709
2679
"NAME_PATTERN should not be an absolute path")
2710
tree, relpath = WorkingTree.open_containing(directory)
2680
tree, relpath = WorkingTree.open_containing(u'.')
2711
2681
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2712
2682
ignored = globbing.Globster(name_pattern_list)
2714
self.add_cleanup(tree.lock_read().unlock)
2715
2685
for entry in tree.list_files():
2717
2687
if id is not None:
2718
2688
filename = entry[0]
2719
2689
if ignored.match(filename):
2720
matches.append(filename)
2690
matches.append(filename.encode('utf-8'))
2721
2692
if len(matches) > 0:
2722
self.outf.write("Warning: the following files are version controlled and"
2723
" match your ignore pattern:\n%s"
2724
"\nThese files will continue to be version controlled"
2725
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2693
print "Warning: the following files are version controlled and" \
2694
" match your ignore pattern:\n%s" \
2695
"\nThese files will continue to be version controlled" \
2696
" unless you 'bzr remove' them." % ("\n".join(matches),)
2728
2699
class cmd_ignored(Command):
2729
__doc__ = """List ignored files and the patterns that matched them.
2700
"""List ignored files and the patterns that matched them.
2731
2702
List all the ignored files and the ignore pattern that caused the file to
2739
2710
encoding_type = 'replace'
2740
2711
_see_also = ['ignore', 'ls']
2741
takes_options = ['directory']
2743
2713
@display_command
2744
def run(self, directory=u'.'):
2745
tree = WorkingTree.open_containing(directory)[0]
2746
self.add_cleanup(tree.lock_read().unlock)
2715
tree = WorkingTree.open_containing(u'.')[0]
2717
self.add_cleanup(tree.unlock)
2747
2718
for path, file_class, kind, file_id, entry in tree.list_files():
2748
2719
if file_class != 'I':
2755
2726
class cmd_lookup_revision(Command):
2756
__doc__ = """Lookup the revision-id from a revision-number
2727
"""Lookup the revision-id from a revision-number
2759
2730
bzr lookup-revision 33
2762
2733
takes_args = ['revno']
2763
takes_options = ['directory']
2765
2735
@display_command
2766
def run(self, revno, directory=u'.'):
2736
def run(self, revno):
2768
2738
revno = int(revno)
2769
2739
except ValueError:
2770
raise errors.BzrCommandError("not a valid revision-number: %r"
2772
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2773
self.outf.write("%s\n" % revid)
2740
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2742
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2776
2745
class cmd_export(Command):
2777
__doc__ = """Export current or past revision to a destination directory or archive.
2746
"""Export current or past revision to a destination directory or archive.
2779
2748
If no revision is specified this exports the last committed revision.
2814
2783
help="Name of the root directory inside the exported file."),
2815
Option('per-file-timestamps',
2816
help='Set modification time of files to that of the last '
2817
'revision in which it was changed.'),
2819
2785
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2820
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2786
root=None, filters=False):
2821
2787
from bzrlib.export import export
2823
2789
if branch_or_subdir is None:
2824
tree = WorkingTree.open_containing(directory)[0]
2790
tree = WorkingTree.open_containing(u'.')[0]
2825
2791
b = tree.branch
2831
2797
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2833
export(rev_tree, dest, format, root, subdir, filtered=filters,
2834
per_file_timestamps=per_file_timestamps)
2799
export(rev_tree, dest, format, root, subdir, filtered=filters)
2835
2800
except errors.NoSuchExportFormat, e:
2836
2801
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2804
class cmd_cat(Command):
2840
__doc__ = """Write the contents of a file as of a given revision to standard output.
2805
"""Write the contents of a file as of a given revision to standard output.
2842
2807
If no revision is nominated, the last revision is used.
2858
2823
@display_command
2859
2824
def run(self, filename, revision=None, name_from_revision=False,
2860
filters=False, directory=None):
2861
2826
if revision is not None and len(revision) != 1:
2862
2827
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2863
2828
" one revision specifier")
2864
2829
tree, branch, relpath = \
2865
_open_directory_or_containing_tree_or_branch(filename, directory)
2866
self.add_cleanup(branch.lock_read().unlock)
2830
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2832
self.add_cleanup(branch.unlock)
2867
2833
return self._run(tree, branch, relpath, filename, revision,
2868
2834
name_from_revision, filters)
2923
2890
class cmd_local_time_offset(Command):
2924
__doc__ = """Show the offset in seconds from GMT to local time."""
2891
"""Show the offset in seconds from GMT to local time."""
2926
2893
@display_command
2928
self.outf.write("%s\n" % osutils.local_time_offset())
2895
print osutils.local_time_offset()
2932
2899
class cmd_commit(Command):
2933
__doc__ = """Commit changes into a new revision.
2900
"""Commit changes into a new revision.
2935
2902
An explanatory message needs to be given for each commit. This is
2936
2903
often done by using the --message option (getting the message from the
3130
3097
'(use --file "%(f)s" to take commit message from that file)'
3131
3098
% { 'f': message })
3132
3099
ui.ui_factory.show_warning(warning_msg)
3134
message = message.replace('\r\n', '\n')
3135
message = message.replace('\r', '\n')
3137
raise errors.BzrCommandError(
3138
"please specify either --message or --file")
3140
3101
def get_message(commit_obj):
3141
3102
"""Callback to get commit message"""
3145
my_message = f.read().decode(osutils.get_user_encoding())
3148
elif message is not None:
3149
my_message = message
3151
# No message supplied: make one up.
3152
# text is the status of the tree
3153
text = make_commit_message_template_encoded(tree,
3103
my_message = message
3104
if my_message is not None and '\r' in my_message:
3105
my_message = my_message.replace('\r\n', '\n')
3106
my_message = my_message.replace('\r', '\n')
3107
if my_message is None and not file:
3108
t = make_commit_message_template_encoded(tree,
3154
3109
selected_list, diff=show_diff,
3155
3110
output_encoding=osutils.get_user_encoding())
3156
# start_message is the template generated from hooks
3157
# XXX: Warning - looks like hooks return unicode,
3158
# make_commit_message_template_encoded returns user encoding.
3159
# We probably want to be using edit_commit_message instead to
3161
3111
start_message = generate_commit_message_template(commit_obj)
3162
my_message = edit_commit_message_encoded(text,
3112
my_message = edit_commit_message_encoded(t,
3163
3113
start_message=start_message)
3164
3114
if my_message is None:
3165
3115
raise errors.BzrCommandError("please specify a commit"
3166
3116
" message with either --message or --file")
3117
elif my_message and file:
3118
raise errors.BzrCommandError(
3119
"please specify either --message or --file")
3121
my_message = codecs.open(file, 'rt',
3122
osutils.get_user_encoding()).read()
3167
3123
if my_message == "":
3168
3124
raise errors.BzrCommandError("empty commit message specified")
3169
3125
return my_message
3179
3135
reporter=None, verbose=verbose, revprops=properties,
3180
3136
authors=author, timestamp=commit_stamp,
3181
3137
timezone=offset,
3182
exclude=tree.safe_relpath_files(exclude))
3138
exclude=safe_relpath_files(tree, exclude))
3183
3139
except PointlessCommit:
3140
# FIXME: This should really happen before the file is read in;
3141
# perhaps prepare the commit; get the message; then actually commit
3184
3142
raise errors.BzrCommandError("No changes to commit."
3185
3143
" Use --unchanged to commit anyhow.")
3186
3144
except ConflictsInTree:
3191
3149
raise errors.BzrCommandError("Commit refused because there are"
3192
3150
" unknown files in the working tree.")
3193
3151
except errors.BoundBranchOutOfDate, e:
3194
e.extra_help = ("\n"
3195
'To commit to master branch, run update and then commit.\n'
3196
'You can also pass --local to commit to continue working '
3152
raise errors.BzrCommandError(str(e) + "\n"
3153
'To commit to master branch, run update and then commit.\n'
3154
'You can also pass --local to commit to continue working '
3201
3158
class cmd_check(Command):
3202
__doc__ = """Validate working tree structure, branch consistency and repository history.
3159
"""Validate working tree structure, branch consistency and repository history.
3204
3161
This command checks various invariants about branch and repository storage
3205
3162
to detect data corruption or bzr bugs.
3315
3271
encoding_type = 'replace'
3317
3273
@display_command
3318
def run(self, email=False, branch=False, name=None, directory=None):
3274
def run(self, email=False, branch=False, name=None):
3319
3275
if name is None:
3320
if directory is None:
3321
# use branch if we're inside one; otherwise global config
3323
c = Branch.open_containing(u'.')[0].get_config()
3324
except errors.NotBranchError:
3325
c = _mod_config.GlobalConfig()
3327
c = Branch.open(directory).get_config()
3276
# use branch if we're inside one; otherwise global config
3278
c = Branch.open_containing('.')[0].get_config()
3279
except errors.NotBranchError:
3280
c = config.GlobalConfig()
3329
3282
self.outf.write(c.user_email() + '\n')
3334
3287
# display a warning if an email address isn't included in the given name.
3336
_mod_config.extract_email_address(name)
3289
config.extract_email_address(name)
3337
3290
except errors.NoEmailInUsername, e:
3338
3291
warning('"%s" does not seem to contain an email address. '
3339
3292
'This is allowed, but not recommended.', name)
3341
3294
# use global config unless --branch given
3343
if directory is None:
3344
c = Branch.open_containing(u'.')[0].get_config()
3346
c = Branch.open(directory).get_config()
3296
c = Branch.open_containing('.')[0].get_config()
3348
c = _mod_config.GlobalConfig()
3298
c = config.GlobalConfig()
3349
3299
c.set_user_option('email', name)
3352
3302
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3303
"""Print or set the branch nickname.
3355
3305
If unset, the tree root directory name is used as the nickname.
3356
3306
To print the current nickname, execute with no argument.
3418
3367
'bzr alias --remove expects an alias to remove.')
3419
3368
# If alias is not found, print something like:
3420
3369
# unalias: foo: not found
3421
c = _mod_config.GlobalConfig()
3370
c = config.GlobalConfig()
3422
3371
c.unset_alias(alias_name)
3424
3373
@display_command
3425
3374
def print_aliases(self):
3426
3375
"""Print out the defined aliases in a similar format to bash."""
3427
aliases = _mod_config.GlobalConfig().get_aliases()
3376
aliases = config.GlobalConfig().get_aliases()
3428
3377
for key, value in sorted(aliases.iteritems()):
3429
3378
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3441
3390
def set_alias(self, alias_name, alias_command):
3442
3391
"""Save the alias in the global config."""
3443
c = _mod_config.GlobalConfig()
3392
c = config.GlobalConfig()
3444
3393
c.set_alias(alias_name, alias_command)
3447
3396
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3397
"""Run internal test suite.
3450
3399
If arguments are given, they are regular expressions that say which tests
3451
3400
should run. Tests matching any expression are run, and other tests are
3498
3447
from bzrlib.tests import stub_sftp
3499
3448
return stub_sftp.SFTPAbsoluteServer
3500
3449
if typestring == "memory":
3501
from bzrlib.tests import test_server
3502
return memory.MemoryServer
3450
from bzrlib.transport.memory import MemoryServer
3503
3452
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
3505
return test_server.FakeNFSServer
3453
from bzrlib.transport.fakenfs import FakeNFSServer
3454
return FakeNFSServer
3506
3455
msg = "No known transport type %s. Supported types are: sftp\n" %\
3508
3457
raise errors.BzrCommandError(msg)
3519
3468
'throughout the test suite.',
3520
3469
type=get_transport_type),
3521
3470
Option('benchmark',
3522
help='Run the benchmarks rather than selftests.',
3471
help='Run the benchmarks rather than selftests.'),
3524
3472
Option('lsprof-timed',
3525
3473
help='Generate lsprof output for benchmarked'
3526
3474
' sections of code.'),
3527
3475
Option('lsprof-tests',
3528
3476
help='Generate lsprof output for each test.'),
3477
Option('cache-dir', type=str,
3478
help='Cache intermediate benchmark output in this '
3529
3480
Option('first',
3530
3481
help='Run all tests, but run specified tests first.',
3531
3482
short_name='f',
3566
3517
def run(self, testspecs_list=None, verbose=False, one=False,
3567
3518
transport=None, benchmark=None,
3519
lsprof_timed=None, cache_dir=None,
3569
3520
first=False, list_only=False,
3570
3521
randomize=None, exclude=None, strict=False,
3571
3522
load_list=None, debugflag=None, starting_with=None, subunit=False,
3572
3523
parallel=None, lsprof_tests=False):
3573
from bzrlib import tests
3524
from bzrlib.tests import selftest
3525
import bzrlib.benchmarks as benchmarks
3526
from bzrlib.benchmarks import tree_creator
3528
# Make deprecation warnings visible, unless -Werror is set
3529
symbol_versioning.activate_deprecation_warnings(override=False)
3531
if cache_dir is not None:
3532
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3575
3533
if testspecs_list is not None:
3576
3534
pattern = '|'.join(testspecs_list)
3583
3541
raise errors.BzrCommandError("subunit not available. subunit "
3584
3542
"needs to be installed to use --subunit.")
3585
3543
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3589
# following code can be deleted when it's sufficiently deployed
3590
# -- vila/mgz 20100514
3591
if (sys.platform == "win32"
3592
and getattr(sys.stdout, 'fileno', None) is not None):
3594
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3596
3545
self.additional_selftest_args.setdefault(
3597
3546
'suite_decorators', []).append(parallel)
3599
raise errors.BzrCommandError(
3600
"--benchmark is no longer supported from bzr 2.2; "
3601
"use bzr-usertest instead")
3602
test_suite_factory = None
3548
test_suite_factory = benchmarks.test_suite
3549
# Unless user explicitly asks for quiet, be verbose in benchmarks
3550
verbose = not is_quiet()
3551
# TODO: should possibly lock the history file...
3552
benchfile = open(".perf_history", "at", buffering=1)
3553
self.add_cleanup(benchfile.close)
3555
test_suite_factory = None
3603
3557
selftest_kwargs = {"verbose": verbose,
3604
3558
"pattern": pattern,
3605
3559
"stop_on_failure": one,
3617
3572
"starting_with": starting_with
3619
3574
selftest_kwargs.update(self.additional_selftest_args)
3621
# Make deprecation warnings visible, unless -Werror is set
3622
cleanup = symbol_versioning.activate_deprecation_warnings(
3625
result = tests.selftest(**selftest_kwargs)
3575
result = selftest(**selftest_kwargs)
3628
3576
return int(not result)
3631
3579
class cmd_version(Command):
3632
__doc__ = """Show version of bzr."""
3580
"""Show version of bzr."""
3634
3582
encoding_type = 'replace'
3635
3583
takes_options = [
3648
3596
class cmd_rocks(Command):
3649
__doc__ = """Statement of optimism."""
3597
"""Statement of optimism."""
3653
3601
@display_command
3655
self.outf.write("It sure does!\n")
3603
print "It sure does!"
3658
3606
class cmd_find_merge_base(Command):
3659
__doc__ = """Find and print a base revision for merging two branches."""
3607
"""Find and print a base revision for merging two branches."""
3660
3608
# TODO: Options to specify revisions on either side, as if
3661
3609
# merging only part of the history.
3662
3610
takes_args = ['branch', 'other']
3669
3617
branch1 = Branch.open_containing(branch)[0]
3670
3618
branch2 = Branch.open_containing(other)[0]
3671
self.add_cleanup(branch1.lock_read().unlock)
3672
self.add_cleanup(branch2.lock_read().unlock)
3620
self.add_cleanup(branch1.unlock)
3622
self.add_cleanup(branch2.unlock)
3673
3623
last1 = ensure_null(branch1.last_revision())
3674
3624
last2 = ensure_null(branch2.last_revision())
3676
3626
graph = branch1.repository.get_graph(branch2.repository)
3677
3627
base_rev_id = graph.find_unique_lca(last1, last2)
3679
self.outf.write('merge base is revision %s\n' % base_rev_id)
3629
print 'merge base is revision %s' % base_rev_id
3682
3632
class cmd_merge(Command):
3683
__doc__ = """Perform a three-way merge.
3633
"""Perform a three-way merge.
3685
3635
The source of the merge can be specified either in the form of a branch,
3686
3636
or in the form of a path to a file containing a merge directive generated
3769
3719
' completely merged into the source, pull from the'
3770
3720
' source rather than merging. When this happens,'
3771
3721
' you do not need to commit the result.'),
3772
custom_help('directory',
3773
3723
help='Branch to merge into, '
3774
'rather than the one containing the working directory.'),
3724
'rather than the one containing the working directory.',
3775
3728
Option('preview', help='Instead of merging, show a diff of the'
3777
3730
Option('interactive', help='Select changes interactively.',
3826
3780
raise errors.BzrCommandError(
3827
3781
'Cannot use -r with merge directives or bundles')
3828
3782
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3831
3785
if merger is None and uncommitted:
3832
3786
if revision is not None and len(revision) > 0:
3833
3787
raise errors.BzrCommandError('Cannot use --uncommitted and'
3834
3788
' --revision at the same time.')
3835
merger = self.get_merger_from_uncommitted(tree, location, None)
3789
merger = self.get_merger_from_uncommitted(tree, location, pb)
3836
3790
allow_pending = False
3838
3792
if merger is None:
3839
3793
merger, allow_pending = self._get_merger_from_branch(tree,
3840
location, revision, remember, possible_transports, None)
3794
location, revision, remember, possible_transports, pb)
3842
3796
merger.merge_type = merge_type
3843
3797
merger.reprocess = reprocess
3877
3831
def _do_preview(self, merger):
3878
3832
from bzrlib.diff import show_diff_trees
3879
3833
result_tree = self._get_preview(merger)
3880
path_encoding = osutils.get_diff_header_encoding()
3881
3834
show_diff_trees(merger.this_tree, result_tree, self.outf,
3882
old_label='', new_label='',
3883
path_encoding=path_encoding)
3835
old_label='', new_label='')
3885
3837
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3886
3838
merger.change_reporter = change_reporter
4071
4023
def run(self, file_list=None, merge_type=None, show_base=False,
4072
4024
reprocess=False):
4073
from bzrlib.conflicts import restore
4074
4025
if merge_type is None:
4075
4026
merge_type = _mod_merge.Merge3Merger
4076
tree, file_list = WorkingTree.open_containing_paths(file_list)
4077
self.add_cleanup(tree.lock_write().unlock)
4027
tree, file_list = tree_files(file_list)
4029
self.add_cleanup(tree.unlock)
4078
4030
parents = tree.get_parent_ids()
4079
4031
if len(parents) != 2:
4080
4032
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4116
4068
# list, we imply that the working tree text has seen and rejected
4117
4069
# all the changes from the other tree, when in fact those changes
4118
4070
# have not yet been seen.
4071
pb = ui.ui_factory.nested_progress_bar()
4119
4072
tree.set_parent_ids(parents[:1])
4121
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4074
merger = _mod_merge.Merger.from_revision_ids(pb,
4122
4076
merger.interesting_ids = interesting_ids
4123
4077
merger.merge_type = merge_type
4124
4078
merger.show_base = show_base
4200
4156
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4201
4157
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4202
tree.revert(file_list, rev_tree, not no_backup, None,
4203
report_changes=True)
4158
pb = ui.ui_factory.nested_progress_bar()
4160
tree.revert(file_list, rev_tree, not no_backup, pb,
4161
report_changes=True)
4206
4166
class cmd_assert_fail(Command):
4207
__doc__ = """Test reporting of assertion failures"""
4167
"""Test reporting of assertion failures"""
4208
4168
# intended just for use in testing
4313
4272
theirs_only=False,
4314
4273
log_format=None, long=False, short=False, line=False,
4315
4274
show_ids=False, verbose=False, this=False, other=False,
4316
include_merges=False, revision=None, my_revision=None,
4275
include_merges=False, revision=None, my_revision=None):
4318
4276
from bzrlib.missing import find_unmerged, iter_log_revisions
4319
4277
def message(s):
4320
4278
if not is_quiet():
4350
4306
remote_branch = Branch.open(other_branch)
4351
4307
if remote_branch.base == local_branch.base:
4352
4308
remote_branch = local_branch
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4310
local_branch.lock_read()
4311
self.add_cleanup(local_branch.unlock)
4356
4312
local_revid_range = _revision_range_to_revid_range(
4357
4313
_get_revision_range(my_revision, local_branch,
4316
remote_branch.lock_read()
4317
self.add_cleanup(remote_branch.unlock)
4360
4318
remote_revid_range = _revision_range_to_revid_range(
4361
4319
_get_revision_range(revision,
4362
4320
remote_branch, self.name()))
4422
4381
class cmd_pack(Command):
4423
__doc__ = """Compress the data within a repository.
4425
This operation compresses the data within a bazaar repository. As
4426
bazaar supports automatic packing of repository, this operation is
4427
normally not required to be done manually.
4429
During the pack operation, bazaar takes a backup of existing repository
4430
data, i.e. pack files. This backup is eventually removed by bazaar
4431
automatically when it is safe to do so. To save disk space by removing
4432
the backed up pack files, the --clean-obsolete-packs option may be
4435
Warning: If you use --clean-obsolete-packs and your machine crashes
4436
during or immediately after repacking, you may be left with a state
4437
where the deletion has been written to disk but the new packs have not
4438
been. In this case the repository may be unusable.
4382
"""Compress the data within a repository."""
4441
4384
_see_also = ['repositories']
4442
4385
takes_args = ['branch_or_repo?']
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4387
def run(self, branch_or_repo='.'):
4448
4388
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4450
4390
branch = dir.open_branch()
4451
4391
repository = branch.repository
4452
4392
except errors.NotBranchError:
4453
4393
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4457
4397
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4398
"""List the installed plugins.
4460
4400
This command displays the list of installed plugins including
4461
4401
version of plugin and a short description of each.
4468
4408
adding new commands, providing additional network transports and
4469
4409
customizing log output.
4471
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4472
for further information on plugins including where to find them and how to
4473
install them. Instructions are also provided there on how to write new
4474
plugins using the Python programming language.
4411
See the Bazaar web site, http://bazaar-vcs.org, for further
4412
information on plugins including where to find them and how to
4413
install them. Instructions are also provided there on how to
4414
write new plugins using the Python programming language.
4476
4416
takes_options = ['verbose']
4492
4432
doc = '(no description)'
4493
4433
result.append((name_ver, doc, plugin.path()))
4494
4434
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4502
4442
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4443
"""Show testament (signing-form) of a revision."""
4504
4444
takes_options = [
4506
4446
Option('long', help='Produce long-format testament.'),
4548
4489
Option('long', help='Show commit date in annotations.'),
4553
4493
encoding_type = 'exact'
4555
4495
@display_command
4556
4496
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4558
4498
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4499
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4500
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4561
4501
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4503
self.add_cleanup(wt.unlock)
4564
self.add_cleanup(branch.lock_read().unlock)
4506
self.add_cleanup(branch.unlock)
4565
4507
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4509
self.add_cleanup(tree.unlock)
4567
4510
if wt is not None:
4568
4511
file_id = wt.path2id(relpath)
4584
4527
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4528
"""Create a digital signature for an existing revision."""
4586
4529
# TODO be able to replace existing ones.
4588
4531
hidden = True # is this right ?
4589
4532
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4533
takes_options = ['revision']
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4535
def run(self, revision_id_list=None, revision=None):
4593
4536
if revision_id_list is not None and revision is not None:
4594
4537
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4538
if revision_id_list is None and revision is None:
4596
4539
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4540
b = WorkingTree.open_containing(u'.')[0].branch
4542
self.add_cleanup(b.unlock)
4599
4543
return self._run(b, revision_id_list, revision)
4601
4545
def _run(self, b, revision_id_list, revision):
4661
4604
_see_also = ['checkouts', 'unbind']
4662
4605
takes_args = ['location?']
4663
takes_options = ['directory']
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4608
def run(self, location=None):
4609
b, relpath = Branch.open_containing(u'.')
4667
4610
if location is None:
4669
4612
location = b.get_old_bound_location()
4697
4637
_see_also = ['checkouts', 'bind']
4698
4638
takes_args = []
4699
takes_options = ['directory']
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4642
b, relpath = Branch.open_containing(u'.')
4703
4643
if not b.unbind():
4704
4644
raise errors.BzrCommandError('Local branch is not bound')
4707
4647
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4648
"""Remove the last committed revision.
4710
4650
--verbose will print out what is being removed.
4711
4651
--dry-run will go through all the motions, but not actually
4751
4691
b = control.open_branch()
4753
4693
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4695
self.add_cleanup(tree.unlock)
4756
self.add_cleanup(b.lock_write().unlock)
4698
self.add_cleanup(b.unlock)
4757
4699
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4759
4701
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4792
4734
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4737
print 'Dry-run, pretending to remove the above revisions.'
4739
val = raw_input('Press <enter> to continue')
4798
self.outf.write('The above revision(s) will be removed.\n')
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4741
print 'The above revision(s) will be removed.'
4743
val = raw_input('Are you sure [y/N]? ')
4744
if val.lower() not in ('y', 'yes'):
4805
4748
mutter('Uncommitting from {%s} to {%s}',
4806
4749
last_rev_id, rev_id)
4807
4750
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4751
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
4752
note('You can restore the old tip by running:\n'
4753
' bzr pull . -r revid:%s', last_rev_id)
4813
4756
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock.
4816
This command breaks a lock on a repository, branch, working directory or
4757
"""Break a dead lock on a repository, branch or working directory.
4819
4759
CAUTION: Locks should only be broken when you are sure that the process
4820
4760
holding the lock has been stopped.
4827
4767
bzr break-lock bzr+ssh://example.com/bzr/foo
4828
bzr break-lock --conf ~/.bazaar
4831
4769
takes_args = ['location?']
4834
help='LOCATION is the directory where the config lock is.'),
4837
def run(self, location=None, config=False):
4771
def run(self, location=None, show=False):
4838
4772
if location is None:
4839
4773
location = u'.'
4841
conf = _mod_config.LockableConfig(file_name=location)
4844
control, relpath = bzrdir.BzrDir.open_containing(location)
4846
control.break_lock()
4847
except NotImplementedError:
4774
control, relpath = bzrdir.BzrDir.open_containing(location)
4776
control.break_lock()
4777
except NotImplementedError:
4851
4781
class cmd_wait_until_signalled(Command):
4852
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4782
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4854
4784
This just prints a line to signal when it is ready, then blocks on stdin.
4915
4846
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4916
4847
protocol=None):
4917
from bzrlib import transport
4848
from bzrlib.transport import get_transport, transport_server_registry
4918
4849
if directory is None:
4919
4850
directory = os.getcwd()
4920
4851
if protocol is None:
4921
protocol = transport.transport_server_registry.get()
4852
protocol = transport_server_registry.get()
4922
4853
host, port = self.get_host_and_port(port)
4923
4854
url = urlutils.local_path_to_url(directory)
4924
4855
if not allow_writes:
4925
4856
url = 'readonly+' + url
4926
t = transport.get_transport(url)
4927
protocol(t, host, port, inet)
4857
transport = get_transport(url)
4858
protocol(transport, host, port, inet)
4930
4861
class cmd_join(Command):
4931
__doc__ = """Combine a tree into its containing tree.
4862
"""Combine a tree into its containing tree.
4933
4864
This command requires the target tree to be in a rich-root format.
5042
4972
encoding_type = 'exact'
5044
4974
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5045
sign=False, revision=None, mail_to=None, message=None,
4975
sign=False, revision=None, mail_to=None, message=None):
5047
4976
from bzrlib.revision import ensure_null, NULL_REVISION
5048
4977
include_patch, include_bundle = {
5049
4978
'plain': (False, False),
5050
4979
'diff': (True, False),
5051
4980
'bundle': (True, True),
5053
branch = Branch.open(directory)
4982
branch = Branch.open('.')
5054
4983
stored_submit_branch = branch.get_submit_branch()
5055
4984
if submit_branch is None:
5056
4985
submit_branch = stored_submit_branch
5306
5235
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5307
5236
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5309
If no tag name is specified it will be determined through the
5310
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5311
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5315
5239
_see_also = ['commit', 'tags']
5316
takes_args = ['tag_name?']
5240
takes_args = ['tag_name']
5317
5241
takes_options = [
5318
5242
Option('delete',
5319
5243
help='Delete this tag rather than placing it.',
5321
custom_help('directory',
5322
help='Branch in which to place the tag.'),
5246
help='Branch in which to place the tag.',
5323
5250
Option('force',
5324
5251
help='Replace existing tags.',
5329
def run(self, tag_name=None,
5256
def run(self, tag_name,
5335
5262
branch, relpath = Branch.open_containing(directory)
5336
self.add_cleanup(branch.lock_write().unlock)
5264
self.add_cleanup(branch.unlock)
5338
if tag_name is None:
5339
raise errors.BzrCommandError("No tag specified to delete.")
5340
5266
branch.tags.delete_tag(tag_name)
5341
5267
self.outf.write('Deleted tag %s.\n' % tag_name)
5556
5480
def run(self, to_location=None, force=False, create_branch=False,
5557
revision=None, directory=u'.'):
5558
5482
from bzrlib import switch
5559
tree_location = directory
5560
5484
revision = _get_one_revision('switch', revision)
5561
5485
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5562
5486
if to_location is None:
5563
5487
if revision is None:
5564
5488
raise errors.BzrCommandError('You must supply either a'
5565
5489
' revision or a location')
5566
to_location = tree_location
5568
5492
branch = control_dir.open_branch()
5569
5493
had_explicit_nick = branch.get_config().has_explicit_nickname()
5792
5715
self.outf.write(" <no hooks installed>\n")
5795
class cmd_remove_branch(Command):
5796
__doc__ = """Remove a branch.
5798
This will remove the branch from the specified location but
5799
will keep any working tree or repository in place.
5803
Remove the branch at repo/trunk::
5805
bzr remove-branch repo/trunk
5809
takes_args = ["location?"]
5811
aliases = ["rmbranch"]
5813
def run(self, location=None):
5814
if location is None:
5816
branch = Branch.open_containing(location)[0]
5817
branch.bzrdir.destroy_branch()
5820
5718
class cmd_shelve(Command):
5821
__doc__ = """Temporarily set aside some changes from the current tree.
5719
"""Temporarily set aside some changes from the current tree.
5823
5721
Shelve allows you to temporarily put changes you've made "on the shelf",
5824
5722
ie. out of the way, until a later time when you can bring them back from
5860
5757
_see_also = ['unshelve']
5862
5759
def run(self, revision=None, all=False, file_list=None, message=None,
5863
writer=None, list=False, destroy=False, directory=u'.'):
5760
writer=None, list=False, destroy=False):
5865
5762
return self.run_for_list()
5866
5763
from bzrlib.shelf_ui import Shelver
5941
5838
To check what clean-tree will do, use --dry-run.
5943
takes_options = ['directory',
5944
Option('ignored', help='Delete all ignored files.'),
5840
takes_options = [Option('ignored', help='Delete all ignored files.'),
5945
5841
Option('detritus', help='Delete conflict files, merge'
5946
5842
' backups, and failed selftest dirs.'),
5947
5843
Option('unknown',
5950
5846
' deleting them.'),
5951
5847
Option('force', help='Do not prompt before deleting.')]
5952
5848
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5953
force=False, directory=u'.'):
5954
5850
from bzrlib.clean_tree import clean_tree
5955
5851
if not (unknown or ignored or detritus):
5959
clean_tree(directory, unknown=unknown, ignored=ignored,
5960
detritus=detritus, dry_run=dry_run, no_prompt=force)
5855
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5856
dry_run=dry_run, no_prompt=force)
5963
5859
class cmd_reference(Command):
5964
__doc__ = """list, view and set branch locations for nested trees.
5860
"""list, view and set branch locations for nested trees.
5966
5862
If no arguments are provided, lists the branch locations for nested trees.
5967
5863
If one argument is provided, display the branch location for that tree.
6007
5903
self.outf.write('%s %s\n' % (path, location))
6010
def _register_lazy_builtins():
6011
# register lazy builtins from other modules; called at startup and should
6012
# be only called once.
6013
for (name, aliases, module_name) in [
6014
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6015
('cmd_dpush', [], 'bzrlib.foreign'),
6016
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6017
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6018
('cmd_conflicts', [], 'bzrlib.conflicts'),
6019
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6021
builtin_command_registry.register_lazy(name, aliases, module_name)
5906
# these get imported and then picked up by the scan for cmd_*
5907
# TODO: Some more consistent way to split command definitions across files;
5908
# we do need to load at least some information about them to know of
5909
# aliases. ideally we would avoid loading the implementation until the
5910
# details were needed.
5911
from bzrlib.cmd_version_info import cmd_version_info
5912
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5913
from bzrlib.bundle.commands import (
5916
from bzrlib.foreign import cmd_dpush
5917
from bzrlib.sign_my_commits import cmd_sign_my_commits
5918
from bzrlib.weave_commands import cmd_versionedfile_list, \
5919
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
