55
54
from bzrlib.branch import Branch
56
55
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
56
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
57
from bzrlib.smtp_connection import SMTPConnection
60
58
from bzrlib.workingtree import WorkingTree
63
from bzrlib.commands import (
65
builtin_command_registry,
61
from bzrlib.commands import Command, display_command
68
62
from bzrlib.option import (
344
338
# cat-revision is more for frontends so should be exact
345
339
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
342
def run(self, revision_id=None, revision=None):
357
343
if revision_id is not None and revision is not None:
362
348
' --revision or a revision_id')
363
349
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')
351
# TODO: jam 20060112 should cat-revision always output utf-8?
352
if revision_id is not None:
353
revision_id = osutils.safe_revision_id(revision_id, warn=False)
355
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
356
except errors.NoSuchRevision:
357
msg = "The repository %s contains no revision %s." % (b.repository.base,
359
raise errors.BzrCommandError(msg)
360
elif revision is not None:
363
raise errors.BzrCommandError('You cannot specify a NULL'
365
rev_id = rev.as_revision_id(b)
366
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
369
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
370
"""Dump the contents of a btree index file to stdout.
395
372
PATH is a btree index file, it can be any URL. This includes things like
396
373
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
437
for node in bt.iter_all_entries():
461
438
# Node is made up of:
462
439
# (index, key, value, [references])
466
refs_as_tuples = None
468
refs_as_tuples = static_tuple.as_tuples(refs)
440
refs_as_tuples = static_tuple.as_tuples(node[3])
469
441
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
442
self.outf.write('%s\n' % (as_tuple,))
473
445
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
446
"""Remove the working tree from a given branch/checkout.
476
448
Since a lightweight checkout is little more than a working tree
477
449
this will refuse to run against one.
479
451
To re-create the working tree, use "bzr checkout".
481
453
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
454
takes_args = ['location?']
483
455
takes_options = [
485
457
help='Remove the working tree even if it has '
486
458
'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()
461
def run(self, location='.', force=False):
462
d = bzrdir.BzrDir.open(location)
465
working = d.open_workingtree()
466
except errors.NoWorkingTree:
467
raise errors.BzrCommandError("No working tree to remove")
468
except errors.NotLocalUrl:
469
raise errors.BzrCommandError("You cannot remove the working tree"
472
if (working.has_changes()):
473
raise errors.UncommittedChanges(working)
475
working_path = working.bzrdir.root_transport.base
476
branch_path = working.branch.bzrdir.root_transport.base
477
if working_path != branch_path:
478
raise errors.BzrCommandError("You cannot remove the working tree"
479
" from a lightweight checkout")
481
d.destroy_workingtree()
514
484
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
485
"""Show current revision number.
517
487
This is equal to the number of revisions on this branch.
707
677
def run(self, dir_list):
708
678
for d in dir_list:
709
680
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)
682
self.outf.write('added %s\n' % d)
720
685
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
686
"""Show path of a file relative to root"""
723
688
takes_args = ['filename']
987
952
tree_to = WorkingTree.open_containing(directory)[0]
988
953
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
991
954
except errors.NoWorkingTree:
993
956
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
997
958
if local and not branch_to.get_bound_location():
998
959
raise errors.LocalRequiresBoundBranch()
1030
991
branch_from = Branch.open(location,
1031
992
possible_transports=possible_transports)
994
if branch_to.get_parent() is None or remember:
995
branch_to.set_parent(branch_from.base)
997
if branch_from is not branch_to:
1032
998
branch_from.lock_read()
1033
999
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
1000
if revision is not None:
1039
1001
revision_id = revision.as_revision_id(branch_from)
1003
branch_to.lock_write()
1004
self.add_cleanup(branch_to.unlock)
1041
1005
if tree_to is not None:
1042
1006
view_info = _get_view_info_for_change_reporter(tree_to)
1043
1007
change_reporter = delta._ChangeReporter(
1125
1089
# Get the source branch
1126
1090
(tree, br_from,
1127
1091
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1093
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1094
if strict is None: strict = True # default value
1128
1095
# Get the tip's revision_id
1129
1096
revision = _get_one_revision('push', revision)
1130
1097
if revision is not None:
1131
1098
revision_id = revision.in_history(br_from).rev_id
1133
1100
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.')
1101
if strict and tree is not None and revision_id is None:
1102
if (tree.has_changes()):
1103
raise errors.UncommittedChanges(
1104
tree, more='Use --no-strict to force the push.')
1105
if tree.last_revision() != tree.branch.last_revision():
1106
# The tree has lost sync with its branch, there is little
1107
# chance that the user is aware of it but he can still force
1108
# the push with --no-strict
1109
raise errors.OutOfDateTree(
1110
tree, more='Use --no-strict to force the push.')
1139
1112
# Get the stacked_on branch, if any
1140
1113
if stacked_on is not None:
1141
1114
stacked_on = urlutils.normalize_url(stacked_on)
1206
1179
' directory exists, but does not already'
1207
1180
' have a control directory. This flag will'
1208
1181
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
1183
aliases = ['get', 'clone']
1214
1185
def run(self, from_location, to_location=None, revision=None,
1215
1186
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1187
use_existing_dir=False, switch=False):
1217
1188
from bzrlib import switch as _mod_switch
1218
1189
from bzrlib.tag import _merge_tags_if_possible
1219
1190
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1272
1243
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1244
errors.UnstackableRepositoryFormat), e:
1274
1245
note('Branched %d revision(s).' % branch.revno())
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1281
1247
# Switch to the new branch
1282
1248
wt, _ = WorkingTree.open_containing('.')
1396
1362
If you want to discard your local changes, you can just do a
1397
1363
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1403
1366
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1367
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1368
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1370
def run(self, dir='.'):
1412
1371
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1372
possible_transports = []
1415
master = branch.get_master_branch(
1373
master = tree.branch.get_master_branch(
1416
1374
possible_transports=possible_transports)
1417
1375
if master is not None:
1418
1376
tree.lock_write()
1422
1380
branch_location = tree.branch.base
1423
1381
self.add_cleanup(tree.unlock)
1424
1382
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1383
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1428
1385
existing_pending_merges = tree.get_parent_ids()[1:]
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1439
revision_id = branch.last_revision()
1440
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))
1386
last_rev = _mod_revision.ensure_null(tree.last_revision())
1387
if last_rev == _mod_revision.ensure_null(
1388
tree.branch.last_revision()):
1389
# may be up to date, check master too.
1390
if master is None or last_rev == _mod_revision.ensure_null(
1391
master.last_revision()):
1392
revno = tree.branch.revision_id_to_revno(last_rev)
1393
note('Tree is up to date at revision %d of branch %s'
1394
% (revno, branch_location))
1445
1396
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1450
conflicts = tree.update(
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1461
revno = tree.branch.revision_id_to_dotted_revno(
1397
conflicts = tree.update(
1398
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1399
view_info=view_info), possible_transports=possible_transports)
1400
revno = tree.branch.revision_id_to_revno(
1462
1401
_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:
1402
note('Updated to revision %d of branch %s' %
1403
(revno, branch_location))
1404
if tree.get_parent_ids()[1:] != existing_pending_merges:
1467
1405
note('Your local commits will now show as pending merges with '
1468
1406
"'bzr status', and can be committed with 'bzr commit'.")
1469
1407
if conflicts != 0:
1945
1883
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
1887
aliases = ['di', 'dif']
1954
1888
encoding_type = 'exact'
1956
1890
@display_command
1957
1891
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,
1892
prefix=None, old=None, new=None, using=None):
1893
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1962
1895
if (prefix is None) or (prefix == '0'):
1963
1896
# diff -p0 format
1977
1910
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1911
' 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
1913
(old_tree, new_tree,
1985
1914
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)
1915
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1916
file_list, revision, old, new, apply_view=True)
1988
1917
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1918
specific_files=specific_files,
1990
1919
external_diff_options=diff_options,
1991
1920
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1921
extra_trees=extra_trees, using=using)
1996
1924
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1925
"""List files deleted in the working tree.
1999
1927
# TODO: Show files deleted since a previous revision, or
2000
1928
# between two revisions.
2229
2157
:Tips & tricks:
2231
2159
GUI tools and IDEs are often better at exploring history than command
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2160
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2161
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2162
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2164
Web interfaces are often better at exploring history than command line
2165
tools, particularly for branches on servers. You may prefer Loggerhead
2166
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2237
2168
You may find it useful to add the aliases below to ``bazaar.conf``::
2429
2350
direction=direction, specific_fileids=file_ids,
2430
2351
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2352
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,
2353
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2354
Logger(b, rqst).show(lf)
2456
2375
raise errors.BzrCommandError(
2457
2376
"bzr %s doesn't accept two revisions in different"
2458
2377
" 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)
2378
rev1 = start_spec.in_history(branch)
2464
2379
# Avoid loading all of history when we know a missing
2465
2380
# end of range means the last revision ...
2466
2381
if end_spec.spec is None:
2660
2575
After adding, editing or deleting that file either indirectly by
2661
2576
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
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2677
2579
Note: ignore patterns containing shell wildcards must be quoted from
2678
2580
the shell on Unix.
2701
2599
Ignore everything but the "debian" toplevel directory::
2703
2601
bzr ignore "RE:(?!debian/).*"
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2709
bzr ignore "!./local"
2713
2604
_see_also = ['status', 'ignored', 'patterns']
2714
2605
takes_args = ['name_pattern*']
2715
2606
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2607
Option('old-default-rules',
2608
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2611
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2612
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)
2613
if old_default_rules is not None:
2614
# dump the rules and exit
2615
for pattern in ignores.OLD_DEFAULTS:
2727
2618
if not name_pattern_list:
2728
2619
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2620
"NAME_PATTERN or --old-default-rules")
2730
2621
name_pattern_list = [globbing.normalize_pattern(p)
2731
2622
for p in name_pattern_list]
2732
2623
for name_pattern in name_pattern_list:
2744
2635
if id is not None:
2745
2636
filename = entry[0]
2746
2637
if ignored.match(filename):
2747
matches.append(filename)
2638
matches.append(filename.encode('utf-8'))
2749
2640
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),))
2641
print "Warning: the following files are version controlled and" \
2642
" match your ignore pattern:\n%s" \
2643
"\nThese files will continue to be version controlled" \
2644
" unless you 'bzr remove' them." % ("\n".join(matches),)
2756
2647
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2648
"""List ignored files and the patterns that matched them.
2759
2650
List all the ignored files and the ignore pattern that caused the file to
2795
2686
revno = int(revno)
2796
2687
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)
2688
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2690
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2803
2693
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2694
"""Export current or past revision to a destination directory or archive.
2806
2696
If no revision is specified this exports the last committed revision.
2841
2731
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
2733
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2734
root=None, filters=False):
2848
2735
from bzrlib.export import export
2850
2737
if branch_or_subdir is None:
2858
2745
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)
2747
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2748
except errors.NoSuchExportFormat, e:
2863
2749
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2866
2752
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2753
"""Write the contents of a file as of a given revision to standard output.
2869
2755
If no revision is nominated, the last revision is used.
2942
2826
chunks = content.splitlines(True)
2943
2827
content = filtered_output_bytes(chunks, filters,
2944
2828
ContentFilterContext(relpath, rev_tree))
2946
2829
self.outf.writelines(content)
2949
2831
self.outf.write(content)
2952
2834
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2835
"""Show the offset in seconds from GMT to local time."""
2955
2837
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2839
print osutils.local_time_offset()
2961
2843
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2844
"""Commit changes into a new revision.
2964
2846
An explanatory message needs to be given for each commit. This is
2965
2847
often done by using the --message option (getting the message from the
3159
3041
'(use --file "%(f)s" to take commit message from that file)'
3160
3042
% { 'f': message })
3161
3043
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
3045
def get_message(commit_obj):
3170
3046
"""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,
3047
my_message = message
3048
if my_message is not None and '\r' in my_message:
3049
my_message = my_message.replace('\r\n', '\n')
3050
my_message = my_message.replace('\r', '\n')
3051
if my_message is None and not file:
3052
t = make_commit_message_template_encoded(tree,
3180
3053
selected_list, diff=show_diff,
3181
3054
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
3055
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3056
my_message = edit_commit_message_encoded(t,
3189
3057
start_message=start_message)
3190
3058
if my_message is None:
3191
3059
raise errors.BzrCommandError("please specify a commit"
3192
3060
" message with either --message or --file")
3061
elif my_message and file:
3062
raise errors.BzrCommandError(
3063
"please specify either --message or --file")
3065
my_message = codecs.open(file, 'rt',
3066
osutils.get_user_encoding()).read()
3193
3067
if my_message == "":
3194
3068
raise errors.BzrCommandError("empty commit message specified")
3195
3069
return my_message
3217
3093
raise errors.BzrCommandError("Commit refused because there are"
3218
3094
" unknown files in the working tree.")
3219
3095
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 '
3096
raise errors.BzrCommandError(str(e) + "\n"
3097
'To commit to master branch, run update and then commit.\n'
3098
'You can also pass --local to commit to continue working '
3227
3102
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3103
"""Validate working tree structure, branch consistency and repository history.
3230
3105
This command checks various invariants about branch and repository storage
3231
3106
to detect data corruption or bzr bugs.
3513
3388
def get_transport_type(typestring):
3514
3389
"""Parse and return a transport specifier."""
3515
3390
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3391
from bzrlib.transport.sftp import SFTPAbsoluteServer
3392
return SFTPAbsoluteServer
3518
3393
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3394
from bzrlib.transport.memory import MemoryServer
3521
3396
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3397
from bzrlib.transport.fakenfs import FakeNFSServer
3398
return FakeNFSServer
3524
3399
msg = "No known transport type %s. Supported types are: sftp\n" %\
3526
3401
raise errors.BzrCommandError(msg)
3610
3485
raise errors.BzrCommandError("subunit not available. subunit "
3611
3486
"needs to be installed to use --subunit.")
3612
3487
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
3489
self.additional_selftest_args.setdefault(
3620
3490
'suite_decorators', []).append(parallel)
3670
3540
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3541
"""Statement of optimism."""
3675
3545
@display_command
3677
self.outf.write("It sure does!\n")
3547
print "It sure does!"
3680
3550
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3551
"""Find and print a base revision for merging two branches."""
3682
3552
# TODO: Options to specify revisions on either side, as if
3683
3553
# merging only part of the history.
3684
3554
takes_args = ['branch', 'other']
3700
3570
graph = branch1.repository.get_graph(branch2.repository)
3701
3571
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3573
print 'merge base is revision %s' % base_rev_id
3706
3576
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3577
"""Perform a three-way merge.
3709
3579
The source of the merge can be specified either in the form of a branch,
3710
3580
or in the form of a path to a file containing a merge directive generated
3739
3609
committed to record the result of the merge.
3741
3611
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
3743
merge revision which has more than two parents.
3745
If one would like to merge changes from the working tree of the other
3746
branch without merging any committed revisions, the --uncommitted option
3749
3614
To select only some changes to merge, use "merge -i", which will prompt
3750
3615
you to apply each diff hunk and file change, similar to "shelve".
3854
3712
raise errors.BzrCommandError(
3855
3713
'Cannot use -r with merge directives or bundles')
3856
3714
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
3717
if merger is None and uncommitted:
3860
3718
if revision is not None and len(revision) > 0:
3861
3719
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
3720
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3721
merger = self.get_merger_from_uncommitted(tree, location, pb)
3864
3722
allow_pending = False
3866
3724
if merger is None:
3867
3725
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3726
location, revision, remember, possible_transports, pb)
3870
3728
merger.merge_type = merge_type
3871
3729
merger.reprocess = reprocess
4143
4000
# list, we imply that the working tree text has seen and rejected
4144
4001
# all the changes from the other tree, when in fact those changes
4145
4002
# have not yet been seen.
4003
pb = ui.ui_factory.nested_progress_bar()
4146
4004
tree.set_parent_ids(parents[:1])
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4006
merger = _mod_merge.Merger.from_revision_ids(pb,
4149
4008
merger.interesting_ids = interesting_ids
4150
4009
merger.merge_type = merge_type
4151
4010
merger.show_base = show_base
4185
4045
created as above. Directories containing unknown files will not be
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
4048
The working tree contains a list of pending merged revisions, which will
4049
be included as parents in the next commit. Normally, revert clears that
4050
list as well as reverting the files. If any files are specified, revert
4051
leaves the pending merge list alone and reverts only the files. Use "bzr
4052
revert ." in the tree root to revert all files but keep the merge record,
4053
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4054
reverting any files.
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4056
Using "bzr revert --forget-merges", it is possible to apply the changes
4057
from an arbitrary merge as a single revision. To do this, perform the
4058
merge as desired. Then doing revert with the "--forget-merges" option will
4059
keep the content of the tree as it was, but it will clear the list of
4060
pending merges. The next commit will then contain all of the changes that
4061
would have been in the merge, but without any mention of the other parent
4062
revisions. Because this technique forgets where these changes originated,
4063
it may cause additional conflicts on later merges involving the source and
4205
4064
target branches.
4228
4087
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4088
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)
4089
pb = ui.ui_factory.nested_progress_bar()
4091
tree.revert(file_list, rev_tree, not no_backup, pb,
4092
report_changes=True)
4234
4097
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4098
"""Test reporting of assertion failures"""
4236
4099
# intended just for use in testing
4377
4237
remote_branch = Branch.open(other_branch)
4378
4238
if remote_branch.base == local_branch.base:
4379
4239
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4241
local_branch.lock_read()
4242
self.add_cleanup(local_branch.unlock)
4384
4243
local_revid_range = _revision_range_to_revid_range(
4385
4244
_get_revision_range(my_revision, local_branch,
4247
remote_branch.lock_read()
4248
self.add_cleanup(remote_branch.unlock)
4388
4249
remote_revid_range = _revision_range_to_revid_range(
4389
4250
_get_revision_range(revision,
4390
4251
remote_branch, self.name()))
4451
4312
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.
4313
"""Compress the data within a repository."""
4470
4315
_see_also = ['repositories']
4471
4316
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):
4318
def run(self, branch_or_repo='.'):
4477
4319
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4321
branch = dir.open_branch()
4480
4322
repository = branch.repository
4481
4323
except errors.NotBranchError:
4482
4324
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4328
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4329
"""List the installed plugins.
4489
4331
This command displays the list of installed plugins including
4490
4332
version of plugin and a short description of each.
4497
4339
adding new commands, providing additional network transports and
4498
4340
customizing log output.
4500
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4501
for further information on plugins including where to find them and how to
4502
install them. Instructions are also provided there on how to write new
4503
plugins using the Python programming language.
4342
See the Bazaar web site, http://bazaar-vcs.org, for further
4343
information on plugins including where to find them and how to
4344
install them. Instructions are also provided there on how to
4345
write new plugins using the Python programming language.
4505
4347
takes_options = ['verbose']
4521
4363
doc = '(no description)'
4522
4364
result.append((name_ver, doc, plugin.path()))
4523
4365
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
4373
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4374
"""Show testament (signing-form) of a revision."""
4533
4375
takes_options = [
4535
4377
Option('long', help='Produce long-format testament.'),
4705
4546
'This format does not remember old locations.')
4707
4548
if location is None:
4708
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
4549
raise errors.BzrCommandError('No location supplied and no '
4550
'previous location known')
4713
4551
b_other = Branch.open(location)
4715
4553
b.bind(b_other)
4827
4665
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4668
print 'Dry-run, pretending to remove the above revisions.'
4670
val = raw_input('Press <enter> to continue')
4833
self.outf.write('The above revision(s) will be removed.\n')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4672
print 'The above revision(s) will be removed.'
4674
val = raw_input('Are you sure [y/N]? ')
4675
if val.lower() not in ('y', 'yes'):
4840
4679
mutter('Uncommitting from {%s} to {%s}',
4841
4680
last_rev_id, rev_id)
4842
4681
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4682
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)
4683
note('You can restore the old tip by running:\n'
4684
' bzr pull . -r revid:%s', last_rev_id)
4848
4687
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4688
"""Break a dead lock on a repository, branch or working directory.
4851
4690
CAUTION: Locks should only be broken when you are sure that the process
4852
4691
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4693
You can get information on what locks are open via the 'bzr info' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4861
4698
takes_args = ['location?']
5134
4971
directly from the merge directive, without retrieving data from a
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
4974
If --no-bundle is specified, then public_branch is needed (and must be
4975
up-to-date), so that the receiver can perform the merge using the
4976
public_branch. The public_branch is always included if known, so that
4977
people can check it later.
4979
The submit branch defaults to the parent, but can be overridden. Both
4980
submit branch and public branch will be remembered if supplied.
4982
If a public_branch is known for the submit_branch, that public submit
4983
branch is used in the merge instructions. This means that a local mirror
4984
can be used as your actual submit branch, once you have set public_branch
5164
4987
Mail is sent using your preferred mail program. This should be transparent
5165
4988
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5327
5146
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5147
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
5150
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5151
takes_args = ['tag_name']
5338
5152
takes_options = [
5339
5153
Option('delete',
5340
5154
help='Delete this tag rather than placing it.',
5373
5185
revision_id = revision[0].as_revision_id(branch)
5375
5187
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
5188
if (not force) and branch.tags.has_tag(tag_name):
5382
5189
raise errors.TagAlreadyExists(tag_name)
5383
5190
branch.tags.set_tag(tag_name, revision_id)
5572
5379
that of the master.
5575
takes_args = ['to_location?']
5382
takes_args = ['to_location']
5576
5383
takes_options = [Option('force',
5577
5384
help='Switch even if local commits will be lost.'),
5579
5385
Option('create-branch', short_name='b',
5580
5386
help='Create the target branch from this one before'
5581
5387
' switching to it.'),
5584
def run(self, to_location=None, force=False, create_branch=False,
5390
def run(self, to_location, force=False, create_branch=False):
5586
5391
from bzrlib import switch
5587
5392
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5393
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5596
5395
branch = control_dir.open_branch()
5597
5396
had_explicit_nick = branch.get_config().has_explicit_nickname()
5611
5408
to_branch = branch.bzrdir.sprout(to_location,
5612
5409
possible_transports=[branch.bzrdir.root_transport],
5613
5410
source_branch=branch).open_branch()
5412
# from_branch = control_dir.open_branch()
5413
# except errors.NotBranchError:
5414
# raise BzrCommandError('Cannot create a branch from this'
5415
# ' location when we cannot open this branch')
5416
# from_branch.bzrdir.sprout(
5616
5420
to_branch = Branch.open(to_location)
5618
5422
this_url = self._get_branch_location(control_dir)
5619
5423
to_branch = Branch.open(
5620
5424
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5425
switch.switch(control_dir, to_branch, force)
5624
5426
if had_explicit_nick:
5625
5427
branch = control_dir.open_branch() #get the new branch!
5626
5428
branch.nick = to_branch.nick
5819
5621
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
5624
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5625
"""Temporarily set aside some changes from the current tree.
5850
5627
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5628
ie. out of the way, until a later time when you can bring them back from
5934
5711
enum_switch=False, value_switches=True,
5935
5712
apply="Apply changes and remove from the shelf.",
5936
5713
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
5714
delete_only="Delete changes without applying them.",
5940
5715
keep="Apply changes but don't delete them.",
6032
5807
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)
5810
# these get imported and then picked up by the scan for cmd_*
5811
# TODO: Some more consistent way to split command definitions across files;
5812
# we do need to load at least some information about them to know of
5813
# aliases. ideally we would avoid loading the implementation until the
5814
# details were needed.
5815
from bzrlib.cmd_version_info import cmd_version_info
5816
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5817
from bzrlib.bundle.commands import (
5820
from bzrlib.foreign import cmd_dpush
5821
from bzrlib.sign_my_commits import cmd_sign_my_commits
5822
from bzrlib.weave_commands import cmd_versionedfile_list, \
5823
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
