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