/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
2255.2.61 by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked.
2412
                    if verbose:
3883.1.1 by Gordon P. Hemsley
Add trailing slash after directories.
2413
                        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.
2414
                        if show_ids and fid is not None:
2415
                            outstring = "%-50s %s" % (outstring, fid)
2416
                        self.outf.write(outstring + '\n')
2417
                    elif null:
3883.1.6 by Gordon P. Hemsley
Revert added slash for null-separated output of 'bzr ls'.
2418
                        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.
2419
                        if show_ids:
2420
                            if fid is not None:
2421
                                self.outf.write(fid)
2422
                            self.outf.write('\0')
2423
                        self.outf.flush()
2424
                    else:
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
2425
                        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.
2426
                            my_id = fid
2427
                        else:
2428
                            my_id = ''
2429
                        if show_ids:
3883.1.1 by Gordon P. Hemsley
Add trailing slash after directories.
2430
                            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.
2431
                        else:
3883.1.1 by Gordon P. Hemsley
Add trailing slash after directories.
2432
                            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.
2433
        finally:
2434
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2435
2436
2437
class cmd_unknowns(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
2438
    """List unknown files.
2439
    """
1551.10.14 by Aaron Bentley
Add some blank lines
2440
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
2441
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2442
    _see_also = ['ls']
1551.10.14 by Aaron Bentley
Add some blank lines
2443
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2444
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2445
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2446
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
2447
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2448
2449
2450
class cmd_ignore(Command):
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
2451
    """Ignore specified files or patterns.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2452
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
2453
    See ``bzr help patterns`` for details on the syntax of patterns.
2454
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2455
    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
2456
    After adding, editing or deleting that file either indirectly by
2457
    using this command or directly by using an editor, be sure to commit
2458
    it.
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
2459
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2460
    Note: ignore patterns containing shell wildcards must be quoted from
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
2461
    the shell on Unix.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2462
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2463
    :Examples:
2464
        Ignore the top level Makefile::
2465
2466
            bzr ignore ./Makefile
2467
2468
        Ignore class files in all directories::
2469
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
2470
            bzr ignore "*.class"
2471
2472
        Ignore .o files under the lib directory::
2473
2474
            bzr ignore "lib/**/*.o"
2475
2476
        Ignore .o files under the lib directory::
2477
2478
            bzr ignore "RE:lib/.*\.o"
3257.1.1 by Adeodato Simó
Add an example of some bzrignore cool stuff with Python regexes.
2479
2480
        Ignore everything but the "debian" toplevel directory::
2481
2482
            bzr ignore "RE:(?!debian/).*"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2483
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2484
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
2485
    _see_also = ['status', 'ignored', 'patterns']
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
2486
    takes_args = ['name_pattern*']
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
2487
    takes_options = [
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2488
        Option('old-default-rules',
2489
               help='Write out the ignore rules bzr < 0.9 always used.')
2490
        ]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2491
2063.5.2 by wang
Don't use mutable values as default argument definitions.
2492
    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.
2493
        from bzrlib import ignores
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
2494
        if old_default_rules is not None:
2495
            # 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.
2496
            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.
2497
                print pattern
2498
            return
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
2499
        if not name_pattern_list:
2063.5.5 by wang
resolve a conflict
2500
            raise errors.BzrCommandError("ignore requires at least one "
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
2501
                                  "NAME_PATTERN or --old-default-rules")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2502
        name_pattern_list = [globbing.normalize_pattern(p)
2298.8.4 by Kent Gibson
Fix whitespace and alignment.
2503
                             for p in name_pattern_list]
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
2504
        for name_pattern in name_pattern_list:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2505
            if (name_pattern[0] == '/' or
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
2506
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
2507
                raise errors.BzrCommandError(
2508
                    "NAME_PATTERN should not be an absolute path")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2509
        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.
2510
        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.
2511
        ignored = globbing.Globster(name_pattern_list)
2512
        matches = []
2513
        tree.lock_read()
2514
        for entry in tree.list_files():
2515
            id = entry[3]
2516
            if id is not None:
2517
                filename = entry[0]
2518
                if ignored.match(filename):
2747.5.3 by Daniel Watkins
Modified to avoid encoding issues.
2519
                    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.
2520
        tree.unlock()
2521
        if len(matches) > 0:
2522
            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
2523
                  " match your ignore pattern:\n%s" \
2524
                  "\nThese files will continue to be version controlled" \
2525
                  " unless you 'bzr remove' them." % ("\n".join(matches),)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2526
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
2527
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2528
class cmd_ignored(Command):
2529
    """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
2530
2531
    List all the ignored files and the ignore pattern that caused the file to
2532
    be ignored.
2533
2534
    Alternatively, to list just the files::
2535
2536
        bzr ls --ignored
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2537
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2538
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2539
    encoding_type = 'replace'
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
2540
    _see_also = ['ignore', 'ls']
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2541
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2542
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2543
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2544
        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.
2545
        tree.lock_read()
2546
        try:
2547
            for path, file_class, kind, file_id, entry in tree.list_files():
2548
                if file_class != 'I':
2549
                    continue
2550
                ## XXX: Slightly inefficient since this was already calculated
2551
                pat = tree.is_ignored(path)
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2552
                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.
2553
        finally:
2554
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2555
2556
2557
class cmd_lookup_revision(Command):
2558
    """Lookup the revision-id from a revision-number
2559
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2560
    :Examples:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2561
        bzr lookup-revision 33
2562
    """
2563
    hidden = True
2564
    takes_args = ['revno']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2565
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2566
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2567
    def run(self, revno):
2568
        try:
2569
            revno = int(revno)
2570
        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
2571
            raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2572
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2573
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2574
2575
2576
class cmd_export(Command):
2374.1.1 by Ian Clatworthy
Help and man page fixes
2577
    """Export current or past revision to a destination directory or archive.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2578
2579
    If no revision is specified this exports the last committed revision.
2580
2581
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
2582
    given, try to find the format with the extension. If no extension
2583
    is found exports to a directory (equivalent to --format=dir).
2584
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
2585
    If root is supplied, it will be used as the root directory inside
2586
    container formats (tar, zip, etc). If it is not supplied it will default
2587
    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
2588
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2589
    If branch is omitted then the branch containing the current working
2590
    directory will be used.
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2591
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
2592
    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
2593
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2594
      =================       =========================
2595
      Supported formats       Autodetected by extension
2596
      =================       =========================
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
2597
         dir                         (none)
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2598
         tar                          .tar
2599
         tbz2                    .tar.bz2, .tbz2
2600
         tgz                      .tar.gz, .tgz
2601
         zip                          .zip
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2602
      =================       =========================
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2603
    """
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2604
    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.
2605
    takes_options = [
2606
        Option('format',
2607
               help="Type of file to export to.",
2608
               type=unicode),
2609
        'revision',
3368.2.48 by Ian Clatworthy
apply first round of poolie's review feedback
2610
        Option('filters', help='Apply content filters to export the '
2611
                'convenient form.'),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2612
        Option('root',
2613
               type=str,
2614
               help="Name of the root directory inside the exported file."),
2615
        ]
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2616
    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
2617
        root=None, filters=False):
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
2618
        from bzrlib.export import export
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2619
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2620
        if branch_or_subdir is None:
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2621
            tree = WorkingTree.open_containing(u'.')[0]
2622
            b = tree.branch
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2623
            subdir = None
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2624
        else:
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2625
            b, subdir = Branch.open_containing(branch_or_subdir)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2626
            tree = None
2627
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
2628
        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.
2629
        try:
3368.2.41 by Ian Clatworthy
1st cut merge of bzr.dev r3907
2630
            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.
2631
        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
2632
            raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2633
2634
2635
class cmd_cat(Command):
2374.1.1 by Ian Clatworthy
Help and man page fixes
2636
    """Write the contents of a file as of a given revision to standard output.
2637
2638
    If no revision is nominated, the last revision is used.
2639
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2640
    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
2641
    binary file.
2374.1.1 by Ian Clatworthy
Help and man page fixes
2642
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2643
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2644
    _see_also = ['ls']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2645
    takes_options = [
2646
        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
2647
        Option('filters', help='Apply content filters to display the '
2648
                'convenience form.'),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2649
        'revision',
2650
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2651
    takes_args = ['filename']
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
2652
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2653
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2654
    @display_command
3368.2.31 by Ian Clatworthy
add --filters option to cat command
2655
    def run(self, filename, revision=None, name_from_revision=False,
2656
            filters=False):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
2657
        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
2658
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
2659
                                         " one revision specifier")
2660
        tree, branch, relpath = \
2661
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2662
        branch.lock_read()
2663
        try:
2664
            return self._run(tree, branch, relpath, filename, revision,
3368.2.31 by Ian Clatworthy
add --filters option to cat command
2665
                             name_from_revision, filters)
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2666
        finally:
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
2667
            branch.unlock()
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2668
3368.2.31 by Ian Clatworthy
add --filters option to cat command
2669
    def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2670
        filtered):
1907.4.5 by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
2671
        if tree is None:
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
2672
            tree = b.basis_tree()
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
2673
        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
2674
2675
        old_file_id = rev_tree.path2id(relpath)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2676
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
2677
        if name_from_revision:
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
2678
            # Try in revision if requested
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2679
            if old_file_id is None:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2680
                raise errors.BzrCommandError(
2681
                    "%r is not present in revision %s" % (
2682
                        filename, rev_tree.get_revision_id()))
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2683
            else:
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2684
                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
2685
        else:
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
2686
            cur_file_id = tree.path2id(relpath)
2687
            found = False
2688
            if cur_file_id is not None:
2689
                # Then try with the actual file id
2690
                try:
2691
                    content = rev_tree.get_file_text(cur_file_id)
2692
                    found = True
2693
                except errors.NoSuchId:
2694
                    # The actual file id didn't exist at that time
2695
                    pass
2696
            if not found and old_file_id is not None:
2697
                # Finally try with the old file id
2698
                content = rev_tree.get_file_text(old_file_id)
2699
                found = True
2700
            if not found:
2701
                # Can't be found anywhere
2702
                raise errors.BzrCommandError(
2703
                    "%r is not present in revision %s" % (
2704
                        filename, rev_tree.get_revision_id()))
3368.2.31 by Ian Clatworthy
add --filters option to cat command
2705
        if filtered:
2706
            from bzrlib.filters import (
2707
                ContentFilterContext,
2708
                filtered_output_bytes,
2709
                )
3368.2.33 by Ian Clatworthy
expand filter context to support interesting stuff
2710
            filters = rev_tree._content_filter_stack(relpath)
3368.2.48 by Ian Clatworthy
apply first round of poolie's review feedback
2711
            chunks = content.splitlines(True)
2712
            content = filtered_output_bytes(chunks, filters,
3368.2.33 by Ian Clatworthy
expand filter context to support interesting stuff
2713
                ContentFilterContext(relpath, rev_tree))
3368.2.31 by Ian Clatworthy
add --filters option to cat command
2714
            self.outf.writelines(content)
2715
        else:
2716
            self.outf.write(content)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2717
2718
2719
class cmd_local_time_offset(Command):
2720
    """Show the offset in seconds from GMT to local time."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2721
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2722
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2723
    def run(self):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2724
        print osutils.local_time_offset()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2725
2726
2727
2728
class cmd_commit(Command):
2729
    """Commit changes into a new revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2730
4351.1.1 by Ian Clatworthy
improve commit help
2731
    An explanatory message needs to be given for each commit. This is
2732
    often done by using the --message option (getting the message from the
2733
    command line) or by using the --file option (getting the message from
2734
    a file). If neither of these options is given, an editor is opened for
2735
    the user to enter the message. To see the changed files in the
2736
    boilerplate text loaded into the editor, use the --show-diff option.
2737
2738
    By default, the entire tree is committed and the person doing the
2739
    commit is assumed to be the author. These defaults can be overridden
2740
    as explained below.
2741
2742
    :Selective commits:
2743
2744
      If selected files are specified, only changes to those files are
2745
      committed.  If a directory is specified then the directory and
2746
      everything within it is committed.
2747
  
2748
      When excludes are given, they take precedence over selected files.
2749
      For example, to commit only changes within foo, but not changes
2750
      within foo/bar::
2751
  
2752
        bzr commit foo -x foo/bar
2753
  
2754
      A selective commit after a merge is not yet supported.
2755
2756
    :Custom authors:
2757
2758
      If the author of the change is not the same person as the committer,
2759
      you can specify the author's name using the --author option. The
2760
      name should be in the same format as a committer-id, e.g.
2761
      "John Doe <jdoe@example.com>". If there is more than one author of
2762
      the change you can specify the option multiple times, once for each
2763
      author.
2764
  
2765
    :Checks:
2766
2767
      A common mistake is to forget to add a new file or directory before
2768
      running the commit command. The --strict option checks for unknown
2769
      files and aborts the commit if any are found. More advanced pre-commit
2770
      checks can be implemented by defining hooks. See ``bzr help hooks``
2771
      for details.
2772
2773
    :Things to note:
2774
2775
      If you accidentially commit the wrong changes or make a spelling
2776
      mistake in the commit message say, you can use the uncommit command
2777
      to undo it. See ``bzr help uncommit`` for details.
2778
2779
      Hooks can also be configured to run after a commit. This allows you
2780
      to trigger updates to external systems like bug trackers. The --fixes
2781
      option can be used to record the association between a revision and
2782
      one or more bugs. See ``bzr help bugs`` for details.
2783
2784
      A selective commit may fail in some cases where the committed
2785
      tree would be invalid. Consider::
2786
  
2787
        bzr init foo
2788
        mkdir foo/bar
2789
        bzr add foo/bar
2790
        bzr commit foo -m "committing foo"
2791
        bzr mv foo/bar foo/baz
2792
        mkdir foo/bar
2793
        bzr add foo/bar
2794
        bzr commit foo/bar -m "committing bar but not baz"
2795
  
2796
      In the example above, the last commit will fail by design. This gives
2797
      the user the opportunity to decide whether they want to commit the
2798
      rename at the same time, separately first, or not at all. (As a general
2799
      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;
2800
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2801
    # TODO: Run hooks on tree to-be-committed, and after commit.
2802
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2803
    # TODO: Strict commit that fails if there are deleted files.
2804
    #       (what does "deleted files" mean ??)
2805
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2806
    # TODO: Give better message for -s, --summary, used by tla people
2807
2808
    # XXX: verbose currently does nothing
2809
4351.1.1 by Ian Clatworthy
improve commit help
2810
    _see_also = ['add', 'bugs', 'hooks', 'uncommit']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2811
    takes_args = ['selected*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2812
    takes_options = [
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2813
            ListOption('exclude', type=str, short_name='x',
2814
                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.
2815
            Option('message', type=unicode,
2816
                   short_name='m',
2817
                   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
2818
            'verbose',
2819
             Option('unchanged',
2820
                    help='Commit even if nothing has changed.'),
2821
             Option('file', type=str,
2822
                    short_name='F',
2823
                    argname='msgfile',
2824
                    help='Take commit message from this file.'),
2825
             Option('strict',
2826
                    help="Refuse to commit if there are unknown "
2827
                    "files in the working tree."),
2828
             ListOption('fixes', type=str,
3535.10.7 by James Westby
Make the --fixes option conform to the style guide check once more.
2829
                    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.
2830
                         "(see \"bzr help bugs\")."),
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
2831
             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.
2832
                    help="Set the author's name, if it's different "
2833
                         "from the committer."),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2834
             Option('local',
2835
                    help="Perform a local commit in a bound "
2836
                         "branch.  Local commits are not pushed to "
2837
                         "the master branch until a normal commit "
2838
                         "is performed."
2839
                    ),
2598.6.10 by ghigo
In the commit dialog, the diff is stored as 8-bit raw data
2840
              Option('show-diff',
2841
                     help='When no message is supplied, show the diff along'
2842
                     ' 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
2843
             ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2844
    aliases = ['ci', 'checkin']
2845
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
2846
    def _iter_bug_fix_urls(self, fixes, branch):
2376.4.7 by jml at canonical
- Add docstrings to tests.
2847
        # Configure the properties for bug fixing attributes.
2848
        for fixed_bug in fixes:
2849
            tokens = fixed_bug.split(':')
2850
            if len(tokens) != 2:
2851
                raise errors.BzrCommandError(
3535.10.3 by James Westby
Talk about "trackers" rather than "tags" as it may be less confusing.
2852
                    "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.
2853
                    "See \"bzr help bugs\" for more information on this "
2854
                    "feature.\nCommit refused." % fixed_bug)
2376.4.7 by jml at canonical
- Add docstrings to tests.
2855
            tag, bug_id = tokens
2856
            try:
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
2857
                yield bugtracker.get_bug_url(tag, branch, bug_id)
2376.4.26 by Jonathan Lange
Tests for MalformedBugIdentifier and new error UnknownBugTrackerAbbreviation.
2858
            except errors.UnknownBugTrackerAbbreviation:
2376.4.7 by jml at canonical
- Add docstrings to tests.
2859
                raise errors.BzrCommandError(
2860
                    'Unrecognized bug %s. Commit refused.' % fixed_bug)
3535.10.9 by James Westby
Make the improved messages show up in the UI.
2861
            except errors.MalformedBugIdentifier, e:
2376.4.7 by jml at canonical
- Add docstrings to tests.
2862
                raise errors.BzrCommandError(
3535.10.9 by James Westby
Make the improved messages show up in the UI.
2863
                    "%s\nCommit refused." % (str(e),))
2376.4.7 by jml at canonical
- Add docstrings to tests.
2864
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
2865
    def run(self, message=None, file=None, verbose=False, selected_list=None,
2817.4.4 by Vincent Ladeuil
Redo the lost modification.
2866
            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)
2867
            author=None, show_diff=False, exclude=None):
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
2868
        from bzrlib.errors import (
2869
            PointlessCommit,
2870
            ConflictsInTree,
2871
            StrictCommitFailed
2872
        )
2873
        from bzrlib.msgeditor import (
2874
            edit_commit_message_encoded,
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
2875
            generate_commit_message_template,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
2876
            make_commit_message_template_encoded
2877
        )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2878
1185.33.77 by Martin Pool
doc
2879
        # TODO: Need a blackbox test for invoking the external editor; may be
2880
        # slightly problematic to run this cross-platform.
2881
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2882
        # 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
2883
        # spending the user's valuable time typing a commit message.
2376.4.2 by jml at canonical
More sophisticated error handling for --fixes option
2884
2885
        properties = {}
2886
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2887
        tree, selected_list = tree_files(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
2888
        if selected_list == ['']:
2889
            # workaround - commit of root of tree should be exactly the same
2890
            # as just default commit in that tree, and succeed even though
2891
            # selected-file merge commit is not done yet
2892
            selected_list = []
2893
2817.4.4 by Vincent Ladeuil
Redo the lost modification.
2894
        if fixes is None:
2895
            fixes = []
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
2896
        bug_property = bugtracker.encode_fixes_bug_urls(
2897
            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
2898
        if bug_property:
2899
            properties['bugs'] = bug_property
2376.4.7 by jml at canonical
- Add docstrings to tests.
2900
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
2901
        if local and not tree.branch.get_bound_location():
2902
            raise errors.LocalRequiresBoundBranch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2903
2149.1.4 by Aaron Bentley
Add additional test that callback is called with a Commit instance
2904
        def get_message(commit_obj):
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2905
            """Callback to get commit message"""
2906
            my_message = message
2907
            if my_message is None and not file:
2598.6.24 by ghigo
update on the basis of Aaron suggestions
2908
                t = make_commit_message_template_encoded(tree,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
2909
                        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.
2910
                        output_encoding=osutils.get_user_encoding())
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
2911
                start_message = generate_commit_message_template(commit_obj)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2912
                my_message = edit_commit_message_encoded(t,
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
2913
                    start_message=start_message)
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2914
                if my_message is None:
2915
                    raise errors.BzrCommandError("please specify a commit"
2916
                        " message with either --message or --file")
2598.6.29 by ghigo
Removed the check on the switch "--show-diff" in order to allow the
2917
            elif my_message and file:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2918
                raise errors.BzrCommandError(
2598.6.29 by ghigo
Removed the check on the switch "--show-diff" in order to allow the
2919
                    "please specify either --message or --file")
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2920
            if file:
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2921
                my_message = codecs.open(file, 'rt',
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
2922
                                         osutils.get_user_encoding()).read()
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2923
            if my_message == "":
2924
                raise errors.BzrCommandError("empty commit message specified")
2925
            return my_message
2376.4.2 by jml at canonical
More sophisticated error handling for --fixes option
2926
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2927
        try:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2928
            tree.commit(message_callback=get_message,
2929
                        specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
2930
                        allow_pointless=unchanged, strict=strict, local=local,
2789.2.1 by Ian Clatworthy
Make commit less verbose by default
2931
                        reporter=None, verbose=verbose, revprops=properties,
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
2932
                        authors=author,
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
2933
                        exclude=safe_relpath_files(tree, exclude))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2934
        except PointlessCommit:
2935
            # FIXME: This should really happen before the file is read in;
2936
            # perhaps prepare the commit; get the message; then actually commit
4351.1.2 by Ian Clatworthy
tweak grammar in error message
2937
            raise errors.BzrCommandError("No changes to commit."
2938
                              " Use --unchanged to commit anyhow.")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
2939
        except ConflictsInTree:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2940
            raise errors.BzrCommandError('Conflicts detected in working '
2941
                'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'
2942
                ' resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2943
        except StrictCommitFailed:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2944
            raise errors.BzrCommandError("Commit refused because there are"
2945
                              " 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
2946
        except errors.BoundBranchOutOfDate, e:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2947
            raise errors.BzrCommandError(str(e) + "\n"
2948
            'To commit to master branch, run update and then commit.\n'
2949
            'You can also pass --local to commit to continue working '
2950
            'disconnected.')
2111.1.1 by Martin Pool
Fix #32054, save message if commit fails.
2951
2952
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2953
class cmd_check(Command):
3015.4.20 by Daniel Watkins
Fixed summary.
2954
    """Validate working tree structure, branch consistency and repository history.
3015.3.25 by Daniel Watkins
Updated help.
2955
2956
    This command checks various invariants about branch and repository storage
2957
    to detect data corruption or bzr bugs.
2958
2959
    The working tree and branch checks will only give output if a problem is
2960
    detected. The output fields of the repository check are:
2745.6.8 by Aaron Bentley
Clean up text
2961
2962
        revisions: This is just the number of revisions checked.  It doesn't
2963
            indicate a problem.
2964
        versionedfiles: This is just the number of versionedfiles checked.  It
2965
            doesn't indicate a problem.
2966
        unreferenced ancestors: Texts that are ancestors of other texts, but
2967
            are not properly referenced by the revision ancestry.  This is a
2968
            subtle problem that Bazaar can work around.
2969
        unique file texts: This is the total number of unique file contents
2970
            seen in the checked revisions.  It does not indicate a problem.
2971
        repeated file texts: This is the total number of repeated texts seen
2972
            in the checked revisions.  Texts can be repeated when their file
2973
            entries are modified, but the file contents are not.  It does not
2974
            indicate a problem.
3015.4.14 by Daniel Watkins
Updated check help to explain what happens when no options are given.
2975
3015.4.19 by Daniel Watkins
Improved check docs.
2976
    If no restrictions are specified, all Bazaar data that is found at the given
2977
    location will be checked.
2978
2979
    :Examples:
2980
2981
        Check the tree and branch at 'foo'::
2982
2983
            bzr check --tree --branch foo
2984
2985
        Check only the repository at 'bar'::
2986
2987
            bzr check --repo bar
2988
2989
        Check everything at 'baz'::
2990
2991
            bzr check baz
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2992
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2993
2994
    _see_also = ['reconcile']
3015.3.2 by Daniel Watkins
Check.check now takes a path rather than a branch.
2995
    takes_args = ['path?']
3015.4.2 by Daniel Watkins
Made UI changes to include CLI options.
2996
    takes_options = ['verbose',
2997
                     Option('branch', help="Check the branch related to the"
2998
                                           " current directory."),
2999
                     Option('repo', help="Check the repository related to the"
3000
                                         " current directory."),
3001
                     Option('tree', help="Check the working tree related to"
3002
                                         " the current directory.")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3003
3015.4.5 by Daniel Watkins
Each option selects only the specific thing to be checked.
3004
    def run(self, path=None, verbose=False, branch=False, repo=False,
3005
            tree=False):
3015.3.22 by Daniel Watkins
Changed 'check' to 'check_dwim'.
3006
        from bzrlib.check import check_dwim
3015.3.2 by Daniel Watkins
Check.check now takes a path rather than a branch.
3007
        if path is None:
3008
            path = '.'
3015.4.7 by Daniel Watkins
Vanilla 'bzr check' checks all items.
3009
        if not branch and not repo and not tree:
3010
            branch = repo = tree = True
3015.4.2 by Daniel Watkins
Made UI changes to include CLI options.
3011
        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;
3012
3013
3014
class cmd_upgrade(Command):
3015
    """Upgrade branch storage to current format.
3016
3017
    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.
3018
    this command. When the default format has changed you may also be warned
3019
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3020
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3021
3022
    _see_also = ['check']
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
3023
    takes_args = ['url?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
3024
    takes_options = [
2221.4.9 by Aaron Bentley
Zap trailing whitespace
3025
                    RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
3026
                        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
3027
                             ' formats" for details.',
3224.5.2 by Andrew Bennetts
Avoid importing bzrlib.bzrdir unnecessarily.
3028
                        lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3029
                        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
3030
                        value_switches=True, title='Branch format'),
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
3031
                    ]
3032
3033
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3034
        from bzrlib.upgrade import upgrade
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
3035
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3036
3037
3038
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
3039
    """Show or set bzr user id.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3040
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3041
    :Examples:
3042
        Show the email of the current user::
3043
3044
            bzr whoami --email
3045
3046
        Set the current user::
3047
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
3048
            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
3049
    """
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3050
    takes_options = [ Option('email',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3051
                             help='Display email address only.'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3052
                      Option('branch',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3053
                             help='Set identity for the current branch instead of '
3054
                                  'globally.'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3055
                    ]
3056
    takes_args = ['name?']
3057
    encoding_type = 'replace'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3058
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3059
    @display_command
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3060
    def run(self, email=False, branch=False, name=None):
3061
        if name is None:
3062
            # use branch if we're inside one; otherwise global config
3063
            try:
1816.2.10 by Robey Pointer
code style changes
3064
                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
3065
            except errors.NotBranchError:
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3066
                c = config.GlobalConfig()
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
3067
            if email:
1816.2.10 by Robey Pointer
code style changes
3068
                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
3069
            else:
1816.2.10 by Robey Pointer
code style changes
3070
                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
3071
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3072
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
3073
        # display a warning if an email address isn't included in the given name.
3074
        try:
3075
            config.extract_email_address(name)
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
3076
        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
3077
            warning('"%s" does not seem to contain an email address.  '
3078
                    'This is allowed, but not recommended.', name)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3079
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
3080
        # use global config unless --branch given
3081
        if branch:
1816.2.10 by Robey Pointer
code style changes
3082
            c = Branch.open_containing('.')[0].get_config()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3083
        else:
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
3084
            c = config.GlobalConfig()
3085
        c.set_user_option('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3086
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.
3087
1185.35.14 by Aaron Bentley
Implemented nick command
3088
class cmd_nick(Command):
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
3089
    """Print or set the branch nickname.
3090
3091
    If unset, the tree root directory name is used as the nickname.
3092
    To print the current nickname, execute with no argument.
3093
3094
    Bound branches use the nickname of its master branch unless it is set
3095
    locally.
1185.35.14 by Aaron Bentley
Implemented nick command
3096
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3097
3098
    _see_also = ['info']
1185.35.14 by Aaron Bentley
Implemented nick command
3099
    takes_args = ['nickname?']
3100
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
3101
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
3102
        if nickname is None:
3103
            self.printme(branch)
3104
        else:
3105
            branch.nick = nickname
3106
3107
    @display_command
3108
    def printme(self, branch):
2367.1.8 by Robert Collins
Whitespace.
3109
        print branch.nick
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3110
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.
3111
2900.3.2 by Tim Penhey
A working alias command.
3112
class cmd_alias(Command):
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3113
    """Set/unset and display aliases.
2900.3.2 by Tim Penhey
A working alias command.
3114
3115
    :Examples:
3116
        Show the current aliases::
3117
3118
            bzr alias
3119
3120
        Show the alias specified for 'll'::
3121
3122
            bzr alias ll
3123
3124
        Set an alias for 'll'::
3125
2900.3.10 by Tim Penhey
Show examples, and change text to use double rather than single quotes.
3126
            bzr alias ll="log --line -r-10..-1"
2900.3.2 by Tim Penhey
A working alias command.
3127
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3128
        To remove an alias for 'll'::
3129
3130
            bzr alias --remove ll
3131
2900.3.2 by Tim Penhey
A working alias command.
3132
    """
3133
    takes_args = ['name?']
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3134
    takes_options = [
3135
        Option('remove', help='Remove the alias.'),
3136
        ]
2900.3.2 by Tim Penhey
A working alias command.
3137
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3138
    def run(self, name=None, remove=False):
3139
        if remove:
3140
            self.remove_alias(name)
3141
        elif name is None:
2900.3.2 by Tim Penhey
A working alias command.
3142
            self.print_aliases()
3143
        else:
3144
            equal_pos = name.find('=')
3145
            if equal_pos == -1:
3146
                self.print_alias(name)
3147
            else:
3148
                self.set_alias(name[:equal_pos], name[equal_pos+1:])
3149
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3150
    def remove_alias(self, alias_name):
3151
        if alias_name is None:
3152
            raise errors.BzrCommandError(
3153
                'bzr alias --remove expects an alias to remove.')
3154
        # If alias is not found, print something like:
3155
        # unalias: foo: not found
2900.3.8 by Tim Penhey
Use the exception text for unalias not found.
3156
        c = config.GlobalConfig()
3157
        c.unset_alias(alias_name)
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3158
3159
    @display_command
2900.3.2 by Tim Penhey
A working alias command.
3160
    def print_aliases(self):
3161
        """Print out the defined aliases in a similar format to bash."""
3162
        aliases = config.GlobalConfig().get_aliases()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3163
        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.
3164
            self.outf.write('bzr alias %s="%s"\n' % (key, value))
2900.3.2 by Tim Penhey
A working alias command.
3165
3166
    @display_command
3167
    def print_alias(self, alias_name):
3168
        from bzrlib.commands import get_alias
3169
        alias = get_alias(alias_name)
3170
        if alias is None:
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3171
            self.outf.write("bzr alias: %s: not found\n" % alias_name)
2900.3.2 by Tim Penhey
A working alias command.
3172
        else:
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3173
            self.outf.write(
2900.3.11 by Tim Penhey
Fixed the output in the tests.
3174
                'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
2900.3.2 by Tim Penhey
A working alias command.
3175
2900.3.12 by Tim Penhey
Final review comments.
3176
    def set_alias(self, alias_name, alias_command):
2900.3.2 by Tim Penhey
A working alias command.
3177
        """Save the alias in the global config."""
3178
        c = config.GlobalConfig()
2900.3.12 by Tim Penhey
Final review comments.
3179
        c.set_alias(alias_name, alias_command)
2900.3.2 by Tim Penhey
A working alias command.
3180
3181
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3182
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
3183
    """Run internal test suite.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3184
2213.2.1 by Martin Pool
Add selftest --first flag
3185
    If arguments are given, they are regular expressions that say which tests
3186
    should run.  Tests matching any expression are run, and other tests are
3187
    not run.
3188
3189
    Alternatively if --first is given, matching tests are run first and then
3190
    all other tests are run.  This is useful if you have been working in a
3191
    particular area, but want to make sure nothing else was broken.
1552 by Martin Pool
Improved help text for bzr selftest
3192
2394.2.2 by Ian Clatworthy
Add --randomize and update help
3193
    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
3194
    excluded, regardless of whether they match --first or not.
2394.2.2 by Ian Clatworthy
Add --randomize and update help
3195
3196
    To help catch accidential dependencies between tests, the --randomize
3197
    option is useful. In most cases, the argument used is the word 'now'.
3198
    Note that the seed used for the random number generator is displayed
3199
    when this option is used. The seed can be explicitly passed as the
3200
    argument to this option if required. This enables reproduction of the
3201
    actual ordering used if and when an order sensitive problem is encountered.
3202
3203
    If --list-only is given, the tests that would be run are listed. This is
3204
    useful when combined with --first, --exclude and/or --randomize to
3205
    understand their impact. The test harness reports "Listed nn tests in ..."
3206
    instead of "Ran nn tests in ..." when list mode is enabled.
3207
1552 by Martin Pool
Improved help text for bzr selftest
3208
    If the global option '--no-plugins' is given, plugins are not loaded
3209
    before running the selftests.  This has two effects: features provided or
3210
    modified by plugins will not be tested, and tests provided by plugins will
3211
    not be run.
3212
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3213
    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)
3214
    typically inside $TMPDIR or /tmp.
3215
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3216
    :Examples:
3217
        Run only tests relating to 'ignore'::
3218
3219
            bzr selftest ignore
3220
3221
        Disable plugins and list tests as they're run::
3222
3223
            bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
3224
    """
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.
3225
    # NB: this is used from the class without creating an instance, which is
3226
    # why it does not have a self parameter.
3227
    def get_transport_type(typestring):
3228
        """Parse and return a transport specifier."""
3229
        if typestring == "sftp":
3230
            from bzrlib.transport.sftp import SFTPAbsoluteServer
3231
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
3232
        if typestring == "memory":
3233
            from bzrlib.transport.memory import MemoryServer
3234
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
3235
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
3236
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
3237
            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.
3238
        msg = "No known transport type %s. Supported types are: sftp\n" %\
3239
            (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
3240
        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.
3241
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3242
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
3243
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
3244
    takes_options = ['verbose',
2418.2.2 by Martin Pool
Add -1 option to selftest
3245
                     Option('one',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3246
                             help='Stop when one test fails.',
2418.2.2 by Martin Pool
Add -1 option to selftest
3247
                             short_name='1',
3248
                             ),
2333.1.1 by Dmitry Vasiliev
Fixed typo and removed some trailing whitespaces
3249
                     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.
3250
                            help='Use a different transport by default '
3251
                                 'throughout the test suite.',
3252
                            type=get_transport_type),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3253
                     Option('benchmark',
3254
                            help='Run the benchmarks rather than selftests.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
3255
                     Option('lsprof-timed',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3256
                            help='Generate lsprof output for benchmarked'
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
3257
                                 ' sections of code.'),
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
3258
                     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
3259
                            help='Cache intermediate benchmark output in this '
3260
                                 'directory.'),
2213.2.1 by Martin Pool
Add selftest --first flag
3261
                     Option('first',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3262
                            help='Run all tests, but run specified tests first.',
2418.2.1 by Martin Pool
Add -f alias for selftest --first
3263
                            short_name='f',
2321.2.1 by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
3264
                            ),
2394.2.1 by Ian Clatworthy
--list and --exclude first cut
3265
                     Option('list-only',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3266
                            help='List the tests instead of running them.'),
4205.3.2 by Robert Collins
Create fork and reinvoke parallel testing support.
3267
                     RegistryOption('parallel',
4205.3.5 by Robert Collins
Missing . on the parallel option.
3268
                        help="Run the test suite in parallel.",
4205.3.2 by Robert Collins
Create fork and reinvoke parallel testing support.
3269
                        lazy_registry=('bzrlib.tests', 'parallel_registry'),
3270
                        value_switches=False,
3271
                        ),
2394.2.2 by Ian Clatworthy
Add --randomize and update help
3272
                     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
3273
                            help='Randomize the order of tests using the given'
3274
                                 ' seed or "now" for the current time.'),
2394.2.2 by Ian Clatworthy
Add --randomize and update help
3275
                     Option('exclude', type=str, argname="PATTERN",
2394.2.6 by Ian Clatworthy
completed blackbox tests
3276
                            short_name='x',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3277
                            help='Exclude tests that match this regular'
3278
                                 ' expression.'),
4165.1.1 by Robert Collins
Add builtin subunit support.
3279
                     Option('subunit',
3280
                        help='Output test progress via subunit.'),
2658.3.3 by Daniel Watkins
Added UI support for bzr selftest --strict.
3281
                     Option('strict', help='Fail on missing dependencies or '
3282
                            'known failures.'),
3193.1.8 by Vincent Ladeuil
Add '--load-list' option to selftest.
3283
                     Option('load-list', type=str, argname='TESTLISTFILE',
3284
                            help='Load a test id list from a text file.'),
3390.1.1 by Andrew Bennetts
Add --debugflags/-E option to selftest.
3285
                     ListOption('debugflag', type=str, short_name='E',
3286
                                help='Turn on a selftest debug flag.'),
3649.6.4 by Vincent Ladeuil
selftest --starting-with now accepts multiple values.
3287
                     ListOption('starting-with', type=str, argname='TESTID',
3288
                                param_name='starting_with', short_name='s',
3289
                                help=
3290
                                'Load only the tests starting with TESTID.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
3291
                     ]
2204.3.4 by Alexander Belchenko
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback
3292
    encoding_type = 'replace'
1185.16.58 by mbp at sourcefrog
- run all selftests by default
3293
4000.2.3 by Robert Collins
Allow extra options to bzrlib.tests.selftest from plugins.
3294
    def __init__(self):
3295
        Command.__init__(self)
3296
        self.additional_selftest_args = {}
3297
2805.1.1 by Ian Clatworthy
Fix selftest --benchmark so verbose by default again
3298
    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)
3299
            transport=None, benchmark=None,
3300
            lsprof_timed=None, cache_dir=None,
3301
            first=False, list_only=False,
3198.1.1 by Vincent Ladeuil
Add --load-list option to selftest
3302
            randomize=None, exclude=None, strict=False,
4205.3.2 by Robert Collins
Create fork and reinvoke parallel testing support.
3303
            load_list=None, debugflag=None, starting_with=None, subunit=False,
3304
            parallel=None):
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
3305
        from bzrlib.tests import selftest
3306
        import bzrlib.benchmarks as benchmarks
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
3307
        from bzrlib.benchmarks import tree_creator
2321.2.1 by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
3308
3427.5.3 by John Arbash Meinel
Update the activate_deprecation_warnings so it can be skipped if there is already an error set.
3309
        # Make deprecation warnings visible, unless -Werror is set
3427.5.7 by John Arbash Meinel
Bring back always in the form of 'override'.
3310
        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.
3311
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
3312
        if cache_dir is not None:
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
3313
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2095.4.1 by Martin Pool
Better progress bars during tests
3314
        if testspecs_list is not None:
3315
            pattern = '|'.join(testspecs_list)
3316
        else:
3317
            pattern = ".*"
4165.1.1 by Robert Collins
Add builtin subunit support.
3318
        if subunit:
4165.1.2 by Robert Collins
Make a clear error when attempting to use subunit and it is not available.
3319
            try:
3320
                from bzrlib.tests import SubUnitBzrRunner
3321
            except ImportError:
3322
                raise errors.BzrCommandError("subunit not available. subunit "
3323
                    "needs to be installed to use --subunit.")
4165.1.1 by Robert Collins
Add builtin subunit support.
3324
            self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4205.3.2 by Robert Collins
Create fork and reinvoke parallel testing support.
3325
        if parallel:
3326
            self.additional_selftest_args.setdefault(
3327
                'suite_decorators', []).append(parallel)
2095.4.1 by Martin Pool
Better progress bars during tests
3328
        if benchmark:
3329
            test_suite_factory = benchmarks.test_suite
2805.1.1 by Ian Clatworthy
Fix selftest --benchmark so verbose by default again
3330
            # Unless user explicitly asks for quiet, be verbose in benchmarks
3331
            verbose = not is_quiet()
2095.4.1 by Martin Pool
Better progress bars during tests
3332
            # TODO: should possibly lock the history file...
2197.1.1 by Martin Pool
Use line buffering to write .perf_history
3333
            benchfile = open(".perf_history", "at", buffering=1)
2095.4.1 by Martin Pool
Better progress bars during tests
3334
        else:
3335
            test_suite_factory = None
3336
            benchfile = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3337
        try:
4000.2.4 by Robert Collins
PEP8ification of selftest_kwargs in cmd_selftest.
3338
            selftest_kwargs = {"verbose": verbose,
3339
                              "pattern": pattern,
3340
                              "stop_on_failure": one,
3341
                              "transport": transport,
3342
                              "test_suite_factory": test_suite_factory,
3343
                              "lsprof_timed": lsprof_timed,
3344
                              "bench_history": benchfile,
3345
                              "matching_tests_first": first,
3346
                              "list_only": list_only,
3347
                              "random_seed": randomize,
3348
                              "exclude_pattern": exclude,
3349
                              "strict": strict,
3350
                              "load_list": load_list,
3351
                              "debug_flags": debugflag,
3352
                              "starting_with": starting_with
4000.2.3 by Robert Collins
Allow extra options to bzrlib.tests.selftest from plugins.
3353
                              }
3354
            selftest_kwargs.update(self.additional_selftest_args)
3355
            result = selftest(**selftest_kwargs)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3356
        finally:
2095.4.1 by Martin Pool
Better progress bars during tests
3357
            if benchfile is not None:
3358
                benchfile.close()
3359
        return int(not result)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3360
3361
3362
class cmd_version(Command):
3363
    """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
3364
2785.1.2 by bialix at ukr
bugfix for #131100
3365
    encoding_type = 'replace'
3346.2.1 by Martin Pool
Add version --short option
3366
    takes_options = [
3367
        Option("short", help="Print just the version number."),
3368
        ]
2785.1.2 by bialix at ukr
bugfix for #131100
3369
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3370
    @display_command
3346.2.1 by Martin Pool
Add version --short option
3371
    def run(self, short=False):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
3372
        from bzrlib.version import show_version
3346.2.1 by Martin Pool
Add version --short option
3373
        if short:
3346.2.7 by Martin Pool
Commands should use self.outf not print
3374
            self.outf.write(bzrlib.version_string + '\n')
3346.2.1 by Martin Pool
Add version --short option
3375
        else:
3376
            show_version(to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3377
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
3378
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3379
class cmd_rocks(Command):
3380
    """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
3381
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3382
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
3383
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3384
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3385
    def run(self):
2227.4.1 by v.ladeuil+lp at free
Fix #78026.
3386
        print "It sure does!"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3387
3388
3389
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.
3390
    """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
3391
    # TODO: Options to specify revisions on either side, as if
3392
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3393
    takes_args = ['branch', 'other']
3394
    hidden = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3395
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3396
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3397
    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.
3398
        from bzrlib.revision import ensure_null
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3399
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
3400
        branch1 = Branch.open_containing(branch)[0]
3401
        branch2 = Branch.open_containing(other)[0]
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3402
        branch1.lock_read()
3403
        try:
3404
            branch2.lock_read()
3405
            try:
3406
                last1 = ensure_null(branch1.last_revision())
3407
                last2 = ensure_null(branch2.last_revision())
3408
3409
                graph = branch1.repository.get_graph(branch2.repository)
3410
                base_rev_id = graph.find_unique_lca(last1, last2)
3411
3412
                print 'merge base is revision %s' % base_rev_id
3413
            finally:
3414
                branch2.unlock()
3415
        finally:
3416
            branch1.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3417
3418
3419
class cmd_merge(Command):
3420
    """Perform a three-way merge.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3421
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
3422
    The source of the merge can be specified either in the form of a branch,
3423
    or in the form of a path to a file containing a merge directive generated
3424
    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:
3425
    or the branch most recently merged using --remember.
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
3426
3277.1.2 by Peter Schuller
As per feedback to previous attempt:
3427
    When merging a branch, by default the tip will be merged. To pick a different
3428
    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)
3429
    BASE and the second one as OTHER. Merging individual revisions, or a subset of
3430
    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'.
3431
3432
    Revision numbers are always relative to the branch being merged.
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
3433
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
3434
    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
3435
    branch, automatically determining an appropriate base.  If this
3436
    fails, you may need to give an explicit base.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3437
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
3438
    Merge will do its best to combine the changes in two branches, but there
3439
    are some kinds of problems only a human can fix.  When it encounters those,
3440
    it will mark a conflict.  A conflict means that you need to fix something,
3441
    before you should commit.
3442
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
3443
    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
3444
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
3445
    If there is no default branch set, the first merge will set it. After
3446
    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.
3447
    default, use --remember. The value will only be saved if the remote
3448
    location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
3449
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3450
    The results of the merge are placed into the destination working
3451
    directory, where they can be reviewed (with bzr diff), tested, and then
3452
    committed to record the result of the merge.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3453
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3454
    merge refuses to run if there are any uncommitted changes, unless
3455
    --force is given.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3456
3457
    :Examples:
3458
        To merge the latest revision from bzr.dev::
3459
3460
            bzr merge ../bzr.dev
3461
3462
        To merge changes up to and including revision 82 from bzr.dev::
3463
3464
            bzr merge -r 82 ../bzr.dev
3465
3466
        To merge the changes introduced by 82, without previous changes::
3467
3468
            bzr merge -r 81..82 ../bzr.dev
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
3469
4031.3.1 by Frank Aspell
Fixing various typos
3470
        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
3471
3472
            bzr merge /tmp/merge
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3473
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3474
3008.1.25 by Aaron Bentley
Set encoding exact on cmd_merge
3475
    encoding_type = 'exact'
4095.2.1 by Neil Martinsen-Burrell
Better help for bzr send
3476
    _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.
3477
    takes_args = ['location?']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3478
    takes_options = [
2839.5.1 by Alexander Belchenko
add -c option to merge command
3479
        'change',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3480
        'revision',
3481
        Option('force',
3482
               help='Merge even if the destination tree has uncommitted changes.'),
3483
        'merge-type',
3484
        'reprocess',
3485
        'remember',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3486
        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
3487
               "conflicts."),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3488
        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
3489
               ' from a working copy, instead of branch changes.'),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3490
        Option('pull', help='If the destination is already'
3491
                ' 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
3492
                ' source rather than merging.  When this happens,'
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3493
                ' you do not need to commit the result.'),
3494
        Option('directory',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3495
               help='Branch to merge into, '
3496
                    'rather than the one containing the working directory.',
3497
               short_name='d',
3498
               type=unicode,
3499
               ),
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3500
        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.
3501
    ]
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3502
3277.1.4 by Peter Schuller
As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.
3503
    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.
3504
            merge_type=None, show_base=False, reprocess=None, remember=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3505
            uncommitted=False, pull=False,
3506
            directory=None,
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3507
            preview=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3508
            ):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3509
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3510
            merge_type = _mod_merge.Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
3511
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3512
        if directory is None: directory = u'.'
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3513
        possible_transports = []
3514
        merger = None
3515
        allow_pending = True
3516
        verified = 'inapplicable'
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
3517
        tree = WorkingTree.open_containing(directory)[0]
4037.2.1 by Roberto Aguilar
Check for umcommitted changes.
3518
3519
        # die as quickly as possible if there are uncommitted changes
4037.2.2 by Roberto Aguilar
Updating uncommitted changes check.
3520
        try:
3521
            basis_tree = tree.revision_tree(tree.last_revision())
3522
        except errors.NoSuchRevision:
3523
            basis_tree = tree.basis_tree()
4104.8.1 by Robert Collins
Cherrypick the fix for merge --force onto 1.13.1
3524
        if not force:
3525
            changes = tree.changes_from(basis_tree)
3526
            if changes.has_changed():
3527
                raise errors.UncommittedChanges(tree)
4037.2.1 by Roberto Aguilar
Check for umcommitted changes.
3528
3586.1.31 by Ian Clatworthy
view filtering for pull, update & merge
3529
        view_info = _get_view_info_for_change_reporter(tree)
1551.10.25 by Aaron Bentley
Make ChangeReporter private
3530
        change_reporter = delta._ChangeReporter(
3586.1.31 by Ian Clatworthy
view filtering for pull, update & merge
3531
            unversioned_filter=tree.is_ignored, view_info=view_info)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3532
        cleanups = []
3533
        try:
3534
            pb = ui.ui_factory.nested_progress_bar()
3535
            cleanups.append(pb.finished)
3536
            tree.lock_write()
3537
            cleanups.append(tree.unlock)
1551.15.74 by Aaron Bentley
Textual updates from review
3538
            if location is not None:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
3539
                try:
3540
                    mergeable = bundle.read_mergeable_from_url(location,
3541
                        possible_transports=possible_transports)
3542
                except errors.NotABundle:
3543
                    mergeable = None
3544
                else:
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3545
                    if uncommitted:
3546
                        raise errors.BzrCommandError('Cannot use --uncommitted'
3547
                            ' with bundles or merge directives.')
3548
3549
                    if revision is not None:
3550
                        raise errors.BzrCommandError(
3551
                            'Cannot use -r with merge directives or bundles')
3552
                    merger, verified = _mod_merge.Merger.from_mergeable(tree,
3553
                       mergeable, pb)
3554
3555
            if merger is None and uncommitted:
3556
                if revision is not None and len(revision) > 0:
3557
                    raise errors.BzrCommandError('Cannot use --uncommitted and'
3558
                        ' --revision at the same time.')
1551.15.74 by Aaron Bentley
Textual updates from review
3559
                location = self._select_branch_location(tree, location)[0]
3560
                other_tree, other_path = WorkingTree.open_containing(location)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3561
                merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3562
                    pb)
3563
                allow_pending = False
3017.3.1 by Aaron Bentley
merge --uncommit can now specify single files (#136890)
3564
                if other_path != '':
3565
                    merger.interesting_files = [other_path]
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3566
3567
            if merger is None:
1551.15.75 by Aaron Bentley
_merger_from_branch -> _get_merger_from_branch
3568
                merger, allow_pending = self._get_merger_from_branch(tree,
1551.15.74 by Aaron Bentley
Textual updates from review
3569
                    location, revision, remember, possible_transports, pb)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3570
3571
            merger.merge_type = merge_type
3572
            merger.reprocess = reprocess
3573
            merger.show_base = show_base
3574
            self.sanity_check_merger(merger)
3575
            if (merger.base_rev_id == merger.other_rev_id and
3376.2.11 by Martin Pool
Compare to None using is/is not not ==
3576
                merger.other_rev_id is not None):
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3577
                note('Nothing to do.')
3578
                return 0
3579
            if pull:
3580
                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.
3581
                    raise errors.BzrCommandError('Cannot pull individual files')
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3582
                if (merger.base_rev_id == tree.last_revision()):
3583
                    result = tree.pull(merger.other_branch, False,
3584
                                       merger.other_rev_id)
3585
                    result.report(self.outf)
3586
                    return 0
4037.2.4 by Roberto Aguilar
Set check_basis to False.
3587
            merger.check_basis(False)
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3588
            if preview:
3589
                return self._do_preview(merger)
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3590
            else:
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3591
                return self._do_merge(merger, change_reporter, allow_pending,
3592
                                      verified)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3593
        finally:
3594
            for cleanup in reversed(cleanups):
3595
                cleanup()
3596
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3597
    def _do_preview(self, merger):
3598
        from bzrlib.diff import show_diff_trees
3599
        tree_merger = merger.make_merger()
3600
        tt = tree_merger.make_preview_transform()
3199.1.9 by Vincent Ladeuil
Aaron's review feedback.
3601
        try:
3602
            result_tree = tt.get_preview_tree()
3603
            show_diff_trees(merger.this_tree, result_tree, self.outf,
3604
                            old_label='', new_label='')
3605
        finally:
3606
            tt.finalize()
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
3607
3608
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
3609
        merger.change_reporter = change_reporter
3610
        conflict_count = merger.do_merge()
3611
        if allow_pending:
3612
            merger.set_pending()
3613
        if verified == 'failed':
3614
            warning('Preview patch does not match changes')
3615
        if conflict_count != 0:
3616
            return 1
3617
        else:
3618
            return 0
3619
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3620
    def sanity_check_merger(self, merger):
3621
        if (merger.show_base and
3622
            not merger.merge_type is _mod_merge.Merge3Merger):
3623
            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
3624
                                         " 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.
3625
        if merger.reprocess is None:
3626
            if merger.show_base:
3627
                merger.reprocess = False
3628
            else:
3629
                # Use reprocess if the merger supports it
3630
                merger.reprocess = merger.merge_type.supports_reprocess
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3631
        if merger.reprocess and not merger.merge_type.supports_reprocess:
3632
            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
3633
                                         " for merge type %s." %
3634
                                         merger.merge_type)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3635
        if merger.reprocess and merger.show_base:
3636
            raise errors.BzrCommandError("Cannot do conflict reduction and"
3637
                                         " show base.")
3638
1551.15.75 by Aaron Bentley
_merger_from_branch -> _get_merger_from_branch
3639
    def _get_merger_from_branch(self, tree, location, revision, remember,
3640
                                possible_transports, pb):
3641
        """Produce a merger from a location, assuming it refers to a branch."""
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3642
        from bzrlib.tag import _merge_tags_if_possible
3643
        # find the branch locations
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3644
        other_loc, user_location = self._select_branch_location(tree, location,
1551.15.74 by Aaron Bentley
Textual updates from review
3645
            revision, -1)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3646
        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
3647
            base_loc, _unused = self._select_branch_location(tree,
3648
                location, revision, 0)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3649
        else:
3650
            base_loc = other_loc
3651
        # Open the branches
3652
        other_branch, other_path = Branch.open_containing(other_loc,
3653
            possible_transports)
3654
        if base_loc == other_loc:
3655
            base_branch = other_branch
3656
        else:
3657
            base_branch, base_path = Branch.open_containing(base_loc,
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3658
                possible_transports)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3659
        # Find the revision ids
3660
        if revision is None or len(revision) < 1 or revision[-1] is None:
3661
            other_revision_id = _mod_revision.ensure_null(
3662
                other_branch.last_revision())
3663
        else:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
3664
            other_revision_id = revision[-1].as_revision_id(other_branch)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3665
        if (revision is not None and len(revision) == 2
3666
            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()
3667
            base_revision_id = revision[0].as_revision_id(base_branch)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3668
        else:
3669
            base_revision_id = None
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
3670
        # Remember where we merge from
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3671
        if ((remember or tree.branch.get_submit_branch() is None) and
3672
             user_location is not None):
3673
            tree.branch.set_submit_branch(other_branch.base)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3674
        _merge_tags_if_possible(other_branch, tree.branch)
3675
        merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3676
            other_revision_id, base_revision_id, other_branch, base_branch)
3677
        if other_path != '':
3678
            allow_pending = False
3679
            merger.interesting_files = [other_path]
1645.1.1 by Aaron Bentley
Implement single-file merge
3680
        else:
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
3681
            allow_pending = True
3682
        return merger, allow_pending
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3683
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3684
    def _select_branch_location(self, tree, user_location, revision=None,
1551.15.74 by Aaron Bentley
Textual updates from review
3685
                                index=None):
3686
        """Select a branch location, according to possible inputs.
3687
3688
        If provided, branches from ``revision`` are preferred.  (Both
3689
        ``revision`` and ``index`` must be supplied.)
3690
3691
        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
3692
        ``submit`` or ``parent`` location is used, and a note is printed.
1551.15.74 by Aaron Bentley
Textual updates from review
3693
3694
        :param tree: The working tree to select a branch for merging into
3695
        :param location: The location entered by the user
3696
        :param revision: The revision parameter to the command
3697
        :param index: The index to use for the revision parameter.  Negative
3698
            indices are permitted.
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3699
        :return: (selected_location, user_location).  The default location
3700
            will be the user-entered location.
1551.15.74 by Aaron Bentley
Textual updates from review
3701
        """
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3702
        if (revision is not None and index is not None
3703
            and revision[index] is not None):
3704
            branch = revision[index].get_branch()
3705
            if branch is not None:
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3706
                return branch, branch
3707
        if user_location is None:
3708
            location = self._get_remembered(tree, 'Merging from')
3709
        else:
3710
            location = user_location
3711
        return location, user_location
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
3712
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3713
    def _get_remembered(self, tree, verb_string):
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3714
        """Use tree.branch's parent if none was supplied.
3715
3716
        Report if the remembered location was used.
3717
        """
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3718
        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.
3719
        stored_location_type = "submit"
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
3720
        if stored_location is None:
3721
            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.
3722
            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
3723
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3724
        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
3725
            raise errors.BzrCommandError("No location specified or remembered")
3249.1.1 by Ian Clatworthy
fix merge redirection when using a remembered location
3726
        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.
3727
        note(u"%s remembered %s location %s", verb_string,
3728
                stored_location_type, display_url)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
3729
        return stored_location
3730
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3731
1185.35.4 by Aaron Bentley
Implemented remerge
3732
class cmd_remerge(Command):
3733
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3734
3735
    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
3736
    conflicts.  Some merge techniques are better than others, and remerge
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3737
    lets you try different ones on different files.
3738
3739
    The options for remerge have the same meaning and defaults as the ones for
3740
    merge.  The difference is that remerge can (only) be run when there is a
3741
    pending merge, and it lets you specify particular files.
3742
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3743
    :Examples:
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3744
        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
3745
        conflict regions, in addition to the usual THIS and OTHER texts::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3746
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3747
            bzr remerge --show-base
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
3748
3749
        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
3750
        additional processing to reduce the size of conflict regions::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3751
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3752
            bzr remerge --merge-type weave --reprocess foobar
2374.1.1 by Ian Clatworthy
Help and man page fixes
3753
    """
1185.35.4 by Aaron Bentley
Implemented remerge
3754
    takes_args = ['file*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3755
    takes_options = [
3756
            'merge-type',
3757
            'reprocess',
3758
            Option('show-base',
3759
                   help="Show base revision text in conflicts."),
3760
            ]
1185.35.4 by Aaron Bentley
Implemented remerge
3761
3762
    def run(self, file_list=None, merge_type=None, show_base=False,
3763
            reprocess=False):
3764
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3765
            merge_type = _mod_merge.Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
3766
        tree, file_list = tree_files(file_list)
3767
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
3768
        try:
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
3769
            parents = tree.get_parent_ids()
3770
            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
3771
                raise errors.BzrCommandError("Sorry, remerge only works after normal"
3772
                                             " merges.  Not cherrypicking or"
3773
                                             " multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
3774
            repository = tree.branch.repository
1185.35.4 by Aaron Bentley
Implemented remerge
3775
            interesting_ids = None
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3776
            new_conflicts = []
3777
            conflicts = tree.conflicts()
1185.35.4 by Aaron Bentley
Implemented remerge
3778
            if file_list is not None:
3779
                interesting_ids = set()
3780
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
3781
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
3782
                    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
3783
                        raise errors.NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
3784
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
3785
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
3786
                        continue
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3787
1508.1.15 by Robert Collins
Merge from mpool.
3788
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
3789
                        interesting_ids.add(ie.file_id)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3790
                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
3791
            else:
2080.2.3 by John Arbash Meinel
remerge only supports text or content conflicts
3792
                # Remerge only supports resolving contents conflicts
3793
                allowed_conflicts = ('text conflict', 'contents conflict')
3794
                restore_files = [c.path for c in conflicts
3795
                                 if c.typestring in allowed_conflicts]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3796
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
3797
            tree.set_conflicts(ConflictList(new_conflicts))
2080.2.1 by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
3798
            if file_list is not None:
1185.35.4 by Aaron Bentley
Implemented remerge
3799
                restore_files = file_list
3800
            for filename in restore_files:
3801
                try:
1508.1.15 by Robert Collins
Merge from mpool.
3802
                    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
3803
                except errors.NotConflicted:
1185.35.4 by Aaron Bentley
Implemented remerge
3804
                    pass
1551.15.52 by Aaron Bentley
Tweak from review comments
3805
            # Disable pending merges, because the file texts we are remerging
3806
            # have not had those merges performed.  If we use the wrong parents
3807
            # list, we imply that the working tree text has seen and rejected
3808
            # all the changes from the other tree, when in fact those changes
3809
            # have not yet been seen.
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3810
            pb = ui.ui_factory.nested_progress_bar()
1551.15.53 by Aaron Bentley
Restore old method of adjusting partents
3811
            tree.set_parent_ids(parents[:1])
1551.15.47 by Aaron Bentley
Fix remerge --weave
3812
            try:
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3813
                merger = _mod_merge.Merger.from_revision_ids(pb,
3814
                                                             tree, parents[1])
3815
                merger.interesting_ids = interesting_ids
3816
                merger.merge_type = merge_type
3817
                merger.show_base = show_base
3818
                merger.reprocess = reprocess
3819
                conflicts = merger.do_merge()
1551.15.47 by Aaron Bentley
Fix remerge --weave
3820
            finally:
1551.15.53 by Aaron Bentley
Restore old method of adjusting partents
3821
                tree.set_parent_ids(parents)
3062.2.8 by Aaron Bentley
Update remerge to use Merger.from_revision_ids
3822
                pb.finished()
1185.35.4 by Aaron Bentley
Implemented remerge
3823
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
3824
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
3825
        if conflicts > 0:
3826
            return 1
3827
        else:
3828
            return 0
3829
2023.1.1 by ghigo
add topics help
3830
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3831
class cmd_revert(Command):
1551.8.27 by Aaron Bentley
Update docs again
3832
    """Revert files to a previous revision.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3833
1551.8.27 by Aaron Bentley
Update docs again
3834
    Giving a list of files will revert only those files.  Otherwise, all files
3835
    will be reverted.  If the revision is not specified with '--revision', the
3836
    last committed revision is used.
1551.8.26 by Aaron Bentley
Update revert help text
3837
3838
    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.
3839
    merge instead.  For example, "merge . --revision -2..-3" will remove the
3840
    changes introduced by -2, without affecting the changes introduced by -1.
3841
    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
3842
1551.8.26 by Aaron Bentley
Update revert help text
3843
    By default, any files that have been manually changed will be backed up
3844
    first.  (Files changed only by merge are not backed up.)  Backup files have
1551.8.27 by Aaron Bentley
Update docs again
3845
    '.~#~' appended to their name, where # is a number.
3846
3847
    When you provide files, you can use their current pathname or the pathname
3848
    from the target revision.  So you can use revert to "undelete" a file by
3849
    name.  If you name a directory, all the contents of that directory will be
3850
    reverted.
2614.1.1 by Martin Pool
Doc for revert, #87548
3851
3852
    Any files that have been newly added since that revision will be deleted,
3853
    with a backup kept if appropriate.  Directories containing unknown files
3854
    will not be deleted.
2911.2.1 by Martin Pool
Better help for revert
3855
3856
    The working tree contains a list of pending merged revisions, which will
3857
    be included as parents in the next commit.  Normally, revert clears that
3006.1.1 by Adeodato Simó
Fix typos in revert's help.
3858
    list as well as reverting the files.  If any files are specified, revert
3859
    leaves the pending merge list alone and reverts only the files.  Use "bzr
2911.2.1 by Martin Pool
Better help for revert
3860
    revert ." in the tree root to revert all files but keep the merge record,
3861
    and "bzr revert --forget-merges" to clear the pending merge list without
3862
    reverting any files.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3863
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3864
3865
    _see_also = ['cat', 'export']
2598.1.6 by Martin Pool
Add help for --no-backup
3866
    takes_options = [
2851.2.1 by Martin Pool
Add revert --forget-merges
3867
        'revision',
3868
        Option('no-backup', "Do not save backups of reverted files."),
3869
        Option('forget-merges',
3870
               'Remove pending merge marker, without changing any files.'),
3871
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3872
    takes_args = ['file*']
3873
2851.2.1 by Martin Pool
Add revert --forget-merges
3874
    def run(self, revision=None, no_backup=False, file_list=None,
3875
            forget_merges=None):
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
3876
        tree, file_list = tree_files(file_list)
3737.2.1 by John Arbash Meinel
Take out a write lock right away for 'bzr revert'
3877
        tree.lock_write()
3878
        try:
3879
            if forget_merges:
3880
                tree.set_parent_ids(tree.get_parent_ids()[:1])
3881
            else:
3882
                self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3883
        finally:
3884
            tree.unlock()
2851.2.1 by Martin Pool
Add revert --forget-merges
3885
3886
    @staticmethod
3887
    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)
3888
        rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3889
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
3890
        try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3891
            tree.revert(file_list, rev_tree, not no_backup, pb,
3892
                report_changes=True)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
3893
        finally:
3894
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3895
3896
3897
class cmd_assert_fail(Command):
3898
    """Test reporting of assertion failures"""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3899
    # intended just for use in testing
3900
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3901
    hidden = True
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3902
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3903
    def run(self):
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3904
        raise AssertionError("always fails")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3905
3906
3907
class cmd_help(Command):
3908
    """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)
3909
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3910
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3911
    _see_also = ['topics']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3912
    takes_options = [
3913
            Option('long', 'Show help on all commands.'),
3914
            ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3915
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
3916
    aliases = ['?', '--help', '-?', '-h']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3917
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3918
    @display_command
3984.4.5 by Ian Clatworthy
help xxx is full help; xxx -h is concise help
3919
    def run(self, topic=None, long=False):
2023.1.1 by ghigo
add topics help
3920
        import bzrlib.help
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3921
        if topic is None and long:
3922
            topic = "commands"
3984.4.5 by Ian Clatworthy
help xxx is full help; xxx -h is concise help
3923
        bzrlib.help.help(topic)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3924
3925
3926
class cmd_shell_complete(Command):
3927
    """Show appropriate completions for context.
3928
2023.1.1 by ghigo
add topics help
3929
    For a list of all available commands, say 'bzr shell-complete'.
3930
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3931
    takes_args = ['context?']
3932
    aliases = ['s-c']
3933
    hidden = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3934
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3935
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3936
    def run(self, context=None):
3937
        import shellcomplete
3938
        shellcomplete.shellcomplete(context)
3939
3940
3941
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
3942
    """Show unmerged/unpulled revisions between two branches.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3943
2023.1.1 by ghigo
add topics help
3944
    OTHER_BRANCH may be local or remote.
3921.3.12 by Marius Kruger
add missing examples and NEWS
3945
4156.1.1 by Vincent Ladeuil
Trivial spelling correction to "bzr missing" documentation
3946
    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.
3947
    -r revision requests a specific revision, -r ..end or -r begin.. are
3948
    also valid.
3949
3921.3.12 by Marius Kruger
add missing examples and NEWS
3950
    :Examples:
3951
3952
        Determine the missing revisions between this and the branch at the
3953
        remembered pull location::
3954
3955
            bzr missing
3956
3957
        Determine the missing revisions between this and another branch::
3958
3959
            bzr missing http://server/branch
3960
3961
        Determine the missing revisions up to a specific revision on the other
3962
        branch::
3963
3964
            bzr missing -r ..-10
3965
3966
        Determine the missing revisions up to a specific revision on this
3967
        branch::
3968
3969
            bzr missing --my-revision ..-10
2023.1.1 by ghigo
add topics help
3970
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3971
3972
    _see_also = ['merge', 'pull']
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3973
    takes_args = ['other_branch?']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3974
    takes_options = [
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3975
        Option('reverse', 'Reverse the order of revisions.'),
3976
        Option('mine-only',
3977
               'Display changes in the local branch only.'),
3978
        Option('this' , 'Same as --mine-only.'),
3979
        Option('theirs-only',
3980
               'Display changes in the remote branch only.'),
3981
        Option('other', 'Same as --theirs-only.'),
3982
        'log-format',
3983
        'show-ids',
3984
        'verbose',
3985
        custom_help('revision',
3921.3.11 by Marius Kruger
swap options as per review:
3986
             help='Filter on other branch revisions (inclusive). '
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3987
                'See "help revisionspec" for details.'),
3921.3.11 by Marius Kruger
swap options as per review:
3988
        Option('my-revision',
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3989
            type=_parse_revision_str,
3921.3.11 by Marius Kruger
swap options as per review:
3990
            help='Filter on local branch revisions (inclusive). '
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3991
                'See "help revisionspec" for details.'),
4221.1.1 by Vincent Ladeuil
Clarify 'missing --include-merges' help.
3992
        Option('include-merges',
3993
               'Show all revisions in addition to the mainline ones.'),
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
3994
        ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
3995
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3996
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
3997
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3998
    def run(self, other_branch=None, reverse=False, mine_only=False,
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
3999
            theirs_only=False,
4000
            log_format=None, long=False, short=False, line=False,
4001
            show_ids=False, verbose=False, this=False, other=False,
3921.3.11 by Marius Kruger
swap options as per review:
4002
            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.
4003
        from bzrlib.missing import find_unmerged, iter_log_revisions
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
4004
        def message(s):
4005
            if not is_quiet():
4006
                self.outf.write(s)
2528.1.1 by Martin Pool
Better option names for missing (elliot)
4007
4008
        if this:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
4009
            mine_only = this
2528.1.1 by Martin Pool
Better option names for missing (elliot)
4010
        if other:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
4011
            theirs_only = other
4012
        # TODO: We should probably check that we don't have mine-only and
4013
        #       theirs-only set, but it gets complicated because we also have
4014
        #       this and other which could be used.
4015
        restrict = 'all'
4016
        if mine_only:
4017
            restrict = 'local'
4018
        elif theirs_only:
4019
            restrict = 'remote'
2528.1.1 by Martin Pool
Better option names for missing (elliot)
4020
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
4021
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
4022
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
4023
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
4024
            other_branch = parent
4025
            if other_branch is None:
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
4026
                raise errors.BzrCommandError("No peer location known"
2485.8.17 by Vincent Ladeuil
Fix the fix.
4027
                                             " or specified.")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
4028
            display_url = urlutils.unescape_for_display(parent,
4029
                                                        self.outf.encoding)
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
4030
            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.
4031
                    + display_url + "\n")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
4032
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
4033
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
4034
        if remote_branch.base == local_branch.base:
4035
            remote_branch = local_branch
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
4036
4037
        local_revid_range = _revision_range_to_revid_range(
3921.3.11 by Marius Kruger
swap options as per review:
4038
            _get_revision_range(my_revision, local_branch,
3921.3.9 by Marius Kruger
* add some blackbox tests and another whitebox test
4039
                self.name()))
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
4040
4041
        remote_revid_range = _revision_range_to_revid_range(
3921.3.11 by Marius Kruger
swap options as per review:
4042
            _get_revision_range(revision,
3921.3.9 by Marius Kruger
* add some blackbox tests and another whitebox test
4043
                remote_branch, self.name()))
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
4044
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
4045
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
4046
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
4047
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
4048
            try:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
4049
                local_extra, remote_extra = find_unmerged(
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
4050
                    local_branch, remote_branch, restrict,
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
4051
                    backward=not reverse,
3921.3.3 by Marius Kruger
tried to add `bzr missing -r1..-1` but failed :(
4052
                    include_merges=include_merges,
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
4053
                    local_revid_range=local_revid_range,
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
4054
                    remote_revid_range=remote_revid_range)
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
4055
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
4056
                if log_format is None:
4057
                    registry = log.log_formatter_registry
4058
                    log_format = registry.get_default(local_branch)
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
4059
                lf = log_format(to_file=self.outf,
4060
                                show_ids=show_ids,
4061
                                show_timezone='original')
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
4062
4063
                status_code = 0
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
4064
                if local_extra and not theirs_only:
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
4065
                    message("You have %d extra revision(s):\n" %
3778.5.2 by Martin Pool
review cleanups
4066
                        len(local_extra))
2485.8.13 by Vincent Ladeuil
merge bzr.dev@2495
4067
                    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.
4068
                                        local_branch.repository,
4069
                                        verbose):
4070
                        lf.log_revision(revision)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
4071
                    printed_local = True
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
4072
                    status_code = 1
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
4073
                else:
4074
                    printed_local = False
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
4075
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
4076
                if remote_extra and not mine_only:
4077
                    if printed_local is True:
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
4078
                        message("\n\n\n")
4079
                    message("You are missing %d revision(s):\n" %
3778.5.2 by Martin Pool
review cleanups
4080
                        len(remote_extra))
2485.8.13 by Vincent Ladeuil
merge bzr.dev@2495
4081
                    for revision in iter_log_revisions(remote_extra,
4082
                                        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.
4083
                                        verbose):
4084
                        lf.log_revision(revision)
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
4085
                    status_code = 1
4086
4087
                if mine_only and not local_extra:
4088
                    # We checked local, and found nothing extra
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
4089
                    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
4090
                elif theirs_only and not remote_extra:
4091
                    # We checked remote, and found nothing extra
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
4092
                    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
4093
                elif not (mine_only or theirs_only or local_extra or
4094
                          remote_extra):
4095
                    # We checked both branches, and neither one had extra
4096
                    # revisions
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
4097
                    message("Branches are up to date.\n")
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
4098
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
4099
                remote_branch.unlock()
4100
        finally:
4101
            local_branch.unlock()
4102
        if not status_code and parent is None and other_branch is not None:
4103
            local_branch.lock_write()
4104
            try:
4105
                # handle race conditions - a parent might be set while we run.
4106
                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
4107
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
4108
            finally:
4109
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
4110
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4111
4112
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
4113
class cmd_pack(Command):
4114
    """Compress the data within a repository."""
4115
4116
    _see_also = ['repositories']
4117
    takes_args = ['branch_or_repo?']
4118
4119
    def run(self, branch_or_repo='.'):
4120
        dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4121
        try:
4122
            branch = dir.open_branch()
4123
            repository = branch.repository
4124
        except errors.NotBranchError:
4125
            repository = dir.open_repository()
4126
        repository.pack()
4127
4128
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4129
class cmd_plugins(Command):
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
4130
    """List the installed plugins.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4131
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
4132
    This command displays the list of installed plugins including
4133
    version of plugin and a short description of each.
4134
4135
    --verbose shows the path where each plugin is located.
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
4136
4137
    A plugin is an external component for Bazaar that extends the
4138
    revision control system, by adding or replacing code in Bazaar.
4139
    Plugins can do a variety of things, including overriding commands,
4140
    adding new commands, providing additional network transports and
4141
    customizing log output.
4142
4143
    See the Bazaar web site, http://bazaar-vcs.org, for further
4144
    information on plugins including where to find them and how to
4145
    install them. Instructions are also provided there on how to
4146
    write new plugins using the Python programming language.
4147
    """
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
4148
    takes_options = ['verbose']
2629.1.1 by Ian Clatworthy
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
4149
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4150
    @display_command
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
4151
    def run(self, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4152
        import bzrlib.plugin
4153
        from inspect import getdoc
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
4154
        result = []
2762.2.1 by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square
4155
        for name, plugin in bzrlib.plugin.plugins().items():
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
4156
            version = plugin.__version__
4157
            if version == 'unknown':
4158
                version = ''
4159
            name_ver = '%s %s' % (name, version)
2762.2.1 by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square
4160
            d = getdoc(plugin.module)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4161
            if d:
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
4162
                doc = d.split('\n')[0]
4163
            else:
4164
                doc = '(no description)'
4165
            result.append((name_ver, doc, plugin.path()))
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
4166
        for name_ver, doc, path in sorted(result):
4167
            print name_ver
4168
            print '   ', doc
4169
            if verbose:
4170
                print '   ', path
4171
            print
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4172
4173
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
4174
class cmd_testament(Command):
4175
    """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
4176
    takes_options = [
4177
            'revision',
4178
            Option('long', help='Produce long-format testament.'),
4179
            Option('strict',
4180
                   help='Produce a strict-format testament.')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
4181
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4182
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
4183
    def run(self, branch=u'.', revision=None, long=False, strict=False):
4184
        from bzrlib.testament import Testament, StrictTestament
4185
        if strict is True:
4186
            testament_class = StrictTestament
4187
        else:
4188
            testament_class = Testament
3530.2.1 by John Arbash Meinel
'bzr testament' should just open the branch
4189
        if branch == '.':
4190
            b = Branch.open_containing(branch)[0]
4191
        else:
4192
            b = Branch.open(branch)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
4193
        b.lock_read()
4194
        try:
4195
            if revision is None:
4196
                rev_id = b.last_revision()
4197
            else:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
4198
                rev_id = revision[0].as_revision_id(b)
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
4199
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
4200
            if long:
4201
                sys.stdout.writelines(t.as_text_lines())
4202
            else:
4203
                sys.stdout.write(t.as_short_text())
4204
        finally:
4205
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4206
4207
4208
class cmd_annotate(Command):
4209
    """Show the origin of each line in a file.
4210
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
4211
    This prints out the given file with an annotation on the left side
4212
    indicating which revision, author and date introduced the change.
4213
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4214
    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
4215
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4216
    """
4217
    # TODO: annotate directories; showing when each file was last changed
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4218
    # 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
4219
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
4220
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4221
    takes_args = ['filename']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4222
    takes_options = [Option('all', help='Show annotations on all lines.'),
4223
                     Option('long', help='Show commit date in annotations.'),
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
4224
                     'revision',
4225
                     'show-ids',
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
4226
                     ]
2593.1.1 by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations.
4227
    encoding_type = 'exact'
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4228
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4229
    @display_command
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
4230
    def run(self, filename, all=False, long=False, revision=None,
4231
            show_ids=False):
3603.4.1 by Robert Collins
Implement lookups into the current working tree for bzr annotate, fixing bug 3439.
4232
        from bzrlib.annotate import annotate_file, annotate_file_tree
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
4233
        wt, branch, relpath = \
4234
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4235
        if wt is not None:
4236
            wt.lock_read()
4237
        else:
4238
            branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4239
        try:
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
4240
            tree = _get_one_revision_tree('annotate', revision, branch=branch)
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
4241
            if wt is not None:
4242
                file_id = wt.path2id(relpath)
4243
            else:
4244
                file_id = tree.path2id(relpath)
2561.2.1 by James Westby
Display a useful error message when annotating a non-existant file (#122656)
4245
            if file_id is None:
2561.2.2 by James Westby
Fix up with comments from Aaron.
4246
                raise errors.NotVersionedError(filename)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4247
            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.
4248
            if wt is not None and revision is None:
4249
                # If there is a tree and we're not annotating historical
4250
                # versions, annotate the working tree's content.
4251
                annotate_file_tree(wt, file_id, self.outf, long, all,
4252
                    show_ids=show_ids)
4253
            else:
4254
                annotate_file(branch, file_version, file_id, long, all, self.outf,
4255
                              show_ids=show_ids)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
4256
        finally:
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
4257
            if wt is not None:
4258
                wt.unlock()
4259
            else:
4260
                branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
4261
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
4262
4263
class cmd_re_sign(Command):
4264
    """Create a digital signature for an existing revision."""
4265
    # TODO be able to replace existing ones.
4266
4267
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
4268
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
4269
    takes_options = ['revision']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4270
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
4271
    def run(self, revision_id_list=None, revision=None):
4272
        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
4273
            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
4274
        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
4275
            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)
4276
        b = WorkingTree.open_containing(u'.')[0].branch
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
4277
        b.lock_write()
4278
        try:
4279
            return self._run(b, revision_id_list, revision)
4280
        finally:
4281
            b.unlock()
4282
4283
    def _run(self, b, revision_id_list, revision):
4284
        import bzrlib.gpg as gpg
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
4285
        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
4286
        if revision_id_list is not None:
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
4287
            b.repository.start_write_group()
4288
            try:
4289
                for revision_id in revision_id_list:
4290
                    b.repository.sign_revision(revision_id, gpg_strategy)
4291
            except:
4292
                b.repository.abort_write_group()
4293
                raise
4294
            else:
4295
                b.repository.commit_write_group()
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
4296
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
4297
            if len(revision) == 1:
4298
                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.
4299
                b.repository.start_write_group()
4300
                try:
4301
                    b.repository.sign_revision(rev_id, gpg_strategy)
4302
                except:
4303
                    b.repository.abort_write_group()
4304
                    raise
4305
                else:
4306
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
4307
            elif len(revision) == 2:
4308
                # are they both on rh- if so we can walk between them
4309
                # might be nice to have a range helper for arbitrary
4310
                # revision paths. hmm.
4311
                from_revno, from_revid = revision[0].in_history(b)
4312
                to_revno, to_revid = revision[1].in_history(b)
4313
                if to_revid is None:
4314
                    to_revno = b.revno()
4315
                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
4316
                    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.
4317
                b.repository.start_write_group()
4318
                try:
4319
                    for revno in range(from_revno, to_revno + 1):
4320
                        b.repository.sign_revision(b.get_rev_id(revno),
4321
                                                   gpg_strategy)
4322
                except:
4323
                    b.repository.abort_write_group()
4324
                    raise
4325
                else:
4326
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
4327
            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
4328
                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.
4329
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
4330
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4331
class cmd_bind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
4332
    """Convert the current branch into a checkout of the supplied branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4333
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
4334
    Once converted into a checkout, commits must succeed on the master branch
4335
    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.
4336
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
4337
    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.
4338
    locally, in which case binding will update the the local nickname to be
4339
    that of the master.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4340
    """
4341
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4342
    _see_also = ['checkouts', 'unbind']
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
4343
    takes_args = ['location?']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4344
    takes_options = []
4345
4346
    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
4347
        b, relpath = Branch.open_containing(u'.')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
4348
        if location is None:
4349
            try:
4350
                location = b.get_old_bound_location()
4351
            except errors.UpgradeRequired:
4352
                raise errors.BzrCommandError('No location supplied.  '
4353
                    'This format does not remember old locations.')
4354
            else:
4355
                if location is None:
2230.3.45 by Aaron Bentley
Change error message (mpool)
4356
                    raise errors.BzrCommandError('No location supplied and no '
4357
                        'previous location known')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4358
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
4359
        try:
4360
            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
4361
        except errors.DivergedBranches:
4362
            raise errors.BzrCommandError('These branches have diverged.'
4363
                                         ' Try merging, and then bind again.')
3565.6.11 by Marius Kruger
Bind now updates explicit nicks
4364
        if b.get_config().has_explicit_nickname():
4365
            b.nick = b_other.nick
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4366
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
4367
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4368
class cmd_unbind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
4369
    """Convert the current checkout into a regular branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4370
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
4371
    After unbinding, the local branch is considered independent and subsequent
4372
    commits will be local only.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4373
    """
4374
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4375
    _see_also = ['checkouts', 'bind']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
4376
    takes_args = []
4377
    takes_options = []
4378
4379
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
4380
        b, relpath = Branch.open_containing(u'.')
4381
        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
4382
            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
4383
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
4384
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
4385
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4386
    """Remove the last committed revision.
4387
4388
    --verbose will print out what is being removed.
4389
    --dry-run will go through all the motions, but not actually
4390
    remove anything.
2747.2.1 by Daniel Watkins
Modified the help message of 'uncommit'.
4391
4392
    If --revision is specified, uncommit revisions to leave the branch at the
4393
    specified revision.  For example, "bzr uncommit -r 15" will leave the
4394
    branch at revision 15.
4395
1551.19.39 by Aaron Bentley
Update 'uncommit' docs
4396
    Uncommit leaves the working tree ready for a new commit.  The only change
4397
    it may make is to restore any pending merges that were present before
4398
    the commit.
1553.5.34 by Martin Pool
Stub lock-breaking command
4399
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
4400
1553.5.34 by Martin Pool
Stub lock-breaking command
4401
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
4402
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
4403
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
4404
    # information in shared branches as well.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4405
    _see_also = ['commit']
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
4406
    takes_options = ['verbose', 'revision',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4407
                    Option('dry-run', help='Don\'t actually make changes.'),
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4408
                    Option('force', help='Say yes to all questions.'),
4409
                    Option('local',
4410
                           help="Only remove the commits from the local branch"
4411
                                " when in a checkout."
4412
                           ),
4413
                    ]
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4414
    takes_args = ['location?']
4415
    aliases = []
3101.1.1 by Aaron Bentley
Uncommit doesn't throw when it encounters un-encodable characters
4416
    encoding_type = 'replace'
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4417
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
4418
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4419
            dry_run=False, verbose=False,
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4420
            revision=None, force=False, local=False):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4421
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
4422
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
4423
        control, relpath = bzrdir.BzrDir.open_containing(location)
4424
        try:
4425
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
4426
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
4427
        except (errors.NoWorkingTree, errors.NotLocalUrl):
4428
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
4429
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4430
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
4431
        if tree is not None:
4432
            tree.lock_write()
4433
        else:
4434
            b.lock_write()
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
4435
        try:
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4436
            return self._run(b, tree, dry_run, verbose, revision, force,
4437
                             local=local)
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
4438
        finally:
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
4439
            if tree is not None:
4440
                tree.unlock()
4441
            else:
4442
                b.unlock()
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
4443
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4444
    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.
4445
        from bzrlib.log import log_formatter, show_log
4446
        from bzrlib.uncommit import uncommit
4447
4448
        last_revno, last_rev_id = b.last_revision_info()
4449
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
4450
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4451
        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.
4452
            revno = last_revno
4453
            rev_id = last_rev_id
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4454
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
4455
            # 'bzr uncommit -r 10' actually means uncommit
4456
            # so that the final tree is at revno 10.
4457
            # but bzrlib.uncommit.uncommit() actually uncommits
4458
            # the revisions that are supplied.
4459
            # 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.
4460
            revno = revision[0].in_history(b).revno + 1
4461
            if revno <= last_revno:
4462
                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
4463
2948.2.2 by John Arbash Meinel
Re-introduce the None check in case someone asks to uncommit *to* the last revision
4464
        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
4465
            self.outf.write('No revisions to uncommit.\n')
4466
            return 1
4467
4468
        lf = log_formatter('short',
4469
                           to_file=self.outf,
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
4470
                           show_timezone='original')
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
4471
4472
        show_log(b,
4473
                 lf,
4474
                 verbose=False,
4475
                 direction='forward',
4476
                 start_revision=revno,
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
4477
                 end_revision=last_revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4478
4479
        if dry_run:
4480
            print 'Dry-run, pretending to remove the above revisions.'
4481
            if not force:
4482
                val = raw_input('Press <enter> to continue')
4483
        else:
4484
            print 'The above revision(s) will be removed.'
4485
            if not force:
4486
                val = raw_input('Are you sure [y/N]? ')
4487
                if val.lower() not in ('y', 'yes'):
4488
                    print 'Canceled'
4489
                    return 0
4490
3629.1.1 by John Arbash Meinel
Change 'bzr uncommit' to display the revision ids and log them.
4491
        mutter('Uncommitting from {%s} to {%s}',
4492
               last_rev_id, rev_id)
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
4493
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3280.4.1 by John Arbash Meinel
Add uncommit --local.
4494
                 revno=revno, local=local)
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
4495
        note('You can restore the old tip by running:\n'
4496
             '  bzr pull . -r revid:%s', last_rev_id)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
4497
4498
1553.5.34 by Martin Pool
Stub lock-breaking command
4499
class cmd_break_lock(Command):
4500
    """Break a dead lock on a repository, branch or working directory.
4501
1553.5.35 by Martin Pool
Start break-lock --show
4502
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
4503
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
4504
4505
    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
4506
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4507
    :Examples:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
4508
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
4509
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
4510
    takes_args = ['location?']
4511
4512
    def run(self, location=None, show=False):
4513
        if location is None:
4514
            location = u'.'
4515
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
4516
        try:
4517
            control.break_lock()
4518
        except NotImplementedError:
4519
            pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4520
1553.5.35 by Martin Pool
Start break-lock --show
4521
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
4522
class cmd_wait_until_signalled(Command):
4523
    """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4524
4525
    This just prints a line to signal when it is ready, then blocks on stdin.
4526
    """
4527
4528
    hidden = True
4529
4530
    def run(self):
1910.17.6 by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print.
4531
        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
4532
        sys.stdout.flush()
4533
        sys.stdin.readline()
4534
1553.5.35 by Martin Pool
Start break-lock --show
4535
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4536
class cmd_serve(Command):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
4537
    """Run the bzr server."""
4538
4539
    aliases = ['server']
4540
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4541
    takes_options = [
4542
        Option('inet',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4543
               help='Serve on stdin/out for use from inetd or sshd.'),
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
4544
        RegistryOption('protocol', 
4545
               help="Protocol to serve.", 
4370.4.6 by Jelmer Vernooij
Move server protocol registry to bzrlib.transport.
4546
               lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
4547
               value_switches=True),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4548
        Option('port',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4549
               help='Listen for connections on nominated port of the form '
4550
                    '[hostname:]portnumber.  Passing 0 as the port number will '
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
4551
                    'result in a dynamically allocated port.  The default port '
4552
                    'depends on the protocol.',
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
4553
               type=str),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4554
        Option('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4555
               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
4556
               type=unicode),
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
4557
        Option('allow-writes',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4558
               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`.
4559
                    '--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
4560
                    'the served directory and below.'
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
4561
                ),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
4562
        ]
4563
3955.1.4 by Jonathan Lange
Docstrings and extraction of method to get the smart server.
4564
    def get_host_and_port(self, port):
4565
        """Return the host and port to run the smart server on.
4566
4370.4.3 by Jelmer Vernooij
Move host/port parsing to early in bzr-serve.
4567
        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.
4568
4569
        If 'port' has a colon in it, the string before the colon will be
4570
        interpreted as the host.
4571
4572
        :param port: A string of the port to run the server on.
4573
        :return: A tuple of (host, port), where 'host' is a host name or IP,
4574
            and port is an integer TCP/IP port.
4575
        """
4370.4.3 by Jelmer Vernooij
Move host/port parsing to early in bzr-serve.
4576
        host = None
4370.4.7 by Jelmer Vernooij
Review feedback from Ian.
4577
        if port is not None:
3955.1.2 by Jonathan Lange
Extract the port-getting logic. Use note() rather than print()
4578
            if ':' in port:
4579
                host, port = port.split(':')
4580
            port = int(port)
4581
        return host, port
4582
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
4583
    def run(self, port=None, inet=False, directory=None, allow_writes=False,
4584
            protocol=None):
4370.4.6 by Jelmer Vernooij
Move server protocol registry to bzrlib.transport.
4585
        from bzrlib.transport import get_transport, transport_server_registry
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
4586
        if directory is None:
4587
            directory = os.getcwd()
4588
        if protocol is None:
4370.4.6 by Jelmer Vernooij
Move server protocol registry to bzrlib.transport.
4589
            protocol = transport_server_registry.get()
4370.4.3 by Jelmer Vernooij
Move host/port parsing to early in bzr-serve.
4590
        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.
4591
        url = urlutils.local_path_to_url(directory)
4592
        if not allow_writes:
4593
            url = 'readonly+' + url
4594
        transport = get_transport(url)
4370.4.6 by Jelmer Vernooij
Move server protocol registry to bzrlib.transport.
4595
        protocol(transport, host, port, inet)
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
4596
3955.1.2 by Jonathan Lange
Extract the port-getting logic. Use note() rather than print()
4597
1731.2.7 by Aaron Bentley
Add join command
4598
class cmd_join(Command):
4251.1.2 by Aaron Bentley
Hide the --reference option.
4599
    """Combine a tree into its containing tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4600
4251.1.2 by Aaron Bentley
Hide the --reference option.
4601
    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
4602
4603
    The TREE argument should be an independent tree, inside another tree, but
4604
    not part of it.  (Such trees can be produced by "bzr split", but also by
4605
    running "bzr branch" with the target inside a tree.)
4606
4607
    The result is a combined tree, with the subtree no longer an independant
4608
    part.  This is marked as a merge of the subtree into the containing tree,
4609
    and all history is preserved.
1731.2.7 by Aaron Bentley
Add join command
4610
    """
4611
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4612
    _see_also = ['split']
1731.2.7 by Aaron Bentley
Add join command
4613
    takes_args = ['tree']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4614
    takes_options = [
4251.1.2 by Aaron Bentley
Hide the --reference option.
4615
            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
4616
            ]
1731.2.7 by Aaron Bentley
Add join command
4617
2100.3.11 by Aaron Bentley
Add join --reference support
4618
    def run(self, tree, reference=False):
1731.2.7 by Aaron Bentley
Add join command
4619
        sub_tree = WorkingTree.open(tree)
4620
        parent_dir = osutils.dirname(sub_tree.basedir)
4621
        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
4622
        repo = containing_tree.branch.repository
4623
        if not repo.supports_rich_root():
4624
            raise errors.BzrCommandError(
4625
                "Can't join trees because %s doesn't support rich root data.\n"
4626
                "You can use bzr upgrade on the repository."
4627
                % (repo,))
2100.3.11 by Aaron Bentley
Add join --reference support
4628
        if reference:
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
4629
            try:
2100.3.11 by Aaron Bentley
Add join --reference support
4630
                containing_tree.add_reference(sub_tree)
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
4631
            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
4632
                # XXX: Would be better to just raise a nicely printable
4633
                # exception from the real origin.  Also below.  mbp 20070306
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
4634
                raise errors.BzrCommandError("Cannot join %s.  %s" %
2100.3.11 by Aaron Bentley
Add join --reference support
4635
                                             (tree, e.reason))
4636
        else:
4637
            try:
4638
                containing_tree.subsume(sub_tree)
4639
            except errors.BadSubsumeSource, e:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4640
                raise errors.BzrCommandError("Cannot join %s.  %s" %
2100.3.11 by Aaron Bentley
Add join --reference support
4641
                                             (tree, e.reason))
1553.5.35 by Martin Pool
Start break-lock --show
4642
1731.2.22 by Aaron Bentley
Initial work on split command
4643
4644
class cmd_split(Command):
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
4645
    """Split a subdirectory of a tree into a separate tree.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
4646
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
4647
    This command will produce a target tree in a format that supports
4648
    rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be
4649
    converted into earlier formats like 'dirstate-tags'.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
4650
4651
    The TREE argument should be a subdirectory of a working tree.  That
4652
    subdirectory will be converted into an independent tree, with its own
4653
    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
4654
    """
4655
4251.1.4 by Aaron Bentley
Uncomment split's 'See also:join'
4656
    _see_also = ['join']
1731.2.22 by Aaron Bentley
Initial work on split command
4657
    takes_args = ['tree']
4658
4659
    def run(self, tree):
4660
        containing_tree, subdir = WorkingTree.open_containing(tree)
4661
        sub_id = containing_tree.path2id(subdir)
4662
        if sub_id is None:
4663
            raise errors.NotVersionedError(subdir)
1731.2.23 by Aaron Bentley
Throw user-friendly error splitting in shared repo with wrong format
4664
        try:
4665
            containing_tree.extract(sub_id)
4666
        except errors.RootNotRich:
4667
            raise errors.UpgradeRequired(containing_tree.branch.base)
1731.2.22 by Aaron Bentley
Initial work on split command
4668
4669
1551.12.8 by Aaron Bentley
Add merge-directive command
4670
class cmd_merge_directive(Command):
1551.12.32 by Aaron Bentley
Improve merge directive help
4671
    """Generate a merge directive for auto-merge tools.
4672
4673
    A directive requests a merge to be performed, and also provides all the
4674
    information necessary to do so.  This means it must either include a
4675
    revision bundle, or the location of a branch containing the desired
4676
    revision.
4677
4678
    A submit branch (the location to merge into) must be supplied the first
4679
    time the command is issued.  After it has been supplied once, it will
4680
    be remembered as the default.
4681
4682
    A public branch is optional if a revision bundle is supplied, but required
4683
    if --diff or --plain is specified.  It will be remembered as the default
4684
    after the first use.
4685
    """
1551.12.20 by Aaron Bentley
Pull directive registry into command class
4686
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4687
    takes_args = ['submit_branch?', 'public_branch?']
4688
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4689
    hidden = True
4690
2681.1.4 by Aaron Bentley
Fix reference to told submit command
4691
    _see_also = ['send']
2520.4.121 by Aaron Bentley
Polish up submit command
4692
1551.12.43 by Aaron Bentley
Misc changes from review
4693
    takes_options = [
4694
        RegistryOption.from_kwargs('patch-type',
2681.1.7 by Aaron Bentley
Fix option grammar
4695
            '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
4696
            title='Patch type',
4697
            value_switches=True,
4698
            enum_switch=False,
4699
            bundle='Bazaar revision bundle (default).',
4700
            diff='Normal unified diff.',
4701
            plain='No patch, just directive.'),
4702
        Option('sign', help='GPG-sign the directive.'), 'revision',
1551.12.26 by Aaron Bentley
Get email working, with optional message
4703
        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
4704
            help='Instead of printing the directive, email to this address.'),
1551.12.27 by Aaron Bentley
support custom message everywhere
4705
        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
4706
            help='Message to use when committing this merge.')
1551.12.27 by Aaron Bentley
support custom message everywhere
4707
        ]
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4708
2530.2.1 by Adeodato Simó
Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
4709
    encoding_type = 'exact'
4710
1551.12.16 by Aaron Bentley
Enable signing merge directives
4711
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
1551.12.27 by Aaron Bentley
support custom message everywhere
4712
            sign=False, revision=None, mail_to=None, message=None):
2490.2.28 by Aaron Bentley
Fix handling of null revision
4713
        from bzrlib.revision import ensure_null, NULL_REVISION
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4714
        include_patch, include_bundle = {
4715
            'plain': (False, False),
4716
            'diff': (True, False),
4717
            'bundle': (True, True),
4718
            }[patch_type]
1551.12.8 by Aaron Bentley
Add merge-directive command
4719
        branch = Branch.open('.')
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4720
        stored_submit_branch = branch.get_submit_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4721
        if submit_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4722
            submit_branch = stored_submit_branch
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4723
        else:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4724
            if stored_submit_branch is None:
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4725
                branch.set_submit_branch(submit_branch)
4726
        if submit_branch is None:
4727
            submit_branch = branch.get_parent()
4728
        if submit_branch is None:
4729
            raise errors.BzrCommandError('No submit branch specified or known')
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4730
4731
        stored_public_branch = branch.get_public_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4732
        if public_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4733
            public_branch = stored_public_branch
4734
        elif stored_public_branch is None:
4735
            branch.set_public_branch(public_branch)
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4736
        if not include_bundle and public_branch is None:
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
4737
            raise errors.BzrCommandError('No public branch specified or'
4738
                                         ' known')
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4739
        base_revision_id = None
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4740
        if revision is not None:
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4741
            if len(revision) > 2:
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4742
                raise errors.BzrCommandError('bzr merge-directive takes '
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4743
                    '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()
4744
            revision_id = revision[-1].as_revision_id(branch)
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4745
            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()
4746
                base_revision_id = revision[0].as_revision_id(branch)
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4747
        else:
4748
            revision_id = branch.last_revision()
2490.2.28 by Aaron Bentley
Fix handling of null revision
4749
        revision_id = ensure_null(revision_id)
4750
        if revision_id == NULL_REVISION:
4751
            raise errors.BzrCommandError('No revisions to bundle.')
2520.4.73 by Aaron Bentley
Implement new merge directive format
4752
        directive = merge_directive.MergeDirective2.from_objects(
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4753
            branch.repository, revision_id, time.time(),
1551.12.8 by Aaron Bentley
Add merge-directive command
4754
            osutils.local_time_offset(), submit_branch,
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4755
            public_branch=public_branch, include_patch=include_patch,
4756
            include_bundle=include_bundle, message=message,
4757
            base_revision_id=base_revision_id)
1551.12.26 by Aaron Bentley
Get email working, with optional message
4758
        if mail_to is None:
4759
            if sign:
4760
                self.outf.write(directive.to_signed(branch))
4761
            else:
4762
                self.outf.writelines(directive.to_lines())
1551.12.16 by Aaron Bentley
Enable signing merge directives
4763
        else:
1551.12.26 by Aaron Bentley
Get email working, with optional message
4764
            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.
4765
            s = SMTPConnection(branch.get_config())
4766
            s.send_email(message)
1551.12.8 by Aaron Bentley
Add merge-directive command
4767
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4768
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
4769
class cmd_send(Command):
4770
    """Mail or create a merge-directive for submitting changes.
4771
4772
    A merge directive provides many things needed for requesting merges:
4773
4774
    * A machine-readable description of the merge to perform
4775
4776
    * An optional patch that is a preview of the changes requested
4777
4778
    * An optional bundle of revision data, so that the changes can be applied
4779
      directly from the merge directive, without retrieving data from a
4780
      branch.
4781
4782
    If --no-bundle is specified, then public_branch is needed (and must be
4783
    up-to-date), so that the receiver can perform the merge using the
4784
    public_branch.  The public_branch is always included if known, so that
4785
    people can check it later.
4786
4787
    The submit branch defaults to the parent, but can be overridden.  Both
4788
    submit branch and public branch will be remembered if supplied.
4789
4790
    If a public_branch is known for the submit_branch, that public submit
4791
    branch is used in the merge instructions.  This means that a local mirror
4792
    can be used as your actual submit branch, once you have set public_branch
4793
    for that mirror.
4794
4795
    Mail is sent using your preferred mail program.  This should be transparent
4796
    on Windows (it uses MAPI).  On Linux, it requires the xdg-email utility.
4797
    If the preferred client can't be found (or used), your editor will be used.
4798
4799
    To use a specific mail program, set the mail_client configuration option.
4800
    (For Thunderbird 1.5, this works around some bugs.)  Supported values for
4801
    specific clients are "claws", "evolution", "kmail", "mutt", and
4802
    "thunderbird"; generic options are "default", "editor", "emacsclient",
4803
    "mapi", and "xdg-email".  Plugins may also add supported clients.
4804
4805
    If mail is being sent, a to address is required.  This can be supplied
4806
    either on the commandline, by setting the submit_to configuration
4807
    option in the branch itself or the child_submit_to configuration option
4808
    in the submit branch.
4809
4810
    Two formats are currently supported: "4" uses revision bundle format 4 and
4811
    merge directive format 2.  It is significantly faster and smaller than
4812
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
4813
    default.  "0.9" uses revision bundle format 0.9 and merge directive
4814
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
4815
4816
    The merge directives created by bzr send may be applied using bzr merge or
4817
    bzr pull by specifying a file containing a merge directive as the location.
4818
    """
4819
4820
    encoding_type = 'exact'
4821
4822
    _see_also = ['merge', 'pull']
4823
4824
    takes_args = ['submit_branch?', 'public_branch?']
4825
4826
    takes_options = [
4827
        Option('no-bundle',
4828
               help='Do not include a bundle in the merge directive.'),
4829
        Option('no-patch', help='Do not include a preview patch in the merge'
4830
               ' directive.'),
4831
        Option('remember',
4832
               help='Remember submit and public branch.'),
4833
        Option('from',
4834
               help='Branch to generate the submission from, '
4835
               'rather than the one containing the working directory.',
4836
               short_name='f',
4837
               type=unicode),
4838
        Option('output', short_name='o',
4839
               help='Write merge directive to this file; '
4840
                    'use - for stdout.',
4841
               type=unicode),
4842
        Option('mail-to', help='Mail the request to this address.',
4843
               type=unicode),
4844
        'revision',
4845
        'message',
4846
        Option('body', help='Body for the email.', type=unicode),
4847
        RegistryOption('format',
4848
                       help='Use the specified output format.', 
4849
                       lazy_registry=('bzrlib.send', 'format_registry'))
4850
        ]
4851
4852
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4853
            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".
4854
            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.
4855
        from bzrlib.send import send
4856
        return send(submit_branch, revision, public_branch, remember,
4857
                         format, no_bundle, no_patch, output,
4858
                         kwargs.get('from', '.'), mail_to, message, body,
4859
                         self.outf)
4860
4861
4367.1.6 by Jelmer Vernooij
Fix bundle revisions.
4862
class cmd_bundle_revisions(cmd_send):
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
4863
    """Create a merge-directive for submitting changes.
4864
4865
    A merge directive provides many things needed for requesting merges:
4866
4867
    * A machine-readable description of the merge to perform
4868
4869
    * An optional patch that is a preview of the changes requested
4870
4871
    * An optional bundle of revision data, so that the changes can be applied
4872
      directly from the merge directive, without retrieving data from a
4873
      branch.
4874
4875
    If --no-bundle is specified, then public_branch is needed (and must be
4876
    up-to-date), so that the receiver can perform the merge using the
4877
    public_branch.  The public_branch is always included if known, so that
4878
    people can check it later.
4879
4880
    The submit branch defaults to the parent, but can be overridden.  Both
4881
    submit branch and public branch will be remembered if supplied.
4882
4883
    If a public_branch is known for the submit_branch, that public submit
4884
    branch is used in the merge instructions.  This means that a local mirror
4885
    can be used as your actual submit branch, once you have set public_branch
4886
    for that mirror.
4887
4888
    Two formats are currently supported: "4" uses revision bundle format 4 and
4889
    merge directive format 2.  It is significantly faster and smaller than
4890
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
4891
    default.  "0.9" uses revision bundle format 0.9 and merge directive
4892
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
4893
    """
4894
4895
    takes_options = [
4896
        Option('no-bundle',
4897
               help='Do not include a bundle in the merge directive.'),
4898
        Option('no-patch', help='Do not include a preview patch in the merge'
4899
               ' directive.'),
4900
        Option('remember',
4901
               help='Remember submit and public branch.'),
4902
        Option('from',
4903
               help='Branch to generate the submission from, '
4904
               'rather than the one containing the working directory.',
4905
               short_name='f',
4906
               type=unicode),
4907
        Option('output', short_name='o', help='Write directive to this file.',
4908
               type=unicode),
4909
        'revision',
4910
        RegistryOption('format',
4911
                       help='Use the specified output format.',
4912
                       lazy_registry=('bzrlib.send', 'format_registry')),
4913
        ]
4914
    aliases = ['bundle']
4915
4916
    _see_also = ['send', 'merge']
4917
4918
    hidden = True
4919
4920
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4921
            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".
4922
            format=None, **kwargs):
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
4923
        if output is None:
4924
            output = '-'
4925
        from bzrlib.send import send
4926
        return send(submit_branch, revision, public_branch, remember,
4927
                         format, no_bundle, no_patch, output,
4928
                         kwargs.get('from', '.'), None, None, None,
4929
                         self.outf)
4930
4931
2220.2.2 by Martin Pool
Add tag command and basic implementation
4932
class cmd_tag(Command):
2664.1.1 by Joachim Nilsson
Change tag description for "help commands" to make it easier to find
4933
    """Create, remove or modify a tag naming a revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4934
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4935
    Tags give human-meaningful names to revisions.  Commands that take a -r
4936
    (--revision) option can be given -rtag:X, where X is any previously
4937
    created tag.
4938
2220.2.41 by Martin Pool
Fix tag help (fullermd)
4939
    Tags are stored in the branch.  Tags are copied from one branch to another
4940
    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.
4941
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4942
    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.
4943
    --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
4944
3566.2.2 by Benjamin Peterson
fix markup
4945
    To rename a tag (change the name but keep it on the same revsion), run ``bzr
4946
    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.
4947
    """
2220.2.2 by Martin Pool
Add tag command and basic implementation
4948
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4949
    _see_also = ['commit', 'tags']
2220.2.2 by Martin Pool
Add tag command and basic implementation
4950
    takes_args = ['tag_name']
4951
    takes_options = [
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4952
        Option('delete',
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4953
            help='Delete this tag rather than placing it.',
4954
            ),
4955
        Option('directory',
4956
            help='Branch in which to place the tag.',
4957
            short_name='d',
4958
            type=unicode,
4959
            ),
4960
        Option('force',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4961
            help='Replace existing tags.',
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4962
            ),
2220.2.6 by Martin Pool
Add tag -r option
4963
        'revision',
2220.2.2 by Martin Pool
Add tag command and basic implementation
4964
        ]
4965
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4966
    def run(self, tag_name,
4967
            delete=None,
4968
            directory='.',
4969
            force=None,
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4970
            revision=None,
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4971
            ):
2220.2.2 by Martin Pool
Add tag command and basic implementation
4972
        branch, relpath = Branch.open_containing(directory)
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4973
        branch.lock_write()
4974
        try:
4975
            if delete:
4976
                branch.tags.delete_tag(tag_name)
4977
                self.outf.write('Deleted tag %s.\n' % tag_name)
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4978
            else:
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4979
                if revision:
4980
                    if len(revision) != 1:
4981
                        raise errors.BzrCommandError(
4982
                            "Tags can only be placed on a single revision, "
4983
                            "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()
4984
                    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.
4985
                else:
4986
                    revision_id = branch.last_revision()
4987
                if (not force) and branch.tags.has_tag(tag_name):
4988
                    raise errors.TagAlreadyExists(tag_name)
4989
                branch.tags.set_tag(tag_name, revision_id)
4990
                self.outf.write('Created tag %s.\n' % tag_name)
4991
        finally:
4992
            branch.unlock()
2220.2.2 by Martin Pool
Add tag command and basic implementation
4993
4994
2220.2.24 by Martin Pool
Add tags command
4995
class cmd_tags(Command):
4996
    """List tags.
4997
3007.1.1 by Adeodato Simó
Small fix to tags' help.
4998
    This command shows a table of tag names and the revisions they reference.
2220.2.24 by Martin Pool
Add tags command
4999
    """
5000
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
5001
    _see_also = ['tag']
2220.2.24 by Martin Pool
Add tags command
5002
    takes_options = [
5003
        Option('directory',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
5004
            help='Branch whose tags should be displayed.',
2220.2.24 by Martin Pool
Add tags command
5005
            short_name='d',
5006
            type=unicode,
5007
            ),
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5008
        RegistryOption.from_kwargs('sort',
5009
            'Sort tags by different criteria.', title='Sorting',
5010
            alpha='Sort tags lexicographically (default).',
5011
            time='Sort tags chronologically.',
5012
            ),
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
5013
        '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.
5014
        'revision',
2220.2.24 by Martin Pool
Add tags command
5015
    ]
5016
5017
    @display_command
5018
    def run(self,
5019
            directory='.',
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5020
            sort='alpha',
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
5021
            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.
5022
            revision=None,
2220.2.24 by Martin Pool
Add tags command
5023
            ):
5024
        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.
5025
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5026
        tags = branch.tags.get_tag_dict().items()
3553.1.1 by Robert Collins
Do not scan history for tags when none are present.
5027
        if not tags:
5028
            return
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
5029
5030
        if revision:
5031
            branch.lock_read()
5032
            try:
5033
                graph = branch.repository.get_graph()
3904.2.4 by Marius Kruger
* rename _get2Revisions to _get_revision_range
5034
                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.
5035
                revid1, revid2 = rev1.rev_id, rev2.rev_id
5036
                # only show revisions between revid1 and revid2 (inclusive)
5037
                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
5038
                    graph.is_between(revid, revid1, revid2)]
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
5039
            finally:
5040
                branch.unlock()
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5041
        if sort == 'alpha':
5042
            tags.sort()
5043
        elif sort == 'time':
5044
            timestamps = {}
5045
            for tag, revid in tags:
5046
                try:
5047
                    revobj = branch.repository.get_revision(revid)
5048
                except errors.NoSuchRevision:
5049
                    timestamp = sys.maxint # place them at the end
5050
                else:
5051
                    timestamp = revobj.timestamp
5052
                timestamps[revid] = timestamp
5053
            tags.sort(key=lambda x: timestamps[x[1]])
5054
        if not show_ids:
5055
            # [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4390.1.1 by Ian Clatworthy
avoid full revno map generation in tags command
5056
            for index, (tag, revid) in enumerate(tags):
5057
                try:
5058
                    revno = branch.revision_id_to_dotted_revno(revid)
5059
                    if isinstance(revno, tuple):
5060
                        revno = '.'.join(map(str, revno))
5061
                except errors.NoSuchRevision:
5062
                    # Bad tag data/merges can lead to tagged revisions
5063
                    # which are not in this branch. Fail gracefully ...
5064
                    revno = '?'
5065
                tags[index] = (tag, revno)
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
5066
        for tag, revspec in tags:
5067
            self.outf.write('%-20s %s\n' % (tag, revspec))
2220.2.24 by Martin Pool
Add tags command
5068
5069
2796.2.5 by Aaron Bentley
Implement reconfigure command
5070
class cmd_reconfigure(Command):
2796.2.15 by Aaron Bentley
More updates from review
5071
    """Reconfigure the type of a bzr directory.
5072
5073
    A target configuration must be specified.
5074
5075
    For checkouts, the bind-to location will be auto-detected if not specified.
5076
    The order of preference is
5077
    1. For a lightweight checkout, the current bound location.
5078
    2. For branches that used to be checkouts, the previously-bound location.
5079
    3. The push location.
5080
    4. The parent location.
5081
    If none of these is available, --bind-to must be specified.
5082
    """
2796.2.5 by Aaron Bentley
Implement reconfigure command
5083
3535.4.1 by Marius Kruger
Update reconfigure help to say exactly what it wil do.
5084
    _see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
2796.2.5 by Aaron Bentley
Implement reconfigure command
5085
    takes_args = ['location?']
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
5086
    takes_options = [
5087
        RegistryOption.from_kwargs(
5088
            'target_type',
5089
            title='Target type',
5090
            help='The type to reconfigure the directory to.',
5091
            value_switches=True, enum_switch=False,
5092
            branch='Reconfigure to be an unbound branch with no working tree.',
5093
            tree='Reconfigure to be an unbound branch with a working tree.',
5094
            checkout='Reconfigure to be a bound branch with a working tree.',
5095
            lightweight_checkout='Reconfigure to be a lightweight'
5096
                ' checkout (with no local history).',
5097
            standalone='Reconfigure to be a standalone branch '
5098
                '(i.e. stop using shared repository).',
5099
            use_shared='Reconfigure to use a shared repository.',
5100
            with_trees='Reconfigure repository to create '
5101
                'working trees on branches by default.',
5102
            with_no_trees='Reconfigure repository to not create '
5103
                'working trees on branches by default.'
5104
            ),
5105
        Option('bind-to', help='Branch to bind checkout to.', type=str),
5106
        Option('force',
5107
               help='Perform reconfiguration even if local changes'
5108
               ' will be lost.')
5109
        ]
2796.2.5 by Aaron Bentley
Implement reconfigure command
5110
5111
    def run(self, location=None, target_type=None, bind_to=None, force=False):
5112
        directory = bzrdir.BzrDir.open(location)
2796.2.15 by Aaron Bentley
More updates from review
5113
        if target_type is None:
2830.2.4 by Martin Pool
Fix previously hidden NameError in reconfigure
5114
            raise errors.BzrCommandError('No target configuration specified')
2796.2.15 by Aaron Bentley
More updates from review
5115
        elif target_type == 'branch':
2796.2.5 by Aaron Bentley
Implement reconfigure command
5116
            reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5117
        elif target_type == 'tree':
5118
            reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5119
        elif target_type == 'checkout':
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
5120
            reconfiguration = reconfigure.Reconfigure.to_checkout(
5121
                directory, bind_to)
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
5122
        elif target_type == 'lightweight-checkout':
5123
            reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5124
                directory, bind_to)
3311.2.6 by Aaron Bentley
rename 'sharing' to 'use-shared'
5125
        elif target_type == 'use-shared':
5126
            reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
3311.2.5 by Aaron Bentley
Implement reconfigure --standalone and --sharing
5127
        elif target_type == 'standalone':
5128
            reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
3921.4.3 by Matthew Fuller
Add --with-trees and --with-no-trees to the 'reconfigure' command.
5129
        elif target_type == 'with-trees':
5130
            reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5131
                directory, True)
5132
        elif target_type == 'with-no-trees':
5133
            reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5134
                directory, False)
2796.2.5 by Aaron Bentley
Implement reconfigure command
5135
        reconfiguration.apply(force)
5136
5137
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5138
class cmd_switch(Command):
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5139
    """Set the branch of a checkout and update.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5140
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5141
    For lightweight checkouts, this changes the branch being referenced.
5142
    For heavyweight checkouts, this checks that there are no local commits
5143
    versus the current bound branch, then it makes the local branch a mirror
5144
    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.
5145
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5146
    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.
5147
    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
5148
5149
    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
5150
5151
    The path to the branch to switch to can be specified relative to the parent
5152
    directory of the current branch. For example, if you are currently in a
5153
    checkout of /path/to/branch, specifying 'newbranch' will find a branch at
5154
    /path/to/newbranch.
3565.6.15 by Marius Kruger
update bind and switch command descriptions to state what will happen to nicknames.
5155
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
5156
    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.
5157
    locally, in which case switching will update the the local nickname to be
5158
    that of the master.
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5159
    """
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5160
5161
    takes_args = ['to_location']
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5162
    takes_options = [Option('force',
5163
                        help='Switch even if local commits will be lost.')
5164
                     ]
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5165
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5166
    def run(self, to_location, force=False):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
5167
        from bzrlib import switch
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5168
        tree_location = '.'
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
5169
        control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
5170
        try:
5171
            branch = control_dir.open_branch()
5172
            had_explicit_nick = branch.get_config().has_explicit_nickname()
5173
        except errors.NotBranchError:
5174
            had_explicit_nick = False
3246.5.1 by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the
5175
        try:
5176
            to_branch = Branch.open(to_location)
5177
        except errors.NotBranchError:
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
5178
            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
5179
            to_branch = Branch.open(
3602.3.4 by Adrian Wilkins
Improved comments and documentation
5180
                urlutils.join(this_url, '..', to_location))
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
5181
        switch.switch(control_dir, to_branch, force)
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
5182
        if had_explicit_nick:
3565.6.7 by Marius Kruger
* checkouts now use master nick when no explicit nick is set.
5183
            branch = control_dir.open_branch() #get the new branch!
5184
            branch.nick = to_branch.nick
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5185
        note('Switched to branch: %s',
5186
            urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5187
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
5188
    def _get_branch_location(self, control_dir):
5189
        """Return location of branch for this control dir."""
5190
        try:
5191
            this_branch = control_dir.open_branch()
5192
            # 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.
5193
            master_location = this_branch.get_bound_location()
5194
            if master_location is not None:
5195
                return master_location
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
5196
            # If not, use a local sibling
5197
            return this_branch.base
5198
        except errors.NotBranchError:
5199
            format = control_dir.find_branch_format()
5200
            if getattr(format, 'get_reference', None) is not None:
5201
                return format.get_reference(control_dir)
5202
            else:
5203
                return control_dir.root_transport.base
5204
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
5205
3586.1.9 by Ian Clatworthy
first cut at view command
5206
class cmd_view(Command):
5207
    """Manage filtered views.
3586.1.33 by Ian Clatworthy
cleanup trailing whitespace
5208
3586.1.9 by Ian Clatworthy
first cut at view command
5209
    Views provide a mask over the tree so that users can focus on
5210
    a subset of a tree when doing their work. After creating a view,
5211
    commands that support a list of files - status, diff, commit, etc -
5212
    effectively have that list of files implicitly given each time.
5213
    An explicit list of files can still be given but those files
5214
    must be within the current view.
5215
5216
    In most cases, a view has a short life-span: it is created to make
5217
    a selected change and is deleted once that change is committed.
5218
    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
5219
    and switch between them.
3586.1.33 by Ian Clatworthy
cleanup trailing whitespace
5220
3586.1.9 by Ian Clatworthy
first cut at view command
5221
    To disable the current view without deleting it, you can switch to
5222
    the pseudo view called ``off``. This can be useful when you need
5223
    to see the whole tree for an operation or two (e.g. merge) but
5224
    want to switch back to your view after that.
5225
5226
    :Examples:
3586.1.14 by Ian Clatworthy
added --all option to the view command
5227
      To define the current view::
3586.1.9 by Ian Clatworthy
first cut at view command
5228
5229
        bzr view file1 dir1 ...
5230
5231
      To list the current view::
5232
5233
        bzr view
5234
5235
      To delete the current view::
5236
5237
        bzr view --delete
5238
5239
      To disable the current view without deleting it::
5240
5241
        bzr view --switch off
5242
3586.1.14 by Ian Clatworthy
added --all option to the view command
5243
      To define a named view and switch to it::
3586.1.9 by Ian Clatworthy
first cut at view command
5244
5245
        bzr view --name view-name file1 dir1 ...
5246
5247
      To list a named view::
5248
5249
        bzr view --name view-name
5250
5251
      To delete a named view::
5252
5253
        bzr view --name view-name --delete
5254
5255
      To switch to a named view::
5256
5257
        bzr view --switch view-name
3586.1.14 by Ian Clatworthy
added --all option to the view command
5258
5259
      To list all views defined::
5260
5261
        bzr view --all
5262
5263
      To delete all views::
5264
5265
        bzr view --delete --all
3586.1.9 by Ian Clatworthy
first cut at view command
5266
    """
5267
3586.1.14 by Ian Clatworthy
added --all option to the view command
5268
    _see_also = []
3586.1.9 by Ian Clatworthy
first cut at view command
5269
    takes_args = ['file*']
5270
    takes_options = [
3586.1.14 by Ian Clatworthy
added --all option to the view command
5271
        Option('all',
5272
            help='Apply list or delete action to all views.',
5273
            ),
3586.1.9 by Ian Clatworthy
first cut at view command
5274
        Option('delete',
5275
            help='Delete the view.',
5276
            ),
5277
        Option('name',
3586.1.14 by Ian Clatworthy
added --all option to the view command
5278
            help='Name of the view to define, list or delete.',
3586.1.9 by Ian Clatworthy
first cut at view command
5279
            type=unicode,
5280
            ),
5281
        Option('switch',
5282
            help='Name of the view to switch to.',
5283
            type=unicode,
5284
            ),
5285
        ]
5286
5287
    def run(self, file_list,
3586.1.14 by Ian Clatworthy
added --all option to the view command
5288
            all=False,
3586.1.9 by Ian Clatworthy
first cut at view command
5289
            delete=False,
5290
            name=None,
5291
            switch=None,
5292
            ):
5293
        tree, file_list = tree_files(file_list, apply_view=False)
5294
        current_view, view_dict = tree.views.get_view_info()
5295
        if name is None:
5296
            name = current_view
5297
        if delete:
5298
            if file_list:
3586.1.11 by Ian Clatworthy
tweak user feedback
5299
                raise errors.BzrCommandError(
5300
                    "Both --delete and a file list specified")
3586.1.9 by Ian Clatworthy
first cut at view command
5301
            elif switch:
3586.1.11 by Ian Clatworthy
tweak user feedback
5302
                raise errors.BzrCommandError(
5303
                    "Both --delete and --switch specified")
3586.1.14 by Ian Clatworthy
added --all option to the view command
5304
            elif all:
5305
                tree.views.set_view_info(None, {})
5306
                self.outf.write("Deleted all views.\n")
3586.1.9 by Ian Clatworthy
first cut at view command
5307
            elif name is None:
3586.1.11 by Ian Clatworthy
tweak user feedback
5308
                raise errors.BzrCommandError("No current view to delete")
3586.1.9 by Ian Clatworthy
first cut at view command
5309
            else:
5310
                tree.views.delete_view(name)
5311
                self.outf.write("Deleted '%s' view.\n" % name)
5312
        elif switch:
5313
            if file_list:
3586.1.11 by Ian Clatworthy
tweak user feedback
5314
                raise errors.BzrCommandError(
5315
                    "Both --switch and a file list specified")
3586.1.14 by Ian Clatworthy
added --all option to the view command
5316
            elif all:
5317
                raise errors.BzrCommandError(
5318
                    "Both --switch and --all specified")
3586.1.9 by Ian Clatworthy
first cut at view command
5319
            elif switch == 'off':
5320
                if current_view is None:
3586.1.11 by Ian Clatworthy
tweak user feedback
5321
                    raise errors.BzrCommandError("No current view to disable")
3586.1.9 by Ian Clatworthy
first cut at view command
5322
                tree.views.set_view_info(None, view_dict)
3586.1.11 by Ian Clatworthy
tweak user feedback
5323
                self.outf.write("Disabled '%s' view.\n" % (current_view))
3586.1.9 by Ian Clatworthy
first cut at view command
5324
            else:
5325
                tree.views.set_view_info(switch, view_dict)
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
5326
                view_str = views.view_display_str(tree.views.lookup_view())
5327
                self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
3586.1.14 by Ian Clatworthy
added --all option to the view command
5328
        elif all:
5329
            if view_dict:
5330
                self.outf.write('Views defined:\n')
5331
                for view in sorted(view_dict):
5332
                    if view == current_view:
5333
                        active = "=>"
5334
                    else:
5335
                        active = "  "
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
5336
                    view_str = views.view_display_str(view_dict[view])
5337
                    self.outf.write('%s %-20s %s\n' % (active, view, view_str))
3586.1.14 by Ian Clatworthy
added --all option to the view command
5338
            else:
5339
                self.outf.write('No views defined.\n')
3586.1.9 by Ian Clatworthy
first cut at view command
5340
        elif file_list:
5341
            if name is None:
5342
                # No name given and no current view set
5343
                name = 'my'
5344
            elif name == 'off':
3586.1.11 by Ian Clatworthy
tweak user feedback
5345
                raise errors.BzrCommandError(
5346
                    "Cannot change the 'off' pseudo view")
3586.1.9 by Ian Clatworthy
first cut at view command
5347
            tree.views.set_view(name, sorted(file_list))
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
5348
            view_str = views.view_display_str(tree.views.lookup_view())
3586.1.11 by Ian Clatworthy
tweak user feedback
5349
            self.outf.write("Using '%s' view: %s\n" % (name, view_str))
3586.1.9 by Ian Clatworthy
first cut at view command
5350
        else:
5351
            # list the files
3586.1.13 by Ian Clatworthy
fix list of a known view when no current view set
5352
            if name is None:
5353
                # No name given and no current view set
3586.1.9 by Ian Clatworthy
first cut at view command
5354
                self.outf.write('No current view.\n')
5355
            else:
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
5356
                view_str = views.view_display_str(tree.views.lookup_view(name))
3586.1.11 by Ian Clatworthy
tweak user feedback
5357
                self.outf.write("'%s' view is: %s\n" % (name, view_str))
3586.1.9 by Ian Clatworthy
first cut at view command
5358
5359
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5360
class cmd_hooks(Command):
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
5361
    """Show hooks."""
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5362
3254.2.9 by Daniel Watkins
Made cmd_hooks hidden.
5363
    hidden = True
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5364
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
5365
    def run(self):
5366
        for hook_key in sorted(hooks.known_hooks.keys()):
5367
            some_hooks = hooks.known_hooks_key_to_object(hook_key)
5368
            self.outf.write("%s:\n" % type(some_hooks).__name__)
5369
            for hook_name, hook_point in sorted(some_hooks.items()):
5370
                self.outf.write("  %s:\n" % (hook_name,))
5371
                found_hooks = list(hook_point)
5372
                if found_hooks:
5373
                    for hook in found_hooks:
5374
                        self.outf.write("    %s\n" %
5375
                                        (some_hooks.get_hook_name(hook),))
5376
                else:
5377
                    self.outf.write("    <no hooks installed>\n")
3254.2.1 by Daniel Watkins
Added cmd_hooks.
5378
5379
0.16.80 by Aaron Bentley
Rename shelve2/unshelve2 to shelve/unshelve
5380
class cmd_shelve(Command):
0.16.74 by Aaron Bentley
Merge with shelf-manager
5381
    """Temporarily set aside some changes from the current tree.
5382
5383
    Shelve allows you to temporarily put changes you've made "on the shelf",
5384
    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.
5385
    the shelf with the 'unshelve' command.  The changes are stored alongside
5386
    your working tree, and so they aren't propagated along with your branch nor
5387
    will they survive its deletion.
0.16.74 by Aaron Bentley
Merge with shelf-manager
5388
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5389
    If shelve --list is specified, previously-shelved changes are listed.
5390
0.16.74 by Aaron Bentley
Merge with shelf-manager
5391
    Shelve is intended to help separate several sets of changes that have
5392
    been inappropriately mingled.  If you just want to get rid of all changes
5393
    and you don't need to restore them later, use revert.  If you want to
5394
    shelve all text changes at once, use shelve --all.
5395
5396
    If filenames are specified, only the changes to those files will be
5397
    shelved. Other files will be left untouched.
5398
5399
    If a revision is specified, changes since that revision will be shelved.
5400
5401
    You can put multiple items on the shelf, and by default, 'unshelve' will
5402
    restore the most recently shelved changes.
5403
    """
5404
5405
    takes_args = ['file*']
5406
5407
    takes_options = [
5408
        'revision',
5409
        Option('all', help='Shelve all changes.'),
5410
        'message',
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
5411
        RegistryOption('writer', 'Method to use for writing diffs.',
5412
                       bzrlib.option.diff_writer_registry,
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5413
                       value_switches=True, enum_switch=False),
5414
0.16.119 by Aaron Bentley
Fix option help style.
5415
        Option('list', help='List shelved changes.'),
4100.3.1 by Aaron Bentley
Implement shelve --destroy
5416
        Option('destroy',
5417
               help='Destroy removed changes instead of shelving them.'),
0.16.74 by Aaron Bentley
Merge with shelf-manager
5418
    ]
0.16.117 by Aaron Bentley
Remove references to ls-shelf
5419
    _see_also = ['unshelve']
0.16.74 by Aaron Bentley
Merge with shelf-manager
5420
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
5421
    def run(self, revision=None, all=False, file_list=None, message=None,
4100.3.1 by Aaron Bentley
Implement shelve --destroy
5422
            writer=None, list=False, destroy=False):
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5423
        if list:
5424
            return self.run_for_list()
0.16.74 by Aaron Bentley
Merge with shelf-manager
5425
        from bzrlib.shelf_ui import Shelver
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
5426
        if writer is None:
5427
            writer = bzrlib.option.diff_writer_registry.get()
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
5428
        try:
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
5429
            Shelver.from_args(writer(sys.stdout), revision, all, file_list,
4100.3.1 by Aaron Bentley
Implement shelve --destroy
5430
                              message, destroy=destroy).run()
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
5431
        except errors.UserAbort:
5432
            return 0
0.16.74 by Aaron Bentley
Merge with shelf-manager
5433
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5434
    def run_for_list(self):
0.16.118 by Aaron Bentley
Fix open_containing
5435
        tree = WorkingTree.open_containing('.')[0]
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
5436
        tree.lock_read()
5437
        try:
5438
            manager = tree.get_shelf_manager()
5439
            shelves = manager.active_shelves()
5440
            if len(shelves) == 0:
5441
                note('No shelved changes.')
5442
                return 0
5443
            for shelf_id in reversed(shelves):
5444
                message = manager.get_metadata(shelf_id).get('message')
5445
                if message is None:
5446
                    message = '<no message>'
5447
                self.outf.write('%3d: %s\n' % (shelf_id, message))
5448
            return 1
5449
        finally:
5450
            tree.unlock()
5451
0.16.74 by Aaron Bentley
Merge with shelf-manager
5452
0.16.80 by Aaron Bentley
Rename shelve2/unshelve2 to shelve/unshelve
5453
class cmd_unshelve(Command):
0.16.74 by Aaron Bentley
Merge with shelf-manager
5454
    """Restore shelved changes.
5455
5456
    By default, the most recently shelved changes are restored. However if you
3990.2.5 by Daniel Watkins
Improve unshelve documentation, as per #327425.
5457
    specify a shelf by id those changes will be restored instead.  This works
5458
    best when the changes don't depend on each other.
0.16.74 by Aaron Bentley
Merge with shelf-manager
5459
    """
5460
5461
    takes_args = ['shelf_id?']
5462
    takes_options = [
5463
        RegistryOption.from_kwargs(
5464
            'action', help="The action to perform.",
5465
            enum_switch=False, value_switches=True,
5466
            apply="Apply changes and remove from the shelf.",
5467
            dry_run="Show changes, but do not apply or remove them.",
5468
            delete_only="Delete changes without applying them."
5469
        )
5470
    ]
0.16.117 by Aaron Bentley
Remove references to ls-shelf
5471
    _see_also = ['shelve']
0.16.74 by Aaron Bentley
Merge with shelf-manager
5472
5473
    def run(self, shelf_id=None, action='apply'):
5474
        from bzrlib.shelf_ui import Unshelver
5475
        Unshelver.from_args(shelf_id, action).run()
5476
5477
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
5478
class cmd_clean_tree(Command):
5479
    """Remove unwanted files from working tree.
5480
5481
    By default, only unknown files, not ignored files, are deleted.  Versioned
5482
    files are never deleted.
5483
5484
    Another class is 'detritus', which includes files emitted by bzr during
5485
    normal operations and selftests.  (The value of these files decreases with
5486
    time.)
5487
5488
    If no options are specified, unknown files are deleted.  Otherwise, option
5489
    flags are respected, and may be combined.
5490
5491
    To check what clean-tree will do, use --dry-run.
5492
    """
5493
    takes_options = [Option('ignored', help='Delete all ignored files.'),
5494
                     Option('detritus', help='Delete conflict files, merge'
5495
                            ' backups, and failed selftest dirs.'),
5496
                     Option('unknown',
5497
                            help='Delete files unknown to bzr (default).'),
5498
                     Option('dry-run', help='Show files to delete instead of'
5499
                            ' deleting them.'),
5500
                     Option('force', help='Do not prompt before deleting.')]
5501
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5502
            force=False):
5503
        from bzrlib.clean_tree import clean_tree
5504
        if not (unknown or ignored or detritus):
5505
            unknown = True
5506
        if dry_run:
5507
            force = True
4020.1.5 by Aaron Bentley
Fix some formatting issues.
5508
        clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
5509
                   dry_run=dry_run, no_prompt=force)
5510
5511
4273.1.19 by Aaron Bentley
Implement reference command
5512
class cmd_reference(Command):
5513
    """list, view and set branch locations for nested trees.
5514
5515
    If no arguments are provided, lists the branch locations for nested trees.
5516
    If one argument is provided, display the branch location for that tree.
5517
    If two arguments are provided, set the branch location for that tree.
5518
    """
5519
5520
    hidden = True
5521
5522
    takes_args = ['path?', 'location?']
5523
5524
    def run(self, path=None, location=None):
5525
        branchdir = '.'
5526
        if path is not None:
5527
            branchdir = path
5528
        tree, branch, relpath =(
5529
            bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5530
        if path is not None:
5531
            path = relpath
5532
        if tree is None:
5533
            tree = branch.basis_tree()
5534
        if path is None:
5535
            info = branch._get_all_reference_info().iteritems()
5536
            self._display_reference_info(tree, branch, info)
5537
        else:
5538
            file_id = tree.path2id(path)
5539
            if file_id is None:
5540
                raise errors.NotVersionedError(path)
5541
            if location is None:
5542
                info = [(file_id, branch.get_reference_info(file_id))]
5543
                self._display_reference_info(tree, branch, info)
5544
            else:
5545
                branch.set_reference_info(file_id, path, location)
5546
5547
    def _display_reference_info(self, tree, branch, info):
5548
        ref_list = []
5549
        for file_id, (path, location) in info:
5550
            try:
5551
                path = tree.id2path(file_id)
5552
            except errors.NoSuchId:
5553
                pass
5554
            ref_list.append((path, location))
5555
        for path, location in sorted(ref_list):
5556
            self.outf.write('%s %s\n' % (path, location))
5557
5558
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
5559
# these get imported and then picked up by the scan for cmd_*
5560
# TODO: Some more consistent way to split command definitions across files;
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5561
# 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'.
5562
# aliases.  ideally we would avoid loading the implementation until the
5563
# details were needed.
2022.1.2 by John Arbash Meinel
rename version_info => cmd_version_info
5564
from bzrlib.cmd_version_info import cmd_version_info
1185.35.4 by Aaron Bentley
Implemented remerge
5565
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2520.4.35 by Aaron Bentley
zap obsolete changeset commands, add bundle-info command
5566
from bzrlib.bundle.commands import (
5567
    cmd_bundle_info,
5568
    )
3920.2.2 by Jelmer Vernooij
Import dpush command.
5569
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.
5570
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.
5571
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
5572
        cmd_weave_plan_merge, cmd_weave_merge_text