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