/brz/remove-bazaar

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