/brz/remove-bazaar

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