/brz/remove-bazaar

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