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