/brz/remove-bazaar

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