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