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