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