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