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