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