~bzr-pqm/bzr/bzr.dev

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