/brz/remove-bazaar

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