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