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