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")
987
963
tree_to = WorkingTree.open_containing(directory)[0]
988
964
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
991
965
except errors.NoWorkingTree:
993
967
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
997
969
if local and not branch_to.get_bound_location():
998
970
raise errors.LocalRequiresBoundBranch()
1030
1002
branch_from = Branch.open(location,
1031
1003
possible_transports=possible_transports)
1005
if branch_to.get_parent() is None or remember:
1006
branch_to.set_parent(branch_from.base)
1008
if branch_from is not branch_to:
1032
1009
branch_from.lock_read()
1033
1010
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
1011
if revision is not None:
1039
1012
revision_id = revision.as_revision_id(branch_from)
1014
branch_to.lock_write()
1015
self.add_cleanup(branch_to.unlock)
1041
1016
if tree_to is not None:
1042
1017
view_info = _get_view_info_for_change_reporter(tree_to)
1043
1018
change_reporter = delta._ChangeReporter(
1125
1100
# Get the source branch
1126
1101
(tree, br_from,
1127
1102
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1104
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1105
if strict is None: strict = True # default value
1128
1106
# Get the tip's revision_id
1129
1107
revision = _get_one_revision('push', revision)
1130
1108
if revision is not None:
1131
1109
revision_id = revision.in_history(br_from).rev_id
1133
1111
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.')
1112
if strict and tree is not None and revision_id is None:
1113
if (tree.has_changes()):
1114
raise errors.UncommittedChanges(
1115
tree, more='Use --no-strict to force the push.')
1116
if tree.last_revision() != tree.branch.last_revision():
1117
# The tree has lost sync with its branch, there is little
1118
# chance that the user is aware of it but he can still force
1119
# the push with --no-strict
1120
raise errors.OutOfDateTree(
1121
tree, more='Use --no-strict to force the push.')
1139
1123
# Get the stacked_on branch, if any
1140
1124
if stacked_on is not None:
1141
1125
stacked_on = urlutils.normalize_url(stacked_on)
1175
1159
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1160
"""Create a new branch that is a copy of an existing branch.
1178
1162
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1163
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1288
1272
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1273
"""Create a new checkout of an existing branch.
1291
1275
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1276
the branch found in '.'. This is useful if you have removed the working tree
1389
1373
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1374
"""Update a tree to have the latest code committed to its branch.
1392
1376
This will perform a merge into the working tree, and may generate
1393
1377
conflicts. If you have any local changes, you will still
1422
1406
branch_location = tree.branch.base
1423
1407
self.add_cleanup(tree.unlock)
1424
1408
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1409
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1428
1411
existing_pending_merges = tree.get_parent_ids()[1:]
1429
1412
if master is None:
1439
1422
revision_id = branch.last_revision()
1440
1423
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))
1424
revno = branch.revision_id_to_revno(revision_id)
1425
note("Tree is up to date at revision %d of branch %s" %
1426
(revno, branch_location))
1445
1428
view_info = _get_view_info_for_change_reporter(tree)
1446
1429
change_reporter = delta._ChangeReporter(
1458
1441
"bzr update --revision only works"
1459
1442
" for a revision in the branch history"
1460
1443
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1444
revno = tree.branch.revision_id_to_revno(
1462
1445
_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:
1446
note('Updated to revision %d of branch %s' %
1447
(revno, branch_location))
1448
if tree.get_parent_ids()[1:] != existing_pending_merges:
1467
1449
note('Your local commits will now show as pending merges with '
1468
1450
"'bzr status', and can be committed with 'bzr commit'.")
1469
1451
if conflicts != 0:
1475
1457
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1458
"""Show information about a working tree, branch or repository.
1478
1460
This command will show all known locations and formats associated to the
1479
1461
tree, branch or repository.
1573
1555
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1556
"""Print file_id of a particular file or directory.
1576
1558
The file_id is assigned when the file is first added and remains the
1577
1559
same through all revisions where the file exists, even when it is
1595
1577
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1578
"""Print path of file_ids to a file or directory.
1598
1580
This prints one line for each directory down to the target,
1599
1581
starting at the branch root.
1661
1643
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1644
"""List all revisions merged into this branch."""
1664
1646
_see_also = ['log', 'revision-history']
1665
1647
takes_args = ['location?']
1795
1777
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1778
"""Create a shared repository for branches to share storage space.
1798
1780
New branches created under the repository directory will store their
1799
1781
revisions in the repository, not in the branch directory. For branches
1855
1837
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1838
"""Show differences in the working tree, between revisions or branches.
1858
1840
If no arguments are given, all changes for the current tree are listed.
1859
1841
If files are given, only the changes in those files are listed.
1945
1927
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
1931
aliases = ['di', 'dif']
1954
1932
encoding_type = 'exact'
1956
1934
@display_command
1957
1935
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,
1936
prefix=None, old=None, new=None, using=None):
1937
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1962
1939
if (prefix is None) or (prefix == '0'):
1963
1940
# diff -p0 format
1977
1954
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1955
' 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
1957
(old_tree, new_tree,
1985
1958
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)
1959
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1960
file_list, revision, old, new, apply_view=True)
1988
1961
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1962
specific_files=specific_files,
1990
1963
external_diff_options=diff_options,
1991
1964
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1965
extra_trees=extra_trees, using=using)
1996
1968
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1969
"""List files deleted in the working tree.
1999
1971
# TODO: Show files deleted since a previous revision, or
2000
1972
# between two revisions.
2299
2271
help='Show changes made in each revision as a patch.'),
2300
2272
Option('include-merges',
2301
2273
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
2275
encoding_type = 'replace'
2320
2288
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2289
include_merges=False):
2324
2290
from bzrlib.log import (
2326
2292
make_log_request_dict,
2327
2293
_get_info_for_log_files,
2329
2295
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
2296
if include_merges:
2335
2297
if levels is None:
2429
2391
direction=direction, specific_fileids=file_ids,
2430
2392
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2393
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,
2394
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2395
Logger(b, rqst).show(lf)
2456
2416
raise errors.BzrCommandError(
2457
2417
"bzr %s doesn't accept two revisions in different"
2458
2418
" 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)
2419
rev1 = start_spec.in_history(branch)
2464
2420
# Avoid loading all of history when we know a missing
2465
2421
# end of range means the last revision ...
2466
2422
if end_spec.spec is None:
2661
2617
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
2620
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
2621
precedence over regular ignores. Such exceptions are used to specify
2672
2622
files that should be versioned which would otherwise be ignored.
2713
2663
_see_also = ['status', 'ignored', 'patterns']
2714
2664
takes_args = ['name_pattern*']
2715
2665
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2666
Option('old-default-rules',
2667
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2670
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2671
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)
2672
if old_default_rules is not None:
2673
# dump the rules and exit
2674
for pattern in ignores.OLD_DEFAULTS:
2727
2677
if not name_pattern_list:
2728
2678
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2679
"NAME_PATTERN or --old-default-rules")
2730
2680
name_pattern_list = [globbing.normalize_pattern(p)
2731
2681
for p in name_pattern_list]
2732
2682
for name_pattern in name_pattern_list:
2744
2694
if id is not None:
2745
2695
filename = entry[0]
2746
2696
if ignored.match(filename):
2747
matches.append(filename)
2697
matches.append(filename.encode('utf-8'))
2749
2699
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),))
2700
print "Warning: the following files are version controlled and" \
2701
" match your ignore pattern:\n%s" \
2702
"\nThese files will continue to be version controlled" \
2703
" unless you 'bzr remove' them." % ("\n".join(matches),)
2756
2706
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2707
"""List ignored files and the patterns that matched them.
2759
2709
List all the ignored files and the ignore pattern that caused the file to
2795
2745
revno = int(revno)
2796
2746
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)
2747
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2749
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2803
2752
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2753
"""Export current or past revision to a destination directory or archive.
2806
2755
If no revision is specified this exports the last committed revision.
2841
2790
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
2792
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2793
root=None, filters=False):
2848
2794
from bzrlib.export import export
2850
2796
if branch_or_subdir is None:
2858
2804
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)
2806
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2807
except errors.NoSuchExportFormat, e:
2863
2808
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2866
2811
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2812
"""Write the contents of a file as of a given revision to standard output.
2869
2814
If no revision is nominated, the last revision is used.
2952
2897
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2898
"""Show the offset in seconds from GMT to local time."""
2955
2900
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2902
print osutils.local_time_offset()
2961
2906
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2907
"""Commit changes into a new revision.
2964
2909
An explanatory message needs to be given for each commit. This is
2965
2910
often done by using the --message option (getting the message from the
3073
3018
"the master branch until a normal commit "
3074
3019
"is performed."
3076
Option('show-diff', short_name='p',
3077
3022
help='When no message is supplied, show the diff along'
3078
3023
' with the status summary in the message editor.'),
3159
3104
'(use --file "%(f)s" to take commit message from that file)'
3160
3105
% { 'f': message })
3161
3106
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
3108
def get_message(commit_obj):
3170
3109
"""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,
3110
my_message = message
3111
if my_message is not None and '\r' in my_message:
3112
my_message = my_message.replace('\r\n', '\n')
3113
my_message = my_message.replace('\r', '\n')
3114
if my_message is None and not file:
3115
t = make_commit_message_template_encoded(tree,
3180
3116
selected_list, diff=show_diff,
3181
3117
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
3118
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3119
my_message = edit_commit_message_encoded(t,
3189
3120
start_message=start_message)
3190
3121
if my_message is None:
3191
3122
raise errors.BzrCommandError("please specify a commit"
3192
3123
" message with either --message or --file")
3124
elif my_message and file:
3125
raise errors.BzrCommandError(
3126
"please specify either --message or --file")
3128
my_message = codecs.open(file, 'rt',
3129
osutils.get_user_encoding()).read()
3193
3130
if my_message == "":
3194
3131
raise errors.BzrCommandError("empty commit message specified")
3195
3132
return my_message
3207
3144
timezone=offset,
3208
3145
exclude=safe_relpath_files(tree, exclude))
3209
3146
except PointlessCommit:
3147
# FIXME: This should really happen before the file is read in;
3148
# perhaps prepare the commit; get the message; then actually commit
3210
3149
raise errors.BzrCommandError("No changes to commit."
3211
3150
" Use --unchanged to commit anyhow.")
3212
3151
except ConflictsInTree:
3217
3156
raise errors.BzrCommandError("Commit refused because there are"
3218
3157
" unknown files in the working tree.")
3219
3158
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 '
3159
raise errors.BzrCommandError(str(e) + "\n"
3160
'To commit to master branch, run update and then commit.\n'
3161
'You can also pass --local to commit to continue working '
3227
3165
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3166
"""Validate working tree structure, branch consistency and repository history.
3230
3168
This command checks various invariants about branch and repository storage
3231
3169
to detect data corruption or bzr bugs.
3390
3328
@display_command
3391
3329
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3395
3333
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3334
"""Set/unset and display aliases.
3399
3337
Show the current aliases::
3465
3403
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3404
"""Run internal test suite.
3468
3406
If arguments are given, they are regular expressions that say which tests
3469
3407
should run. Tests matching any expression are run, and other tests are
3610
3548
raise errors.BzrCommandError("subunit not available. subunit "
3611
3549
"needs to be installed to use --subunit.")
3612
3550
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
3552
self.additional_selftest_args.setdefault(
3620
3553
'suite_decorators', []).append(parallel)
3670
3603
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3604
"""Statement of optimism."""
3675
3608
@display_command
3677
self.outf.write("It sure does!\n")
3610
print "It sure does!"
3680
3613
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3614
"""Find and print a base revision for merging two branches."""
3682
3615
# TODO: Options to specify revisions on either side, as if
3683
3616
# merging only part of the history.
3684
3617
takes_args = ['branch', 'other']
3700
3633
graph = branch1.repository.get_graph(branch2.repository)
3701
3634
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3636
print 'merge base is revision %s' % base_rev_id
3706
3639
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3640
"""Perform a three-way merge.
3709
3642
The source of the merge can be specified either in the form of a branch,
3710
3643
or in the form of a path to a file containing a merge directive generated
4097
4030
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4031
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
4032
if merge_type is None:
4101
4033
merge_type = _mod_merge.Merge3Merger
4102
4034
tree, file_list = tree_files(file_list)
4162
4094
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4095
"""Revert files to a previous revision.
4165
4097
Giving a list of files will revert only those files. Otherwise, all files
4166
4098
will be reverted. If the revision is not specified with '--revision', the
4217
4149
def run(self, revision=None, no_backup=False, file_list=None,
4218
4150
forget_merges=None):
4219
4151
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
4153
self.add_cleanup(tree.unlock)
4222
4154
if forget_merges:
4223
4155
tree.set_parent_ids(tree.get_parent_ids()[:1])
4377
4306
remote_branch = Branch.open(other_branch)
4378
4307
if remote_branch.base == local_branch.base:
4379
4308
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4310
local_branch.lock_read()
4311
self.add_cleanup(local_branch.unlock)
4384
4312
local_revid_range = _revision_range_to_revid_range(
4385
4313
_get_revision_range(my_revision, local_branch,
4316
remote_branch.lock_read()
4317
self.add_cleanup(remote_branch.unlock)
4388
4318
remote_revid_range = _revision_range_to_revid_range(
4389
4319
_get_revision_range(revision,
4390
4320
remote_branch, self.name()))
4451
4381
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.
4382
"""Compress the data within a repository."""
4470
4384
_see_also = ['repositories']
4471
4385
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):
4387
def run(self, branch_or_repo='.'):
4477
4388
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4390
branch = dir.open_branch()
4480
4391
repository = branch.repository
4481
4392
except errors.NotBranchError:
4482
4393
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4397
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4398
"""List the installed plugins.
4489
4400
This command displays the list of installed plugins including
4490
4401
version of plugin and a short description of each.
4521
4432
doc = '(no description)'
4522
4433
result.append((name_ver, doc, plugin.path()))
4523
4434
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
4442
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4443
"""Show testament (signing-form) of a revision."""
4533
4444
takes_options = [
4535
4446
Option('long', help='Produce long-format testament.'),
4563
4474
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4475
"""Show the origin of each line in a file.
4566
4477
This prints out the given file with an annotation on the left side
4567
4478
indicating which revision, author and date introduced the change.
4682
4593
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.
4594
"""Convert the current branch into a checkout of the supplied branch.
4686
4596
Once converted into a checkout, commits must succeed on the master branch
4687
4597
before they will be applied to the local branch.
4723
4633
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4634
"""Convert the current checkout into a regular branch.
4726
4636
After unbinding, the local branch is considered independent and subsequent
4727
4637
commits will be local only.
4740
4650
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4651
"""Remove the last committed revision.
4743
4653
--verbose will print out what is being removed.
4744
4654
--dry-run will go through all the motions, but not actually
4812
4722
rev_id = b.get_rev_id(revno)
4814
4724
if rev_id is None or _mod_revision.is_null(rev_id):
4815
self.outf.write('No revisions to uncommit.\n')
4725
ui.ui_factory.note('No revisions to uncommit.')
4728
log_collector = ui.ui_factory.make_output_stream()
4818
4729
lf = log_formatter('short',
4730
to_file=log_collector,
4820
4731
show_timezone='original')
4827
4738
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4741
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
4833
self.outf.write('The above revision(s) will be removed.\n')
4743
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')
4746
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4747
ui.ui_factory.note('Canceled')
4840
4750
mutter('Uncommitting from {%s} to {%s}',
4841
4751
last_rev_id, rev_id)
4842
4752
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4753
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)
4754
ui.ui_factory.note('You can restore the old tip by running:\n'
4755
' bzr pull . -r revid:%s' % last_rev_id)
4848
4758
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4759
"""Break a dead lock on a repository, branch or working directory.
4851
4761
CAUTION: Locks should only be broken when you are sure that the process
4852
4762
holding the lock has been stopped.
4999
4909
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4910
"""Split a subdirectory of a tree into a separate tree.
5002
4912
This command will produce a target tree in a format that supports
5003
4913
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5025
4935
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4936
"""Generate a merge directive for auto-merge tools.
5028
4938
A directive requests a merge to be performed, and also provides all the
5029
4939
information necessary to do so. This means it must either include a
5314
5224
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5225
"""Create, remove or modify a tag naming a revision.
5317
5227
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5228
(--revision) option can be given -rtag:X, where X is any previously
5327
5237
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5238
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
5241
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5242
takes_args = ['tag_name']
5338
5243
takes_options = [
5339
5244
Option('delete',
5340
5245
help='Delete this tag rather than placing it.',
5373
5276
revision_id = revision[0].as_revision_id(branch)
5375
5278
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
5279
if (not force) and branch.tags.has_tag(tag_name):
5382
5280
raise errors.TagAlreadyExists(tag_name)
5383
5281
branch.tags.set_tag(tag_name, revision_id)
5552
5450
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5451
"""Set the branch of a checkout and update.
5555
5453
For lightweight checkouts, this changes the branch being referenced.
5556
5454
For heavyweight checkouts, this checks that there are no local commits
5819
5717
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
5720
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5721
"""Temporarily set aside some changes from the current tree.
5850
5723
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5724
ie. out of the way, until a later time when you can bring them back from
5922
5795
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5796
"""Restore shelved changes.
5925
5798
By default, the most recently shelved changes are restored. However if you
5926
5799
specify a shelf by id those changes will be restored instead. This works
5954
5827
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5828
"""Remove unwanted files from working tree.
5957
5830
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5831
files are never deleted.
5988
5861
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5862
"""list, view and set branch locations for nested trees.
5991
5864
If no arguments are provided, lists the branch locations for nested trees.
5992
5865
If one argument is provided, display the branch location for that tree.
6032
5905
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)
5908
# these get imported and then picked up by the scan for cmd_*
5909
# TODO: Some more consistent way to split command definitions across files;
5910
# we do need to load at least some information about them to know of
5911
# aliases. ideally we would avoid loading the implementation until the
5912
# details were needed.
5913
from bzrlib.cmd_version_info import cmd_version_info
5914
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5915
from bzrlib.bundle.commands import (
5918
from bzrlib.foreign import cmd_dpush
5919
from bzrlib.sign_my_commits import cmd_sign_my_commits
added
removed
bzrlib/builtins.py
