~bzr-pqm/bzr/bzr.dev

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