/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" \
2442
                  " match your ignore pattern:\n%s" % ("\n".join(matches),)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2443
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
2444
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2445
class cmd_ignored(Command):
2446
    """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
2447
2448
    List all the ignored files and the ignore pattern that caused the file to
2449
    be ignored.
2450
2451
    Alternatively, to list just the files::
2452
2453
        bzr ls --ignored
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2454
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2455
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2456
    encoding_type = 'replace'
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
2457
    _see_also = ['ignore', 'ls']
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2458
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2459
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2460
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2461
        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.
2462
        tree.lock_read()
2463
        try:
2464
            for path, file_class, kind, file_id, entry in tree.list_files():
2465
                if file_class != 'I':
2466
                    continue
2467
                ## XXX: Slightly inefficient since this was already calculated
2468
                pat = tree.is_ignored(path)
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2469
                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.
2470
        finally:
2471
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2472
2473
2474
class cmd_lookup_revision(Command):
2475
    """Lookup the revision-id from a revision-number
2476
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2477
    :Examples:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2478
        bzr lookup-revision 33
2479
    """
2480
    hidden = True
2481
    takes_args = ['revno']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2482
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2483
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2484
    def run(self, revno):
2485
        try:
2486
            revno = int(revno)
2487
        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
2488
            raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2489
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2490
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2491
2492
2493
class cmd_export(Command):
2374.1.1 by Ian Clatworthy
Help and man page fixes
2494
    """Export current or past revision to a destination directory or archive.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2495
2496
    If no revision is specified this exports the last committed revision.
2497
2498
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
2499
    given, try to find the format with the extension. If no extension
2500
    is found exports to a directory (equivalent to --format=dir).
2501
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
2502
    If root is supplied, it will be used as the root directory inside
2503
    container formats (tar, zip, etc). If it is not supplied it will default
2504
    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
2505
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2506
    If branch is omitted then the branch containing the current working
2507
    directory will be used.
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2508
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
2509
    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
2510
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2511
      =================       =========================
2512
      Supported formats       Autodetected by extension
2513
      =================       =========================
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
2514
         dir                         (none)
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2515
         tar                          .tar
2516
         tbz2                    .tar.bz2, .tbz2
2517
         tgz                      .tar.gz, .tgz
2518
         zip                          .zip
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2519
      =================       =========================
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2520
    """
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2521
    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.
2522
    takes_options = [
2523
        Option('format',
2524
               help="Type of file to export to.",
2525
               type=unicode),
2526
        'revision',
2527
        Option('root',
2528
               type=str,
2529
               help="Name of the root directory inside the exported file."),
2530
        ]
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2531
    def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2532
        root=None):
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
2533
        from bzrlib.export import export
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2534
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2535
        if branch_or_subdir is None:
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2536
            tree = WorkingTree.open_containing(u'.')[0]
2537
            b = tree.branch
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2538
            subdir = None
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2539
        else:
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2540
            b, subdir = Branch.open_containing(branch_or_subdir)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2541
            tree = None
2542
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
2543
        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.
2544
        try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2545
            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.
2546
        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
2547
            raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2548
2549
2550
class cmd_cat(Command):
2374.1.1 by Ian Clatworthy
Help and man page fixes
2551
    """Write the contents of a file as of a given revision to standard output.
2552
2553
    If no revision is nominated, the last revision is used.
2554
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2555
    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
2556
    binary file.
2374.1.1 by Ian Clatworthy
Help and man page fixes
2557
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2558
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2559
    _see_also = ['ls']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2560
    takes_options = [
2561
        Option('name-from-revision', help='The path name in the old tree.'),
2562
        'revision',
2563
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2564
    takes_args = ['filename']
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
2565
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2566
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2567
    @display_command
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
2568
    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
2569
        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
2570
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
2571
                                         " one revision specifier")
2572
        tree, branch, relpath = \
2573
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2574
        branch.lock_read()
2575
        try:
2576
            return self._run(tree, branch, relpath, filename, revision,
2577
                             name_from_revision)
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2578
        finally:
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
2579
            branch.unlock()
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2580
2581
    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.
2582
        if tree is None:
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
2583
            tree = b.basis_tree()
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
2584
        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
2585
2586
        old_file_id = rev_tree.path2id(relpath)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2587
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
2588
        if name_from_revision:
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
2589
            # Try in revision if requested
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2590
            if old_file_id is None:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2591
                raise errors.BzrCommandError(
2592
                    "%r is not present in revision %s" % (
2593
                        filename, rev_tree.get_revision_id()))
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2594
            else:
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2595
                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
2596
        else:
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
2597
            cur_file_id = tree.path2id(relpath)
2598
            found = False
2599
            if cur_file_id is not None:
2600
                # Then try with the actual file id
2601
                try:
2602
                    content = rev_tree.get_file_text(cur_file_id)
2603
                    found = True
2604
                except errors.NoSuchId:
2605
                    # The actual file id didn't exist at that time
2606
                    pass
2607
            if not found and old_file_id is not None:
2608
                # Finally try with the old file id
2609
                content = rev_tree.get_file_text(old_file_id)
2610
                found = True
2611
            if not found:
2612
                # Can't be found anywhere
2613
                raise errors.BzrCommandError(
2614
                    "%r is not present in revision %s" % (
2615
                        filename, rev_tree.get_revision_id()))
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2616
        self.outf.write(content)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2617
2618
2619
class cmd_local_time_offset(Command):
2620
    """Show the offset in seconds from GMT to local time."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2621
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2622
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2623
    def run(self):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2624
        print osutils.local_time_offset()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2625
2626
2627
2628
class cmd_commit(Command):
2629
    """Commit changes into a new revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2630
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2631
    If no arguments are given, the entire tree is committed.
2632
2633
    If selected files are specified, only changes to those files are
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2634
    committed.  If a directory is specified then the directory and everything
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2635
    within it is committed.
2636
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2637
    When excludes are given, they take precedence over selected files.
2638
    For example, too commit only changes within foo, but not changes within
2639
    foo/bar::
2640
2641
      bzr commit foo -x foo/bar
2642
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.
2643
    If author of the change is not the same person as the committer, you can
2644
    specify the author's name using the --author option. The name should be
2645
    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.
2646
    If there is more than one author of the change you can specify the option
2647
    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.
2648
2374.1.5 by Ian Clatworthy
explained selected fail commit failure by design
2649
    A selected-file commit may fail in some cases where the committed
2650
    tree would be invalid. Consider::
2651
2652
      bzr init foo
2653
      mkdir foo/bar
2654
      bzr add foo/bar
2655
      bzr commit foo -m "committing foo"
2374.1.6 by Ian Clatworthy
explained selected fail commit failure by design
2656
      bzr mv foo/bar foo/baz
2374.1.5 by Ian Clatworthy
explained selected fail commit failure by design
2657
      mkdir foo/bar
2658
      bzr add foo/bar
2374.1.6 by Ian Clatworthy
explained selected fail commit failure by design
2659
      bzr commit foo/bar -m "committing bar but not baz"
2374.1.5 by Ian Clatworthy
explained selected fail commit failure by design
2660
2661
    In the example above, the last commit will fail by design. This gives
2662
    the user the opportunity to decide whether they want to commit the
2663
    rename at the same time, separately first, or not at all. (As a general
2664
    rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2665
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
2666
    Note: A selected-file commit after a merge is not yet supported.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2667
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2668
    # TODO: Run hooks on tree to-be-committed, and after commit.
2669
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2670
    # TODO: Strict commit that fails if there are deleted files.
2671
    #       (what does "deleted files" mean ??)
2672
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2673
    # TODO: Give better message for -s, --summary, used by tla people
2674
2675
    # XXX: verbose currently does nothing
2676
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
2677
    _see_also = ['bugs', 'uncommit']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2678
    takes_args = ['selected*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2679
    takes_options = [
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2680
            ListOption('exclude', type=str, short_name='x',
2681
                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.
2682
            Option('message', type=unicode,
2683
                   short_name='m',
2684
                   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
2685
            'verbose',
2686
             Option('unchanged',
2687
                    help='Commit even if nothing has changed.'),
2688
             Option('file', type=str,
2689
                    short_name='F',
2690
                    argname='msgfile',
2691
                    help='Take commit message from this file.'),
2692
             Option('strict',
2693
                    help="Refuse to commit if there are unknown "
2694
                    "files in the working tree."),
2695
             ListOption('fixes', type=str,
3535.10.7 by James Westby
Make the --fixes option conform to the style guide check once more.
2696
                    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.
2697
                         "(see \"bzr help bugs\")."),
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
2698
             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.
2699
                    help="Set the author's name, if it's different "
2700
                         "from the committer."),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2701
             Option('local',
2702
                    help="Perform a local commit in a bound "
2703
                         "branch.  Local commits are not pushed to "
2704
                         "the master branch until a normal commit "
2705
                         "is performed."
2706
                    ),
2598.6.10 by ghigo
In the commit dialog, the diff is stored as 8-bit raw data
2707
              Option('show-diff',
2708
                     help='When no message is supplied, show the diff along'
2709
                     ' 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
2710
             ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2711
    aliases = ['ci', 'checkin']
2712
2376.4.7 by jml at canonical
- Add docstrings to tests.
2713
    def _get_bug_fix_properties(self, fixes, branch):
2376.4.18 by Jonathan Lange
Store all bug fix URLs in a single property.
2714
        properties = []
2376.4.7 by jml at canonical
- Add docstrings to tests.
2715
        # Configure the properties for bug fixing attributes.
2716
        for fixed_bug in fixes:
2717
            tokens = fixed_bug.split(':')
2718
            if len(tokens) != 2:
2719
                raise errors.BzrCommandError(
3535.10.3 by James Westby
Talk about "trackers" rather than "tags" as it may be less confusing.
2720
                    "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.
2721
                    "See \"bzr help bugs\" for more information on this "
2722
                    "feature.\nCommit refused." % fixed_bug)
2376.4.7 by jml at canonical
- Add docstrings to tests.
2723
            tag, bug_id = tokens
2724
            try:
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
2725
                bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2376.4.26 by Jonathan Lange
Tests for MalformedBugIdentifier and new error UnknownBugTrackerAbbreviation.
2726
            except errors.UnknownBugTrackerAbbreviation:
2376.4.7 by jml at canonical
- Add docstrings to tests.
2727
                raise errors.BzrCommandError(
2728
                    'Unrecognized bug %s. Commit refused.' % fixed_bug)
3535.10.9 by James Westby
Make the improved messages show up in the UI.
2729
            except errors.MalformedBugIdentifier, e:
2376.4.7 by jml at canonical
- Add docstrings to tests.
2730
                raise errors.BzrCommandError(
3535.10.9 by James Westby
Make the improved messages show up in the UI.
2731
                    "%s\nCommit refused." % (str(e),))
2376.4.18 by Jonathan Lange
Store all bug fix URLs in a single property.
2732
            properties.append('%s fixed' % bug_url)
2376.4.21 by Jonathan Lange
Change the bugs separator to \n from ,
2733
        return '\n'.join(properties)
2376.4.7 by jml at canonical
- Add docstrings to tests.
2734
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
2735
    def run(self, message=None, file=None, verbose=False, selected_list=None,
2817.4.4 by Vincent Ladeuil
Redo the lost modification.
2736
            unchanged=False, strict=False, local=False, fixes=None,
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2737
            author=None, show_diff=False, exclude=None):
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
2738
        from bzrlib.errors import (
2739
            PointlessCommit,
2740
            ConflictsInTree,
2741
            StrictCommitFailed
2742
        )
2743
        from bzrlib.msgeditor import (
2744
            edit_commit_message_encoded,
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
2745
            generate_commit_message_template,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
2746
            make_commit_message_template_encoded
2747
        )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2748
1185.33.77 by Martin Pool
doc
2749
        # TODO: Need a blackbox test for invoking the external editor; may be
2750
        # slightly problematic to run this cross-platform.
2751
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2752
        # TODO: do more checks that the commit will succeed before
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
2753
        # spending the user's valuable time typing a commit message.
2376.4.2 by jml at canonical
More sophisticated error handling for --fixes option
2754
2755
        properties = {}
2756
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2757
        tree, selected_list = tree_files(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
2758
        if selected_list == ['']:
2759
            # workaround - commit of root of tree should be exactly the same
2760
            # as just default commit in that tree, and succeed even though
2761
            # selected-file merge commit is not done yet
2762
            selected_list = []
2763
2817.4.4 by Vincent Ladeuil
Redo the lost modification.
2764
        if fixes is None:
2765
            fixes = []
2453.2.1 by Martin Pool
Don't set the bugs property unless bugs are actually set
2766
        bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2767
        if bug_property:
2768
            properties['bugs'] = bug_property
2376.4.7 by jml at canonical
- Add docstrings to tests.
2769
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
2770
        if local and not tree.branch.get_bound_location():
2771
            raise errors.LocalRequiresBoundBranch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2772
2149.1.4 by Aaron Bentley
Add additional test that callback is called with a Commit instance
2773
        def get_message(commit_obj):
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2774
            """Callback to get commit message"""
2775
            my_message = message
2776
            if my_message is None and not file:
2598.6.24 by ghigo
update on the basis of Aaron suggestions
2777
                t = make_commit_message_template_encoded(tree,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
2778
                        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.
2779
                        output_encoding=osutils.get_user_encoding())
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
2780
                start_message = generate_commit_message_template(commit_obj)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2781
                my_message = edit_commit_message_encoded(t,
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
2782
                    start_message=start_message)
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2783
                if my_message is None:
2784
                    raise errors.BzrCommandError("please specify a commit"
2785
                        " message with either --message or --file")
2598.6.29 by ghigo
Removed the check on the switch "--show-diff" in order to allow the
2786
            elif my_message and file:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2787
                raise errors.BzrCommandError(
2598.6.29 by ghigo
Removed the check on the switch "--show-diff" in order to allow the
2788
                    "please specify either --message or --file")
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2789
            if file:
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2790
                my_message = codecs.open(file, 'rt',
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
2791
                                         osutils.get_user_encoding()).read()
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2792
            if my_message == "":
2793
                raise errors.BzrCommandError("empty commit message specified")
2794
            return my_message
2376.4.2 by jml at canonical
More sophisticated error handling for --fixes option
2795
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2796
        try:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2797
            tree.commit(message_callback=get_message,
2798
                        specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
2799
                        allow_pointless=unchanged, strict=strict, local=local,
2789.2.1 by Ian Clatworthy
Make commit less verbose by default
2800
                        reporter=None, verbose=verbose, revprops=properties,
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
2801
                        authors=author,
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2802
                        exclude=safe_relpath_files(tree, exclude))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2803
        except PointlessCommit:
2804
            # FIXME: This should really happen before the file is read in;
2805
            # perhaps prepare the commit; get the message; then actually commit
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2806
            raise errors.BzrCommandError("no changes to commit."
2807
                              " use --unchanged to commit anyhow")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
2808
        except ConflictsInTree:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2809
            raise errors.BzrCommandError('Conflicts detected in working '
2810
                'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'
2811
                ' resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2812
        except StrictCommitFailed:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2813
            raise errors.BzrCommandError("Commit refused because there are"
2814
                              " 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
2815
        except errors.BoundBranchOutOfDate, e:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2816
            raise errors.BzrCommandError(str(e) + "\n"
2817
            'To commit to master branch, run update and then commit.\n'
2818
            'You can also pass --local to commit to continue working '
2819
            'disconnected.')
2111.1.1 by Martin Pool
Fix #32054, save message if commit fails.
2820
2821
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2822
class cmd_check(Command):
3015.4.20 by Daniel Watkins
Fixed summary.
2823
    """Validate working tree structure, branch consistency and repository history.
3015.3.25 by Daniel Watkins
Updated help.
2824
2825
    This command checks various invariants about branch and repository storage
2826
    to detect data corruption or bzr bugs.
2827
2828
    The working tree and branch checks will only give output if a problem is
2829
    detected. The output fields of the repository check are:
2745.6.8 by Aaron Bentley
Clean up text
2830
2831
        revisions: This is just the number of revisions checked.  It doesn't
2832
            indicate a problem.
2833
        versionedfiles: This is just the number of versionedfiles checked.  It
2834
            doesn't indicate a problem.
2835
        unreferenced ancestors: Texts that are ancestors of other texts, but
2836
            are not properly referenced by the revision ancestry.  This is a
2837
            subtle problem that Bazaar can work around.
2838
        unique file texts: This is the total number of unique file contents
2839
            seen in the checked revisions.  It does not indicate a problem.
2840
        repeated file texts: This is the total number of repeated texts seen
2841
            in the checked revisions.  Texts can be repeated when their file
2842
            entries are modified, but the file contents are not.  It does not
2843
            indicate a problem.
3015.4.14 by Daniel Watkins
Updated check help to explain what happens when no options are given.
2844
3015.4.19 by Daniel Watkins
Improved check docs.
2845
    If no restrictions are specified, all Bazaar data that is found at the given
2846
    location will be checked.
2847
2848
    :Examples:
2849
2850
        Check the tree and branch at 'foo'::
2851
2852
            bzr check --tree --branch foo
2853
2854
        Check only the repository at 'bar'::
2855
2856
            bzr check --repo bar
2857
2858
        Check everything at 'baz'::
2859
2860
            bzr check baz
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2861
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2862
2863
    _see_also = ['reconcile']
3015.3.2 by Daniel Watkins
Check.check now takes a path rather than a branch.
2864
    takes_args = ['path?']
3015.4.2 by Daniel Watkins
Made UI changes to include CLI options.
2865
    takes_options = ['verbose',
2866
                     Option('branch', help="Check the branch related to the"
2867
                                           " current directory."),
2868
                     Option('repo', help="Check the repository related to the"
2869
                                         " current directory."),
2870
                     Option('tree', help="Check the working tree related to"
2871
                                         " the current directory.")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2872
3015.4.5 by Daniel Watkins
Each option selects only the specific thing to be checked.
2873
    def run(self, path=None, verbose=False, branch=False, repo=False,
2874
            tree=False):
3015.3.22 by Daniel Watkins
Changed 'check' to 'check_dwim'.
2875
        from bzrlib.check import check_dwim
3015.3.2 by Daniel Watkins
Check.check now takes a path rather than a branch.
2876
        if path is None:
2877
            path = '.'
3015.4.7 by Daniel Watkins
Vanilla 'bzr check' checks all items.
2878
        if not branch and not repo and not tree:
2879
            branch = repo = tree = True
3015.4.2 by Daniel Watkins
Made UI changes to include CLI options.
2880
        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;
2881
2882
2883
class cmd_upgrade(Command):
2884
    """Upgrade branch storage to current format.
2885
2886
    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.
2887
    this command. When the default format has changed you may also be warned
2888
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2889
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2890
2891
    _see_also = ['check']
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
2892
    takes_args = ['url?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2893
    takes_options = [
2221.4.9 by Aaron Bentley
Zap trailing whitespace
2894
                    RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2895
                        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
2896
                             ' formats" for details.',
3224.5.2 by Andrew Bennetts
Avoid importing bzrlib.bzrdir unnecessarily.
2897
                        lazy_registry=('bzrlib.bzrdir', 'format_registry'),
2898
                        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
2899
                        value_switches=True, title='Branch format'),
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2900
                    ]
2901
2902
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2903
        from bzrlib.upgrade import upgrade
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2904
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
2905
            format = bzrdir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2906
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2907
2908
2909
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
2910
    """Show or set bzr user id.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2911
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2912
    :Examples:
2913
        Show the email of the current user::
2914
2915
            bzr whoami --email
2916
2917
        Set the current user::
2918
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
2919
            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
2920
    """
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2921
    takes_options = [ Option('email',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2922
                             help='Display email address only.'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2923
                      Option('branch',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2924
                             help='Set identity for the current branch instead of '
2925
                                  'globally.'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2926
                    ]
2927
    takes_args = ['name?']
2928
    encoding_type = 'replace'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2929
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2930
    @display_command
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2931
    def run(self, email=False, branch=False, name=None):
2932
        if name is None:
2933
            # use branch if we're inside one; otherwise global config
2934
            try:
1816.2.10 by Robey Pointer
code style changes
2935
                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
2936
            except errors.NotBranchError:
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2937
                c = config.GlobalConfig()
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2938
            if email:
1816.2.10 by Robey Pointer
code style changes
2939
                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
2940
            else:
1816.2.10 by Robey Pointer
code style changes
2941
                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
2942
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2943
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
2944
        # display a warning if an email address isn't included in the given name.
2945
        try:
2946
            config.extract_email_address(name)
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
2947
        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
2948
            warning('"%s" does not seem to contain an email address.  '
2949
                    'This is allowed, but not recommended.', name)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2950
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2951
        # use global config unless --branch given
2952
        if branch:
1816.2.10 by Robey Pointer
code style changes
2953
            c = Branch.open_containing('.')[0].get_config()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2954
        else:
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2955
            c = config.GlobalConfig()
2956
        c.set_user_option('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2957
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.
2958
1185.35.14 by Aaron Bentley
Implemented nick command
2959
class cmd_nick(Command):
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
2960
    """Print or set the branch nickname.
2961
2962
    If unset, the tree root directory name is used as the nickname.
2963
    To print the current nickname, execute with no argument.
2964
2965
    Bound branches use the nickname of its master branch unless it is set
2966
    locally.
1185.35.14 by Aaron Bentley
Implemented nick command
2967
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2968
2969
    _see_also = ['info']
1185.35.14 by Aaron Bentley
Implemented nick command
2970
    takes_args = ['nickname?']
2971
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2972
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
2973
        if nickname is None:
2974
            self.printme(branch)
2975
        else:
2976
            branch.nick = nickname
2977
2978
    @display_command
2979
    def printme(self, branch):
2367.1.8 by Robert Collins
Whitespace.
2980
        print branch.nick
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2981
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.
2982
2900.3.2 by Tim Penhey
A working alias command.
2983
class cmd_alias(Command):
2900.3.7 by Tim Penhey
Updates from Aaron's review.
2984
    """Set/unset and display aliases.
2900.3.2 by Tim Penhey
A working alias command.
2985
2986
    :Examples:
2987
        Show the current aliases::
2988
2989
            bzr alias
2990
2991
        Show the alias specified for 'll'::
2992
2993
            bzr alias ll
2994
2995
        Set an alias for 'll'::
2996
2900.3.10 by Tim Penhey
Show examples, and change text to use double rather than single quotes.
2997
            bzr alias ll="log --line -r-10..-1"
2900.3.2 by Tim Penhey
A working alias command.
2998
2900.3.4 by Tim Penhey
Removed the unalais separate command.
2999
        To remove an alias for 'll'::
3000
3001
            bzr alias --remove ll
3002
2900.3.2 by Tim Penhey
A working alias command.
3003
    """
3004
    takes_args = ['name?']
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3005
    takes_options = [
3006
        Option('remove', help='Remove the alias.'),
3007
        ]
2900.3.2 by Tim Penhey
A working alias command.
3008
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3009
    def run(self, name=None, remove=False):
3010
        if remove:
3011
            self.remove_alias(name)
3012
        elif name is None:
2900.3.2 by Tim Penhey
A working alias command.
3013
            self.print_aliases()
3014
        else:
3015
            equal_pos = name.find('=')
3016
            if equal_pos == -1:
3017
                self.print_alias(name)
3018
            else:
3019
                self.set_alias(name[:equal_pos], name[equal_pos+1:])
3020
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3021
    def remove_alias(self, alias_name):
3022
        if alias_name is None:
3023
            raise errors.BzrCommandError(
3024
                'bzr alias --remove expects an alias to remove.')
3025
        # If alias is not found, print something like:
3026
        # unalias: foo: not found
2900.3.8 by Tim Penhey
Use the exception text for unalias not found.
3027
        c = config.GlobalConfig()
3028
        c.unset_alias(alias_name)
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3029
3030
    @display_command
2900.3.2 by Tim Penhey
A working alias command.
3031
    def print_aliases(self):
3032
        """Print out the defined aliases in a similar format to bash."""
3033
        aliases = config.GlobalConfig().get_aliases()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3034
        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.
3035
            self.outf.write('bzr alias %s="%s"\n' % (key, value))
2900.3.2 by Tim Penhey
A working alias command.
3036
3037
    @display_command
3038
    def print_alias(self, alias_name):
3039
        from bzrlib.commands import get_alias
3040
        alias = get_alias(alias_name)
3041
        if alias is None:
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3042
            self.outf.write("bzr alias: %s: not found\n" % alias_name)
2900.3.2 by Tim Penhey
A working alias command.
3043
        else:
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3044
            self.outf.write(
2900.3.11 by Tim Penhey
Fixed the output in the tests.
3045
                'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
2900.3.2 by Tim Penhey
A working alias command.
3046
2900.3.12 by Tim Penhey
Final review comments.
3047
    def set_alias(self, alias_name, alias_command):
2900.3.2 by Tim Penhey
A working alias command.
3048
        """Save the alias in the global config."""
3049
        c = config.GlobalConfig()
2900.3.12 by Tim Penhey
Final review comments.
3050
        c.set_alias(alias_name, alias_command)
2900.3.2 by Tim Penhey
A working alias command.
3051
3052
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3053
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
3054
    """Run internal test suite.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3055
2213.2.1 by Martin Pool
Add selftest --first flag
3056
    If arguments are given, they are regular expressions that say which tests
3057
    should run.  Tests matching any expression are run, and other tests are
3058
    not run.
3059
3060
    Alternatively if --first is given, matching tests are run first and then
3061
    all other tests are run.  This is useful if you have been working in a
3062
    particular area, but want to make sure nothing else was broken.
1552 by Martin Pool
Improved help text for bzr selftest
3063
2394.2.2 by Ian Clatworthy
Add --randomize and update help
3064
    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
3065
    excluded, regardless of whether they match --first or not.
2394.2.2 by Ian Clatworthy
Add --randomize and update help
3066
3067
    To help catch accidential dependencies between tests, the --randomize
3068
    option is useful. In most cases, the argument used is the word 'now'.
3069
    Note that the seed used for the random number generator is displayed
3070
    when this option is used. The seed can be explicitly passed as the
3071
    argument to this option if required. This enables reproduction of the
3072
    actual ordering used if and when an order sensitive problem is encountered.
3073
3074
    If --list-only is given, the tests that would be run are listed. This is
3075
    useful when combined with --first, --exclude and/or --randomize to
3076
    understand their impact. The test harness reports "Listed nn tests in ..."
3077
    instead of "Ran nn tests in ..." when list mode is enabled.
3078
1552 by Martin Pool
Improved help text for bzr selftest
3079
    If the global option '--no-plugins' is given, plugins are not loaded
3080
    before running the selftests.  This has two effects: features provided or
3081
    modified by plugins will not be tested, and tests provided by plugins will
3082
    not be run.
3083
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3084
    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)
3085
    typically inside $TMPDIR or /tmp.
3086
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3087
    :Examples:
3088
        Run only tests relating to 'ignore'::
3089
3090
            bzr selftest ignore
3091
3092
        Disable plugins and list tests as they're run::
3093
3094
            bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
3095
    """
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.
3096
    # NB: this is used from the class without creating an instance, which is
3097
    # why it does not have a self parameter.
3098
    def get_transport_type(typestring):
3099
        """Parse and return a transport specifier."""
3100
        if typestring == "sftp":
3101
            from bzrlib.transport.sftp import SFTPAbsoluteServer
3102
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
3103
        if typestring == "memory":
3104
            from bzrlib.transport.memory import MemoryServer
3105
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
3106
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
3107
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
3108
            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.
3109
        msg = "No known transport type %s. Supported types are: sftp\n" %\
3110
            (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
3111
        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.
3112
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3113
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
3114
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
3115
    takes_options = ['verbose',
2418.2.2 by Martin Pool
Add -1 option to selftest
3116
                     Option('one',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3117
                             help='Stop when one test fails.',
2418.2.2 by Martin Pool
Add -1 option to selftest
3118
                             short_name='1',
3119
                             ),
2333.1.1 by Dmitry Vasiliev
Fixed typo and removed some trailing whitespaces
3120
                     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.
3121
                            help='Use a different transport by default '
3122
                                 'throughout the test suite.',
3123
                            type=get_transport_type),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3124
                     Option('benchmark',
3125
                            help='Run the benchmarks rather than selftests.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
3126
                     Option('lsprof-timed',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3127
                            help='Generate lsprof output for benchmarked'
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
3128
                                 ' sections of code.'),
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
3129
                     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
3130
                            help='Cache intermediate benchmark output in this '
3131
                                 'directory.'),
2213.2.1 by Martin Pool
Add selftest --first flag
3132
                     Option('first',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3133
                            help='Run all tests, but run specified tests first.',
2418.2.1 by Martin Pool
Add -f alias for selftest --first
3134
                            short_name='f',
2321.2.1 by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
3135
                            ),
2394.2.1 by Ian Clatworthy
--list and --exclude first cut
3136
                     Option('list-only',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3137
                            help='List the tests instead of running them.'),
2394.2.2 by Ian Clatworthy
Add --randomize and update help
3138
                     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
3139
                            help='Randomize the order of tests using the given'
3140
                                 ' seed or "now" for the current time.'),
2394.2.2 by Ian Clatworthy
Add --randomize and update help
3141
                     Option('exclude', type=str, argname="PATTERN",
2394.2.6 by Ian Clatworthy
completed blackbox tests
3142
                            short_name='x',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3143
                            help='Exclude tests that match this regular'
3144
                                 ' expression.'),
2658.3.3 by Daniel Watkins
Added UI support for bzr selftest --strict.
3145
                     Option('strict', help='Fail on missing dependencies or '
3146
                            'known failures.'),
3193.1.8 by Vincent Ladeuil
Add '--load-list' option to selftest.
3147
                     Option('load-list', type=str, argname='TESTLISTFILE',
3148
                            help='Load a test id list from a text file.'),
3390.1.1 by Andrew Bennetts
Add --debugflags/-E option to selftest.
3149
                     ListOption('debugflag', type=str, short_name='E',
3150
                                help='Turn on a selftest debug flag.'),
3649.6.4 by Vincent Ladeuil
selftest --starting-with now accepts multiple values.
3151
                     ListOption('starting-with', type=str, argname='TESTID',
3152
                                param_name='starting_with', short_name='s',
3153
                                help=
3154
                                'Load only the tests starting with TESTID.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
3155
                     ]
2204.3.4 by Alexander Belchenko
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback
3156
    encoding_type = 'replace'
1185.16.58 by mbp at sourcefrog
- run all selftests by default
3157
4000.2.3 by Robert Collins
Allow extra options to bzrlib.tests.selftest from plugins.
3158
    def __init__(self):
3159
        Command.__init__(self)
3160
        self.additional_selftest_args = {}
3161
2805.1.1 by Ian Clatworthy
Fix selftest --benchmark so verbose by default again
3162
    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)
3163
            transport=None, benchmark=None,
3164
            lsprof_timed=None, cache_dir=None,
3165
            first=False, list_only=False,
3198.1.1 by Vincent Ladeuil
Add --load-list option to selftest
3166
            randomize=None, exclude=None, strict=False,
3302.11.7 by Vincent Ladeuil
merge bzr.dev, fixing simple conflicts
3167
            load_list=None, debugflag=None, starting_with=None):
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
3168
        from bzrlib.tests import selftest
3169
        import bzrlib.benchmarks as benchmarks
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
3170
        from bzrlib.benchmarks import tree_creator
2321.2.1 by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
3171
3427.5.3 by John Arbash Meinel
Update the activate_deprecation_warnings so it can be skipped if there is already an error set.
3172
        # Make deprecation warnings visible, unless -Werror is set
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
3173
        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.
3174
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
3175
        if cache_dir is not None:
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
3176
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2606.1.3 by Martin Pool
Update tests for new version display
3177
        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
3178
            print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
3179
            print '   %s (%s python%s)' % (
3180
                    bzrlib.__path__[0],
3181
                    bzrlib.version_string,
3293.2.2 by Martin Pool
Fix formatting of other occurrences of Python version
3182
                    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
3183
                    )
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
3184
        print
2095.4.1 by Martin Pool
Better progress bars during tests
3185
        if testspecs_list is not None:
3186
            pattern = '|'.join(testspecs_list)
3187
        else:
3188
            pattern = ".*"
3189
        if benchmark:
3190
            test_suite_factory = benchmarks.test_suite
2805.1.1 by Ian Clatworthy
Fix selftest --benchmark so verbose by default again
3191
            # Unless user explicitly asks for quiet, be verbose in benchmarks
3192
            verbose = not is_quiet()
2095.4.1 by Martin Pool
Better progress bars during tests
3193
            # TODO: should possibly lock the history file...
2197.1.1 by Martin Pool
Use line buffering to write .perf_history
3194
            benchfile = open(".perf_history", "at", buffering=1)
2095.4.1 by Martin Pool
Better progress bars during tests
3195
        else:
3196
            test_suite_factory = None
3197
            benchfile = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3198
        try:
4000.2.4 by Robert Collins
PEP8ification of selftest_kwargs in cmd_selftest.
3199
            selftest_kwargs = {"verbose": verbose,
3200
                              "pattern": pattern,
3201
                              "stop_on_failure": one,
3202
                              "transport": transport,
3203
                              "test_suite_factory": test_suite_factory,
3204
                              "lsprof_timed": lsprof_timed,
3205
                              "bench_history": benchfile,
3206
                              "matching_tests_first": first,
3207
                              "list_only": list_only,
3208
                              "random_seed": randomize,
3209
                              "exclude_pattern": exclude,
3210
                              "strict": strict,
3211
                              "load_list": load_list,
3212
                              "debug_flags": debugflag,
3213
                              "starting_with": starting_with
4000.2.3 by Robert Collins
Allow extra options to bzrlib.tests.selftest from plugins.
3214
                              }
3215
            selftest_kwargs.update(self.additional_selftest_args)
3216
            result = selftest(**selftest_kwargs)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3217
        finally:
2095.4.1 by Martin Pool
Better progress bars during tests
3218
            if benchfile is not None:
3219
                benchfile.close()
3220
        if result:
3221.5.1 by Vincent Ladeuil
Fix bug #137823 by raising UnavailableFeature *after* the fake ftp server
3221
            note('tests passed')
2095.4.1 by Martin Pool
Better progress bars during tests
3222
        else:
3221.5.1 by Vincent Ladeuil
Fix bug #137823 by raising UnavailableFeature *after* the fake ftp server
3223
            note('tests failed')
2095.4.1 by Martin Pool
Better progress bars during tests
3224
        return int(not result)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3225
3226
3227
class cmd_version(Command):
3228
    """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
3229
2785.1.2 by bialix at ukr
bugfix for #131100
3230
    encoding_type = 'replace'
3346.2.1 by Martin Pool
Add version --short option
3231
    takes_options = [
3232
        Option("short", help="Print just the version number."),
3233
        ]
2785.1.2 by bialix at ukr
bugfix for #131100
3234
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3235
    @display_command
3346.2.1 by Martin Pool
Add version --short option
3236
    def run(self, short=False):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
3237
        from bzrlib.version import show_version
3346.2.1 by Martin Pool
Add version --short option
3238
        if short:
3346.2.7 by Martin Pool
Commands should use self.outf not print
3239
            self.outf.write(bzrlib.version_string + '\n')
3346.2.1 by Martin Pool
Add version --short option
3240
        else:
3241
            show_version(to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3242
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
3243
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3244
class cmd_rocks(Command):
3245
    """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
3246
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3247
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
3248
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3249
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3250
    def run(self):
2227.4.1 by v.ladeuil+lp at free
Fix #78026.
3251
        print "It sure does!"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3252
3253
3254
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.
3255
    """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
3256
    # TODO: Options to specify revisions on either side, as if
3257
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3258
    takes_args = ['branch', 'other']
3259
    hidden = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3260
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3261
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3262
    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.
3263
        from bzrlib.revision import ensure_null
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3264
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
3265
        branch1 = Branch.open_containing(branch)[0]
3266
        branch2 = Branch.open_containing(other)[0]
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3267
        branch1.lock_read()
3268
        try:
3269
            branch2.lock_read()
3270
            try:
3271
                last1 = ensure_null(branch1.last_revision())
3272
                last2 = ensure_null(branch2.last_revision())
3273
3274
                graph = branch1.repository.get_graph(branch2.repository)
3275
                base_rev_id = graph.find_unique_lca(last1, last2)
3276
3277
                print 'merge base is revision %s' % base_rev_id
3278
            finally:
3279
                branch2.unlock()
3280
        finally:
3281
            branch1.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3282
3283
3284
class cmd_merge(Command):
3285
    """Perform a three-way merge.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3286
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
3287
    The source of the merge can be specified either in the form of a branch,
3288
    or in the form of a path to a file containing a merge directive generated
3289
    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:
3290
    or the branch most recently merged using --remember.
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
3291
3277.1.2 by Peter Schuller
As per feedback to previous attempt:
3292
    When merging a branch, by default the tip will be merged. To pick a different
3293
    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)
3294
    BASE and the second one as OTHER. Merging individual revisions, or a subset of
3295
    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'.
3296
3297
    Revision numbers are always relative to the branch being merged.
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
3298
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
3299
    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
3300
    branch, automatically determining an appropriate base.  If this
3301
    fails, you may need to give an explicit base.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3302
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
3303
    Merge will do its best to combine the changes in two branches, but there
3304
    are some kinds of problems only a human can fix.  When it encounters those,
3305
    it will mark a conflict.  A conflict means that you need to fix something,
3306
    before you should commit.
3307
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
3308
    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
3309
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
3310
    If there is no default branch set, the first merge will set it. After
3311
    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.
3312
    default, use --remember. The value will only be saved if the remote
3313
    location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
3314
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3315
    The results of the merge are placed into the destination working
3316
    directory, where they can be reviewed (with bzr diff), tested, and then
3317
    committed to record the result of the merge.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3318
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3319
    merge refuses to run if there are any uncommitted changes, unless
3320
    --force is given.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3321
3322
    :Examples:
3323
        To merge the latest revision from bzr.dev::
3324
3325
            bzr merge ../bzr.dev
3326
3327
        To merge changes up to and including revision 82 from bzr.dev::
3328
3329
            bzr merge -r 82 ../bzr.dev
3330
3331
        To merge the changes introduced by 82, without previous changes::
3332
3333
            bzr merge -r 81..82 ../bzr.dev
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
3334
3335
        To apply a merge directive contained in in /tmp/merge:
3336
3337
            bzr merge /tmp/merge
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3338
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3339
3008.1.25 by Aaron Bentley
Set encoding exact on cmd_merge
3340
    encoding_type = 'exact'
4095.2.1 by Neil Martinsen-Burrell
Better help for bzr send
3341
    _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.
3342
    takes_args = ['location?']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3343
    takes_options = [
2839.5.1 by Alexander Belchenko
add -c option to merge command
3344
        'change',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3345
        'revision',
3346
        Option('force',
3347
               help='Merge even if the destination tree has uncommitted changes.'),
3348
        'merge-type',
3349
        'reprocess',
3350
        'remember',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3351
        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
3352
               "conflicts."),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3353
        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
3354
               ' from a working copy, instead of branch changes.'),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3355
        Option('pull', help='If the destination is already'
3356
                ' 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
3357
                ' source rather than merging.  When this happens,'
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3358
                ' you do not need to commit the result.'),
3359
        Option('directory',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3360
               help='Branch to merge into, '
3361
                    'rather than the one containing the working directory.',
3362
               short_name='d',
3363
               type=unicode,
3364
               ),
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3365
        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.
3366
    ]
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3367
3277.1.4 by Peter Schuller
As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.
3368
    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.
3369
            merge_type=None, show_base=False, reprocess=None, remember=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3370
            uncommitted=False, pull=False,
3371
            directory=None,
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3372
            preview=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3373
            ):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3374
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3375
            merge_type = _mod_merge.Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
3376
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3377
        if directory is None: directory = u'.'
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3378
        possible_transports = []
3379
        merger = None
3380
        allow_pending = True
3381
        verified = 'inapplicable'
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3382
        tree = WorkingTree.open_containing(directory)[0]
4037.2.1 by Roberto Aguilar
Check for umcommitted changes.
3383
3384
        # die as quickly as possible if there are uncommitted changes
4037.2.2 by Roberto Aguilar
Updating uncommitted changes check.
3385
        try:
3386
            basis_tree = tree.revision_tree(tree.last_revision())
3387
        except errors.NoSuchRevision:
3388
            basis_tree = tree.basis_tree()
3389
        changes = tree.changes_from(basis_tree)
3390
        if changes.has_changed():
4037.2.1 by Roberto Aguilar
Check for umcommitted changes.
3391
            raise errors.UncommittedChanges(tree)
3392
3586.1.31 by Ian Clatworthy
view filtering for pull, update & merge
3393
        view_info = _get_view_info_for_change_reporter(tree)
1551.10.25 by Aaron Bentley
Make ChangeReporter private
3394
        change_reporter = delta._ChangeReporter(
3586.1.31 by Ian Clatworthy
view filtering for pull, update & merge
3395
            unversioned_filter=tree.is_ignored, view_info=view_info)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3396
        cleanups = []
3397
        try:
3398
            pb = ui.ui_factory.nested_progress_bar()
3399
            cleanups.append(pb.finished)
3400
            tree.lock_write()
3401
            cleanups.append(tree.unlock)
1551.15.74 by Aaron Bentley
Textual updates from review
3402
            if location is not None:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
3403
                try:
3404
                    mergeable = bundle.read_mergeable_from_url(location,
3405
                        possible_transports=possible_transports)
3406
                except errors.NotABundle:
3407
                    mergeable = None
3408
                else:
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3409
                    if uncommitted:
3410
                        raise errors.BzrCommandError('Cannot use --uncommitted'
3411
                            ' with bundles or merge directives.')
3412
3413
                    if revision is not None:
3414
                        raise errors.BzrCommandError(
3415
                            'Cannot use -r with merge directives or bundles')
3416
                    merger, verified = _mod_merge.Merger.from_mergeable(tree,
3417
                       mergeable, pb)
3418
3419
            if merger is None and uncommitted:
3420
                if revision is not None and len(revision) > 0:
3421
                    raise errors.BzrCommandError('Cannot use --uncommitted and'
3422
                        ' --revision at the same time.')
1551.15.74 by Aaron Bentley
Textual updates from review
3423
                location = self._select_branch_location(tree, location)[0]
3424
                other_tree, other_path = WorkingTree.open_containing(location)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3425
                merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3426
                    pb)
3427
                allow_pending = False
3017.3.1 by Aaron Bentley
merge --uncommit can now specify single files (#136890)
3428
                if other_path != '':
3429
                    merger.interesting_files = [other_path]
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3430
3431
            if merger is None:
1551.15.75 by Aaron Bentley
_merger_from_branch -> _get_merger_from_branch
3432
                merger, allow_pending = self._get_merger_from_branch(tree,
1551.15.74 by Aaron Bentley
Textual updates from review
3433
                    location, revision, remember, possible_transports, pb)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3434
3435
            merger.merge_type = merge_type
3436
            merger.reprocess = reprocess
3437
            merger.show_base = show_base
3438
            self.sanity_check_merger(merger)
3439
            if (merger.base_rev_id == merger.other_rev_id and
3376.2.11 by Martin Pool
Compare to None using is/is not not ==
3440
                merger.other_rev_id is not None):
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3441
                note('Nothing to do.')
3442
                return 0
3443
            if pull:
3444
                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.
3445
                    raise errors.BzrCommandError('Cannot pull individual files')
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3446
                if (merger.base_rev_id == tree.last_revision()):
3447
                    result = tree.pull(merger.other_branch, False,
3448
                                       merger.other_rev_id)
3449
                    result.report(self.outf)
3450
                    return 0
4037.2.4 by Roberto Aguilar
Set check_basis to False.
3451
            merger.check_basis(False)
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3452
            if preview:
3453
                return self._do_preview(merger)
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3454
            else:
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3455
                return self._do_merge(merger, change_reporter, allow_pending,
3456
                                      verified)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3457
        finally:
3458
            for cleanup in reversed(cleanups):
3459
                cleanup()
3460
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3461
    def _do_preview(self, merger):
3462
        from bzrlib.diff import show_diff_trees
3463
        tree_merger = merger.make_merger()
3464
        tt = tree_merger.make_preview_transform()
3199.1.9 by Vincent Ladeuil
Aaron's review feedback.
3465
        try:
3466
            result_tree = tt.get_preview_tree()
3467
            show_diff_trees(merger.this_tree, result_tree, self.outf,
3468
                            old_label='', new_label='')
3469
        finally:
3470
            tt.finalize()
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3471
3472
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
3473
        merger.change_reporter = change_reporter
3474
        conflict_count = merger.do_merge()
3475
        if allow_pending:
3476
            merger.set_pending()
3477
        if verified == 'failed':
3478
            warning('Preview patch does not match changes')
3479
        if conflict_count != 0:
3480
            return 1
3481
        else:
3482
            return 0
3483
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3484
    def sanity_check_merger(self, merger):
3485
        if (merger.show_base and
3486
            not merger.merge_type is _mod_merge.Merge3Merger):
3487
            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
3488
                                         " 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.
3489
        if merger.reprocess is None:
3490
            if merger.show_base:
3491
                merger.reprocess = False
3492
            else:
3493
                # Use reprocess if the merger supports it
3494
                merger.reprocess = merger.merge_type.supports_reprocess
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3495
        if merger.reprocess and not merger.merge_type.supports_reprocess:
3496
            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
3497
                                         " for merge type %s." %
3498
                                         merger.merge_type)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3499
        if merger.reprocess and merger.show_base:
3500
            raise errors.BzrCommandError("Cannot do conflict reduction and"
3501
                                         " show base.")
3502
1551.15.75 by Aaron Bentley
_merger_from_branch -> _get_merger_from_branch
3503
    def _get_merger_from_branch(self, tree, location, revision, remember,
3504
                                possible_transports, pb):
3505
        """Produce a merger from a location, assuming it refers to a branch."""
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3506
        from bzrlib.tag import _merge_tags_if_possible
3507
        # find the branch locations
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3508
        other_loc, user_location = self._select_branch_location(tree, location,
1551.15.74 by Aaron Bentley
Textual updates from review
3509
            revision, -1)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3510
        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
3511
            base_loc, _unused = self._select_branch_location(tree,
3512
                location, revision, 0)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3513
        else:
3514
            base_loc = other_loc
3515
        # Open the branches
3516
        other_branch, other_path = Branch.open_containing(other_loc,
3517
            possible_transports)
3518
        if base_loc == other_loc:
3519
            base_branch = other_branch
3520
        else:
3521
            base_branch, base_path = Branch.open_containing(base_loc,
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3522
                possible_transports)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3523
        # Find the revision ids
3524
        if revision is None or len(revision) < 1 or revision[-1] is None:
3525
            other_revision_id = _mod_revision.ensure_null(
3526
                other_branch.last_revision())
3527
        else:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
3528
            other_revision_id = revision[-1].as_revision_id(other_branch)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3529
        if (revision is not None and len(revision) == 2
3530
            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()
3531
            base_revision_id = revision[0].as_revision_id(base_branch)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3532
        else:
3533
            base_revision_id = None
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
3534
        # Remember where we merge from
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3535
        if ((remember or tree.branch.get_submit_branch() is None) and
3536
             user_location is not None):
3537
            tree.branch.set_submit_branch(other_branch.base)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3538
        _merge_tags_if_possible(other_branch, tree.branch)
3539
        merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3540
            other_revision_id, base_revision_id, other_branch, base_branch)
3541
        if other_path != '':
3542
            allow_pending = False
3543
            merger.interesting_files = [other_path]
1645.1.1 by Aaron Bentley
Implement single-file merge
3544
        else:
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3545
            allow_pending = True
3546
        return merger, allow_pending
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3547
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3548
    def _select_branch_location(self, tree, user_location, revision=None,
1551.15.74 by Aaron Bentley
Textual updates from review
3549
                                index=None):
3550
        """Select a branch location, according to possible inputs.
3551
3552
        If provided, branches from ``revision`` are preferred.  (Both
3553
        ``revision`` and ``index`` must be supplied.)
3554
3555
        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
3556
        ``submit`` or ``parent`` location is used, and a note is printed.
1551.15.74 by Aaron Bentley
Textual updates from review
3557
3558
        :param tree: The working tree to select a branch for merging into
3559
        :param location: The location entered by the user
3560
        :param revision: The revision parameter to the command
3561
        :param index: The index to use for the revision parameter.  Negative
3562
            indices are permitted.
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3563
        :return: (selected_location, user_location).  The default location
3564
            will be the user-entered location.
1551.15.74 by Aaron Bentley
Textual updates from review
3565
        """
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3566
        if (revision is not None and index is not None
3567
            and revision[index] is not None):
3568
            branch = revision[index].get_branch()
3569
            if branch is not None:
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3570
                return branch, branch
3571
        if user_location is None:
3572
            location = self._get_remembered(tree, 'Merging from')
3573
        else:
3574
            location = user_location
3575
        return location, user_location
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3576
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3577
    def _get_remembered(self, tree, verb_string):
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3578
        """Use tree.branch's parent if none was supplied.
3579
3580
        Report if the remembered location was used.
3581
        """
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3582
        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.
3583
        stored_location_type = "submit"
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3584
        if stored_location is None:
3585
            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.
3586
            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
3587
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3588
        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
3589
            raise errors.BzrCommandError("No location specified or remembered")
3249.1.1 by Ian Clatworthy
fix merge redirection when using a remembered location
3590
        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.
3591
        note(u"%s remembered %s location %s", verb_string,
3592
                stored_location_type, display_url)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3593
        return stored_location
3594
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3595
1185.35.4 by Aaron Bentley
Implemented remerge
3596
class cmd_remerge(Command):
3597
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3598
3599
    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
3600
    conflicts.  Some merge techniques are better than others, and remerge
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3601
    lets you try different ones on different files.
3602
3603
    The options for remerge have the same meaning and defaults as the ones for
3604
    merge.  The difference is that remerge can (only) be run when there is a
3605
    pending merge, and it lets you specify particular files.
3606
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3607
    :Examples:
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3608
        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
3609
        conflict regions, in addition to the usual THIS and OTHER texts::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3610
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3611
            bzr remerge --show-base
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3612
3613
        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
3614
        additional processing to reduce the size of conflict regions::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3615
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3616
            bzr remerge --merge-type weave --reprocess foobar
2374.1.1 by Ian Clatworthy
Help and man page fixes
3617
    """
1185.35.4 by Aaron Bentley
Implemented remerge
3618
    takes_args = ['file*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3619
    takes_options = [
3620
            'merge-type',
3621
            'reprocess',
3622
            Option('show-base',
3623
                   help="Show base revision text in conflicts."),
3624
            ]
1185.35.4 by Aaron Bentley
Implemented remerge
3625
3626
    def run(self, file_list=None, merge_type=None, show_base=False,
3627
            reprocess=False):
3628
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3629
            merge_type = _mod_merge.Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
3630
        tree, file_list = tree_files(file_list)
3631
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
3632
        try:
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
3633
            parents = tree.get_parent_ids()
3634
            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
3635
                raise errors.BzrCommandError("Sorry, remerge only works after normal"
3636
                                             " merges.  Not cherrypicking or"
3637
                                             " multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
3638
            repository = tree.branch.repository
1185.35.4 by Aaron Bentley
Implemented remerge
3639
            interesting_ids = None
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3640
            new_conflicts = []
3641
            conflicts = tree.conflicts()
1185.35.4 by Aaron Bentley
Implemented remerge
3642
            if file_list is not None:
3643
                interesting_ids = set()
3644
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
3645
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
3646
                    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
3647
                        raise errors.NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
3648
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
3649
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
3650
                        continue
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3651
1508.1.15 by Robert Collins
Merge from mpool.
3652
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
3653
                        interesting_ids.add(ie.file_id)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3654
                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
3655
            else:
2080.2.3 by John Arbash Meinel
remerge only supports text or content conflicts
3656
                # Remerge only supports resolving contents conflicts
3657
                allowed_conflicts = ('text conflict', 'contents conflict')
3658
                restore_files = [c.path for c in conflicts
3659
                                 if c.typestring in allowed_conflicts]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3660
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3661
            tree.set_conflicts(ConflictList(new_conflicts))
2080.2.1 by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
3662
            if file_list is not None:
1185.35.4 by Aaron Bentley
Implemented remerge
3663
                restore_files = file_list
3664
            for filename in restore_files:
3665
                try:
1508.1.15 by Robert Collins
Merge from mpool.
3666
                    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
3667
                except errors.NotConflicted:
1185.35.4 by Aaron Bentley
Implemented remerge
3668
                    pass
1551.15.52 by Aaron Bentley
Tweak from review comments
3669
            # Disable pending merges, because the file texts we are remerging
3670
            # have not had those merges performed.  If we use the wrong parents
3671
            # list, we imply that the working tree text has seen and rejected
3672
            # all the changes from the other tree, when in fact those changes
3673
            # have not yet been seen.
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3674
            pb = ui.ui_factory.nested_progress_bar()
1551.15.53 by Aaron Bentley
Restore old method of adjusting partents
3675
            tree.set_parent_ids(parents[:1])
1551.15.47 by Aaron Bentley
Fix remerge --weave
3676
            try:
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3677
                merger = _mod_merge.Merger.from_revision_ids(pb,
3678
                                                             tree, parents[1])
3679
                merger.interesting_ids = interesting_ids
3680
                merger.merge_type = merge_type
3681
                merger.show_base = show_base
3682
                merger.reprocess = reprocess
3683
                conflicts = merger.do_merge()
1551.15.47 by Aaron Bentley
Fix remerge --weave
3684
            finally:
1551.15.53 by Aaron Bentley
Restore old method of adjusting partents
3685
                tree.set_parent_ids(parents)
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3686
                pb.finished()
1185.35.4 by Aaron Bentley
Implemented remerge
3687
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
3688
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
3689
        if conflicts > 0:
3690
            return 1
3691
        else:
3692
            return 0
3693
2023.1.1 by ghigo
add topics help
3694
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3695
class cmd_revert(Command):
1551.8.27 by Aaron Bentley
Update docs again
3696
    """Revert files to a previous revision.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3697
1551.8.27 by Aaron Bentley
Update docs again
3698
    Giving a list of files will revert only those files.  Otherwise, all files
3699
    will be reverted.  If the revision is not specified with '--revision', the
3700
    last committed revision is used.
1551.8.26 by Aaron Bentley
Update revert help text
3701
3702
    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.
3703
    merge instead.  For example, "merge . --revision -2..-3" will remove the
3704
    changes introduced by -2, without affecting the changes introduced by -1.
3705
    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
3706
1551.8.26 by Aaron Bentley
Update revert help text
3707
    By default, any files that have been manually changed will be backed up
3708
    first.  (Files changed only by merge are not backed up.)  Backup files have
1551.8.27 by Aaron Bentley
Update docs again
3709
    '.~#~' appended to their name, where # is a number.
3710
3711
    When you provide files, you can use their current pathname or the pathname
3712
    from the target revision.  So you can use revert to "undelete" a file by
3713
    name.  If you name a directory, all the contents of that directory will be
3714
    reverted.
2614.1.1 by Martin Pool
Doc for revert, #87548
3715
3716
    Any files that have been newly added since that revision will be deleted,
3717
    with a backup kept if appropriate.  Directories containing unknown files
3718
    will not be deleted.
2911.2.1 by Martin Pool
Better help for revert
3719
3720
    The working tree contains a list of pending merged revisions, which will
3721
    be included as parents in the next commit.  Normally, revert clears that
3006.1.1 by Adeodato Simó
Fix typos in revert's help.
3722
    list as well as reverting the files.  If any files are specified, revert
3723
    leaves the pending merge list alone and reverts only the files.  Use "bzr
2911.2.1 by Martin Pool
Better help for revert
3724
    revert ." in the tree root to revert all files but keep the merge record,
3725
    and "bzr revert --forget-merges" to clear the pending merge list without
3726
    reverting any files.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3727
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3728
3729
    _see_also = ['cat', 'export']
2598.1.6 by Martin Pool
Add help for --no-backup
3730
    takes_options = [
2851.2.1 by Martin Pool
Add revert --forget-merges
3731
        'revision',
3732
        Option('no-backup', "Do not save backups of reverted files."),
3733
        Option('forget-merges',
3734
               'Remove pending merge marker, without changing any files.'),
3735
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3736
    takes_args = ['file*']
3737
2851.2.1 by Martin Pool
Add revert --forget-merges
3738
    def run(self, revision=None, no_backup=False, file_list=None,
3739
            forget_merges=None):
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
3740
        tree, file_list = tree_files(file_list)
3737.2.1 by John Arbash Meinel
Take out a write lock right away for 'bzr revert'
3741
        tree.lock_write()
3742
        try:
3743
            if forget_merges:
3744
                tree.set_parent_ids(tree.get_parent_ids()[:1])
3745
            else:
3746
                self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3747
        finally:
3748
            tree.unlock()
2851.2.1 by Martin Pool
Add revert --forget-merges
3749
3750
    @staticmethod
3751
    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)
3752
        rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3753
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
3754
        try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3755
            tree.revert(file_list, rev_tree, not no_backup, pb,
3756
                report_changes=True)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
3757
        finally:
3758
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3759
3760
3761
class cmd_assert_fail(Command):
3762
    """Test reporting of assertion failures"""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3763
    # intended just for use in testing
3764
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3765
    hidden = True
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3766
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3767
    def run(self):
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3768
        raise AssertionError("always fails")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3769
3770
3771
class cmd_help(Command):
3772
    """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)
3773
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3774
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3775
    _see_also = ['topics']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3776
    takes_options = [
3777
            Option('long', 'Show help on all commands.'),
3778
            ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3779
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
3780
    aliases = ['?', '--help', '-?', '-h']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3781
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3782
    @display_command
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
3783
    def run(self, topic=None, long=False):
2023.1.1 by ghigo
add topics help
3784
        import bzrlib.help
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3785
        if topic is None and long:
3786
            topic = "commands"
2023.1.1 by ghigo
add topics help
3787
        bzrlib.help.help(topic)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3788
3789
3790
class cmd_shell_complete(Command):
3791
    """Show appropriate completions for context.
3792
2023.1.1 by ghigo
add topics help
3793
    For a list of all available commands, say 'bzr shell-complete'.
3794
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3795
    takes_args = ['context?']
3796
    aliases = ['s-c']
3797
    hidden = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3798
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3799
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3800
    def run(self, context=None):
3801
        import shellcomplete
3802
        shellcomplete.shellcomplete(context)
3803
3804
3805
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
3806
    """Show unmerged/unpulled revisions between two branches.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3807
2023.1.1 by ghigo
add topics help
3808
    OTHER_BRANCH may be local or remote.
3921.3.12 by Marius Kruger
add missing examples and NEWS
3809
3921.3.13 by Marius Kruger
update missing documentation and blackbox test to better reflect `-r 3` behaviour.
3810
    To filter on a range of revirions, you can use the command -r begin..end
3811
    -r revision requests a specific revision, -r ..end or -r begin.. are
3812
    also valid.
3813
3921.3.12 by Marius Kruger
add missing examples and NEWS
3814
    :Examples:
3815
3816
        Determine the missing revisions between this and the branch at the
3817
        remembered pull location::
3818
3819
            bzr missing
3820
3821
        Determine the missing revisions between this and another branch::
3822
3823
            bzr missing http://server/branch
3824
3825
        Determine the missing revisions up to a specific revision on the other
3826
        branch::
3827
3828
            bzr missing -r ..-10
3829
3830
        Determine the missing revisions up to a specific revision on this
3831
        branch::
3832
3833
            bzr missing --my-revision ..-10
2023.1.1 by ghigo
add topics help
3834
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3835
3836
    _see_also = ['merge', 'pull']
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3837
    takes_args = ['other_branch?']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3838
    takes_options = [
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3839
        Option('reverse', 'Reverse the order of revisions.'),
3840
        Option('mine-only',
3841
               'Display changes in the local branch only.'),
3842
        Option('this' , 'Same as --mine-only.'),
3843
        Option('theirs-only',
3844
               'Display changes in the remote branch only.'),
3845
        Option('other', 'Same as --theirs-only.'),
3846
        'log-format',
3847
        'show-ids',
3848
        'verbose',
3849
        custom_help('revision',
3921.3.11 by Marius Kruger
swap options as per review:
3850
             help='Filter on other branch revisions (inclusive). '
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3851
                'See "help revisionspec" for details.'),
3921.3.11 by Marius Kruger
swap options as per review:
3852
        Option('my-revision',
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3853
            type=_parse_revision_str,
3921.3.11 by Marius Kruger
swap options as per review:
3854
            help='Filter on local branch revisions (inclusive). '
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3855
                'See "help revisionspec" for details.'),
3856
        Option('include-merges', 'Show merged revisions.'),
3857
        ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
3858
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3859
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
3860
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3861
    def run(self, other_branch=None, reverse=False, mine_only=False,
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
3862
            theirs_only=False,
3863
            log_format=None, long=False, short=False, line=False,
3864
            show_ids=False, verbose=False, this=False, other=False,
3921.3.11 by Marius Kruger
swap options as per review:
3865
            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.
3866
        from bzrlib.missing import find_unmerged, iter_log_revisions
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
3867
        def message(s):
3868
            if not is_quiet():
3869
                self.outf.write(s)
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3870
3871
        if this:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3872
            mine_only = this
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3873
        if other:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3874
            theirs_only = other
3875
        # TODO: We should probably check that we don't have mine-only and
3876
        #       theirs-only set, but it gets complicated because we also have
3877
        #       this and other which could be used.
3878
        restrict = 'all'
3879
        if mine_only:
3880
            restrict = 'local'
3881
        elif theirs_only:
3882
            restrict = 'remote'
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3883
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3884
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
3885
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3886
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
3887
            other_branch = parent
3888
            if other_branch is None:
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3889
                raise errors.BzrCommandError("No peer location known"
2485.8.17 by Vincent Ladeuil
Fix the fix.
3890
                                             " or specified.")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
3891
            display_url = urlutils.unescape_for_display(parent,
3892
                                                        self.outf.encoding)
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
3893
            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.
3894
                    + display_url + "\n")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
3895
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3896
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
3897
        if remote_branch.base == local_branch.base:
3898
            remote_branch = local_branch
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
3899
3900
        local_revid_range = _revision_range_to_revid_range(
3921.3.11 by Marius Kruger
swap options as per review:
3901
            _get_revision_range(my_revision, local_branch,
3921.3.9 by Marius Kruger
* add some blackbox tests and another whitebox test
3902
                self.name()))
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
3903
3904
        remote_revid_range = _revision_range_to_revid_range(
3921.3.11 by Marius Kruger
swap options as per review:
3905
            _get_revision_range(revision,
3921.3.9 by Marius Kruger
* add some blackbox tests and another whitebox test
3906
                remote_branch, self.name()))
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
3907
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3908
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3909
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
3910
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3911
            try:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3912
                local_extra, remote_extra = find_unmerged(
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
3913
                    local_branch, remote_branch, restrict,
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
3914
                    backward=not reverse,
3921.3.3 by Marius Kruger
tried to add `bzr missing -r1..-1` but failed :(
3915
                    include_merges=include_merges,
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
3916
                    local_revid_range=local_revid_range,
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3917
                    remote_revid_range=remote_revid_range)
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
3918
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3919
                if log_format is None:
3920
                    registry = log.log_formatter_registry
3921
                    log_format = registry.get_default(local_branch)
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
3922
                lf = log_format(to_file=self.outf,
3923
                                show_ids=show_ids,
3924
                                show_timezone='original')
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3925
3926
                status_code = 0
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3927
                if local_extra and not theirs_only:
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
3928
                    message("You have %d extra revision(s):\n" %
3778.5.2 by Martin Pool
review cleanups
3929
                        len(local_extra))
2485.8.13 by Vincent Ladeuil
merge bzr.dev@2495
3930
                    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.
3931
                                        local_branch.repository,
3932
                                        verbose):
3933
                        lf.log_revision(revision)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3934
                    printed_local = True
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3935
                    status_code = 1
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3936
                else:
3937
                    printed_local = False
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3938
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3939
                if remote_extra and not mine_only:
3940
                    if printed_local is True:
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
3941
                        message("\n\n\n")
3942
                    message("You are missing %d revision(s):\n" %
3778.5.2 by Martin Pool
review cleanups
3943
                        len(remote_extra))
2485.8.13 by Vincent Ladeuil
merge bzr.dev@2495
3944
                    for revision in iter_log_revisions(remote_extra,
3945
                                        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.
3946
                                        verbose):
3947
                        lf.log_revision(revision)
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3948
                    status_code = 1
3949
3950
                if mine_only and not local_extra:
3951
                    # We checked local, and found nothing extra
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
3952
                    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
3953
                elif theirs_only and not remote_extra:
3954
                    # We checked remote, and found nothing extra
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
3955
                    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
3956
                elif not (mine_only or theirs_only or local_extra or
3957
                          remote_extra):
3958
                    # We checked both branches, and neither one had extra
3959
                    # revisions
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
3960
                    message("Branches are up to date.\n")
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3961
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3962
                remote_branch.unlock()
3963
        finally:
3964
            local_branch.unlock()
3965
        if not status_code and parent is None and other_branch is not None:
3966
            local_branch.lock_write()
3967
            try:
3968
                # handle race conditions - a parent might be set while we run.
3969
                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
3970
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3971
            finally:
3972
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3973
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3974
3975
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
3976
class cmd_pack(Command):
3977
    """Compress the data within a repository."""
3978
3979
    _see_also = ['repositories']
3980
    takes_args = ['branch_or_repo?']
3981
3982
    def run(self, branch_or_repo='.'):
3983
        dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3984
        try:
3985
            branch = dir.open_branch()
3986
            repository = branch.repository
3987
        except errors.NotBranchError:
3988
            repository = dir.open_repository()
3989
        repository.pack()
3990
3991
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3992
class cmd_plugins(Command):
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
3993
    """List the installed plugins.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3994
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3995
    This command displays the list of installed plugins including
3996
    version of plugin and a short description of each.
3997
3998
    --verbose shows the path where each plugin is located.
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
3999
4000
    A plugin is an external component for Bazaar that extends the
4001
    revision control system, by adding or replacing code in Bazaar.
4002
    Plugins can do a variety of things, including overriding commands,
4003
    adding new commands, providing additional network transports and
4004
    customizing log output.
4005
4006
    See the Bazaar web site, http://bazaar-vcs.org, for further
4007
    information on plugins including where to find them and how to
4008
    install them. Instructions are also provided there on how to
4009
    write new plugins using the Python programming language.
4010
    """
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
4011
    takes_options = ['verbose']
2629.1.1 by Ian Clatworthy
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
4012
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4013
    @display_command
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
4014
    def run(self, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4015
        import bzrlib.plugin
4016
        from inspect import getdoc
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
4017
        result = []
2762.2.1 by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square
4018
        for name, plugin in bzrlib.plugin.plugins().items():
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
4019
            version = plugin.__version__
4020
            if version == 'unknown':
4021
                version = ''
4022
            name_ver = '%s %s' % (name, version)
2762.2.1 by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square
4023
            d = getdoc(plugin.module)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4024
            if d:
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
4025
                doc = d.split('\n')[0]
4026
            else:
4027
                doc = '(no description)'
4028
            result.append((name_ver, doc, plugin.path()))
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
4029
        for name_ver, doc, path in sorted(result):
4030
            print name_ver
4031
            print '   ', doc
4032
            if verbose:
4033
                print '   ', path
4034
            print
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4035
4036
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
4037
class cmd_testament(Command):
4038
    """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
4039
    takes_options = [
4040
            'revision',
4041
            Option('long', help='Produce long-format testament.'),
4042
            Option('strict',
4043
                   help='Produce a strict-format testament.')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
4044
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4045
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
4046
    def run(self, branch=u'.', revision=None, long=False, strict=False):
4047
        from bzrlib.testament import Testament, StrictTestament
4048
        if strict is True:
4049
            testament_class = StrictTestament
4050
        else:
4051
            testament_class = Testament
3530.2.1 by John Arbash Meinel
'bzr testament' should just open the branch
4052
        if branch == '.':
4053
            b = Branch.open_containing(branch)[0]
4054
        else:
4055
            b = Branch.open(branch)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
4056
        b.lock_read()
4057
        try:
4058
            if revision is None:
4059
                rev_id = b.last_revision()
4060
            else:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
4061
                rev_id = revision[0].as_revision_id(b)
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
4062
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
4063
            if long:
4064
                sys.stdout.writelines(t.as_text_lines())
4065
            else:
4066
                sys.stdout.write(t.as_short_text())
4067
        finally:
4068
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4069
4070
4071
class cmd_annotate(Command):
4072
    """Show the origin of each line in a file.
4073
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
4074
    This prints out the given file with an annotation on the left side
4075
    indicating which revision, author and date introduced the change.
4076
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4077
    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
4078
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4079
    """
4080
    # TODO: annotate directories; showing when each file was last changed
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4081
    # 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
4082
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
4083
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4084
    takes_args = ['filename']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4085
    takes_options = [Option('all', help='Show annotations on all lines.'),
4086
                     Option('long', help='Show commit date in annotations.'),
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
4087
                     'revision',
4088
                     'show-ids',
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
4089
                     ]
2593.1.1 by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations.
4090
    encoding_type = 'exact'
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4091
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4092
    @display_command
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
4093
    def run(self, filename, all=False, long=False, revision=None,
4094
            show_ids=False):
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
4095
        from bzrlib.annotate import annotate_file, annotate_file_tree
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
4096
        wt, branch, relpath = \
4097
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4098
        if wt is not None:
4099
            wt.lock_read()
4100
        else:
4101
            branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4102
        try:
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
4103
            tree = _get_one_revision_tree('annotate', revision, branch=branch)
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
4104
            if wt is not None:
4105
                file_id = wt.path2id(relpath)
4106
            else:
4107
                file_id = tree.path2id(relpath)
2561.2.1 by James Westby
Display a useful error message when annotating a non-existant file (#122656)
4108
            if file_id is None:
2561.2.2 by James Westby
Fix up with comments from Aaron.
4109
                raise errors.NotVersionedError(filename)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4110
            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.
4111
            if wt is not None and revision is None:
4112
                # If there is a tree and we're not annotating historical
4113
                # versions, annotate the working tree's content.
4114
                annotate_file_tree(wt, file_id, self.outf, long, all,
4115
                    show_ids=show_ids)
4116
            else:
4117
                annotate_file(branch, file_version, file_id, long, all, self.outf,
4118
                              show_ids=show_ids)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4119
        finally:
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
4120
            if wt is not None:
4121
                wt.unlock()
4122
            else:
4123
                branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
4124
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
4125
4126
class cmd_re_sign(Command):
4127
    """Create a digital signature for an existing revision."""
4128
    # TODO be able to replace existing ones.
4129
4130
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
4131
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
4132
    takes_options = ['revision']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4133
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
4134
    def run(self, revision_id_list=None, revision=None):
4135
        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
4136
            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
4137
        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
4138
            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)
4139
        b = WorkingTree.open_containing(u'.')[0].branch
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
4140
        b.lock_write()
4141
        try:
4142
            return self._run(b, revision_id_list, revision)
4143
        finally:
4144
            b.unlock()
4145
4146
    def _run(self, b, revision_id_list, revision):
4147
        import bzrlib.gpg as gpg
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
4148
        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
4149
        if revision_id_list is not None:
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
4150
            b.repository.start_write_group()
4151
            try:
4152
                for revision_id in revision_id_list:
4153
                    b.repository.sign_revision(revision_id, gpg_strategy)
4154
            except:
4155
                b.repository.abort_write_group()
4156
                raise
4157
            else:
4158
                b.repository.commit_write_group()
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
4159
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
4160
            if len(revision) == 1:
4161
                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.
4162
                b.repository.start_write_group()
4163
                try:
4164
                    b.repository.sign_revision(rev_id, gpg_strategy)
4165
                except:
4166
                    b.repository.abort_write_group()
4167
                    raise
4168
                else:
4169
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
4170
            elif len(revision) == 2:
4171
                # are they both on rh- if so we can walk between them
4172
                # might be nice to have a range helper for arbitrary
4173
                # revision paths. hmm.
4174
                from_revno, from_revid = revision[0].in_history(b)
4175
                to_revno, to_revid = revision[1].in_history(b)
4176
                if to_revid is None:
4177
                    to_revno = b.revno()
4178
                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
4179
                    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.
4180
                b.repository.start_write_group()
4181
                try:
4182
                    for revno in range(from_revno, to_revno + 1):
4183
                        b.repository.sign_revision(b.get_rev_id(revno),
4184
                                                   gpg_strategy)
4185
                except:
4186
                    b.repository.abort_write_group()
4187
                    raise
4188
                else:
4189
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
4190
            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
4191
                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.
4192
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
4193
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4194
class cmd_bind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
4195
    """Convert the current branch into a checkout of the supplied branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4196
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
4197
    Once converted into a checkout, commits must succeed on the master branch
4198
    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.
4199
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
4200
    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.
4201
    locally, in which case binding will update the the local nickname to be
4202
    that of the master.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4203
    """
4204
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4205
    _see_also = ['checkouts', 'unbind']
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
4206
    takes_args = ['location?']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4207
    takes_options = []
4208
4209
    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
4210
        b, relpath = Branch.open_containing(u'.')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
4211
        if location is None:
4212
            try:
4213
                location = b.get_old_bound_location()
4214
            except errors.UpgradeRequired:
4215
                raise errors.BzrCommandError('No location supplied.  '
4216
                    'This format does not remember old locations.')
4217
            else:
4218
                if location is None:
2230.3.45 by Aaron Bentley
Change error message (mpool)
4219
                    raise errors.BzrCommandError('No location supplied and no '
4220
                        'previous location known')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4221
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
4222
        try:
4223
            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
4224
        except errors.DivergedBranches:
4225
            raise errors.BzrCommandError('These branches have diverged.'
4226
                                         ' Try merging, and then bind again.')
3565.6.11 by Marius Kruger
Bind now updates explicit nicks
4227
        if b.get_config().has_explicit_nickname():
4228
            b.nick = b_other.nick
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4229
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
4230
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4231
class cmd_unbind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
4232
    """Convert the current checkout into a regular branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4233
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
4234
    After unbinding, the local branch is considered independent and subsequent
4235
    commits will be local only.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4236
    """
4237
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4238
    _see_also = ['checkouts', 'bind']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4239
    takes_args = []
4240
    takes_options = []
4241
4242
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
4243
        b, relpath = Branch.open_containing(u'.')
4244
        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
4245
            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
4246
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
4247
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
4248
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4249
    """Remove the last committed revision.
4250
4251
    --verbose will print out what is being removed.
4252
    --dry-run will go through all the motions, but not actually
4253
    remove anything.
2747.2.1 by Daniel Watkins
Modified the help message of 'uncommit'.
4254
4255
    If --revision is specified, uncommit revisions to leave the branch at the
4256
    specified revision.  For example, "bzr uncommit -r 15" will leave the
4257
    branch at revision 15.
4258
1551.19.39 by Aaron Bentley
Update 'uncommit' docs
4259
    Uncommit leaves the working tree ready for a new commit.  The only change
4260
    it may make is to restore any pending merges that were present before
4261
    the commit.
1553.5.34 by Martin Pool
Stub lock-breaking command
4262
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
4263
1553.5.34 by Martin Pool
Stub lock-breaking command
4264
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
4265
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
4266
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
4267
    # information in shared branches as well.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4268
    _see_also = ['commit']
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
4269
    takes_options = ['verbose', 'revision',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4270
                    Option('dry-run', help='Don\'t actually make changes.'),
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4271
                    Option('force', help='Say yes to all questions.'),
4272
                    Option('local',
4273
                           help="Only remove the commits from the local branch"
4274
                                " when in a checkout."
4275
                           ),
4276
                    ]
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4277
    takes_args = ['location?']
4278
    aliases = []
3101.1.1 by Aaron Bentley
Uncommit doesn't throw when it encounters un-encodable characters
4279
    encoding_type = 'replace'
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4280
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
4281
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4282
            dry_run=False, verbose=False,
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4283
            revision=None, force=False, local=False):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4284
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
4285
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
4286
        control, relpath = bzrdir.BzrDir.open_containing(location)
4287
        try:
4288
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
4289
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
4290
        except (errors.NoWorkingTree, errors.NotLocalUrl):
4291
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
4292
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4293
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
4294
        if tree is not None:
4295
            tree.lock_write()
4296
        else:
4297
            b.lock_write()
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
4298
        try:
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4299
            return self._run(b, tree, dry_run, verbose, revision, force,
4300
                             local=local)
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
4301
        finally:
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
4302
            if tree is not None:
4303
                tree.unlock()
4304
            else:
4305
                b.unlock()
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
4306
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4307
    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.
4308
        from bzrlib.log import log_formatter, show_log
4309
        from bzrlib.uncommit import uncommit
4310
4311
        last_revno, last_rev_id = b.last_revision_info()
4312
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
4313
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4314
        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.
4315
            revno = last_revno
4316
            rev_id = last_rev_id
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4317
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
4318
            # 'bzr uncommit -r 10' actually means uncommit
4319
            # so that the final tree is at revno 10.
4320
            # but bzrlib.uncommit.uncommit() actually uncommits
4321
            # the revisions that are supplied.
4322
            # 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.
4323
            revno = revision[0].in_history(b).revno + 1
4324
            if revno <= last_revno:
4325
                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
4326
2948.2.2 by John Arbash Meinel
Re-introduce the None check in case someone asks to uncommit *to* the last revision
4327
        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
4328
            self.outf.write('No revisions to uncommit.\n')
4329
            return 1
4330
4331
        lf = log_formatter('short',
4332
                           to_file=self.outf,
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
4333
                           show_timezone='original')
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
4334
4335
        show_log(b,
4336
                 lf,
4337
                 verbose=False,
4338
                 direction='forward',
4339
                 start_revision=revno,
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
4340
                 end_revision=last_revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4341
4342
        if dry_run:
4343
            print 'Dry-run, pretending to remove the above revisions.'
4344
            if not force:
4345
                val = raw_input('Press <enter> to continue')
4346
        else:
4347
            print 'The above revision(s) will be removed.'
4348
            if not force:
4349
                val = raw_input('Are you sure [y/N]? ')
4350
                if val.lower() not in ('y', 'yes'):
4351
                    print 'Canceled'
4352
                    return 0
4353
3629.1.1 by John Arbash Meinel
Change 'bzr uncommit' to display the revision ids and log them.
4354
        mutter('Uncommitting from {%s} to {%s}',
4355
               last_rev_id, rev_id)
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
4356
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4357
                 revno=revno, local=local)
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
4358
        note('You can restore the old tip by running:\n'
4359
             '  bzr pull . -r revid:%s', last_rev_id)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4360
4361
1553.5.34 by Martin Pool
Stub lock-breaking command
4362
class cmd_break_lock(Command):
4363
    """Break a dead lock on a repository, branch or working directory.
4364
1553.5.35 by Martin Pool
Start break-lock --show
4365
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
4366
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
4367
4368
    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
4369
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4370
    :Examples:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
4371
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
4372
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
4373
    takes_args = ['location?']
4374
4375
    def run(self, location=None, show=False):
4376
        if location is None:
4377
            location = u'.'
4378
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
4379
        try:
4380
            control.break_lock()
4381
        except NotImplementedError:
4382
            pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4383
1553.5.35 by Martin Pool
Start break-lock --show
4384
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
4385
class cmd_wait_until_signalled(Command):
4386
    """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4387
4388
    This just prints a line to signal when it is ready, then blocks on stdin.
4389
    """
4390
4391
    hidden = True
4392
4393
    def run(self):
1910.17.6 by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print.
4394
        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
4395
        sys.stdout.flush()
4396
        sys.stdin.readline()
4397
1553.5.35 by Martin Pool
Start break-lock --show
4398
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4399
class cmd_serve(Command):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
4400
    """Run the bzr server."""
4401
4402
    aliases = ['server']
4403
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4404
    takes_options = [
4405
        Option('inet',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4406
               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
4407
        Option('port',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4408
               help='Listen for connections on nominated port of the form '
4409
                    '[hostname:]portnumber.  Passing 0 as the port number will '
4410
                    'result in a dynamically allocated port.  The default port is '
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
4411
                    '4155.',
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
4412
               type=str),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4413
        Option('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4414
               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
4415
               type=unicode),
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
4416
        Option('allow-writes',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4417
               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`.
4418
                    '--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
4419
                    'the served directory and below.'
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
4420
                ),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4421
        ]
4422
3955.1.3 by Jonathan Lange
Rename run_server to run_smart_server.
4423
    def run_smart_server(self, smart_server):
3955.1.1 by Jonathan Lange
Extract the bit of run() that runs the server.
4424
        """Run 'smart_server' forever, with no UI output at all."""
4425
        # For the duration of this server, no UI output is permitted. note
4426
        # that this may cause problems with blackbox tests. This should be
4427
        # changed with care though, as we dont want to use bandwidth sending
4428
        # progress over stderr to smart server clients!
4429
        from bzrlib import lockdir
4430
        old_factory = ui.ui_factory
4431
        old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4432
        try:
4433
            ui.ui_factory = ui.SilentUIFactory()
4434
            lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4435
            smart_server.serve()
4436
        finally:
4437
            ui.ui_factory = old_factory
4438
            lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4439
3955.1.4 by Jonathan Lange
Docstrings and extraction of method to get the smart server.
4440
    def get_host_and_port(self, port):
4441
        """Return the host and port to run the smart server on.
4442
4443
        If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4444
        and port (`medium.BZR_DEFAULT_PORT`) will be used.
4445
4446
        If 'port' has a colon in it, the string before the colon will be
4447
        interpreted as the host.
4448
4449
        :param port: A string of the port to run the server on.
4450
        :return: A tuple of (host, port), where 'host' is a host name or IP,
4451
            and port is an integer TCP/IP port.
4452
        """
3955.1.2 by Jonathan Lange
Extract the port-getting logic. Use note() rather than print()
4453
        from bzrlib.smart import medium
4454
        host = medium.BZR_DEFAULT_INTERFACE
4455
        if port is None:
4456
            port = medium.BZR_DEFAULT_PORT
4457
        else:
4458
            if ':' in port:
4459
                host, port = port.split(':')
4460
            port = int(port)
4461
        return host, port
4462
3955.1.4 by Jonathan Lange
Docstrings and extraction of method to get the smart server.
4463
    def get_smart_server(self, transport, inet, port):
4464
        """Construct a smart server.
4465
4466
        :param transport: The base transport from which branches will be
4467
            served.
4468
        :param inet: If True, serve over stdin and stdout. Used for running
4469
            from inet.
4470
        :param port: The port to listen on. By default, it's `
4471
            medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4472
            information.
4473
        :return: A smart server.
4474
        """
4475
        from bzrlib.smart import medium, server
4476
        if inet:
4477
            smart_server = medium.SmartServerPipeStreamMedium(
3955.1.6 by Jonathan Lange
Fix up a couple of dumb errors.
4478
                sys.stdin, sys.stdout, transport)
3955.1.4 by Jonathan Lange
Docstrings and extraction of method to get the smart server.
4479
        else:
4480
            host, port = self.get_host_and_port(port)
3955.1.6 by Jonathan Lange
Fix up a couple of dumb errors.
4481
            smart_server = server.SmartTCPServer(
4482
                transport, host=host, port=port)
3955.1.4 by Jonathan Lange
Docstrings and extraction of method to get the smart server.
4483
            note('listening on port: %s' % smart_server.port)
3955.1.6 by Jonathan Lange
Fix up a couple of dumb errors.
4484
        return smart_server
3955.1.4 by Jonathan Lange
Docstrings and extraction of method to get the smart server.
4485
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
4486
    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
4487
        from bzrlib.transport import get_transport
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
4488
        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
4489
        if directory is None:
4490
            directory = os.getcwd()
2044.2.1 by Lukáš Lalinský
Use urlutils.local_path_to_url to get an URL from the directory path.
4491
        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`.
4492
        if not allow_writes:
4493
            url = 'readonly+' + url
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
4494
        chroot_server = ChrootServer(get_transport(url))
4495
        chroot_server.setUp()
4496
        t = get_transport(chroot_server.get_url())
3955.1.4 by Jonathan Lange
Docstrings and extraction of method to get the smart server.
4497
        smart_server = self.get_smart_server(t, inet, port)
3955.1.3 by Jonathan Lange
Rename run_server to run_smart_server.
4498
        self.run_smart_server(smart_server)
1752.2.12 by Martin Pool
New 'bzr serve --inet' runs souk server.
4499
3955.1.2 by Jonathan Lange
Extract the port-getting logic. Use note() rather than print()
4500
1731.2.7 by Aaron Bentley
Add join command
4501
class cmd_join(Command):
4502
    """Combine a subtree into its containing tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4503
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
4504
    This command is for experimental use only.  It requires the target tree
4505
    to be in dirstate-with-subtree format, which cannot be converted into
4506
    earlier formats.
4507
4508
    The TREE argument should be an independent tree, inside another tree, but
4509
    not part of it.  (Such trees can be produced by "bzr split", but also by
4510
    running "bzr branch" with the target inside a tree.)
4511
4512
    The result is a combined tree, with the subtree no longer an independant
4513
    part.  This is marked as a merge of the subtree into the containing tree,
4514
    and all history is preserved.
4515
4516
    If --reference is specified, the subtree retains its independence.  It can
4517
    be branched by itself, and can be part of multiple projects at the same
4518
    time.  But operations performed in the containing tree, such as commit
4519
    and merge, will recurse into the subtree.
1731.2.7 by Aaron Bentley
Add join command
4520
    """
4521
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4522
    _see_also = ['split']
1731.2.7 by Aaron Bentley
Add join command
4523
    takes_args = ['tree']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4524
    takes_options = [
4525
            Option('reference', help='Join by reference.'),
4526
            ]
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
4527
    hidden = True
1731.2.7 by Aaron Bentley
Add join command
4528
2100.3.11 by Aaron Bentley
Add join --reference support
4529
    def run(self, tree, reference=False):
1731.2.7 by Aaron Bentley
Add join command
4530
        sub_tree = WorkingTree.open(tree)
4531
        parent_dir = osutils.dirname(sub_tree.basedir)
4532
        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
4533
        repo = containing_tree.branch.repository
4534
        if not repo.supports_rich_root():
4535
            raise errors.BzrCommandError(
4536
                "Can't join trees because %s doesn't support rich root data.\n"
4537
                "You can use bzr upgrade on the repository."
4538
                % (repo,))
2100.3.11 by Aaron Bentley
Add join --reference support
4539
        if reference:
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
4540
            try:
2100.3.11 by Aaron Bentley
Add join --reference support
4541
                containing_tree.add_reference(sub_tree)
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
4542
            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
4543
                # XXX: Would be better to just raise a nicely printable
4544
                # exception from the real origin.  Also below.  mbp 20070306
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
4545
                raise errors.BzrCommandError("Cannot join %s.  %s" %
2100.3.11 by Aaron Bentley
Add join --reference support
4546
                                             (tree, e.reason))
4547
        else:
4548
            try:
4549
                containing_tree.subsume(sub_tree)
4550
            except errors.BadSubsumeSource, e:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4551
                raise errors.BzrCommandError("Cannot join %s.  %s" %
2100.3.11 by Aaron Bentley
Add join --reference support
4552
                                             (tree, e.reason))
1553.5.35 by Martin Pool
Start break-lock --show
4553
1731.2.22 by Aaron Bentley
Initial work on split command
4554
4555
class cmd_split(Command):
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
4556
    """Split a subdirectory of a tree into a separate tree.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
4557
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
4558
    This command will produce a target tree in a format that supports
4559
    rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be
4560
    converted into earlier formats like 'dirstate-tags'.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
4561
4562
    The TREE argument should be a subdirectory of a working tree.  That
4563
    subdirectory will be converted into an independent tree, with its own
4564
    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
4565
    """
4566
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
4567
    # join is not un-hidden yet
4568
    #_see_also = ['join']
1731.2.22 by Aaron Bentley
Initial work on split command
4569
    takes_args = ['tree']
4570
4571
    def run(self, tree):
4572
        containing_tree, subdir = WorkingTree.open_containing(tree)
4573
        sub_id = containing_tree.path2id(subdir)
4574
        if sub_id is None:
4575
            raise errors.NotVersionedError(subdir)
1731.2.23 by Aaron Bentley
Throw user-friendly error splitting in shared repo with wrong format
4576
        try:
4577
            containing_tree.extract(sub_id)
4578
        except errors.RootNotRich:
4579
            raise errors.UpgradeRequired(containing_tree.branch.base)
1731.2.22 by Aaron Bentley
Initial work on split command
4580
4581
1551.12.8 by Aaron Bentley
Add merge-directive command
4582
class cmd_merge_directive(Command):
1551.12.32 by Aaron Bentley
Improve merge directive help
4583
    """Generate a merge directive for auto-merge tools.
4584
4585
    A directive requests a merge to be performed, and also provides all the
4586
    information necessary to do so.  This means it must either include a
4587
    revision bundle, or the location of a branch containing the desired
4588
    revision.
4589
4590
    A submit branch (the location to merge into) must be supplied the first
4591
    time the command is issued.  After it has been supplied once, it will
4592
    be remembered as the default.
4593
4594
    A public branch is optional if a revision bundle is supplied, but required
4595
    if --diff or --plain is specified.  It will be remembered as the default
4596
    after the first use.
4597
    """
1551.12.20 by Aaron Bentley
Pull directive registry into command class
4598
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4599
    takes_args = ['submit_branch?', 'public_branch?']
4600
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4601
    hidden = True
4602
2681.1.4 by Aaron Bentley
Fix reference to told submit command
4603
    _see_also = ['send']
2520.4.121 by Aaron Bentley
Polish up submit command
4604
1551.12.43 by Aaron Bentley
Misc changes from review
4605
    takes_options = [
4606
        RegistryOption.from_kwargs('patch-type',
2681.1.7 by Aaron Bentley
Fix option grammar
4607
            '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
4608
            title='Patch type',
4609
            value_switches=True,
4610
            enum_switch=False,
4611
            bundle='Bazaar revision bundle (default).',
4612
            diff='Normal unified diff.',
4613
            plain='No patch, just directive.'),
4614
        Option('sign', help='GPG-sign the directive.'), 'revision',
1551.12.26 by Aaron Bentley
Get email working, with optional message
4615
        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
4616
            help='Instead of printing the directive, email to this address.'),
1551.12.27 by Aaron Bentley
support custom message everywhere
4617
        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
4618
            help='Message to use when committing this merge.')
1551.12.27 by Aaron Bentley
support custom message everywhere
4619
        ]
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4620
2530.2.1 by Adeodato Simó
Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
4621
    encoding_type = 'exact'
4622
1551.12.16 by Aaron Bentley
Enable signing merge directives
4623
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
1551.12.27 by Aaron Bentley
support custom message everywhere
4624
            sign=False, revision=None, mail_to=None, message=None):
2490.2.28 by Aaron Bentley
Fix handling of null revision
4625
        from bzrlib.revision import ensure_null, NULL_REVISION
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4626
        include_patch, include_bundle = {
4627
            'plain': (False, False),
4628
            'diff': (True, False),
4629
            'bundle': (True, True),
4630
            }[patch_type]
1551.12.8 by Aaron Bentley
Add merge-directive command
4631
        branch = Branch.open('.')
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4632
        stored_submit_branch = branch.get_submit_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4633
        if submit_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4634
            submit_branch = stored_submit_branch
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4635
        else:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4636
            if stored_submit_branch is None:
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4637
                branch.set_submit_branch(submit_branch)
4638
        if submit_branch is None:
4639
            submit_branch = branch.get_parent()
4640
        if submit_branch is None:
4641
            raise errors.BzrCommandError('No submit branch specified or known')
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4642
4643
        stored_public_branch = branch.get_public_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4644
        if public_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4645
            public_branch = stored_public_branch
4646
        elif stored_public_branch is None:
4647
            branch.set_public_branch(public_branch)
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4648
        if not include_bundle and public_branch is None:
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
4649
            raise errors.BzrCommandError('No public branch specified or'
4650
                                         ' known')
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4651
        base_revision_id = None
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4652
        if revision is not None:
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4653
            if len(revision) > 2:
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4654
                raise errors.BzrCommandError('bzr merge-directive takes '
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4655
                    '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()
4656
            revision_id = revision[-1].as_revision_id(branch)
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4657
            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()
4658
                base_revision_id = revision[0].as_revision_id(branch)
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4659
        else:
4660
            revision_id = branch.last_revision()
2490.2.28 by Aaron Bentley
Fix handling of null revision
4661
        revision_id = ensure_null(revision_id)
4662
        if revision_id == NULL_REVISION:
4663
            raise errors.BzrCommandError('No revisions to bundle.')
2520.4.73 by Aaron Bentley
Implement new merge directive format
4664
        directive = merge_directive.MergeDirective2.from_objects(
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4665
            branch.repository, revision_id, time.time(),
1551.12.8 by Aaron Bentley
Add merge-directive command
4666
            osutils.local_time_offset(), submit_branch,
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4667
            public_branch=public_branch, include_patch=include_patch,
4668
            include_bundle=include_bundle, message=message,
4669
            base_revision_id=base_revision_id)
1551.12.26 by Aaron Bentley
Get email working, with optional message
4670
        if mail_to is None:
4671
            if sign:
4672
                self.outf.write(directive.to_signed(branch))
4673
            else:
4674
                self.outf.writelines(directive.to_lines())
1551.12.16 by Aaron Bentley
Enable signing merge directives
4675
        else:
1551.12.26 by Aaron Bentley
Get email working, with optional message
4676
            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.
4677
            s = SMTPConnection(branch.get_config())
4678
            s.send_email(message)
1551.12.8 by Aaron Bentley
Add merge-directive command
4679
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4680
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4681
class cmd_send(Command):
3825.6.6 by Karl Fogel
* bzr/bzr.dev/bzrlib/builtins.py
4682
    """Mail or create a merge-directive for submitting changes.
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4683
4684
    A merge directive provides many things needed for requesting merges:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4685
4686
    * A machine-readable description of the merge to perform
4687
4688
    * An optional patch that is a preview of the changes requested
4689
4690
    * 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
4691
      directly from the merge directive, without retrieving data from a
4692
      branch.
4693
4694
    If --no-bundle is specified, then public_branch is needed (and must be
4695
    up-to-date), so that the receiver can perform the merge using the
4696
    public_branch.  The public_branch is always included if known, so that
4697
    people can check it later.
4698
4699
    The submit branch defaults to the parent, but can be overridden.  Both
4700
    submit branch and public branch will be remembered if supplied.
4701
4702
    If a public_branch is known for the submit_branch, that public submit
4703
    branch is used in the merge instructions.  This means that a local mirror
2520.4.122 by Aaron Bentley
Clarify doc
4704
    can be used as your actual submit branch, once you have set public_branch
4705
    for that mirror.
2681.1.6 by Aaron Bentley
Update help to describe available formats
4706
2681.1.30 by Aaron Bentley
Update NEWS and docs
4707
    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
4708
    on Windows (it uses MAPI).  On Linux, it requires the xdg-email utility.
4709
    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
4710
2681.1.30 by Aaron Bentley
Update NEWS and docs
4711
    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.
4712
    (For Thunderbird 1.5, this works around some bugs.)  Supported values for
3921.2.8 by Aaron Bentley
Update docs
4713
    specific clients are "claws", "evolution", "kmail", "mutt", and
4714
    "thunderbird"; generic options are "default", "editor", "emacsclient",
4715
    "mapi", and "xdg-email".  Plugins may also add supported clients.
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4716
4717
    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
4718
    either on the commandline, by setting the submit_to configuration
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4719
    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
4720
    in the submit branch.
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4721
2681.1.6 by Aaron Bentley
Update help to describe available formats
4722
    Two formats are currently supported: "4" uses revision bundle format 4 and
4723
    merge directive format 2.  It is significantly faster and smaller than
4724
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
4725
    default.  "0.9" uses revision bundle format 0.9 and merge directive
4726
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4727
4095.2.1 by Neil Martinsen-Burrell
Better help for bzr send
4728
    The merge directives created by bzr send may be applied using bzr merge or
4729
    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
4730
    """
4731
4732
    encoding_type = 'exact'
4733
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
4734
    _see_also = ['merge', 'pull']
2520.4.121 by Aaron Bentley
Polish up submit command
4735
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4736
    takes_args = ['submit_branch?', 'public_branch?']
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4737
2520.4.121 by Aaron Bentley
Polish up submit command
4738
    takes_options = [
4739
        Option('no-bundle',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4740
               help='Do not include a bundle in the merge directive.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4741
        Option('no-patch', help='Do not include a preview patch in the merge'
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4742
               ' directive.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4743
        Option('remember',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4744
               help='Remember submit and public branch.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4745
        Option('from',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4746
               help='Branch to generate the submission from, '
4747
               'rather than the one containing the working directory.',
2520.4.121 by Aaron Bentley
Polish up submit command
4748
               short_name='f',
4749
               type=unicode),
3377.2.1 by Martin Pool
doc: send -o, and more on send in user guide
4750
        Option('output', short_name='o',
3377.2.2 by Martin Pool
Say 'merge directive' rather than just 'directive' in help
4751
               help='Write merge directive to this file; '
3377.2.1 by Martin Pool
doc: send -o, and more on send in user guide
4752
                    'use - for stdout.',
2520.4.121 by Aaron Bentley
Polish up submit command
4753
               type=unicode),
2681.1.32 by Aaron Bentley
Fix option grammar
4754
        Option('mail-to', help='Mail the request to this address.',
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4755
               type=unicode),
2520.4.121 by Aaron Bentley
Polish up submit command
4756
        'revision',
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4757
        'message',
4098.5.2 by Aaron Bentley
Push body support through bzr send.
4758
        Option('body', help='Body for the email.', type=unicode),
2681.1.7 by Aaron Bentley
Fix option grammar
4759
        RegistryOption.from_kwargs('format',
4760
        'Use the specified output format.',
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4761
        **{'4': 'Bundle format 4, Merge Directive 2 (default)',
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
4762
           '0.9': 'Bundle format 0.9, Merge Directive 1',})
2520.4.121 by Aaron Bentley
Polish up submit command
4763
        ]
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4764
4765
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
2520.4.121 by Aaron Bentley
Polish up submit command
4766
            no_patch=False, revision=None, remember=False, output=None,
4098.5.2 by Aaron Bentley
Push body support through bzr send.
4767
            format='4', mail_to=None, message=None, body=None, **kwargs):
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4768
        return self._run(submit_branch, revision, public_branch, remember,
4769
                         format, no_bundle, no_patch, output,
4098.5.2 by Aaron Bentley
Push body support through bzr send.
4770
                         kwargs.get('from', '.'), mail_to, message, body)
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4771
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4772
    def _run(self, submit_branch, revision, public_branch, remember, format,
4098.5.2 by Aaron Bentley
Push body support through bzr send.
4773
             no_bundle, no_patch, output, from_, mail_to, message, body):
2872.2.1 by Andrew Bennetts
Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
4774
        from bzrlib.revision import NULL_REVISION
3060.2.1 by Lukáš Lalinský
Fix misplaced branch lock in cmd_send.
4775
        branch = Branch.open_containing(from_)[0]
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
4776
        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.
4777
            outfile = cStringIO.StringIO()
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
4778
        elif output == '-':
2520.4.121 by Aaron Bentley
Polish up submit command
4779
            outfile = self.outf
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4780
        else:
2520.4.121 by Aaron Bentley
Polish up submit command
4781
            outfile = open(output, 'wb')
3060.2.1 by Lukáš Lalinský
Fix misplaced branch lock in cmd_send.
4782
        # we may need to write data into branch's repository to calculate
4783
        # the data to send.
4784
        branch.lock_write()
2520.4.121 by Aaron Bentley
Polish up submit command
4785
        try:
2681.1.10 by Aaron Bentley
Clean up handling of unknown mail clients
4786
            if output is None:
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4787
                config = branch.get_config()
4788
                if mail_to is None:
4789
                    mail_to = config.get_user_option('submit_to')
4790
                mail_client = config.get_mail_client()
4098.5.4 by Aaron Bentley
Cleaner support for mail clients lacking body support.
4791
                if (not getattr(mail_client, 'supports_body', False)
4792
                    and body is not None):
4793
                    raise errors.BzrCommandError(
4794
                        'Mail client "%s" does not support specifying body' %
4795
                        mail_client.__class__.__name__)
2520.4.121 by Aaron Bentley
Polish up submit command
4796
            if remember and submit_branch is None:
4797
                raise errors.BzrCommandError(
4798
                    '--remember requires a branch to be specified.')
4799
            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.
4800
            remembered_submit_branch = None
2520.4.121 by Aaron Bentley
Polish up submit command
4801
            if submit_branch is None:
4802
                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.
4803
                remembered_submit_branch = "submit"
2520.4.121 by Aaron Bentley
Polish up submit command
4804
            else:
4805
                if stored_submit_branch is None or remember:
4806
                    branch.set_submit_branch(submit_branch)
4807
            if submit_branch is None:
4808
                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.
4809
                remembered_submit_branch = "parent"
2520.4.121 by Aaron Bentley
Polish up submit command
4810
            if submit_branch is None:
4811
                raise errors.BzrCommandError('No submit branch known or'
4812
                                             ' specified')
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
4813
            if remembered_submit_branch is not None:
4814
                note('Using saved %s location "%s" to determine what '
4815
                        'changes to submit.', remembered_submit_branch,
4816
                        submit_branch)
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4817
3251.1.2 by Jelmer Vernooij
``bzr send`` now supports new ``child_submit_to`` option in the submit branch
4818
            if mail_to is None:
3251.1.3 by Jelmer Vernooij
Fix formatting.
4819
                submit_config = Branch.open(submit_branch).get_config()
4820
                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
4821
2520.4.121 by Aaron Bentley
Polish up submit command
4822
            stored_public_branch = branch.get_public_branch()
4823
            if public_branch is None:
4824
                public_branch = stored_public_branch
4825
            elif stored_public_branch is None or remember:
4826
                branch.set_public_branch(public_branch)
4827
            if no_bundle and public_branch is None:
4828
                raise errors.BzrCommandError('No public branch specified or'
4829
                                             ' known')
4830
            base_revision_id = None
2747.3.1 by Aaron Bentley
'send' and 'bundle' now handle partial ranges correctly (#61685)
4831
            revision_id = None
2520.4.121 by Aaron Bentley
Polish up submit command
4832
            if revision is not None:
4833
                if len(revision) > 2:
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4834
                    raise errors.BzrCommandError('bzr send takes '
2520.4.121 by Aaron Bentley
Polish up submit command
4835
                        '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()
4836
                revision_id = revision[-1].as_revision_id(branch)
2520.4.121 by Aaron Bentley
Polish up submit command
4837
                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()
4838
                    base_revision_id = revision[0].as_revision_id(branch)
2747.3.1 by Aaron Bentley
'send' and 'bundle' now handle partial ranges correctly (#61685)
4839
            if revision_id is None:
2520.4.121 by Aaron Bentley
Polish up submit command
4840
                revision_id = branch.last_revision()
4841
            if revision_id == NULL_REVISION:
4842
                raise errors.BzrCommandError('No revisions to submit.')
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4843
            if format == '4':
4844
                directive = merge_directive.MergeDirective2.from_objects(
4845
                    branch.repository, revision_id, time.time(),
4846
                    osutils.local_time_offset(), submit_branch,
4847
                    public_branch=public_branch, include_patch=not no_patch,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4848
                    include_bundle=not no_bundle, message=message,
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4849
                    base_revision_id=base_revision_id)
4850
            elif format == '0.9':
4851
                if not no_bundle:
4852
                    if not no_patch:
4853
                        patch_type = 'bundle'
4854
                    else:
4855
                        raise errors.BzrCommandError('Format 0.9 does not'
4856
                            ' permit bundle with no patch')
4857
                else:
4858
                    if not no_patch:
4859
                        patch_type = 'diff'
4860
                    else:
4861
                        patch_type = None
4862
                directive = merge_directive.MergeDirective.from_objects(
4863
                    branch.repository, revision_id, time.time(),
4864
                    osutils.local_time_offset(), submit_branch,
4865
                    public_branch=public_branch, patch_type=patch_type,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4866
                    message=message)
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4867
2520.4.121 by Aaron Bentley
Polish up submit command
4868
            outfile.writelines(directive.to_lines())
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
4869
            if output is None:
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4870
                subject = '[MERGE] '
4871
                if message is not None:
4872
                    subject += message
4873
                else:
4874
                    revision = branch.repository.get_revision(revision_id)
2681.3.5 by Lukáš Lalinsky
Don't send e-mails with multi-line subjects.
4875
                    subject += revision.get_summary()
3251.2.1 by Aaron Bentley
Use nick/revno-based names for merge directives
4876
                basename = directive.get_disk_name(branch)
2681.1.11 by Aaron Bentley
Add docstrings, add compose_merge_request
4877
                mail_client.compose_merge_request(mail_to, subject,
4098.5.2 by Aaron Bentley
Push body support through bzr send.
4878
                                                  outfile.getvalue(),
4879
                                                  basename, body)
2520.4.121 by Aaron Bentley
Polish up submit command
4880
        finally:
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4881
            if output != '-':
2520.4.121 by Aaron Bentley
Polish up submit command
4882
                outfile.close()
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
4883
            branch.unlock()
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4884
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4885
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4886
class cmd_bundle_revisions(cmd_send):
4887
3825.6.6 by Karl Fogel
* bzr/bzr.dev/bzrlib/builtins.py
4888
    """Create a merge-directive for submitting changes.
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4889
4890
    A merge directive provides many things needed for requesting merges:
4891
4892
    * A machine-readable description of the merge to perform
4893
4894
    * An optional patch that is a preview of the changes requested
4895
4896
    * An optional bundle of revision data, so that the changes can be applied
4897
      directly from the merge directive, without retrieving data from a
4898
      branch.
4899
4900
    If --no-bundle is specified, then public_branch is needed (and must be
4901
    up-to-date), so that the receiver can perform the merge using the
4902
    public_branch.  The public_branch is always included if known, so that
4903
    people can check it later.
4904
4905
    The submit branch defaults to the parent, but can be overridden.  Both
4906
    submit branch and public branch will be remembered if supplied.
4907
4908
    If a public_branch is known for the submit_branch, that public submit
4909
    branch is used in the merge instructions.  This means that a local mirror
4910
    can be used as your actual submit branch, once you have set public_branch
4911
    for that mirror.
2681.1.6 by Aaron Bentley
Update help to describe available formats
4912
4913
    Two formats are currently supported: "4" uses revision bundle format 4 and
4914
    merge directive format 2.  It is significantly faster and smaller than
4915
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
4916
    default.  "0.9" uses revision bundle format 0.9 and merge directive
4917
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4918
    """
4919
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4920
    takes_options = [
4921
        Option('no-bundle',
4922
               help='Do not include a bundle in the merge directive.'),
4923
        Option('no-patch', help='Do not include a preview patch in the merge'
4924
               ' directive.'),
4925
        Option('remember',
4926
               help='Remember submit and public branch.'),
4927
        Option('from',
4928
               help='Branch to generate the submission from, '
4929
               'rather than the one containing the working directory.',
4930
               short_name='f',
4931
               type=unicode),
4932
        Option('output', short_name='o', help='Write directive to this file.',
4933
               type=unicode),
4934
        'revision',
4935
        RegistryOption.from_kwargs('format',
4936
        'Use the specified output format.',
4937
        **{'4': 'Bundle format 4, Merge Directive 2 (default)',
4938
           '0.9': 'Bundle format 0.9, Merge Directive 1',})
4939
        ]
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4940
    aliases = ['bundle']
4941
4942
    _see_also = ['send', 'merge']
4943
4944
    hidden = True
4945
4946
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4947
            no_patch=False, revision=None, remember=False, output=None,
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4948
            format='4', **kwargs):
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4949
        if output is None:
4950
            output = '-'
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4951
        return self._run(submit_branch, revision, public_branch, remember,
4952
                         format, no_bundle, no_patch, output,
4098.5.7 by Aaron Bentley
Fix bundle-revisions after adjusting cmd_send._run
4953
                         kwargs.get('from', '.'), None, None, None)
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4954
4955
2220.2.2 by Martin Pool
Add tag command and basic implementation
4956
class cmd_tag(Command):
2664.1.1 by Joachim Nilsson
Change tag description for "help commands" to make it easier to find
4957
    """Create, remove or modify a tag naming a revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4958
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4959
    Tags give human-meaningful names to revisions.  Commands that take a -r
4960
    (--revision) option can be given -rtag:X, where X is any previously
4961
    created tag.
4962
2220.2.41 by Martin Pool
Fix tag help (fullermd)
4963
    Tags are stored in the branch.  Tags are copied from one branch to another
4964
    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.
4965
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4966
    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.
4967
    --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
4968
3566.2.2 by Benjamin Peterson
fix markup
4969
    To rename a tag (change the name but keep it on the same revsion), run ``bzr
4970
    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.
4971
    """
2220.2.2 by Martin Pool
Add tag command and basic implementation
4972
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4973
    _see_also = ['commit', 'tags']
2220.2.2 by Martin Pool
Add tag command and basic implementation
4974
    takes_args = ['tag_name']
4975
    takes_options = [
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4976
        Option('delete',
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4977
            help='Delete this tag rather than placing it.',
4978
            ),
4979
        Option('directory',
4980
            help='Branch in which to place the tag.',
4981
            short_name='d',
4982
            type=unicode,
4983
            ),
4984
        Option('force',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4985
            help='Replace existing tags.',
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4986
            ),
2220.2.6 by Martin Pool
Add tag -r option
4987
        'revision',
2220.2.2 by Martin Pool
Add tag command and basic implementation
4988
        ]
4989
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4990
    def run(self, tag_name,
4991
            delete=None,
4992
            directory='.',
4993
            force=None,
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4994
            revision=None,
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4995
            ):
2220.2.2 by Martin Pool
Add tag command and basic implementation
4996
        branch, relpath = Branch.open_containing(directory)
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4997
        branch.lock_write()
4998
        try:
4999
            if delete:
5000
                branch.tags.delete_tag(tag_name)
5001
                self.outf.write('Deleted tag %s.\n' % tag_name)
2220.2.21 by Martin Pool
Add tag --delete command and implementation
5002
            else:
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
5003
                if revision:
5004
                    if len(revision) != 1:
5005
                        raise errors.BzrCommandError(
5006
                            "Tags can only be placed on a single revision, "
5007
                            "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()
5008
                    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.
5009
                else:
5010
                    revision_id = branch.last_revision()
5011
                if (not force) and branch.tags.has_tag(tag_name):
5012
                    raise errors.TagAlreadyExists(tag_name)
5013
                branch.tags.set_tag(tag_name, revision_id)
5014
                self.outf.write('Created tag %s.\n' % tag_name)
5015
        finally:
5016
            branch.unlock()
2220.2.2 by Martin Pool
Add tag command and basic implementation
5017
5018
2220.2.24 by Martin Pool
Add tags command
5019
class cmd_tags(Command):
5020
    """List tags.
5021
3007.1.1 by Adeodato Simó
Small fix to tags' help.
5022
    This command shows a table of tag names and the revisions they reference.
2220.2.24 by Martin Pool
Add tags command
5023
    """
5024
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
5025
    _see_also = ['tag']
2220.2.24 by Martin Pool
Add tags command
5026
    takes_options = [
5027
        Option('directory',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
5028
            help='Branch whose tags should be displayed.',
2220.2.24 by Martin Pool
Add tags command
5029
            short_name='d',
5030
            type=unicode,
5031
            ),
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5032
        RegistryOption.from_kwargs('sort',
5033
            'Sort tags by different criteria.', title='Sorting',
5034
            alpha='Sort tags lexicographically (default).',
5035
            time='Sort tags chronologically.',
5036
            ),
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
5037
        '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.
5038
        'revision',
2220.2.24 by Martin Pool
Add tags command
5039
    ]
5040
5041
    @display_command
5042
    def run(self,
5043
            directory='.',
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5044
            sort='alpha',
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
5045
            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.
5046
            revision=None,
2220.2.24 by Martin Pool
Add tags command
5047
            ):
5048
        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.
5049
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5050
        tags = branch.tags.get_tag_dict().items()
3553.1.1 by Robert Collins
Do not scan history for tags when none are present.
5051
        if not tags:
5052
            return
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
5053
5054
        if revision:
5055
            branch.lock_read()
5056
            try:
5057
                graph = branch.repository.get_graph()
3904.2.4 by Marius Kruger
* rename _get2Revisions to _get_revision_range
5058
                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.
5059
                revid1, revid2 = rev1.rev_id, rev2.rev_id
5060
                # only show revisions between revid1 and revid2 (inclusive)
5061
                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
5062
                    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.
5063
            finally:
5064
                branch.unlock()
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5065
        if sort == 'alpha':
5066
            tags.sort()
5067
        elif sort == 'time':
5068
            timestamps = {}
5069
            for tag, revid in tags:
5070
                try:
5071
                    revobj = branch.repository.get_revision(revid)
5072
                except errors.NoSuchRevision:
5073
                    timestamp = sys.maxint # place them at the end
5074
                else:
5075
                    timestamp = revobj.timestamp
5076
                timestamps[revid] = timestamp
5077
            tags.sort(key=lambda x: timestamps[x[1]])
5078
        if not show_ids:
5079
            # [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5080
            revno_map = branch.get_revision_id_to_revno_map()
5081
            tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5082
                        for tag, revid in tags ]
5083
        for tag, revspec in tags:
5084
            self.outf.write('%-20s %s\n' % (tag, revspec))
2220.2.24 by Martin Pool
Add tags command
5085
5086
2796.2.5 by Aaron Bentley
Implement reconfigure command
5087
class cmd_reconfigure(Command):
2796.2.15 by Aaron Bentley
More updates from review
5088
    """Reconfigure the type of a bzr directory.
5089
5090
    A target configuration must be specified.
5091
5092
    For checkouts, the bind-to location will be auto-detected if not specified.
5093
    The order of preference is
5094
    1. For a lightweight checkout, the current bound location.
5095
    2. For branches that used to be checkouts, the previously-bound location.
5096
    3. The push location.
5097
    4. The parent location.
5098
    If none of these is available, --bind-to must be specified.
5099
    """
2796.2.5 by Aaron Bentley
Implement reconfigure command
5100
3535.4.1 by Marius Kruger
Update reconfigure help to say exactly what it wil do.
5101
    _see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
2796.2.5 by Aaron Bentley
Implement reconfigure command
5102
    takes_args = ['location?']
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
5103
    takes_options = [
5104
        RegistryOption.from_kwargs(
5105
            'target_type',
5106
            title='Target type',
5107
            help='The type to reconfigure the directory to.',
5108
            value_switches=True, enum_switch=False,
5109
            branch='Reconfigure to be an unbound branch with no working tree.',
5110
            tree='Reconfigure to be an unbound branch with a working tree.',
5111
            checkout='Reconfigure to be a bound branch with a working tree.',
5112
            lightweight_checkout='Reconfigure to be a lightweight'
5113
                ' checkout (with no local history).',
5114
            standalone='Reconfigure to be a standalone branch '
5115
                '(i.e. stop using shared repository).',
5116
            use_shared='Reconfigure to use a shared repository.',
5117
            with_trees='Reconfigure repository to create '
5118
                'working trees on branches by default.',
5119
            with_no_trees='Reconfigure repository to not create '
5120
                'working trees on branches by default.'
5121
            ),
5122
        Option('bind-to', help='Branch to bind checkout to.', type=str),
5123
        Option('force',
5124
               help='Perform reconfiguration even if local changes'
5125
               ' will be lost.')
5126
        ]
2796.2.5 by Aaron Bentley
Implement reconfigure command
5127
5128
    def run(self, location=None, target_type=None, bind_to=None, force=False):
5129
        directory = bzrdir.BzrDir.open(location)
2796.2.15 by Aaron Bentley
More updates from review
5130
        if target_type is None:
2830.2.4 by Martin Pool
Fix previously hidden NameError in reconfigure
5131
            raise errors.BzrCommandError('No target configuration specified')
2796.2.15 by Aaron Bentley
More updates from review
5132
        elif target_type == 'branch':
2796.2.5 by Aaron Bentley
Implement reconfigure command
5133
            reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5134
        elif target_type == 'tree':
5135
            reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5136
        elif target_type == 'checkout':
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
5137
            reconfiguration = reconfigure.Reconfigure.to_checkout(
5138
                directory, bind_to)
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
5139
        elif target_type == 'lightweight-checkout':
5140
            reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5141
                directory, bind_to)
3311.2.6 by Aaron Bentley
rename 'sharing' to 'use-shared'
5142
        elif target_type == 'use-shared':
5143
            reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
3311.2.5 by Aaron Bentley
Implement reconfigure --standalone and --sharing
5144
        elif target_type == 'standalone':
5145
            reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
3921.4.3 by Matthew Fuller
Add --with-trees and --with-no-trees to the 'reconfigure' command.
5146
        elif target_type == 'with-trees':
5147
            reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5148
                directory, True)
5149
        elif target_type == 'with-no-trees':
5150
            reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5151
                directory, False)
2796.2.5 by Aaron Bentley
Implement reconfigure command
5152
        reconfiguration.apply(force)
5153
5154
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5155
class cmd_switch(Command):
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5156
    """Set the branch of a checkout and update.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5157
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5158
    For lightweight checkouts, this changes the branch being referenced.
5159
    For heavyweight checkouts, this checks that there are no local commits
5160
    versus the current bound branch, then it makes the local branch a mirror
5161
    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.
5162
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5163
    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.
5164
    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
5165
5166
    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
5167
5168
    The path to the branch to switch to can be specified relative to the parent
5169
    directory of the current branch. For example, if you are currently in a
5170
    checkout of /path/to/branch, specifying 'newbranch' will find a branch at
5171
    /path/to/newbranch.
3565.6.15 by Marius Kruger
update bind and switch command descriptions to state what will happen to nicknames.
5172
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
5173
    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.
5174
    locally, in which case switching will update the the local nickname to be
5175
    that of the master.
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5176
    """
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5177
5178
    takes_args = ['to_location']
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5179
    takes_options = [Option('force',
5180
                        help='Switch even if local commits will be lost.')
5181
                     ]
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5182
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5183
    def run(self, to_location, force=False):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
5184
        from bzrlib import switch
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5185
        tree_location = '.'
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
5186
        control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
3565.6.1 by Marius Kruger
Let 'bzr switch' update the nick too.
5187
        branch = control_dir.open_branch()
3246.5.1 by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the
5188
        try:
5189
            to_branch = Branch.open(to_location)
5190
        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.
5191
            this_branch = control_dir.open_branch()
3602.3.4 by Adrian Wilkins
Improved comments and documentation
5192
            # 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.
5193
            this_url = this_branch.get_bound_location()
3602.3.4 by Adrian Wilkins
Improved comments and documentation
5194
            # If not, use a local sibling
3602.3.3 by Adrian Wilkins
Tweaked as suggested to be more lightweight about opening branches.
5195
            if this_url is None:
5196
                this_url = this_branch.base
3246.5.1 by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the
5197
            to_branch = Branch.open(
3602.3.4 by Adrian Wilkins
Improved comments and documentation
5198
                urlutils.join(this_url, '..', to_location))
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5199
        switch.switch(control_dir, to_branch, force)
3565.6.7 by Marius Kruger
* checkouts now use master nick when no explicit nick is set.
5200
        if branch.get_config().has_explicit_nickname():
5201
            branch = control_dir.open_branch() #get the new branch!
5202
            branch.nick = to_branch.nick
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5203
        note('Switched to branch: %s',
5204
            urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5205
5206
3586.1.9 by Ian Clatworthy
first cut at view command
5207
class cmd_view(Command):
5208
    """Manage filtered views.
3586.1.33 by Ian Clatworthy
cleanup trailing whitespace
5209
3586.1.9 by Ian Clatworthy
first cut at view command
5210
    Views provide a mask over the tree so that users can focus on
5211
    a subset of a tree when doing their work. After creating a view,
5212
    commands that support a list of files - status, diff, commit, etc -
5213
    effectively have that list of files implicitly given each time.
5214
    An explicit list of files can still be given but those files
5215
    must be within the current view.
5216
5217
    In most cases, a view has a short life-span: it is created to make
5218
    a selected change and is deleted once that change is committed.
5219
    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
5220
    and switch between them.
3586.1.33 by Ian Clatworthy
cleanup trailing whitespace
5221
3586.1.9 by Ian Clatworthy
first cut at view command
5222
    To disable the current view without deleting it, you can switch to
5223
    the pseudo view called ``off``. This can be useful when you need
5224
    to see the whole tree for an operation or two (e.g. merge) but
5225
    want to switch back to your view after that.
5226
5227
    :Examples:
3586.1.14 by Ian Clatworthy
added --all option to the view command
5228
      To define the current view::
3586.1.9 by Ian Clatworthy
first cut at view command
5229
5230
        bzr view file1 dir1 ...
5231
5232
      To list the current view::
5233
5234
        bzr view
5235
5236
      To delete the current view::
5237
5238
        bzr view --delete
5239
5240
      To disable the current view without deleting it::
5241
5242
        bzr view --switch off
5243
3586.1.14 by Ian Clatworthy
added --all option to the view command
5244
      To define a named view and switch to it::
3586.1.9 by Ian Clatworthy
first cut at view command
5245
5246
        bzr view --name view-name file1 dir1 ...
5247
5248
      To list a named view::
5249
5250
        bzr view --name view-name
5251
5252
      To delete a named view::
5253
5254
        bzr view --name view-name --delete
5255
5256
      To switch to a named view::
5257
5258
        bzr view --switch view-name
3586.1.14 by Ian Clatworthy
added --all option to the view command
5259
5260
      To list all views defined::
5261
5262
        bzr view --all
5263
5264
      To delete all views::
5265
5266
        bzr view --delete --all
3586.1.9 by Ian Clatworthy
first cut at view command
5267
    """
5268
3586.1.14 by Ian Clatworthy
added --all option to the view command
5269
    _see_also = []
3586.1.9 by Ian Clatworthy
first cut at view command
5270
    takes_args = ['file*']
5271
    takes_options = [
3586.1.14 by Ian Clatworthy
added --all option to the view command
5272
        Option('all',
5273
            help='Apply list or delete action to all views.',
5274
            ),
3586.1.9 by Ian Clatworthy
first cut at view command
5275
        Option('delete',
5276
            help='Delete the view.',
5277
            ),
5278
        Option('name',
3586.1.14 by Ian Clatworthy
added --all option to the view command
5279
            help='Name of the view to define, list or delete.',
3586.1.9 by Ian Clatworthy
first cut at view command
5280
            type=unicode,
5281
            ),
5282
        Option('switch',
5283
            help='Name of the view to switch to.',
5284
            type=unicode,
5285
            ),
5286
        ]
5287
5288
    def run(self, file_list,
3586.1.14 by Ian Clatworthy
added --all option to the view command
5289
            all=False,
3586.1.9 by Ian Clatworthy
first cut at view command
5290
            delete=False,
5291
            name=None,
5292
            switch=None,
5293
            ):
5294
        tree, file_list = tree_files(file_list, apply_view=False)
5295
        current_view, view_dict = tree.views.get_view_info()
5296
        if name is None:
5297
            name = current_view
5298
        if delete:
5299
            if file_list:
3586.1.11 by Ian Clatworthy
tweak user feedback
5300
                raise errors.BzrCommandError(
5301
                    "Both --delete and a file list specified")
3586.1.9 by Ian Clatworthy
first cut at view command
5302
            elif switch:
3586.1.11 by Ian Clatworthy
tweak user feedback
5303
                raise errors.BzrCommandError(
5304
                    "Both --delete and --switch specified")
3586.1.14 by Ian Clatworthy
added --all option to the view command
5305
            elif all:
5306
                tree.views.set_view_info(None, {})
5307
                self.outf.write("Deleted all views.\n")
3586.1.9 by Ian Clatworthy
first cut at view command
5308
            elif name is None:
3586.1.11 by Ian Clatworthy
tweak user feedback
5309
                raise errors.BzrCommandError("No current view to delete")
3586.1.9 by Ian Clatworthy
first cut at view command
5310
            else:
5311
                tree.views.delete_view(name)
5312
                self.outf.write("Deleted '%s' view.\n" % name)
5313
        elif switch:
5314
            if file_list:
3586.1.11 by Ian Clatworthy
tweak user feedback
5315
                raise errors.BzrCommandError(
5316
                    "Both --switch and a file list specified")
3586.1.14 by Ian Clatworthy
added --all option to the view command
5317
            elif all:
5318
                raise errors.BzrCommandError(
5319
                    "Both --switch and --all specified")
3586.1.9 by Ian Clatworthy
first cut at view command
5320
            elif switch == 'off':
5321
                if current_view is None:
3586.1.11 by Ian Clatworthy
tweak user feedback
5322
                    raise errors.BzrCommandError("No current view to disable")
3586.1.9 by Ian Clatworthy
first cut at view command
5323
                tree.views.set_view_info(None, view_dict)
3586.1.11 by Ian Clatworthy
tweak user feedback
5324
                self.outf.write("Disabled '%s' view.\n" % (current_view))
3586.1.9 by Ian Clatworthy
first cut at view command
5325
            else:
5326
                tree.views.set_view_info(switch, view_dict)
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
5327
                view_str = views.view_display_str(tree.views.lookup_view())
5328
                self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
3586.1.14 by Ian Clatworthy
added --all option to the view command
5329
        elif all:
5330
            if view_dict:
5331
                self.outf.write('Views defined:\n')
5332
                for view in sorted(view_dict):
5333
                    if view == current_view:
5334
                        active = "=>"
5335
                    else:
5336
                        active = "  "
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
5337
                    view_str = views.view_display_str(view_dict[view])
5338
                    self.outf.write('%s %-20s %s\n' % (active, view, view_str))
3586.1.14 by Ian Clatworthy
added --all option to the view command
5339
            else:
5340
                self.outf.write('No views defined.\n')
3586.1.9 by Ian Clatworthy
first cut at view command
5341
        elif file_list:
5342
            if name is None:
5343
                # No name given and no current view set
5344
                name = 'my'
5345
            elif name == 'off':
3586.1.11 by Ian Clatworthy
tweak user feedback
5346
                raise errors.BzrCommandError(
5347
                    "Cannot change the 'off' pseudo view")
3586.1.9 by Ian Clatworthy
first cut at view command
5348
            tree.views.set_view(name, sorted(file_list))
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
5349
            view_str = views.view_display_str(tree.views.lookup_view())
3586.1.11 by Ian Clatworthy
tweak user feedback
5350
            self.outf.write("Using '%s' view: %s\n" % (name, view_str))
3586.1.9 by Ian Clatworthy
first cut at view command
5351
        else:
5352
            # list the files
3586.1.13 by Ian Clatworthy
fix list of a known view when no current view set
5353
            if name is None:
5354
                # No name given and no current view set
3586.1.9 by Ian Clatworthy
first cut at view command
5355
                self.outf.write('No current view.\n')
5356
            else:
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
5357
                view_str = views.view_display_str(tree.views.lookup_view(name))
3586.1.11 by Ian Clatworthy
tweak user feedback
5358
                self.outf.write("'%s' view is: %s\n" % (name, view_str))
3586.1.9 by Ian Clatworthy
first cut at view command
5359
5360
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5361
class cmd_hooks(Command):
5362
    """Show a branch's currently registered hooks.
5363
    """
5364
3254.2.9 by Daniel Watkins
Made cmd_hooks hidden.
5365
    hidden = True
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5366
    takes_args = ['path?']
5367
5368
    def run(self, path=None):
5369
        if path is None:
5370
            path = '.'
5371
        branch_hooks = Branch.open(path).hooks
5372
        for hook_type in branch_hooks:
5373
            hooks = branch_hooks[hook_type]
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
5374
            self.outf.write("%s:\n" % (hook_type,))
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5375
            if hooks:
5376
                for hook in hooks:
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
5377
                    self.outf.write("  %s\n" %
5378
                                    (branch_hooks.get_hook_name(hook),))
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5379
            else:
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
5380
                self.outf.write("  <no hooks installed>\n")
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5381
5382
0.16.80 by Aaron Bentley
Rename shelve2/unshelve2 to shelve/unshelve
5383
class cmd_shelve(Command):
0.16.74 by Aaron Bentley
Merge with shelf-manager
5384
    """Temporarily set aside some changes from the current tree.
5385
5386
    Shelve allows you to temporarily put changes you've made "on the shelf",
5387
    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.
5388
    the shelf with the 'unshelve' command.  The changes are stored alongside
5389
    your working tree, and so they aren't propagated along with your branch nor
5390
    will they survive its deletion.
0.16.74 by Aaron Bentley
Merge with shelf-manager
5391
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5392
    If shelve --list is specified, previously-shelved changes are listed.
5393
0.16.74 by Aaron Bentley
Merge with shelf-manager
5394
    Shelve is intended to help separate several sets of changes that have
5395
    been inappropriately mingled.  If you just want to get rid of all changes
5396
    and you don't need to restore them later, use revert.  If you want to
5397
    shelve all text changes at once, use shelve --all.
5398
5399
    If filenames are specified, only the changes to those files will be
5400
    shelved. Other files will be left untouched.
5401
5402
    If a revision is specified, changes since that revision will be shelved.
5403
5404
    You can put multiple items on the shelf, and by default, 'unshelve' will
5405
    restore the most recently shelved changes.
5406
    """
5407
5408
    takes_args = ['file*']
5409
5410
    takes_options = [
5411
        'revision',
5412
        Option('all', help='Shelve all changes.'),
5413
        'message',
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
5414
        RegistryOption('writer', 'Method to use for writing diffs.',
5415
                       bzrlib.option.diff_writer_registry,
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5416
                       value_switches=True, enum_switch=False),
5417
0.16.119 by Aaron Bentley
Fix option help style.
5418
        Option('list', help='List shelved changes.'),
4100.3.1 by Aaron Bentley
Implement shelve --destroy
5419
        Option('destroy',
5420
               help='Destroy removed changes instead of shelving them.'),
0.16.74 by Aaron Bentley
Merge with shelf-manager
5421
    ]
0.16.117 by Aaron Bentley
Remove references to ls-shelf
5422
    _see_also = ['unshelve']
0.16.74 by Aaron Bentley
Merge with shelf-manager
5423
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
5424
    def run(self, revision=None, all=False, file_list=None, message=None,
4100.3.1 by Aaron Bentley
Implement shelve --destroy
5425
            writer=None, list=False, destroy=False):
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5426
        if list:
5427
            return self.run_for_list()
0.16.74 by Aaron Bentley
Merge with shelf-manager
5428
        from bzrlib.shelf_ui import Shelver
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
5429
        if writer is None:
5430
            writer = bzrlib.option.diff_writer_registry.get()
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
5431
        try:
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
5432
            Shelver.from_args(writer(sys.stdout), revision, all, file_list,
4100.3.1 by Aaron Bentley
Implement shelve --destroy
5433
                              message, destroy=destroy).run()
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
5434
        except errors.UserAbort:
5435
            return 0
0.16.74 by Aaron Bentley
Merge with shelf-manager
5436
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5437
    def run_for_list(self):
0.16.118 by Aaron Bentley
Fix open_containing
5438
        tree = WorkingTree.open_containing('.')[0]
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5439
        tree.lock_read()
5440
        try:
5441
            manager = tree.get_shelf_manager()
5442
            shelves = manager.active_shelves()
5443
            if len(shelves) == 0:
5444
                note('No shelved changes.')
5445
                return 0
5446
            for shelf_id in reversed(shelves):
5447
                message = manager.get_metadata(shelf_id).get('message')
5448
                if message is None:
5449
                    message = '<no message>'
5450
                self.outf.write('%3d: %s\n' % (shelf_id, message))
5451
            return 1
5452
        finally:
5453
            tree.unlock()
5454
0.16.74 by Aaron Bentley
Merge with shelf-manager
5455
0.16.80 by Aaron Bentley
Rename shelve2/unshelve2 to shelve/unshelve
5456
class cmd_unshelve(Command):
0.16.74 by Aaron Bentley
Merge with shelf-manager
5457
    """Restore shelved changes.
5458
5459
    By default, the most recently shelved changes are restored. However if you
3990.2.5 by Daniel Watkins
Improve unshelve documentation, as per #327425.
5460
    specify a shelf by id those changes will be restored instead.  This works
5461
    best when the changes don't depend on each other.
0.16.74 by Aaron Bentley
Merge with shelf-manager
5462
    """
5463
5464
    takes_args = ['shelf_id?']
5465
    takes_options = [
5466
        RegistryOption.from_kwargs(
5467
            'action', help="The action to perform.",
5468
            enum_switch=False, value_switches=True,
5469
            apply="Apply changes and remove from the shelf.",
5470
            dry_run="Show changes, but do not apply or remove them.",
5471
            delete_only="Delete changes without applying them."
5472
        )
5473
    ]
0.16.117 by Aaron Bentley
Remove references to ls-shelf
5474
    _see_also = ['shelve']
0.16.74 by Aaron Bentley
Merge with shelf-manager
5475
5476
    def run(self, shelf_id=None, action='apply'):
5477
        from bzrlib.shelf_ui import Unshelver
5478
        Unshelver.from_args(shelf_id, action).run()
5479
5480
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
5481
class cmd_clean_tree(Command):
5482
    """Remove unwanted files from working tree.
5483
5484
    By default, only unknown files, not ignored files, are deleted.  Versioned
5485
    files are never deleted.
5486
5487
    Another class is 'detritus', which includes files emitted by bzr during
5488
    normal operations and selftests.  (The value of these files decreases with
5489
    time.)
5490
5491
    If no options are specified, unknown files are deleted.  Otherwise, option
5492
    flags are respected, and may be combined.
5493
5494
    To check what clean-tree will do, use --dry-run.
5495
    """
5496
    takes_options = [Option('ignored', help='Delete all ignored files.'),
5497
                     Option('detritus', help='Delete conflict files, merge'
5498
                            ' backups, and failed selftest dirs.'),
5499
                     Option('unknown',
5500
                            help='Delete files unknown to bzr (default).'),
5501
                     Option('dry-run', help='Show files to delete instead of'
5502
                            ' deleting them.'),
5503
                     Option('force', help='Do not prompt before deleting.')]
5504
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5505
            force=False):
5506
        from bzrlib.clean_tree import clean_tree
5507
        if not (unknown or ignored or detritus):
5508
            unknown = True
5509
        if dry_run:
5510
            force = True
4020.1.5 by Aaron Bentley
Fix some formatting issues.
5511
        clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
5512
                   dry_run=dry_run, no_prompt=force)
5513
5514
2524.1.1 by Aaron Bentley
Revert broken changes
5515
def _create_prefix(cur_transport):
5516
    needed = [cur_transport]
5517
    # Recurse upwards until we can create a directory successfully
5518
    while True:
5519
        new_transport = cur_transport.clone('..')
5520
        if new_transport.base == cur_transport.base:
2604.1.1 by Martin Pool
Fix unbound variable in _create_prefix (thanks vila)
5521
            raise errors.BzrCommandError(
5522
                "Failed to create path prefix for %s."
5523
                % cur_transport.base)
2524.1.1 by Aaron Bentley
Revert broken changes
5524
        try:
5525
            new_transport.mkdir('.')
5526
        except errors.NoSuchFile:
5527
            needed.append(new_transport)
5528
            cur_transport = new_transport
5529
        else:
5530
            break
5531
    # Now we only need to create child directories
5532
    while needed:
5533
        cur_transport = needed.pop()
5534
        cur_transport.ensure_base()
5535
2604.1.1 by Martin Pool
Fix unbound variable in _create_prefix (thanks vila)
5536
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
5537
# these get imported and then picked up by the scan for cmd_*
5538
# TODO: Some more consistent way to split command definitions across files;
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5539
# 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'.
5540
# aliases.  ideally we would avoid loading the implementation until the
5541
# details were needed.
2022.1.2 by John Arbash Meinel
rename version_info => cmd_version_info
5542
from bzrlib.cmd_version_info import cmd_version_info
1185.35.4 by Aaron Bentley
Implemented remerge
5543
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2520.4.35 by Aaron Bentley
zap obsolete changeset commands, add bundle-info command
5544
from bzrlib.bundle.commands import (
5545
    cmd_bundle_info,
5546
    )
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
5547
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.
5548
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
5549
        cmd_weave_plan_merge, cmd_weave_merge_text