60
60
from bzrlib.workingtree import WorkingTree
63
from bzrlib.commands import (
65
builtin_command_registry,
63
from bzrlib.commands import Command, display_command
68
64
from bzrlib.option import (
334
330
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
331
"""Write out metadata for a revision.
337
333
The revision to print can either be specified by a specific
338
334
revision identifier, or you can use --revision.
344
340
# cat-revision is more for frontends so should be exact
345
341
encoding = 'strict'
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
356
344
def run(self, revision_id=None, revision=None):
357
345
if revision_id is not None and revision is not None:
362
350
' --revision or a revision_id')
363
351
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
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
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
371
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
372
"""Dump the contents of a btree index file to stdout.
395
374
PATH is a btree index file, it can be any URL. This includes things like
396
375
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
439
for node in bt.iter_all_entries():
461
440
# Node is made up of:
462
441
# (index, key, value, [references])
466
refs_as_tuples = None
468
refs_as_tuples = static_tuple.as_tuples(refs)
442
refs_as_tuples = static_tuple.as_tuples(node[3])
469
443
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
444
self.outf.write('%s\n' % (as_tuple,))
473
447
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
448
"""Remove the working tree from a given branch/checkout.
476
450
Since a lightweight checkout is little more than a working tree
477
451
this will refuse to run against one.
504
478
if (working.has_changes()):
505
479
raise errors.UncommittedChanges(working)
507
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:
508
484
raise errors.BzrCommandError("You cannot remove the working tree"
509
485
" from a lightweight checkout")
707
683
def run(self, dir_list):
708
684
for d in dir_list:
709
686
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
715
self.outf.write('added %s\n' % d)
717
raise errors.NotVersionedError(path=base)
688
self.outf.write('added %s\n' % d)
720
691
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
692
"""Show path of a file relative to root"""
723
694
takes_args = ['filename']
987
958
tree_to = WorkingTree.open_containing(directory)[0]
988
959
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
991
960
except errors.NoWorkingTree:
993
962
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
997
964
if local and not branch_to.get_bound_location():
998
965
raise errors.LocalRequiresBoundBranch()
1030
997
branch_from = Branch.open(location,
1031
998
possible_transports=possible_transports)
1000
if branch_to.get_parent() is None or remember:
1001
branch_to.set_parent(branch_from.base)
1003
if branch_from is not branch_to:
1032
1004
branch_from.lock_read()
1033
1005
self.add_cleanup(branch_from.unlock)
1035
if branch_to.get_parent() is None or remember:
1036
branch_to.set_parent(branch_from.base)
1038
1006
if revision is not None:
1039
1007
revision_id = revision.as_revision_id(branch_from)
1009
branch_to.lock_write()
1010
self.add_cleanup(branch_to.unlock)
1041
1011
if tree_to is not None:
1042
1012
view_info = _get_view_info_for_change_reporter(tree_to)
1043
1013
change_reporter = delta._ChangeReporter(
1125
1095
# Get the source branch
1126
1096
(tree, br_from,
1127
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
1128
1101
# Get the tip's revision_id
1129
1102
revision = _get_one_revision('push', revision)
1130
1103
if revision is not None:
1131
1104
revision_id = revision.in_history(br_from).rev_id
1133
1106
revision_id = None
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
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.')
1139
1118
# Get the stacked_on branch, if any
1140
1119
if stacked_on is not None:
1141
1120
stacked_on = urlutils.normalize_url(stacked_on)
1175
1154
class cmd_branch(Command):
1176
__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.
1178
1157
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1158
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1288
1267
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1268
"""Create a new checkout of an existing branch.
1291
1270
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1271
the branch found in '.'. This is useful if you have removed the working tree
1389
1368
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1369
"""Update a tree to have the latest code committed to its branch.
1392
1371
This will perform a merge into the working tree, and may generate
1393
1372
conflicts. If you have any local changes, you will still
1422
1401
branch_location = tree.branch.base
1423
1402
self.add_cleanup(tree.unlock)
1424
1403
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1404
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1428
1406
existing_pending_merges = tree.get_parent_ids()[1:]
1429
1407
if master is None:
1439
1417
revision_id = branch.last_revision()
1440
1418
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.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))
1445
1423
view_info = _get_view_info_for_change_reporter(tree)
1446
1424
change_reporter = delta._ChangeReporter(
1458
1436
"bzr update --revision only works"
1459
1437
" for a revision in the branch history"
1460
1438
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1439
revno = tree.branch.revision_id_to_revno(
1462
1440
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
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:
1467
1444
note('Your local commits will now show as pending merges with '
1468
1445
"'bzr status', and can be committed with 'bzr commit'.")
1469
1446
if conflicts != 0:
1475
1452
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1453
"""Show information about a working tree, branch or repository.
1478
1455
This command will show all known locations and formats associated to the
1479
1456
tree, branch or repository.
1573
1550
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1551
"""Print file_id of a particular file or directory.
1576
1553
The file_id is assigned when the file is first added and remains the
1577
1554
same through all revisions where the file exists, even when it is
1595
1572
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1573
"""Print path of file_ids to a file or directory.
1598
1575
This prints one line for each directory down to the target,
1599
1576
starting at the branch root.
1661
1638
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1639
"""List all revisions merged into this branch."""
1664
1641
_see_also = ['log', 'revision-history']
1665
1642
takes_args = ['location?']
1795
1772
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1773
"""Create a shared repository for branches to share storage space.
1798
1775
New branches created under the repository directory will store their
1799
1776
revisions in the repository, not in the branch directory. For branches
1855
1832
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1833
"""Show differences in the working tree, between revisions or branches.
1858
1835
If no arguments are given, all changes for the current tree are listed.
1859
1836
If files are given, only the changes in those files are listed.
1945
1922
help='Use this command to compare files.',
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1953
1926
aliases = ['di', 'dif']
1954
1927
encoding_type = 'exact'
1956
1929
@display_command
1957
1930
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
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
1962
1934
if (prefix is None) or (prefix == '0'):
1963
1935
# diff -p0 format
1977
1949
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1950
' one or two revision specifiers')
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1984
1952
(old_tree, new_tree,
1985
1953
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1954
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1955
file_list, revision, old, new, apply_view=True)
1988
1956
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1957
specific_files=specific_files,
1990
1958
external_diff_options=diff_options,
1991
1959
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1960
extra_trees=extra_trees, using=using)
1996
1963
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1964
"""List files deleted in the working tree.
1999
1966
# TODO: Show files deleted since a previous revision, or
2000
1967
# between two revisions.
2299
2266
help='Show changes made in each revision as a patch.'),
2300
2267
Option('include-merges',
2301
2268
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2307
2270
encoding_type = 'replace'
2320
2283
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2284
include_merges=False):
2324
2285
from bzrlib.log import (
2326
2287
make_log_request_dict,
2327
2288
_get_info_for_log_files,
2329
2290
direction = (forward and 'forward') or 'reverse'
2330
if (exclude_common_ancestry
2331
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2334
2291
if include_merges:
2335
2292
if levels is None:
2429
2386
direction=direction, specific_fileids=file_ids,
2430
2387
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2388
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2389
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2390
Logger(b, rqst).show(lf)
2456
2411
raise errors.BzrCommandError(
2457
2412
"bzr %s doesn't accept two revisions in different"
2458
2413
" branches." % command_name)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2463
rev1 = start_spec.in_history(branch)
2414
rev1 = start_spec.in_history(branch)
2464
2415
# Avoid loading all of history when we know a missing
2465
2416
# end of range means the last revision ...
2466
2417
if end_spec.spec is None:
2661
2612
using this command or directly by using an editor, be sure to commit
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2670
2615
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
2616
precedence over regular ignores. Such exceptions are used to specify
2672
2617
files that should be versioned which would otherwise be ignored.
2713
2658
_see_also = ['status', 'ignored', 'patterns']
2714
2659
takes_args = ['name_pattern*']
2715
2660
takes_options = [
2716
Option('default-rules',
2717
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.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2665
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2666
from bzrlib import ignores
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
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:
2727
2672
if not name_pattern_list:
2728
2673
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2674
"NAME_PATTERN or --old-default-rules")
2730
2675
name_pattern_list = [globbing.normalize_pattern(p)
2731
2676
for p in name_pattern_list]
2732
2677
for name_pattern in name_pattern_list:
2744
2689
if id is not None:
2745
2690
filename = entry[0]
2746
2691
if ignored.match(filename):
2747
matches.append(filename)
2692
matches.append(filename.encode('utf-8'))
2749
2694
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" 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),)
2756
2701
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2702
"""List ignored files and the patterns that matched them.
2759
2704
List all the ignored files and the ignore pattern that caused the file to
2795
2740
revno = int(revno)
2796
2741
except ValueError:
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2800
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)
2803
2747
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2748
"""Export current or past revision to a destination directory or archive.
2806
2750
If no revision is specified this exports the last committed revision.
2841
2785
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
2846
2787
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2788
root=None, filters=False):
2848
2789
from bzrlib.export import export
2850
2791
if branch_or_subdir is None:
2858
2799
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2801
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2802
except errors.NoSuchExportFormat, e:
2863
2803
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2866
2806
class cmd_cat(Command):
2867
__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.
2869
2809
If no revision is nominated, the last revision is used.
2952
2892
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2893
"""Show the offset in seconds from GMT to local time."""
2955
2895
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2897
print osutils.local_time_offset()
2961
2901
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2902
"""Commit changes into a new revision.
2964
2904
An explanatory message needs to be given for each commit. This is
2965
2905
often done by using the --message option (getting the message from the
3073
3013
"the master branch until a normal commit "
3074
3014
"is performed."
3076
Option('show-diff', short_name='p',
3077
3017
help='When no message is supplied, show the diff along'
3078
3018
' with the status summary in the message editor.'),
3159
3099
'(use --file "%(f)s" to take commit message from that file)'
3160
3100
% { 'f': message })
3161
3101
ui.ui_factory.show_warning(warning_msg)
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3169
3103
def get_message(commit_obj):
3170
3104
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
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,
3180
3111
selected_list, diff=show_diff,
3181
3112
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3187
3113
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3114
my_message = edit_commit_message_encoded(t,
3189
3115
start_message=start_message)
3190
3116
if my_message is None:
3191
3117
raise errors.BzrCommandError("please specify a commit"
3192
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()
3193
3125
if my_message == "":
3194
3126
raise errors.BzrCommandError("empty commit message specified")
3195
3127
return my_message
3207
3139
timezone=offset,
3208
3140
exclude=safe_relpath_files(tree, exclude))
3209
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
3210
3144
raise errors.BzrCommandError("No changes to commit."
3211
3145
" Use --unchanged to commit anyhow.")
3212
3146
except ConflictsInTree:
3217
3151
raise errors.BzrCommandError("Commit refused because there are"
3218
3152
" unknown files in the working tree.")
3219
3153
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'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 '
3227
3160
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3161
"""Validate working tree structure, branch consistency and repository history.
3230
3163
This command checks various invariants about branch and repository storage
3231
3164
to detect data corruption or bzr bugs.
3390
3323
@display_command
3391
3324
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3395
3328
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3329
"""Set/unset and display aliases.
3399
3332
Show the current aliases::
3465
3398
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3399
"""Run internal test suite.
3468
3401
If arguments are given, they are regular expressions that say which tests
3469
3402
should run. Tests matching any expression are run, and other tests are
3610
3543
raise errors.BzrCommandError("subunit not available. subunit "
3611
3544
"needs to be installed to use --subunit.")
3612
3545
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3547
self.additional_selftest_args.setdefault(
3620
3548
'suite_decorators', []).append(parallel)
3670
3598
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3599
"""Statement of optimism."""
3675
3603
@display_command
3677
self.outf.write("It sure does!\n")
3605
print "It sure does!"
3680
3608
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3609
"""Find and print a base revision for merging two branches."""
3682
3610
# TODO: Options to specify revisions on either side, as if
3683
3611
# merging only part of the history.
3684
3612
takes_args = ['branch', 'other']
3700
3628
graph = branch1.repository.get_graph(branch2.repository)
3701
3629
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3631
print 'merge base is revision %s' % base_rev_id
3706
3634
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3635
"""Perform a three-way merge.
3709
3637
The source of the merge can be specified either in the form of a branch,
3710
3638
or in the form of a path to a file containing a merge directive generated
4097
4025
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4026
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
4027
if merge_type is None:
4101
4028
merge_type = _mod_merge.Merge3Merger
4102
4029
tree, file_list = tree_files(file_list)
4162
4089
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4090
"""Revert files to a previous revision.
4165
4092
Giving a list of files will revert only those files. Otherwise, all files
4166
4093
will be reverted. If the revision is not specified with '--revision', the
4217
4144
def run(self, revision=None, no_backup=False, file_list=None,
4218
4145
forget_merges=None):
4219
4146
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
4148
self.add_cleanup(tree.unlock)
4222
4149
if forget_merges:
4223
4150
tree.set_parent_ids(tree.get_parent_ids()[:1])
4377
4301
remote_branch = Branch.open(other_branch)
4378
4302
if remote_branch.base == local_branch.base:
4379
4303
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4305
local_branch.lock_read()
4306
self.add_cleanup(local_branch.unlock)
4384
4307
local_revid_range = _revision_range_to_revid_range(
4385
4308
_get_revision_range(my_revision, local_branch,
4311
remote_branch.lock_read()
4312
self.add_cleanup(remote_branch.unlock)
4388
4313
remote_revid_range = _revision_range_to_revid_range(
4389
4314
_get_revision_range(revision,
4390
4315
remote_branch, self.name()))
4451
4376
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4377
"""Compress the data within a repository."""
4470
4379
_see_also = ['repositories']
4471
4380
takes_args = ['branch_or_repo?']
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4382
def run(self, branch_or_repo='.'):
4477
4383
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4385
branch = dir.open_branch()
4480
4386
repository = branch.repository
4481
4387
except errors.NotBranchError:
4482
4388
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4392
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4393
"""List the installed plugins.
4489
4395
This command displays the list of installed plugins including
4490
4396
version of plugin and a short description of each.
4521
4427
doc = '(no description)'
4522
4428
result.append((name_ver, doc, plugin.path()))
4523
4429
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4531
4437
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4438
"""Show testament (signing-form) of a revision."""
4533
4439
takes_options = [
4535
4441
Option('long', help='Produce long-format testament.'),
4563
4469
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4470
"""Show the origin of each line in a file.
4566
4472
This prints out the given file with an annotation on the left side
4567
4473
indicating which revision, author and date introduced the change.
4682
4588
class cmd_bind(Command):
4683
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
If no branch is supplied, rebind to the last bound location.
4589
"""Convert the current branch into a checkout of the supplied branch.
4686
4591
Once converted into a checkout, commits must succeed on the master branch
4687
4592
before they will be applied to the local branch.
4723
4628
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4629
"""Convert the current checkout into a regular branch.
4726
4631
After unbinding, the local branch is considered independent and subsequent
4727
4632
commits will be local only.
4740
4645
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4646
"""Remove the last committed revision.
4743
4648
--verbose will print out what is being removed.
4744
4649
--dry-run will go through all the motions, but not actually
4812
4717
rev_id = b.get_rev_id(revno)
4814
4719
if rev_id is None or _mod_revision.is_null(rev_id):
4815
self.outf.write('No revisions to uncommit.\n')
4720
ui.ui_factory.note('No revisions to uncommit.')
4723
log_collector = ui.ui_factory.make_output_stream()
4818
4724
lf = log_formatter('short',
4725
to_file=log_collector,
4820
4726
show_timezone='original')
4827
4733
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4736
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
4833
self.outf.write('The above revision(s) will be removed.\n')
4738
ui.ui_factory.note('The above revision(s) will be removed.')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4741
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4742
ui.ui_factory.note('Canceled')
4840
4745
mutter('Uncommitting from {%s} to {%s}',
4841
4746
last_rev_id, rev_id)
4842
4747
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4748
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' 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)
4848
4753
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4754
"""Break a dead lock on a repository, branch or working directory.
4851
4756
CAUTION: Locks should only be broken when you are sure that the process
4852
4757
holding the lock has been stopped.
4999
4904
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4905
"""Split a subdirectory of a tree into a separate tree.
5002
4907
This command will produce a target tree in a format that supports
5003
4908
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5025
4930
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4931
"""Generate a merge directive for auto-merge tools.
5028
4933
A directive requests a merge to be performed, and also provides all the
5029
4934
information necessary to do so. This means it must either include a
5314
5219
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5220
"""Create, remove or modify a tag naming a revision.
5317
5222
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5223
(--revision) option can be given -rtag:X, where X is any previously
5327
5232
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5233
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5330
If no tag name is specified it will be determined through the
5331
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5332
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5336
5236
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5237
takes_args = ['tag_name']
5338
5238
takes_options = [
5339
5239
Option('delete',
5340
5240
help='Delete this tag rather than placing it.',
5373
5271
revision_id = revision[0].as_revision_id(branch)
5375
5273
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
5274
if (not force) and branch.tags.has_tag(tag_name):
5382
5275
raise errors.TagAlreadyExists(tag_name)
5383
5276
branch.tags.set_tag(tag_name, revision_id)
5552
5445
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5446
"""Set the branch of a checkout and update.
5555
5448
For lightweight checkouts, this changes the branch being referenced.
5556
5449
For heavyweight checkouts, this checks that there are no local commits
5819
5712
self.outf.write(" <no hooks installed>\n")
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5830
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
5836
takes_args = ["location?"]
5838
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5847
5715
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5716
"""Temporarily set aside some changes from the current tree.
5850
5718
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5719
ie. out of the way, until a later time when you can bring them back from
5922
5790
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5791
"""Restore shelved changes.
5925
5793
By default, the most recently shelved changes are restored. However if you
5926
5794
specify a shelf by id those changes will be restored instead. This works
5954
5822
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5823
"""Remove unwanted files from working tree.
5957
5825
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5826
files are never deleted.
5988
5856
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5857
"""list, view and set branch locations for nested trees.
5991
5859
If no arguments are provided, lists the branch locations for nested trees.
5992
5860
If one argument is provided, display the branch location for that tree.
6032
5900
self.outf.write('%s %s\n' % (path, location))
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6046
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
