/brz/remove-bazaar

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