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