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