/brz/remove-bazaar

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