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