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