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