/brz/remove-bazaar

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