/brz/remove-bazaar

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