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