/brz/remove-bazaar

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