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