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