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