/brz/remove-bazaar

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