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