/brz/remove-bazaar

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