/brz/remove-bazaar

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