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