~bzr-pqm/bzr/bzr.dev

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