/brz/remove-bazaar

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