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 5127.1.5
- compare with another revision
- download diff
- download tarball
- view history from revision 5127.1.5
- Committer: Martin Pool
- Date: 2010-04-01 04:41:18 UTC
- mto: This revision was merged to the branch mainline in revision 5128.
- Revision ID: mbp@sourcefrog.net-20100401044118-shyctqc02ob08ngz
ignore .testrepository
- files removed:
- bzrlib/tests/commands/test_revert.py
- bzrlib/tests/per_bzrdir_colo
- files renamed:
- apport/ => contrib/apport/
- apport/bzr-crashdb.conf => contrib/apport/bzr.conf
- files modified:
- Makefile
added
removed
bzrlib/builtins.py
239
239
# opens the branch?)
240
240
241
241
class cmd_status(Command):
242
__doc__ = """Display status summary.
242
"""Display status summary.
243
243
244
244
This reports on versioned and unknown files, reporting them
245
245
grouped by state. Possible states are:
332
332
333
333
334
334
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
335
"""Write out metadata for a revision.
336
336
337
337
The revision to print can either be specified by a specific
338
338
revision identifier, or you can use --revision.
390
390
391
391
392
392
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
393
"""Dump the contents of a btree index file to stdout.
394
394
395
395
PATH is a btree index file, it can be any URL. This includes things like
396
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
471
471
472
472
473
473
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
474
"""Remove the working tree from a given branch/checkout.
475
475
476
476
Since a lightweight checkout is little more than a working tree
477
477
this will refuse to run against one.
504
504
if (working.has_changes()):
505
505
raise errors.UncommittedChanges(working)
506
506
507
if working.user_url != working.branch.user_url:
507
working_path = working.bzrdir.root_transport.base
508
branch_path = working.branch.bzrdir.root_transport.base
509
if working_path != branch_path:
508
510
raise errors.BzrCommandError("You cannot remove the working tree"
509
511
" from a lightweight checkout")
510
512
512
514
513
515
514
516
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
517
"""Show current revision number.
516
518
517
519
This is equal to the number of revisions on this branch.
518
520
"""
548
550
549
551
550
552
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
553
"""Show revision number and revision id for a given revision identifier.
552
554
"""
553
555
hidden = True
554
556
takes_args = ['revision_info*']
610
612
611
613
612
614
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
615
"""Add specified files or directories.
614
616
615
617
In non-recursive mode, all the named items are added, regardless
616
618
of whether they were previously ignored. A warning is given if
696
698
697
699
698
700
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
701
"""Create a new versioned directory.
700
702
701
703
This is equivalent to creating the directory and then adding it.
702
704
"""
718
720
719
721
720
722
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
723
"""Show path of a file relative to root"""
722
724
723
725
takes_args = ['filename']
724
726
hidden = True
733
735
734
736
735
737
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
738
"""Show inventory of the current working copy or a revision.
737
739
738
740
It is possible to limit the output to a particular entry
739
741
type using the --kind option. For example: --kind file.
794
796
795
797
796
798
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
799
"""Move or rename a file.
798
800
799
801
:Usage:
800
802
bzr mv OLDNAME NEWNAME
931
933
932
934
933
935
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
936
"""Turn this branch into a mirror of another branch.
935
937
936
938
By default, this command only works on branches that have not diverged.
937
939
Branches are considered diverged if the destination branch's most recent
986
988
try:
987
989
tree_to = WorkingTree.open_containing(directory)[0]
988
990
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
991
except errors.NoWorkingTree:
992
992
tree_to = None
993
993
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
994
997
995
if local and not branch_to.get_bound_location():
998
996
raise errors.LocalRequiresBoundBranch()
999
997
1029
1027
else:
1030
1028
branch_from = Branch.open(location,
1031
1029
possible_transports=possible_transports)
1030
1031
if branch_to.get_parent() is None or remember:
1032
branch_to.set_parent(branch_from.base)
1033
1034
if branch_from is not branch_to:
1032
1035
branch_from.lock_read()
1033
1036
self.add_cleanup(branch_from.unlock)
1034
1035
if branch_to.get_parent() is None or remember:
1036
branch_to.set_parent(branch_from.base)
1037
1038
1037
if revision is not None:
1039
1038
revision_id = revision.as_revision_id(branch_from)
1040
1039
1040
branch_to.lock_write()
1041
self.add_cleanup(branch_to.unlock)
1041
1042
if tree_to is not None:
1042
1043
view_info = _get_view_info_for_change_reporter(tree_to)
1043
1044
change_reporter = delta._ChangeReporter(
1058
1059
1059
1060
1060
1061
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1062
"""Update a mirror of this branch.
1062
1063
1063
1064
The target branch will not have its working tree populated because this
1064
1065
is both expensive, and is not supported on remote file systems.
1125
1126
# Get the source branch
1126
1127
(tree, br_from,
1127
1128
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1129
if strict is None:
1130
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1131
if strict is None: strict = True # default value
1128
1132
# Get the tip's revision_id
1129
1133
revision = _get_one_revision('push', revision)
1130
1134
if revision is not None:
1131
1135
revision_id = revision.in_history(br_from).rev_id
1132
1136
else:
1133
1137
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.')
1138
if strict and tree is not None and revision_id is None:
1139
if (tree.has_changes()):
1140
raise errors.UncommittedChanges(
1141
tree, more='Use --no-strict to force the push.')
1142
if tree.last_revision() != tree.branch.last_revision():
1143
# The tree has lost sync with its branch, there is little
1144
# chance that the user is aware of it but he can still force
1145
# the push with --no-strict
1146
raise errors.OutOfDateTree(
1147
tree, more='Use --no-strict to force the push.')
1148
1139
1149
# Get the stacked_on branch, if any
1140
1150
if stacked_on is not None:
1141
1151
stacked_on = urlutils.normalize_url(stacked_on)
1173
1183
1174
1184
1175
1185
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1186
"""Create a new branch that is a copy of an existing branch.
1177
1187
1178
1188
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1189
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1286
1296
1287
1297
1288
1298
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1299
"""Create a new checkout of an existing branch.
1290
1300
1291
1301
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1302
the branch found in '.'. This is useful if you have removed the working tree
1355
1365
1356
1366
1357
1367
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1368
"""Show list of renamed files.
1359
1369
"""
1360
1370
# TODO: Option to show renames between two historical versions.
1361
1371
1387
1397
1388
1398
1389
1399
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1400
"""Update a tree to have the latest code committed to its branch.
1391
1401
1392
1402
This will perform a merge into the working tree, and may generate
1393
1403
conflicts. If you have any local changes, you will still
1438
1448
else:
1439
1449
revision_id = branch.last_revision()
1440
1450
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))
1451
revno = branch.revision_id_to_revno(revision_id)
1452
note("Tree is up to date at revision %d of branch %s" %
1453
(revno, branch_location))
1444
1454
return 0
1445
1455
view_info = _get_view_info_for_change_reporter(tree)
1446
1456
change_reporter = delta._ChangeReporter(
1458
1468
"bzr update --revision only works"
1459
1469
" for a revision in the branch history"
1460
1470
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1471
revno = tree.branch.revision_id_to_revno(
1462
1472
_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:
1473
note('Updated to revision %d of branch %s' %
1474
(revno, branch_location))
1475
if tree.get_parent_ids()[1:] != existing_pending_merges:
1467
1476
note('Your local commits will now show as pending merges with '
1468
1477
"'bzr status', and can be committed with 'bzr commit'.")
1469
1478
if conflicts != 0:
1473
1482
1474
1483
1475
1484
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1485
"""Show information about a working tree, branch or repository.
1477
1486
1478
1487
This command will show all known locations and formats associated to the
1479
1488
tree, branch or repository.
1517
1526
1518
1527
1519
1528
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1529
"""Remove files or directories.
1521
1530
1522
1531
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1532
them if they can easily be recovered using revert. If no options or
1571
1580
1572
1581
1573
1582
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1583
"""Print file_id of a particular file or directory.
1575
1584
1576
1585
The file_id is assigned when the file is first added and remains the
1577
1586
same through all revisions where the file exists, even when it is
1593
1602
1594
1603
1595
1604
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1605
"""Print path of file_ids to a file or directory.
1597
1606
1598
1607
This prints one line for each directory down to the target,
1599
1608
starting at the branch root.
1615
1624
1616
1625
1617
1626
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1627
"""Reconcile bzr metadata in a branch.
1619
1628
1620
1629
This can correct data mismatches that may have been caused by
1621
1630
previous ghost operations or bzr upgrades. You should only
1643
1652
1644
1653
1645
1654
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1655
"""Display the list of revision ids on a branch."""
1647
1656
1648
1657
_see_also = ['log']
1649
1658
takes_args = ['location?']
1659
1668
1660
1669
1661
1670
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1671
"""List all revisions merged into this branch."""
1663
1672
1664
1673
_see_also = ['log', 'revision-history']
1665
1674
takes_args = ['location?']
1684
1693
1685
1694
1686
1695
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1696
"""Make a directory into a versioned branch.
1688
1697
1689
1698
Use this to create an empty branch, or before importing an
1690
1699
existing project.
1793
1802
1794
1803
1795
1804
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1805
"""Create a shared repository for branches to share storage space.
1797
1806
1798
1807
New branches created under the repository directory will store their
1799
1808
revisions in the repository, not in the branch directory. For branches
1853
1862
1854
1863
1855
1864
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1865
"""Show differences in the working tree, between revisions or branches.
1857
1866
1858
1867
If no arguments are given, all changes for the current tree are listed.
1859
1868
If files are given, only the changes in those files are listed.
1945
1954
help='Use this command to compare files.',
1946
1955
type=unicode,
1947
1956
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1957
]
1953
1958
aliases = ['di', 'dif']
1954
1959
encoding_type = 'exact'
1955
1960
1956
1961
@display_command
1957
1962
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,
1960
show_diff_trees)
1963
prefix=None, old=None, new=None, using=None):
1964
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1965
1962
1966
if (prefix is None) or (prefix == '0'):
1963
1967
# diff -p0 format
1977
1981
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1982
' one or two revision specifiers')
1979
1983
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1984
(old_tree, new_tree,
1985
1985
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)
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1987
file_list, revision, old, new, apply_view=True)
1988
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1989
specific_files=specific_files,
1990
1990
external_diff_options=diff_options,
1991
1991
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1992
extra_trees=extra_trees, using=using)
1994
1993
1995
1994
1996
1995
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1996
"""List files deleted in the working tree.
1998
1997
"""
1999
1998
# TODO: Show files deleted since a previous revision, or
2000
1999
# between two revisions.
2023
2022
2024
2023
2025
2024
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
2025
"""List files modified in working tree.
2027
2026
"""
2028
2027
2029
2028
hidden = True
2046
2045
2047
2046
2048
2047
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
2048
"""List files added in working tree.
2050
2049
"""
2051
2050
2052
2051
hidden = True
2082
2081
2083
2082
2084
2083
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2084
"""Show the tree root directory.
2086
2085
2087
2086
The root is the nearest enclosing directory with a .bzr control
2088
2087
directory."""
2112
2111
2113
2112
2114
2113
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2114
"""Show historical log for a branch or subset of a branch.
2116
2115
2117
2116
log is bzr's default tool for exploring the history of a branch.
2118
2117
The branch to use is taken from the first parameter. If no parameters
2299
2298
help='Show changes made in each revision as a patch.'),
2300
2299
Option('include-merges',
2301
2300
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
)
2306
2301
]
2307
2302
encoding_type = 'replace'
2308
2303
2318
2313
message=None,
2319
2314
limit=None,
2320
2315
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2316
include_merges=False):
2324
2317
from bzrlib.log import (
2325
2318
Logger,
2326
2319
make_log_request_dict,
2327
2320
_get_info_for_log_files,
2328
2321
)
2329
2322
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
2323
if include_merges:
2335
2324
if levels is None:
2336
2325
levels = 0
2429
2418
direction=direction, specific_fileids=file_ids,
2430
2419
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2420
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,
2434
)
2421
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2422
Logger(b, rqst).show(lf)
2436
2423
2437
2424
2495
2482
2496
2483
2497
2484
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2485
"""Return revision-ids which affected a particular file.
2499
2486
2500
2487
A more user-friendly interface is "bzr log FILE".
2501
2488
"""
2516
2503
2517
2504
2518
2505
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2506
"""List files in a tree.
2520
2507
"""
2521
2508
2522
2509
_see_also = ['status', 'cat']
2633
2620
2634
2621
2635
2622
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2623
"""List unknown files.
2637
2624
"""
2638
2625
2639
2626
hidden = True
2646
2633
2647
2634
2648
2635
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2636
"""Ignore specified files or patterns.
2650
2637
2651
2638
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2639
2661
2648
using this command or directly by using an editor, be sure to commit
2662
2649
it.
2663
2650
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
2670
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
2652
precedence over regular ignores. Such exceptions are used to specify
2672
2653
files that should be versioned which would otherwise be ignored.
2713
2694
_see_also = ['status', 'ignored', 'patterns']
2714
2695
takes_args = ['name_pattern*']
2715
2696
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2697
Option('old-default-rules',
2698
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2699
]
2719
2700
2720
def run(self, name_pattern_list=None, default_rules=None):
2701
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2702
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:
2703
if old_default_rules is not None:
2704
# dump the rules and exit
2705
for pattern in ignores.OLD_DEFAULTS:
2725
2706
self.outf.write("%s\n" % pattern)
2726
2707
return
2727
2708
if not name_pattern_list:
2728
2709
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2710
"NAME_PATTERN or --old-default-rules")
2730
2711
name_pattern_list = [globbing.normalize_pattern(p)
2731
2712
for p in name_pattern_list]
2732
2713
for name_pattern in name_pattern_list:
2754
2735
2755
2736
2756
2737
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2738
"""List ignored files and the patterns that matched them.
2758
2739
2759
2740
List all the ignored files and the ignore pattern that caused the file to
2760
2741
be ignored.
2781
2762
2782
2763
2783
2764
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2765
"""Lookup the revision-id from a revision-number
2785
2766
2786
2767
:Examples:
2787
2768
bzr lookup-revision 33
2801
2782
2802
2783
2803
2784
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2785
"""Export current or past revision to a destination directory or archive.
2805
2786
2806
2787
If no revision is specified this exports the last committed revision.
2807
2788
2864
2845
2865
2846
2866
2847
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2848
"""Write the contents of a file as of a given revision to standard output.
2868
2849
2869
2850
If no revision is nominated, the last revision is used.
2870
2851
2950
2931
2951
2932
2952
2933
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2934
"""Show the offset in seconds from GMT to local time."""
2954
2935
hidden = True
2955
2936
@display_command
2956
2937
def run(self):
2959
2940
2960
2941
2961
2942
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2943
"""Commit changes into a new revision.
2963
2944
2964
2945
An explanatory message needs to be given for each commit. This is
2965
2946
often done by using the --message option (getting the message from the
3073
3054
"the master branch until a normal commit "
3074
3055
"is performed."
3075
3056
),
3076
Option('show-diff', short_name='p',
3057
Option('show-diff',
3077
3058
help='When no message is supplied, show the diff along'
3078
3059
' with the status summary in the message editor.'),
3079
3060
]
3159
3140
'(use --file "%(f)s" to take commit message from that file)'
3160
3141
% { 'f': message })
3161
3142
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")
3168
3143
3169
3144
def get_message(commit_obj):
3170
3145
"""Callback to get commit message"""
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,
3146
my_message = message
3147
if my_message is not None and '\r' in my_message:
3148
my_message = my_message.replace('\r\n', '\n')
3149
my_message = my_message.replace('\r', '\n')
3150
if my_message is None and not file:
3151
t = make_commit_message_template_encoded(tree,
3180
3152
selected_list, diff=show_diff,
3181
3153
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.
3187
3154
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3155
my_message = edit_commit_message_encoded(t,
3189
3156
start_message=start_message)
3190
3157
if my_message is None:
3191
3158
raise errors.BzrCommandError("please specify a commit"
3192
3159
" message with either --message or --file")
3160
elif my_message and file:
3161
raise errors.BzrCommandError(
3162
"please specify either --message or --file")
3163
if file:
3164
my_message = codecs.open(file, 'rt',
3165
osutils.get_user_encoding()).read()
3193
3166
if my_message == "":
3194
3167
raise errors.BzrCommandError("empty commit message specified")
3195
3168
return my_message
3207
3180
timezone=offset,
3208
3181
exclude=safe_relpath_files(tree, exclude))
3209
3182
except PointlessCommit:
3183
# FIXME: This should really happen before the file is read in;
3184
# perhaps prepare the commit; get the message; then actually commit
3210
3185
raise errors.BzrCommandError("No changes to commit."
3211
3186
" Use --unchanged to commit anyhow.")
3212
3187
except ConflictsInTree:
3225
3200
3226
3201
3227
3202
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3203
"""Validate working tree structure, branch consistency and repository history.
3229
3204
3230
3205
This command checks various invariants about branch and repository storage
3231
3206
to detect data corruption or bzr bugs.
3295
3270
3296
3271
3297
3272
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3273
"""Upgrade branch storage to current format.
3299
3274
3300
3275
The check command or bzr developers may sometimes advise you to run
3301
3276
this command. When the default format has changed you may also be warned
3319
3294
3320
3295
3321
3296
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3297
"""Show or set bzr user id.
3323
3298
3324
3299
:Examples:
3325
3300
Show the email of the current user::
3369
3344
3370
3345
3371
3346
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3347
"""Print or set the branch nickname.
3373
3348
3374
3349
If unset, the tree root directory name is used as the nickname.
3375
3350
To print the current nickname, execute with no argument.
3393
3368
3394
3369
3395
3370
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3371
"""Set/unset and display aliases.
3397
3372
3398
3373
:Examples:
3399
3374
Show the current aliases::
3463
3438
3464
3439
3465
3440
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3441
"""Run internal test suite.
3467
3442
3468
3443
If arguments are given, they are regular expressions that say which tests
3469
3444
should run. Tests matching any expression are run, and other tests are
3610
3585
raise errors.BzrCommandError("subunit not available. subunit "
3611
3586
"needs to be installed to use --subunit.")
3612
3587
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)
3618
3588
if parallel:
3619
3589
self.additional_selftest_args.setdefault(
3620
3590
'suite_decorators', []).append(parallel)
3651
3621
3652
3622
3653
3623
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3624
"""Show version of bzr."""
3655
3625
3656
3626
encoding_type = 'replace'
3657
3627
takes_options = [
3668
3638
3669
3639
3670
3640
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3641
"""Statement of optimism."""
3672
3642
3673
3643
hidden = True
3674
3644
3678
3648
3679
3649
3680
3650
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3651
"""Find and print a base revision for merging two branches."""
3682
3652
# TODO: Options to specify revisions on either side, as if
3683
3653
# merging only part of the history.
3684
3654
takes_args = ['branch', 'other']
3704
3674
3705
3675
3706
3676
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3677
"""Perform a three-way merge.
3708
3678
3709
3679
The source of the merge can be specified either in the form of a branch,
3710
3680
or in the form of a path to a file containing a merge directive generated
4065
4035
4066
4036
4067
4037
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
4038
"""Redo a merge.
4069
4039
4070
4040
Use this if you want to try a different merge technique while resolving
4071
4041
conflicts. Some merge techniques are better than others, and remerge
4160
4130
4161
4131
4162
4132
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4133
"""Revert files to a previous revision.
4164
4134
4165
4135
Giving a list of files will revert only those files. Otherwise, all files
4166
4136
will be reverted. If the revision is not specified with '--revision', the
4217
4187
def run(self, revision=None, no_backup=False, file_list=None,
4218
4188
forget_merges=None):
4219
4189
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4190
tree.lock_write()
4221
4191
self.add_cleanup(tree.unlock)
4222
4192
if forget_merges:
4223
4193
tree.set_parent_ids(tree.get_parent_ids()[:1])
4232
4202
4233
4203
4234
4204
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4205
"""Test reporting of assertion failures"""
4236
4206
# intended just for use in testing
4237
4207
4238
4208
hidden = True
4242
4212
4243
4213
4244
4214
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4215
"""Show help on a command or other topic.
4246
4216
"""
4247
4217
4248
4218
_see_also = ['topics']
4261
4231
4262
4232
4263
4233
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4234
"""Show appropriate completions for context.
4265
4235
4266
4236
For a list of all available commands, say 'bzr shell-complete'.
4267
4237
"""
4276
4246
4277
4247
4278
4248
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4249
"""Show unmerged/unpulled revisions between two branches.
4280
4250
4281
4251
OTHER_BRANCH may be local or remote.
4282
4252
4360
4330
restrict = 'remote'
4361
4331
4362
4332
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4333
parent = local_branch.get_parent()
4367
4334
if other_branch is None:
4368
4335
other_branch = parent
4377
4344
remote_branch = Branch.open(other_branch)
4378
4345
if remote_branch.base == local_branch.base:
4379
4346
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4347
4348
local_branch.lock_read()
4349
self.add_cleanup(local_branch.unlock)
4384
4350
local_revid_range = _revision_range_to_revid_range(
4385
4351
_get_revision_range(my_revision, local_branch,
4386
4352
self.name()))
4387
4353
4354
remote_branch.lock_read()
4355
self.add_cleanup(remote_branch.unlock)
4388
4356
remote_revid_range = _revision_range_to_revid_range(
4389
4357
_get_revision_range(revision,
4390
4358
remote_branch, self.name()))
4449
4417
4450
4418
4451
4419
class cmd_pack(Command):
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
"""
4420
"""Compress the data within a repository."""
4469
4421
4470
4422
_see_also = ['repositories']
4471
4423
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4424
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4425
def run(self, branch_or_repo='.'):
4477
4426
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4427
try:
4479
4428
branch = dir.open_branch()
4480
4429
repository = branch.repository
4481
4430
except errors.NotBranchError:
4482
4431
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4432
repository.pack()
4484
4433
4485
4434
4486
4435
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4436
"""List the installed plugins.
4488
4437
4489
4438
This command displays the list of installed plugins including
4490
4439
version of plugin and a short description of each.
4529
4478
4530
4479
4531
4480
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4481
"""Show testament (signing-form) of a revision."""
4533
4482
takes_options = [
4534
4483
'revision',
4535
4484
Option('long', help='Produce long-format testament.'),
4561
4510
4562
4511
4563
4512
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4513
"""Show the origin of each line in a file.
4565
4514
4566
4515
This prints out the given file with an annotation on the left side
4567
4516
indicating which revision, author and date introduced the change.
4614
4563
4615
4564
4616
4565
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4566
"""Create a digital signature for an existing revision."""
4618
4567
# TODO be able to replace existing ones.
4619
4568
4620
4569
hidden = True # is this right ?
4680
4629
4681
4630
4682
4631
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.
4632
"""Convert the current branch into a checkout of the supplied branch.
4685
4633
4686
4634
Once converted into a checkout, commits must succeed on the master branch
4687
4635
before they will be applied to the local branch.
4721
4669
4722
4670
4723
4671
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4672
"""Convert the current checkout into a regular branch.
4725
4673
4726
4674
After unbinding, the local branch is considered independent and subsequent
4727
4675
commits will be local only.
4738
4686
4739
4687
4740
4688
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4689
"""Remove the last committed revision.
4742
4690
4743
4691
--verbose will print out what is being removed.
4744
4692
--dry-run will go through all the motions, but not actually
4846
4794
4847
4795
4848
4796
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4797
"""Break a dead lock on a repository, branch or working directory.
4850
4798
4851
4799
CAUTION: Locks should only be broken when you are sure that the process
4852
4800
holding the lock has been stopped.
4871
4819
4872
4820
4873
4821
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4822
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4823
4876
4824
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4825
"""
4885
4833
4886
4834
4887
4835
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4836
"""Run the bzr server."""
4889
4837
4890
4838
aliases = ['server']
4891
4839
4951
4899
4952
4900
4953
4901
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4902
"""Combine a tree into its containing tree.
4955
4903
4956
4904
This command requires the target tree to be in a rich-root format.
4957
4905
4997
4945
4998
4946
4999
4947
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4948
"""Split a subdirectory of a tree into a separate tree.
5001
4949
5002
4950
This command will produce a target tree in a format that supports
5003
4951
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4971
5024
4972
5025
4973
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4974
"""Generate a merge directive for auto-merge tools.
5027
4975
5028
4976
A directive requests a merge to be performed, and also provides all the
5029
4977
information necessary to do so. This means it must either include a
5122
5070
5123
5071
5124
5072
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
5073
"""Mail or create a merge-directive for submitting changes.
5126
5074
5127
5075
A merge directive provides many things needed for requesting merges:
5128
5076
5239
5187
5240
5188
5241
5189
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5190
"""Create a merge-directive for submitting changes.
5243
5191
5244
5192
A merge directive provides many things needed for requesting merges:
5245
5193
5312
5260
5313
5261
5314
5262
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5263
"""Create, remove or modify a tag naming a revision.
5316
5264
5317
5265
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5266
(--revision) option can be given -rtag:X, where X is any previously
5385
5333
5386
5334
5387
5335
class cmd_tags(Command):
5388
__doc__ = """List tags.
5336
"""List tags.
5389
5337
5390
5338
This command shows a table of tag names and the revisions they reference.
5391
5339
"""
5459
5407
5460
5408
5461
5409
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5410
"""Reconfigure the type of a bzr directory.
5463
5411
5464
5412
A target configuration must be specified.
5465
5413
5550
5498
5551
5499
5552
5500
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5501
"""Set the branch of a checkout and update.
5554
5502
5555
5503
For lightweight checkouts, this changes the branch being referenced.
5556
5504
For heavyweight checkouts, this checks that there are no local commits
5646
5594
5647
5595
5648
5596
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5597
"""Manage filtered views.
5650
5598
5651
5599
Views provide a mask over the tree so that users can focus on
5652
5600
a subset of a tree when doing their work. After creating a view,
5800
5748
5801
5749
5802
5750
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5751
"""Show hooks."""
5804
5752
5805
5753
hidden = True
5806
5754
5820
5768
5821
5769
5822
5770
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5771
"""Remove a branch.
5824
5772
5825
5773
This will remove the branch from the specified location but
5826
5774
will keep any working tree or repository in place.
5845
5793
5846
5794
5847
5795
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5796
"""Temporarily set aside some changes from the current tree.
5849
5797
5850
5798
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5799
ie. out of the way, until a later time when you can bring them back from
5920
5868
5921
5869
5922
5870
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5871
"""Restore shelved changes.
5924
5872
5925
5873
By default, the most recently shelved changes are restored. However if you
5926
5874
specify a shelf by id those changes will be restored instead. This works
5952
5900
5953
5901
5954
5902
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5903
"""Remove unwanted files from working tree.
5956
5904
5957
5905
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5906
files are never deleted.
5986
5934
5987
5935
5988
5936
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5937
"""list, view and set branch locations for nested trees.
5990
5938
5991
5939
If no arguments are provided, lists the branch locations for nested trees.
5992
5940
If one argument is provided, display the branch location for that tree.
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0