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