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