/brz/remove-bazaar

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