To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 5121.2.5
- compare with another revision
- compare with revision 2001.2.1
- download diff
- download tarball
- view history from revision 5121.2.5
- Committer: Jelmer Vernooij
- Date: 2010-04-30 11:35:43 UTC
- mfrom: (5195 +trunk)
- mto: This revision was merged to the branch mainline in revision 5197.
- Revision ID: jelmer@samba.org-20100430113543-tiqqhmqa3d8no4iu
merge bzr.dev
- files added:
- bzrlib/tests/commands/test_revert.py
- bzrlib/tests/per_bzrdir_colo
- files renamed:
- contrib/apport/ => apport/
- contrib/apport/bzr.conf => apport/bzr-crashdb.conf
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
60
60
from bzrlib.workingtree import WorkingTree
61
61
""")
62
62
63
from bzrlib.commands import Command, display_command
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
64
68
from bzrlib.option import (
65
69
ListOption,
66
70
Option,
235
239
# opens the branch?)
236
240
237
241
class cmd_status(Command):
238
"""Display status summary.
242
__doc__ = """Display status summary.
239
243
240
244
This reports on versioned and unknown files, reporting them
241
245
grouped by state. Possible states are:
328
332
329
333
330
334
class cmd_cat_revision(Command):
331
"""Write out metadata for a revision.
335
__doc__ = """Write out metadata for a revision.
332
336
333
337
The revision to print can either be specified by a specific
334
338
revision identifier, or you can use --revision.
386
390
387
391
388
392
class cmd_dump_btree(Command):
389
"""Dump the contents of a btree index file to stdout.
393
__doc__ = """Dump the contents of a btree index file to stdout.
390
394
391
395
PATH is a btree index file, it can be any URL. This includes things like
392
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
467
471
468
472
469
473
class cmd_remove_tree(Command):
470
"""Remove the working tree from a given branch/checkout.
474
__doc__ = """Remove the working tree from a given branch/checkout.
471
475
472
476
Since a lightweight checkout is little more than a working tree
473
477
this will refuse to run against one.
500
504
if (working.has_changes()):
501
505
raise errors.UncommittedChanges(working)
502
506
503
working_path = working.bzrdir.root_transport.base
504
branch_path = working.branch.bzrdir.root_transport.base
505
if working_path != branch_path:
507
if working.user_url != working.branch.user_url:
506
508
raise errors.BzrCommandError("You cannot remove the working tree"
507
509
" from a lightweight checkout")
508
510
510
512
511
513
512
514
class cmd_revno(Command):
513
"""Show current revision number.
515
__doc__ = """Show current revision number.
514
516
515
517
This is equal to the number of revisions on this branch.
516
518
"""
546
548
547
549
548
550
class cmd_revision_info(Command):
549
"""Show revision number and revision id for a given revision identifier.
551
__doc__ = """Show revision number and revision id for a given revision identifier.
550
552
"""
551
553
hidden = True
552
554
takes_args = ['revision_info*']
608
610
609
611
610
612
class cmd_add(Command):
611
"""Add specified files or directories.
613
__doc__ = """Add specified files or directories.
612
614
613
615
In non-recursive mode, all the named items are added, regardless
614
616
of whether they were previously ignored. A warning is given if
694
696
695
697
696
698
class cmd_mkdir(Command):
697
"""Create a new versioned directory.
699
__doc__ = """Create a new versioned directory.
698
700
699
701
This is equivalent to creating the directory and then adding it.
700
702
"""
716
718
717
719
718
720
class cmd_relpath(Command):
719
"""Show path of a file relative to root"""
721
__doc__ = """Show path of a file relative to root"""
720
722
721
723
takes_args = ['filename']
722
724
hidden = True
731
733
732
734
733
735
class cmd_inventory(Command):
734
"""Show inventory of the current working copy or a revision.
736
__doc__ = """Show inventory of the current working copy or a revision.
735
737
736
738
It is possible to limit the output to a particular entry
737
739
type using the --kind option. For example: --kind file.
792
794
793
795
794
796
class cmd_mv(Command):
795
"""Move or rename a file.
797
__doc__ = """Move or rename a file.
796
798
797
799
:Usage:
798
800
bzr mv OLDNAME NEWNAME
929
931
930
932
931
933
class cmd_pull(Command):
932
"""Turn this branch into a mirror of another branch.
934
__doc__ = """Turn this branch into a mirror of another branch.
933
935
934
936
By default, this command only works on branches that have not diverged.
935
937
Branches are considered diverged if the destination branch's most recent
984
986
try:
985
987
tree_to = WorkingTree.open_containing(directory)[0]
986
988
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
987
991
except errors.NoWorkingTree:
988
992
tree_to = None
989
993
branch_to = Branch.open_containing(directory)[0]
990
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
991
997
if local and not branch_to.get_bound_location():
992
998
raise errors.LocalRequiresBoundBranch()
993
999
1023
1029
else:
1024
1030
branch_from = Branch.open(location,
1025
1031
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1026
1034
1027
1035
if branch_to.get_parent() is None or remember:
1028
1036
branch_to.set_parent(branch_from.base)
1029
1037
1030
if branch_from is not branch_to:
1031
branch_from.lock_read()
1032
self.add_cleanup(branch_from.unlock)
1033
1038
if revision is not None:
1034
1039
revision_id = revision.as_revision_id(branch_from)
1035
1040
1036
branch_to.lock_write()
1037
self.add_cleanup(branch_to.unlock)
1038
1041
if tree_to is not None:
1039
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1040
1043
change_reporter = delta._ChangeReporter(
1055
1058
1056
1059
1057
1060
class cmd_push(Command):
1058
"""Update a mirror of this branch.
1061
__doc__ = """Update a mirror of this branch.
1059
1062
1060
1063
The target branch will not have its working tree populated because this
1061
1064
is both expensive, and is not supported on remote file systems.
1122
1125
# Get the source branch
1123
1126
(tree, br_from,
1124
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1125
if strict is None:
1126
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1127
if strict is None: strict = True # default value
1128
1128
# Get the tip's revision_id
1129
1129
revision = _get_one_revision('push', revision)
1130
1130
if revision is not None:
1131
1131
revision_id = revision.in_history(br_from).rev_id
1132
1132
else:
1133
1133
revision_id = None
1134
if strict and tree is not None and revision_id is None:
1135
if (tree.has_changes()):
1136
raise errors.UncommittedChanges(
1137
tree, more='Use --no-strict to force the push.')
1138
if tree.last_revision() != tree.branch.last_revision():
1139
# The tree has lost sync with its branch, there is little
1140
# chance that the user is aware of it but he can still force
1141
# the push with --no-strict
1142
raise errors.OutOfDateTree(
1143
tree, more='Use --no-strict to force the push.')
1144
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.')
1145
1139
# Get the stacked_on branch, if any
1146
1140
if stacked_on is not None:
1147
1141
stacked_on = urlutils.normalize_url(stacked_on)
1179
1173
1180
1174
1181
1175
class cmd_branch(Command):
1182
"""Create a new branch that is a copy of an existing branch.
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1183
1177
1184
1178
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1185
1179
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1292
1286
1293
1287
1294
1288
class cmd_checkout(Command):
1295
"""Create a new checkout of an existing branch.
1289
__doc__ = """Create a new checkout of an existing branch.
1296
1290
1297
1291
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1298
1292
the branch found in '.'. This is useful if you have removed the working tree
1361
1355
1362
1356
1363
1357
class cmd_renames(Command):
1364
"""Show list of renamed files.
1358
__doc__ = """Show list of renamed files.
1365
1359
"""
1366
1360
# TODO: Option to show renames between two historical versions.
1367
1361
1393
1387
1394
1388
1395
1389
class cmd_update(Command):
1396
"""Update a tree to have the latest code committed to its branch.
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1397
1391
1398
1392
This will perform a merge into the working tree, and may generate
1399
1393
conflicts. If you have any local changes, you will still
1444
1438
else:
1445
1439
revision_id = branch.last_revision()
1446
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1447
revno = branch.revision_id_to_revno(revision_id)
1448
note("Tree is up to date at revision %d of branch %s" %
1449
(revno, branch_location))
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))
1450
1444
return 0
1451
1445
view_info = _get_view_info_for_change_reporter(tree)
1452
1446
change_reporter = delta._ChangeReporter(
1464
1458
"bzr update --revision only works"
1465
1459
" for a revision in the branch history"
1466
1460
% (e.revision))
1467
revno = tree.branch.revision_id_to_revno(
1461
revno = tree.branch.revision_id_to_dotted_revno(
1468
1462
_mod_revision.ensure_null(tree.last_revision()))
1469
note('Updated to revision %d of branch %s' %
1470
(revno, branch_location))
1471
if tree.get_parent_ids()[1:] != existing_pending_merges:
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:
1472
1467
note('Your local commits will now show as pending merges with '
1473
1468
"'bzr status', and can be committed with 'bzr commit'.")
1474
1469
if conflicts != 0:
1478
1473
1479
1474
1480
1475
class cmd_info(Command):
1481
"""Show information about a working tree, branch or repository.
1476
__doc__ = """Show information about a working tree, branch or repository.
1482
1477
1483
1478
This command will show all known locations and formats associated to the
1484
1479
tree, branch or repository.
1522
1517
1523
1518
1524
1519
class cmd_remove(Command):
1525
"""Remove files or directories.
1520
__doc__ = """Remove files or directories.
1526
1521
1527
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1528
1523
them if they can easily be recovered using revert. If no options or
1576
1571
1577
1572
1578
1573
class cmd_file_id(Command):
1579
"""Print file_id of a particular file or directory.
1574
__doc__ = """Print file_id of a particular file or directory.
1580
1575
1581
1576
The file_id is assigned when the file is first added and remains the
1582
1577
same through all revisions where the file exists, even when it is
1598
1593
1599
1594
1600
1595
class cmd_file_path(Command):
1601
"""Print path of file_ids to a file or directory.
1596
__doc__ = """Print path of file_ids to a file or directory.
1602
1597
1603
1598
This prints one line for each directory down to the target,
1604
1599
starting at the branch root.
1620
1615
1621
1616
1622
1617
class cmd_reconcile(Command):
1623
"""Reconcile bzr metadata in a branch.
1618
__doc__ = """Reconcile bzr metadata in a branch.
1624
1619
1625
1620
This can correct data mismatches that may have been caused by
1626
1621
previous ghost operations or bzr upgrades. You should only
1648
1643
1649
1644
1650
1645
class cmd_revision_history(Command):
1651
"""Display the list of revision ids on a branch."""
1646
__doc__ = """Display the list of revision ids on a branch."""
1652
1647
1653
1648
_see_also = ['log']
1654
1649
takes_args = ['location?']
1664
1659
1665
1660
1666
1661
class cmd_ancestry(Command):
1667
"""List all revisions merged into this branch."""
1662
__doc__ = """List all revisions merged into this branch."""
1668
1663
1669
1664
_see_also = ['log', 'revision-history']
1670
1665
takes_args = ['location?']
1689
1684
1690
1685
1691
1686
class cmd_init(Command):
1692
"""Make a directory into a versioned branch.
1687
__doc__ = """Make a directory into a versioned branch.
1693
1688
1694
1689
Use this to create an empty branch, or before importing an
1695
1690
existing project.
1798
1793
1799
1794
1800
1795
class cmd_init_repository(Command):
1801
"""Create a shared repository for branches to share storage space.
1796
__doc__ = """Create a shared repository for branches to share storage space.
1802
1797
1803
1798
New branches created under the repository directory will store their
1804
1799
revisions in the repository, not in the branch directory. For branches
1858
1853
1859
1854
1860
1855
class cmd_diff(Command):
1861
"""Show differences in the working tree, between revisions or branches.
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1862
1857
1863
1858
If no arguments are given, all changes for the current tree are listed.
1864
1859
If files are given, only the changes in those files are listed.
1950
1945
help='Use this command to compare files.',
1951
1946
type=unicode,
1952
1947
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1953
1952
]
1954
1953
aliases = ['di', 'dif']
1955
1954
encoding_type = 'exact'
1956
1955
1957
1956
@display_command
1958
1957
def run(self, revision=None, file_list=None, diff_options=None,
1959
prefix=None, old=None, new=None, using=None):
1960
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1960
show_diff_trees)
1961
1961
1962
1962
if (prefix is None) or (prefix == '0'):
1963
1963
# diff -p0 format
1977
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1978
' one or two revision specifiers')
1979
1979
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1980
1984
(old_tree, new_tree,
1981
1985
old_branch, new_branch,
1982
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1983
file_list, revision, old, new, apply_view=True)
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1984
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1985
1989
specific_files=specific_files,
1986
1990
external_diff_options=diff_options,
1987
1991
old_label=old_label, new_label=new_label,
1988
extra_trees=extra_trees, using=using)
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1989
1994
1990
1995
1991
1996
class cmd_deleted(Command):
1992
"""List files deleted in the working tree.
1997
__doc__ = """List files deleted in the working tree.
1993
1998
"""
1994
1999
# TODO: Show files deleted since a previous revision, or
1995
2000
# between two revisions.
2018
2023
2019
2024
2020
2025
class cmd_modified(Command):
2021
"""List files modified in working tree.
2026
__doc__ = """List files modified in working tree.
2022
2027
"""
2023
2028
2024
2029
hidden = True
2041
2046
2042
2047
2043
2048
class cmd_added(Command):
2044
"""List files added in working tree.
2049
__doc__ = """List files added in working tree.
2045
2050
"""
2046
2051
2047
2052
hidden = True
2077
2082
2078
2083
2079
2084
class cmd_root(Command):
2080
"""Show the tree root directory.
2085
__doc__ = """Show the tree root directory.
2081
2086
2082
2087
The root is the nearest enclosing directory with a .bzr control
2083
2088
directory."""
2107
2112
2108
2113
2109
2114
class cmd_log(Command):
2110
"""Show historical log for a branch or subset of a branch.
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2111
2116
2112
2117
log is bzr's default tool for exploring the history of a branch.
2113
2118
The branch to use is taken from the first parameter. If no parameters
2294
2299
help='Show changes made in each revision as a patch.'),
2295
2300
Option('include-merges',
2296
2301
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)'
2305
)
2297
2306
]
2298
2307
encoding_type = 'replace'
2299
2308
2309
2318
message=None,
2310
2319
limit=None,
2311
2320
show_diff=False,
2312
include_merges=False):
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2313
2324
from bzrlib.log import (
2314
2325
Logger,
2315
2326
make_log_request_dict,
2316
2327
_get_info_for_log_files,
2317
2328
)
2318
2329
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')
2319
2334
if include_merges:
2320
2335
if levels is None:
2321
2336
levels = 0
2414
2429
direction=direction, specific_fileids=file_ids,
2415
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2416
2431
message_search=message, delta_type=delta_type,
2417
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2434
)
2418
2435
Logger(b, rqst).show(lf)
2419
2436
2420
2437
2478
2495
2479
2496
2480
2497
class cmd_touching_revisions(Command):
2481
"""Return revision-ids which affected a particular file.
2498
__doc__ = """Return revision-ids which affected a particular file.
2482
2499
2483
2500
A more user-friendly interface is "bzr log FILE".
2484
2501
"""
2499
2516
2500
2517
2501
2518
class cmd_ls(Command):
2502
"""List files in a tree.
2519
__doc__ = """List files in a tree.
2503
2520
"""
2504
2521
2505
2522
_see_also = ['status', 'cat']
2616
2633
2617
2634
2618
2635
class cmd_unknowns(Command):
2619
"""List unknown files.
2636
__doc__ = """List unknown files.
2620
2637
"""
2621
2638
2622
2639
hidden = True
2629
2646
2630
2647
2631
2648
class cmd_ignore(Command):
2632
"""Ignore specified files or patterns.
2649
__doc__ = """Ignore specified files or patterns.
2633
2650
2634
2651
See ``bzr help patterns`` for details on the syntax of patterns.
2635
2652
2644
2661
using this command or directly by using an editor, be sure to commit
2645
2662
it.
2646
2663
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.
2669
2647
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2648
2671
precedence over regular ignores. Such exceptions are used to specify
2649
2672
files that should be versioned which would otherwise be ignored.
2690
2713
_see_also = ['status', 'ignored', 'patterns']
2691
2714
takes_args = ['name_pattern*']
2692
2715
takes_options = [
2693
Option('old-default-rules',
2694
help='Write out the ignore rules bzr < 0.9 always used.')
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2695
2718
]
2696
2719
2697
def run(self, name_pattern_list=None, old_default_rules=None):
2720
def run(self, name_pattern_list=None, default_rules=None):
2698
2721
from bzrlib import ignores
2699
if old_default_rules is not None:
2700
# dump the rules and exit
2701
for pattern in ignores.OLD_DEFAULTS:
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2702
2725
self.outf.write("%s\n" % pattern)
2703
2726
return
2704
2727
if not name_pattern_list:
2705
2728
raise errors.BzrCommandError("ignore requires at least one "
2706
"NAME_PATTERN or --old-default-rules")
2729
"NAME_PATTERN or --default-rules.")
2707
2730
name_pattern_list = [globbing.normalize_pattern(p)
2708
2731
for p in name_pattern_list]
2709
2732
for name_pattern in name_pattern_list:
2731
2754
2732
2755
2733
2756
class cmd_ignored(Command):
2734
"""List ignored files and the patterns that matched them.
2757
__doc__ = """List ignored files and the patterns that matched them.
2735
2758
2736
2759
List all the ignored files and the ignore pattern that caused the file to
2737
2760
be ignored.
2758
2781
2759
2782
2760
2783
class cmd_lookup_revision(Command):
2761
"""Lookup the revision-id from a revision-number
2784
__doc__ = """Lookup the revision-id from a revision-number
2762
2785
2763
2786
:Examples:
2764
2787
bzr lookup-revision 33
2778
2801
2779
2802
2780
2803
class cmd_export(Command):
2781
"""Export current or past revision to a destination directory or archive.
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2782
2805
2783
2806
If no revision is specified this exports the last committed revision.
2784
2807
2841
2864
2842
2865
2843
2866
class cmd_cat(Command):
2844
"""Write the contents of a file as of a given revision to standard output.
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2845
2868
2846
2869
If no revision is nominated, the last revision is used.
2847
2870
2927
2950
2928
2951
2929
2952
class cmd_local_time_offset(Command):
2930
"""Show the offset in seconds from GMT to local time."""
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2931
2954
hidden = True
2932
2955
@display_command
2933
2956
def run(self):
2936
2959
2937
2960
2938
2961
class cmd_commit(Command):
2939
"""Commit changes into a new revision.
2962
__doc__ = """Commit changes into a new revision.
2940
2963
2941
2964
An explanatory message needs to be given for each commit. This is
2942
2965
often done by using the --message option (getting the message from the
3050
3073
"the master branch until a normal commit "
3051
3074
"is performed."
3052
3075
),
3053
Option('show-diff',
3076
Option('show-diff', short_name='p',
3054
3077
help='When no message is supplied, show the diff along'
3055
3078
' with the status summary in the message editor.'),
3056
3079
]
3136
3159
'(use --file "%(f)s" to take commit message from that file)'
3137
3160
% { 'f': message })
3138
3161
ui.ui_factory.show_warning(warning_msg)
3162
if '\r' in message:
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3165
if file:
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3139
3168
3140
3169
def get_message(commit_obj):
3141
3170
"""Callback to get commit message"""
3142
my_message = message
3143
if my_message is not None and '\r' in my_message:
3144
my_message = my_message.replace('\r\n', '\n')
3145
my_message = my_message.replace('\r', '\n')
3146
if my_message is None and not file:
3147
t = make_commit_message_template_encoded(tree,
3171
if file:
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3176
else:
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
3148
3180
selected_list, diff=show_diff,
3149
3181
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
3186
# avoid this.
3150
3187
start_message = generate_commit_message_template(commit_obj)
3151
my_message = edit_commit_message_encoded(t,
3188
my_message = edit_commit_message_encoded(text,
3152
3189
start_message=start_message)
3153
3190
if my_message is None:
3154
3191
raise errors.BzrCommandError("please specify a commit"
3155
3192
" message with either --message or --file")
3156
elif my_message and file:
3157
raise errors.BzrCommandError(
3158
"please specify either --message or --file")
3159
if file:
3160
my_message = codecs.open(file, 'rt',
3161
osutils.get_user_encoding()).read()
3162
3193
if my_message == "":
3163
3194
raise errors.BzrCommandError("empty commit message specified")
3164
3195
return my_message
3176
3207
timezone=offset,
3177
3208
exclude=safe_relpath_files(tree, exclude))
3178
3209
except PointlessCommit:
3179
# FIXME: This should really happen before the file is read in;
3180
# perhaps prepare the commit; get the message; then actually commit
3181
3210
raise errors.BzrCommandError("No changes to commit."
3182
3211
" Use --unchanged to commit anyhow.")
3183
3212
except ConflictsInTree:
3196
3225
3197
3226
3198
3227
class cmd_check(Command):
3199
"""Validate working tree structure, branch consistency and repository history.
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3200
3229
3201
3230
This command checks various invariants about branch and repository storage
3202
3231
to detect data corruption or bzr bugs.
3266
3295
3267
3296
3268
3297
class cmd_upgrade(Command):
3269
"""Upgrade branch storage to current format.
3298
__doc__ = """Upgrade branch storage to current format.
3270
3299
3271
3300
The check command or bzr developers may sometimes advise you to run
3272
3301
this command. When the default format has changed you may also be warned
3290
3319
3291
3320
3292
3321
class cmd_whoami(Command):
3293
"""Show or set bzr user id.
3322
__doc__ = """Show or set bzr user id.
3294
3323
3295
3324
:Examples:
3296
3325
Show the email of the current user::
3340
3369
3341
3370
3342
3371
class cmd_nick(Command):
3343
"""Print or set the branch nickname.
3372
__doc__ = """Print or set the branch nickname.
3344
3373
3345
3374
If unset, the tree root directory name is used as the nickname.
3346
3375
To print the current nickname, execute with no argument.
3364
3393
3365
3394
3366
3395
class cmd_alias(Command):
3367
"""Set/unset and display aliases.
3396
__doc__ = """Set/unset and display aliases.
3368
3397
3369
3398
:Examples:
3370
3399
Show the current aliases::
3434
3463
3435
3464
3436
3465
class cmd_selftest(Command):
3437
"""Run internal test suite.
3466
__doc__ = """Run internal test suite.
3438
3467
3439
3468
If arguments are given, they are regular expressions that say which tests
3440
3469
should run. Tests matching any expression are run, and other tests are
3581
3610
raise errors.BzrCommandError("subunit not available. subunit "
3582
3611
"needs to be installed to use --subunit.")
3583
3612
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:
3616
import msvcrt
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3584
3618
if parallel:
3585
3619
self.additional_selftest_args.setdefault(
3586
3620
'suite_decorators', []).append(parallel)
3617
3651
3618
3652
3619
3653
class cmd_version(Command):
3620
"""Show version of bzr."""
3654
__doc__ = """Show version of bzr."""
3621
3655
3622
3656
encoding_type = 'replace'
3623
3657
takes_options = [
3634
3668
3635
3669
3636
3670
class cmd_rocks(Command):
3637
"""Statement of optimism."""
3671
__doc__ = """Statement of optimism."""
3638
3672
3639
3673
hidden = True
3640
3674
3644
3678
3645
3679
3646
3680
class cmd_find_merge_base(Command):
3647
"""Find and print a base revision for merging two branches."""
3681
__doc__ = """Find and print a base revision for merging two branches."""
3648
3682
# TODO: Options to specify revisions on either side, as if
3649
3683
# merging only part of the history.
3650
3684
takes_args = ['branch', 'other']
3670
3704
3671
3705
3672
3706
class cmd_merge(Command):
3673
"""Perform a three-way merge.
3707
__doc__ = """Perform a three-way merge.
3674
3708
3675
3709
The source of the merge can be specified either in the form of a branch,
3676
3710
or in the form of a path to a file containing a merge directive generated
4031
4065
4032
4066
4033
4067
class cmd_remerge(Command):
4034
"""Redo a merge.
4068
__doc__ = """Redo a merge.
4035
4069
4036
4070
Use this if you want to try a different merge technique while resolving
4037
4071
conflicts. Some merge techniques are better than others, and remerge
4062
4096
4063
4097
def run(self, file_list=None, merge_type=None, show_base=False,
4064
4098
reprocess=False):
4099
from bzrlib.conflicts import restore
4065
4100
if merge_type is None:
4066
4101
merge_type = _mod_merge.Merge3Merger
4067
4102
tree, file_list = tree_files(file_list)
4125
4160
4126
4161
4127
4162
class cmd_revert(Command):
4128
"""Revert files to a previous revision.
4163
__doc__ = """Revert files to a previous revision.
4129
4164
4130
4165
Giving a list of files will revert only those files. Otherwise, all files
4131
4166
will be reverted. If the revision is not specified with '--revision', the
4182
4217
def run(self, revision=None, no_backup=False, file_list=None,
4183
4218
forget_merges=None):
4184
4219
tree, file_list = tree_files(file_list)
4185
tree.lock_write()
4220
tree.lock_tree_write()
4186
4221
self.add_cleanup(tree.unlock)
4187
4222
if forget_merges:
4188
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4197
4232
4198
4233
4199
4234
class cmd_assert_fail(Command):
4200
"""Test reporting of assertion failures"""
4235
__doc__ = """Test reporting of assertion failures"""
4201
4236
# intended just for use in testing
4202
4237
4203
4238
hidden = True
4207
4242
4208
4243
4209
4244
class cmd_help(Command):
4210
"""Show help on a command or other topic.
4245
__doc__ = """Show help on a command or other topic.
4211
4246
"""
4212
4247
4213
4248
_see_also = ['topics']
4226
4261
4227
4262
4228
4263
class cmd_shell_complete(Command):
4229
"""Show appropriate completions for context.
4264
__doc__ = """Show appropriate completions for context.
4230
4265
4231
4266
For a list of all available commands, say 'bzr shell-complete'.
4232
4267
"""
4241
4276
4242
4277
4243
4278
class cmd_missing(Command):
4244
"""Show unmerged/unpulled revisions between two branches.
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4245
4280
4246
4281
OTHER_BRANCH may be local or remote.
4247
4282
4325
4360
restrict = 'remote'
4326
4361
4327
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4328
4366
parent = local_branch.get_parent()
4329
4367
if other_branch is None:
4330
4368
other_branch = parent
4339
4377
remote_branch = Branch.open(other_branch)
4340
4378
if remote_branch.base == local_branch.base:
4341
4379
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4342
4383
4343
local_branch.lock_read()
4344
self.add_cleanup(local_branch.unlock)
4345
4384
local_revid_range = _revision_range_to_revid_range(
4346
4385
_get_revision_range(my_revision, local_branch,
4347
4386
self.name()))
4348
4387
4349
remote_branch.lock_read()
4350
self.add_cleanup(remote_branch.unlock)
4351
4388
remote_revid_range = _revision_range_to_revid_range(
4352
4389
_get_revision_range(revision,
4353
4390
remote_branch, self.name()))
4412
4449
4413
4450
4414
4451
class cmd_pack(Command):
4415
"""Compress the data within a repository."""
4452
__doc__ = """Compress the data within a repository.
4453
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.
4457
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
4462
used.
4463
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.
4468
"""
4416
4469
4417
4470
_see_also = ['repositories']
4418
4471
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4419
4475
4420
def run(self, branch_or_repo='.'):
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4421
4477
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4422
4478
try:
4423
4479
branch = dir.open_branch()
4424
4480
repository = branch.repository
4425
4481
except errors.NotBranchError:
4426
4482
repository = dir.open_repository()
4427
repository.pack()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4428
4484
4429
4485
4430
4486
class cmd_plugins(Command):
4431
"""List the installed plugins.
4487
__doc__ = """List the installed plugins.
4432
4488
4433
4489
This command displays the list of installed plugins including
4434
4490
version of plugin and a short description of each.
4473
4529
4474
4530
4475
4531
class cmd_testament(Command):
4476
"""Show testament (signing-form) of a revision."""
4532
__doc__ = """Show testament (signing-form) of a revision."""
4477
4533
takes_options = [
4478
4534
'revision',
4479
4535
Option('long', help='Produce long-format testament.'),
4505
4561
4506
4562
4507
4563
class cmd_annotate(Command):
4508
"""Show the origin of each line in a file.
4564
__doc__ = """Show the origin of each line in a file.
4509
4565
4510
4566
This prints out the given file with an annotation on the left side
4511
4567
indicating which revision, author and date introduced the change.
4558
4614
4559
4615
4560
4616
class cmd_re_sign(Command):
4561
"""Create a digital signature for an existing revision."""
4617
__doc__ = """Create a digital signature for an existing revision."""
4562
4618
# TODO be able to replace existing ones.
4563
4619
4564
4620
hidden = True # is this right ?
4624
4680
4625
4681
4626
4682
class cmd_bind(Command):
4627
"""Convert the current branch into a checkout of the supplied branch.
4683
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4628
4684
4629
4685
Once converted into a checkout, commits must succeed on the master branch
4630
4686
before they will be applied to the local branch.
4664
4720
4665
4721
4666
4722
class cmd_unbind(Command):
4667
"""Convert the current checkout into a regular branch.
4723
__doc__ = """Convert the current checkout into a regular branch.
4668
4724
4669
4725
After unbinding, the local branch is considered independent and subsequent
4670
4726
commits will be local only.
4681
4737
4682
4738
4683
4739
class cmd_uncommit(Command):
4684
"""Remove the last committed revision.
4740
__doc__ = """Remove the last committed revision.
4685
4741
4686
4742
--verbose will print out what is being removed.
4687
4743
--dry-run will go through all the motions, but not actually
4789
4845
4790
4846
4791
4847
class cmd_break_lock(Command):
4792
"""Break a dead lock on a repository, branch or working directory.
4848
__doc__ = """Break a dead lock on a repository, branch or working directory.
4793
4849
4794
4850
CAUTION: Locks should only be broken when you are sure that the process
4795
4851
holding the lock has been stopped.
4814
4870
4815
4871
4816
4872
class cmd_wait_until_signalled(Command):
4817
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4873
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4818
4874
4819
4875
This just prints a line to signal when it is ready, then blocks on stdin.
4820
4876
"""
4828
4884
4829
4885
4830
4886
class cmd_serve(Command):
4831
"""Run the bzr server."""
4887
__doc__ = """Run the bzr server."""
4832
4888
4833
4889
aliases = ['server']
4834
4890
4894
4950
4895
4951
4896
4952
class cmd_join(Command):
4897
"""Combine a tree into its containing tree.
4953
__doc__ = """Combine a tree into its containing tree.
4898
4954
4899
4955
This command requires the target tree to be in a rich-root format.
4900
4956
4940
4996
4941
4997
4942
4998
class cmd_split(Command):
4943
"""Split a subdirectory of a tree into a separate tree.
4999
__doc__ = """Split a subdirectory of a tree into a separate tree.
4944
5000
4945
5001
This command will produce a target tree in a format that supports
4946
5002
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4966
5022
4967
5023
4968
5024
class cmd_merge_directive(Command):
4969
"""Generate a merge directive for auto-merge tools.
5025
__doc__ = """Generate a merge directive for auto-merge tools.
4970
5026
4971
5027
A directive requests a merge to be performed, and also provides all the
4972
5028
information necessary to do so. This means it must either include a
5065
5121
5066
5122
5067
5123
class cmd_send(Command):
5068
"""Mail or create a merge-directive for submitting changes.
5124
__doc__ = """Mail or create a merge-directive for submitting changes.
5069
5125
5070
5126
A merge directive provides many things needed for requesting merges:
5071
5127
5182
5238
5183
5239
5184
5240
class cmd_bundle_revisions(cmd_send):
5185
"""Create a merge-directive for submitting changes.
5241
__doc__ = """Create a merge-directive for submitting changes.
5186
5242
5187
5243
A merge directive provides many things needed for requesting merges:
5188
5244
5255
5311
5256
5312
5257
5313
class cmd_tag(Command):
5258
"""Create, remove or modify a tag naming a revision.
5314
__doc__ = """Create, remove or modify a tag naming a revision.
5259
5315
5260
5316
Tags give human-meaningful names to revisions. Commands that take a -r
5261
5317
(--revision) option can be given -rtag:X, where X is any previously
5328
5384
5329
5385
5330
5386
class cmd_tags(Command):
5331
"""List tags.
5387
__doc__ = """List tags.
5332
5388
5333
5389
This command shows a table of tag names and the revisions they reference.
5334
5390
"""
5402
5458
5403
5459
5404
5460
class cmd_reconfigure(Command):
5405
"""Reconfigure the type of a bzr directory.
5461
__doc__ = """Reconfigure the type of a bzr directory.
5406
5462
5407
5463
A target configuration must be specified.
5408
5464
5493
5549
5494
5550
5495
5551
class cmd_switch(Command):
5496
"""Set the branch of a checkout and update.
5552
__doc__ = """Set the branch of a checkout and update.
5497
5553
5498
5554
For lightweight checkouts, this changes the branch being referenced.
5499
5555
For heavyweight checkouts, this checks that there are no local commits
5589
5645
5590
5646
5591
5647
class cmd_view(Command):
5592
"""Manage filtered views.
5648
__doc__ = """Manage filtered views.
5593
5649
5594
5650
Views provide a mask over the tree so that users can focus on
5595
5651
a subset of a tree when doing their work. After creating a view,
5743
5799
5744
5800
5745
5801
class cmd_hooks(Command):
5746
"""Show hooks."""
5802
__doc__ = """Show hooks."""
5747
5803
5748
5804
hidden = True
5749
5805
5763
5819
5764
5820
5765
5821
class cmd_remove_branch(Command):
5766
"""Remove a branch.
5822
__doc__ = """Remove a branch.
5767
5823
5768
5824
This will remove the branch from the specified location but
5769
5825
will keep any working tree or repository in place.
5788
5844
5789
5845
5790
5846
class cmd_shelve(Command):
5791
"""Temporarily set aside some changes from the current tree.
5847
__doc__ = """Temporarily set aside some changes from the current tree.
5792
5848
5793
5849
Shelve allows you to temporarily put changes you've made "on the shelf",
5794
5850
ie. out of the way, until a later time when you can bring them back from
5863
5919
5864
5920
5865
5921
class cmd_unshelve(Command):
5866
"""Restore shelved changes.
5922
__doc__ = """Restore shelved changes.
5867
5923
5868
5924
By default, the most recently shelved changes are restored. However if you
5869
5925
specify a shelf by id those changes will be restored instead. This works
5895
5951
5896
5952
5897
5953
class cmd_clean_tree(Command):
5898
"""Remove unwanted files from working tree.
5954
__doc__ = """Remove unwanted files from working tree.
5899
5955
5900
5956
By default, only unknown files, not ignored files, are deleted. Versioned
5901
5957
files are never deleted.
5929
5985
5930
5986
5931
5987
class cmd_reference(Command):
5932
"""list, view and set branch locations for nested trees.
5988
__doc__ = """list, view and set branch locations for nested trees.
5933
5989
5934
5990
If no arguments are provided, lists the branch locations for nested trees.
5935
5991
If one argument is provided, display the branch location for that tree.
5975
6031
self.outf.write('%s %s\n' % (path, location))
5976
6032
5977
6033
5978
from bzrlib.cmd_version_info import cmd_version_info
5979
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5980
from bzrlib.foreign import cmd_dpush
5981
from bzrlib.sign_my_commits import cmd_sign_my_commits
6034
def _register_lazy_builtins():
6035
# register lazy builtins from other modules; called at startup and should
6036
# be only called once.
6037
for (name, aliases, module_name) in [
6038
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6039
('cmd_dpush', [], 'bzrlib.foreign'),
6040
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6041
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6042
('cmd_conflicts', [], 'bzrlib.conflicts'),
6043
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6044
]:
6045
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0