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