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