/brz/remove-bazaar

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