~bzr-pqm/bzr/bzr.dev

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