239
239
# opens the branch?)
241
241
class cmd_status(Command):
242
__doc__ = """Display status summary.
242
"""Display status summary.
244
244
This reports on versioned and unknown files, reporting them
245
245
grouped by state. Possible states are:
334
334
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
335
"""Write out metadata for a revision.
337
337
The revision to print can either be specified by a specific
338
338
revision identifier, or you can use --revision.
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.
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
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.
476
476
Since a lightweight checkout is little more than a working tree
477
477
this will refuse to run against one.
550
550
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
551
"""Show revision number and revision id for a given revision identifier.
554
554
takes_args = ['revision_info*']
612
612
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
613
"""Add specified files or directories.
615
615
In non-recursive mode, all the named items are added, regardless
616
616
of whether they were previously ignored. A warning is given if
735
735
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
736
"""Show inventory of the current working copy or a revision.
738
738
It is possible to limit the output to a particular entry
739
739
type using the --kind option. For example: --kind file.
933
933
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
934
"""Turn this branch into a mirror of another branch.
936
936
By default, this command only works on branches that have not diverged.
937
937
Branches are considered diverged if the destination branch's most recent
1060
1060
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
1061
"""Update a mirror of this branch.
1063
1063
The target branch will not have its working tree populated because this
1064
1064
is both expensive, and is not supported on remote file systems.
1133
1133
revision_id = None
1134
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.')
1135
tree.warn_if_changed_or_out_of_date(
1136
strict, 'push_strict', 'Use --no-strict to force the push.')
1139
1137
# Get the stacked_on branch, if any
1140
1138
if stacked_on is not None:
1141
1139
stacked_on = urlutils.normalize_url(stacked_on)
1175
1173
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1174
"""Create a new branch that is a copy of an existing branch.
1178
1176
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1177
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1288
1286
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1287
"""Create a new checkout of an existing branch.
1291
1289
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1290
the branch found in '.'. This is useful if you have removed the working tree
1389
1387
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1388
"""Update a tree to have the latest code committed to its branch.
1392
1390
This will perform a merge into the working tree, and may generate
1393
1391
conflicts. If you have any local changes, you will still
1475
1473
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1474
"""Show information about a working tree, branch or repository.
1478
1476
This command will show all known locations and formats associated to the
1479
1477
tree, branch or repository.
1519
1517
class cmd_remove(Command):
1520
__doc__ = """Remove files or directories.
1518
"""Remove files or directories.
1522
1520
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
1521
them if they can easily be recovered using revert. If no options or
1573
1571
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1572
"""Print file_id of a particular file or directory.
1576
1574
The file_id is assigned when the file is first added and remains the
1577
1575
same through all revisions where the file exists, even when it is
1595
1593
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1594
"""Print path of file_ids to a file or directory.
1598
1596
This prints one line for each directory down to the target,
1599
1597
starting at the branch root.
1617
1615
class cmd_reconcile(Command):
1618
__doc__ = """Reconcile bzr metadata in a branch.
1616
"""Reconcile bzr metadata in a branch.
1620
1618
This can correct data mismatches that may have been caused by
1621
1619
previous ghost operations or bzr upgrades. You should only
1661
1659
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1660
"""List all revisions merged into this branch."""
1664
1662
_see_also = ['log', 'revision-history']
1665
1663
takes_args = ['location?']
1795
1793
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1794
"""Create a shared repository for branches to share storage space.
1798
1796
New branches created under the repository directory will store their
1799
1797
revisions in the repository, not in the branch directory. For branches
1855
1853
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1854
"""Show differences in the working tree, between revisions or branches.
1858
1856
If no arguments are given, all changes for the current tree are listed.
1859
1857
If files are given, only the changes in those files are listed.
1996
1994
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1995
"""List files deleted in the working tree.
1999
1997
# TODO: Show files deleted since a previous revision, or
2000
1998
# between two revisions.
2114
2112
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2113
"""Show historical log for a branch or subset of a branch.
2117
2115
log is bzr's default tool for exploring the history of a branch.
2118
2116
The branch to use is taken from the first parameter. If no parameters
2299
2297
help='Show changes made in each revision as a patch.'),
2300
2298
Option('include-merges',
2301
2299
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2307
2301
encoding_type = 'replace'
2320
2314
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2315
include_merges=False):
2324
2316
from bzrlib.log import (
2326
2318
make_log_request_dict,
2327
2319
_get_info_for_log_files,
2329
2321
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
2322
if include_merges:
2335
2323
if levels is None:
2429
2417
direction=direction, specific_fileids=file_ids,
2430
2418
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2419
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,
2420
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2421
Logger(b, rqst).show(lf)
2497
2483
class cmd_touching_revisions(Command):
2498
__doc__ = """Return revision-ids which affected a particular file.
2484
"""Return revision-ids which affected a particular file.
2500
2486
A more user-friendly interface is "bzr log FILE".
2661
2647
using this command or directly by using an editor, be sure to commit
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2670
2650
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
2651
precedence over regular ignores. Such exceptions are used to specify
2672
2652
files that should be versioned which would otherwise be ignored.
2713
2693
_see_also = ['status', 'ignored', 'patterns']
2714
2694
takes_args = ['name_pattern*']
2715
2695
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2696
Option('old-default-rules',
2697
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2700
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2701
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:
2702
if old_default_rules is not None:
2703
# dump the rules and exit
2704
for pattern in ignores.OLD_DEFAULTS:
2725
2705
self.outf.write("%s\n" % pattern)
2727
2707
if not name_pattern_list:
2728
2708
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2709
"NAME_PATTERN or --old-default-rules")
2730
2710
name_pattern_list = [globbing.normalize_pattern(p)
2731
2711
for p in name_pattern_list]
2732
2712
for name_pattern in name_pattern_list:
2756
2736
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2737
"""List ignored files and the patterns that matched them.
2759
2739
List all the ignored files and the ignore pattern that caused the file to
2803
2783
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2784
"""Export current or past revision to a destination directory or archive.
2806
2786
If no revision is specified this exports the last committed revision.
2961
2941
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2942
"""Commit changes into a new revision.
2964
2944
An explanatory message needs to be given for each commit. This is
2965
2945
often done by using the --message option (getting the message from the
3073
3053
"the master branch until a normal commit "
3074
3054
"is performed."
3076
Option('show-diff', short_name='p',
3077
3057
help='When no message is supplied, show the diff along'
3078
3058
' with the status summary in the message editor.'),
3227
3207
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3208
"""Validate working tree structure, branch consistency and repository history.
3230
3210
This command checks various invariants about branch and repository storage
3231
3211
to detect data corruption or bzr bugs.
3297
3277
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3278
"""Upgrade branch storage to current format.
3300
3280
The check command or bzr developers may sometimes advise you to run
3301
3281
this command. When the default format has changed you may also be warned
3371
3351
class cmd_nick(Command):
3372
__doc__ = """Print or set the branch nickname.
3352
"""Print or set the branch nickname.
3374
3354
If unset, the tree root directory name is used as the nickname.
3375
3355
To print the current nickname, execute with no argument.
3465
3445
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3446
"""Run internal test suite.
3468
3448
If arguments are given, they are regular expressions that say which tests
3469
3449
should run. Tests matching any expression are run, and other tests are
3610
3590
raise errors.BzrCommandError("subunit not available. subunit "
3611
3591
"needs to be installed to use --subunit.")
3612
3592
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3594
self.additional_selftest_args.setdefault(
3620
3595
'suite_decorators', []).append(parallel)
3680
3655
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3656
"""Find and print a base revision for merging two branches."""
3682
3657
# TODO: Options to specify revisions on either side, as if
3683
3658
# merging only part of the history.
3684
3659
takes_args = ['branch', 'other']
3706
3681
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3682
"""Perform a three-way merge.
3709
3684
The source of the merge can be specified either in the form of a branch,
3710
3685
or in the form of a path to a file containing a merge directive generated
4067
4042
class cmd_remerge(Command):
4068
__doc__ = """Redo a merge.
4070
4045
Use this if you want to try a different merge technique while resolving
4071
4046
conflicts. Some merge techniques are better than others, and remerge
4162
4137
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4138
"""Revert files to a previous revision.
4165
4140
Giving a list of files will revert only those files. Otherwise, all files
4166
4141
will be reverted. If the revision is not specified with '--revision', the
4217
4192
def run(self, revision=None, no_backup=False, file_list=None,
4218
4193
forget_merges=None):
4219
4194
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
4196
self.add_cleanup(tree.unlock)
4222
4197
if forget_merges:
4223
4198
tree.set_parent_ids(tree.get_parent_ids()[:1])
4263
4238
class cmd_shell_complete(Command):
4264
__doc__ = """Show appropriate completions for context.
4239
"""Show appropriate completions for context.
4266
4241
For a list of all available commands, say 'bzr shell-complete'.
4451
4426
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4427
"""Compress the data within a repository."""
4470
4429
_see_also = ['repositories']
4471
4430
takes_args = ['branch_or_repo?']
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4432
def run(self, branch_or_repo='.'):
4477
4433
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4435
branch = dir.open_branch()
4480
4436
repository = branch.repository
4481
4437
except errors.NotBranchError:
4482
4438
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4442
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4443
"""List the installed plugins.
4489
4445
This command displays the list of installed plugins including
4490
4446
version of plugin and a short description of each.
4531
4487
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4488
"""Show testament (signing-form) of a revision."""
4533
4489
takes_options = [
4535
4491
Option('long', help='Produce long-format testament.'),
4563
4519
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4520
"""Show the origin of each line in a file.
4566
4522
This prints out the given file with an annotation on the left side
4567
4523
indicating which revision, author and date introduced the change.
4616
4572
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
4573
"""Create a digital signature for an existing revision."""
4618
4574
# TODO be able to replace existing ones.
4620
4576
hidden = True # is this right ?
4682
4638
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.
4639
"""Convert the current branch into a checkout of the supplied branch.
4686
4641
Once converted into a checkout, commits must succeed on the master branch
4687
4642
before they will be applied to the local branch.
4723
4678
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4679
"""Convert the current checkout into a regular branch.
4726
4681
After unbinding, the local branch is considered independent and subsequent
4727
4682
commits will be local only.
4740
4695
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4696
"""Remove the last committed revision.
4743
4698
--verbose will print out what is being removed.
4744
4699
--dry-run will go through all the motions, but not actually
4848
4803
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4804
"""Break a dead lock on a repository, branch or working directory.
4851
4806
CAUTION: Locks should only be broken when you are sure that the process
4852
4807
holding the lock has been stopped.
4873
4828
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4829
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4876
4831
This just prints a line to signal when it is ready, then blocks on stdin.
4999
4954
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4955
"""Split a subdirectory of a tree into a separate tree.
5002
4957
This command will produce a target tree in a format that supports
5003
4958
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5025
4980
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4981
"""Generate a merge directive for auto-merge tools.
5028
4983
A directive requests a merge to be performed, and also provides all the
5029
4984
information necessary to do so. This means it must either include a
5241
5196
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
5197
"""Create a merge-directive for submitting changes.
5244
5199
A merge directive provides many things needed for requesting merges:
5314
5269
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5270
"""Create, remove or modify a tag naming a revision.
5317
5272
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5273
(--revision) option can be given -rtag:X, where X is any previously
5552
5507
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5508
"""Set the branch of a checkout and update.
5555
5510
For lightweight checkouts, this changes the branch being referenced.
5556
5511
For heavyweight checkouts, this checks that there are no local commits
5648
5603
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5604
"""Manage filtered views.
5651
5606
Views provide a mask over the tree so that users can focus on
5652
5607
a subset of a tree when doing their work. After creating a view,
5847
5802
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5803
"""Temporarily set aside some changes from the current tree.
5850
5805
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5806
ie. out of the way, until a later time when you can bring them back from
5922
5877
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5878
"""Restore shelved changes.
5925
5880
By default, the most recently shelved changes are restored. However if you
5926
5881
specify a shelf by id those changes will be restored instead. This works
5954
5909
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5910
"""Remove unwanted files from working tree.
5957
5912
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5913
files are never deleted.
5988
5943
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5944
"""list, view and set branch locations for nested trees.
5991
5946
If no arguments are provided, lists the branch locations for nested trees.
5992
5947
If one argument is provided, display the branch location for that tree.