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