/brz/remove-bazaar

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