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