/brz/remove-bazaar

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