/brz/remove-bazaar

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