/brz/remove-bazaar

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