/brz/remove-bazaar

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