/brz/remove-bazaar

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