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