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.
479
453
To re-create the working tree, use "bzr checkout".
481
455
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
456
takes_args = ['location?']
483
457
takes_options = [
485
459
help='Remove the working tree even if it has '
486
460
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
463
def run(self, location='.', force=False):
464
d = bzrdir.BzrDir.open(location)
467
working = d.open_workingtree()
468
except errors.NoWorkingTree:
469
raise errors.BzrCommandError("No working tree to remove")
470
except errors.NotLocalUrl:
471
raise errors.BzrCommandError("You cannot remove the working tree"
474
if (working.has_changes()):
475
raise errors.UncommittedChanges(working)
477
working_path = working.bzrdir.root_transport.base
478
branch_path = working.branch.bzrdir.root_transport.base
479
if working_path != branch_path:
480
raise errors.BzrCommandError("You cannot remove the working tree"
481
" from a lightweight checkout")
483
d.destroy_workingtree()
514
486
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
487
"""Show current revision number.
517
489
This is equal to the number of revisions on this branch.
707
679
def run(self, dir_list):
708
680
for d in dir_list:
709
682
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)
684
self.outf.write('added %s\n' % d)
720
687
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
688
"""Show path of a file relative to root"""
723
690
takes_args = ['filename']
987
954
tree_to = WorkingTree.open_containing(directory)[0]
988
955
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
991
956
except errors.NoWorkingTree:
993
958
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
997
960
if local and not branch_to.get_bound_location():
998
961
raise errors.LocalRequiresBoundBranch()
1030
993
branch_from = Branch.open(location,
1031
994
possible_transports=possible_transports)
996
if branch_to.get_parent() is None or remember:
997
branch_to.set_parent(branch_from.base)
999
if branch_from is not branch_to:
1032
1000
branch_from.lock_read()
1033
1001
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
1002
if revision is not None:
1039
1003
revision_id = revision.as_revision_id(branch_from)
1005
branch_to.lock_write()
1006
self.add_cleanup(branch_to.unlock)
1041
1007
if tree_to is not None:
1042
1008
view_info = _get_view_info_for_change_reporter(tree_to)
1043
1009
change_reporter = delta._ChangeReporter(
1125
1091
# Get the source branch
1126
1092
(tree, br_from,
1127
1093
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1095
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1096
if strict is None: strict = True # default value
1128
1097
# Get the tip's revision_id
1129
1098
revision = _get_one_revision('push', revision)
1130
1099
if revision is not None:
1131
1100
revision_id = revision.in_history(br_from).rev_id
1133
1102
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.')
1103
if strict and tree is not None and revision_id is None:
1104
if (tree.has_changes()):
1105
raise errors.UncommittedChanges(
1106
tree, more='Use --no-strict to force the push.')
1107
if tree.last_revision() != tree.branch.last_revision():
1108
# The tree has lost sync with its branch, there is little
1109
# chance that the user is aware of it but he can still force
1110
# the push with --no-strict
1111
raise errors.OutOfDateTree(
1112
tree, more='Use --no-strict to force the push.')
1139
1114
# Get the stacked_on branch, if any
1140
1115
if stacked_on is not None:
1141
1116
stacked_on = urlutils.normalize_url(stacked_on)
1175
1150
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1151
"""Create a new branch that is a copy of an existing branch.
1178
1153
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1154
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1288
1263
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1264
"""Create a new checkout of an existing branch.
1291
1266
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1267
the branch found in '.'. This is useful if you have removed the working tree
1389
1364
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1365
"""Update a tree to have the latest code committed to its branch.
1392
1367
This will perform a merge into the working tree, and may generate
1393
1368
conflicts. If you have any local changes, you will still
1422
1397
branch_location = tree.branch.base
1423
1398
self.add_cleanup(tree.unlock)
1424
1399
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1400
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1428
1402
existing_pending_merges = tree.get_parent_ids()[1:]
1429
1403
if master is None:
1439
1413
revision_id = branch.last_revision()
1440
1414
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))
1415
revno = branch.revision_id_to_revno(revision_id)
1416
note("Tree is up to date at revision %d of branch %s" %
1417
(revno, branch_location))
1445
1419
view_info = _get_view_info_for_change_reporter(tree)
1446
1420
change_reporter = delta._ChangeReporter(
1458
1432
"bzr update --revision only works"
1459
1433
" for a revision in the branch history"
1460
1434
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1435
revno = tree.branch.revision_id_to_revno(
1462
1436
_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:
1437
note('Updated to revision %d of branch %s' %
1438
(revno, branch_location))
1439
if tree.get_parent_ids()[1:] != existing_pending_merges:
1467
1440
note('Your local commits will now show as pending merges with '
1468
1441
"'bzr status', and can be committed with 'bzr commit'.")
1469
1442
if conflicts != 0:
1475
1448
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1449
"""Show information about a working tree, branch or repository.
1478
1451
This command will show all known locations and formats associated to the
1479
1452
tree, branch or repository.
1573
1546
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1547
"""Print file_id of a particular file or directory.
1576
1549
The file_id is assigned when the file is first added and remains the
1577
1550
same through all revisions where the file exists, even when it is
1595
1568
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1569
"""Print path of file_ids to a file or directory.
1598
1571
This prints one line for each directory down to the target,
1599
1572
starting at the branch root.
1661
1634
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1635
"""List all revisions merged into this branch."""
1664
1637
_see_also = ['log', 'revision-history']
1665
1638
takes_args = ['location?']
1795
1768
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1769
"""Create a shared repository for branches to share storage space.
1798
1771
New branches created under the repository directory will store their
1799
1772
revisions in the repository, not in the branch directory. For branches
1855
1828
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1829
"""Show differences in the working tree, between revisions or branches.
1858
1831
If no arguments are given, all changes for the current tree are listed.
1859
1832
If files are given, only the changes in those files are listed.
1945
1918
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
1922
aliases = ['di', 'dif']
1954
1923
encoding_type = 'exact'
1956
1925
@display_command
1957
1926
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,
1927
prefix=None, old=None, new=None, using=None):
1928
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1962
1930
if (prefix is None) or (prefix == '0'):
1963
1931
# diff -p0 format
1977
1945
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1946
' 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
1948
(old_tree, new_tree,
1985
1949
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)
1950
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1951
file_list, revision, old, new, apply_view=True)
1988
1952
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1953
specific_files=specific_files,
1990
1954
external_diff_options=diff_options,
1991
1955
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1956
extra_trees=extra_trees, using=using)
1996
1959
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1960
"""List files deleted in the working tree.
1999
1962
# TODO: Show files deleted since a previous revision, or
2000
1963
# between two revisions.
2299
2262
help='Show changes made in each revision as a patch.'),
2300
2263
Option('include-merges',
2301
2264
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
2266
encoding_type = 'replace'
2320
2279
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2280
include_merges=False):
2324
2281
from bzrlib.log import (
2326
2283
make_log_request_dict,
2327
2284
_get_info_for_log_files,
2329
2286
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
2287
if include_merges:
2335
2288
if levels is None:
2429
2382
direction=direction, specific_fileids=file_ids,
2430
2383
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2384
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,
2385
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2386
Logger(b, rqst).show(lf)
2456
2407
raise errors.BzrCommandError(
2457
2408
"bzr %s doesn't accept two revisions in different"
2458
2409
" 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)
2410
rev1 = start_spec.in_history(branch)
2464
2411
# Avoid loading all of history when we know a missing
2465
2412
# end of range means the last revision ...
2466
2413
if end_spec.spec is None:
2661
2608
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
2611
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
2612
precedence over regular ignores. Such exceptions are used to specify
2672
2613
files that should be versioned which would otherwise be ignored.
2713
2654
_see_also = ['status', 'ignored', 'patterns']
2714
2655
takes_args = ['name_pattern*']
2715
2656
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2657
Option('old-default-rules',
2658
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2661
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2662
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)
2663
if old_default_rules is not None:
2664
# dump the rules and exit
2665
for pattern in ignores.OLD_DEFAULTS:
2727
2668
if not name_pattern_list:
2728
2669
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2670
"NAME_PATTERN or --old-default-rules")
2730
2671
name_pattern_list = [globbing.normalize_pattern(p)
2731
2672
for p in name_pattern_list]
2732
2673
for name_pattern in name_pattern_list:
2744
2685
if id is not None:
2745
2686
filename = entry[0]
2746
2687
if ignored.match(filename):
2747
matches.append(filename)
2688
matches.append(filename.encode('utf-8'))
2749
2690
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),))
2691
print "Warning: the following files are version controlled and" \
2692
" match your ignore pattern:\n%s" \
2693
"\nThese files will continue to be version controlled" \
2694
" unless you 'bzr remove' them." % ("\n".join(matches),)
2756
2697
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2698
"""List ignored files and the patterns that matched them.
2759
2700
List all the ignored files and the ignore pattern that caused the file to
2795
2736
revno = int(revno)
2796
2737
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)
2738
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2740
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2803
2743
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2744
"""Export current or past revision to a destination directory or archive.
2806
2746
If no revision is specified this exports the last committed revision.
2841
2781
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
2783
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2784
root=None, filters=False):
2848
2785
from bzrlib.export import export
2850
2787
if branch_or_subdir is None:
2858
2795
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)
2797
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2798
except errors.NoSuchExportFormat, e:
2863
2799
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2866
2802
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2803
"""Write the contents of a file as of a given revision to standard output.
2869
2805
If no revision is nominated, the last revision is used.
2952
2888
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2889
"""Show the offset in seconds from GMT to local time."""
2955
2891
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2893
print osutils.local_time_offset()
2961
2897
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2898
"""Commit changes into a new revision.
2964
2900
An explanatory message needs to be given for each commit. This is
2965
2901
often done by using the --message option (getting the message from the
3073
3009
"the master branch until a normal commit "
3074
3010
"is performed."
3076
Option('show-diff', short_name='p',
3077
3013
help='When no message is supplied, show the diff along'
3078
3014
' with the status summary in the message editor.'),
3159
3095
'(use --file "%(f)s" to take commit message from that file)'
3160
3096
% { 'f': message })
3161
3097
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
3099
def get_message(commit_obj):
3170
3100
"""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,
3101
my_message = message
3102
if my_message is not None and '\r' in my_message:
3103
my_message = my_message.replace('\r\n', '\n')
3104
my_message = my_message.replace('\r', '\n')
3105
if my_message is None and not file:
3106
t = make_commit_message_template_encoded(tree,
3180
3107
selected_list, diff=show_diff,
3181
3108
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
3109
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3110
my_message = edit_commit_message_encoded(t,
3189
3111
start_message=start_message)
3190
3112
if my_message is None:
3191
3113
raise errors.BzrCommandError("please specify a commit"
3192
3114
" message with either --message or --file")
3115
elif my_message and file:
3116
raise errors.BzrCommandError(
3117
"please specify either --message or --file")
3119
my_message = codecs.open(file, 'rt',
3120
osutils.get_user_encoding()).read()
3193
3121
if my_message == "":
3194
3122
raise errors.BzrCommandError("empty commit message specified")
3195
3123
return my_message
3207
3135
timezone=offset,
3208
3136
exclude=safe_relpath_files(tree, exclude))
3209
3137
except PointlessCommit:
3138
# FIXME: This should really happen before the file is read in;
3139
# perhaps prepare the commit; get the message; then actually commit
3210
3140
raise errors.BzrCommandError("No changes to commit."
3211
3141
" Use --unchanged to commit anyhow.")
3212
3142
except ConflictsInTree:
3217
3147
raise errors.BzrCommandError("Commit refused because there are"
3218
3148
" unknown files in the working tree.")
3219
3149
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 '
3150
raise errors.BzrCommandError(str(e) + "\n"
3151
'To commit to master branch, run update and then commit.\n'
3152
'You can also pass --local to commit to continue working '
3227
3156
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3157
"""Validate working tree structure, branch consistency and repository history.
3230
3159
This command checks various invariants about branch and repository storage
3231
3160
to detect data corruption or bzr bugs.
3390
3319
@display_command
3391
3320
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3395
3324
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3325
"""Set/unset and display aliases.
3399
3328
Show the current aliases::
3465
3394
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3395
"""Run internal test suite.
3468
3397
If arguments are given, they are regular expressions that say which tests
3469
3398
should run. Tests matching any expression are run, and other tests are
3610
3539
raise errors.BzrCommandError("subunit not available. subunit "
3611
3540
"needs to be installed to use --subunit.")
3612
3541
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
3543
self.additional_selftest_args.setdefault(
3620
3544
'suite_decorators', []).append(parallel)
3670
3594
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3595
"""Statement of optimism."""
3675
3599
@display_command
3677
self.outf.write("It sure does!\n")
3601
print "It sure does!"
3680
3604
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3605
"""Find and print a base revision for merging two branches."""
3682
3606
# TODO: Options to specify revisions on either side, as if
3683
3607
# merging only part of the history.
3684
3608
takes_args = ['branch', 'other']
3700
3624
graph = branch1.repository.get_graph(branch2.repository)
3701
3625
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3627
print 'merge base is revision %s' % base_rev_id
3706
3630
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3631
"""Perform a three-way merge.
3709
3633
The source of the merge can be specified either in the form of a branch,
3710
3634
or in the form of a path to a file containing a merge directive generated
3854
3778
raise errors.BzrCommandError(
3855
3779
'Cannot use -r with merge directives or bundles')
3856
3780
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
3783
if merger is None and uncommitted:
3860
3784
if revision is not None and len(revision) > 0:
3861
3785
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
3786
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3787
merger = self.get_merger_from_uncommitted(tree, location, pb)
3864
3788
allow_pending = False
3866
3790
if merger is None:
3867
3791
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3792
location, revision, remember, possible_transports, pb)
3870
3794
merger.merge_type = merge_type
3871
3795
merger.reprocess = reprocess
4097
4021
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4022
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
4023
if merge_type is None:
4101
4024
merge_type = _mod_merge.Merge3Merger
4102
4025
tree, file_list = tree_files(file_list)
4143
4066
# list, we imply that the working tree text has seen and rejected
4144
4067
# all the changes from the other tree, when in fact those changes
4145
4068
# have not yet been seen.
4069
pb = ui.ui_factory.nested_progress_bar()
4146
4070
tree.set_parent_ids(parents[:1])
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4072
merger = _mod_merge.Merger.from_revision_ids(pb,
4149
4074
merger.interesting_ids = interesting_ids
4150
4075
merger.merge_type = merge_type
4151
4076
merger.show_base = show_base
4162
4088
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4089
"""Revert files to a previous revision.
4165
4091
Giving a list of files will revert only those files. Otherwise, all files
4166
4092
will be reverted. If the revision is not specified with '--revision', the
4217
4143
def run(self, revision=None, no_backup=False, file_list=None,
4218
4144
forget_merges=None):
4219
4145
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
4147
self.add_cleanup(tree.unlock)
4222
4148
if forget_merges:
4223
4149
tree.set_parent_ids(tree.get_parent_ids()[:1])
4228
4154
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4155
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
4156
pb = ui.ui_factory.nested_progress_bar()
4158
tree.revert(file_list, rev_tree, not no_backup, pb,
4159
report_changes=True)
4234
4164
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4165
"""Test reporting of assertion failures"""
4236
4166
# intended just for use in testing
4377
4304
remote_branch = Branch.open(other_branch)
4378
4305
if remote_branch.base == local_branch.base:
4379
4306
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4308
local_branch.lock_read()
4309
self.add_cleanup(local_branch.unlock)
4384
4310
local_revid_range = _revision_range_to_revid_range(
4385
4311
_get_revision_range(my_revision, local_branch,
4314
remote_branch.lock_read()
4315
self.add_cleanup(remote_branch.unlock)
4388
4316
remote_revid_range = _revision_range_to_revid_range(
4389
4317
_get_revision_range(revision,
4390
4318
remote_branch, self.name()))
4451
4379
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.
4380
"""Compress the data within a repository."""
4470
4382
_see_also = ['repositories']
4471
4383
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):
4385
def run(self, branch_or_repo='.'):
4477
4386
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4388
branch = dir.open_branch()
4480
4389
repository = branch.repository
4481
4390
except errors.NotBranchError:
4482
4391
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4395
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4396
"""List the installed plugins.
4489
4398
This command displays the list of installed plugins including
4490
4399
version of plugin and a short description of each.
4521
4430
doc = '(no description)'
4522
4431
result.append((name_ver, doc, plugin.path()))
4523
4432
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
4440
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4441
"""Show testament (signing-form) of a revision."""
4533
4442
takes_options = [
4535
4444
Option('long', help='Produce long-format testament.'),
4563
4472
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4473
"""Show the origin of each line in a file.
4566
4475
This prints out the given file with an annotation on the left side
4567
4476
indicating which revision, author and date introduced the change.
4682
4591
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.
4592
"""Convert the current branch into a checkout of the supplied branch.
4686
4594
Once converted into a checkout, commits must succeed on the master branch
4687
4595
before they will be applied to the local branch.
4723
4631
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4632
"""Convert the current checkout into a regular branch.
4726
4634
After unbinding, the local branch is considered independent and subsequent
4727
4635
commits will be local only.
4740
4648
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4649
"""Remove the last committed revision.
4743
4651
--verbose will print out what is being removed.
4744
4652
--dry-run will go through all the motions, but not actually
4812
4720
rev_id = b.get_rev_id(revno)
4814
4722
if rev_id is None or _mod_revision.is_null(rev_id):
4815
self.outf.write('No revisions to uncommit.\n')
4723
ui.ui_factory.note('No revisions to uncommit.')
4726
log_collector = ui.ui_factory.make_output_stream()
4818
4727
lf = log_formatter('short',
4728
to_file=log_collector,
4820
4729
show_timezone='original')
4827
4736
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4739
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
4833
self.outf.write('The above revision(s) will be removed.\n')
4741
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')
4744
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4745
ui.ui_factory.note('Canceled')
4840
4748
mutter('Uncommitting from {%s} to {%s}',
4841
4749
last_rev_id, rev_id)
4842
4750
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4751
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)
4752
ui.ui_factory.note('You can restore the old tip by running:\n'
4753
' bzr pull . -r revid:%s' % last_rev_id)
4848
4756
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4757
"""Break a dead lock on a repository, branch or working directory.
4851
4759
CAUTION: Locks should only be broken when you are sure that the process
4852
4760
holding the lock has been stopped.
4999
4907
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4908
"""Split a subdirectory of a tree into a separate tree.
5002
4910
This command will produce a target tree in a format that supports
5003
4911
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5025
4933
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4934
"""Generate a merge directive for auto-merge tools.
5028
4936
A directive requests a merge to be performed, and also provides all the
5029
4937
information necessary to do so. This means it must either include a
5314
5222
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5223
"""Create, remove or modify a tag naming a revision.
5317
5225
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5226
(--revision) option can be given -rtag:X, where X is any previously
5327
5235
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5236
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
5239
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5240
takes_args = ['tag_name']
5338
5241
takes_options = [
5339
5242
Option('delete',
5340
5243
help='Delete this tag rather than placing it.',
5373
5274
revision_id = revision[0].as_revision_id(branch)
5375
5276
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
5277
if (not force) and branch.tags.has_tag(tag_name):
5382
5278
raise errors.TagAlreadyExists(tag_name)
5383
5279
branch.tags.set_tag(tag_name, revision_id)
5552
5448
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5449
"""Set the branch of a checkout and update.
5555
5451
For lightweight checkouts, this changes the branch being referenced.
5556
5452
For heavyweight checkouts, this checks that there are no local commits
5819
5715
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
5718
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5719
"""Temporarily set aside some changes from the current tree.
5850
5721
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5722
ie. out of the way, until a later time when you can bring them back from
5922
5793
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5794
"""Restore shelved changes.
5925
5796
By default, the most recently shelved changes are restored. However if you
5926
5797
specify a shelf by id those changes will be restored instead. This works
5954
5825
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5826
"""Remove unwanted files from working tree.
5957
5828
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5829
files are never deleted.
5988
5859
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5860
"""list, view and set branch locations for nested trees.
5991
5862
If no arguments are provided, lists the branch locations for nested trees.
5992
5863
If one argument is provided, display the branch location for that tree.
6032
5903
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)
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
