~bzr-pqm/bzr/bzr.dev

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