/brz/remove-bazaar

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