/brz/remove-bazaar

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