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