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