~bzr-pqm/bzr/bzr.dev

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