« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 5086.3.3
- compare with another revision
- download diff
- download tarball
- view history from revision 5086.3.3
- Committer: Jelmer Vernooij
- Date: 2010-03-13 02:49:14 UTC
- mto: This revision was merged to the branch mainline in revision 5089.
- Revision ID: jelmer@samba.org-20100313024914-rpuoguinoxpxt05b
Allow merge directives to output multiple patch files.
- files removed:
- bzrlib/tests/blackbox/test_rmbranch.py
- bzrlib/tests/per_bzrdir_colo
- files renamed:
- apport/ => contrib/apport/
- apport/bzr-crashdb.conf => contrib/apport/bzr.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 (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
63
from bzrlib.commands import Command, display_command
68
64
from bzrlib.option import (
69
65
ListOption,
70
66
Option,
239
235
# opens the branch?)
240
236
241
237
class cmd_status(Command):
242
__doc__ = """Display status summary.
238
"""Display status summary.
243
239
244
240
This reports on versioned and unknown files, reporting them
245
241
grouped by state. Possible states are:
332
328
333
329
334
330
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
331
"""Write out metadata for a revision.
336
332
337
333
The revision to print can either be specified by a specific
338
334
revision identifier, or you can use --revision.
390
386
391
387
392
388
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
389
"""Dump the contents of a btree index file to stdout.
394
390
395
391
PATH is a btree index file, it can be any URL. This includes things like
396
392
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
456
for node in bt.iter_all_entries():
461
457
# Node is made up of:
462
458
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
459
refs_as_tuples = static_tuple.as_tuples(node[3])
469
460
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
461
self.outf.write('%s\n' % (as_tuple,))
471
462
472
463
473
464
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
465
"""Remove the working tree from a given branch/checkout.
475
466
476
467
Since a lightweight checkout is little more than a working tree
477
468
this will refuse to run against one.
504
495
if (working.has_changes()):
505
496
raise errors.UncommittedChanges(working)
506
497
507
if working.user_url != working.branch.user_url:
498
working_path = working.bzrdir.root_transport.base
499
branch_path = working.branch.bzrdir.root_transport.base
500
if working_path != branch_path:
508
501
raise errors.BzrCommandError("You cannot remove the working tree"
509
502
" from a lightweight checkout")
510
503
512
505
513
506
514
507
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
508
"""Show current revision number.
516
509
517
510
This is equal to the number of revisions on this branch.
518
511
"""
548
541
549
542
550
543
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
544
"""Show revision number and revision id for a given revision identifier.
552
545
"""
553
546
hidden = True
554
547
takes_args = ['revision_info*']
610
603
611
604
612
605
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
606
"""Add specified files or directories.
614
607
615
608
In non-recursive mode, all the named items are added, regardless
616
609
of whether they were previously ignored. A warning is given if
696
689
697
690
698
691
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
692
"""Create a new versioned directory.
700
693
701
694
This is equivalent to creating the directory and then adding it.
702
695
"""
718
711
719
712
720
713
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
714
"""Show path of a file relative to root"""
722
715
723
716
takes_args = ['filename']
724
717
hidden = True
733
726
734
727
735
728
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
729
"""Show inventory of the current working copy or a revision.
737
730
738
731
It is possible to limit the output to a particular entry
739
732
type using the --kind option. For example: --kind file.
794
787
795
788
796
789
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
790
"""Move or rename a file.
798
791
799
792
:Usage:
800
793
bzr mv OLDNAME NEWNAME
931
924
932
925
933
926
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
927
"""Turn this branch into a mirror of another branch.
935
928
936
929
By default, this command only works on branches that have not diverged.
937
930
Branches are considered diverged if the destination branch's most recent
986
979
try:
987
980
tree_to = WorkingTree.open_containing(directory)[0]
988
981
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
991
982
except errors.NoWorkingTree:
992
983
tree_to = None
993
984
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
996
985
997
986
if local and not branch_to.get_bound_location():
998
987
raise errors.LocalRequiresBoundBranch()
999
988
1029
1018
else:
1030
1019
branch_from = Branch.open(location,
1031
1020
possible_transports=possible_transports)
1021
1022
if branch_to.get_parent() is None or remember:
1023
branch_to.set_parent(branch_from.base)
1024
1025
if branch_from is not branch_to:
1032
1026
branch_from.lock_read()
1033
1027
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
1028
if revision is not None:
1039
1029
revision_id = revision.as_revision_id(branch_from)
1040
1030
1031
branch_to.lock_write()
1032
self.add_cleanup(branch_to.unlock)
1041
1033
if tree_to is not None:
1042
1034
view_info = _get_view_info_for_change_reporter(tree_to)
1043
1035
change_reporter = delta._ChangeReporter(
1058
1050
1059
1051
1060
1052
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1053
"""Update a mirror of this branch.
1062
1054
1063
1055
The target branch will not have its working tree populated because this
1064
1056
is both expensive, and is not supported on remote file systems.
1125
1117
# Get the source branch
1126
1118
(tree, br_from,
1127
1119
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1120
if strict is None:
1121
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1122
if strict is None: strict = True # default value
1128
1123
# Get the tip's revision_id
1129
1124
revision = _get_one_revision('push', revision)
1130
1125
if revision is not None:
1131
1126
revision_id = revision.in_history(br_from).rev_id
1132
1127
else:
1133
1128
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.')
1129
if strict and tree is not None and revision_id is None:
1130
if (tree.has_changes()):
1131
raise errors.UncommittedChanges(
1132
tree, more='Use --no-strict to force the push.')
1133
if tree.last_revision() != tree.branch.last_revision():
1134
# The tree has lost sync with its branch, there is little
1135
# chance that the user is aware of it but he can still force
1136
# the push with --no-strict
1137
raise errors.OutOfDateTree(
1138
tree, more='Use --no-strict to force the push.')
1139
1139
1140
# Get the stacked_on branch, if any
1140
1141
if stacked_on is not None:
1141
1142
stacked_on = urlutils.normalize_url(stacked_on)
1173
1174
1174
1175
1175
1176
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1177
"""Create a new branch that is a copy of an existing branch.
1177
1178
1178
1179
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1180
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1286
1287
1287
1288
1288
1289
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1290
"""Create a new checkout of an existing branch.
1290
1291
1291
1292
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1293
the branch found in '.'. This is useful if you have removed the working tree
1355
1356
1356
1357
1357
1358
class cmd_renames(Command):
1358
__doc__ = """Show list of renamed files.
1359
"""Show list of renamed files.
1359
1360
"""
1360
1361
# TODO: Option to show renames between two historical versions.
1361
1362
1387
1388
1388
1389
1389
1390
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1391
"""Update a tree to have the latest code committed to its branch.
1391
1392
1392
1393
This will perform a merge into the working tree, and may generate
1393
1394
conflicts. If you have any local changes, you will still
1422
1423
branch_location = tree.branch.base
1423
1424
self.add_cleanup(tree.unlock)
1424
1425
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1427
self.outf.encoding)
1426
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1427
self.outf.encoding)
1428
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1429
1429
if master is None:
1430
1430
old_tip = None
1438
1438
else:
1439
1439
revision_id = branch.last_revision()
1440
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))
1441
revno = branch.revision_id_to_revno(revision_id)
1442
note("Tree is up to date at revision %d of branch %s" %
1443
(revno, branch_location))
1444
1444
return 0
1445
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
1446
change_reporter = delta._ChangeReporter(
1458
1458
"bzr update --revision only works"
1459
1459
" for a revision in the branch history"
1460
1460
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1461
revno = tree.branch.revision_id_to_revno(
1462
1462
_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:
1463
note('Updated to revision %d of branch %s' %
1464
(revno, branch_location))
1465
if tree.get_parent_ids()[1:] != existing_pending_merges:
1467
1466
note('Your local commits will now show as pending merges with '
1468
1467
"'bzr status', and can be committed with 'bzr commit'.")
1469
1468
if conflicts != 0:
1473
1472
1474
1473
1475
1474
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1475
"""Show information about a working tree, branch or repository.
1477
1476
1478
1477
This command will show all known locations and formats associated to the
1479
1478
tree, branch or repository.
1517
1516
1518
1517
1519
1518
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1519
"""Remove files or directories.
1521
1520
1522
1521
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1522
them if they can easily be recovered using revert. If no options or
1571
1570
1572
1571
1573
1572
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1573
"""Print file_id of a particular file or directory.
1575
1574
1576
1575
The file_id is assigned when the file is first added and remains the
1577
1576
same through all revisions where the file exists, even when it is
1593
1592
1594
1593
1595
1594
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1595
"""Print path of file_ids to a file or directory.
1597
1596
1598
1597
This prints one line for each directory down to the target,
1599
1598
starting at the branch root.
1615
1614
1616
1615
1617
1616
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1617
"""Reconcile bzr metadata in a branch.
1619
1618
1620
1619
This can correct data mismatches that may have been caused by
1621
1620
previous ghost operations or bzr upgrades. You should only
1643
1642
1644
1643
1645
1644
class cmd_revision_history(Command):
1646
__doc__ = """Display the list of revision ids on a branch."""
1645
"""Display the list of revision ids on a branch."""
1647
1646
1648
1647
_see_also = ['log']
1649
1648
takes_args = ['location?']
1659
1658
1660
1659
1661
1660
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1661
"""List all revisions merged into this branch."""
1663
1662
1664
1663
_see_also = ['log', 'revision-history']
1665
1664
takes_args = ['location?']
1684
1683
1685
1684
1686
1685
class cmd_init(Command):
1687
__doc__ = """Make a directory into a versioned branch.
1686
"""Make a directory into a versioned branch.
1688
1687
1689
1688
Use this to create an empty branch, or before importing an
1690
1689
existing project.
1793
1792
1794
1793
1795
1794
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1795
"""Create a shared repository for branches to share storage space.
1797
1796
1798
1797
New branches created under the repository directory will store their
1799
1798
revisions in the repository, not in the branch directory. For branches
1853
1852
1854
1853
1855
1854
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1855
"""Show differences in the working tree, between revisions or branches.
1857
1856
1858
1857
If no arguments are given, all changes for the current tree are listed.
1859
1858
If files are given, only the changes in those files are listed.
1945
1944
help='Use this command to compare files.',
1946
1945
type=unicode,
1947
1946
),
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1952
1947
]
1953
1948
aliases = ['di', 'dif']
1954
1949
encoding_type = 'exact'
1955
1950
1956
1951
@display_command
1957
1952
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)
1953
prefix=None, old=None, new=None, using=None):
1954
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1961
1955
1962
1956
if (prefix is None) or (prefix == '0'):
1963
1957
# diff -p0 format
1977
1971
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1972
' one or two revision specifiers')
1979
1973
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1982
'exclusive.')
1983
1984
1974
(old_tree, new_tree,
1985
1975
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)
1976
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1977
file_list, revision, old, new, apply_view=True)
1988
1978
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1979
specific_files=specific_files,
1990
1980
external_diff_options=diff_options,
1991
1981
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1993
format_cls=format)
1982
extra_trees=extra_trees, using=using)
1994
1983
1995
1984
1996
1985
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1986
"""List files deleted in the working tree.
1998
1987
"""
1999
1988
# TODO: Show files deleted since a previous revision, or
2000
1989
# between two revisions.
2023
2012
2024
2013
2025
2014
class cmd_modified(Command):
2026
__doc__ = """List files modified in working tree.
2015
"""List files modified in working tree.
2027
2016
"""
2028
2017
2029
2018
hidden = True
2046
2035
2047
2036
2048
2037
class cmd_added(Command):
2049
__doc__ = """List files added in working tree.
2038
"""List files added in working tree.
2050
2039
"""
2051
2040
2052
2041
hidden = True
2082
2071
2083
2072
2084
2073
class cmd_root(Command):
2085
__doc__ = """Show the tree root directory.
2074
"""Show the tree root directory.
2086
2075
2087
2076
The root is the nearest enclosing directory with a .bzr control
2088
2077
directory."""
2112
2101
2113
2102
2114
2103
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2104
"""Show historical log for a branch or subset of a branch.
2116
2105
2117
2106
log is bzr's default tool for exploring the history of a branch.
2118
2107
The branch to use is taken from the first parameter. If no parameters
2299
2288
help='Show changes made in each revision as a patch.'),
2300
2289
Option('include-merges',
2301
2290
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
2291
]
2307
2292
encoding_type = 'replace'
2308
2293
2318
2303
message=None,
2319
2304
limit=None,
2320
2305
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2323
):
2306
include_merges=False):
2324
2307
from bzrlib.log import (
2325
2308
Logger,
2326
2309
make_log_request_dict,
2327
2310
_get_info_for_log_files,
2328
2311
)
2329
2312
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
2313
if include_merges:
2335
2314
if levels is None:
2336
2315
levels = 0
2429
2408
direction=direction, specific_fileids=file_ids,
2430
2409
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2410
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
)
2411
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2412
Logger(b, rqst).show(lf)
2436
2413
2437
2414
2456
2433
raise errors.BzrCommandError(
2457
2434
"bzr %s doesn't accept two revisions in different"
2458
2435
" branches." % command_name)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2462
else:
2463
rev1 = start_spec.in_history(branch)
2436
rev1 = start_spec.in_history(branch)
2464
2437
# Avoid loading all of history when we know a missing
2465
2438
# end of range means the last revision ...
2466
2439
if end_spec.spec is None:
2495
2468
2496
2469
2497
2470
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2471
"""Return revision-ids which affected a particular file.
2499
2472
2500
2473
A more user-friendly interface is "bzr log FILE".
2501
2474
"""
2516
2489
2517
2490
2518
2491
class cmd_ls(Command):
2519
__doc__ = """List files in a tree.
2492
"""List files in a tree.
2520
2493
"""
2521
2494
2522
2495
_see_also = ['status', 'cat']
2633
2606
2634
2607
2635
2608
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2609
"""List unknown files.
2637
2610
"""
2638
2611
2639
2612
hidden = True
2646
2619
2647
2620
2648
2621
class cmd_ignore(Command):
2649
__doc__ = """Ignore specified files or patterns.
2622
"""Ignore specified files or patterns.
2650
2623
2651
2624
See ``bzr help patterns`` for details on the syntax of patterns.
2652
2625
2661
2634
using this command or directly by using an editor, be sure to commit
2662
2635
it.
2663
2636
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
2637
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
2638
precedence over regular ignores. Such exceptions are used to specify
2672
2639
files that should be versioned which would otherwise be ignored.
2713
2680
_see_also = ['status', 'ignored', 'patterns']
2714
2681
takes_args = ['name_pattern*']
2715
2682
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2683
Option('old-default-rules',
2684
help='Write out the ignore rules bzr < 0.9 always used.')
2718
2685
]
2719
2686
2720
def run(self, name_pattern_list=None, default_rules=None):
2687
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2688
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:
2689
if old_default_rules is not None:
2690
# dump the rules and exit
2691
for pattern in ignores.OLD_DEFAULTS:
2725
2692
self.outf.write("%s\n" % pattern)
2726
2693
return
2727
2694
if not name_pattern_list:
2728
2695
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2696
"NAME_PATTERN or --old-default-rules")
2730
2697
name_pattern_list = [globbing.normalize_pattern(p)
2731
2698
for p in name_pattern_list]
2732
2699
for name_pattern in name_pattern_list:
2754
2721
2755
2722
2756
2723
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2724
"""List ignored files and the patterns that matched them.
2758
2725
2759
2726
List all the ignored files and the ignore pattern that caused the file to
2760
2727
be ignored.
2781
2748
2782
2749
2783
2750
class cmd_lookup_revision(Command):
2784
__doc__ = """Lookup the revision-id from a revision-number
2751
"""Lookup the revision-id from a revision-number
2785
2752
2786
2753
:Examples:
2787
2754
bzr lookup-revision 33
2801
2768
2802
2769
2803
2770
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2771
"""Export current or past revision to a destination directory or archive.
2805
2772
2806
2773
If no revision is specified this exports the last committed revision.
2807
2774
2864
2831
2865
2832
2866
2833
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2834
"""Write the contents of a file as of a given revision to standard output.
2868
2835
2869
2836
If no revision is nominated, the last revision is used.
2870
2837
2950
2917
2951
2918
2952
2919
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2920
"""Show the offset in seconds from GMT to local time."""
2954
2921
hidden = True
2955
2922
@display_command
2956
2923
def run(self):
2959
2926
2960
2927
2961
2928
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2929
"""Commit changes into a new revision.
2963
2930
2964
2931
An explanatory message needs to be given for each commit. This is
2965
2932
often done by using the --message option (getting the message from the
3073
3040
"the master branch until a normal commit "
3074
3041
"is performed."
3075
3042
),
3076
Option('show-diff', short_name='p',
3043
Option('show-diff',
3077
3044
help='When no message is supplied, show the diff along'
3078
3045
' with the status summary in the message editor.'),
3079
3046
]
3159
3126
'(use --file "%(f)s" to take commit message from that file)'
3160
3127
% { 'f': message })
3161
3128
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
3129
3169
3130
def get_message(commit_obj):
3170
3131
"""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,
3132
my_message = message
3133
if my_message is not None and '\r' in my_message:
3134
my_message = my_message.replace('\r\n', '\n')
3135
my_message = my_message.replace('\r', '\n')
3136
if my_message is None and not file:
3137
t = make_commit_message_template_encoded(tree,
3180
3138
selected_list, diff=show_diff,
3181
3139
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
3140
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3141
my_message = edit_commit_message_encoded(t,
3189
3142
start_message=start_message)
3190
3143
if my_message is None:
3191
3144
raise errors.BzrCommandError("please specify a commit"
3192
3145
" message with either --message or --file")
3146
elif my_message and file:
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3149
if file:
3150
my_message = codecs.open(file, 'rt',
3151
osutils.get_user_encoding()).read()
3193
3152
if my_message == "":
3194
3153
raise errors.BzrCommandError("empty commit message specified")
3195
3154
return my_message
3207
3166
timezone=offset,
3208
3167
exclude=safe_relpath_files(tree, exclude))
3209
3168
except PointlessCommit:
3169
# FIXME: This should really happen before the file is read in;
3170
# perhaps prepare the commit; get the message; then actually commit
3210
3171
raise errors.BzrCommandError("No changes to commit."
3211
3172
" Use --unchanged to commit anyhow.")
3212
3173
except ConflictsInTree:
3225
3186
3226
3187
3227
3188
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3189
"""Validate working tree structure, branch consistency and repository history.
3229
3190
3230
3191
This command checks various invariants about branch and repository storage
3231
3192
to detect data corruption or bzr bugs.
3295
3256
3296
3257
3297
3258
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3259
"""Upgrade branch storage to current format.
3299
3260
3300
3261
The check command or bzr developers may sometimes advise you to run
3301
3262
this command. When the default format has changed you may also be warned
3319
3280
3320
3281
3321
3282
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3283
"""Show or set bzr user id.
3323
3284
3324
3285
:Examples:
3325
3286
Show the email of the current user::
3369
3330
3370
3331
3371
3332
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3333
"""Print or set the branch nickname.
3373
3334
3374
3335
If unset, the tree root directory name is used as the nickname.
3375
3336
To print the current nickname, execute with no argument.
3393
3354
3394
3355
3395
3356
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3357
"""Set/unset and display aliases.
3397
3358
3398
3359
:Examples:
3399
3360
Show the current aliases::
3463
3424
3464
3425
3465
3426
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3427
"""Run internal test suite.
3467
3428
3468
3429
If arguments are given, they are regular expressions that say which tests
3469
3430
should run. Tests matching any expression are run, and other tests are
3610
3571
raise errors.BzrCommandError("subunit not available. subunit "
3611
3572
"needs to be installed to use --subunit.")
3612
3573
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
3574
if parallel:
3619
3575
self.additional_selftest_args.setdefault(
3620
3576
'suite_decorators', []).append(parallel)
3651
3607
3652
3608
3653
3609
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
3610
"""Show version of bzr."""
3655
3611
3656
3612
encoding_type = 'replace'
3657
3613
takes_options = [
3668
3624
3669
3625
3670
3626
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3627
"""Statement of optimism."""
3672
3628
3673
3629
hidden = True
3674
3630
3678
3634
3679
3635
3680
3636
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3637
"""Find and print a base revision for merging two branches."""
3682
3638
# TODO: Options to specify revisions on either side, as if
3683
3639
# merging only part of the history.
3684
3640
takes_args = ['branch', 'other']
3704
3660
3705
3661
3706
3662
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3663
"""Perform a three-way merge.
3708
3664
3709
3665
The source of the merge can be specified either in the form of a branch,
3710
3666
or in the form of a path to a file containing a merge directive generated
4065
4021
4066
4022
4067
4023
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
4024
"""Redo a merge.
4069
4025
4070
4026
Use this if you want to try a different merge technique while resolving
4071
4027
conflicts. Some merge techniques are better than others, and remerge
4096
4052
4097
4053
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4054
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
4055
if merge_type is None:
4101
4056
merge_type = _mod_merge.Merge3Merger
4102
4057
tree, file_list = tree_files(file_list)
4160
4115
4161
4116
4162
4117
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4118
"""Revert files to a previous revision.
4164
4119
4165
4120
Giving a list of files will revert only those files. Otherwise, all files
4166
4121
will be reverted. If the revision is not specified with '--revision', the
4217
4172
def run(self, revision=None, no_backup=False, file_list=None,
4218
4173
forget_merges=None):
4219
4174
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4175
tree.lock_write()
4221
4176
self.add_cleanup(tree.unlock)
4222
4177
if forget_merges:
4223
4178
tree.set_parent_ids(tree.get_parent_ids()[:1])
4232
4187
4233
4188
4234
4189
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4190
"""Test reporting of assertion failures"""
4236
4191
# intended just for use in testing
4237
4192
4238
4193
hidden = True
4242
4197
4243
4198
4244
4199
class cmd_help(Command):
4245
__doc__ = """Show help on a command or other topic.
4200
"""Show help on a command or other topic.
4246
4201
"""
4247
4202
4248
4203
_see_also = ['topics']
4261
4216
4262
4217
4263
4218
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4219
"""Show appropriate completions for context.
4265
4220
4266
4221
For a list of all available commands, say 'bzr shell-complete'.
4267
4222
"""
4276
4231
4277
4232
4278
4233
class cmd_missing(Command):
4279
__doc__ = """Show unmerged/unpulled revisions between two branches.
4234
"""Show unmerged/unpulled revisions between two branches.
4280
4235
4281
4236
OTHER_BRANCH may be local or remote.
4282
4237
4360
4315
restrict = 'remote'
4361
4316
4362
4317
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4365
4366
4318
parent = local_branch.get_parent()
4367
4319
if other_branch is None:
4368
4320
other_branch = parent
4377
4329
remote_branch = Branch.open(other_branch)
4378
4330
if remote_branch.base == local_branch.base:
4379
4331
remote_branch = local_branch
4380
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4383
4332
4333
local_branch.lock_read()
4334
self.add_cleanup(local_branch.unlock)
4384
4335
local_revid_range = _revision_range_to_revid_range(
4385
4336
_get_revision_range(my_revision, local_branch,
4386
4337
self.name()))
4387
4338
4339
remote_branch.lock_read()
4340
self.add_cleanup(remote_branch.unlock)
4388
4341
remote_revid_range = _revision_range_to_revid_range(
4389
4342
_get_revision_range(revision,
4390
4343
remote_branch, self.name()))
4449
4402
4450
4403
4451
4404
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
"""
4405
"""Compress the data within a repository."""
4469
4406
4470
4407
_see_also = ['repositories']
4471
4408
takes_args = ['branch_or_repo?']
4472
takes_options = [
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4474
]
4475
4409
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4410
def run(self, branch_or_repo='.'):
4477
4411
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4478
4412
try:
4479
4413
branch = dir.open_branch()
4480
4414
repository = branch.repository
4481
4415
except errors.NotBranchError:
4482
4416
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4417
repository.pack()
4484
4418
4485
4419
4486
4420
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4421
"""List the installed plugins.
4488
4422
4489
4423
This command displays the list of installed plugins including
4490
4424
version of plugin and a short description of each.
4529
4463
4530
4464
4531
4465
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4466
"""Show testament (signing-form) of a revision."""
4533
4467
takes_options = [
4534
4468
'revision',
4535
4469
Option('long', help='Produce long-format testament.'),
4561
4495
4562
4496
4563
4497
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4498
"""Show the origin of each line in a file.
4565
4499
4566
4500
This prints out the given file with an annotation on the left side
4567
4501
indicating which revision, author and date introduced the change.
4614
4548
4615
4549
4616
4550
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4551
"""Create a digital signature for an existing revision."""
4618
4552
# TODO be able to replace existing ones.
4619
4553
4620
4554
hidden = True # is this right ?
4680
4614
4681
4615
4682
4616
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.
4617
"""Convert the current branch into a checkout of the supplied branch.
4685
4618
4686
4619
Once converted into a checkout, commits must succeed on the master branch
4687
4620
before they will be applied to the local branch.
4721
4654
4722
4655
4723
4656
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4657
"""Convert the current checkout into a regular branch.
4725
4658
4726
4659
After unbinding, the local branch is considered independent and subsequent
4727
4660
commits will be local only.
4738
4671
4739
4672
4740
4673
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4674
"""Remove the last committed revision.
4742
4675
4743
4676
--verbose will print out what is being removed.
4744
4677
--dry-run will go through all the motions, but not actually
4846
4779
4847
4780
4848
4781
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4782
"""Break a dead lock on a repository, branch or working directory.
4850
4783
4851
4784
CAUTION: Locks should only be broken when you are sure that the process
4852
4785
holding the lock has been stopped.
4871
4804
4872
4805
4873
4806
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4807
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4875
4808
4876
4809
This just prints a line to signal when it is ready, then blocks on stdin.
4877
4810
"""
4885
4818
4886
4819
4887
4820
class cmd_serve(Command):
4888
__doc__ = """Run the bzr server."""
4821
"""Run the bzr server."""
4889
4822
4890
4823
aliases = ['server']
4891
4824
4951
4884
4952
4885
4953
4886
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4887
"""Combine a tree into its containing tree.
4955
4888
4956
4889
This command requires the target tree to be in a rich-root format.
4957
4890
4997
4930
4998
4931
4999
4932
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4933
"""Split a subdirectory of a tree into a separate tree.
5001
4934
5002
4935
This command will produce a target tree in a format that supports
5003
4936
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5023
4956
5024
4957
5025
4958
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4959
"""Generate a merge directive for auto-merge tools.
5027
4960
5028
4961
A directive requests a merge to be performed, and also provides all the
5029
4962
information necessary to do so. This means it must either include a
5122
5055
5123
5056
5124
5057
class cmd_send(Command):
5125
__doc__ = """Mail or create a merge-directive for submitting changes.
5058
"""Mail or create a merge-directive for submitting changes.
5126
5059
5127
5060
A merge directive provides many things needed for requesting merges:
5128
5061
5239
5172
5240
5173
5241
5174
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5175
"""Create a merge-directive for submitting changes.
5243
5176
5244
5177
A merge directive provides many things needed for requesting merges:
5245
5178
5312
5245
5313
5246
5314
5247
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5248
"""Create, remove or modify a tag naming a revision.
5316
5249
5317
5250
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5251
(--revision) option can be given -rtag:X, where X is any previously
5326
5259
5327
5260
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5261
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5329
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
5333
details.
5334
5262
"""
5335
5263
5336
5264
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5265
takes_args = ['tag_name']
5338
5266
takes_options = [
5339
5267
Option('delete',
5340
5268
help='Delete this tag rather than placing it.',
5350
5278
'revision',
5351
5279
]
5352
5280
5353
def run(self, tag_name=None,
5281
def run(self, tag_name,
5354
5282
delete=None,
5355
5283
directory='.',
5356
5284
force=None,
5360
5288
branch.lock_write()
5361
5289
self.add_cleanup(branch.unlock)
5362
5290
if delete:
5363
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5365
5291
branch.tags.delete_tag(tag_name)
5366
5292
self.outf.write('Deleted tag %s.\n' % tag_name)
5367
5293
else:
5373
5299
revision_id = revision[0].as_revision_id(branch)
5374
5300
else:
5375
5301
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
5302
if (not force) and branch.tags.has_tag(tag_name):
5382
5303
raise errors.TagAlreadyExists(tag_name)
5383
5304
branch.tags.set_tag(tag_name, revision_id)
5385
5306
5386
5307
5387
5308
class cmd_tags(Command):
5388
__doc__ = """List tags.
5309
"""List tags.
5389
5310
5390
5311
This command shows a table of tag names and the revisions they reference.
5391
5312
"""
5459
5380
5460
5381
5461
5382
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
5383
"""Reconfigure the type of a bzr directory.
5463
5384
5464
5385
A target configuration must be specified.
5465
5386
5550
5471
5551
5472
5552
5473
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5474
"""Set the branch of a checkout and update.
5554
5475
5555
5476
For lightweight checkouts, this changes the branch being referenced.
5556
5477
For heavyweight checkouts, this checks that there are no local commits
5646
5567
5647
5568
5648
5569
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5570
"""Manage filtered views.
5650
5571
5651
5572
Views provide a mask over the tree so that users can focus on
5652
5573
a subset of a tree when doing their work. After creating a view,
5800
5721
5801
5722
5802
5723
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5724
"""Show hooks."""
5804
5725
5805
5726
hidden = True
5806
5727
5819
5740
self.outf.write(" <no hooks installed>\n")
5820
5741
5821
5742
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5824
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5827
5828
:Examples:
5829
5830
Remove the branch at repo/trunk::
5831
5832
bzr remove-branch repo/trunk
5833
5834
"""
5835
5836
takes_args = ["location?"]
5837
5838
aliases = ["rmbranch"]
5839
5840
def run(self, location=None):
5841
if location is None:
5842
location = "."
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5845
5846
5847
5743
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5744
"""Temporarily set aside some changes from the current tree.
5849
5745
5850
5746
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5747
ie. out of the way, until a later time when you can bring them back from
5920
5816
5921
5817
5922
5818
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5819
"""Restore shelved changes.
5924
5820
5925
5821
By default, the most recently shelved changes are restored. However if you
5926
5822
specify a shelf by id those changes will be restored instead. This works
5952
5848
5953
5849
5954
5850
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5851
"""Remove unwanted files from working tree.
5956
5852
5957
5853
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5854
files are never deleted.
5986
5882
5987
5883
5988
5884
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5885
"""list, view and set branch locations for nested trees.
5990
5886
5991
5887
If no arguments are provided, lists the branch locations for nested trees.
5992
5888
If one argument is provided, display the branch location for that tree.
6032
5928
self.outf.write('%s %s\n' % (path, location))
6033
5929
6034
5930
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'),
6045
]:
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
5931
# these get imported and then picked up by the scan for cmd_*
5932
# TODO: Some more consistent way to split command definitions across files;
5933
# we do need to load at least some information about them to know of
5934
# aliases. ideally we would avoid loading the implementation until the
5935
# details were needed.
5936
from bzrlib.cmd_version_info import cmd_version_info
5937
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5938
from bzrlib.bundle.commands import (
5939
cmd_bundle_info,
5940
)
5941
from bzrlib.foreign import cmd_dpush
5942
from bzrlib.sign_my_commits import cmd_sign_my_commits
Loggerhead is a web-based interface for Breezy
Version: 2.0.1