~bzr-pqm/bzr/bzr.dev

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