~bzr-pqm/bzr/bzr.dev

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