/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
17
"""builtin bzr commands"""
18
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
19
import os
1551.12.26 by Aaron Bentley
Get email working, with optional message
20
from StringIO import StringIO
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
21
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
1685.1.52 by John Arbash Meinel
[merge] bzr.dev 1704
24
import codecs
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
25
import sys
1551.12.8 by Aaron Bentley
Add merge-directive command
26
import time
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
27
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
28
import bzrlib
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
29
from bzrlib import (
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
30
    bugtracker,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
31
    bundle,
32
    bzrdir,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
33
    delta,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
34
    config,
35
    errors,
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
36
    globbing,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
37
    ignores,
38
    log,
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
39
    merge as _mod_merge,
1551.12.8 by Aaron Bentley
Add merge-directive command
40
    merge_directive,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
41
    osutils,
2796.2.5 by Aaron Bentley
Implement reconfigure command
42
    reconfigure,
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
43
    revision as _mod_revision,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
44
    symbol_versioning,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
45
    transport,
1996.3.30 by John Arbash Meinel
Don't import 'bzrlib.tree' directly in bzrlib.builtins
46
    tree as _mod_tree,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
47
    ui,
48
    urlutils,
49
    )
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
50
from bzrlib.branch import Branch
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
51
from bzrlib.conflicts import ConflictList
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
52
from bzrlib.revisionspec import RevisionSpec
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
53
from bzrlib.smtp_connection import SMTPConnection
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
54
from bzrlib.workingtree import WorkingTree
55
""")
56
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
57
from bzrlib.commands import Command, display_command
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
2872.2.1 by Andrew Bennetts
Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
59
from bzrlib.trace import mutter, note, warning, is_quiet, info
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
60
61
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
62
def tree_files(file_list, default_branch=u'.'):
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
63
    try:
1508.1.15 by Robert Collins
Merge from mpool.
64
        return internal_tree_files(file_list, default_branch)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
65
    except errors.FileInWrongBranch, e:
66
        raise errors.BzrCommandError("%s is not in the same branch as %s" %
67
                                     (e.path, file_list[0]))
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
68
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
69
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
70
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
71
    if branch is None:
72
        branch = tree.branch
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
73
    if revisions is None:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
74
        if tree is not None:
75
            rev_tree = tree.basis_tree()
76
        else:
77
            rev_tree = branch.basis_tree()
78
    else:
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
79
        if len(revisions) != 1:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
80
            raise errors.BzrCommandError(
81
                'bzr %s --revision takes exactly one revision identifier' % (
82
                    command_name,))
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
83
        rev_tree = revisions[0].as_tree(branch)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
84
    return rev_tree
85
86
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
87
# XXX: Bad function name; should possibly also be a class method of
88
# WorkingTree rather than a function.
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
89
def internal_tree_files(file_list, default_branch=u'.'):
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
90
    """Convert command-line paths to a WorkingTree and relative paths.
91
92
    This is typically used for command-line processors that take one or
93
    more filenames, and infer the workingtree that contains them.
94
95
    The filenames given are not required to exist.
96
97
    :param file_list: Filenames to convert.  
98
2091.3.2 by Aaron Bentley
Traverse non-terminal symlinks for mv et al
99
    :param default_branch: Fallback tree path to use if file_list is empty or
100
        None.
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
101
102
    :return: workingtree, [relative_paths]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
103
    """
104
    if file_list is None or len(file_list) == 0:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
105
        return WorkingTree.open_containing(default_branch)[0], file_list
2091.3.5 by Aaron Bentley
Move realpath functionality into osutils
106
    tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
107
    return tree, safe_relpath_files(tree, file_list)
108
109
110
def safe_relpath_files(tree, file_list):
111
    """Convert file_list into a list of relpaths in tree.
112
113
    :param tree: A tree to operate on.
114
    :param file_list: A list of user provided paths or None.
115
    :return: A list of relative paths.
116
    :raises errors.PathNotChild: When a provided path is in a different tree
117
        than tree.
118
    """
119
    if file_list is None:
120
        return None
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
121
    new_list = []
122
    for filename in file_list:
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
123
        try:
2091.3.7 by Aaron Bentley
Rename real_parent to dereferenced_path
124
            new_list.append(tree.relpath(osutils.dereference_path(filename)))
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
125
        except errors.PathNotChild:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
126
            raise errors.FileInWrongBranch(tree.branch, filename)
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
127
    return new_list
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
128
129
1185.16.112 by mbp at sourcefrog
todo
130
# TODO: Make sure no commands unconditionally use the working directory as a
131
# branch.  If a filename argument is used, the first of them should be used to
132
# specify the branch.  (Perhaps this can be factored out into some kind of
133
# Argument class, representing a file in a branch, where the first occurrence
134
# opens the branch?)
135
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
136
class cmd_status(Command):
137
    """Display status summary.
138
139
    This reports on versioned and unknown files, reporting them
140
    grouped by state.  Possible states are:
141
1551.10.10 by Aaron Bentley
Add help text
142
    added
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
143
        Versioned in the working copy but not in the previous revision.
144
1551.10.10 by Aaron Bentley
Add help text
145
    removed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
146
        Versioned in the previous revision but removed or deleted
147
        in the working copy.
148
1551.10.10 by Aaron Bentley
Add help text
149
    renamed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
150
        Path of this file changed from the previous revision;
151
        the text may also have changed.  This includes files whose
152
        parent directory was renamed.
153
1551.10.10 by Aaron Bentley
Add help text
154
    modified
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
155
        Text has changed since the previous revision.
156
1551.10.10 by Aaron Bentley
Add help text
157
    kind changed
158
        File kind has been changed (e.g. from file to directory).
159
160
    unknown
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
161
        Not versioned and not matching an ignore pattern.
162
2374.1.1 by Ian Clatworthy
Help and man page fixes
163
    To see ignored files use 'bzr ignored'.  For details on the
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
164
    changes to file texts, use 'bzr diff'.
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
165
    
2792.1.1 by Ian Clatworthy
Add short options to status to assist migrating svn users (Daniel Watkins)
166
    Note that --short or -S gives status flags for each item, similar
167
    to Subversion's status command. To get output similar to svn -q,
3504.3.1 by Andrew Bennetts
Fix trivial bug in 'bzr help status' reported by mlh on #bzr.
168
    use bzr status -SV.
1551.10.10 by Aaron Bentley
Add help text
169
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
170
    If no arguments are specified, the status of the entire working
171
    directory is shown.  Otherwise, only the status of the specified
172
    files or directories is reported.  If a directory is given, status
173
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
174
175
    If a revision argument is given, the status is calculated against
176
    that revision, or between two revisions if two are provided.
1185.3.2 by Martin Pool
- remove -r option from status command because it's not used
177
    """
1185.16.76 by Martin Pool
doc
178
    
179
    # TODO: --no-recurse, --recurse options
180
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
181
    takes_args = ['file*']
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
182
    takes_options = ['show-ids', 'revision', 'change',
2792.1.1 by Ian Clatworthy
Add short options to status to assist migrating svn users (Daniel Watkins)
183
                     Option('short', help='Use short status indicators.',
2663.1.7 by Daniel Watkins
Capitalised short names.
184
                            short_name='S'),
2663.1.5 by Daniel Watkins
Changed 'bzr stat --quiet' to 'bzr stat -(vs|sv)', as per list suggestions.
185
                     Option('versioned', help='Only show versioned files.',
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
186
                            short_name='V'),
187
                     Option('no-pending', help='Don\'t show pending merges.',
188
                           ),
2663.1.5 by Daniel Watkins
Changed 'bzr stat --quiet' to 'bzr stat -(vs|sv)', as per list suggestions.
189
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
190
    aliases = ['st', 'stat']
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
191
192
    encoding_type = 'replace'
2520.1.3 by Daniel Watkins
'help status' now points to 'help status-flags'.
193
    _see_also = ['diff', 'revert', 'status-flags']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
194
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
195
    @display_command
2318.2.1 by Kent Gibson
Apply status versioned patch
196
    def run(self, show_ids=False, file_list=None, revision=None, short=False,
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
197
            versioned=False, no_pending=False):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
198
        from bzrlib.status import show_tree_status
1185.85.15 by John Arbash Meinel
Updated bzr status, adding test_cat
199
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
200
        if revision and len(revision) > 2:
201
            raise errors.BzrCommandError('bzr status --revision takes exactly'
202
                                         ' one or two revision specifiers')
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
203
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
204
        tree, relfile_list = tree_files(file_list)
205
        # Avoid asking for specific files when that is not needed.
206
        if relfile_list == ['']:
207
            relfile_list = None
208
            # Don't disable pending merges for full trees other than '.'.
209
            if file_list == ['.']:
210
                no_pending = True
211
        # A specific path within a tree was given.
212
        elif relfile_list is not None:
213
            no_pending = True
1773.1.2 by Robert Collins
Remove --all option from status.
214
        show_tree_status(tree, show_ids=show_ids,
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
215
                         specific_files=relfile_list, revision=revision,
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
216
                         to_file=self.outf, short=short, versioned=versioned,
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
217
                         show_pending=(not no_pending))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
218
219
220
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
221
    """Write out metadata for a revision.
222
    
223
    The revision to print can either be specified by a specific
224
    revision identifier, or you can use --revision.
225
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
226
227
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
228
    takes_args = ['revision_id?']
229
    takes_options = ['revision']
1685.1.76 by Wouter van Heyst
codecleanup
230
    # cat-revision is more for frontends so should be exact
231
    encoding = 'strict'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
232
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
233
    @display_command
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
234
    def run(self, revision_id=None, revision=None):
235
        if revision_id is not None and revision is not None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
236
            raise errors.BzrCommandError('You can only supply one of'
237
                                         ' revision_id or --revision')
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
238
        if revision_id is None and revision is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
239
            raise errors.BzrCommandError('You must supply either'
240
                                         ' --revision or a revision_id')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
241
        b = WorkingTree.open_containing(u'.')[0].branch
1185.85.72 by John Arbash Meinel
Fix some of the tests.
242
243
        # TODO: jam 20060112 should cat-revision always output utf-8?
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
244
        if revision_id is not None:
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
245
            revision_id = osutils.safe_revision_id(revision_id, warn=False)
3668.4.1 by Jelmer Vernooij
Show proper error rather than traceback when an unknown revision id is specified to bzr cat-revision.
246
            try:
247
                self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
248
            except errors.NoSuchRevision:
249
                msg = "The repository %s contains no revision %s." % (b.repository.base,
250
                    revision_id)
251
                raise errors.BzrCommandError(msg)
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
252
        elif revision is not None:
253
            for rev in revision:
254
                if rev is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
255
                    raise errors.BzrCommandError('You cannot specify a NULL'
256
                                                 ' revision.')
3298.2.14 by Aaron Bentley
Optimize revision-info and cat-revision
257
                rev_id = rev.as_revision_id(b)
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
258
                self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
1185.1.29 by Robert Collins
merge merge tweaks from aaron, which includes latest .dev
259
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
260
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
261
class cmd_remove_tree(Command):
262
    """Remove the working tree from a given branch/checkout.
263
264
    Since a lightweight checkout is little more than a working tree
265
    this will refuse to run against one.
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
266
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
267
    To re-create the working tree, use "bzr checkout".
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
268
    """
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
269
    _see_also = ['checkout', 'working-trees']
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
270
    takes_args = ['location?']
3667.2.1 by Lukáš Lalinský
Make `bzr remove-tree` not remove trees with uncommitted changes by default
271
    takes_options = [
272
        Option('force',
273
               help='Remove the working tree even if it has '
274
                    'uncommitted changes.'),
275
        ]
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
276
3667.2.1 by Lukáš Lalinský
Make `bzr remove-tree` not remove trees with uncommitted changes by default
277
    def run(self, location='.', force=False):
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
278
        d = bzrdir.BzrDir.open(location)
279
        
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
280
        try:
281
            working = d.open_workingtree()
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
282
        except errors.NoWorkingTree:
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
283
            raise errors.BzrCommandError("No working tree to remove")
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
284
        except errors.NotLocalUrl:
285
            raise errors.BzrCommandError("You cannot remove the working tree of a "
286
                                         "remote path")
3667.2.1 by Lukáš Lalinský
Make `bzr remove-tree` not remove trees with uncommitted changes by default
287
        if not force:
288
            changes = working.changes_from(working.basis_tree())
289
            if changes.has_changed():
290
                raise errors.UncommittedChanges(working)
291
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
292
        working_path = working.bzrdir.root_transport.base
293
        branch_path = working.branch.bzrdir.root_transport.base
294
        if working_path != branch_path:
295
            raise errors.BzrCommandError("You cannot remove the working tree from "
296
                                         "a lightweight checkout")
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
297
        
298
        d.destroy_workingtree()
299
        
300
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
301
class cmd_revno(Command):
302
    """Show current revision number.
303
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
304
    This is equal to the number of revisions on this branch.
305
    """
306
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
307
    _see_also = ['info']
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
308
    takes_args = ['location?']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
309
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
310
    @display_command
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
311
    def run(self, location=u'.'):
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
312
        self.outf.write(str(Branch.open_containing(location)[0].revno()))
313
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
314
1182 by Martin Pool
- more disentangling of xml storage format from objects
315
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
316
class cmd_revision_info(Command):
317
    """Show revision number and revision id for a given revision identifier.
318
    """
319
    hidden = True
320
    takes_args = ['revision_info*']
321
    takes_options = ['revision']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
322
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
323
    @display_command
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
324
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
325
326
        revs = []
327
        if revision is not None:
328
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
329
        if revision_info_list is not None:
330
            for rev in revision_info_list:
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
331
                revs.append(RevisionSpec.from_string(rev))
2512.2.3 by Matthew Fuller
Default revision-info to the head of the branch when no revision is
332
333
        b = Branch.open_containing(u'.')[0]
334
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
335
        if len(revs) == 0:
2512.2.3 by Matthew Fuller
Default revision-info to the head of the branch when no revision is
336
            revs.append(RevisionSpec.from_string('-1'))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
337
338
        for rev in revs:
3298.2.14 by Aaron Bentley
Optimize revision-info and cat-revision
339
            revision_id = rev.as_revision_id(b)
340
            try:
341
                revno = '%4d' % (b.revision_id_to_revno(revision_id))
342
            except errors.NoSuchRevision:
2512.2.2 by Matthew Fuller
Update revision-info to show dotted revnos.
343
                dotted_map = b.get_revision_id_to_revno_map()
3298.2.14 by Aaron Bentley
Optimize revision-info and cat-revision
344
                revno = '.'.join(str(i) for i in dotted_map[revision_id])
345
            print '%s %s' % (revno, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
346
347
    
348
class cmd_add(Command):
349
    """Add specified files or directories.
350
351
    In non-recursive mode, all the named items are added, regardless
352
    of whether they were previously ignored.  A warning is given if
353
    any of the named files are already versioned.
354
355
    In recursive mode (the default), files are treated the same way
356
    but the behaviour for directories is different.  Directories that
357
    are already versioned do not give a warning.  All directories,
358
    whether already versioned or not, are searched for files or
359
    subdirectories that are neither versioned or ignored, and these
360
    are added.  This search proceeds recursively into versioned
361
    directories.  If no names are given '.' is assumed.
362
363
    Therefore simply saying 'bzr add' will version all files that
364
    are currently unknown.
365
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
366
    Adding a file whose parent directory is not versioned will
367
    implicitly add the parent, and so on up to the root. This means
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
368
    you should never need to explicitly add a directory, they'll just
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
369
    get added when you add a file in the directory.
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
370
371
    --dry-run will show which files would be added, but not actually 
372
    add them.
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
373
374
    --file-ids-from will try to use the file ids from the supplied path.
375
    It looks up ids trying to find a matching parent directory with the
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
376
    same filename, and then by pure path. This option is rarely needed
377
    but can be useful when adding the same logical file into two
378
    branches that will be merged later (without showing the two different
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
379
    adds as a conflict). It is also useful when merging another project
380
    into a subdirectory of this one.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
381
    """
382
    takes_args = ['file*']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
383
    takes_options = [
384
        Option('no-recurse',
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
385
               help="Don't recursively add the contents of directories."),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
386
        Option('dry-run',
387
               help="Show what would be done, but don't actually do anything."),
388
        'verbose',
389
        Option('file-ids-from',
390
               type=unicode,
391
               help='Lookup file ids from this tree.'),
392
        ]
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
393
    encoding_type = 'replace'
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
394
    _see_also = ['remove']
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
395
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
396
    def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
397
            file_ids_from=None):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
398
        import bzrlib.add
399
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
400
        base_tree = None
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
401
        if file_ids_from is not None:
402
            try:
403
                base_tree, base_path = WorkingTree.open_containing(
404
                                            file_ids_from)
405
            except errors.NoWorkingTree:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
406
                base_branch, base_path = Branch.open_containing(
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
407
                                            file_ids_from)
408
                base_tree = base_branch.basis_tree()
409
410
            action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
411
                          to_file=self.outf, should_print=(not is_quiet()))
412
        else:
413
            action = bzrlib.add.AddAction(to_file=self.outf,
414
                should_print=(not is_quiet()))
415
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
416
        if base_tree:
417
            base_tree.lock_read()
418
        try:
2568.2.6 by Robert Collins
Review feedback.
419
            file_list = self._maybe_expand_globs(file_list)
2568.2.2 by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
420
            if file_list:
421
                tree = WorkingTree.open_containing(file_list[0])[0]
422
            else:
423
                tree = WorkingTree.open_containing(u'.')[0]
2568.2.8 by Robert Collins
Really really change the command to use the new API.
424
            added, ignored = tree.smart_add(file_list, not
2568.2.2 by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
425
                no_recurse, action=action, save=not dry_run)
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
426
        finally:
427
            if base_tree is not None:
428
                base_tree.unlock()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
429
        if len(ignored) > 0:
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
430
            if verbose:
431
                for glob in sorted(ignored.keys()):
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
432
                    for path in ignored[glob]:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
433
                        self.outf.write("ignored %s matching \"%s\"\n" 
434
                                        % (path, glob))
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
435
            else:
436
                match_len = 0
437
                for glob, paths in ignored.items():
438
                    match_len += len(paths)
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
439
                self.outf.write("ignored %d file(s).\n" % match_len)
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
440
            self.outf.write("If you wish to add some of these files,"
441
                            " please add them by name.\n")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
442
443
444
class cmd_mkdir(Command):
445
    """Create a new versioned directory.
446
447
    This is equivalent to creating the directory and then adding it.
448
    """
1685.1.80 by Wouter van Heyst
more code cleanup
449
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
450
    takes_args = ['dir+']
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
451
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
452
453
    def run(self, dir_list):
454
        for d in dir_list:
455
            os.mkdir(d)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
456
            wt, dd = WorkingTree.open_containing(d)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
457
            wt.add([dd])
1685.1.80 by Wouter van Heyst
more code cleanup
458
            self.outf.write('added %s\n' % d)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
459
460
461
class cmd_relpath(Command):
462
    """Show path of a file relative to root"""
1685.1.80 by Wouter van Heyst
more code cleanup
463
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
464
    takes_args = ['filename']
465
    hidden = True
466
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
467
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
468
    def run(self, filename):
1185.85.19 by John Arbash Meinel
Updated bzr relpath
469
        # TODO: jam 20050106 Can relpath return a munged path if
470
        #       sys.stdout encoding cannot represent it?
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
471
        tree, relpath = WorkingTree.open_containing(filename)
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
472
        self.outf.write(relpath)
473
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
474
475
476
class cmd_inventory(Command):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
477
    """Show inventory of the current working copy or a revision.
478
479
    It is possible to limit the output to a particular entry
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
480
    type using the --kind option.  For example: --kind file.
481
482
    It is also possible to restrict the list of files to a specific
483
    set. For example: bzr inventory --show-ids this/file
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
484
    """
1685.1.80 by Wouter van Heyst
more code cleanup
485
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
486
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
487
    _see_also = ['ls']
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
488
    takes_options = [
489
        'revision',
490
        'show-ids',
491
        Option('kind',
2598.1.12 by Martin Pool
Fix up --kind options
492
               help='List entries of a particular kind: file, directory, symlink.',
493
               type=unicode),
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
494
        ]
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
495
    takes_args = ['file*']
496
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
497
    @display_command
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
498
    def run(self, revision=None, show_ids=False, kind=None, file_list=None):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
499
        if kind and kind not in ['file', 'directory', 'symlink']:
2598.1.12 by Martin Pool
Fix up --kind options
500
            raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
2027.4.3 by John Arbash Meinel
Change how 'bzr inventory' finds paths
501
502
        work_tree, file_list = tree_files(file_list)
2255.7.24 by John Arbash Meinel
Rework cmd_inventory so that it uses paths2ids and locks the trees for read.
503
        work_tree.lock_read()
504
        try:
505
            if revision is not None:
506
                if len(revision) > 1:
507
                    raise errors.BzrCommandError(
508
                        'bzr inventory --revision takes exactly one revision'
509
                        ' identifier')
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
510
                tree = revision[0].as_tree(work_tree.branch)
2255.7.24 by John Arbash Meinel
Rework cmd_inventory so that it uses paths2ids and locks the trees for read.
511
512
                extra_trees = [work_tree]
513
                tree.lock_read()
514
            else:
515
                tree = work_tree
516
                extra_trees = []
517
518
            if file_list is not None:
519
                file_ids = tree.paths2ids(file_list, trees=extra_trees,
520
                                          require_versioned=True)
521
                # find_ids_across_trees may include some paths that don't
522
                # exist in 'tree'.
523
                entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
524
                                 for file_id in file_ids if file_id in tree)
525
            else:
526
                entries = tree.inventory.entries()
527
        finally:
528
            tree.unlock()
529
            if tree is not work_tree:
530
                work_tree.unlock()
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
531
532
        for path, entry in entries:
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
533
            if kind and kind != entry.kind:
534
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
535
            if show_ids:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
536
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
537
            else:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
538
                self.outf.write(path)
539
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
540
541
542
class cmd_mv(Command):
543
    """Move or rename a file.
544
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
545
    :Usage:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
546
        bzr mv OLDNAME NEWNAME
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
547
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
548
        bzr mv SOURCE... DESTINATION
549
550
    If the last argument is a versioned directory, all the other names
551
    are moved into it.  Otherwise, there must be exactly two arguments
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
552
    and the file is changed to a new name.
553
554
    If OLDNAME does not exist on the filesystem but is versioned and
555
    NEWNAME does exist on the filesystem but is not versioned, mv
556
    assumes that the file has been manually moved and only updates
557
    its internal inventory to reflect that change.
558
    The same is valid when moving many SOURCE files to a DESTINATION.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
559
560
    Files cannot be moved between branches.
561
    """
1685.1.80 by Wouter van Heyst
more code cleanup
562
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
563
    takes_args = ['names*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
564
    takes_options = [Option("after", help="Move only the bzr identifier"
565
        " of the file, because the file has already been moved."),
566
        ]
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
567
    aliases = ['move', 'rename']
1185.85.26 by John Arbash Meinel
bzr mv should succeed even if it can't display the paths.
568
    encoding_type = 'replace'
569
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
570
    def run(self, names_list, after=False):
1846.1.1 by Wouter van Heyst
Don't fail on 'bzr mv', extract move tests from OldTests.
571
        if names_list is None:
572
            names_list = []
573
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
574
        if len(names_list) < 2:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
575
            raise errors.BzrCommandError("missing file argument")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
576
        tree, rel_names = tree_files(names_list)
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
577
        tree.lock_write()
578
        try:
579
            self._run(tree, names_list, rel_names, after)
580
        finally:
581
            tree.unlock()
3246.1.1 by Alexander Belchenko
Allow rename (change case of name) directory on case-insensitive filesystem.
582
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
583
    def _run(self, tree, names_list, rel_names, after):
584
        into_existing = osutils.isdir(names_list[-1])
585
        if into_existing and len(names_list) == 2:
3249.4.1 by Alexander Belchenko
merge Lukas' patch and update it with case-insensitive rename check.
586
            # special cases:
587
            # a. case-insensitive filesystem and change case of dir
588
            # b. move directory after the fact (if the source used to be
589
            #    a directory, but now doesn't exist in the working tree
590
            #    and the target is an existing directory, just rename it)
591
            if (not tree.case_sensitive
592
                and rel_names[0].lower() == rel_names[1].lower()):
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
593
                into_existing = False
3249.4.1 by Alexander Belchenko
merge Lukas' patch and update it with case-insensitive rename check.
594
            else:
595
                inv = tree.inventory
596
                from_id = tree.path2id(rel_names[0])
597
                if (not osutils.lexists(names_list[0]) and
598
                    from_id and inv.get_file_kind(from_id) == "directory"):
599
                    into_existing = False
600
        # move/rename
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
601
        if into_existing:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
602
            # move into existing directory
2123.3.5 by Steffen Eichenberg
specifying named parameters
603
            for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
604
                self.outf.write("%s => %s\n" % pair)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
605
        else:
606
            if len(names_list) != 2:
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
607
                raise errors.BzrCommandError('to mv multiple files the'
608
                                             ' destination must be a versioned'
609
                                             ' directory')
2123.3.5 by Steffen Eichenberg
specifying named parameters
610
            tree.rename_one(rel_names[0], rel_names[1], after=after)
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
611
            self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
3246.1.1 by Alexander Belchenko
Allow rename (change case of name) directory on case-insensitive filesystem.
612
613
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
614
class cmd_pull(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
615
    """Turn this branch into a mirror of another branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
616
617
    This command only works on branches that have not diverged.  Branches are
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
618
    considered diverged if the destination branch's most recent commit is one
619
    that has not been merged (directly or indirectly) into the parent.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
620
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
621
    If branches have diverged, you can use 'bzr merge' to integrate the changes
622
    from one into the other.  Once one branch has merged, the other should
623
    be able to pull it again.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
624
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
625
    If you want to forget your local changes and just update your branch to
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
626
    match the remote one, use pull --overwrite.
1614.2.3 by Olaf Conradi
In commands push and pull, moved help text for --remember down. It's not
627
628
    If there is no default location set, the first pull will set it.  After
629
    that, you can omit the location to use the default.  To change the
1785.1.4 by John Arbash Meinel
Update help for the new --remember semantics.
630
    default, use --remember. The value will only be saved if the remote
631
    location can be accessed.
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
632
633
    Note: The location can be specified either in the form of a branch,
634
    or in the form of a path to a file containing a merge directive generated
635
    with bzr send.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
636
    """
1685.1.80 by Wouter van Heyst
more code cleanup
637
2520.1.6 by Daniel Watkins
Fixed 'pull' help.
638
    _see_also = ['push', 'update', 'status-flags']
1551.17.4 by Aaron Bentley
Make pull -v description more specific
639
    takes_options = ['remember', 'overwrite', 'revision',
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
640
        custom_help('verbose',
1551.17.4 by Aaron Bentley
Make pull -v description more specific
641
            help='Show logs of pulled revisions.'),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
642
        Option('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
643
            help='Branch to pull into, '
644
                 'rather than the one containing the working directory.',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
645
            short_name='d',
646
            type=unicode,
647
            ),
648
        ]
2520.1.6 by Daniel Watkins
Fixed 'pull' help.
649
    takes_args = ['location?']
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
650
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
651
1551.11.10 by Aaron Bentley
Add change reporting to pull
652
    def run(self, location=None, remember=False, overwrite=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
653
            revision=None, verbose=False,
654
            directory=None):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
655
        # FIXME: too much stuff is in the command class
1551.14.11 by Aaron Bentley
rename rev_id and other_rev_id
656
        revision_id = None
1551.14.7 by Aaron Bentley
test suite fixes
657
        mergeable = None
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
658
        if directory is None:
659
            directory = u'.'
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
660
        try:
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
661
            tree_to = WorkingTree.open_containing(directory)[0]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
662
            branch_to = tree_to.branch
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
663
        except errors.NoWorkingTree:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
664
            tree_to = None
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
665
            branch_to = Branch.open_containing(directory)[0]
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
666
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
667
        possible_transports = []
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
668
        if location is not None:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
669
            try:
670
                mergeable = bundle.read_mergeable_from_url(location,
671
                    possible_transports=possible_transports)
672
            except errors.NotABundle:
673
                mergeable = None
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
674
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
675
        stored_loc = branch_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
676
        if location is None:
677
            if stored_loc is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
678
                raise errors.BzrCommandError("No pull location known or"
679
                                             " specified.")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
680
            else:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
681
                display_url = urlutils.unescape_for_display(stored_loc,
682
                        self.outf.encoding)
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
683
                if not is_quiet():
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
684
                    self.outf.write("Using saved parent location: %s\n" % display_url)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
685
                location = stored_loc
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
686
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
687
        if mergeable is not None:
688
            if revision is not None:
689
                raise errors.BzrCommandError(
690
                    'Cannot use -r with merge directives or bundles')
2520.4.109 by Aaron Bentley
start work on directive cherry-picking
691
            mergeable.install_revisions(branch_to.repository)
692
            base_revision_id, revision_id, verified = \
693
                mergeable.get_merge_request(branch_to.repository)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
694
            branch_from = branch_to
695
        else:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
696
            branch_from = Branch.open(location,
697
                possible_transports=possible_transports)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
698
699
            if branch_to.get_parent() is None or remember:
700
                branch_to.set_parent(branch_from.base)
701
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
702
        if revision is not None:
703
            if len(revision) == 1:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
704
                revision_id = revision[0].as_revision_id(branch_from)
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
705
            else:
706
                raise errors.BzrCommandError(
707
                    'bzr pull --revision takes one value.')
1185.76.1 by Erik Bågfors
Support for --revision in pull
708
1551.19.42 by Aaron Bentley
Add lock around branch pull
709
        branch_to.lock_write()
710
        try:
711
            if tree_to is not None:
712
                change_reporter = delta._ChangeReporter(
713
                    unversioned_filter=tree_to.is_ignored)
714
                result = tree_to.pull(branch_from, overwrite, revision_id,
715
                                      change_reporter,
716
                                      possible_transports=possible_transports)
717
            else:
718
                result = branch_to.pull(branch_from, overwrite, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
719
1551.19.42 by Aaron Bentley
Add lock around branch pull
720
            result.report(self.outf)
721
            if verbose and result.old_revid != result.new_revid:
722
                old_rh = list(
723
                    branch_to.repository.iter_reverse_revision_history(
724
                    result.old_revid))
725
                old_rh.reverse()
726
                new_rh = branch_to.revision_history()
727
                log.show_changed_revisions(branch_to, old_rh, new_rh,
728
                                           to_file=self.outf)
729
        finally:
730
            branch_to.unlock()
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
731
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
732
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
733
class cmd_push(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
734
    """Update a mirror of this branch.
735
    
736
    The target branch will not have its working tree populated because this
737
    is both expensive, and is not supported on remote file systems.
738
    
739
    Some smart servers or protocols *may* put the working tree in place in
740
    the future.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
741
742
    This command only works on branches that have not diverged.  Branches are
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
743
    considered diverged if the destination branch's most recent commit is one
744
    that has not been merged (directly or indirectly) by the source branch.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
745
746
    If branches have diverged, you can use 'bzr push --overwrite' to replace
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
747
    the other branch completely, discarding its unmerged changes.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
748
    
749
    If you want to ensure you have the different changes in the other branch,
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
750
    do a merge (see bzr help merge) from the other branch, and commit that.
751
    After that you will be able to do a push without '--overwrite'.
1614.2.3 by Olaf Conradi
In commands push and pull, moved help text for --remember down. It's not
752
753
    If there is no default push location set, the first push will set it.
754
    After that, you can omit the location to use the default.  To change the
1785.1.4 by John Arbash Meinel
Update help for the new --remember semantics.
755
    default, use --remember. The value will only be saved if the remote
756
    location can be accessed.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
757
    """
1685.1.80 by Wouter van Heyst
more code cleanup
758
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
759
    _see_also = ['pull', 'update', 'working-trees']
3256.1.2 by Daniel Watkins
Added revision argument to push.
760
    takes_options = ['remember', 'overwrite', 'verbose', 'revision',
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
761
        Option('create-prefix',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
762
               help='Create the path leading up to the branch '
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
763
                    'if it does not already exist.'),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
764
        Option('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
765
            help='Branch to push from, '
766
                 'rather than the one containing the working directory.',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
767
            short_name='d',
768
            type=unicode,
769
            ),
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
770
        Option('use-existing-dir',
771
               help='By default push will fail if the target'
772
                    ' directory exists, but does not already'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
773
                    ' have a control directory.  This flag will'
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
774
                    ' allow push to proceed.'),
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
775
        Option('stacked',
776
            help='Create a stacked branch that references the public location '
777
                'of the parent branch.'),
778
        Option('stacked-on',
3221.19.4 by Ian Clatworthy
shallow -> stacked
779
            help='Create a stacked branch that refers to another branch '
3221.19.2 by Ian Clatworthy
tweaks to ui during review by igc
780
                'for the commit history. Only the work not present in the '
781
                'referenced branch is included in the branch created.',
3221.11.12 by Robert Collins
Basic push --reference support, requires url, slow.
782
            type=unicode),
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
783
        ]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
784
    takes_args = ['location?']
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
785
    encoding_type = 'replace'
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
786
1495 by Robert Collins
Add a --create-prefix to the new push command.
787
    def run(self, location=None, remember=False, overwrite=False,
3221.14.3 by Ian Clatworthy
Merge bzr.dev r3466
788
        create_prefix=False, verbose=False, revision=None,
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
789
        use_existing_dir=False, directory=None, stacked_on=None,
790
        stacked=False):
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
791
        from bzrlib.push import _show_push_branch
792
793
        # Get the source branch and revision_id
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
794
        if directory is None:
795
            directory = '.'
3221.11.13 by Robert Collins
Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.
796
        br_from = Branch.open_containing(directory)[0]
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
797
        if revision is not None:
798
            if len(revision) == 1:
799
                revision_id = revision[0].in_history(br_from).rev_id
800
            else:
801
                raise errors.BzrCommandError(
802
                    'bzr push --revision takes one value.')
803
        else:
804
            revision_id = br_from.last_revision()
805
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
806
        # Get the stacked_on branch, if any
807
        if stacked_on is not None:
808
            stacked_on = urlutils.normalize_url(stacked_on)
3221.19.4 by Ian Clatworthy
shallow -> stacked
809
        elif stacked:
3221.11.15 by Robert Collins
no parent branch causes an error on push --shallow.
810
            parent_url = br_from.get_parent()
811
            if parent_url:
812
                parent = Branch.open(parent_url)
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
813
                stacked_on = parent.get_public_branch()
814
                if not stacked_on:
3221.11.17 by Robert Collins
no public location causes the parent to be used directly with push --shallow.
815
                    # I considered excluding non-http url's here, thus forcing
816
                    # 'public' branches only, but that only works for some
3221.14.3 by Ian Clatworthy
Merge bzr.dev r3466
817
                    # users, so it's best to just depend on the user spotting an
3221.11.17 by Robert Collins
no public location causes the parent to be used directly with push --shallow.
818
                    # error by the feedback given to them. RBC 20080227.
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
819
                    stacked_on = parent_url
820
            if not stacked_on:
3221.11.15 by Robert Collins
no parent branch causes an error on push --shallow.
821
                raise errors.BzrCommandError(
822
                    "Could not determine branch to refer to.")
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
823
824
        # Get the destination location
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
825
        if location is None:
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
826
            stored_loc = br_from.get_push_location()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
827
            if stored_loc is None:
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
828
                raise errors.BzrCommandError(
829
                    "No push location known or specified.")
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
830
            else:
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
831
                display_url = urlutils.unescape_for_display(stored_loc,
832
                        self.outf.encoding)
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
833
                self.outf.write("Using saved push location: %s\n" % display_url)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
834
                location = stored_loc
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
835
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
836
        _show_push_branch(br_from, revision_id, location, self.outf,
837
            verbose=verbose, overwrite=overwrite, remember=remember,
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
838
            stacked_on=stacked_on, create_prefix=create_prefix,
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
839
            use_existing_dir=use_existing_dir)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
840
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
841
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
842
class cmd_branch(Command):
843
    """Create a new copy of a branch.
844
845
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
846
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
847
    If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
848
    is derived from the FROM_LOCATION by stripping a leading scheme or drive
849
    identifier, if any. For example, "branch lp:foo-bar" will attempt to
850
    create ./foo-bar.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
851
852
    To retrieve the branch as of a particular revision, supply the --revision
853
    parameter, as in "branch foo/bar -r 5".
854
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
855
856
    _see_also = ['checkout']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
857
    takes_args = ['from_location', 'to_location?']
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
858
    takes_options = ['revision', Option('hardlink',
3221.11.20 by Robert Collins
Support --shallow on branch.
859
        help='Hard-link working tree files where possible.'),
3221.20.3 by Ian Clatworthy
shallow -> stacked
860
        Option('stacked',
861
            help='Create a stacked branch referring to the source branch. '
3221.11.20 by Robert Collins
Support --shallow on branch.
862
                'The new branch will depend on the availability of the source '
863
                'branch for all operations.'),
3696.2.3 by Daniel Watkins
Added --standalone option to branch.
864
        Option('standalone',
865
               help='Do not use a shared repository, even if available.'),
3221.11.20 by Robert Collins
Support --shallow on branch.
866
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
867
    aliases = ['get', 'clone']
868
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
869
    def run(self, from_location, to_location=None, revision=None,
3696.2.3 by Daniel Watkins
Added --standalone option to branch.
870
            hardlink=False, stacked=False, standalone=False):
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
871
        from bzrlib.tag import _merge_tags_if_possible
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
872
        if revision is None:
873
            revision = [None]
874
        elif len(revision) > 1:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
875
            raise errors.BzrCommandError(
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
876
                'bzr branch --revision takes exactly 1 revision value')
2283.1.1 by John Arbash Meinel
(John Arbash Meinel) (trivial) remove unused and incorrect code.
877
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
878
        accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
879
            from_location)
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
880
        br_from.lock_read()
881
        try:
1185.8.4 by Aaron Bentley
Fixed branch -r
882
            if len(revision) == 1 and revision[0] is not None:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
883
                revision_id = revision[0].as_revision_id(br_from)
1185.8.4 by Aaron Bentley
Fixed branch -r
884
            else:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
885
                # FIXME - wt.last_revision, fallback to branch, fall back to
886
                # None or perhaps NULL_REVISION to mean copy nothing
887
                # RBC 20060209
888
                revision_id = br_from.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
889
            if to_location is None:
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
890
                to_location = urlutils.derive_to_location(from_location)
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
891
            to_transport = transport.get_transport(to_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
892
            try:
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
893
                to_transport.mkdir('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
894
            except errors.FileExists:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
895
                raise errors.BzrCommandError('Target directory "%s" already'
896
                                             ' exists.' % to_location)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
897
            except errors.NoSuchFile:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
898
                raise errors.BzrCommandError('Parent of "%s" does not exist.'
899
                                             % to_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
900
            try:
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
901
                # preserve whatever source format we have.
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
902
                dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
3123.5.8 by Aaron Bentley
Work around double-opening lock issue
903
                                            possible_transports=[to_transport],
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
904
                                            accelerator_tree=accelerator_tree,
3696.2.3 by Daniel Watkins
Added --standalone option to branch.
905
                                            hardlink=hardlink, stacked=stacked,
906
                                            force_new_repo=standalone)
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
907
                branch = dir.open_branch()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
908
            except errors.NoSuchRevision:
1685.1.80 by Wouter van Heyst
more code cleanup
909
                to_transport.delete_tree('.')
3221.20.1 by Ian Clatworthy
tweaks by igc during review
910
                msg = "The branch %s has no revision %s." % (from_location,
911
                    revision[0])
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
912
                raise errors.BzrCommandError(msg)
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
913
            _merge_tags_if_possible(br_from, branch)
3221.20.3 by Ian Clatworthy
shallow -> stacked
914
            # If the source branch is stacked, the new branch may
915
            # be stacked whether we asked for that explicitly or not.
916
            # We therefore need a try/except here and not just 'if stacked:'
3221.11.19 by Robert Collins
Branching a shallow branch gets a shallow branch.
917
            try:
3221.20.3 by Ian Clatworthy
shallow -> stacked
918
                note('Created new stacked branch referring to %s.' %
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
919
                    branch.get_stacked_on_url())
3221.11.19 by Robert Collins
Branching a shallow branch gets a shallow branch.
920
            except (errors.NotStacked, errors.UnstackableBranchFormat,
3221.11.20 by Robert Collins
Support --shallow on branch.
921
                errors.UnstackableRepositoryFormat), e:
3221.11.19 by Robert Collins
Branching a shallow branch gets a shallow branch.
922
                note('Branched %d revision(s).' % branch.revno())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
923
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
924
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
925
926
1508.1.20 by Robert Collins
Create a checkout command.
927
class cmd_checkout(Command):
928
    """Create a new checkout of an existing branch.
929
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
930
    If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
931
    the branch found in '.'. This is useful if you have removed the working tree
932
    or if it was never created - i.e. if you pushed the branch to its current
933
    location using SFTP.
934
    
1508.1.20 by Robert Collins
Create a checkout command.
935
    If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
936
    be used.  In other words, "checkout ../foo/bar" will attempt to create ./bar.
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
937
    If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
938
    is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
939
    identifier, if any. For example, "checkout lp:foo-bar" will attempt to
940
    create ./foo-bar.
1508.1.20 by Robert Collins
Create a checkout command.
941
942
    To retrieve the branch as of a particular revision, supply the --revision
943
    parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
944
    out of date [so you cannot commit] but it may be useful (i.e. to examine old
945
    code.)
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
946
    """
1508.1.20 by Robert Collins
Create a checkout command.
947
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
948
    _see_also = ['checkouts', 'branch']
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
949
    takes_args = ['branch_location?', 'to_location?']
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
950
    takes_options = ['revision',
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
951
                     Option('lightweight',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
952
                            help="Perform a lightweight checkout.  Lightweight "
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
953
                                 "checkouts depend on access to the branch for "
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
954
                                 "every operation.  Normal checkouts can perform "
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
955
                                 "common operations like diff and status without "
956
                                 "such access, and also support local commits."
957
                            ),
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
958
                     Option('files-from', type=str,
959
                            help="Get file contents from this tree."),
960
                     Option('hardlink',
961
                            help='Hard-link working tree files where possible.'
962
                            ),
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
963
                     ]
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
964
    aliases = ['co']
1508.1.20 by Robert Collins
Create a checkout command.
965
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
966
    def run(self, branch_location=None, to_location=None, revision=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
967
            lightweight=False, files_from=None, hardlink=False):
1508.1.20 by Robert Collins
Create a checkout command.
968
        if revision is None:
969
            revision = [None]
970
        elif len(revision) > 1:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
971
            raise errors.BzrCommandError(
1508.1.20 by Robert Collins
Create a checkout command.
972
                'bzr checkout --revision takes exactly 1 revision value')
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
973
        if branch_location is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
974
            branch_location = osutils.getcwd()
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
975
            to_location = branch_location
3123.5.20 by Aaron Bentley
Checkout uses branch tree as a fallback accelerator
976
        accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
977
            branch_location)
978
        if files_from is not None:
979
            accelerator_tree = WorkingTree.open(files_from)
1508.1.20 by Robert Collins
Create a checkout command.
980
        if len(revision) == 1 and revision[0] is not None:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
981
            revision_id = revision[0].as_revision_id(source)
1508.1.20 by Robert Collins
Create a checkout command.
982
        else:
983
            revision_id = None
984
        if to_location is None:
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
985
            to_location = urlutils.derive_to_location(branch_location)
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
986
        # if the source and to_location are the same, 
987
        # and there is no working tree,
988
        # then reconstitute a branch
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
989
        if (osutils.abspath(to_location) ==
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
990
            osutils.abspath(branch_location)):
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
991
            try:
992
                source.bzrdir.open_workingtree()
993
            except errors.NoWorkingTree:
1551.15.60 by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708)
994
                source.bzrdir.create_workingtree(revision_id)
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
995
                return
3123.5.2 by Aaron Bentley
Allow checkout --files_from
996
        source.create_checkout(to_location, revision_id, lightweight,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
997
                               accelerator_tree, hardlink)
1508.1.20 by Robert Collins
Create a checkout command.
998
999
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1000
class cmd_renames(Command):
1001
    """Show list of renamed files.
1002
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1003
    # TODO: Option to show renames between two historical versions.
1004
1005
    # TODO: Only show renames under dir, rather than in the whole branch.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1006
    _see_also = ['status']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1007
    takes_args = ['dir?']
1008
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1009
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1010
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1011
        tree = WorkingTree.open_containing(dir)[0]
2255.7.63 by Robert Collins
Fix cmd_renames to lock around inventory access.
1012
        tree.lock_read()
1013
        try:
1014
            new_inv = tree.inventory
1015
            old_tree = tree.basis_tree()
1016
            old_tree.lock_read()
1017
            try:
1018
                old_inv = old_tree.inventory
1019
                renames = list(_mod_tree.find_renames(old_inv, new_inv))
1020
                renames.sort()
1021
                for old_name, new_name in renames:
1022
                    self.outf.write("%s => %s\n" % (old_name, new_name))
1023
            finally:
1024
                old_tree.unlock()
1025
        finally:
1026
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1027
1028
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1029
class cmd_update(Command):
1030
    """Update a tree to have the latest code committed to its branch.
1031
    
1032
    This will perform a merge into the working tree, and may generate
1587.1.10 by Robert Collins
update updates working tree and branch together.
1033
    conflicts. If you have any local changes, you will still 
1034
    need to commit them after the update for the update to be complete.
1035
    
1036
    If you want to discard your local changes, you can just do a 
1037
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1038
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1039
2625.5.1 by Daniel Watkins
'bzr update's help now includes a see also reference to 'help status-flags'.
1040
    _see_also = ['pull', 'working-trees', 'status-flags']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1041
    takes_args = ['dir?']
1815.3.1 by Stefan (metze) Metzmacher
add 'up' as alias for 'update'
1042
    aliases = ['up']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1043
1044
    def run(self, dir='.'):
1045
        tree = WorkingTree.open_containing(dir)[0]
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1046
        possible_transports = []
1047
        master = tree.branch.get_master_branch(
1048
            possible_transports=possible_transports)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1049
        if master is not None:
1050
            tree.lock_write()
1051
        else:
1052
            tree.lock_tree_write()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1053
        try:
2014.1.1 by John Arbash Meinel
Stop using pending_merges() in 'bzr update'
1054
            existing_pending_merges = tree.get_parent_ids()[1:]
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
1055
            last_rev = _mod_revision.ensure_null(tree.last_revision())
1056
            if last_rev == _mod_revision.ensure_null(
1057
                tree.branch.last_revision()):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1058
                # may be up to date, check master too.
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
1059
                if master is None or last_rev == _mod_revision.ensure_null(
1060
                    master.last_revision()):
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
1061
                    revno = tree.branch.revision_id_to_revno(last_rev)
1062
                    note("Tree is up to date at revision %d." % (revno,))
1063
                    return 0
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1064
            conflicts = tree.update(
1065
                delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1066
                possible_transports=possible_transports)
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
1067
            revno = tree.branch.revision_id_to_revno(
1068
                _mod_revision.ensure_null(tree.last_revision()))
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
1069
            note('Updated to revision %d.' % (revno,))
2014.1.1 by John Arbash Meinel
Stop using pending_merges() in 'bzr update'
1070
            if tree.get_parent_ids()[1:] != existing_pending_merges:
1711.2.108 by John Arbash Meinel
Assert that update informs the user about where their local commits went.
1071
                note('Your local commits will now show as pending merges with '
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
1072
                     "'bzr status', and can be committed with 'bzr commit'.")
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1073
            if conflicts != 0:
1074
                return 1
1075
            else:
1076
                return 0
1077
        finally:
1078
            tree.unlock()
1079
1080
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1081
class cmd_info(Command):
1694.2.6 by Martin Pool
[merge] bzr.dev
1082
    """Show information about a working tree, branch or repository.
1083
1084
    This command will show all known locations and formats associated to the
1085
    tree, branch or repository.  Statistical information is included with
1086
    each report.
1087
1088
    Branches and working trees will also report any missing revisions.
1089
    """
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
1090
    _see_also = ['revno', 'working-trees', 'repositories']
1694.2.6 by Martin Pool
[merge] bzr.dev
1091
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
1092
    takes_options = ['verbose']
2904.3.1 by Lukáš Lalinský
Unicode-safe output from ``bzr info``.
1093
    encoding_type = 'replace'
1694.2.6 by Martin Pool
[merge] bzr.dev
1094
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1095
    @display_command
2768.1.8 by Ian Clatworthy
Get test suite fully working again
1096
    def run(self, location=None, verbose=False):
1097
        if verbose:
1098
            noise_level = 2
1099
        else:
1100
            noise_level = 0
1694.2.6 by Martin Pool
[merge] bzr.dev
1101
        from bzrlib.info import show_bzrdir_info
1102
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
2904.3.1 by Lukáš Lalinský
Unicode-safe output from ``bzr info``.
1103
                         verbose=noise_level, outfile=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1104
1105
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
1106
class cmd_remove(Command):
2292.1.24 by Marius Kruger
minor text cleanups
1107
    """Remove files or directories.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1108
3619.5.3 by Robert Collins
Review feedback.
1109
    This makes bzr stop tracking changes to the specified files. bzr will delete
1110
    them if they can easily be recovered using revert. If no options or
1111
    parameters are given bzr will scan for files that are being tracked by bzr
1112
    but missing in your tree and stop tracking them for you.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1113
    """
1551.6.26 by Aaron Bentley
Add support for remove --new
1114
    takes_args = ['file*']
2292.1.30 by Marius Kruger
* Minor text fixes.
1115
    takes_options = ['verbose',
3619.5.1 by Robert Collins
* ``bzr rm`` will now scan for files that are missing and remove just
1116
        Option('new', help='Only remove files that have never been committed.'),
2292.1.28 by Marius Kruger
* NEWS
1117
        RegistryOption.from_kwargs('file-deletion-strategy',
2681.1.7 by Aaron Bentley
Fix option grammar
1118
            'The file deletion mode to be used.',
2292.1.28 by Marius Kruger
* NEWS
1119
            title='Deletion Strategy', value_switches=True, enum_switch=False,
2292.1.30 by Marius Kruger
* Minor text fixes.
1120
            safe='Only delete files if they can be'
1121
                 ' safely recovered (default).',
2292.1.28 by Marius Kruger
* NEWS
1122
            keep="Don't delete any files.",
1123
            force='Delete all the specified files, even if they can not be '
1124
                'recovered and even if they are non-empty directories.')]
3619.5.2 by Robert Collins
* ``bzr rm`` is now aliased to ``bzr del`` for the convenience of svn
1125
    aliases = ['rm', 'del']
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1126
    encoding_type = 'replace'
2292.1.1 by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file.
1127
2292.1.30 by Marius Kruger
* Minor text fixes.
1128
    def run(self, file_list, verbose=False, new=False,
2292.1.28 by Marius Kruger
* NEWS
1129
        file_deletion_strategy='safe'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1130
        tree, file_list = tree_files(file_list)
2292.1.1 by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file.
1131
1132
        if file_list is not None:
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
1133
            file_list = [f for f in file_list]
2292.1.1 by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file.
1134
3619.5.1 by Robert Collins
* ``bzr rm`` will now scan for files that are missing and remove just
1135
        tree.lock_write()
1136
        try:
1137
            # Heuristics should probably all move into tree.remove_smart or
1138
            # some such?
1139
            if new:
1140
                added = tree.changes_from(tree.basis_tree(),
1141
                    specific_files=file_list).added
1142
                file_list = sorted([f[0] for f in added], reverse=True)
1143
                if len(file_list) == 0:
1144
                    raise errors.BzrCommandError('No matching files.')
1145
            elif file_list is None:
1146
                # missing files show up in iter_changes(basis) as
1147
                # versioned-with-no-kind.
1148
                missing = []
1149
                for change in tree.iter_changes(tree.basis_tree()):
3619.5.3 by Robert Collins
Review feedback.
1150
                    # Find paths in the working tree that have no kind:
1151
                    if change[1][1] is not None and change[6][1] is None:
3619.5.1 by Robert Collins
* ``bzr rm`` will now scan for files that are missing and remove just
1152
                        missing.append(change[1][1])
1153
                file_list = sorted(missing, reverse=True)
1154
                file_deletion_strategy = 'keep'
1155
            tree.remove(file_list, verbose=verbose, to_file=self.outf,
1156
                keep_files=file_deletion_strategy=='keep',
1157
                force=file_deletion_strategy=='force')
1158
        finally:
1159
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1160
1161
1162
class cmd_file_id(Command):
1163
    """Print file_id of a particular file or directory.
1164
1165
    The file_id is assigned when the file is first added and remains the
1166
    same through all revisions where the file exists, even when it is
1167
    moved or renamed.
1168
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1169
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1170
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1171
    _see_also = ['inventory', 'ls']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1172
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
1173
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1174
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1175
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1176
        tree, relpath = WorkingTree.open_containing(filename)
2255.7.39 by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees.
1177
        i = tree.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1178
        if i is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1179
            raise errors.NotVersionedError(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1180
        else:
1685.1.80 by Wouter van Heyst
more code cleanup
1181
            self.outf.write(i + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1182
1183
1184
class cmd_file_path(Command):
1185
    """Print path of file_ids to a file or directory.
1186
1187
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
1188
    starting at the branch root.
1189
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1190
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1191
    hidden = True
1192
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
1193
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1194
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1195
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1196
        tree, relpath = WorkingTree.open_containing(filename)
2255.7.39 by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees.
1197
        fid = tree.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1198
        if fid is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1199
            raise errors.NotVersionedError(filename)
2255.7.39 by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees.
1200
        segments = osutils.splitpath(relpath)
1201
        for pos in range(1, len(segments) + 1):
1202
            path = osutils.joinpath(segments[:pos])
1203
            self.outf.write("%s\n" % tree.path2id(path))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1204
1205
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1206
class cmd_reconcile(Command):
1207
    """Reconcile bzr metadata in a branch.
1208
1209
    This can correct data mismatches that may have been caused by
1210
    previous ghost operations or bzr upgrades. You should only
1211
    need to run this command if 'bzr check' or a bzr developer 
1212
    advises you to run it.
1213
1214
    If a second branch is provided, cross-branch reconciliation is
1215
    also attempted, which will check that data like the tree root
1216
    id which was not present in very early bzr versions is represented
1217
    correctly in both branches.
1218
1219
    At the same time it is run it may recompress data resulting in 
1220
    a potential saving in disk space or performance gain.
1221
1222
    The branch *MUST* be on a listable system such as local disk or sftp.
1223
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1224
1225
    _see_also = ['check']
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1226
    takes_args = ['branch?']
1227
1228
    def run(self, branch="."):
1229
        from bzrlib.reconcile import reconcile
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1230
        dir = bzrdir.BzrDir.open(branch)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1231
        reconcile(dir)
1232
1233
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1234
class cmd_revision_history(Command):
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1235
    """Display the list of revision ids on a branch."""
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1236
1237
    _see_also = ['log']
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1238
    takes_args = ['location?']
1239
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1240
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1241
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1242
    @display_command
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1243
    def run(self, location="."):
1244
        branch = Branch.open_containing(location)[0]
1245
        for revid in branch.revision_history():
1733.2.4 by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history().
1246
            self.outf.write(revid)
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1247
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1248
1249
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1250
class cmd_ancestry(Command):
1251
    """List all revisions merged into this branch."""
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1252
1253
    _see_also = ['log', 'revision-history']
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
1254
    takes_args = ['location?']
1255
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1256
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1257
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1258
    @display_command
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
1259
    def run(self, location="."):
1260
        try:
1261
            wt = WorkingTree.open_containing(location)[0]
1262
        except errors.NoWorkingTree:
1263
            b = Branch.open(location)
1264
            last_revision = b.last_revision()
1265
        else:
1266
            b = wt.branch
1267
            last_revision = wt.last_revision()
1268
1269
        revision_ids = b.repository.get_ancestry(last_revision)
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
1270
        revision_ids.pop(0)
1271
        for revision_id in revision_ids:
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
1272
            self.outf.write(revision_id + '\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1273
1274
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1275
class cmd_init(Command):
1276
    """Make a directory into a versioned branch.
1277
1278
    Use this to create an empty branch, or before importing an
1279
    existing project.
1280
1662.1.19 by Martin Pool
Better error message when initting existing tree
1281
    If there is a repository in a parent directory of the location, then 
1282
    the history of the branch will be stored in the repository.  Otherwise
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
1283
    init creates a standalone branch which carries its own history
1284
    in the .bzr directory.
1662.1.19 by Martin Pool
Better error message when initting existing tree
1285
1286
    If there is already a branch at the location but it has no working tree,
1287
    the tree can be populated with 'bzr checkout'.
1288
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1289
    Recipe for importing a tree of files::
1290
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1291
        cd ~/project
1292
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
1293
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1294
        bzr status
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
1295
        bzr commit -m "imported project"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1296
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1297
2677.1.2 by Alexander Belchenko
bzr_man: see also topics as cross-reference links
1298
    _see_also = ['init-repository', 'branch', 'checkout']
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1299
    takes_args = ['location?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1300
    takes_options = [
2524.1.1 by Aaron Bentley
Revert broken changes
1301
        Option('create-prefix',
1302
               help='Create the path leading up to the branch '
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1303
                    'if it does not already exist.'),
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1304
         RegistryOption('format',
1305
                help='Specify a format for this branch. '
1306
                'See "help formats".',
1307
                registry=bzrdir.format_registry,
2241.1.19 by mbp at sourcefrog
(merge) trunk
1308
                converter=bzrdir.format_registry.make_bzrdir,
1309
                value_switches=True,
1310
                title="Branch Format",
1311
                ),
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1312
         Option('append-revisions-only',
1313
                help='Never change revnos or the existing log.'
1314
                '  Append revisions to it only.')
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1315
         ]
2524.1.1 by Aaron Bentley
Revert broken changes
1316
    def run(self, location=None, format=None, append_revisions_only=False,
1317
            create_prefix=False):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1318
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1319
            format = bzrdir.format_registry.make_bzrdir('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1320
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1321
            location = u'.'
1830.4.5 by Wouter van Heyst
cleanup
1322
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1323
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1324
1325
        # The path has to exist to initialize a
1326
        # branch inside of it.
1327
        # Just using os.mkdir, since I don't
1328
        # believe that we want to create a bunch of
1329
        # locations if the user supplies an extended path
2524.1.1 by Aaron Bentley
Revert broken changes
1330
        try:
1331
            to_transport.ensure_base()
1332
        except errors.NoSuchFile:
1333
            if not create_prefix:
1334
                raise errors.BzrCommandError("Parent directory of %s"
1335
                    " does not exist."
1336
                    "\nYou may supply --create-prefix to create all"
1337
                    " leading parent directories."
1338
                    % location)
1339
            _create_prefix(to_transport)
2504.1.3 by Daniel Watkins
Implemented --create-prefix for 'init'.
1340
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1341
        try:
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
1342
            a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1343
        except errors.NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1344
            # really a NotBzrDir error...
2476.3.11 by Vincent Ladeuil
Cosmetic changes.
1345
            create_branch = bzrdir.BzrDir.create_branch_convenience
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
1346
            branch = create_branch(to_transport.base, format=format,
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1347
                                   possible_transports=[to_transport])
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
1348
            a_bzrdir = branch.bzrdir
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1349
        else:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1350
            from bzrlib.transport.local import LocalTransport
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
1351
            if a_bzrdir.has_branch():
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1352
                if (isinstance(to_transport, LocalTransport)
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
1353
                    and not a_bzrdir.has_workingtree()):
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1354
                        raise errors.BranchExistsWithoutWorkingTree(location)
1355
                raise errors.AlreadyBranchError(location)
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
1356
            branch = a_bzrdir.create_branch()
1357
            a_bzrdir.create_workingtree()
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1358
        if append_revisions_only:
1359
            try:
1360
                branch.set_append_revisions_only(True)
1361
            except errors.UpgradeRequired:
1362
                raise errors.BzrCommandError('This branch format cannot be set'
1363
                    ' to append-revisions-only.  Try --experimental-branch6')
3535.9.1 by Marius Kruger
print info after init and init-repo
1364
        if not is_quiet():
1365
            from bzrlib.info import show_bzrdir_info
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
1366
            show_bzrdir_info(a_bzrdir, verbose=0, outfile=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1367
1368
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1369
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1370
    """Create a shared repository to hold branches.
1371
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
1372
    New branches created under the repository directory will store their
1373
    revisions in the repository, not in the branch directory.
1374
1375
    If the --no-trees option is used then the branches in the repository
1376
    will not have working trees by default.
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1377
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1378
    :Examples:
1379
        Create a shared repositories holding just branches::
1380
1381
            bzr init-repo --no-trees repo
1382
            bzr init repo/trunk
1383
1384
        Make a lightweight checkout elsewhere::
1385
1386
            bzr checkout --lightweight repo/trunk trunk-checkout
1387
            cd trunk-checkout
1388
            (add files here)
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1389
    """
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
1390
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1391
    _see_also = ['init', 'branch', 'checkout', 'repositories']
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1392
    takes_args = ["location"]
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1393
    takes_options = [RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1394
                            help='Specify a format for this repository. See'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1395
                                 ' "bzr help formats" for details.',
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1396
                            registry=bzrdir.format_registry,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1397
                            converter=bzrdir.format_registry.make_bzrdir,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1398
                            value_switches=True, title='Repository format'),
2257.2.1 by Wouter van Heyst
Change the ui level default for init-repo to --trees.
1399
                     Option('no-trees',
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
1400
                             help='Branches in the repository will default to'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1401
                                  ' not having a working tree.'),
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
1402
                    ]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1403
    aliases = ["init-repo"]
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
1404
2257.2.2 by Wouter van Heyst
Actually test that `bzr init-repo --{no,}-trees` still works
1405
    def run(self, location, format=None, no_trees=False):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1406
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1407
            format = bzrdir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1408
1409
        if location is None:
1410
            location = '.'
1411
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1412
        to_transport = transport.get_transport(location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1413
        to_transport.ensure_base()
1830.4.5 by Wouter van Heyst
cleanup
1414
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1415
        newdir = format.initialize_on_transport(to_transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
1416
        repo = newdir.create_repository(shared=True)
2257.2.2 by Wouter van Heyst
Actually test that `bzr init-repo --{no,}-trees` still works
1417
        repo.set_make_working_trees(not no_trees)
3535.9.1 by Marius Kruger
print info after init and init-repo
1418
        if not is_quiet():
1419
            from bzrlib.info import show_bzrdir_info
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
1420
            show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
1558.5.1 by Aaron Bentley
Added make-repository command
1421
1422
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1423
class cmd_diff(Command):
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1424
    """Show differences in the working tree, between revisions or branches.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1425
    
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1426
    If no arguments are given, all changes for the current tree are listed.
1427
    If files are given, only the changes in those files are listed.
1428
    Remote and multiple branches can be compared by using the --old and
1429
    --new options. If not provided, the default for both is derived from
1430
    the first argument, if any, or the current tree if no arguments are
1431
    given.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1432
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1433
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1434
    produces patches suitable for "patch -p1".
1435
2961.2.1 by Guillermo Gonzalez
* fix Bug #147938 (add exit values reference for cmd_diff help)
1436
    :Exit values:
1437
        1 - changed
1438
        2 - unrepresentable changes
1439
        3 - error
1440
        0 - no change
1441
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1442
    :Examples:
1443
        Shows the difference in the working tree versus the last commit::
1444
1445
            bzr diff
1446
1447
        Difference between the working tree and revision 1::
1448
1449
            bzr diff -r1
1450
1451
        Difference between revision 2 and revision 1::
1452
1453
            bzr diff -r1..2
1454
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1455
        Difference between revision 2 and revision 1 for branch xxx::
1456
1457
            bzr diff -r1..2 xxx
1458
1459
        Show just the differences for file NEWS::
1460
1461
            bzr diff NEWS
1462
1463
        Show the differences in working tree xxx for file NEWS::
1464
1465
            bzr diff xxx/NEWS
1466
1467
        Show the differences from branch xxx to this working tree:
1468
1469
            bzr diff --old xxx
1470
1471
        Show the differences between two branches for file NEWS::
1472
3072.1.4 by Ian Clatworthy
Tweak help
1473
            bzr diff --old xxx --new yyy NEWS
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1474
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1475
        Same as 'bzr diff' but prefix paths with old/ and new/::
1476
1477
            bzr diff --prefix old/:new/
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1478
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1479
    _see_also = ['status']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1480
    takes_args = ['file*']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
1481
    takes_options = [
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
1482
        Option('diff-options', type=str,
1483
               help='Pass these options to the external diff program.'),
2193.3.1 by Martin Pool
Finish removal of global short-option table
1484
        Option('prefix', type=str,
1485
               short_name='p',
2852.1.1 by Vincent Ladeuil
Fix typo.
1486
               help='Set prefixes added to old and new filenames, as '
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1487
                    'two values separated by a colon. (eg "old/:new/").'),
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1488
        Option('old',
3118.1.2 by Ian Clatworthy
diff on branches without working trees (Ian Clatworthy, #6700)
1489
            help='Branch/tree to compare from.',
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1490
            type=unicode,
1491
            ),
1492
        Option('new',
3118.1.2 by Ian Clatworthy
diff on branches without working trees (Ian Clatworthy, #6700)
1493
            help='Branch/tree to compare to.',
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1494
            type=unicode,
1495
            ),
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
1496
        'revision',
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
1497
        'change',
3123.6.2 by Aaron Bentley
Implement diff --using natively
1498
        Option('using',
1499
            help='Use this command to compare files.',
1500
            type=unicode,
1501
            ),
2190.2.1 by Martin Pool
remove global registration of short options
1502
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1503
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1504
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1505
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1506
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1507
    def run(self, revision=None, file_list=None, diff_options=None,
3123.6.2 by Aaron Bentley
Implement diff --using natively
1508
            prefix=None, old=None, new=None, using=None):
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1509
        from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1510
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1511
        if (prefix is None) or (prefix == '0'):
1512
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
1513
            old_label = ''
1514
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1515
        elif prefix == '1':
1516
            old_label = 'old/'
1517
            new_label = 'new/'
2197.2.1 by Martin Pool
Refactor cmd_diff
1518
        elif ':' in prefix:
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1519
            old_label, new_label = prefix.split(":")
2197.2.1 by Martin Pool
Refactor cmd_diff
1520
        else:
2324.1.1 by Dmitry Vasiliev
Small fixes for bzr diff
1521
            raise errors.BzrCommandError(
2325.1.2 by John Arbash Meinel
Add (eg "old/:new/") to errors to make it a little clearer.
1522
                '--prefix expects two values separated by a colon'
1523
                ' (eg "old/:new/")')
2197.2.1 by Martin Pool
Refactor cmd_diff
1524
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
1525
        if revision and len(revision) > 2:
1526
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1527
                                         ' one or two revision specifiers')
2325.1.2 by John Arbash Meinel
Add (eg "old/:new/") to errors to make it a little clearer.
1528
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1529
        old_tree, new_tree, specific_files, extra_trees = \
1530
                _get_trees_to_diff(file_list, revision, old, new)
1531
        return show_diff_trees(old_tree, new_tree, sys.stdout, 
1532
                               specific_files=specific_files,
1533
                               external_diff_options=diff_options,
1534
                               old_label=old_label, new_label=new_label,
3123.6.2 by Aaron Bentley
Implement diff --using natively
1535
                               extra_trees=extra_trees, using=using)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1536
1537
1538
class cmd_deleted(Command):
1539
    """List files deleted in the working tree.
1540
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1541
    # TODO: Show files deleted since a previous revision, or
1542
    # between two revisions.
1543
    # TODO: Much more efficient way to do this: read in new
1544
    # directories with readdir, rather than stating each one.  Same
1545
    # level of effort but possibly much less IO.  (Or possibly not,
1546
    # if the directories are very large...)
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1547
    _see_also = ['status', 'ls']
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1548
    takes_options = ['show-ids']
1549
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1550
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1551
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1552
        tree = WorkingTree.open_containing(u'.')[0]
2255.7.72 by Robert Collins
Update cmd_deleted to lock around inventory access.
1553
        tree.lock_read()
1554
        try:
1555
            old = tree.basis_tree()
1556
            old.lock_read()
1557
            try:
1558
                for path, ie in old.inventory.iter_entries():
1559
                    if not tree.has_id(ie.file_id):
1560
                        self.outf.write(path)
1561
                        if show_ids:
1562
                            self.outf.write(' ')
1563
                            self.outf.write(ie.file_id)
1564
                        self.outf.write('\n')
1565
            finally:
1566
                old.unlock()
1567
        finally:
1568
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1569
1570
1571
class cmd_modified(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1572
    """List files modified in working tree.
1573
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1574
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1575
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1576
    _see_also = ['status', 'ls']
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1577
    takes_options = [
1578
            Option('null',
1579
                   help='Write an ascii NUL (\\0) separator '
1580
                   'between files rather than a newline.')
1581
            ]
1551.10.14 by Aaron Bentley
Add some blank lines
1582
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1583
    @display_command
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1584
    def run(self, null=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1585
        tree = WorkingTree.open_containing(u'.')[0]
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
1586
        td = tree.changes_from(tree.basis_tree())
1398 by Robert Collins
integrate in Gustavos x-bit patch
1587
        for path, id, kind, text_modified, meta_modified in td.modified:
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1588
            if null:
1589
                self.outf.write(path + '\0')
1590
            else:
1591
                self.outf.write(osutils.quotefn(path) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1592
1593
1594
class cmd_added(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1595
    """List files added in working tree.
1596
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1597
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1598
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1599
    _see_also = ['status', 'ls']
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1600
    takes_options = [
1601
            Option('null',
1602
                   help='Write an ascii NUL (\\0) separator '
1603
                   'between files rather than a newline.')
1604
            ]
1551.10.14 by Aaron Bentley
Add some blank lines
1605
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1606
    @display_command
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1607
    def run(self, null=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1608
        wt = WorkingTree.open_containing(u'.')[0]
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
1609
        wt.lock_read()
1610
        try:
1611
            basis = wt.basis_tree()
1612
            basis.lock_read()
1613
            try:
1614
                basis_inv = basis.inventory
1615
                inv = wt.inventory
1616
                for file_id in inv:
1617
                    if file_id in basis_inv:
1618
                        continue
1619
                    if inv.is_root(file_id) and len(basis_inv) == 0:
1620
                        continue
1621
                    path = inv.id2path(file_id)
1622
                    if not os.access(osutils.abspath(path), os.F_OK):
1623
                        continue
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1624
                    if null:
1625
                        self.outf.write(path + '\0')
1626
                    else:
1627
                        self.outf.write(osutils.quotefn(path) + '\n')
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
1628
            finally:
1629
                basis.unlock()
1630
        finally:
1631
            wt.unlock()
1185.85.53 by John Arbash Meinel
Updated cmd_root
1632
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1633
1634
class cmd_root(Command):
1635
    """Show the tree root directory.
1636
1637
    The root is the nearest enclosing directory with a .bzr control
1638
    directory."""
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1639
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1640
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1641
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1642
    def run(self, filename=None):
1643
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1644
        tree = WorkingTree.open_containing(filename)[0]
1685.1.80 by Wouter van Heyst
more code cleanup
1645
        self.outf.write(tree.basedir + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1646
1647
2466.9.1 by Kent Gibson
add bzr log --limit
1648
def _parse_limit(limitstring):
1649
    try:
1650
        return int(limitstring)
1651
    except ValueError:
1652
        msg = "The limit argument must be an integer."
1653
        raise errors.BzrCommandError(msg)
1654
1655
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1656
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1657
    """Show log of a branch, file, or directory.
1658
1659
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1660
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1661
    To request a range of logs, you can use the command -r begin..end
1662
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1663
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1664
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1665
    :Examples:
1666
        Log the current branch::
1667
1668
            bzr log
1669
1670
        Log a file::
1671
1672
            bzr log foo.c
1673
1674
        Log the last 10 revisions of a branch::
1675
1676
            bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1677
    """
1678
1393.1.55 by Martin Pool
doc
1679
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1680
1626.1.2 by Martin Pool
Better help message for log command.
1681
    takes_args = ['location?']
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
1682
    takes_options = [
1683
            Option('forward',
1684
                   help='Show from oldest to newest.'),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
1685
            Option('timezone',
1686
                   type=str,
1687
                   help='Display timezone as local, original, or utc.'),
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
1688
            custom_help('verbose',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
1689
                   help='Show files changed in each revision.'),
1690
            'show-ids',
1691
            'revision',
1692
            'log-format',
1693
            Option('message',
1694
                   short_name='m',
1695
                   help='Show revisions whose message matches this '
1696
                        'regular expression.',
1697
                   type=str),
1698
            Option('limit',
3108.1.1 by Matt Nordhoff
bzr log: Add -l short name for the --limit argument.
1699
                   short_name='l',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
1700
                   help='Limit the output to the first N revisions.',
1701
                   argname='N',
1702
                   type=_parse_limit),
1703
            ]
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
1704
    encoding_type = 'replace'
1705
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1706
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1707
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1708
            verbose=False,
1709
            show_ids=False,
1710
            forward=False,
1711
            revision=None,
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1712
            log_format=None,
2466.9.1 by Kent Gibson
add bzr log --limit
1713
            message=None,
1714
            limit=None):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1715
        from bzrlib.log import show_log
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1716
        direction = (forward and 'forward') or 'reverse'
1717
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1718
        # log everything
1719
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1720
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1721
            # find the file id to log:
1722
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
1723
            tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1724
                location)
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1725
            if fp != '':
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
1726
                if tree is None:
1727
                    tree = b.basis_tree()
2255.7.39 by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees.
1728
                file_id = tree.path2id(fp)
2100.1.1 by wang
Running ``bzr log`` on nonexistent file gives an error instead of the
1729
                if file_id is None:
1730
                    raise errors.BzrCommandError(
1731
                        "Path does not have any revision history: %s" %
1732
                        location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1733
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1734
            # local dir only
1735
            # FIXME ? log the current subdir only RBC 20060203 
1907.4.10 by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path.
1736
            if revision is not None \
1737
                    and len(revision) > 0 and revision[0].get_branch():
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1738
                location = revision[0].get_branch()
1739
            else:
1740
                location = '.'
1741
            dir, relpath = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1742
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1743
2230.4.1 by Aaron Bentley
Get log as fast branch5
1744
        b.lock_read()
1745
        try:
1746
            if revision is None:
1747
                rev1 = None
1748
                rev2 = None
1749
            elif len(revision) == 1:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1750
                rev1 = rev2 = revision[0].in_history(b)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1751
            elif len(revision) == 2:
1752
                if revision[1].get_branch() != revision[0].get_branch():
1753
                    # b is taken from revision[0].get_branch(), and
1754
                    # show_log will use its revision_history. Having
1755
                    # different branches will lead to weird behaviors.
1756
                    raise errors.BzrCommandError(
1757
                        "Log doesn't accept two revisions in different"
1758
                        " branches.")
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1759
                rev1 = revision[0].in_history(b)
1760
                rev2 = revision[1].in_history(b)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1761
            else:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1762
                raise errors.BzrCommandError(
2230.4.1 by Aaron Bentley
Get log as fast branch5
1763
                    'bzr log --revision takes one or two values.')
1764
1765
            if log_format is None:
1766
                log_format = log.log_formatter_registry.get_default(b)
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
1767
2230.4.1 by Aaron Bentley
Get log as fast branch5
1768
            lf = log_format(show_ids=show_ids, to_file=self.outf,
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
1769
                            show_timezone=timezone)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1770
1771
            show_log(b,
1772
                     lf,
1773
                     file_id,
1774
                     verbose=verbose,
1775
                     direction=direction,
1776
                     start_revision=rev1,
1777
                     end_revision=rev2,
2466.9.1 by Kent Gibson
add bzr log --limit
1778
                     search=message,
1779
                     limit=limit)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1780
        finally:
1781
            b.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1782
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1783
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1784
def get_log_format(long=False, short=False, line=False, default='long'):
1785
    log_format = default
1786
    if long:
1787
        log_format = 'long'
1788
    if short:
1789
        log_format = 'short'
1790
    if line:
1791
        log_format = 'line'
1792
    return log_format
1793
1794
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1795
class cmd_touching_revisions(Command):
1796
    """Return revision-ids which affected a particular file.
1797
1685.1.80 by Wouter van Heyst
more code cleanup
1798
    A more user-friendly interface is "bzr log FILE".
1799
    """
1800
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1801
    hidden = True
1802
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1803
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1804
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1805
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1806
        tree, relpath = WorkingTree.open_containing(filename)
1807
        b = tree.branch
2255.7.39 by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees.
1808
        file_id = tree.path2id(relpath)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1809
        for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1810
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1811
1812
1813
class cmd_ls(Command):
1814
    """List files in a tree.
1815
    """
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1816
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1817
    _see_also = ['status', 'cat']
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1818
    takes_args = ['path?']
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1819
    # TODO: Take a revision or remote path and list that tree instead.
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
1820
    takes_options = [
1821
            'verbose',
1822
            'revision',
1823
            Option('non-recursive',
1824
                   help='Don\'t recurse into subdirectories.'),
1825
            Option('from-root',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
1826
                   help='Print paths relative to the root of the branch.'),
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
1827
            Option('unknown', help='Print unknown files.'),
3382.2.1 by Jerad Cramp
Fixed bug #165086. Command 'bzr ls' now accepts '-V' as an alias for '--versioned'.
1828
            Option('versioned', help='Print versioned files.',
1829
                   short_name='V'),
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
1830
            Option('ignored', help='Print ignored files.'),
1831
            Option('null',
1832
                   help='Write an ascii NUL (\\0) separator '
1833
                   'between files rather than a newline.'),
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
1834
            Option('kind',
2598.1.12 by Martin Pool
Fix up --kind options
1835
                   help='List entries of a particular kind: file, directory, symlink.',
1836
                   type=unicode),
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
1837
            'show-ids',
1838
            ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1839
    @display_command
2598.1.12 by Martin Pool
Fix up --kind options
1840
    def run(self, revision=None, verbose=False,
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1841
            non_recursive=False, from_root=False,
1842
            unknown=False, versioned=False, ignored=False,
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1843
            null=False, kind=None, show_ids=False, path=None):
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1844
1845
        if kind and kind not in ('file', 'directory', 'symlink'):
1846
            raise errors.BzrCommandError('invalid kind specified')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1847
1848
        if verbose and null:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1849
            raise errors.BzrCommandError('Cannot set both --verbose and --null')
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1850
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1851
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1852
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1853
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1854
        if path is None:
1855
            fs_path = '.'
1856
            prefix = ''
1857
        else:
1858
            if from_root:
1859
                raise errors.BzrCommandError('cannot specify both --from-root'
1860
                                             ' and PATH')
1861
            fs_path = path
1862
            prefix = path
2215.3.3 by Aaron Bentley
Get ls working on branches
1863
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1864
            fs_path)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1865
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1866
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1867
        elif relpath:
1868
            relpath += '/'
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
1869
        if revision is not None or tree is None:
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
1870
            tree = _get_one_revision_tree('ls', revision, branch=branch)
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1871
2255.2.61 by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked.
1872
        tree.lock_read()
1873
        try:
1874
            for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1875
                if fp.startswith(relpath):
1876
                    fp = osutils.pathjoin(prefix, fp[len(relpath):])
1877
                    if non_recursive and '/' in fp:
1878
                        continue
1879
                    if not all and not selection[fc]:
1880
                        continue
1881
                    if kind is not None and fkind != kind:
1882
                        continue
1883
                    if verbose:
1884
                        kindch = entry.kind_character()
1885
                        outstring = '%-8s %s%s' % (fc, fp, kindch)
1886
                        if show_ids and fid is not None:
1887
                            outstring = "%-50s %s" % (outstring, fid)
1888
                        self.outf.write(outstring + '\n')
1889
                    elif null:
1890
                        self.outf.write(fp + '\0')
1891
                        if show_ids:
1892
                            if fid is not None:
1893
                                self.outf.write(fid)
1894
                            self.outf.write('\0')
1895
                        self.outf.flush()
1896
                    else:
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1897
                        if fid is not None:
2255.2.61 by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked.
1898
                            my_id = fid
1899
                        else:
1900
                            my_id = ''
1901
                        if show_ids:
1902
                            self.outf.write('%-50s %s\n' % (fp, my_id))
1903
                        else:
1904
                            self.outf.write(fp + '\n')
1905
        finally:
1906
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1907
1908
1909
class cmd_unknowns(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1910
    """List unknown files.
1911
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1912
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1913
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1914
    _see_also = ['ls']
1551.10.14 by Aaron Bentley
Add some blank lines
1915
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1916
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1917
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1918
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1919
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1920
1921
1922
class cmd_ignore(Command):
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1923
    """Ignore specified files or patterns.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1924
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
1925
    See ``bzr help patterns`` for details on the syntax of patterns.
1926
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1927
    To remove patterns from the ignore list, edit the .bzrignore file.
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
1928
    After adding, editing or deleting that file either indirectly by
1929
    using this command or directly by using an editor, be sure to commit
1930
    it.
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1931
1932
    Note: ignore patterns containing shell wildcards must be quoted from 
1933
    the shell on Unix.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1934
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1935
    :Examples:
1936
        Ignore the top level Makefile::
1937
1938
            bzr ignore ./Makefile
1939
1940
        Ignore class files in all directories::
1941
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
1942
            bzr ignore "*.class"
1943
1944
        Ignore .o files under the lib directory::
1945
1946
            bzr ignore "lib/**/*.o"
1947
1948
        Ignore .o files under the lib directory::
1949
1950
            bzr ignore "RE:lib/.*\.o"
3257.1.1 by Adeodato Simó
Add an example of some bzrignore cool stuff with Python regexes.
1951
1952
        Ignore everything but the "debian" toplevel directory::
1953
1954
            bzr ignore "RE:(?!debian/).*"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1955
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1956
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
1957
    _see_also = ['status', 'ignored', 'patterns']
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1958
    takes_args = ['name_pattern*']
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1959
    takes_options = [
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1960
        Option('old-default-rules',
1961
               help='Write out the ignore rules bzr < 0.9 always used.')
1962
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1963
    
2063.5.2 by wang
Don't use mutable values as default argument definitions.
1964
    def run(self, name_pattern_list=None, old_default_rules=None):
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
1965
        from bzrlib import ignores
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1966
        if old_default_rules is not None:
1967
            # dump the rules and exit
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
1968
            for pattern in ignores.OLD_DEFAULTS:
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1969
                print pattern
1970
            return
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1971
        if not name_pattern_list:
2063.5.5 by wang
resolve a conflict
1972
            raise errors.BzrCommandError("ignore requires at least one "
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
1973
                                  "NAME_PATTERN or --old-default-rules")
2298.8.4 by Kent Gibson
Fix whitespace and alignment.
1974
        name_pattern_list = [globbing.normalize_pattern(p) 
1975
                             for p in name_pattern_list]
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1976
        for name_pattern in name_pattern_list:
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
1977
            if (name_pattern[0] == '/' or 
1978
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1979
                raise errors.BzrCommandError(
1980
                    "NAME_PATTERN should not be an absolute path")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1981
        tree, relpath = WorkingTree.open_containing(u'.')
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
1982
        ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2747.5.1 by Daniel Watkins
'ignore' now outputs a list of versioned files that match the given pattern.
1983
        ignored = globbing.Globster(name_pattern_list)
1984
        matches = []
1985
        tree.lock_read()
1986
        for entry in tree.list_files():
1987
            id = entry[3]
1988
            if id is not None:
1989
                filename = entry[0]
1990
                if ignored.match(filename):
2747.5.3 by Daniel Watkins
Modified to avoid encoding issues.
1991
                    matches.append(filename.encode('utf-8'))
2747.5.1 by Daniel Watkins
'ignore' now outputs a list of versioned files that match the given pattern.
1992
        tree.unlock()
1993
        if len(matches) > 0:
1994
            print "Warning: the following files are version controlled and" \
1995
                  " match your ignore pattern:\n%s" % ("\n".join(matches),)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1996
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
1997
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1998
class cmd_ignored(Command):
1999
    """List ignored files and the patterns that matched them.
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
2000
2001
    List all the ignored files and the ignore pattern that caused the file to
2002
    be ignored.
2003
2004
    Alternatively, to list just the files::
2005
2006
        bzr ls --ignored
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2007
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2008
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2009
    encoding_type = 'replace'
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
2010
    _see_also = ['ignore', 'ls']
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2011
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2012
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2013
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2014
        tree = WorkingTree.open_containing(u'.')[0]
2255.2.61 by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked.
2015
        tree.lock_read()
2016
        try:
2017
            for path, file_class, kind, file_id, entry in tree.list_files():
2018
                if file_class != 'I':
2019
                    continue
2020
                ## XXX: Slightly inefficient since this was already calculated
2021
                pat = tree.is_ignored(path)
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2022
                self.outf.write('%-50s %s\n' % (path, pat))
2255.2.61 by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked.
2023
        finally:
2024
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2025
2026
2027
class cmd_lookup_revision(Command):
2028
    """Lookup the revision-id from a revision-number
2029
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2030
    :Examples:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2031
        bzr lookup-revision 33
2032
    """
2033
    hidden = True
2034
    takes_args = ['revno']
2035
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2036
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2037
    def run(self, revno):
2038
        try:
2039
            revno = int(revno)
2040
        except ValueError:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2041
            raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2042
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2043
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2044
2045
2046
class cmd_export(Command):
2374.1.1 by Ian Clatworthy
Help and man page fixes
2047
    """Export current or past revision to a destination directory or archive.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2048
2049
    If no revision is specified this exports the last committed revision.
2050
2051
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
2052
    given, try to find the format with the extension. If no extension
2053
    is found exports to a directory (equivalent to --format=dir).
2054
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
2055
    If root is supplied, it will be used as the root directory inside
2056
    container formats (tar, zip, etc). If it is not supplied it will default
2057
    to the exported filename. The root option has no effect for 'dir' format.
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2058
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2059
    If branch is omitted then the branch containing the current working
2060
    directory will be used.
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2061
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
2062
    Note: Export of tree with non-ASCII filenames to zip is not supported.
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2063
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2064
      =================       =========================
2065
      Supported formats       Autodetected by extension
2066
      =================       =========================
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
2067
         dir                         (none)
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2068
         tar                          .tar
2069
         tbz2                    .tar.bz2, .tbz2
2070
         tgz                      .tar.gz, .tgz
2071
         zip                          .zip
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2072
      =================       =========================
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2073
    """
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2074
    takes_args = ['dest', 'branch_or_subdir?']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2075
    takes_options = [
2076
        Option('format',
2077
               help="Type of file to export to.",
2078
               type=unicode),
2079
        'revision',
2080
        Option('root',
2081
               type=str,
2082
               help="Name of the root directory inside the exported file."),
2083
        ]
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2084
    def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2085
        root=None):
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
2086
        from bzrlib.export import export
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2087
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2088
        if branch_or_subdir is None:
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2089
            tree = WorkingTree.open_containing(u'.')[0]
2090
            b = tree.branch
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2091
            subdir = None
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2092
        else:
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2093
            b, subdir = Branch.open_containing(branch_or_subdir)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2094
            tree = None
2095
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
2096
        rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
2097
        try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2098
            export(rev_tree, dest, format, root, subdir)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
2099
        except errors.NoSuchExportFormat, e:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2100
            raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2101
2102
2103
class cmd_cat(Command):
2374.1.1 by Ian Clatworthy
Help and man page fixes
2104
    """Write the contents of a file as of a given revision to standard output.
2105
2106
    If no revision is nominated, the last revision is used.
2107
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2108
    Note: Take care to redirect standard output when using this command on a
2109
    binary file. 
2374.1.1 by Ian Clatworthy
Help and man page fixes
2110
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2111
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2112
    _see_also = ['ls']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2113
    takes_options = [
2114
        Option('name-from-revision', help='The path name in the old tree.'),
2115
        'revision',
2116
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2117
    takes_args = ['filename']
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
2118
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2119
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2120
    @display_command
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
2121
    def run(self, filename, revision=None, name_from_revision=False):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
2122
        if revision is not None and len(revision) != 1:
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2123
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
2124
                                         " one revision specifier")
2125
        tree, branch, relpath = \
2126
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2127
        branch.lock_read()
2128
        try:
2129
            return self._run(tree, branch, relpath, filename, revision,
2130
                             name_from_revision)
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2131
        finally:
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
2132
            branch.unlock()
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2133
2134
    def _run(self, tree, b, relpath, filename, revision, name_from_revision):
1907.4.5 by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
2135
        if tree is None:
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
2136
            tree = b.basis_tree()
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
2137
        rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2138
2139
        cur_file_id = tree.path2id(relpath)
2140
        old_file_id = rev_tree.path2id(relpath)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2141
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
2142
        if name_from_revision:
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2143
            if old_file_id is None:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2144
                raise errors.BzrCommandError(
2145
                    "%r is not present in revision %s" % (
2146
                        filename, rev_tree.get_revision_id()))
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2147
            else:
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2148
                content = rev_tree.get_file_text(old_file_id)
2073.2.2 by wang
Make the decision tree a little clearer. Add more tests for exceptions.
2149
        elif cur_file_id is not None:
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2150
            content = rev_tree.get_file_text(cur_file_id)
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2151
        elif old_file_id is not None:
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2152
            content = rev_tree.get_file_text(old_file_id)
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2153
        else:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2154
            raise errors.BzrCommandError(
2155
                "%r is not present in revision %s" % (
2156
                    filename, rev_tree.get_revision_id()))
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2157
        self.outf.write(content)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2158
2159
2160
class cmd_local_time_offset(Command):
2161
    """Show the offset in seconds from GMT to local time."""
2162
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2163
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2164
    def run(self):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2165
        print osutils.local_time_offset()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2166
2167
2168
2169
class cmd_commit(Command):
2170
    """Commit changes into a new revision.
2171
    
2172
    If no arguments are given, the entire tree is committed.
2173
2174
    If selected files are specified, only changes to those files are
2175
    committed.  If a directory is specified then the directory and everything 
2176
    within it is committed.
2177
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2178
    When excludes are given, they take precedence over selected files.
2179
    For example, too commit only changes within foo, but not changes within
2180
    foo/bar::
2181
2182
      bzr commit foo -x foo/bar
2183
2671.2.2 by Lukáš Lalinský
Move setting of the author revision property to MutableTree.commit. Don't use try/except KeyError in LongLogFormatter to display authors and branch-nicks. Removed warning about missing e-mail in the authors name.
2184
    If author of the change is not the same person as the committer, you can
2185
    specify the author's name using the --author option. The name should be
2186
    in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2671.2.1 by Lukáš Lalinský
Add --author option to 'bzr commit' to record the author's name, if it's different from the committer.
2187
2374.1.5 by Ian Clatworthy
explained selected fail commit failure by design
2188
    A selected-file commit may fail in some cases where the committed
2189
    tree would be invalid. Consider::
2190
2191
      bzr init foo
2192
      mkdir foo/bar
2193
      bzr add foo/bar
2194
      bzr commit foo -m "committing foo"
2374.1.6 by Ian Clatworthy
explained selected fail commit failure by design
2195
      bzr mv foo/bar foo/baz
2374.1.5 by Ian Clatworthy
explained selected fail commit failure by design
2196
      mkdir foo/bar
2197
      bzr add foo/bar
2374.1.6 by Ian Clatworthy
explained selected fail commit failure by design
2198
      bzr commit foo/bar -m "committing bar but not baz"
2374.1.5 by Ian Clatworthy
explained selected fail commit failure by design
2199
2200
    In the example above, the last commit will fail by design. This gives
2201
    the user the opportunity to decide whether they want to commit the
2202
    rename at the same time, separately first, or not at all. (As a general
2203
    rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2204
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
2205
    Note: A selected-file commit after a merge is not yet supported.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2206
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2207
    # TODO: Run hooks on tree to-be-committed, and after commit.
2208
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2209
    # TODO: Strict commit that fails if there are deleted files.
2210
    #       (what does "deleted files" mean ??)
2211
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2212
    # TODO: Give better message for -s, --summary, used by tla people
2213
2214
    # XXX: verbose currently does nothing
2215
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
2216
    _see_also = ['bugs', 'uncommit']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2217
    takes_args = ['selected*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2218
    takes_options = [
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2219
            ListOption('exclude', type=str, short_name='x',
2220
                help="Do not consider changes made to a given path."),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2221
            Option('message', type=unicode,
2222
                   short_name='m',
2223
                   help="Description of the new revision."),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2224
            'verbose',
2225
             Option('unchanged',
2226
                    help='Commit even if nothing has changed.'),
2227
             Option('file', type=str,
2228
                    short_name='F',
2229
                    argname='msgfile',
2230
                    help='Take commit message from this file.'),
2231
             Option('strict',
2232
                    help="Refuse to commit if there are unknown "
2233
                    "files in the working tree."),
2234
             ListOption('fixes', type=str,
2235
                    help="Mark a bug as being fixed by this revision."),
3099.2.1 by John Arbash Meinel
Allow 'bzr commit --author' to take a unicode string.
2236
             Option('author', type=unicode,
2671.2.1 by Lukáš Lalinský
Add --author option to 'bzr commit' to record the author's name, if it's different from the committer.
2237
                    help="Set the author's name, if it's different "
2238
                         "from the committer."),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2239
             Option('local',
2240
                    help="Perform a local commit in a bound "
2241
                         "branch.  Local commits are not pushed to "
2242
                         "the master branch until a normal commit "
2243
                         "is performed."
2244
                    ),
2598.6.10 by ghigo
In the commit dialog, the diff is stored as 8-bit raw data
2245
              Option('show-diff',
2246
                     help='When no message is supplied, show the diff along'
2247
                     ' with the status summary in the message editor.'),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2248
             ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2249
    aliases = ['ci', 'checkin']
2250
2376.4.7 by jml at canonical
- Add docstrings to tests.
2251
    def _get_bug_fix_properties(self, fixes, branch):
2376.4.18 by Jonathan Lange
Store all bug fix URLs in a single property.
2252
        properties = []
2376.4.7 by jml at canonical
- Add docstrings to tests.
2253
        # Configure the properties for bug fixing attributes.
2254
        for fixed_bug in fixes:
2255
            tokens = fixed_bug.split(':')
2256
            if len(tokens) != 2:
2257
                raise errors.BzrCommandError(
2258
                    "Invalid bug %s. Must be in the form of 'tag:id'. "
2259
                    "Commit refused." % fixed_bug)
2260
            tag, bug_id = tokens
2261
            try:
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
2262
                bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2376.4.26 by Jonathan Lange
Tests for MalformedBugIdentifier and new error UnknownBugTrackerAbbreviation.
2263
            except errors.UnknownBugTrackerAbbreviation:
2376.4.7 by jml at canonical
- Add docstrings to tests.
2264
                raise errors.BzrCommandError(
2265
                    'Unrecognized bug %s. Commit refused.' % fixed_bug)
2266
            except errors.MalformedBugIdentifier:
2267
                raise errors.BzrCommandError(
2268
                    "Invalid bug identifier for %s. Commit refused."
2269
                    % fixed_bug)
2376.4.18 by Jonathan Lange
Store all bug fix URLs in a single property.
2270
            properties.append('%s fixed' % bug_url)
2376.4.21 by Jonathan Lange
Change the bugs separator to \n from ,
2271
        return '\n'.join(properties)
2376.4.7 by jml at canonical
- Add docstrings to tests.
2272
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
2273
    def run(self, message=None, file=None, verbose=False, selected_list=None,
2817.4.4 by Vincent Ladeuil
Redo the lost modification.
2274
            unchanged=False, strict=False, local=False, fixes=None,
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2275
            author=None, show_diff=False, exclude=None):
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
2276
        from bzrlib.errors import (
2277
            PointlessCommit,
2278
            ConflictsInTree,
2279
            StrictCommitFailed
2280
        )
2281
        from bzrlib.msgeditor import (
2282
            edit_commit_message_encoded,
2283
            make_commit_message_template_encoded
2284
        )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2285
1185.33.77 by Martin Pool
doc
2286
        # TODO: Need a blackbox test for invoking the external editor; may be
2287
        # slightly problematic to run this cross-platform.
2288
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
2289
        # TODO: do more checks that the commit will succeed before 
2290
        # spending the user's valuable time typing a commit message.
2376.4.2 by jml at canonical
More sophisticated error handling for --fixes option
2291
2292
        properties = {}
2293
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2294
        tree, selected_list = tree_files(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
2295
        if selected_list == ['']:
2296
            # workaround - commit of root of tree should be exactly the same
2297
            # as just default commit in that tree, and succeed even though
2298
            # selected-file merge commit is not done yet
2299
            selected_list = []
2300
2817.4.4 by Vincent Ladeuil
Redo the lost modification.
2301
        if fixes is None:
2302
            fixes = []
2453.2.1 by Martin Pool
Don't set the bugs property unless bugs are actually set
2303
        bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2304
        if bug_property:
2305
            properties['bugs'] = bug_property
2376.4.7 by jml at canonical
- Add docstrings to tests.
2306
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
2307
        if local and not tree.branch.get_bound_location():
2308
            raise errors.LocalRequiresBoundBranch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2309
2149.1.4 by Aaron Bentley
Add additional test that callback is called with a Commit instance
2310
        def get_message(commit_obj):
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2311
            """Callback to get commit message"""
2312
            my_message = message
2313
            if my_message is None and not file:
2598.6.24 by ghigo
update on the basis of Aaron suggestions
2314
                t = make_commit_message_template_encoded(tree,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
2315
                        selected_list, diff=show_diff,
2316
                        output_encoding=bzrlib.user_encoding)
2598.6.24 by ghigo
update on the basis of Aaron suggestions
2317
                my_message = edit_commit_message_encoded(t)
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2318
                if my_message is None:
2319
                    raise errors.BzrCommandError("please specify a commit"
2320
                        " message with either --message or --file")
2598.6.29 by ghigo
Removed the check on the switch "--show-diff" in order to allow the
2321
            elif my_message and file:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2322
                raise errors.BzrCommandError(
2598.6.29 by ghigo
Removed the check on the switch "--show-diff" in order to allow the
2323
                    "please specify either --message or --file")
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2324
            if file:
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2325
                my_message = codecs.open(file, 'rt',
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2326
                                         bzrlib.user_encoding).read()
2327
            if my_message == "":
2328
                raise errors.BzrCommandError("empty commit message specified")
2329
            return my_message
2376.4.2 by jml at canonical
More sophisticated error handling for --fixes option
2330
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2331
        try:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2332
            tree.commit(message_callback=get_message,
2333
                        specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
2334
                        allow_pointless=unchanged, strict=strict, local=local,
2789.2.1 by Ian Clatworthy
Make commit less verbose by default
2335
                        reporter=None, verbose=verbose, revprops=properties,
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2336
                        author=author,
2337
                        exclude=safe_relpath_files(tree, exclude))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2338
        except PointlessCommit:
2339
            # FIXME: This should really happen before the file is read in;
2340
            # perhaps prepare the commit; get the message; then actually commit
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2341
            raise errors.BzrCommandError("no changes to commit."
2342
                              " use --unchanged to commit anyhow")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
2343
        except ConflictsInTree:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2344
            raise errors.BzrCommandError('Conflicts detected in working '
2345
                'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'
2346
                ' resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2347
        except StrictCommitFailed:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2348
            raise errors.BzrCommandError("Commit refused because there are"
2349
                              " unknown files in the working tree.")
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2350
        except errors.BoundBranchOutOfDate, e:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2351
            raise errors.BzrCommandError(str(e) + "\n"
2352
            'To commit to master branch, run update and then commit.\n'
2353
            'You can also pass --local to commit to continue working '
2354
            'disconnected.')
2111.1.1 by Martin Pool
Fix #32054, save message if commit fails.
2355
2356
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2357
class cmd_check(Command):
3015.4.20 by Daniel Watkins
Fixed summary.
2358
    """Validate working tree structure, branch consistency and repository history.
3015.3.25 by Daniel Watkins
Updated help.
2359
2360
    This command checks various invariants about branch and repository storage
2361
    to detect data corruption or bzr bugs.
2362
2363
    The working tree and branch checks will only give output if a problem is
2364
    detected. The output fields of the repository check are:
2745.6.8 by Aaron Bentley
Clean up text
2365
2366
        revisions: This is just the number of revisions checked.  It doesn't
2367
            indicate a problem.
2368
        versionedfiles: This is just the number of versionedfiles checked.  It
2369
            doesn't indicate a problem.
2370
        unreferenced ancestors: Texts that are ancestors of other texts, but
2371
            are not properly referenced by the revision ancestry.  This is a
2372
            subtle problem that Bazaar can work around.
2373
        unique file texts: This is the total number of unique file contents
2374
            seen in the checked revisions.  It does not indicate a problem.
2375
        repeated file texts: This is the total number of repeated texts seen
2376
            in the checked revisions.  Texts can be repeated when their file
2377
            entries are modified, but the file contents are not.  It does not
2378
            indicate a problem.
3015.4.14 by Daniel Watkins
Updated check help to explain what happens when no options are given.
2379
3015.4.19 by Daniel Watkins
Improved check docs.
2380
    If no restrictions are specified, all Bazaar data that is found at the given
2381
    location will be checked.
2382
2383
    :Examples:
2384
2385
        Check the tree and branch at 'foo'::
2386
2387
            bzr check --tree --branch foo
2388
2389
        Check only the repository at 'bar'::
2390
2391
            bzr check --repo bar
2392
2393
        Check everything at 'baz'::
2394
2395
            bzr check baz
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2396
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2397
2398
    _see_also = ['reconcile']
3015.3.2 by Daniel Watkins
Check.check now takes a path rather than a branch.
2399
    takes_args = ['path?']
3015.4.2 by Daniel Watkins
Made UI changes to include CLI options.
2400
    takes_options = ['verbose',
2401
                     Option('branch', help="Check the branch related to the"
2402
                                           " current directory."),
2403
                     Option('repo', help="Check the repository related to the"
2404
                                         " current directory."),
2405
                     Option('tree', help="Check the working tree related to"
2406
                                         " the current directory.")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2407
3015.4.5 by Daniel Watkins
Each option selects only the specific thing to be checked.
2408
    def run(self, path=None, verbose=False, branch=False, repo=False,
2409
            tree=False):
3015.3.22 by Daniel Watkins
Changed 'check' to 'check_dwim'.
2410
        from bzrlib.check import check_dwim
3015.3.2 by Daniel Watkins
Check.check now takes a path rather than a branch.
2411
        if path is None:
2412
            path = '.'
3015.4.7 by Daniel Watkins
Vanilla 'bzr check' checks all items.
2413
        if not branch and not repo and not tree:
2414
            branch = repo = tree = True
3015.4.2 by Daniel Watkins
Made UI changes to include CLI options.
2415
        check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2416
2417
2418
class cmd_upgrade(Command):
2419
    """Upgrade branch storage to current format.
2420
2421
    The check command or bzr developers may sometimes advise you to run
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
2422
    this command. When the default format has changed you may also be warned
2423
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2424
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2425
2426
    _see_also = ['check']
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
2427
    takes_args = ['url?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2428
    takes_options = [
2221.4.9 by Aaron Bentley
Zap trailing whitespace
2429
                    RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2430
                        help='Upgrade to a specific format.  See "bzr help'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2431
                             ' formats" for details.',
2221.4.9 by Aaron Bentley
Zap trailing whitespace
2432
                        registry=bzrdir.format_registry,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
2433
                        converter=bzrdir.format_registry.make_bzrdir,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2434
                        value_switches=True, title='Branch format'),
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2435
                    ]
2436
2437
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2438
        from bzrlib.upgrade import upgrade
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2439
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
2440
            format = bzrdir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2441
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2442
2443
2444
class cmd_whoami(Command):
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2445
    """Show or set bzr user id.
2446
    
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2447
    :Examples:
2448
        Show the email of the current user::
2449
2450
            bzr whoami --email
2451
2452
        Set the current user::
2453
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
2454
            bzr whoami "Frank Chu <fchu@example.com>"
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2455
    """
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2456
    takes_options = [ Option('email',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2457
                             help='Display email address only.'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2458
                      Option('branch',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2459
                             help='Set identity for the current branch instead of '
2460
                                  'globally.'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2461
                    ]
2462
    takes_args = ['name?']
2463
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2464
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2465
    @display_command
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2466
    def run(self, email=False, branch=False, name=None):
2467
        if name is None:
2468
            # use branch if we're inside one; otherwise global config
2469
            try:
1816.2.10 by Robey Pointer
code style changes
2470
                c = Branch.open_containing('.')[0].get_config()
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2471
            except errors.NotBranchError:
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2472
                c = config.GlobalConfig()
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2473
            if email:
1816.2.10 by Robey Pointer
code style changes
2474
                self.outf.write(c.user_email() + '\n')
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2475
            else:
1816.2.10 by Robey Pointer
code style changes
2476
                self.outf.write(c.username() + '\n')
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2477
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2478
1840.1.2 by Robey Pointer
instead of raising an error, just display an exception if 'whoami' is given a name that doesn't look like it contains an email address
2479
        # display a warning if an email address isn't included in the given name.
2480
        try:
2481
            config.extract_email_address(name)
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
2482
        except errors.NoEmailInUsername, e:
1840.1.5 by Robey Pointer
change the warning message for a 'whoami' with no email address, on jam's recommendation
2483
            warning('"%s" does not seem to contain an email address.  '
2484
                    'This is allowed, but not recommended.', name)
1840.1.1 by Robey Pointer
raise an exception if 'whoami' is given a name without a decodable email address
2485
        
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2486
        # use global config unless --branch given
2487
        if branch:
1816.2.10 by Robey Pointer
code style changes
2488
            c = Branch.open_containing('.')[0].get_config()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2489
        else:
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2490
            c = config.GlobalConfig()
2491
        c.set_user_option('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2492
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
2493
1185.35.14 by Aaron Bentley
Implemented nick command
2494
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
2495
    """Print or set the branch nickname.  
2496
1185.35.14 by Aaron Bentley
Implemented nick command
2497
    If unset, the tree root directory name is used as the nickname
2498
    To print the current nickname, execute with no argument.  
2499
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2500
2501
    _see_also = ['info']
1185.35.14 by Aaron Bentley
Implemented nick command
2502
    takes_args = ['nickname?']
2503
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2504
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
2505
        if nickname is None:
2506
            self.printme(branch)
2507
        else:
2508
            branch.nick = nickname
2509
2510
    @display_command
2511
    def printme(self, branch):
2367.1.8 by Robert Collins
Whitespace.
2512
        print branch.nick
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2513
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
2514
2900.3.2 by Tim Penhey
A working alias command.
2515
class cmd_alias(Command):
2900.3.7 by Tim Penhey
Updates from Aaron's review.
2516
    """Set/unset and display aliases.
2900.3.2 by Tim Penhey
A working alias command.
2517
2518
    :Examples:
2519
        Show the current aliases::
2520
2521
            bzr alias
2522
2523
        Show the alias specified for 'll'::
2524
2525
            bzr alias ll
2526
2527
        Set an alias for 'll'::
2528
2900.3.10 by Tim Penhey
Show examples, and change text to use double rather than single quotes.
2529
            bzr alias ll="log --line -r-10..-1"
2900.3.2 by Tim Penhey
A working alias command.
2530
2900.3.4 by Tim Penhey
Removed the unalais separate command.
2531
        To remove an alias for 'll'::
2532
2533
            bzr alias --remove ll
2534
2900.3.2 by Tim Penhey
A working alias command.
2535
    """
2536
    takes_args = ['name?']
2900.3.4 by Tim Penhey
Removed the unalais separate command.
2537
    takes_options = [
2538
        Option('remove', help='Remove the alias.'),
2539
        ]
2900.3.2 by Tim Penhey
A working alias command.
2540
2900.3.4 by Tim Penhey
Removed the unalais separate command.
2541
    def run(self, name=None, remove=False):
2542
        if remove:
2543
            self.remove_alias(name)
2544
        elif name is None:
2900.3.2 by Tim Penhey
A working alias command.
2545
            self.print_aliases()
2546
        else:
2547
            equal_pos = name.find('=')
2548
            if equal_pos == -1:
2549
                self.print_alias(name)
2550
            else:
2551
                self.set_alias(name[:equal_pos], name[equal_pos+1:])
2552
2900.3.4 by Tim Penhey
Removed the unalais separate command.
2553
    def remove_alias(self, alias_name):
2554
        if alias_name is None:
2555
            raise errors.BzrCommandError(
2556
                'bzr alias --remove expects an alias to remove.')
2557
        # If alias is not found, print something like:
2558
        # unalias: foo: not found
2900.3.8 by Tim Penhey
Use the exception text for unalias not found.
2559
        c = config.GlobalConfig()
2560
        c.unset_alias(alias_name)
2900.3.4 by Tim Penhey
Removed the unalais separate command.
2561
2562
    @display_command
2900.3.2 by Tim Penhey
A working alias command.
2563
    def print_aliases(self):
2564
        """Print out the defined aliases in a similar format to bash."""
2565
        aliases = config.GlobalConfig().get_aliases()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
2566
        for key, value in sorted(aliases.iteritems()):
2900.3.10 by Tim Penhey
Show examples, and change text to use double rather than single quotes.
2567
            self.outf.write('bzr alias %s="%s"\n' % (key, value))
2900.3.2 by Tim Penhey
A working alias command.
2568
2569
    @display_command
2570
    def print_alias(self, alias_name):
2571
        from bzrlib.commands import get_alias
2572
        alias = get_alias(alias_name)
2573
        if alias is None:
2900.3.7 by Tim Penhey
Updates from Aaron's review.
2574
            self.outf.write("bzr alias: %s: not found\n" % alias_name)
2900.3.2 by Tim Penhey
A working alias command.
2575
        else:
2900.3.7 by Tim Penhey
Updates from Aaron's review.
2576
            self.outf.write(
2900.3.11 by Tim Penhey
Fixed the output in the tests.
2577
                'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
2900.3.2 by Tim Penhey
A working alias command.
2578
2900.3.12 by Tim Penhey
Final review comments.
2579
    def set_alias(self, alias_name, alias_command):
2900.3.2 by Tim Penhey
A working alias command.
2580
        """Save the alias in the global config."""
2581
        c = config.GlobalConfig()
2900.3.12 by Tim Penhey
Final review comments.
2582
        c.set_alias(alias_name, alias_command)
2900.3.2 by Tim Penhey
A working alias command.
2583
2584
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2585
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2586
    """Run internal test suite.
2587
    
2213.2.1 by Martin Pool
Add selftest --first flag
2588
    If arguments are given, they are regular expressions that say which tests
2589
    should run.  Tests matching any expression are run, and other tests are
2590
    not run.
2591
2592
    Alternatively if --first is given, matching tests are run first and then
2593
    all other tests are run.  This is useful if you have been working in a
2594
    particular area, but want to make sure nothing else was broken.
1552 by Martin Pool
Improved help text for bzr selftest
2595
2394.2.2 by Ian Clatworthy
Add --randomize and update help
2596
    If --exclude is given, tests that match that regular expression are
2394.2.9 by Ian Clatworthy
update NEWS and help to reflect removal of comma support
2597
    excluded, regardless of whether they match --first or not.
2394.2.2 by Ian Clatworthy
Add --randomize and update help
2598
2599
    To help catch accidential dependencies between tests, the --randomize
2600
    option is useful. In most cases, the argument used is the word 'now'.
2601
    Note that the seed used for the random number generator is displayed
2602
    when this option is used. The seed can be explicitly passed as the
2603
    argument to this option if required. This enables reproduction of the
2604
    actual ordering used if and when an order sensitive problem is encountered.
2605
2606
    If --list-only is given, the tests that would be run are listed. This is
2607
    useful when combined with --first, --exclude and/or --randomize to
2608
    understand their impact. The test harness reports "Listed nn tests in ..."
2609
    instead of "Ran nn tests in ..." when list mode is enabled.
2610
1552 by Martin Pool
Improved help text for bzr selftest
2611
    If the global option '--no-plugins' is given, plugins are not loaded
2612
    before running the selftests.  This has two effects: features provided or
2613
    modified by plugins will not be tested, and tests provided by plugins will
2614
    not be run.
2615
2598.4.1 by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander)
2616
    Tests that need working space on disk use a common temporary directory, 
2617
    typically inside $TMPDIR or /tmp.
2618
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2619
    :Examples:
2620
        Run only tests relating to 'ignore'::
2621
2622
            bzr selftest ignore
2623
2624
        Disable plugins and list tests as they're run::
2625
2626
            bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2627
    """
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
2628
    # NB: this is used from the class without creating an instance, which is
2629
    # why it does not have a self parameter.
2630
    def get_transport_type(typestring):
2631
        """Parse and return a transport specifier."""
2632
        if typestring == "sftp":
2633
            from bzrlib.transport.sftp import SFTPAbsoluteServer
2634
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
2635
        if typestring == "memory":
2636
            from bzrlib.transport.memory import MemoryServer
2637
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
2638
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
2639
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
2640
            return FakeNFSServer
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
2641
        msg = "No known transport type %s. Supported types are: sftp\n" %\
2642
            (typestring)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2643
        raise errors.BzrCommandError(msg)
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
2644
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2645
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
2646
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
2647
    takes_options = ['verbose',
2418.2.2 by Martin Pool
Add -1 option to selftest
2648
                     Option('one',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2649
                             help='Stop when one test fails.',
2418.2.2 by Martin Pool
Add -1 option to selftest
2650
                             short_name='1',
2651
                             ),
2333.1.1 by Dmitry Vasiliev
Fixed typo and removed some trailing whitespaces
2652
                     Option('transport',
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
2653
                            help='Use a different transport by default '
2654
                                 'throughout the test suite.',
2655
                            type=get_transport_type),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2656
                     Option('benchmark',
2657
                            help='Run the benchmarks rather than selftests.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2658
                     Option('lsprof-timed',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2659
                            help='Generate lsprof output for benchmarked'
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2660
                                 ' sections of code.'),
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2661
                     Option('cache-dir', type=str,
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2662
                            help='Cache intermediate benchmark output in this '
2663
                                 'directory.'),
2213.2.1 by Martin Pool
Add selftest --first flag
2664
                     Option('first',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2665
                            help='Run all tests, but run specified tests first.',
2418.2.1 by Martin Pool
Add -f alias for selftest --first
2666
                            short_name='f',
2321.2.1 by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
2667
                            ),
2394.2.1 by Ian Clatworthy
--list and --exclude first cut
2668
                     Option('list-only',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2669
                            help='List the tests instead of running them.'),
2394.2.2 by Ian Clatworthy
Add --randomize and update help
2670
                     Option('randomize', type=str, argname="SEED",
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2671
                            help='Randomize the order of tests using the given'
2672
                                 ' seed or "now" for the current time.'),
2394.2.2 by Ian Clatworthy
Add --randomize and update help
2673
                     Option('exclude', type=str, argname="PATTERN",
2394.2.6 by Ian Clatworthy
completed blackbox tests
2674
                            short_name='x',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2675
                            help='Exclude tests that match this regular'
2676
                                 ' expression.'),
2658.3.3 by Daniel Watkins
Added UI support for bzr selftest --strict.
2677
                     Option('strict', help='Fail on missing dependencies or '
2678
                            'known failures.'),
3193.1.8 by Vincent Ladeuil
Add '--load-list' option to selftest.
2679
                     Option('load-list', type=str, argname='TESTLISTFILE',
2680
                            help='Load a test id list from a text file.'),
3390.1.1 by Andrew Bennetts
Add --debugflags/-E option to selftest.
2681
                     ListOption('debugflag', type=str, short_name='E',
2682
                                help='Turn on a selftest debug flag.'),
3649.6.4 by Vincent Ladeuil
selftest --starting-with now accepts multiple values.
2683
                     ListOption('starting-with', type=str, argname='TESTID',
2684
                                param_name='starting_with', short_name='s',
2685
                                help=
2686
                                'Load only the tests starting with TESTID.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2687
                     ]
2204.3.4 by Alexander Belchenko
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback
2688
    encoding_type = 'replace'
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2689
2805.1.1 by Ian Clatworthy
Fix selftest --benchmark so verbose by default again
2690
    def run(self, testspecs_list=None, verbose=False, one=False,
2598.4.1 by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander)
2691
            transport=None, benchmark=None,
2692
            lsprof_timed=None, cache_dir=None,
2693
            first=False, list_only=False,
3198.1.1 by Vincent Ladeuil
Add --load-list option to selftest
2694
            randomize=None, exclude=None, strict=False,
3302.11.7 by Vincent Ladeuil
merge bzr.dev, fixing simple conflicts
2695
            load_list=None, debugflag=None, starting_with=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2696
        import bzrlib.ui
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
2697
        from bzrlib.tests import selftest
2698
        import bzrlib.benchmarks as benchmarks
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
2699
        from bzrlib.benchmarks import tree_creator
2321.2.1 by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
2700
3427.5.3 by John Arbash Meinel
Update the activate_deprecation_warnings so it can be skipped if there is already an error set.
2701
        # Make deprecation warnings visible, unless -Werror is set
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
2702
        symbol_versioning.activate_deprecation_warnings(override=False)
3427.5.3 by John Arbash Meinel
Update the activate_deprecation_warnings so it can be skipped if there is already an error set.
2703
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2704
        if cache_dir is not None:
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
2705
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2606.1.3 by Martin Pool
Update tests for new version display
2706
        if not list_only:
2687.3.1 by Martin Pool
Revert selftest header to just two lines, but still show the bzrlib and python versions
2707
            print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2708
            print '   %s (%s python%s)' % (
2709
                    bzrlib.__path__[0],
2710
                    bzrlib.version_string,
3293.2.2 by Martin Pool
Fix formatting of other occurrences of Python version
2711
                    bzrlib._format_version_tuple(sys.version_info),
2687.3.1 by Martin Pool
Revert selftest header to just two lines, but still show the bzrlib and python versions
2712
                    )
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
2713
        print
2095.4.1 by Martin Pool
Better progress bars during tests
2714
        if testspecs_list is not None:
2715
            pattern = '|'.join(testspecs_list)
2716
        else:
2717
            pattern = ".*"
2718
        if benchmark:
2719
            test_suite_factory = benchmarks.test_suite
2805.1.1 by Ian Clatworthy
Fix selftest --benchmark so verbose by default again
2720
            # Unless user explicitly asks for quiet, be verbose in benchmarks
2721
            verbose = not is_quiet()
2095.4.1 by Martin Pool
Better progress bars during tests
2722
            # TODO: should possibly lock the history file...
2197.1.1 by Martin Pool
Use line buffering to write .perf_history
2723
            benchfile = open(".perf_history", "at", buffering=1)
2095.4.1 by Martin Pool
Better progress bars during tests
2724
        else:
2725
            test_suite_factory = None
2726
            benchfile = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2727
        try:
2598.4.1 by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander)
2728
            result = selftest(verbose=verbose,
2095.4.1 by Martin Pool
Better progress bars during tests
2729
                              pattern=pattern,
2598.4.1 by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander)
2730
                              stop_on_failure=one,
2095.4.1 by Martin Pool
Better progress bars during tests
2731
                              transport=transport,
2732
                              test_suite_factory=test_suite_factory,
2733
                              lsprof_timed=lsprof_timed,
2213.2.1 by Martin Pool
Add selftest --first flag
2734
                              bench_history=benchfile,
2735
                              matching_tests_first=first,
2394.2.1 by Ian Clatworthy
--list and --exclude first cut
2736
                              list_only=list_only,
2394.2.2 by Ian Clatworthy
Add --randomize and update help
2737
                              random_seed=randomize,
2658.3.3 by Daniel Watkins
Added UI support for bzr selftest --strict.
2738
                              exclude_pattern=exclude,
2739
                              strict=strict,
3193.1.8 by Vincent Ladeuil
Add '--load-list' option to selftest.
2740
                              load_list=load_list,
3390.1.1 by Andrew Bennetts
Add --debugflags/-E option to selftest.
2741
                              debug_flags=debugflag,
3302.11.2 by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite.
2742
                              starting_with=starting_with,
2213.2.1 by Martin Pool
Add selftest --first flag
2743
                              )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2744
        finally:
2095.4.1 by Martin Pool
Better progress bars during tests
2745
            if benchfile is not None:
2746
                benchfile.close()
2747
        if result:
3221.5.1 by Vincent Ladeuil
Fix bug #137823 by raising UnavailableFeature *after* the fake ftp server
2748
            note('tests passed')
2095.4.1 by Martin Pool
Better progress bars during tests
2749
        else:
3221.5.1 by Vincent Ladeuil
Fix bug #137823 by raising UnavailableFeature *after* the fake ftp server
2750
            note('tests failed')
2095.4.1 by Martin Pool
Better progress bars during tests
2751
        return int(not result)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2752
2753
2754
class cmd_version(Command):
2755
    """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2756
2785.1.2 by bialix at ukr
bugfix for #131100
2757
    encoding_type = 'replace'
3346.2.1 by Martin Pool
Add version --short option
2758
    takes_options = [
2759
        Option("short", help="Print just the version number."),
2760
        ]
2785.1.2 by bialix at ukr
bugfix for #131100
2761
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2762
    @display_command
3346.2.1 by Martin Pool
Add version --short option
2763
    def run(self, short=False):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
2764
        from bzrlib.version import show_version
3346.2.1 by Martin Pool
Add version --short option
2765
        if short:
3346.2.7 by Martin Pool
Commands should use self.outf not print
2766
            self.outf.write(bzrlib.version_string + '\n')
3346.2.1 by Martin Pool
Add version --short option
2767
        else:
2768
            show_version(to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2769
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2770
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2771
class cmd_rocks(Command):
2772
    """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2773
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2774
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2775
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2776
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2777
    def run(self):
2227.4.1 by v.ladeuil+lp at free
Fix #78026.
2778
        print "It sure does!"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2779
2780
2781
class cmd_find_merge_base(Command):
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2782
    """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2783
    # TODO: Options to specify revisions on either side, as if
2784
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2785
    takes_args = ['branch', 'other']
2786
    hidden = True
2787
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2788
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2789
    def run(self, branch, other):
2872.2.1 by Andrew Bennetts
Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
2790
        from bzrlib.revision import ensure_null
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2791
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2792
        branch1 = Branch.open_containing(branch)[0]
2793
        branch2 = Branch.open_containing(other)[0]
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2794
        branch1.lock_read()
2795
        try:
2796
            branch2.lock_read()
2797
            try:
2798
                last1 = ensure_null(branch1.last_revision())
2799
                last2 = ensure_null(branch2.last_revision())
2800
2801
                graph = branch1.repository.get_graph(branch2.repository)
2802
                base_rev_id = graph.find_unique_lca(last1, last2)
2803
2804
                print 'merge base is revision %s' % base_rev_id
2805
            finally:
2806
                branch2.unlock()
2807
        finally:
2808
            branch1.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2809
2810
2811
class cmd_merge(Command):
2812
    """Perform a three-way merge.
2813
    
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
2814
    The source of the merge can be specified either in the form of a branch,
2815
    or in the form of a path to a file containing a merge directive generated
2816
    with bzr send. If neither is specified, the default is the upstream branch
3277.1.2 by Peter Schuller
As per feedback to previous attempt:
2817
    or the branch most recently merged using --remember.
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
2818
3277.1.2 by Peter Schuller
As per feedback to previous attempt:
2819
    When merging a branch, by default the tip will be merged. To pick a different
2820
    revision, pass --revision. If you specify two values, the first will be used as
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
2821
    BASE and the second one as OTHER. Merging individual revisions, or a subset of
2822
    available revisions, like this is commonly referred to as "cherrypicking".
3277.1.3 by Peter Schuller
Identify by name the "cherrypicking" mode of operation of 'bzr merge'.
2823
2824
    Revision numbers are always relative to the branch being merged.
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2825
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2826
    By default, bzr will try to merge in all new work from the other
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2827
    branch, automatically determining an appropriate base.  If this
2828
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2829
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
2830
    Merge will do its best to combine the changes in two branches, but there
2831
    are some kinds of problems only a human can fix.  When it encounters those,
2832
    it will mark a conflict.  A conflict means that you need to fix something,
2833
    before you should commit.
2834
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2835
    Use bzr resolve when you have fixed a problem.  See also bzr conflicts.
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
2836
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2837
    If there is no default branch set, the first merge will set it. After
2838
    that, you can omit the branch to use the default.  To change the
1785.1.4 by John Arbash Meinel
Update help for the new --remember semantics.
2839
    default, use --remember. The value will only be saved if the remote
2840
    location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
2841
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2842
    The results of the merge are placed into the destination working
2843
    directory, where they can be reviewed (with bzr diff), tested, and then
2844
    committed to record the result of the merge.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2845
    
2846
    merge refuses to run if there are any uncommitted changes, unless
2847
    --force is given.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2848
2849
    :Examples:
2850
        To merge the latest revision from bzr.dev::
2851
2852
            bzr merge ../bzr.dev
2853
2854
        To merge changes up to and including revision 82 from bzr.dev::
2855
2856
            bzr merge -r 82 ../bzr.dev
2857
2858
        To merge the changes introduced by 82, without previous changes::
2859
2860
            bzr merge -r 81..82 ../bzr.dev
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
2861
2862
        To apply a merge directive contained in in /tmp/merge:
2863
2864
            bzr merge /tmp/merge
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2865
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2866
3008.1.25 by Aaron Bentley
Set encoding exact on cmd_merge
2867
    encoding_type = 'exact'
2520.1.5 by Daniel Watkins
'help merge' now points to 'help status-flags'.
2868
    _see_also = ['update', 'remerge', 'status-flags']
3277.1.4 by Peter Schuller
As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.
2869
    takes_args = ['location?']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2870
    takes_options = [
2839.5.1 by Alexander Belchenko
add -c option to merge command
2871
        'change',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2872
        'revision',
2873
        Option('force',
2874
               help='Merge even if the destination tree has uncommitted changes.'),
2875
        'merge-type',
2876
        'reprocess',
2877
        'remember',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2878
        Option('show-base', help="Show base revision text in "
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2879
               "conflicts."),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2880
        Option('uncommitted', help='Apply uncommitted changes'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2881
               ' from a working copy, instead of branch changes.'),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2882
        Option('pull', help='If the destination is already'
2883
                ' completely merged into the source, pull from the'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2884
                ' source rather than merging.  When this happens,'
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2885
                ' you do not need to commit the result.'),
2886
        Option('directory',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2887
               help='Branch to merge into, '
2888
                    'rather than the one containing the working directory.',
2889
               short_name='d',
2890
               type=unicode,
2891
               ),
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
2892
        Option('preview', help='Instead of merging, show a diff of the merge.')
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2893
    ]
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2894
3277.1.4 by Peter Schuller
As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.
2895
    def run(self, location=None, revision=None, force=False,
3277.1.2 by Peter Schuller
As per feedback to previous attempt:
2896
            merge_type=None, show_base=False, reprocess=False, remember=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2897
            uncommitted=False, pull=False,
2898
            directory=None,
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
2899
            preview=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2900
            ):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2901
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2902
            merge_type = _mod_merge.Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
2903
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2904
        if directory is None: directory = u'.'
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2905
        possible_transports = []
2906
        merger = None
2907
        allow_pending = True
2908
        verified = 'inapplicable'
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
2909
        tree = WorkingTree.open_containing(directory)[0]
1551.10.25 by Aaron Bentley
Make ChangeReporter private
2910
        change_reporter = delta._ChangeReporter(
2255.7.98 by Robert Collins
Merge bzr.dev.
2911
            unversioned_filter=tree.is_ignored)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2912
        cleanups = []
2913
        try:
2914
            pb = ui.ui_factory.nested_progress_bar()
2915
            cleanups.append(pb.finished)
2916
            tree.lock_write()
2917
            cleanups.append(tree.unlock)
1551.15.74 by Aaron Bentley
Textual updates from review
2918
            if location is not None:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
2919
                try:
2920
                    mergeable = bundle.read_mergeable_from_url(location,
2921
                        possible_transports=possible_transports)
2922
                except errors.NotABundle:
2923
                    mergeable = None
2924
                else:
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2925
                    if uncommitted:
2926
                        raise errors.BzrCommandError('Cannot use --uncommitted'
2927
                            ' with bundles or merge directives.')
2928
2929
                    if revision is not None:
2930
                        raise errors.BzrCommandError(
2931
                            'Cannot use -r with merge directives or bundles')
2932
                    merger, verified = _mod_merge.Merger.from_mergeable(tree,
2933
                       mergeable, pb)
2934
2935
            if merger is None and uncommitted:
2936
                if revision is not None and len(revision) > 0:
2937
                    raise errors.BzrCommandError('Cannot use --uncommitted and'
2938
                        ' --revision at the same time.')
1551.15.74 by Aaron Bentley
Textual updates from review
2939
                location = self._select_branch_location(tree, location)[0]
2940
                other_tree, other_path = WorkingTree.open_containing(location)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2941
                merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2942
                    pb)
2943
                allow_pending = False
3017.3.1 by Aaron Bentley
merge --uncommit can now specify single files (#136890)
2944
                if other_path != '':
2945
                    merger.interesting_files = [other_path]
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2946
2947
            if merger is None:
1551.15.75 by Aaron Bentley
_merger_from_branch -> _get_merger_from_branch
2948
                merger, allow_pending = self._get_merger_from_branch(tree,
1551.15.74 by Aaron Bentley
Textual updates from review
2949
                    location, revision, remember, possible_transports, pb)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2950
2951
            merger.merge_type = merge_type
2952
            merger.reprocess = reprocess
2953
            merger.show_base = show_base
2954
            self.sanity_check_merger(merger)
2955
            if (merger.base_rev_id == merger.other_rev_id and
3376.2.11 by Martin Pool
Compare to None using is/is not not ==
2956
                merger.other_rev_id is not None):
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2957
                note('Nothing to do.')
2958
                return 0
2959
            if pull:
2960
                if merger.interesting_files is not None:
2872.2.1 by Andrew Bennetts
Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
2961
                    raise errors.BzrCommandError('Cannot pull individual files')
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2962
                if (merger.base_rev_id == tree.last_revision()):
2963
                    result = tree.pull(merger.other_branch, False,
2964
                                       merger.other_rev_id)
2965
                    result.report(self.outf)
2966
                    return 0
2967
            merger.check_basis(not force)
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
2968
            if preview:
2969
                return self._do_preview(merger)
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
2970
            else:
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
2971
                return self._do_merge(merger, change_reporter, allow_pending,
2972
                                      verified)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
2973
        finally:
2974
            for cleanup in reversed(cleanups):
2975
                cleanup()
2976
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
2977
    def _do_preview(self, merger):
2978
        from bzrlib.diff import show_diff_trees
2979
        tree_merger = merger.make_merger()
2980
        tt = tree_merger.make_preview_transform()
3199.1.9 by Vincent Ladeuil
Aaron's review feedback.
2981
        try:
2982
            result_tree = tt.get_preview_tree()
2983
            show_diff_trees(merger.this_tree, result_tree, self.outf,
2984
                            old_label='', new_label='')
2985
        finally:
2986
            tt.finalize()
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
2987
2988
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
2989
        merger.change_reporter = change_reporter
2990
        conflict_count = merger.do_merge()
2991
        if allow_pending:
2992
            merger.set_pending()
2993
        if verified == 'failed':
2994
            warning('Preview patch does not match changes')
2995
        if conflict_count != 0:
2996
            return 1
2997
        else:
2998
            return 0
2999
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3000
    def sanity_check_merger(self, merger):
3001
        if (merger.show_base and
3002
            not merger.merge_type is _mod_merge.Merge3Merger):
3003
            raise errors.BzrCommandError("Show-base is not supported for this"
2665.2.1 by Michael Hudson
test and fix for a NameError in merge --weave --show-base
3004
                                         " merge type. %s" % merger.merge_type)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3005
        if merger.reprocess and not merger.merge_type.supports_reprocess:
3006
            raise errors.BzrCommandError("Conflict reduction is not supported"
2665.2.1 by Michael Hudson
test and fix for a NameError in merge --weave --show-base
3007
                                         " for merge type %s." %
3008
                                         merger.merge_type)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3009
        if merger.reprocess and merger.show_base:
3010
            raise errors.BzrCommandError("Cannot do conflict reduction and"
3011
                                         " show base.")
3012
1551.15.75 by Aaron Bentley
_merger_from_branch -> _get_merger_from_branch
3013
    def _get_merger_from_branch(self, tree, location, revision, remember,
3014
                                possible_transports, pb):
3015
        """Produce a merger from a location, assuming it refers to a branch."""
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3016
        from bzrlib.tag import _merge_tags_if_possible
3017
        # find the branch locations
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3018
        other_loc, user_location = self._select_branch_location(tree, location,
1551.15.74 by Aaron Bentley
Textual updates from review
3019
            revision, -1)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3020
        if revision is not None and len(revision) == 2:
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3021
            base_loc, _unused = self._select_branch_location(tree,
3022
                location, revision, 0)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3023
        else:
3024
            base_loc = other_loc
3025
        # Open the branches
3026
        other_branch, other_path = Branch.open_containing(other_loc,
3027
            possible_transports)
3028
        if base_loc == other_loc:
3029
            base_branch = other_branch
3030
        else:
3031
            base_branch, base_path = Branch.open_containing(base_loc,
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3032
                possible_transports)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3033
        # Find the revision ids
3034
        if revision is None or len(revision) < 1 or revision[-1] is None:
3035
            other_revision_id = _mod_revision.ensure_null(
3036
                other_branch.last_revision())
3037
        else:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
3038
            other_revision_id = revision[-1].as_revision_id(other_branch)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3039
        if (revision is not None and len(revision) == 2
3040
            and revision[0] is not None):
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
3041
            base_revision_id = revision[0].as_revision_id(base_branch)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3042
        else:
3043
            base_revision_id = None
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
3044
        # Remember where we merge from
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3045
        if ((remember or tree.branch.get_submit_branch() is None) and
3046
             user_location is not None):
3047
            tree.branch.set_submit_branch(other_branch.base)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3048
        _merge_tags_if_possible(other_branch, tree.branch)
3049
        merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3050
            other_revision_id, base_revision_id, other_branch, base_branch)
3051
        if other_path != '':
3052
            allow_pending = False
3053
            merger.interesting_files = [other_path]
1645.1.1 by Aaron Bentley
Implement single-file merge
3054
        else:
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3055
            allow_pending = True
3056
        return merger, allow_pending
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3057
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3058
    def _select_branch_location(self, tree, user_location, revision=None,
1551.15.74 by Aaron Bentley
Textual updates from review
3059
                                index=None):
3060
        """Select a branch location, according to possible inputs.
3061
3062
        If provided, branches from ``revision`` are preferred.  (Both
3063
        ``revision`` and ``index`` must be supplied.)
3064
3065
        Otherwise, the ``location`` parameter is used.  If it is None, then the
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3066
        ``submit`` or ``parent`` location is used, and a note is printed.
1551.15.74 by Aaron Bentley
Textual updates from review
3067
3068
        :param tree: The working tree to select a branch for merging into
3069
        :param location: The location entered by the user
3070
        :param revision: The revision parameter to the command
3071
        :param index: The index to use for the revision parameter.  Negative
3072
            indices are permitted.
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3073
        :return: (selected_location, user_location).  The default location
3074
            will be the user-entered location.
1551.15.74 by Aaron Bentley
Textual updates from review
3075
        """
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3076
        if (revision is not None and index is not None
3077
            and revision[index] is not None):
3078
            branch = revision[index].get_branch()
3079
            if branch is not None:
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3080
                return branch, branch
3081
        if user_location is None:
3082
            location = self._get_remembered(tree, 'Merging from')
3083
        else:
3084
            location = user_location
3085
        return location, user_location
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3086
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3087
    def _get_remembered(self, tree, verb_string):
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3088
        """Use tree.branch's parent if none was supplied.
3089
3090
        Report if the remembered location was used.
3091
        """
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3092
        stored_location = tree.branch.get_submit_branch()
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
3093
        stored_location_type = "submit"
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3094
        if stored_location is None:
3095
            stored_location = tree.branch.get_parent()
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
3096
            stored_location_type = "parent"
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
3097
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3098
        if stored_location is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3099
            raise errors.BzrCommandError("No location specified or remembered")
3249.1.1 by Ian Clatworthy
fix merge redirection when using a remembered location
3100
        display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
3101
        note(u"%s remembered %s location %s", verb_string,
3102
                stored_location_type, display_url)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3103
        return stored_location
3104
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3105
1185.35.4 by Aaron Bentley
Implemented remerge
3106
class cmd_remerge(Command):
3107
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3108
3109
    Use this if you want to try a different merge technique while resolving
3110
    conflicts.  Some merge techniques are better than others, and remerge 
3111
    lets you try different ones on different files.
3112
3113
    The options for remerge have the same meaning and defaults as the ones for
3114
    merge.  The difference is that remerge can (only) be run when there is a
3115
    pending merge, and it lets you specify particular files.
3116
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3117
    :Examples:
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3118
        Re-do the merge of all conflicted files, and show the base text in
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3119
        conflict regions, in addition to the usual THIS and OTHER texts::
3120
      
3121
            bzr remerge --show-base
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3122
3123
        Re-do the merge of "foobar", using the weave merge algorithm, with
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3124
        additional processing to reduce the size of conflict regions::
3125
      
3126
            bzr remerge --merge-type weave --reprocess foobar
2374.1.1 by Ian Clatworthy
Help and man page fixes
3127
    """
1185.35.4 by Aaron Bentley
Implemented remerge
3128
    takes_args = ['file*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3129
    takes_options = [
3130
            'merge-type',
3131
            'reprocess',
3132
            Option('show-base',
3133
                   help="Show base revision text in conflicts."),
3134
            ]
1185.35.4 by Aaron Bentley
Implemented remerge
3135
3136
    def run(self, file_list=None, merge_type=None, show_base=False,
3137
            reprocess=False):
3138
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3139
            merge_type = _mod_merge.Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
3140
        tree, file_list = tree_files(file_list)
3141
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
3142
        try:
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
3143
            parents = tree.get_parent_ids()
3144
            if len(parents) != 2:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3145
                raise errors.BzrCommandError("Sorry, remerge only works after normal"
3146
                                             " merges.  Not cherrypicking or"
3147
                                             " multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
3148
            repository = tree.branch.repository
1185.35.4 by Aaron Bentley
Implemented remerge
3149
            interesting_ids = None
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3150
            new_conflicts = []
3151
            conflicts = tree.conflicts()
1185.35.4 by Aaron Bentley
Implemented remerge
3152
            if file_list is not None:
3153
                interesting_ids = set()
3154
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
3155
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
3156
                    if file_id is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3157
                        raise errors.NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
3158
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
3159
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
3160
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
3161
                    
1508.1.15 by Robert Collins
Merge from mpool.
3162
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
3163
                        interesting_ids.add(ie.file_id)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3164
                new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2080.2.1 by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
3165
            else:
2080.2.3 by John Arbash Meinel
remerge only supports text or content conflicts
3166
                # Remerge only supports resolving contents conflicts
3167
                allowed_conflicts = ('text conflict', 'contents conflict')
3168
                restore_files = [c.path for c in conflicts
3169
                                 if c.typestring in allowed_conflicts]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3170
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3171
            tree.set_conflicts(ConflictList(new_conflicts))
2080.2.1 by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
3172
            if file_list is not None:
1185.35.4 by Aaron Bentley
Implemented remerge
3173
                restore_files = file_list
3174
            for filename in restore_files:
3175
                try:
1508.1.15 by Robert Collins
Merge from mpool.
3176
                    restore(tree.abspath(filename))
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3177
                except errors.NotConflicted:
1185.35.4 by Aaron Bentley
Implemented remerge
3178
                    pass
1551.15.52 by Aaron Bentley
Tweak from review comments
3179
            # Disable pending merges, because the file texts we are remerging
3180
            # have not had those merges performed.  If we use the wrong parents
3181
            # list, we imply that the working tree text has seen and rejected
3182
            # all the changes from the other tree, when in fact those changes
3183
            # have not yet been seen.
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3184
            pb = ui.ui_factory.nested_progress_bar()
1551.15.53 by Aaron Bentley
Restore old method of adjusting partents
3185
            tree.set_parent_ids(parents[:1])
1551.15.47 by Aaron Bentley
Fix remerge --weave
3186
            try:
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3187
                merger = _mod_merge.Merger.from_revision_ids(pb,
3188
                                                             tree, parents[1])
3189
                merger.interesting_ids = interesting_ids
3190
                merger.merge_type = merge_type
3191
                merger.show_base = show_base
3192
                merger.reprocess = reprocess
3193
                conflicts = merger.do_merge()
1551.15.47 by Aaron Bentley
Fix remerge --weave
3194
            finally:
1551.15.53 by Aaron Bentley
Restore old method of adjusting partents
3195
                tree.set_parent_ids(parents)
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3196
                pb.finished()
1185.35.4 by Aaron Bentley
Implemented remerge
3197
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
3198
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
3199
        if conflicts > 0:
3200
            return 1
3201
        else:
3202
            return 0
3203
2023.1.1 by ghigo
add topics help
3204
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3205
class cmd_revert(Command):
1551.8.27 by Aaron Bentley
Update docs again
3206
    """Revert files to a previous revision.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3207
1551.8.27 by Aaron Bentley
Update docs again
3208
    Giving a list of files will revert only those files.  Otherwise, all files
3209
    will be reverted.  If the revision is not specified with '--revision', the
3210
    last committed revision is used.
1551.8.26 by Aaron Bentley
Update revert help text
3211
3212
    To remove only some changes, without reverting to a prior version, use
3026.1.1 by Nicholas Allen
Fix small typo in command description for the revert command.
3213
    merge instead.  For example, "merge . --revision -2..-3" will remove the
3214
    changes introduced by -2, without affecting the changes introduced by -1.
3215
    Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
1551.8.26 by Aaron Bentley
Update revert help text
3216
    
3217
    By default, any files that have been manually changed will be backed up
3218
    first.  (Files changed only by merge are not backed up.)  Backup files have
1551.8.27 by Aaron Bentley
Update docs again
3219
    '.~#~' appended to their name, where # is a number.
3220
3221
    When you provide files, you can use their current pathname or the pathname
3222
    from the target revision.  So you can use revert to "undelete" a file by
3223
    name.  If you name a directory, all the contents of that directory will be
3224
    reverted.
2614.1.1 by Martin Pool
Doc for revert, #87548
3225
3226
    Any files that have been newly added since that revision will be deleted,
3227
    with a backup kept if appropriate.  Directories containing unknown files
3228
    will not be deleted.
2911.2.1 by Martin Pool
Better help for revert
3229
3230
    The working tree contains a list of pending merged revisions, which will
3231
    be included as parents in the next commit.  Normally, revert clears that
3006.1.1 by Adeodato Simó
Fix typos in revert's help.
3232
    list as well as reverting the files.  If any files are specified, revert
3233
    leaves the pending merge list alone and reverts only the files.  Use "bzr
2911.2.1 by Martin Pool
Better help for revert
3234
    revert ." in the tree root to revert all files but keep the merge record,
3235
    and "bzr revert --forget-merges" to clear the pending merge list without
3236
    reverting any files.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3237
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3238
3239
    _see_also = ['cat', 'export']
2598.1.6 by Martin Pool
Add help for --no-backup
3240
    takes_options = [
2851.2.1 by Martin Pool
Add revert --forget-merges
3241
        'revision',
3242
        Option('no-backup', "Do not save backups of reverted files."),
3243
        Option('forget-merges',
3244
               'Remove pending merge marker, without changing any files.'),
3245
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3246
    takes_args = ['file*']
3247
2851.2.1 by Martin Pool
Add revert --forget-merges
3248
    def run(self, revision=None, no_backup=False, file_list=None,
3249
            forget_merges=None):
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
3250
        tree, file_list = tree_files(file_list)
2851.2.1 by Martin Pool
Add revert --forget-merges
3251
        if forget_merges:
3252
            tree.set_parent_ids(tree.get_parent_ids()[:1])
3253
        else:
3254
            self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3255
3256
    @staticmethod
3257
    def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
3258
        rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3259
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
3260
        try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3261
            tree.revert(file_list, rev_tree, not no_backup, pb,
3262
                report_changes=True)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
3263
        finally:
3264
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3265
3266
3267
class cmd_assert_fail(Command):
3268
    """Test reporting of assertion failures"""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3269
    # intended just for use in testing
3270
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3271
    hidden = True
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3272
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3273
    def run(self):
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3274
        raise AssertionError("always fails")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3275
3276
3277
class cmd_help(Command):
3278
    """Show help on a command or other topic.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3279
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3280
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3281
    _see_also = ['topics']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3282
    takes_options = [
3283
            Option('long', 'Show help on all commands.'),
3284
            ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3285
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
3286
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3287
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3288
    @display_command
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
3289
    def run(self, topic=None, long=False):
2023.1.1 by ghigo
add topics help
3290
        import bzrlib.help
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3291
        if topic is None and long:
3292
            topic = "commands"
2023.1.1 by ghigo
add topics help
3293
        bzrlib.help.help(topic)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3294
3295
3296
class cmd_shell_complete(Command):
3297
    """Show appropriate completions for context.
3298
2023.1.1 by ghigo
add topics help
3299
    For a list of all available commands, say 'bzr shell-complete'.
3300
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3301
    takes_args = ['context?']
3302
    aliases = ['s-c']
3303
    hidden = True
3304
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3305
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3306
    def run(self, context=None):
3307
        import shellcomplete
3308
        shellcomplete.shellcomplete(context)
3309
3310
3311
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
3312
    """Show unmerged/unpulled revisions between two branches.
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3313
    
2023.1.1 by ghigo
add topics help
3314
    OTHER_BRANCH may be local or remote.
3315
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3316
3317
    _see_also = ['merge', 'pull']
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3318
    takes_args = ['other_branch?']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3319
    takes_options = [
3320
            Option('reverse', 'Reverse the order of revisions.'),
3321
            Option('mine-only',
3322
                   'Display changes in the local branch only.'),
3323
            Option('this' , 'Same as --mine-only.'),
3324
            Option('theirs-only',
3325
                   'Display changes in the remote branch only.'),
3326
            Option('other', 'Same as --theirs-only.'),
3327
            'log-format',
3328
            'show-ids',
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
3329
            'verbose',
3330
            Option('include-merges', 'Show merged revisions.'),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3331
            ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
3332
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3333
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
3334
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3335
    def run(self, other_branch=None, reverse=False, mine_only=False,
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
3336
            theirs_only=False,
3337
            log_format=None, long=False, short=False, line=False,
3338
            show_ids=False, verbose=False, this=False, other=False,
3339
            include_merges=False):
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
3340
        from bzrlib.missing import find_unmerged, iter_log_revisions
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3341
3342
        if this:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3343
            mine_only = this
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3344
        if other:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3345
            theirs_only = other
3346
        # TODO: We should probably check that we don't have mine-only and
3347
        #       theirs-only set, but it gets complicated because we also have
3348
        #       this and other which could be used.
3349
        restrict = 'all'
3350
        if mine_only:
3351
            restrict = 'local'
3352
        elif theirs_only:
3353
            restrict = 'remote'
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3354
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3355
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
3356
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3357
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
3358
            other_branch = parent
3359
            if other_branch is None:
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3360
                raise errors.BzrCommandError("No peer location known"
2485.8.17 by Vincent Ladeuil
Fix the fix.
3361
                                             " or specified.")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
3362
            display_url = urlutils.unescape_for_display(parent,
3363
                                                        self.outf.encoding)
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
3364
            self.outf.write("Using saved parent location: "
3365
                    + display_url + "\n")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
3366
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3367
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
3368
        if remote_branch.base == local_branch.base:
3369
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3370
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3371
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
3372
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3373
            try:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3374
                local_extra, remote_extra = find_unmerged(
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
3375
                    local_branch, remote_branch, restrict,
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
3376
                    backward=not reverse,
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
3377
                    include_merges=include_merges)
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
3378
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3379
                if log_format is None:
3380
                    registry = log.log_formatter_registry
3381
                    log_format = registry.get_default(local_branch)
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
3382
                lf = log_format(to_file=self.outf,
3383
                                show_ids=show_ids,
3384
                                show_timezone='original')
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3385
3386
                status_code = 0
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3387
                if local_extra and not theirs_only:
2485.8.17 by Vincent Ladeuil
Fix the fix.
3388
                    self.outf.write("You have %d extra revision(s):\n" %
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3389
                                    len(local_extra))
2485.8.13 by Vincent Ladeuil
merge bzr.dev@2495
3390
                    for revision in iter_log_revisions(local_extra,
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
3391
                                        local_branch.repository,
3392
                                        verbose):
3393
                        lf.log_revision(revision)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3394
                    printed_local = True
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3395
                    status_code = 1
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3396
                else:
3397
                    printed_local = False
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3398
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3399
                if remote_extra and not mine_only:
3400
                    if printed_local is True:
2485.8.17 by Vincent Ladeuil
Fix the fix.
3401
                        self.outf.write("\n\n\n")
3402
                    self.outf.write("You are missing %d revision(s):\n" %
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3403
                                    len(remote_extra))
2485.8.13 by Vincent Ladeuil
merge bzr.dev@2495
3404
                    for revision in iter_log_revisions(remote_extra,
3405
                                        remote_branch.repository,
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
3406
                                        verbose):
3407
                        lf.log_revision(revision)
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3408
                    status_code = 1
3409
3410
                if mine_only and not local_extra:
3411
                    # We checked local, and found nothing extra
3427.3.8 by John Arbash Meinel
Change the output to 'This branch' and 'Other branch', and document the text in NEWS
3412
                    self.outf.write('This branch is up to date.\n')
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3413
                elif theirs_only and not remote_extra:
3414
                    # We checked remote, and found nothing extra
3427.3.8 by John Arbash Meinel
Change the output to 'This branch' and 'Other branch', and document the text in NEWS
3415
                    self.outf.write('Other branch is up to date.\n')
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3416
                elif not (mine_only or theirs_only or local_extra or
3417
                          remote_extra):
3418
                    # We checked both branches, and neither one had extra
3419
                    # revisions
2485.8.17 by Vincent Ladeuil
Fix the fix.
3420
                    self.outf.write("Branches are up to date.\n")
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3421
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3422
                remote_branch.unlock()
3423
        finally:
3424
            local_branch.unlock()
3425
        if not status_code and parent is None and other_branch is not None:
3426
            local_branch.lock_write()
3427
            try:
3428
                # handle race conditions - a parent might be set while we run.
3429
                if local_branch.get_parent() is None:
1685.1.19 by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one
3430
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3431
            finally:
3432
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3433
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3434
3435
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
3436
class cmd_pack(Command):
3437
    """Compress the data within a repository."""
3438
3439
    _see_also = ['repositories']
3440
    takes_args = ['branch_or_repo?']
3441
3442
    def run(self, branch_or_repo='.'):
3443
        dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3444
        try:
3445
            branch = dir.open_branch()
3446
            repository = branch.repository
3447
        except errors.NotBranchError:
3448
            repository = dir.open_repository()
3449
        repository.pack()
3450
3451
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3452
class cmd_plugins(Command):
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
3453
    """List the installed plugins.
3454
    
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3455
    This command displays the list of installed plugins including
3456
    version of plugin and a short description of each.
3457
3458
    --verbose shows the path where each plugin is located.
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
3459
3460
    A plugin is an external component for Bazaar that extends the
3461
    revision control system, by adding or replacing code in Bazaar.
3462
    Plugins can do a variety of things, including overriding commands,
3463
    adding new commands, providing additional network transports and
3464
    customizing log output.
3465
3466
    See the Bazaar web site, http://bazaar-vcs.org, for further
3467
    information on plugins including where to find them and how to
3468
    install them. Instructions are also provided there on how to
3469
    write new plugins using the Python programming language.
3470
    """
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3471
    takes_options = ['verbose']
2629.1.1 by Ian Clatworthy
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
3472
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3473
    @display_command
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3474
    def run(self, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3475
        import bzrlib.plugin
3476
        from inspect import getdoc
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
3477
        result = []
2762.2.1 by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square
3478
        for name, plugin in bzrlib.plugin.plugins().items():
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
3479
            version = plugin.__version__
3480
            if version == 'unknown':
3481
                version = ''
3482
            name_ver = '%s %s' % (name, version)
2762.2.1 by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square
3483
            d = getdoc(plugin.module)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3484
            if d:
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
3485
                doc = d.split('\n')[0]
3486
            else:
3487
                doc = '(no description)'
3488
            result.append((name_ver, doc, plugin.path()))
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3489
        for name_ver, doc, path in sorted(result):
3490
            print name_ver
3491
            print '   ', doc
3492
            if verbose:
3493
                print '   ', path
3494
            print
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3495
3496
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
3497
class cmd_testament(Command):
3498
    """Show testament (signing-form) of a revision."""
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3499
    takes_options = [
3500
            'revision',
3501
            Option('long', help='Produce long-format testament.'),
3502
            Option('strict',
3503
                   help='Produce a strict-format testament.')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
3504
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3505
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
3506
    def run(self, branch=u'.', revision=None, long=False, strict=False):
3507
        from bzrlib.testament import Testament, StrictTestament
3508
        if strict is True:
3509
            testament_class = StrictTestament
3510
        else:
3511
            testament_class = Testament
3530.2.1 by John Arbash Meinel
'bzr testament' should just open the branch
3512
        if branch == '.':
3513
            b = Branch.open_containing(branch)[0]
3514
        else:
3515
            b = Branch.open(branch)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
3516
        b.lock_read()
3517
        try:
3518
            if revision is None:
3519
                rev_id = b.last_revision()
3520
            else:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
3521
                rev_id = revision[0].as_revision_id(b)
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
3522
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
3523
            if long:
3524
                sys.stdout.writelines(t.as_text_lines())
3525
            else:
3526
                sys.stdout.write(t.as_short_text())
3527
        finally:
3528
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3529
3530
3531
class cmd_annotate(Command):
3532
    """Show the origin of each line in a file.
3533
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
3534
    This prints out the given file with an annotation on the left side
3535
    indicating which revision, author and date introduced the change.
3536
3537
    If the origin is the same for a run of consecutive lines, it is 
3538
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3539
    """
3540
    # TODO: annotate directories; showing when each file was last changed
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
3541
    # TODO: if the working copy is modified, show annotations on that 
3542
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
3543
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3544
    takes_args = ['filename']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3545
    takes_options = [Option('all', help='Show annotations on all lines.'),
3546
                     Option('long', help='Show commit date in annotations.'),
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
3547
                     'revision',
3548
                     'show-ids',
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
3549
                     ]
2593.1.1 by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations.
3550
    encoding_type = 'exact'
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3551
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3552
    @display_command
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
3553
    def run(self, filename, all=False, long=False, revision=None,
3554
            show_ids=False):
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
3555
        from bzrlib.annotate import annotate_file, annotate_file_tree
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
3556
        wt, branch, relpath = \
3557
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3558
        if wt is not None:
3559
            wt.lock_read()
3560
        else:
3561
            branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3562
        try:
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
3563
            tree = _get_one_revision_tree('annotate', revision, branch=branch)
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
3564
            if wt is not None:
3565
                file_id = wt.path2id(relpath)
3566
            else:
3567
                file_id = tree.path2id(relpath)
2561.2.1 by James Westby
Display a useful error message when annotating a non-existant file (#122656)
3568
            if file_id is None:
2561.2.2 by James Westby
Fix up with comments from Aaron.
3569
                raise errors.NotVersionedError(filename)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3570
            file_version = tree.inventory[file_id].revision
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
3571
            if wt is not None and revision is None:
3572
                # If there is a tree and we're not annotating historical
3573
                # versions, annotate the working tree's content.
3574
                annotate_file_tree(wt, file_id, self.outf, long, all,
3575
                    show_ids=show_ids)
3576
            else:
3577
                annotate_file(branch, file_version, file_id, long, all, self.outf,
3578
                              show_ids=show_ids)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3579
        finally:
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
3580
            if wt is not None:
3581
                wt.unlock()
3582
            else:
3583
                branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
3584
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3585
3586
class cmd_re_sign(Command):
3587
    """Create a digital signature for an existing revision."""
3588
    # TODO be able to replace existing ones.
3589
3590
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
3591
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3592
    takes_options = ['revision']
3593
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
3594
    def run(self, revision_id_list=None, revision=None):
3595
        if revision_id_list is not None and revision is not None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3596
            raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
3597
        if revision_id_list is None and revision is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3598
            raise errors.BzrCommandError('You must supply either --revision or a revision_id')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
3599
        b = WorkingTree.open_containing(u'.')[0].branch
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3600
        b.lock_write()
3601
        try:
3602
            return self._run(b, revision_id_list, revision)
3603
        finally:
3604
            b.unlock()
3605
3606
    def _run(self, b, revision_id_list, revision):
3607
        import bzrlib.gpg as gpg
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
3608
        gpg_strategy = gpg.GPGStrategy(b.get_config())
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
3609
        if revision_id_list is not None:
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3610
            b.repository.start_write_group()
3611
            try:
3612
                for revision_id in revision_id_list:
3613
                    b.repository.sign_revision(revision_id, gpg_strategy)
3614
            except:
3615
                b.repository.abort_write_group()
3616
                raise
3617
            else:
3618
                b.repository.commit_write_group()
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3619
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
3620
            if len(revision) == 1:
3621
                revno, rev_id = revision[0].in_history(b)
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3622
                b.repository.start_write_group()
3623
                try:
3624
                    b.repository.sign_revision(rev_id, gpg_strategy)
3625
                except:
3626
                    b.repository.abort_write_group()
3627
                    raise
3628
                else:
3629
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
3630
            elif len(revision) == 2:
3631
                # are they both on rh- if so we can walk between them
3632
                # might be nice to have a range helper for arbitrary
3633
                # revision paths. hmm.
3634
                from_revno, from_revid = revision[0].in_history(b)
3635
                to_revno, to_revid = revision[1].in_history(b)
3636
                if to_revid is None:
3637
                    to_revno = b.revno()
3638
                if from_revno is None or to_revno is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3639
                    raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3640
                b.repository.start_write_group()
3641
                try:
3642
                    for revno in range(from_revno, to_revno + 1):
3643
                        b.repository.sign_revision(b.get_rev_id(revno),
3644
                                                   gpg_strategy)
3645
                except:
3646
                    b.repository.abort_write_group()
3647
                    raise
3648
                else:
3649
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
3650
            else:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3651
                raise errors.BzrCommandError('Please supply either one revision, or a range.')
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3652
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
3653
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3654
class cmd_bind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
3655
    """Convert the current branch into a checkout of the supplied branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3656
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
3657
    Once converted into a checkout, commits must succeed on the master branch
3658
    before they will be applied to the local branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3659
    """
3660
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3661
    _see_also = ['checkouts', 'unbind']
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3662
    takes_args = ['location?']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3663
    takes_options = []
3664
3665
    def run(self, location=None):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
3666
        b, relpath = Branch.open_containing(u'.')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3667
        if location is None:
3668
            try:
3669
                location = b.get_old_bound_location()
3670
            except errors.UpgradeRequired:
3671
                raise errors.BzrCommandError('No location supplied.  '
3672
                    'This format does not remember old locations.')
3673
            else:
3674
                if location is None:
2230.3.45 by Aaron Bentley
Change error message (mpool)
3675
                    raise errors.BzrCommandError('No location supplied and no '
3676
                        'previous location known')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3677
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
3678
        try:
3679
            b.bind(b_other)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3680
        except errors.DivergedBranches:
3681
            raise errors.BzrCommandError('These branches have diverged.'
3682
                                         ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3683
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
3684
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3685
class cmd_unbind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
3686
    """Convert the current checkout into a regular branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3687
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
3688
    After unbinding, the local branch is considered independent and subsequent
3689
    commits will be local only.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3690
    """
3691
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3692
    _see_also = ['checkouts', 'bind']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3693
    takes_args = []
3694
    takes_options = []
3695
3696
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
3697
        b, relpath = Branch.open_containing(u'.')
3698
        if not b.unbind():
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3699
            raise errors.BzrCommandError('Local branch is not bound')
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
3700
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3701
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3702
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3703
    """Remove the last committed revision.
3704
3705
    --verbose will print out what is being removed.
3706
    --dry-run will go through all the motions, but not actually
3707
    remove anything.
2747.2.1 by Daniel Watkins
Modified the help message of 'uncommit'.
3708
3709
    If --revision is specified, uncommit revisions to leave the branch at the
3710
    specified revision.  For example, "bzr uncommit -r 15" will leave the
3711
    branch at revision 15.
3712
1551.19.39 by Aaron Bentley
Update 'uncommit' docs
3713
    Uncommit leaves the working tree ready for a new commit.  The only change
3714
    it may make is to restore any pending merges that were present before
3715
    the commit.
1553.5.34 by Martin Pool
Stub lock-breaking command
3716
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
3717
1553.5.34 by Martin Pool
Stub lock-breaking command
3718
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
3719
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
3720
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3721
    # information in shared branches as well.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3722
    _see_also = ['commit']
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
3723
    takes_options = ['verbose', 'revision',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3724
                    Option('dry-run', help='Don\'t actually make changes.'),
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3725
                    Option('force', help='Say yes to all questions.'),
3726
                    Option('local',
3727
                           help="Only remove the commits from the local branch"
3728
                                " when in a checkout."
3729
                           ),
3730
                    ]
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3731
    takes_args = ['location?']
3732
    aliases = []
3101.1.1 by Aaron Bentley
Uncommit doesn't throw when it encounters un-encodable characters
3733
    encoding_type = 'replace'
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3734
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3735
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3736
            dry_run=False, verbose=False,
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3737
            revision=None, force=False, local=False):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3738
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
3739
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3740
        control, relpath = bzrdir.BzrDir.open_containing(location)
3741
        try:
3742
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
3743
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3744
        except (errors.NoWorkingTree, errors.NotLocalUrl):
3745
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
3746
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3747
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
3748
        if tree is not None:
3749
            tree.lock_write()
3750
        else:
3751
            b.lock_write()
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3752
        try:
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3753
            return self._run(b, tree, dry_run, verbose, revision, force,
3754
                             local=local)
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3755
        finally:
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
3756
            if tree is not None:
3757
                tree.unlock()
3758
            else:
3759
                b.unlock()
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3760
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3761
    def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3762
        from bzrlib.log import log_formatter, show_log
3763
        from bzrlib.uncommit import uncommit
3764
3765
        last_revno, last_rev_id = b.last_revision_info()
3766
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3767
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3768
        if revision is None:
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3769
            revno = last_revno
3770
            rev_id = last_rev_id
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3771
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3772
            # 'bzr uncommit -r 10' actually means uncommit
3773
            # so that the final tree is at revno 10.
3774
            # but bzrlib.uncommit.uncommit() actually uncommits
3775
            # the revisions that are supplied.
3776
            # So we need to offset it by one
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3777
            revno = revision[0].in_history(b).revno + 1
3778
            if revno <= last_revno:
3779
                rev_id = b.get_rev_id(revno)
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3780
2948.2.2 by John Arbash Meinel
Re-introduce the None check in case someone asks to uncommit *to* the last revision
3781
        if rev_id is None or _mod_revision.is_null(rev_id):
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3782
            self.outf.write('No revisions to uncommit.\n')
3783
            return 1
3784
3785
        lf = log_formatter('short',
3786
                           to_file=self.outf,
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
3787
                           show_timezone='original')
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3788
3789
        show_log(b,
3790
                 lf,
3791
                 verbose=False,
3792
                 direction='forward',
3793
                 start_revision=revno,
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3794
                 end_revision=last_revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3795
3796
        if dry_run:
3797
            print 'Dry-run, pretending to remove the above revisions.'
3798
            if not force:
3799
                val = raw_input('Press <enter> to continue')
3800
        else:
3801
            print 'The above revision(s) will be removed.'
3802
            if not force:
3803
                val = raw_input('Are you sure [y/N]? ')
3804
                if val.lower() not in ('y', 'yes'):
3805
                    print 'Canceled'
3806
                    return 0
3807
3629.1.1 by John Arbash Meinel
Change 'bzr uncommit' to display the revision ids and log them.
3808
        mutter('Uncommitting from {%s} to {%s}',
3809
               last_rev_id, rev_id)
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3810
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3811
                 revno=revno, local=local)
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
3812
        note('You can restore the old tip by running:\n'
3813
             '  bzr pull . -r revid:%s', last_rev_id)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3814
3815
1553.5.34 by Martin Pool
Stub lock-breaking command
3816
class cmd_break_lock(Command):
3817
    """Break a dead lock on a repository, branch or working directory.
3818
1553.5.35 by Martin Pool
Start break-lock --show
3819
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
3820
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3821
3822
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
3823
    
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3824
    :Examples:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3825
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
3826
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3827
    takes_args = ['location?']
3828
3829
    def run(self, location=None, show=False):
3830
        if location is None:
3831
            location = u'.'
3832
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
3833
        try:
3834
            control.break_lock()
3835
        except NotImplementedError:
3836
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3837
        
1553.5.35 by Martin Pool
Start break-lock --show
3838
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
3839
class cmd_wait_until_signalled(Command):
3840
    """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3841
3842
    This just prints a line to signal when it is ready, then blocks on stdin.
3843
    """
3844
3845
    hidden = True
3846
3847
    def run(self):
1910.17.6 by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print.
3848
        sys.stdout.write("running\n")
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
3849
        sys.stdout.flush()
3850
        sys.stdin.readline()
3851
1553.5.35 by Martin Pool
Start break-lock --show
3852
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3853
class cmd_serve(Command):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3854
    """Run the bzr server."""
3855
3856
    aliases = ['server']
3857
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3858
    takes_options = [
3859
        Option('inet',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3860
               help='Serve on stdin/out for use from inetd or sshd.'),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3861
        Option('port',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3862
               help='Listen for connections on nominated port of the form '
3863
                    '[hostname:]portnumber.  Passing 0 as the port number will '
3864
                    'result in a dynamically allocated port.  The default port is '
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
3865
                    '4155.',
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
3866
               type=str),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3867
        Option('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3868
               help='Serve contents of this directory.',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3869
               type=unicode),
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3870
        Option('allow-writes',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3871
               help='By default the server is a readonly server.  Supplying '
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3872
                    '--allow-writes enables write access to the contents of '
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3873
                    'the served directory and below.'
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3874
                ),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3875
        ]
3876
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3877
    def run(self, port=None, inet=False, directory=None, allow_writes=False):
3118.3.1 by Andrew Bennetts
Reduce lockdir timeout to 0 seconds in cmd_serve.
3878
        from bzrlib import lockdir
2018.5.22 by Andrew Bennetts
Fix cmd_serve after move of bzrlib.transport.smart
3879
        from bzrlib.smart import medium, server
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3880
        from bzrlib.transport import get_transport
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
3881
        from bzrlib.transport.chroot import ChrootServer
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3882
        if directory is None:
3883
            directory = os.getcwd()
2044.2.1 by Lukáš Lalinský
Use urlutils.local_path_to_url to get an URL from the directory path.
3884
        url = urlutils.local_path_to_url(directory)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3885
        if not allow_writes:
3886
            url = 'readonly+' + url
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
3887
        chroot_server = ChrootServer(get_transport(url))
3888
        chroot_server.setUp()
3889
        t = get_transport(chroot_server.get_url())
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3890
        if inet:
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
3891
            smart_server = medium.SmartServerPipeStreamMedium(
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
3892
                sys.stdin, sys.stdout, t)
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
3893
        else:
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
3894
            host = medium.BZR_DEFAULT_INTERFACE
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
3895
            if port is None:
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
3896
                port = medium.BZR_DEFAULT_PORT
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
3897
            else:
3898
                if ':' in port:
3899
                    host, port = port.split(':')
3900
                port = int(port)
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
3901
            smart_server = server.SmartTCPServer(t, host=host, port=port)
2018.5.15 by Andrew Bennetts
Tidy some imports, and bugs introduced when adding server.py
3902
            print 'listening on port: ', smart_server.port
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
3903
            sys.stdout.flush()
2018.5.69 by Robert Collins
Prevent the smart server sending cruft over stderr to the client.
3904
        # for the duration of this server, no UI output is permitted.
3905
        # note that this may cause problems with blackbox tests. This should
3906
        # be changed with care though, as we dont want to use bandwidth sending
3907
        # progress over stderr to smart server clients!
3908
        old_factory = ui.ui_factory
3118.3.1 by Andrew Bennetts
Reduce lockdir timeout to 0 seconds in cmd_serve.
3909
        old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
2018.5.69 by Robert Collins
Prevent the smart server sending cruft over stderr to the client.
3910
        try:
3911
            ui.ui_factory = ui.SilentUIFactory()
3118.3.1 by Andrew Bennetts
Reduce lockdir timeout to 0 seconds in cmd_serve.
3912
            lockdir._DEFAULT_TIMEOUT_SECONDS = 0
2018.5.69 by Robert Collins
Prevent the smart server sending cruft over stderr to the client.
3913
            smart_server.serve()
3914
        finally:
3915
            ui.ui_factory = old_factory
3118.3.1 by Andrew Bennetts
Reduce lockdir timeout to 0 seconds in cmd_serve.
3916
            lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3917
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3918
1731.2.7 by Aaron Bentley
Add join command
3919
class cmd_join(Command):
3920
    """Combine a subtree into its containing tree.
3921
    
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
3922
    This command is for experimental use only.  It requires the target tree
3923
    to be in dirstate-with-subtree format, which cannot be converted into
3924
    earlier formats.
3925
3926
    The TREE argument should be an independent tree, inside another tree, but
3927
    not part of it.  (Such trees can be produced by "bzr split", but also by
3928
    running "bzr branch" with the target inside a tree.)
3929
3930
    The result is a combined tree, with the subtree no longer an independant
3931
    part.  This is marked as a merge of the subtree into the containing tree,
3932
    and all history is preserved.
3933
3934
    If --reference is specified, the subtree retains its independence.  It can
3935
    be branched by itself, and can be part of multiple projects at the same
3936
    time.  But operations performed in the containing tree, such as commit
3937
    and merge, will recurse into the subtree.
1731.2.7 by Aaron Bentley
Add join command
3938
    """
3939
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3940
    _see_also = ['split']
1731.2.7 by Aaron Bentley
Add join command
3941
    takes_args = ['tree']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3942
    takes_options = [
3943
            Option('reference', help='Join by reference.'),
3944
            ]
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
3945
    hidden = True
1731.2.7 by Aaron Bentley
Add join command
3946
2100.3.11 by Aaron Bentley
Add join --reference support
3947
    def run(self, tree, reference=False):
1731.2.7 by Aaron Bentley
Add join command
3948
        sub_tree = WorkingTree.open(tree)
3949
        parent_dir = osutils.dirname(sub_tree.basedir)
3950
        containing_tree = WorkingTree.open_containing(parent_dir)[0]
2255.2.235 by Martin Pool
Add blackbox test that join gives clean error when the repository doesn't support rich roots
3951
        repo = containing_tree.branch.repository
3952
        if not repo.supports_rich_root():
3953
            raise errors.BzrCommandError(
3954
                "Can't join trees because %s doesn't support rich root data.\n"
3955
                "You can use bzr upgrade on the repository."
3956
                % (repo,))
2100.3.11 by Aaron Bentley
Add join --reference support
3957
        if reference:
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
3958
            try:
2100.3.11 by Aaron Bentley
Add join --reference support
3959
                containing_tree.add_reference(sub_tree)
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
3960
            except errors.BadReferenceTarget, e:
2255.2.235 by Martin Pool
Add blackbox test that join gives clean error when the repository doesn't support rich roots
3961
                # XXX: Would be better to just raise a nicely printable
3962
                # exception from the real origin.  Also below.  mbp 20070306
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
3963
                raise errors.BzrCommandError("Cannot join %s.  %s" %
2100.3.11 by Aaron Bentley
Add join --reference support
3964
                                             (tree, e.reason))
3965
        else:
3966
            try:
3967
                containing_tree.subsume(sub_tree)
3968
            except errors.BadSubsumeSource, e:
3969
                raise errors.BzrCommandError("Cannot join %s.  %s" % 
3970
                                             (tree, e.reason))
1553.5.35 by Martin Pool
Start break-lock --show
3971
1731.2.22 by Aaron Bentley
Initial work on split command
3972
3973
class cmd_split(Command):
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
3974
    """Split a subdirectory of a tree into a separate tree.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
3975
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
3976
    This command will produce a target tree in a format that supports
3977
    rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be
3978
    converted into earlier formats like 'dirstate-tags'.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
3979
3980
    The TREE argument should be a subdirectory of a working tree.  That
3981
    subdirectory will be converted into an independent tree, with its own
3982
    branch.  Commits in the top-level tree will not apply to the new subtree.
1731.2.22 by Aaron Bentley
Initial work on split command
3983
    """
3984
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
3985
    # join is not un-hidden yet
3986
    #_see_also = ['join']
1731.2.22 by Aaron Bentley
Initial work on split command
3987
    takes_args = ['tree']
3988
3989
    def run(self, tree):
3990
        containing_tree, subdir = WorkingTree.open_containing(tree)
3991
        sub_id = containing_tree.path2id(subdir)
3992
        if sub_id is None:
3993
            raise errors.NotVersionedError(subdir)
1731.2.23 by Aaron Bentley
Throw user-friendly error splitting in shared repo with wrong format
3994
        try:
3995
            containing_tree.extract(sub_id)
3996
        except errors.RootNotRich:
3997
            raise errors.UpgradeRequired(containing_tree.branch.base)
1731.2.22 by Aaron Bentley
Initial work on split command
3998
3999
1551.12.8 by Aaron Bentley
Add merge-directive command
4000
class cmd_merge_directive(Command):
1551.12.32 by Aaron Bentley
Improve merge directive help
4001
    """Generate a merge directive for auto-merge tools.
4002
4003
    A directive requests a merge to be performed, and also provides all the
4004
    information necessary to do so.  This means it must either include a
4005
    revision bundle, or the location of a branch containing the desired
4006
    revision.
4007
4008
    A submit branch (the location to merge into) must be supplied the first
4009
    time the command is issued.  After it has been supplied once, it will
4010
    be remembered as the default.
4011
4012
    A public branch is optional if a revision bundle is supplied, but required
4013
    if --diff or --plain is specified.  It will be remembered as the default
4014
    after the first use.
4015
    """
1551.12.20 by Aaron Bentley
Pull directive registry into command class
4016
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4017
    takes_args = ['submit_branch?', 'public_branch?']
4018
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4019
    hidden = True
4020
2681.1.4 by Aaron Bentley
Fix reference to told submit command
4021
    _see_also = ['send']
2520.4.121 by Aaron Bentley
Polish up submit command
4022
1551.12.43 by Aaron Bentley
Misc changes from review
4023
    takes_options = [
4024
        RegistryOption.from_kwargs('patch-type',
2681.1.7 by Aaron Bentley
Fix option grammar
4025
            'The type of patch to include in the directive.',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4026
            title='Patch type',
4027
            value_switches=True,
4028
            enum_switch=False,
4029
            bundle='Bazaar revision bundle (default).',
4030
            diff='Normal unified diff.',
4031
            plain='No patch, just directive.'),
4032
        Option('sign', help='GPG-sign the directive.'), 'revision',
1551.12.26 by Aaron Bentley
Get email working, with optional message
4033
        Option('mail-to', type=str,
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4034
            help='Instead of printing the directive, email to this address.'),
1551.12.27 by Aaron Bentley
support custom message everywhere
4035
        Option('message', type=str, short_name='m',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4036
            help='Message to use when committing this merge.')
1551.12.27 by Aaron Bentley
support custom message everywhere
4037
        ]
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4038
2530.2.1 by Adeodato Simó
Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
4039
    encoding_type = 'exact'
4040
1551.12.16 by Aaron Bentley
Enable signing merge directives
4041
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
1551.12.27 by Aaron Bentley
support custom message everywhere
4042
            sign=False, revision=None, mail_to=None, message=None):
2490.2.28 by Aaron Bentley
Fix handling of null revision
4043
        from bzrlib.revision import ensure_null, NULL_REVISION
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4044
        include_patch, include_bundle = {
4045
            'plain': (False, False),
4046
            'diff': (True, False),
4047
            'bundle': (True, True),
4048
            }[patch_type]
1551.12.8 by Aaron Bentley
Add merge-directive command
4049
        branch = Branch.open('.')
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4050
        stored_submit_branch = branch.get_submit_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4051
        if submit_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4052
            submit_branch = stored_submit_branch
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4053
        else:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4054
            if stored_submit_branch is None:
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4055
                branch.set_submit_branch(submit_branch)
4056
        if submit_branch is None:
4057
            submit_branch = branch.get_parent()
4058
        if submit_branch is None:
4059
            raise errors.BzrCommandError('No submit branch specified or known')
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4060
4061
        stored_public_branch = branch.get_public_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4062
        if public_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4063
            public_branch = stored_public_branch
4064
        elif stored_public_branch is None:
4065
            branch.set_public_branch(public_branch)
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4066
        if not include_bundle and public_branch is None:
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
4067
            raise errors.BzrCommandError('No public branch specified or'
4068
                                         ' known')
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4069
        base_revision_id = None
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4070
        if revision is not None:
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4071
            if len(revision) > 2:
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4072
                raise errors.BzrCommandError('bzr merge-directive takes '
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4073
                    'at most two one revision identifiers')
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
4074
            revision_id = revision[-1].as_revision_id(branch)
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4075
            if len(revision) == 2:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
4076
                base_revision_id = revision[0].as_revision_id(branch)
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4077
        else:
4078
            revision_id = branch.last_revision()
2490.2.28 by Aaron Bentley
Fix handling of null revision
4079
        revision_id = ensure_null(revision_id)
4080
        if revision_id == NULL_REVISION:
4081
            raise errors.BzrCommandError('No revisions to bundle.')
2520.4.73 by Aaron Bentley
Implement new merge directive format
4082
        directive = merge_directive.MergeDirective2.from_objects(
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4083
            branch.repository, revision_id, time.time(),
1551.12.8 by Aaron Bentley
Add merge-directive command
4084
            osutils.local_time_offset(), submit_branch,
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4085
            public_branch=public_branch, include_patch=include_patch,
4086
            include_bundle=include_bundle, message=message,
4087
            base_revision_id=base_revision_id)
1551.12.26 by Aaron Bentley
Get email working, with optional message
4088
        if mail_to is None:
4089
            if sign:
4090
                self.outf.write(directive.to_signed(branch))
4091
            else:
4092
                self.outf.writelines(directive.to_lines())
1551.12.16 by Aaron Bentley
Enable signing merge directives
4093
        else:
1551.12.26 by Aaron Bentley
Get email working, with optional message
4094
            message = directive.to_email(mail_to, branch, sign)
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
4095
            s = SMTPConnection(branch.get_config())
4096
            s.send_email(message)
1551.12.8 by Aaron Bentley
Add merge-directive command
4097
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4098
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4099
class cmd_send(Command):
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4100
    """Mail or create a merge-directive for submiting changes.
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4101
4102
    A merge directive provides many things needed for requesting merges:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4103
4104
    * A machine-readable description of the merge to perform
4105
4106
    * An optional patch that is a preview of the changes requested
4107
4108
    * An optional bundle of revision data, so that the changes can be applied
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4109
      directly from the merge directive, without retrieving data from a
4110
      branch.
4111
4112
    If --no-bundle is specified, then public_branch is needed (and must be
4113
    up-to-date), so that the receiver can perform the merge using the
4114
    public_branch.  The public_branch is always included if known, so that
4115
    people can check it later.
4116
4117
    The submit branch defaults to the parent, but can be overridden.  Both
4118
    submit branch and public branch will be remembered if supplied.
4119
4120
    If a public_branch is known for the submit_branch, that public submit
4121
    branch is used in the merge instructions.  This means that a local mirror
2520.4.122 by Aaron Bentley
Clarify doc
4122
    can be used as your actual submit branch, once you have set public_branch
4123
    for that mirror.
2681.1.6 by Aaron Bentley
Update help to describe available formats
4124
2681.1.30 by Aaron Bentley
Update NEWS and docs
4125
    Mail is sent using your preferred mail program.  This should be transparent
3065.3.2 by Alexander Belchenko
fix ReST formatting in cmd_send help
4126
    on Windows (it uses MAPI).  On Linux, it requires the xdg-email utility.
4127
    If the preferred client can't be found (or used), your editor will be used.
2681.1.30 by Aaron Bentley
Update NEWS and docs
4128
    
4129
    To use a specific mail program, set the mail_client configuration option.
2790.2.2 by Keir Mierle
Change alphabetic ordering into two categories; one for specific clients the other for generic options.
4130
    (For Thunderbird 1.5, this works around some bugs.)  Supported values for
3506.1.5 by Christophe Troestler
Moved "emacsclient" to the `generic options' in `bzr help send'.
4131
    specific clients are "evolution", "kmail", "mutt", and "thunderbird";
4132
    generic options are "default", "editor", "emacsclient", "mapi", and
3638.2.3 by Neil Martinsen-Burrell
Mention mail_client_registry in NEWS and help
4133
    "xdg-email".  Plugins may also add supported clients.
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4134
4135
    If mail is being sent, a to address is required.  This can be supplied
3251.1.2 by Jelmer Vernooij
``bzr send`` now supports new ``child_submit_to`` option in the submit branch
4136
    either on the commandline, by setting the submit_to configuration
4137
    option in the branch itself or the child_submit_to configuration option 
4138
    in the submit branch.
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4139
2681.1.6 by Aaron Bentley
Update help to describe available formats
4140
    Two formats are currently supported: "4" uses revision bundle format 4 and
4141
    merge directive format 2.  It is significantly faster and smaller than
4142
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
4143
    default.  "0.9" uses revision bundle format 0.9 and merge directive
4144
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
4145
    
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
4146
    Merge directives are applied using the merge command or the pull command.
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4147
    """
4148
4149
    encoding_type = 'exact'
4150
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
4151
    _see_also = ['merge', 'pull']
2520.4.121 by Aaron Bentley
Polish up submit command
4152
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4153
    takes_args = ['submit_branch?', 'public_branch?']
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4154
2520.4.121 by Aaron Bentley
Polish up submit command
4155
    takes_options = [
4156
        Option('no-bundle',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4157
               help='Do not include a bundle in the merge directive.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4158
        Option('no-patch', help='Do not include a preview patch in the merge'
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4159
               ' directive.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4160
        Option('remember',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4161
               help='Remember submit and public branch.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4162
        Option('from',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4163
               help='Branch to generate the submission from, '
4164
               'rather than the one containing the working directory.',
2520.4.121 by Aaron Bentley
Polish up submit command
4165
               short_name='f',
4166
               type=unicode),
3377.2.1 by Martin Pool
doc: send -o, and more on send in user guide
4167
        Option('output', short_name='o',
3377.2.2 by Martin Pool
Say 'merge directive' rather than just 'directive' in help
4168
               help='Write merge directive to this file; '
3377.2.1 by Martin Pool
doc: send -o, and more on send in user guide
4169
                    'use - for stdout.',
2520.4.121 by Aaron Bentley
Polish up submit command
4170
               type=unicode),
2681.1.32 by Aaron Bentley
Fix option grammar
4171
        Option('mail-to', help='Mail the request to this address.',
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4172
               type=unicode),
2520.4.121 by Aaron Bentley
Polish up submit command
4173
        'revision',
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4174
        'message',
2681.1.7 by Aaron Bentley
Fix option grammar
4175
        RegistryOption.from_kwargs('format',
4176
        'Use the specified output format.',
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4177
        **{'4': 'Bundle format 4, Merge Directive 2 (default)',
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
4178
           '0.9': 'Bundle format 0.9, Merge Directive 1',})
2520.4.121 by Aaron Bentley
Polish up submit command
4179
        ]
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4180
4181
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
2520.4.121 by Aaron Bentley
Polish up submit command
4182
            no_patch=False, revision=None, remember=False, output=None,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4183
            format='4', mail_to=None, message=None, **kwargs):
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4184
        return self._run(submit_branch, revision, public_branch, remember,
4185
                         format, no_bundle, no_patch, output,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4186
                         kwargs.get('from', '.'), mail_to, message)
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4187
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4188
    def _run(self, submit_branch, revision, public_branch, remember, format,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4189
             no_bundle, no_patch, output, from_, mail_to, message):
2872.2.1 by Andrew Bennetts
Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
4190
        from bzrlib.revision import NULL_REVISION
3060.2.1 by Lukáš Lalinský
Fix misplaced branch lock in cmd_send.
4191
        branch = Branch.open_containing(from_)[0]
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
4192
        if output is None:
4193
            outfile = StringIO()
4194
        elif output == '-':
2520.4.121 by Aaron Bentley
Polish up submit command
4195
            outfile = self.outf
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4196
        else:
2520.4.121 by Aaron Bentley
Polish up submit command
4197
            outfile = open(output, 'wb')
3060.2.1 by Lukáš Lalinský
Fix misplaced branch lock in cmd_send.
4198
        # we may need to write data into branch's repository to calculate
4199
        # the data to send.
4200
        branch.lock_write()
2520.4.121 by Aaron Bentley
Polish up submit command
4201
        try:
2681.1.10 by Aaron Bentley
Clean up handling of unknown mail clients
4202
            if output is None:
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4203
                config = branch.get_config()
4204
                if mail_to is None:
4205
                    mail_to = config.get_user_option('submit_to')
4206
                mail_client = config.get_mail_client()
2520.4.121 by Aaron Bentley
Polish up submit command
4207
            if remember and submit_branch is None:
4208
                raise errors.BzrCommandError(
4209
                    '--remember requires a branch to be specified.')
4210
            stored_submit_branch = branch.get_submit_branch()
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
4211
            remembered_submit_branch = None
2520.4.121 by Aaron Bentley
Polish up submit command
4212
            if submit_branch is None:
4213
                submit_branch = stored_submit_branch
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
4214
                remembered_submit_branch = "submit"
2520.4.121 by Aaron Bentley
Polish up submit command
4215
            else:
4216
                if stored_submit_branch is None or remember:
4217
                    branch.set_submit_branch(submit_branch)
4218
            if submit_branch is None:
4219
                submit_branch = branch.get_parent()
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
4220
                remembered_submit_branch = "parent"
2520.4.121 by Aaron Bentley
Polish up submit command
4221
            if submit_branch is None:
4222
                raise errors.BzrCommandError('No submit branch known or'
4223
                                             ' specified')
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
4224
            if remembered_submit_branch is not None:
4225
                note('Using saved %s location "%s" to determine what '
4226
                        'changes to submit.', remembered_submit_branch,
4227
                        submit_branch)
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4228
3251.1.2 by Jelmer Vernooij
``bzr send`` now supports new ``child_submit_to`` option in the submit branch
4229
            if mail_to is None:
3251.1.3 by Jelmer Vernooij
Fix formatting.
4230
                submit_config = Branch.open(submit_branch).get_config()
4231
                mail_to = submit_config.get_user_option("child_submit_to")
3251.1.2 by Jelmer Vernooij
``bzr send`` now supports new ``child_submit_to`` option in the submit branch
4232
2520.4.121 by Aaron Bentley
Polish up submit command
4233
            stored_public_branch = branch.get_public_branch()
4234
            if public_branch is None:
4235
                public_branch = stored_public_branch
4236
            elif stored_public_branch is None or remember:
4237
                branch.set_public_branch(public_branch)
4238
            if no_bundle and public_branch is None:
4239
                raise errors.BzrCommandError('No public branch specified or'
4240
                                             ' known')
4241
            base_revision_id = None
2747.3.1 by Aaron Bentley
'send' and 'bundle' now handle partial ranges correctly (#61685)
4242
            revision_id = None
2520.4.121 by Aaron Bentley
Polish up submit command
4243
            if revision is not None:
4244
                if len(revision) > 2:
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4245
                    raise errors.BzrCommandError('bzr send takes '
2520.4.121 by Aaron Bentley
Polish up submit command
4246
                        'at most two one revision identifiers')
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
4247
                revision_id = revision[-1].as_revision_id(branch)
2520.4.121 by Aaron Bentley
Polish up submit command
4248
                if len(revision) == 2:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
4249
                    base_revision_id = revision[0].as_revision_id(branch)
2747.3.1 by Aaron Bentley
'send' and 'bundle' now handle partial ranges correctly (#61685)
4250
            if revision_id is None:
2520.4.121 by Aaron Bentley
Polish up submit command
4251
                revision_id = branch.last_revision()
4252
            if revision_id == NULL_REVISION:
4253
                raise errors.BzrCommandError('No revisions to submit.')
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4254
            if format == '4':
4255
                directive = merge_directive.MergeDirective2.from_objects(
4256
                    branch.repository, revision_id, time.time(),
4257
                    osutils.local_time_offset(), submit_branch,
4258
                    public_branch=public_branch, include_patch=not no_patch,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4259
                    include_bundle=not no_bundle, message=message,
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4260
                    base_revision_id=base_revision_id)
4261
            elif format == '0.9':
4262
                if not no_bundle:
4263
                    if not no_patch:
4264
                        patch_type = 'bundle'
4265
                    else:
4266
                        raise errors.BzrCommandError('Format 0.9 does not'
4267
                            ' permit bundle with no patch')
4268
                else:
4269
                    if not no_patch:
4270
                        patch_type = 'diff'
4271
                    else:
4272
                        patch_type = None
4273
                directive = merge_directive.MergeDirective.from_objects(
4274
                    branch.repository, revision_id, time.time(),
4275
                    osutils.local_time_offset(), submit_branch,
4276
                    public_branch=public_branch, patch_type=patch_type,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4277
                    message=message)
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4278
2520.4.121 by Aaron Bentley
Polish up submit command
4279
            outfile.writelines(directive.to_lines())
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
4280
            if output is None:
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4281
                subject = '[MERGE] '
4282
                if message is not None:
4283
                    subject += message
4284
                else:
4285
                    revision = branch.repository.get_revision(revision_id)
2681.3.5 by Lukáš Lalinsky
Don't send e-mails with multi-line subjects.
4286
                    subject += revision.get_summary()
3251.2.1 by Aaron Bentley
Use nick/revno-based names for merge directives
4287
                basename = directive.get_disk_name(branch)
2681.1.11 by Aaron Bentley
Add docstrings, add compose_merge_request
4288
                mail_client.compose_merge_request(mail_to, subject,
3251.2.1 by Aaron Bentley
Use nick/revno-based names for merge directives
4289
                                                  outfile.getvalue(), basename)
2520.4.121 by Aaron Bentley
Polish up submit command
4290
        finally:
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4291
            if output != '-':
2520.4.121 by Aaron Bentley
Polish up submit command
4292
                outfile.close()
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
4293
            branch.unlock()
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4294
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4295
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4296
class cmd_bundle_revisions(cmd_send):
4297
4298
    """Create a merge-directive for submiting changes.
4299
4300
    A merge directive provides many things needed for requesting merges:
4301
4302
    * A machine-readable description of the merge to perform
4303
4304
    * An optional patch that is a preview of the changes requested
4305
4306
    * An optional bundle of revision data, so that the changes can be applied
4307
      directly from the merge directive, without retrieving data from a
4308
      branch.
4309
4310
    If --no-bundle is specified, then public_branch is needed (and must be
4311
    up-to-date), so that the receiver can perform the merge using the
4312
    public_branch.  The public_branch is always included if known, so that
4313
    people can check it later.
4314
4315
    The submit branch defaults to the parent, but can be overridden.  Both
4316
    submit branch and public branch will be remembered if supplied.
4317
4318
    If a public_branch is known for the submit_branch, that public submit
4319
    branch is used in the merge instructions.  This means that a local mirror
4320
    can be used as your actual submit branch, once you have set public_branch
4321
    for that mirror.
2681.1.6 by Aaron Bentley
Update help to describe available formats
4322
4323
    Two formats are currently supported: "4" uses revision bundle format 4 and
4324
    merge directive format 2.  It is significantly faster and smaller than
4325
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
4326
    default.  "0.9" uses revision bundle format 0.9 and merge directive
4327
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4328
    """
4329
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4330
    takes_options = [
4331
        Option('no-bundle',
4332
               help='Do not include a bundle in the merge directive.'),
4333
        Option('no-patch', help='Do not include a preview patch in the merge'
4334
               ' directive.'),
4335
        Option('remember',
4336
               help='Remember submit and public branch.'),
4337
        Option('from',
4338
               help='Branch to generate the submission from, '
4339
               'rather than the one containing the working directory.',
4340
               short_name='f',
4341
               type=unicode),
4342
        Option('output', short_name='o', help='Write directive to this file.',
4343
               type=unicode),
4344
        'revision',
4345
        RegistryOption.from_kwargs('format',
4346
        'Use the specified output format.',
4347
        **{'4': 'Bundle format 4, Merge Directive 2 (default)',
4348
           '0.9': 'Bundle format 0.9, Merge Directive 1',})
4349
        ]
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4350
    aliases = ['bundle']
4351
4352
    _see_also = ['send', 'merge']
4353
4354
    hidden = True
4355
4356
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4357
            no_patch=False, revision=None, remember=False, output=None,
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4358
            format='4', **kwargs):
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4359
        if output is None:
4360
            output = '-'
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4361
        return self._run(submit_branch, revision, public_branch, remember,
4362
                         format, no_bundle, no_patch, output,
2681.1.12 by Aaron Bentley
Fix bundle command
4363
                         kwargs.get('from', '.'), None, None)
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4364
4365
2220.2.2 by Martin Pool
Add tag command and basic implementation
4366
class cmd_tag(Command):
2664.1.1 by Joachim Nilsson
Change tag description for "help commands" to make it easier to find
4367
    """Create, remove or modify a tag naming a revision.
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4368
    
4369
    Tags give human-meaningful names to revisions.  Commands that take a -r
4370
    (--revision) option can be given -rtag:X, where X is any previously
4371
    created tag.
4372
2220.2.41 by Martin Pool
Fix tag help (fullermd)
4373
    Tags are stored in the branch.  Tags are copied from one branch to another
4374
    along when you branch, push, pull or merge.
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4375
4376
    It is an error to give a tag name that already exists unless you pass 
4377
    --force, in which case the tag is moved to point to the new revision.
3566.2.1 by Benjamin Peterson
document how the rename tags
4378
3566.2.2 by Benjamin Peterson
fix markup
4379
    To rename a tag (change the name but keep it on the same revsion), run ``bzr
4380
    tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4381
    """
2220.2.2 by Martin Pool
Add tag command and basic implementation
4382
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4383
    _see_also = ['commit', 'tags']
2220.2.2 by Martin Pool
Add tag command and basic implementation
4384
    takes_args = ['tag_name']
4385
    takes_options = [
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4386
        Option('delete',
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4387
            help='Delete this tag rather than placing it.',
4388
            ),
4389
        Option('directory',
4390
            help='Branch in which to place the tag.',
4391
            short_name='d',
4392
            type=unicode,
4393
            ),
4394
        Option('force',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4395
            help='Replace existing tags.',
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4396
            ),
2220.2.6 by Martin Pool
Add tag -r option
4397
        'revision',
2220.2.2 by Martin Pool
Add tag command and basic implementation
4398
        ]
4399
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4400
    def run(self, tag_name,
4401
            delete=None,
4402
            directory='.',
4403
            force=None,
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4404
            revision=None,
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4405
            ):
2220.2.2 by Martin Pool
Add tag command and basic implementation
4406
        branch, relpath = Branch.open_containing(directory)
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4407
        branch.lock_write()
4408
        try:
4409
            if delete:
4410
                branch.tags.delete_tag(tag_name)
4411
                self.outf.write('Deleted tag %s.\n' % tag_name)
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4412
            else:
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4413
                if revision:
4414
                    if len(revision) != 1:
4415
                        raise errors.BzrCommandError(
4416
                            "Tags can only be placed on a single revision, "
4417
                            "not on a range")
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
4418
                    revision_id = revision[0].as_revision_id(branch)
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4419
                else:
4420
                    revision_id = branch.last_revision()
4421
                if (not force) and branch.tags.has_tag(tag_name):
4422
                    raise errors.TagAlreadyExists(tag_name)
4423
                branch.tags.set_tag(tag_name, revision_id)
4424
                self.outf.write('Created tag %s.\n' % tag_name)
4425
        finally:
4426
            branch.unlock()
2220.2.2 by Martin Pool
Add tag command and basic implementation
4427
4428
2220.2.24 by Martin Pool
Add tags command
4429
class cmd_tags(Command):
4430
    """List tags.
4431
3007.1.1 by Adeodato Simó
Small fix to tags' help.
4432
    This command shows a table of tag names and the revisions they reference.
2220.2.24 by Martin Pool
Add tags command
4433
    """
4434
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4435
    _see_also = ['tag']
2220.2.24 by Martin Pool
Add tags command
4436
    takes_options = [
4437
        Option('directory',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4438
            help='Branch whose tags should be displayed.',
2220.2.24 by Martin Pool
Add tags command
4439
            short_name='d',
4440
            type=unicode,
4441
            ),
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
4442
        RegistryOption.from_kwargs('sort',
4443
            'Sort tags by different criteria.', title='Sorting',
4444
            alpha='Sort tags lexicographically (default).',
4445
            time='Sort tags chronologically.',
4446
            ),
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
4447
        'show-ids',
2220.2.24 by Martin Pool
Add tags command
4448
    ]
4449
4450
    @display_command
4451
    def run(self,
4452
            directory='.',
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
4453
            sort='alpha',
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
4454
            show_ids=False,
2220.2.24 by Martin Pool
Add tags command
4455
            ):
4456
        branch, relpath = Branch.open_containing(directory)
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
4457
        tags = branch.tags.get_tag_dict().items()
3553.1.1 by Robert Collins
Do not scan history for tags when none are present.
4458
        if not tags:
4459
            return
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
4460
        if sort == 'alpha':
4461
            tags.sort()
4462
        elif sort == 'time':
4463
            timestamps = {}
4464
            for tag, revid in tags:
4465
                try:
4466
                    revobj = branch.repository.get_revision(revid)
4467
                except errors.NoSuchRevision:
4468
                    timestamp = sys.maxint # place them at the end
4469
                else:
4470
                    timestamp = revobj.timestamp
4471
                timestamps[revid] = timestamp
4472
            tags.sort(key=lambda x: timestamps[x[1]])
4473
        if not show_ids:
4474
            # [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4475
            revno_map = branch.get_revision_id_to_revno_map()
4476
            tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4477
                        for tag, revid in tags ]
4478
        for tag, revspec in tags:
4479
            self.outf.write('%-20s %s\n' % (tag, revspec))
2220.2.24 by Martin Pool
Add tags command
4480
4481
2796.2.5 by Aaron Bentley
Implement reconfigure command
4482
class cmd_reconfigure(Command):
2796.2.15 by Aaron Bentley
More updates from review
4483
    """Reconfigure the type of a bzr directory.
4484
4485
    A target configuration must be specified.
4486
4487
    For checkouts, the bind-to location will be auto-detected if not specified.
4488
    The order of preference is
4489
    1. For a lightweight checkout, the current bound location.
4490
    2. For branches that used to be checkouts, the previously-bound location.
4491
    3. The push location.
4492
    4. The parent location.
4493
    If none of these is available, --bind-to must be specified.
4494
    """
2796.2.5 by Aaron Bentley
Implement reconfigure command
4495
3535.4.1 by Marius Kruger
Update reconfigure help to say exactly what it wil do.
4496
    _see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
2796.2.5 by Aaron Bentley
Implement reconfigure command
4497
    takes_args = ['location?']
4498
    takes_options = [RegistryOption.from_kwargs('target_type',
4499
                     title='Target type',
4500
                     help='The type to reconfigure the directory to.',
4501
                     value_switches=True, enum_switch=False,
3535.4.1 by Marius Kruger
Update reconfigure help to say exactly what it wil do.
4502
                     branch='Reconfigure to be an unbound branch '
4503
                        'with no working tree.',
4504
                     tree='Reconfigure to be an unbound branch '
4505
                        'with a working tree.',
4506
                     checkout='Reconfigure to be a bound branch '
4507
                        'with a working tree.',
4508
                     lightweight_checkout='Reconfigure to be a lightweight'
4509
                     ' checkout (with no local history).',
4510
                     standalone='Reconfigure to be a standalone branch '
4511
                        '(i.e. stop using shared repository).',
3311.2.6 by Aaron Bentley
rename 'sharing' to 'use-shared'
4512
                     use_shared='Reconfigure to use a shared repository.'),
2796.2.5 by Aaron Bentley
Implement reconfigure command
4513
                     Option('bind-to', help='Branch to bind checkout to.',
4514
                            type=str),
4515
                     Option('force',
4516
                        help='Perform reconfiguration even if local changes'
4517
                        ' will be lost.')
4518
                     ]
4519
4520
    def run(self, location=None, target_type=None, bind_to=None, force=False):
4521
        directory = bzrdir.BzrDir.open(location)
2796.2.15 by Aaron Bentley
More updates from review
4522
        if target_type is None:
2830.2.4 by Martin Pool
Fix previously hidden NameError in reconfigure
4523
            raise errors.BzrCommandError('No target configuration specified')
2796.2.15 by Aaron Bentley
More updates from review
4524
        elif target_type == 'branch':
2796.2.5 by Aaron Bentley
Implement reconfigure command
4525
            reconfiguration = reconfigure.Reconfigure.to_branch(directory)
4526
        elif target_type == 'tree':
4527
            reconfiguration = reconfigure.Reconfigure.to_tree(directory)
4528
        elif target_type == 'checkout':
4529
            reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4530
                                                                  bind_to)
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
4531
        elif target_type == 'lightweight-checkout':
4532
            reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4533
                directory, bind_to)
3311.2.6 by Aaron Bentley
rename 'sharing' to 'use-shared'
4534
        elif target_type == 'use-shared':
4535
            reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
3311.2.5 by Aaron Bentley
Implement reconfigure --standalone and --sharing
4536
        elif target_type == 'standalone':
4537
            reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
2796.2.5 by Aaron Bentley
Implement reconfigure command
4538
        reconfiguration.apply(force)
4539
4540
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4541
class cmd_switch(Command):
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4542
    """Set the branch of a checkout and update.
4543
    
4544
    For lightweight checkouts, this changes the branch being referenced.
4545
    For heavyweight checkouts, this checks that there are no local commits
4546
    versus the current bound branch, then it makes the local branch a mirror
4547
    of the new location and binds to it.
4548
    
4549
    In both cases, the working tree is updated and uncommitted changes
4550
    are merged. The user can commit or revert these as they desire.
4551
4552
    Pending merges need to be committed or reverted before using switch.
3246.5.1 by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the
4553
4554
    The path to the branch to switch to can be specified relative to the parent
4555
    directory of the current branch. For example, if you are currently in a
4556
    checkout of /path/to/branch, specifying 'newbranch' will find a branch at
4557
    /path/to/newbranch.
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4558
    """
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4559
4560
    takes_args = ['to_location']
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4561
    takes_options = [Option('force',
4562
                        help='Switch even if local commits will be lost.')
4563
                     ]
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4564
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4565
    def run(self, to_location, force=False):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
4566
        from bzrlib import switch
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4567
        tree_location = '.'
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
4568
        control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
3246.5.1 by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the
4569
        try:
4570
            to_branch = Branch.open(to_location)
4571
        except errors.NotBranchError:
3602.3.2 by Adrian Wilkins
`bzr switch` now finds the sibling of the bound branch of a heavy checkout when passed a location that does not immediately resolve to a branch.
4572
            this_branch = control_dir.open_branch()
3602.3.4 by Adrian Wilkins
Improved comments and documentation
4573
            # This may be a heavy checkout, where we want the master branch
3602.3.3 by Adrian Wilkins
Tweaked as suggested to be more lightweight about opening branches.
4574
            this_url = this_branch.get_bound_location()
3602.3.4 by Adrian Wilkins
Improved comments and documentation
4575
            # If not, use a local sibling
3602.3.3 by Adrian Wilkins
Tweaked as suggested to be more lightweight about opening branches.
4576
            if this_url is None:
4577
                this_url = this_branch.base
3246.5.1 by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the
4578
            to_branch = Branch.open(
3602.3.4 by Adrian Wilkins
Improved comments and documentation
4579
                urlutils.join(this_url, '..', to_location))
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4580
        switch.switch(control_dir, to_branch, force)
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4581
        note('Switched to branch: %s',
4582
            urlutils.unescape_for_display(to_branch.base, 'utf-8'))
4583
4584
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4585
class cmd_hooks(Command):
4586
    """Show a branch's currently registered hooks.
4587
    """
4588
3254.2.9 by Daniel Watkins
Made cmd_hooks hidden.
4589
    hidden = True
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4590
    takes_args = ['path?']
4591
4592
    def run(self, path=None):
4593
        if path is None:
4594
            path = '.'
4595
        branch_hooks = Branch.open(path).hooks
4596
        for hook_type in branch_hooks:
4597
            hooks = branch_hooks[hook_type]
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
4598
            self.outf.write("%s:\n" % (hook_type,))
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4599
            if hooks:
4600
                for hook in hooks:
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
4601
                    self.outf.write("  %s\n" %
4602
                                    (branch_hooks.get_hook_name(hook),))
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4603
            else:
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
4604
                self.outf.write("  <no hooks installed>\n")
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4605
4606
2524.1.1 by Aaron Bentley
Revert broken changes
4607
def _create_prefix(cur_transport):
4608
    needed = [cur_transport]
4609
    # Recurse upwards until we can create a directory successfully
4610
    while True:
4611
        new_transport = cur_transport.clone('..')
4612
        if new_transport.base == cur_transport.base:
2604.1.1 by Martin Pool
Fix unbound variable in _create_prefix (thanks vila)
4613
            raise errors.BzrCommandError(
4614
                "Failed to create path prefix for %s."
4615
                % cur_transport.base)
2524.1.1 by Aaron Bentley
Revert broken changes
4616
        try:
4617
            new_transport.mkdir('.')
4618
        except errors.NoSuchFile:
4619
            needed.append(new_transport)
4620
            cur_transport = new_transport
4621
        else:
4622
            break
4623
    # Now we only need to create child directories
4624
    while needed:
4625
        cur_transport = needed.pop()
4626
        cur_transport.ensure_base()
4627
2604.1.1 by Martin Pool
Fix unbound variable in _create_prefix (thanks vila)
4628
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
4629
# these get imported and then picked up by the scan for cmd_*
4630
# TODO: Some more consistent way to split command definitions across files;
4631
# we do need to load at least some information about them to know of 
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
4632
# aliases.  ideally we would avoid loading the implementation until the
4633
# details were needed.
2022.1.2 by John Arbash Meinel
rename version_info => cmd_version_info
4634
from bzrlib.cmd_version_info import cmd_version_info
1185.35.4 by Aaron Bentley
Implemented remerge
4635
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2520.4.35 by Aaron Bentley
zap obsolete changeset commands, add bundle-info command
4636
from bzrlib.bundle.commands import (
4637
    cmd_bundle_info,
4638
    )
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
4639
from bzrlib.sign_my_commits import cmd_sign_my_commits
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
4640
from bzrlib.weave_commands import cmd_versionedfile_list, \
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
4641
        cmd_weave_plan_merge, cmd_weave_merge_text