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