/brz/remove-bazaar

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