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