/brz/remove-bazaar

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