/brz/remove-bazaar

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