/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
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
70
def _get_revision_tree(command_name, revision, branch=None, tree=None):
71
    if branch is None:
72
        branch = tree.branch
73
    if revision is None:
74
        if tree is not None:
75
            rev_tree = tree.basis_tree()
76
        else:
77
            rev_tree = branch.basis_tree()
78
    else:
79
        if len(revision) != 1:
80
            raise errors.BzrCommandError(
81
                'bzr %s --revision takes exactly one revision identifier' % (
82
                    command_name,))
83
        rev_tree = revision[0].as_tree(branch)
84
    return rev_tree
85
86
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
87
# XXX: Bad function name; should possibly also be a class method of
88
# WorkingTree rather than a function.
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
89
def internal_tree_files(file_list, default_branch=u'.'):
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
90
    """Convert command-line paths to a WorkingTree and relative paths.
91
92
    This is typically used for command-line processors that take one or
93
    more filenames, and infer the workingtree that contains them.
94
95
    The filenames given are not required to exist.
96
97
    :param file_list: Filenames to convert.  
98
2091.3.2 by Aaron Bentley
Traverse non-terminal symlinks for mv et al
99
    :param default_branch: Fallback tree path to use if file_list is empty or
100
        None.
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
101
102
    :return: workingtree, [relative_paths]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
103
    """
104
    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
105
        return WorkingTree.open_containing(default_branch)[0], file_list
2091.3.5 by Aaron Bentley
Move realpath functionality into osutils
106
    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)
107
    return tree, safe_relpath_files(tree, file_list)
108
109
110
def safe_relpath_files(tree, file_list):
111
    """Convert file_list into a list of relpaths in tree.
112
113
    :param tree: A tree to operate on.
114
    :param file_list: A list of user provided paths or None.
115
    :return: A list of relative paths.
116
    :raises errors.PathNotChild: When a provided path is in a different tree
117
        than tree.
118
    """
119
    if file_list is None:
120
        return None
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
121
    new_list = []
122
    for filename in file_list:
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
123
        try:
2091.3.7 by Aaron Bentley
Rename real_parent to dereferenced_path
124
            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.
125
        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
126
            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)
127
    return new_list
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
128
129
1185.16.112 by mbp at sourcefrog
todo
130
# TODO: Make sure no commands unconditionally use the working directory as a
131
# branch.  If a filename argument is used, the first of them should be used to
132
# specify the branch.  (Perhaps this can be factored out into some kind of
133
# Argument class, representing a file in a branch, where the first occurrence
134
# opens the branch?)
135
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
136
class cmd_status(Command):
137
    """Display status summary.
138
139
    This reports on versioned and unknown files, reporting them
140
    grouped by state.  Possible states are:
141
1551.10.10 by Aaron Bentley
Add help text
142
    added
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
143
        Versioned in the working copy but not in the previous revision.
144
1551.10.10 by Aaron Bentley
Add help text
145
    removed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
146
        Versioned in the previous revision but removed or deleted
147
        in the working copy.
148
1551.10.10 by Aaron Bentley
Add help text
149
    renamed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
150
        Path of this file changed from the previous revision;
151
        the text may also have changed.  This includes files whose
152
        parent directory was renamed.
153
1551.10.10 by Aaron Bentley
Add help text
154
    modified
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
155
        Text has changed since the previous revision.
156
1551.10.10 by Aaron Bentley
Add help text
157
    kind changed
158
        File kind has been changed (e.g. from file to directory).
159
160
    unknown
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
161
        Not versioned and not matching an ignore pattern.
162
2374.1.1 by Ian Clatworthy
Help and man page fixes
163
    To see ignored files use 'bzr ignored'.  For details on the
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
164
    changes to file texts, use 'bzr diff'.
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
165
    
2792.1.1 by Ian Clatworthy
Add short options to status to assist migrating svn users (Daniel Watkins)
166
    Note that --short or -S gives status flags for each item, similar
167
    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.
168
    use bzr status -SV.
1551.10.10 by Aaron Bentley
Add help text
169
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
170
    If no arguments are specified, the status of the entire working
171
    directory is shown.  Otherwise, only the status of the specified
172
    files or directories is reported.  If a directory is given, status
173
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
174
175
    If a revision argument is given, the status is calculated against
176
    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
177
    """
1185.16.76 by Martin Pool
doc
178
    
179
    # TODO: --no-recurse, --recurse options
180
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
181
    takes_args = ['file*']
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
182
    takes_options = ['show-ids', 'revision', 'change',
2792.1.1 by Ian Clatworthy
Add short options to status to assist migrating svn users (Daniel Watkins)
183
                     Option('short', help='Use short status indicators.',
2663.1.7 by Daniel Watkins
Capitalised short names.
184
                            short_name='S'),
2663.1.5 by Daniel Watkins
Changed 'bzr stat --quiet' to 'bzr stat -(vs|sv)', as per list suggestions.
185
                     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)
186
                            short_name='V'),
187
                     Option('no-pending', help='Don\'t show pending merges.',
188
                           ),
2663.1.5 by Daniel Watkins
Changed 'bzr stat --quiet' to 'bzr stat -(vs|sv)', as per list suggestions.
189
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
190
    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()
191
192
    encoding_type = 'replace'
2520.1.3 by Daniel Watkins
'help status' now points to 'help status-flags'.
193
    _see_also = ['diff', 'revert', 'status-flags']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
194
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
195
    @display_command
2318.2.1 by Kent Gibson
Apply status versioned patch
196
    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)
197
            versioned=False, no_pending=False):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
198
        from bzrlib.status import show_tree_status
1185.85.15 by John Arbash Meinel
Updated bzr status, adding test_cat
199
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.
200
        if revision and len(revision) > 2:
201
            raise errors.BzrCommandError('bzr status --revision takes exactly'
202
                                         ' 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)
203
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
204
        tree, relfile_list = tree_files(file_list)
205
        # Avoid asking for specific files when that is not needed.
206
        if relfile_list == ['']:
207
            relfile_list = None
208
            # Don't disable pending merges for full trees other than '.'.
209
            if file_list == ['.']:
210
                no_pending = True
211
        # A specific path within a tree was given.
212
        elif relfile_list is not None:
213
            no_pending = True
1773.1.2 by Robert Collins
Remove --all option from status.
214
        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
215
                         specific_files=relfile_list, revision=revision,
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
216
                         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
217
                         show_pending=(not no_pending))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
218
219
220
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
221
    """Write out metadata for a revision.
222
    
223
    The revision to print can either be specified by a specific
224
    revision identifier, or you can use --revision.
225
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
226
227
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
228
    takes_args = ['revision_id?']
229
    takes_options = ['revision']
1685.1.76 by Wouter van Heyst
codecleanup
230
    # cat-revision is more for frontends so should be exact
231
    encoding = 'strict'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
232
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
233
    @display_command
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
234
    def run(self, revision_id=None, revision=None):
235
        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
236
            raise errors.BzrCommandError('You can only supply one of'
237
                                         ' revision_id or --revision')
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
238
        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
239
            raise errors.BzrCommandError('You must supply either'
240
                                         ' --revision or a revision_id')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
241
        b = WorkingTree.open_containing(u'.')[0].branch
1185.85.72 by John Arbash Meinel
Fix some of the tests.
242
243
        # TODO: jam 20060112 should cat-revision always output utf-8?
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
244
        if revision_id is not None:
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
245
            revision_id = osutils.safe_revision_id(revision_id, warn=False)
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
246
            self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
247
        elif revision is not None:
248
            for rev in revision:
249
                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
250
                    raise errors.BzrCommandError('You cannot specify a NULL'
251
                                                 ' revision.')
3298.2.14 by Aaron Bentley
Optimize revision-info and cat-revision
252
                rev_id = rev.as_revision_id(b)
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
253
                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
254
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
255
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
256
class cmd_remove_tree(Command):
257
    """Remove the working tree from a given branch/checkout.
258
259
    Since a lightweight checkout is little more than a working tree
260
    this will refuse to run against one.
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
261
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
262
    To re-create the working tree, use "bzr checkout".
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
263
    """
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
264
    _see_also = ['checkout', 'working-trees']
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
265
266
    takes_args = ['location?']
267
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
268
    def run(self, location='.'):
269
        d = bzrdir.BzrDir.open(location)
270
        
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
271
        try:
272
            working = d.open_workingtree()
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
273
        except errors.NoWorkingTree:
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
274
            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
275
        except errors.NotLocalUrl:
276
            raise errors.BzrCommandError("You cannot remove the working tree of a "
277
                                         "remote path")
278
        
279
        working_path = working.bzrdir.root_transport.base
280
        branch_path = working.branch.bzrdir.root_transport.base
281
        if working_path != branch_path:
282
            raise errors.BzrCommandError("You cannot remove the working tree from "
283
                                         "a lightweight checkout")
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
284
        
285
        d.destroy_workingtree()
286
        
287
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
288
class cmd_revno(Command):
289
    """Show current revision number.
290
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
291
    This is equal to the number of revisions on this branch.
292
    """
293
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
294
    _see_also = ['info']
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
295
    takes_args = ['location?']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
296
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
297
    @display_command
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
298
    def run(self, location=u'.'):
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
299
        self.outf.write(str(Branch.open_containing(location)[0].revno()))
300
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
301
1182 by Martin Pool
- more disentangling of xml storage format from objects
302
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
303
class cmd_revision_info(Command):
304
    """Show revision number and revision id for a given revision identifier.
305
    """
306
    hidden = True
307
    takes_args = ['revision_info*']
308
    takes_options = ['revision']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
309
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
310
    @display_command
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
311
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
312
313
        revs = []
314
        if revision is not None:
315
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
316
        if revision_info_list is not None:
317
            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)
318
                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
319
320
        b = Branch.open_containing(u'.')[0]
321
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
322
        if len(revs) == 0:
2512.2.3 by Matthew Fuller
Default revision-info to the head of the branch when no revision is
323
            revs.append(RevisionSpec.from_string('-1'))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
324
325
        for rev in revs:
3298.2.14 by Aaron Bentley
Optimize revision-info and cat-revision
326
            revision_id = rev.as_revision_id(b)
327
            try:
328
                revno = '%4d' % (b.revision_id_to_revno(revision_id))
329
            except errors.NoSuchRevision:
2512.2.2 by Matthew Fuller
Update revision-info to show dotted revnos.
330
                dotted_map = b.get_revision_id_to_revno_map()
3298.2.14 by Aaron Bentley
Optimize revision-info and cat-revision
331
                revno = '.'.join(str(i) for i in dotted_map[revision_id])
332
            print '%s %s' % (revno, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
333
334
    
335
class cmd_add(Command):
336
    """Add specified files or directories.
337
338
    In non-recursive mode, all the named items are added, regardless
339
    of whether they were previously ignored.  A warning is given if
340
    any of the named files are already versioned.
341
342
    In recursive mode (the default), files are treated the same way
343
    but the behaviour for directories is different.  Directories that
344
    are already versioned do not give a warning.  All directories,
345
    whether already versioned or not, are searched for files or
346
    subdirectories that are neither versioned or ignored, and these
347
    are added.  This search proceeds recursively into versioned
348
    directories.  If no names are given '.' is assumed.
349
350
    Therefore simply saying 'bzr add' will version all files that
351
    are currently unknown.
352
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
353
    Adding a file whose parent directory is not versioned will
354
    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).
355
    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
356
    get added when you add a file in the directory.
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
357
358
    --dry-run will show which files would be added, but not actually 
359
    add them.
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
360
361
    --file-ids-from will try to use the file ids from the supplied path.
362
    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
363
    same filename, and then by pure path. This option is rarely needed
364
    but can be useful when adding the same logical file into two
365
    branches that will be merged later (without showing the two different
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
366
    adds as a conflict). It is also useful when merging another project
367
    into a subdirectory of this one.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
368
    """
369
    takes_args = ['file*']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
370
    takes_options = [
371
        Option('no-recurse',
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
372
               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.
373
        Option('dry-run',
374
               help="Show what would be done, but don't actually do anything."),
375
        'verbose',
376
        Option('file-ids-from',
377
               type=unicode,
378
               help='Lookup file ids from this tree.'),
379
        ]
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()
380
    encoding_type = 'replace'
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
381
    _see_also = ['remove']
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
382
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
383
    def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
384
            file_ids_from=None):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
385
        import bzrlib.add
386
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
387
        base_tree = None
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
388
        if file_ids_from is not None:
389
            try:
390
                base_tree, base_path = WorkingTree.open_containing(
391
                                            file_ids_from)
392
            except errors.NoWorkingTree:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
393
                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
394
                                            file_ids_from)
395
                base_tree = base_branch.basis_tree()
396
397
            action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
398
                          to_file=self.outf, should_print=(not is_quiet()))
399
        else:
400
            action = bzrlib.add.AddAction(to_file=self.outf,
401
                should_print=(not is_quiet()))
402
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
403
        if base_tree:
404
            base_tree.lock_read()
405
        try:
2568.2.6 by Robert Collins
Review feedback.
406
            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
407
            if file_list:
408
                tree = WorkingTree.open_containing(file_list[0])[0]
409
            else:
410
                tree = WorkingTree.open_containing(u'.')[0]
2568.2.8 by Robert Collins
Really really change the command to use the new API.
411
            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
412
                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.
413
        finally:
414
            if base_tree is not None:
415
                base_tree.unlock()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
416
        if len(ignored) > 0:
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
417
            if verbose:
418
                for glob in sorted(ignored.keys()):
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
419
                    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()
420
                        self.outf.write("ignored %s matching \"%s\"\n" 
421
                                        % (path, glob))
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
422
            else:
423
                match_len = 0
424
                for glob, paths in ignored.items():
425
                    match_len += len(paths)
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
426
                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()
427
            self.outf.write("If you wish to add some of these files,"
428
                            " please add them by name.\n")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
429
430
431
class cmd_mkdir(Command):
432
    """Create a new versioned directory.
433
434
    This is equivalent to creating the directory and then adding it.
435
    """
1685.1.80 by Wouter van Heyst
more code cleanup
436
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
437
    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()
438
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
439
440
    def run(self, dir_list):
441
        for d in dir_list:
442
            os.mkdir(d)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
443
            wt, dd = WorkingTree.open_containing(d)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
444
            wt.add([dd])
1685.1.80 by Wouter van Heyst
more code cleanup
445
            self.outf.write('added %s\n' % d)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
446
447
448
class cmd_relpath(Command):
449
    """Show path of a file relative to root"""
1685.1.80 by Wouter van Heyst
more code cleanup
450
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
451
    takes_args = ['filename']
452
    hidden = True
453
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
454
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
455
    def run(self, filename):
1185.85.19 by John Arbash Meinel
Updated bzr relpath
456
        # TODO: jam 20050106 Can relpath return a munged path if
457
        #       sys.stdout encoding cannot represent it?
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
458
        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()
459
        self.outf.write(relpath)
460
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
461
462
463
class cmd_inventory(Command):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
464
    """Show inventory of the current working copy or a revision.
465
466
    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'
467
    type using the --kind option.  For example: --kind file.
468
469
    It is also possible to restrict the list of files to a specific
470
    set. For example: bzr inventory --show-ids this/file
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
471
    """
1685.1.80 by Wouter van Heyst
more code cleanup
472
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
473
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
474
    _see_also = ['ls']
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
475
    takes_options = [
476
        'revision',
477
        'show-ids',
478
        Option('kind',
2598.1.12 by Martin Pool
Fix up --kind options
479
               help='List entries of a particular kind: file, directory, symlink.',
480
               type=unicode),
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
481
        ]
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
482
    takes_args = ['file*']
483
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
484
    @display_command
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
485
    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'
486
        if kind and kind not in ['file', 'directory', 'symlink']:
2598.1.12 by Martin Pool
Fix up --kind options
487
            raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
2027.4.3 by John Arbash Meinel
Change how 'bzr inventory' finds paths
488
489
        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.
490
        work_tree.lock_read()
491
        try:
492
            if revision is not None:
493
                if len(revision) > 1:
494
                    raise errors.BzrCommandError(
495
                        'bzr inventory --revision takes exactly one revision'
496
                        ' identifier')
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
497
                tree = revision[0].as_tree(work_tree.branch)
2255.7.24 by John Arbash Meinel
Rework cmd_inventory so that it uses paths2ids and locks the trees for read.
498
499
                extra_trees = [work_tree]
500
                tree.lock_read()
501
            else:
502
                tree = work_tree
503
                extra_trees = []
504
505
            if file_list is not None:
506
                file_ids = tree.paths2ids(file_list, trees=extra_trees,
507
                                          require_versioned=True)
508
                # find_ids_across_trees may include some paths that don't
509
                # exist in 'tree'.
510
                entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
511
                                 for file_id in file_ids if file_id in tree)
512
            else:
513
                entries = tree.inventory.entries()
514
        finally:
515
            tree.unlock()
516
            if tree is not work_tree:
517
                work_tree.unlock()
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
518
519
        for path, entry in entries:
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
520
            if kind and kind != entry.kind:
521
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
522
            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()
523
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
524
            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()
525
                self.outf.write(path)
526
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
527
528
529
class cmd_mv(Command):
530
    """Move or rename a file.
531
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
532
    :Usage:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
533
        bzr mv OLDNAME NEWNAME
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
534
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
535
        bzr mv SOURCE... DESTINATION
536
537
    If the last argument is a versioned directory, all the other names
538
    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
539
    and the file is changed to a new name.
540
541
    If OLDNAME does not exist on the filesystem but is versioned and
542
    NEWNAME does exist on the filesystem but is not versioned, mv
543
    assumes that the file has been manually moved and only updates
544
    its internal inventory to reflect that change.
545
    The same is valid when moving many SOURCE files to a DESTINATION.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
546
547
    Files cannot be moved between branches.
548
    """
1685.1.80 by Wouter van Heyst
more code cleanup
549
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
550
    takes_args = ['names*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
551
    takes_options = [Option("after", help="Move only the bzr identifier"
552
        " of the file, because the file has already been moved."),
553
        ]
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
554
    aliases = ['move', 'rename']
1185.85.26 by John Arbash Meinel
bzr mv should succeed even if it can't display the paths.
555
    encoding_type = 'replace'
556
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
557
    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.
558
        if names_list is None:
559
            names_list = []
560
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
561
        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
562
            raise errors.BzrCommandError("missing file argument")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
563
        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
564
        tree.lock_write()
565
        try:
566
            self._run(tree, names_list, rel_names, after)
567
        finally:
568
            tree.unlock()
3246.1.1 by Alexander Belchenko
Allow rename (change case of name) directory on case-insensitive filesystem.
569
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
570
    def _run(self, tree, names_list, rel_names, after):
571
        into_existing = osutils.isdir(names_list[-1])
572
        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.
573
            # special cases:
574
            # a. case-insensitive filesystem and change case of dir
575
            # b. move directory after the fact (if the source used to be
576
            #    a directory, but now doesn't exist in the working tree
577
            #    and the target is an existing directory, just rename it)
578
            if (not tree.case_sensitive
579
                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
580
                into_existing = False
3249.4.1 by Alexander Belchenko
merge Lukas' patch and update it with case-insensitive rename check.
581
            else:
582
                inv = tree.inventory
583
                from_id = tree.path2id(rel_names[0])
584
                if (not osutils.lexists(names_list[0]) and
585
                    from_id and inv.get_file_kind(from_id) == "directory"):
586
                    into_existing = False
587
        # move/rename
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
588
        if into_existing:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
589
            # move into existing directory
2123.3.5 by Steffen Eichenberg
specifying named parameters
590
            for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
591
                self.outf.write("%s => %s\n" % pair)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
592
        else:
593
            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
594
                raise errors.BzrCommandError('to mv multiple files the'
595
                                             ' destination must be a versioned'
596
                                             ' directory')
2123.3.5 by Steffen Eichenberg
specifying named parameters
597
            tree.rename_one(rel_names[0], rel_names[1], after=after)
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
598
            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.
599
600
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
601
class cmd_pull(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
602
    """Turn this branch into a mirror of another branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
603
604
    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
605
    considered diverged if the destination branch's most recent commit is one
606
    that has not been merged (directly or indirectly) into the parent.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
607
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
608
    If branches have diverged, you can use 'bzr merge' to integrate the changes
609
    from one into the other.  Once one branch has merged, the other should
610
    be able to pull it again.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
611
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
612
    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
613
    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
614
615
    If there is no default location set, the first pull will set it.  After
616
    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.
617
    default, use --remember. The value will only be saved if the remote
618
    location can be accessed.
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
619
620
    Note: The location can be specified either in the form of a branch,
621
    or in the form of a path to a file containing a merge directive generated
622
    with bzr send.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
623
    """
1685.1.80 by Wouter van Heyst
more code cleanup
624
2520.1.6 by Daniel Watkins
Fixed 'pull' help.
625
    _see_also = ['push', 'update', 'status-flags']
1551.17.4 by Aaron Bentley
Make pull -v description more specific
626
    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
627
        custom_help('verbose',
1551.17.4 by Aaron Bentley
Make pull -v description more specific
628
            help='Show logs of pulled revisions.'),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
629
        Option('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
630
            help='Branch to pull into, '
631
                 'rather than the one containing the working directory.',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
632
            short_name='d',
633
            type=unicode,
634
            ),
635
        ]
2520.1.6 by Daniel Watkins
Fixed 'pull' help.
636
    takes_args = ['location?']
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
637
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
638
1551.11.10 by Aaron Bentley
Add change reporting to pull
639
    def run(self, location=None, remember=False, overwrite=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
640
            revision=None, verbose=False,
641
            directory=None):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
642
        # FIXME: too much stuff is in the command class
1551.14.11 by Aaron Bentley
rename rev_id and other_rev_id
643
        revision_id = None
1551.14.7 by Aaron Bentley
test suite fixes
644
        mergeable = None
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
645
        if directory is None:
646
            directory = u'.'
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
647
        try:
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
648
            tree_to = WorkingTree.open_containing(directory)[0]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
649
            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
650
        except errors.NoWorkingTree:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
651
            tree_to = None
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
652
            branch_to = Branch.open_containing(directory)[0]
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
653
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
654
        possible_transports = []
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
655
        if location is not None:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
656
            try:
657
                mergeable = bundle.read_mergeable_from_url(location,
658
                    possible_transports=possible_transports)
659
            except errors.NotABundle:
660
                mergeable = None
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
661
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
662
        stored_loc = branch_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
663
        if location is None:
664
            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
665
                raise errors.BzrCommandError("No pull location known or"
666
                                             " specified.")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
667
            else:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
668
                display_url = urlutils.unescape_for_display(stored_loc,
669
                        self.outf.encoding)
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
670
                if not is_quiet():
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
671
                    self.outf.write("Using saved parent location: %s\n" % display_url)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
672
                location = stored_loc
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
673
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
674
        if mergeable is not None:
675
            if revision is not None:
676
                raise errors.BzrCommandError(
677
                    'Cannot use -r with merge directives or bundles')
2520.4.109 by Aaron Bentley
start work on directive cherry-picking
678
            mergeable.install_revisions(branch_to.repository)
679
            base_revision_id, revision_id, verified = \
680
                mergeable.get_merge_request(branch_to.repository)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
681
            branch_from = branch_to
682
        else:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
683
            branch_from = Branch.open(location,
684
                possible_transports=possible_transports)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
685
686
            if branch_to.get_parent() is None or remember:
687
                branch_to.set_parent(branch_from.base)
688
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
689
        if revision is not None:
690
            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()
691
                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'
692
            else:
693
                raise errors.BzrCommandError(
694
                    'bzr pull --revision takes one value.')
1185.76.1 by Erik Bågfors
Support for --revision in pull
695
1551.19.42 by Aaron Bentley
Add lock around branch pull
696
        branch_to.lock_write()
697
        try:
698
            if tree_to is not None:
699
                change_reporter = delta._ChangeReporter(
700
                    unversioned_filter=tree_to.is_ignored)
701
                result = tree_to.pull(branch_from, overwrite, revision_id,
702
                                      change_reporter,
703
                                      possible_transports=possible_transports)
704
            else:
705
                result = branch_to.pull(branch_from, overwrite, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
706
1551.19.42 by Aaron Bentley
Add lock around branch pull
707
            result.report(self.outf)
708
            if verbose and result.old_revid != result.new_revid:
709
                old_rh = list(
710
                    branch_to.repository.iter_reverse_revision_history(
711
                    result.old_revid))
712
                old_rh.reverse()
713
                new_rh = branch_to.revision_history()
714
                log.show_changed_revisions(branch_to, old_rh, new_rh,
715
                                           to_file=self.outf)
716
        finally:
717
            branch_to.unlock()
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
718
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
719
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
720
class cmd_push(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
721
    """Update a mirror of this branch.
722
    
723
    The target branch will not have its working tree populated because this
724
    is both expensive, and is not supported on remote file systems.
725
    
726
    Some smart servers or protocols *may* put the working tree in place in
727
    the future.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
728
729
    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
730
    considered diverged if the destination branch's most recent commit is one
731
    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.
732
733
    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
734
    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.
735
    
736
    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
737
    do a merge (see bzr help merge) from the other branch, and commit that.
738
    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
739
740
    If there is no default push location set, the first push will set it.
741
    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.
742
    default, use --remember. The value will only be saved if the remote
743
    location can be accessed.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
744
    """
1685.1.80 by Wouter van Heyst
more code cleanup
745
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
746
    _see_also = ['pull', 'update', 'working-trees']
3256.1.2 by Daniel Watkins
Added revision argument to push.
747
    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)
748
        Option('create-prefix',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
749
               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
750
                    'if it does not already exist.'),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
751
        Option('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
752
            help='Branch to push from, '
753
                 'rather than the one containing the working directory.',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
754
            short_name='d',
755
            type=unicode,
756
            ),
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
757
        Option('use-existing-dir',
758
               help='By default push will fail if the target'
759
                    ' 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
760
                    ' 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)
761
                    ' allow push to proceed.'),
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
762
        Option('stacked',
763
            help='Create a stacked branch that references the public location '
764
                'of the parent branch.'),
765
        Option('stacked-on',
3221.19.4 by Ian Clatworthy
shallow -> stacked
766
            help='Create a stacked branch that refers to another branch '
3221.19.2 by Ian Clatworthy
tweaks to ui during review by igc
767
                'for the commit history. Only the work not present in the '
768
                'referenced branch is included in the branch created.',
3221.11.12 by Robert Collins
Basic push --reference support, requires url, slow.
769
            type=unicode),
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
770
        ]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
771
    takes_args = ['location?']
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
772
    encoding_type = 'replace'
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
773
1495 by Robert Collins
Add a --create-prefix to the new push command.
774
    def run(self, location=None, remember=False, overwrite=False,
3221.14.3 by Ian Clatworthy
Merge bzr.dev r3466
775
        create_prefix=False, verbose=False, revision=None,
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
776
        use_existing_dir=False, directory=None, stacked_on=None,
777
        stacked=False):
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
778
        from bzrlib.push import _show_push_branch
779
780
        # Get the source branch and revision_id
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
781
        if directory is None:
782
            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.
783
        br_from = Branch.open_containing(directory)[0]
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
784
        if revision is not None:
785
            if len(revision) == 1:
786
                revision_id = revision[0].in_history(br_from).rev_id
787
            else:
788
                raise errors.BzrCommandError(
789
                    'bzr push --revision takes one value.')
790
        else:
791
            revision_id = br_from.last_revision()
792
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
793
        # Get the stacked_on branch, if any
794
        if stacked_on is not None:
795
            stacked_on = urlutils.normalize_url(stacked_on)
3221.19.4 by Ian Clatworthy
shallow -> stacked
796
        elif stacked:
3221.11.15 by Robert Collins
no parent branch causes an error on push --shallow.
797
            parent_url = br_from.get_parent()
798
            if parent_url:
799
                parent = Branch.open(parent_url)
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
800
                stacked_on = parent.get_public_branch()
801
                if not stacked_on:
3221.11.17 by Robert Collins
no public location causes the parent to be used directly with push --shallow.
802
                    # I considered excluding non-http url's here, thus forcing
803
                    # 'public' branches only, but that only works for some
3221.14.3 by Ian Clatworthy
Merge bzr.dev r3466
804
                    # 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.
805
                    # error by the feedback given to them. RBC 20080227.
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
806
                    stacked_on = parent_url
807
            if not stacked_on:
3221.11.15 by Robert Collins
no parent branch causes an error on push --shallow.
808
                raise errors.BzrCommandError(
809
                    "Could not determine branch to refer to.")
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
810
811
        # Get the destination location
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
812
        if location is None:
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
813
            stored_loc = br_from.get_push_location()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
814
            if stored_loc is None:
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
815
                raise errors.BzrCommandError(
816
                    "No push location known or specified.")
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
817
            else:
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
818
                display_url = urlutils.unescape_for_display(stored_loc,
819
                        self.outf.encoding)
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
820
                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.
821
                location = stored_loc
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
822
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
823
        _show_push_branch(br_from, revision_id, location, self.outf,
824
            verbose=verbose, overwrite=overwrite, remember=remember,
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
825
            stacked_on=stacked_on, create_prefix=create_prefix,
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
826
            use_existing_dir=use_existing_dir)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
827
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
828
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
829
class cmd_branch(Command):
830
    """Create a new copy of a branch.
831
832
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
833
    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
834
    If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
835
    is derived from the FROM_LOCATION by stripping a leading scheme or drive
836
    identifier, if any. For example, "branch lp:foo-bar" will attempt to
837
    create ./foo-bar.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
838
839
    To retrieve the branch as of a particular revision, supply the --revision
840
    parameter, as in "branch foo/bar -r 5".
841
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
842
843
    _see_also = ['checkout']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
844
    takes_args = ['from_location', 'to_location?']
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
845
    takes_options = ['revision', Option('hardlink',
3221.11.20 by Robert Collins
Support --shallow on branch.
846
        help='Hard-link working tree files where possible.'),
3221.20.3 by Ian Clatworthy
shallow -> stacked
847
        Option('stacked',
848
            help='Create a stacked branch referring to the source branch. '
3221.11.20 by Robert Collins
Support --shallow on branch.
849
                'The new branch will depend on the availability of the source '
850
                'branch for all operations.'),
851
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
852
    aliases = ['get', 'clone']
853
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
854
    def run(self, from_location, to_location=None, revision=None,
3221.20.3 by Ian Clatworthy
shallow -> stacked
855
            hardlink=False, stacked=False):
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
856
        from bzrlib.tag import _merge_tags_if_possible
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
857
        if revision is None:
858
            revision = [None]
859
        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
860
            raise errors.BzrCommandError(
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
861
                'bzr branch --revision takes exactly 1 revision value')
2283.1.1 by John Arbash Meinel
(John Arbash Meinel) (trivial) remove unused and incorrect code.
862
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
863
        accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
864
            from_location)
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
865
        br_from.lock_read()
866
        try:
1185.8.4 by Aaron Bentley
Fixed branch -r
867
            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()
868
                revision_id = revision[0].as_revision_id(br_from)
1185.8.4 by Aaron Bentley
Fixed branch -r
869
            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.
870
                # FIXME - wt.last_revision, fallback to branch, fall back to
871
                # None or perhaps NULL_REVISION to mean copy nothing
872
                # RBC 20060209
873
                revision_id = br_from.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
874
            if to_location is None:
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
875
                to_location = urlutils.derive_to_location(from_location)
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
876
            to_transport = transport.get_transport(to_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
877
            try:
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
878
                to_transport.mkdir('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
879
            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
880
                raise errors.BzrCommandError('Target directory "%s" already'
881
                                             ' exists.' % to_location)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
882
            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
883
                raise errors.BzrCommandError('Parent of "%s" does not exist.'
884
                                             % to_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
885
            try:
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
886
                # preserve whatever source format we have.
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
887
                dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
3123.5.8 by Aaron Bentley
Work around double-opening lock issue
888
                                            possible_transports=[to_transport],
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
889
                                            accelerator_tree=accelerator_tree,
3221.20.3 by Ian Clatworthy
shallow -> stacked
890
                                            hardlink=hardlink, stacked=stacked)
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
891
                branch = dir.open_branch()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
892
            except errors.NoSuchRevision:
1685.1.80 by Wouter van Heyst
more code cleanup
893
                to_transport.delete_tree('.')
3221.20.1 by Ian Clatworthy
tweaks by igc during review
894
                msg = "The branch %s has no revision %s." % (from_location,
895
                    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
896
                raise errors.BzrCommandError(msg)
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
897
            _merge_tags_if_possible(br_from, branch)
3221.20.3 by Ian Clatworthy
shallow -> stacked
898
            # If the source branch is stacked, the new branch may
899
            # be stacked whether we asked for that explicitly or not.
900
            # 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.
901
            try:
3221.20.3 by Ian Clatworthy
shallow -> stacked
902
                note('Created new stacked branch referring to %s.' %
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
903
                    branch.get_stacked_on_url())
3221.11.19 by Robert Collins
Branching a shallow branch gets a shallow branch.
904
            except (errors.NotStacked, errors.UnstackableBranchFormat,
3221.11.20 by Robert Collins
Support --shallow on branch.
905
                errors.UnstackableRepositoryFormat), e:
3221.11.19 by Robert Collins
Branching a shallow branch gets a shallow branch.
906
                note('Branched %d revision(s).' % branch.revno())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
907
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
908
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
909
910
1508.1.20 by Robert Collins
Create a checkout command.
911
class cmd_checkout(Command):
912
    """Create a new checkout of an existing branch.
913
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
914
    If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
915
    the branch found in '.'. This is useful if you have removed the working tree
916
    or if it was never created - i.e. if you pushed the branch to its current
917
    location using SFTP.
918
    
1508.1.20 by Robert Collins
Create a checkout command.
919
    If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
920
    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
921
    If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
922
    is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
923
    identifier, if any. For example, "checkout lp:foo-bar" will attempt to
924
    create ./foo-bar.
1508.1.20 by Robert Collins
Create a checkout command.
925
926
    To retrieve the branch as of a particular revision, supply the --revision
927
    parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
928
    out of date [so you cannot commit] but it may be useful (i.e. to examine old
929
    code.)
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
930
    """
1508.1.20 by Robert Collins
Create a checkout command.
931
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
932
    _see_also = ['checkouts', 'branch']
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
933
    takes_args = ['branch_location?', 'to_location?']
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
934
    takes_options = ['revision',
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
935
                     Option('lightweight',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
936
                            help="Perform a lightweight checkout.  Lightweight "
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
937
                                 "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
938
                                 "every operation.  Normal checkouts can perform "
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
939
                                 "common operations like diff and status without "
940
                                 "such access, and also support local commits."
941
                            ),
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
942
                     Option('files-from', type=str,
943
                            help="Get file contents from this tree."),
944
                     Option('hardlink',
945
                            help='Hard-link working tree files where possible.'
946
                            ),
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
947
                     ]
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
948
    aliases = ['co']
1508.1.20 by Robert Collins
Create a checkout command.
949
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
950
    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
951
            lightweight=False, files_from=None, hardlink=False):
1508.1.20 by Robert Collins
Create a checkout command.
952
        if revision is None:
953
            revision = [None]
954
        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
955
            raise errors.BzrCommandError(
1508.1.20 by Robert Collins
Create a checkout command.
956
                'bzr checkout --revision takes exactly 1 revision value')
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
957
        if branch_location is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
958
            branch_location = osutils.getcwd()
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
959
            to_location = branch_location
3123.5.20 by Aaron Bentley
Checkout uses branch tree as a fallback accelerator
960
        accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
961
            branch_location)
962
        if files_from is not None:
963
            accelerator_tree = WorkingTree.open(files_from)
1508.1.20 by Robert Collins
Create a checkout command.
964
        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()
965
            revision_id = revision[0].as_revision_id(source)
1508.1.20 by Robert Collins
Create a checkout command.
966
        else:
967
            revision_id = None
968
        if to_location is None:
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
969
            to_location = urlutils.derive_to_location(branch_location)
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
970
        # if the source and to_location are the same, 
971
        # and there is no working tree,
972
        # then reconstitute a branch
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
973
        if (osutils.abspath(to_location) ==
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
974
            osutils.abspath(branch_location)):
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
975
            try:
976
                source.bzrdir.open_workingtree()
977
            except errors.NoWorkingTree:
1551.15.60 by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708)
978
                source.bzrdir.create_workingtree(revision_id)
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
979
                return
3123.5.2 by Aaron Bentley
Allow checkout --files_from
980
        source.create_checkout(to_location, revision_id, lightweight,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
981
                               accelerator_tree, hardlink)
1508.1.20 by Robert Collins
Create a checkout command.
982
983
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
984
class cmd_renames(Command):
985
    """Show list of renamed files.
986
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
987
    # TODO: Option to show renames between two historical versions.
988
989
    # 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)
990
    _see_also = ['status']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
991
    takes_args = ['dir?']
992
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
993
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
994
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
995
        tree = WorkingTree.open_containing(dir)[0]
2255.7.63 by Robert Collins
Fix cmd_renames to lock around inventory access.
996
        tree.lock_read()
997
        try:
998
            new_inv = tree.inventory
999
            old_tree = tree.basis_tree()
1000
            old_tree.lock_read()
1001
            try:
1002
                old_inv = old_tree.inventory
1003
                renames = list(_mod_tree.find_renames(old_inv, new_inv))
1004
                renames.sort()
1005
                for old_name, new_name in renames:
1006
                    self.outf.write("%s => %s\n" % (old_name, new_name))
1007
            finally:
1008
                old_tree.unlock()
1009
        finally:
1010
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1011
1012
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1013
class cmd_update(Command):
1014
    """Update a tree to have the latest code committed to its branch.
1015
    
1016
    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.
1017
    conflicts. If you have any local changes, you will still 
1018
    need to commit them after the update for the update to be complete.
1019
    
1020
    If you want to discard your local changes, you can just do a 
1021
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1022
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1023
2625.5.1 by Daniel Watkins
'bzr update's help now includes a see also reference to 'help status-flags'.
1024
    _see_also = ['pull', 'working-trees', 'status-flags']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1025
    takes_args = ['dir?']
1815.3.1 by Stefan (metze) Metzmacher
add 'up' as alias for 'update'
1026
    aliases = ['up']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1027
1028
    def run(self, dir='.'):
1029
        tree = WorkingTree.open_containing(dir)[0]
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1030
        possible_transports = []
1031
        master = tree.branch.get_master_branch(
1032
            possible_transports=possible_transports)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1033
        if master is not None:
1034
            tree.lock_write()
1035
        else:
1036
            tree.lock_tree_write()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1037
        try:
2014.1.1 by John Arbash Meinel
Stop using pending_merges() in 'bzr update'
1038
            existing_pending_merges = tree.get_parent_ids()[1:]
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
1039
            last_rev = _mod_revision.ensure_null(tree.last_revision())
1040
            if last_rev == _mod_revision.ensure_null(
1041
                tree.branch.last_revision()):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1042
                # may be up to date, check master too.
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
1043
                if master is None or last_rev == _mod_revision.ensure_null(
1044
                    master.last_revision()):
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
1045
                    revno = tree.branch.revision_id_to_revno(last_rev)
1046
                    note("Tree is up to date at revision %d." % (revno,))
1047
                    return 0
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1048
            conflicts = tree.update(
1049
                delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1050
                possible_transports=possible_transports)
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
1051
            revno = tree.branch.revision_id_to_revno(
1052
                _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.
1053
            note('Updated to revision %d.' % (revno,))
2014.1.1 by John Arbash Meinel
Stop using pending_merges() in 'bzr update'
1054
            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.
1055
                note('Your local commits will now show as pending merges with '
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
1056
                     "'bzr status', and can be committed with 'bzr commit'.")
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1057
            if conflicts != 0:
1058
                return 1
1059
            else:
1060
                return 0
1061
        finally:
1062
            tree.unlock()
1063
1064
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1065
class cmd_info(Command):
1694.2.6 by Martin Pool
[merge] bzr.dev
1066
    """Show information about a working tree, branch or repository.
1067
1068
    This command will show all known locations and formats associated to the
1069
    tree, branch or repository.  Statistical information is included with
1070
    each report.
1071
1072
    Branches and working trees will also report any missing revisions.
1073
    """
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
1074
    _see_also = ['revno', 'working-trees', 'repositories']
1694.2.6 by Martin Pool
[merge] bzr.dev
1075
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
1076
    takes_options = ['verbose']
2904.3.1 by Lukáš Lalinský
Unicode-safe output from ``bzr info``.
1077
    encoding_type = 'replace'
1694.2.6 by Martin Pool
[merge] bzr.dev
1078
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1079
    @display_command
2768.1.8 by Ian Clatworthy
Get test suite fully working again
1080
    def run(self, location=None, verbose=False):
1081
        if verbose:
1082
            noise_level = 2
1083
        else:
1084
            noise_level = 0
1694.2.6 by Martin Pool
[merge] bzr.dev
1085
        from bzrlib.info import show_bzrdir_info
1086
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
2904.3.1 by Lukáš Lalinský
Unicode-safe output from ``bzr info``.
1087
                         verbose=noise_level, outfile=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1088
1089
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
1090
class cmd_remove(Command):
2292.1.24 by Marius Kruger
minor text cleanups
1091
    """Remove files or directories.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1092
3619.5.3 by Robert Collins
Review feedback.
1093
    This makes bzr stop tracking changes to the specified files. bzr will delete
1094
    them if they can easily be recovered using revert. If no options or
1095
    parameters are given bzr will scan for files that are being tracked by bzr
1096
    but missing in your tree and stop tracking them for you.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1097
    """
1551.6.26 by Aaron Bentley
Add support for remove --new
1098
    takes_args = ['file*']
2292.1.30 by Marius Kruger
* Minor text fixes.
1099
    takes_options = ['verbose',
3619.5.1 by Robert Collins
* ``bzr rm`` will now scan for files that are missing and remove just
1100
        Option('new', help='Only remove files that have never been committed.'),
2292.1.28 by Marius Kruger
* NEWS
1101
        RegistryOption.from_kwargs('file-deletion-strategy',
2681.1.7 by Aaron Bentley
Fix option grammar
1102
            'The file deletion mode to be used.',
2292.1.28 by Marius Kruger
* NEWS
1103
            title='Deletion Strategy', value_switches=True, enum_switch=False,
2292.1.30 by Marius Kruger
* Minor text fixes.
1104
            safe='Only delete files if they can be'
1105
                 ' safely recovered (default).',
2292.1.28 by Marius Kruger
* NEWS
1106
            keep="Don't delete any files.",
1107
            force='Delete all the specified files, even if they can not be '
1108
                '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
1109
    aliases = ['rm', 'del']
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1110
    encoding_type = 'replace'
2292.1.1 by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file.
1111
2292.1.30 by Marius Kruger
* Minor text fixes.
1112
    def run(self, file_list, verbose=False, new=False,
2292.1.28 by Marius Kruger
* NEWS
1113
        file_deletion_strategy='safe'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1114
        tree, file_list = tree_files(file_list)
2292.1.1 by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file.
1115
1116
        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'
1117
            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.
1118
3619.5.1 by Robert Collins
* ``bzr rm`` will now scan for files that are missing and remove just
1119
        tree.lock_write()
1120
        try:
1121
            # Heuristics should probably all move into tree.remove_smart or
1122
            # some such?
1123
            if new:
1124
                added = tree.changes_from(tree.basis_tree(),
1125
                    specific_files=file_list).added
1126
                file_list = sorted([f[0] for f in added], reverse=True)
1127
                if len(file_list) == 0:
1128
                    raise errors.BzrCommandError('No matching files.')
1129
            elif file_list is None:
1130
                # missing files show up in iter_changes(basis) as
1131
                # versioned-with-no-kind.
1132
                missing = []
1133
                for change in tree.iter_changes(tree.basis_tree()):
3619.5.3 by Robert Collins
Review feedback.
1134
                    # Find paths in the working tree that have no kind:
1135
                    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
1136
                        missing.append(change[1][1])
1137
                file_list = sorted(missing, reverse=True)
1138
                file_deletion_strategy = 'keep'
1139
            tree.remove(file_list, verbose=verbose, to_file=self.outf,
1140
                keep_files=file_deletion_strategy=='keep',
1141
                force=file_deletion_strategy=='force')
1142
        finally:
1143
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1144
1145
1146
class cmd_file_id(Command):
1147
    """Print file_id of a particular file or directory.
1148
1149
    The file_id is assigned when the file is first added and remains the
1150
    same through all revisions where the file exists, even when it is
1151
    moved or renamed.
1152
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1153
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1154
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1155
    _see_also = ['inventory', 'ls']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1156
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
1157
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1158
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1159
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1160
        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.
1161
        i = tree.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1162
        if i is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1163
            raise errors.NotVersionedError(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1164
        else:
1685.1.80 by Wouter van Heyst
more code cleanup
1165
            self.outf.write(i + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1166
1167
1168
class cmd_file_path(Command):
1169
    """Print path of file_ids to a file or directory.
1170
1171
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
1172
    starting at the branch root.
1173
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1174
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1175
    hidden = True
1176
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
1177
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1178
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1179
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1180
        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.
1181
        fid = tree.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1182
        if fid is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1183
            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.
1184
        segments = osutils.splitpath(relpath)
1185
        for pos in range(1, len(segments) + 1):
1186
            path = osutils.joinpath(segments[:pos])
1187
            self.outf.write("%s\n" % tree.path2id(path))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1188
1189
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1190
class cmd_reconcile(Command):
1191
    """Reconcile bzr metadata in a branch.
1192
1193
    This can correct data mismatches that may have been caused by
1194
    previous ghost operations or bzr upgrades. You should only
1195
    need to run this command if 'bzr check' or a bzr developer 
1196
    advises you to run it.
1197
1198
    If a second branch is provided, cross-branch reconciliation is
1199
    also attempted, which will check that data like the tree root
1200
    id which was not present in very early bzr versions is represented
1201
    correctly in both branches.
1202
1203
    At the same time it is run it may recompress data resulting in 
1204
    a potential saving in disk space or performance gain.
1205
1206
    The branch *MUST* be on a listable system such as local disk or sftp.
1207
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1208
1209
    _see_also = ['check']
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1210
    takes_args = ['branch?']
1211
1212
    def run(self, branch="."):
1213
        from bzrlib.reconcile import reconcile
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1214
        dir = bzrdir.BzrDir.open(branch)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1215
        reconcile(dir)
1216
1217
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1218
class cmd_revision_history(Command):
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1219
    """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)
1220
1221
    _see_also = ['log']
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1222
    takes_args = ['location?']
1223
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1224
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1225
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1226
    @display_command
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1227
    def run(self, location="."):
1228
        branch = Branch.open_containing(location)[0]
1229
        for revid in branch.revision_history():
1733.2.4 by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history().
1230
            self.outf.write(revid)
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1231
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1232
1233
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1234
class cmd_ancestry(Command):
1235
    """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)
1236
1237
    _see_also = ['log', 'revision-history']
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
1238
    takes_args = ['location?']
1239
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1240
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1241
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1242
    @display_command
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
1243
    def run(self, location="."):
1244
        try:
1245
            wt = WorkingTree.open_containing(location)[0]
1246
        except errors.NoWorkingTree:
1247
            b = Branch.open(location)
1248
            last_revision = b.last_revision()
1249
        else:
1250
            b = wt.branch
1251
            last_revision = wt.last_revision()
1252
1253
        revision_ids = b.repository.get_ancestry(last_revision)
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
1254
        revision_ids.pop(0)
1255
        for revision_id in revision_ids:
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
1256
            self.outf.write(revision_id + '\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1257
1258
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1259
class cmd_init(Command):
1260
    """Make a directory into a versioned branch.
1261
1262
    Use this to create an empty branch, or before importing an
1263
    existing project.
1264
1662.1.19 by Martin Pool
Better error message when initting existing tree
1265
    If there is a repository in a parent directory of the location, then 
1266
    the history of the branch will be stored in the repository.  Otherwise
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
1267
    init creates a standalone branch which carries its own history
1268
    in the .bzr directory.
1662.1.19 by Martin Pool
Better error message when initting existing tree
1269
1270
    If there is already a branch at the location but it has no working tree,
1271
    the tree can be populated with 'bzr checkout'.
1272
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1273
    Recipe for importing a tree of files::
1274
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1275
        cd ~/project
1276
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
1277
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1278
        bzr status
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
1279
        bzr commit -m "imported project"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1280
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1281
2677.1.2 by Alexander Belchenko
bzr_man: see also topics as cross-reference links
1282
    _see_also = ['init-repository', 'branch', 'checkout']
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1283
    takes_args = ['location?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1284
    takes_options = [
2524.1.1 by Aaron Bentley
Revert broken changes
1285
        Option('create-prefix',
1286
               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
1287
                    'if it does not already exist.'),
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1288
         RegistryOption('format',
1289
                help='Specify a format for this branch. '
1290
                'See "help formats".',
1291
                registry=bzrdir.format_registry,
2241.1.19 by mbp at sourcefrog
(merge) trunk
1292
                converter=bzrdir.format_registry.make_bzrdir,
1293
                value_switches=True,
1294
                title="Branch Format",
1295
                ),
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1296
         Option('append-revisions-only',
1297
                help='Never change revnos or the existing log.'
1298
                '  Append revisions to it only.')
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1299
         ]
2524.1.1 by Aaron Bentley
Revert broken changes
1300
    def run(self, location=None, format=None, append_revisions_only=False,
1301
            create_prefix=False):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1302
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1303
            format = bzrdir.format_registry.make_bzrdir('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1304
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1305
            location = u'.'
1830.4.5 by Wouter van Heyst
cleanup
1306
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1307
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1308
1309
        # The path has to exist to initialize a
1310
        # branch inside of it.
1311
        # Just using os.mkdir, since I don't
1312
        # believe that we want to create a bunch of
1313
        # locations if the user supplies an extended path
2524.1.1 by Aaron Bentley
Revert broken changes
1314
        try:
1315
            to_transport.ensure_base()
1316
        except errors.NoSuchFile:
1317
            if not create_prefix:
1318
                raise errors.BzrCommandError("Parent directory of %s"
1319
                    " does not exist."
1320
                    "\nYou may supply --create-prefix to create all"
1321
                    " leading parent directories."
1322
                    % location)
1323
            _create_prefix(to_transport)
2504.1.3 by Daniel Watkins
Implemented --create-prefix for 'init'.
1324
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1325
        try:
2476.3.3 by Vincent Ladeuil
Fix bug #111702.
1326
            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
1327
        except errors.NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1328
            # really a NotBzrDir error...
2476.3.11 by Vincent Ladeuil
Cosmetic changes.
1329
            create_branch = bzrdir.BzrDir.create_branch_convenience
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
1330
            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
1331
                                   possible_transports=[to_transport])
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1332
        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
1333
            from bzrlib.transport.local import LocalTransport
1662.1.19 by Martin Pool
Better error message when initting existing tree
1334
            if existing_bzrdir.has_branch():
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1335
                if (isinstance(to_transport, LocalTransport)
1336
                    and not existing_bzrdir.has_workingtree()):
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1337
                        raise errors.BranchExistsWithoutWorkingTree(location)
1338
                raise errors.AlreadyBranchError(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1339
            else:
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1340
                branch = existing_bzrdir.create_branch()
1662.1.19 by Martin Pool
Better error message when initting existing tree
1341
                existing_bzrdir.create_workingtree()
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1342
        if append_revisions_only:
1343
            try:
1344
                branch.set_append_revisions_only(True)
1345
            except errors.UpgradeRequired:
1346
                raise errors.BzrCommandError('This branch format cannot be set'
1347
                    ' to append-revisions-only.  Try --experimental-branch6')
3535.9.1 by Marius Kruger
print info after init and init-repo
1348
        if not is_quiet():
1349
            from bzrlib.info import show_bzrdir_info
3535.9.4 by Marius Kruger
use open_containing_from_transport in stead of open_containing
1350
            show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
1351
                to_transport)[0], verbose=0, outfile=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1352
1353
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1354
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1355
    """Create a shared repository to hold branches.
1356
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
1357
    New branches created under the repository directory will store their
1358
    revisions in the repository, not in the branch directory.
1359
1360
    If the --no-trees option is used then the branches in the repository
1361
    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)
1362
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1363
    :Examples:
1364
        Create a shared repositories holding just branches::
1365
1366
            bzr init-repo --no-trees repo
1367
            bzr init repo/trunk
1368
1369
        Make a lightweight checkout elsewhere::
1370
1371
            bzr checkout --lightweight repo/trunk trunk-checkout
1372
            cd trunk-checkout
1373
            (add files here)
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1374
    """
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
1375
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1376
    _see_also = ['init', 'branch', 'checkout', 'repositories']
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1377
    takes_args = ["location"]
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1378
    takes_options = [RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1379
                            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
1380
                                 ' "bzr help formats" for details.',
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1381
                            registry=bzrdir.format_registry,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1382
                            converter=bzrdir.format_registry.make_bzrdir,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1383
                            value_switches=True, title='Repository format'),
2257.2.1 by Wouter van Heyst
Change the ui level default for init-repo to --trees.
1384
                     Option('no-trees',
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
1385
                             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
1386
                                  ' not having a working tree.'),
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
1387
                    ]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1388
    aliases = ["init-repo"]
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
1389
2257.2.2 by Wouter van Heyst
Actually test that `bzr init-repo --{no,}-trees` still works
1390
    def run(self, location, format=None, no_trees=False):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1391
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1392
            format = bzrdir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1393
1394
        if location is None:
1395
            location = '.'
1396
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1397
        to_transport = transport.get_transport(location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1398
        to_transport.ensure_base()
1830.4.5 by Wouter van Heyst
cleanup
1399
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1400
        newdir = format.initialize_on_transport(to_transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
1401
        repo = newdir.create_repository(shared=True)
2257.2.2 by Wouter van Heyst
Actually test that `bzr init-repo --{no,}-trees` still works
1402
        repo.set_make_working_trees(not no_trees)
3535.9.1 by Marius Kruger
print info after init and init-repo
1403
        if not is_quiet():
1404
            from bzrlib.info import show_bzrdir_info
3535.9.4 by Marius Kruger
use open_containing_from_transport in stead of open_containing
1405
            show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
1406
                to_transport)[0], verbose=0, outfile=self.outf)
1558.5.1 by Aaron Bentley
Added make-repository command
1407
1408
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1409
class cmd_diff(Command):
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1410
    """Show differences in the working tree, between revisions or branches.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1411
    
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1412
    If no arguments are given, all changes for the current tree are listed.
1413
    If files are given, only the changes in those files are listed.
1414
    Remote and multiple branches can be compared by using the --old and
1415
    --new options. If not provided, the default for both is derived from
1416
    the first argument, if any, or the current tree if no arguments are
1417
    given.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1418
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1419
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1420
    produces patches suitable for "patch -p1".
1421
2961.2.1 by Guillermo Gonzalez
* fix Bug #147938 (add exit values reference for cmd_diff help)
1422
    :Exit values:
1423
        1 - changed
1424
        2 - unrepresentable changes
1425
        3 - error
1426
        0 - no change
1427
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1428
    :Examples:
1429
        Shows the difference in the working tree versus the last commit::
1430
1431
            bzr diff
1432
1433
        Difference between the working tree and revision 1::
1434
1435
            bzr diff -r1
1436
1437
        Difference between revision 2 and revision 1::
1438
1439
            bzr diff -r1..2
1440
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1441
        Difference between revision 2 and revision 1 for branch xxx::
1442
1443
            bzr diff -r1..2 xxx
1444
1445
        Show just the differences for file NEWS::
1446
1447
            bzr diff NEWS
1448
1449
        Show the differences in working tree xxx for file NEWS::
1450
1451
            bzr diff xxx/NEWS
1452
1453
        Show the differences from branch xxx to this working tree:
1454
1455
            bzr diff --old xxx
1456
1457
        Show the differences between two branches for file NEWS::
1458
3072.1.4 by Ian Clatworthy
Tweak help
1459
            bzr diff --old xxx --new yyy NEWS
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1460
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1461
        Same as 'bzr diff' but prefix paths with old/ and new/::
1462
1463
            bzr diff --prefix old/:new/
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1464
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1465
    _see_also = ['status']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1466
    takes_args = ['file*']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
1467
    takes_options = [
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
1468
        Option('diff-options', type=str,
1469
               help='Pass these options to the external diff program.'),
2193.3.1 by Martin Pool
Finish removal of global short-option table
1470
        Option('prefix', type=str,
1471
               short_name='p',
2852.1.1 by Vincent Ladeuil
Fix typo.
1472
               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
1473
                    'two values separated by a colon. (eg "old/:new/").'),
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1474
        Option('old',
3118.1.2 by Ian Clatworthy
diff on branches without working trees (Ian Clatworthy, #6700)
1475
            help='Branch/tree to compare from.',
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1476
            type=unicode,
1477
            ),
1478
        Option('new',
3118.1.2 by Ian Clatworthy
diff on branches without working trees (Ian Clatworthy, #6700)
1479
            help='Branch/tree to compare to.',
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1480
            type=unicode,
1481
            ),
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
1482
        'revision',
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
1483
        'change',
3123.6.2 by Aaron Bentley
Implement diff --using natively
1484
        Option('using',
1485
            help='Use this command to compare files.',
1486
            type=unicode,
1487
            ),
2190.2.1 by Martin Pool
remove global registration of short options
1488
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1489
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1490
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1491
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1492
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1493
    def run(self, revision=None, file_list=None, diff_options=None,
3123.6.2 by Aaron Bentley
Implement diff --using natively
1494
            prefix=None, old=None, new=None, using=None):
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1495
        from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1496
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1497
        if (prefix is None) or (prefix == '0'):
1498
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
1499
            old_label = ''
1500
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1501
        elif prefix == '1':
1502
            old_label = 'old/'
1503
            new_label = 'new/'
2197.2.1 by Martin Pool
Refactor cmd_diff
1504
        elif ':' in prefix:
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1505
            old_label, new_label = prefix.split(":")
2197.2.1 by Martin Pool
Refactor cmd_diff
1506
        else:
2324.1.1 by Dmitry Vasiliev
Small fixes for bzr diff
1507
            raise errors.BzrCommandError(
2325.1.2 by John Arbash Meinel
Add (eg "old/:new/") to errors to make it a little clearer.
1508
                '--prefix expects two values separated by a colon'
1509
                ' (eg "old/:new/")')
2197.2.1 by Martin Pool
Refactor cmd_diff
1510
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.
1511
        if revision and len(revision) > 2:
1512
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1513
                                         ' one or two revision specifiers')
2325.1.2 by John Arbash Meinel
Add (eg "old/:new/") to errors to make it a little clearer.
1514
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
1515
        old_tree, new_tree, specific_files, extra_trees = \
1516
                _get_trees_to_diff(file_list, revision, old, new)
1517
        return show_diff_trees(old_tree, new_tree, sys.stdout, 
1518
                               specific_files=specific_files,
1519
                               external_diff_options=diff_options,
1520
                               old_label=old_label, new_label=new_label,
3123.6.2 by Aaron Bentley
Implement diff --using natively
1521
                               extra_trees=extra_trees, using=using)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1522
1523
1524
class cmd_deleted(Command):
1525
    """List files deleted in the working tree.
1526
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1527
    # TODO: Show files deleted since a previous revision, or
1528
    # between two revisions.
1529
    # TODO: Much more efficient way to do this: read in new
1530
    # directories with readdir, rather than stating each one.  Same
1531
    # level of effort but possibly much less IO.  (Or possibly not,
1532
    # if the directories are very large...)
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1533
    _see_also = ['status', 'ls']
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1534
    takes_options = ['show-ids']
1535
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1536
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1537
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1538
        tree = WorkingTree.open_containing(u'.')[0]
2255.7.72 by Robert Collins
Update cmd_deleted to lock around inventory access.
1539
        tree.lock_read()
1540
        try:
1541
            old = tree.basis_tree()
1542
            old.lock_read()
1543
            try:
1544
                for path, ie in old.inventory.iter_entries():
1545
                    if not tree.has_id(ie.file_id):
1546
                        self.outf.write(path)
1547
                        if show_ids:
1548
                            self.outf.write(' ')
1549
                            self.outf.write(ie.file_id)
1550
                        self.outf.write('\n')
1551
            finally:
1552
                old.unlock()
1553
        finally:
1554
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1555
1556
1557
class cmd_modified(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1558
    """List files modified in working tree.
1559
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1560
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1561
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1562
    _see_also = ['status', 'ls']
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1563
    takes_options = [
1564
            Option('null',
1565
                   help='Write an ascii NUL (\\0) separator '
1566
                   'between files rather than a newline.')
1567
            ]
1551.10.14 by Aaron Bentley
Add some blank lines
1568
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1569
    @display_command
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1570
    def run(self, null=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1571
        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.
1572
        td = tree.changes_from(tree.basis_tree())
1398 by Robert Collins
integrate in Gustavos x-bit patch
1573
        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
1574
            if null:
1575
                self.outf.write(path + '\0')
1576
            else:
1577
                self.outf.write(osutils.quotefn(path) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1578
1579
1580
class cmd_added(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1581
    """List files added in working tree.
1582
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1583
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1584
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1585
    _see_also = ['status', 'ls']
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1586
    takes_options = [
1587
            Option('null',
1588
                   help='Write an ascii NUL (\\0) separator '
1589
                   'between files rather than a newline.')
1590
            ]
1551.10.14 by Aaron Bentley
Add some blank lines
1591
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1592
    @display_command
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1593
    def run(self, null=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1594
        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.
1595
        wt.lock_read()
1596
        try:
1597
            basis = wt.basis_tree()
1598
            basis.lock_read()
1599
            try:
1600
                basis_inv = basis.inventory
1601
                inv = wt.inventory
1602
                for file_id in inv:
1603
                    if file_id in basis_inv:
1604
                        continue
1605
                    if inv.is_root(file_id) and len(basis_inv) == 0:
1606
                        continue
1607
                    path = inv.id2path(file_id)
1608
                    if not os.access(osutils.abspath(path), os.F_OK):
1609
                        continue
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
1610
                    if null:
1611
                        self.outf.write(path + '\0')
1612
                    else:
1613
                        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.
1614
            finally:
1615
                basis.unlock()
1616
        finally:
1617
            wt.unlock()
1185.85.53 by John Arbash Meinel
Updated cmd_root
1618
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1619
1620
class cmd_root(Command):
1621
    """Show the tree root directory.
1622
1623
    The root is the nearest enclosing directory with a .bzr control
1624
    directory."""
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1625
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1626
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1627
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1628
    def run(self, filename=None):
1629
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1630
        tree = WorkingTree.open_containing(filename)[0]
1685.1.80 by Wouter van Heyst
more code cleanup
1631
        self.outf.write(tree.basedir + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1632
1633
2466.9.1 by Kent Gibson
add bzr log --limit
1634
def _parse_limit(limitstring):
1635
    try:
1636
        return int(limitstring)
1637
    except ValueError:
1638
        msg = "The limit argument must be an integer."
1639
        raise errors.BzrCommandError(msg)
1640
1641
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1642
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1643
    """Show log of a branch, file, or directory.
1644
1645
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1646
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1647
    To request a range of logs, you can use the command -r begin..end
1648
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1649
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1650
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1651
    :Examples:
1652
        Log the current branch::
1653
1654
            bzr log
1655
1656
        Log a file::
1657
1658
            bzr log foo.c
1659
1660
        Log the last 10 revisions of a branch::
1661
1662
            bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1663
    """
1664
1393.1.55 by Martin Pool
doc
1665
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1666
1626.1.2 by Martin Pool
Better help message for log command.
1667
    takes_args = ['location?']
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
1668
    takes_options = [
1669
            Option('forward',
1670
                   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.
1671
            Option('timezone',
1672
                   type=str,
1673
                   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
1674
            custom_help('verbose',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
1675
                   help='Show files changed in each revision.'),
1676
            'show-ids',
1677
            'revision',
1678
            'log-format',
1679
            Option('message',
1680
                   short_name='m',
1681
                   help='Show revisions whose message matches this '
1682
                        'regular expression.',
1683
                   type=str),
1684
            Option('limit',
3108.1.1 by Matt Nordhoff
bzr log: Add -l short name for the --limit argument.
1685
                   short_name='l',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
1686
                   help='Limit the output to the first N revisions.',
1687
                   argname='N',
1688
                   type=_parse_limit),
1689
            ]
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()
1690
    encoding_type = 'replace'
1691
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1692
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1693
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1694
            verbose=False,
1695
            show_ids=False,
1696
            forward=False,
1697
            revision=None,
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1698
            log_format=None,
2466.9.1 by Kent Gibson
add bzr log --limit
1699
            message=None,
1700
            limit=None):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1701
        from bzrlib.log import show_log
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1702
        direction = (forward and 'forward') or 'reverse'
1703
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1704
        # log everything
1705
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1706
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1707
            # find the file id to log:
1708
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
1709
            tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1710
                location)
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1711
            if fp != '':
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
1712
                if tree is None:
1713
                    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.
1714
                file_id = tree.path2id(fp)
2100.1.1 by wang
Running ``bzr log`` on nonexistent file gives an error instead of the
1715
                if file_id is None:
1716
                    raise errors.BzrCommandError(
1717
                        "Path does not have any revision history: %s" %
1718
                        location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1719
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1720
            # local dir only
1721
            # 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.
1722
            if revision is not None \
1723
                    and len(revision) > 0 and revision[0].get_branch():
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1724
                location = revision[0].get_branch()
1725
            else:
1726
                location = '.'
1727
            dir, relpath = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1728
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1729
2230.4.1 by Aaron Bentley
Get log as fast branch5
1730
        b.lock_read()
1731
        try:
1732
            if revision is None:
1733
                rev1 = None
1734
                rev2 = None
1735
            elif len(revision) == 1:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1736
                rev1 = rev2 = revision[0].in_history(b)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1737
            elif len(revision) == 2:
1738
                if revision[1].get_branch() != revision[0].get_branch():
1739
                    # b is taken from revision[0].get_branch(), and
1740
                    # show_log will use its revision_history. Having
1741
                    # different branches will lead to weird behaviors.
1742
                    raise errors.BzrCommandError(
1743
                        "Log doesn't accept two revisions in different"
1744
                        " branches.")
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1745
                rev1 = revision[0].in_history(b)
1746
                rev2 = revision[1].in_history(b)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1747
            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
1748
                raise errors.BzrCommandError(
2230.4.1 by Aaron Bentley
Get log as fast branch5
1749
                    'bzr log --revision takes one or two values.')
1750
1751
            if log_format is None:
1752
                log_format = log.log_formatter_registry.get_default(b)
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
1753
2230.4.1 by Aaron Bentley
Get log as fast branch5
1754
            lf = log_format(show_ids=show_ids, to_file=self.outf,
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
1755
                            show_timezone=timezone)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1756
1757
            show_log(b,
1758
                     lf,
1759
                     file_id,
1760
                     verbose=verbose,
1761
                     direction=direction,
1762
                     start_revision=rev1,
1763
                     end_revision=rev2,
2466.9.1 by Kent Gibson
add bzr log --limit
1764
                     search=message,
1765
                     limit=limit)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1766
        finally:
1767
            b.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1768
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1769
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1770
def get_log_format(long=False, short=False, line=False, default='long'):
1771
    log_format = default
1772
    if long:
1773
        log_format = 'long'
1774
    if short:
1775
        log_format = 'short'
1776
    if line:
1777
        log_format = 'line'
1778
    return log_format
1779
1780
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1781
class cmd_touching_revisions(Command):
1782
    """Return revision-ids which affected a particular file.
1783
1685.1.80 by Wouter van Heyst
more code cleanup
1784
    A more user-friendly interface is "bzr log FILE".
1785
    """
1786
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1787
    hidden = True
1788
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1789
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1790
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1791
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1792
        tree, relpath = WorkingTree.open_containing(filename)
1793
        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.
1794
        file_id = tree.path2id(relpath)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1795
        for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1796
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1797
1798
1799
class cmd_ls(Command):
1800
    """List files in a tree.
1801
    """
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1802
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1803
    _see_also = ['status', 'cat']
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1804
    takes_args = ['path?']
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1805
    # 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
1806
    takes_options = [
1807
            'verbose',
1808
            'revision',
1809
            Option('non-recursive',
1810
                   help='Don\'t recurse into subdirectories.'),
1811
            Option('from-root',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
1812
                   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
1813
            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'.
1814
            Option('versioned', help='Print versioned files.',
1815
                   short_name='V'),
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
1816
            Option('ignored', help='Print ignored files.'),
1817
            Option('null',
1818
                   help='Write an ascii NUL (\\0) separator '
1819
                   '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.
1820
            Option('kind',
2598.1.12 by Martin Pool
Fix up --kind options
1821
                   help='List entries of a particular kind: file, directory, symlink.',
1822
                   type=unicode),
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
1823
            'show-ids',
1824
            ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1825
    @display_command
2598.1.12 by Martin Pool
Fix up --kind options
1826
    def run(self, revision=None, verbose=False,
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1827
            non_recursive=False, from_root=False,
1828
            unknown=False, versioned=False, ignored=False,
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1829
            null=False, kind=None, show_ids=False, path=None):
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1830
1831
        if kind and kind not in ('file', 'directory', 'symlink'):
1832
            raise errors.BzrCommandError('invalid kind specified')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1833
1834
        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
1835
            raise errors.BzrCommandError('Cannot set both --verbose and --null')
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1836
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1837
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1838
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1839
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1840
        if path is None:
1841
            fs_path = '.'
1842
            prefix = ''
1843
        else:
1844
            if from_root:
1845
                raise errors.BzrCommandError('cannot specify both --from-root'
1846
                                             ' and PATH')
1847
            fs_path = path
1848
            prefix = path
2215.3.3 by Aaron Bentley
Get ls working on branches
1849
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1850
            fs_path)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1851
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1852
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1853
        elif relpath:
1854
            relpath += '/'
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
1855
        if revision is not None or tree is None:
1856
            tree = _get_revision_tree('ls', revision, branch=branch)
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1857
2255.2.61 by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked.
1858
        tree.lock_read()
1859
        try:
1860
            for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1861
                if fp.startswith(relpath):
1862
                    fp = osutils.pathjoin(prefix, fp[len(relpath):])
1863
                    if non_recursive and '/' in fp:
1864
                        continue
1865
                    if not all and not selection[fc]:
1866
                        continue
1867
                    if kind is not None and fkind != kind:
1868
                        continue
1869
                    if verbose:
1870
                        kindch = entry.kind_character()
1871
                        outstring = '%-8s %s%s' % (fc, fp, kindch)
1872
                        if show_ids and fid is not None:
1873
                            outstring = "%-50s %s" % (outstring, fid)
1874
                        self.outf.write(outstring + '\n')
1875
                    elif null:
1876
                        self.outf.write(fp + '\0')
1877
                        if show_ids:
1878
                            if fid is not None:
1879
                                self.outf.write(fid)
1880
                            self.outf.write('\0')
1881
                        self.outf.flush()
1882
                    else:
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1883
                        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.
1884
                            my_id = fid
1885
                        else:
1886
                            my_id = ''
1887
                        if show_ids:
1888
                            self.outf.write('%-50s %s\n' % (fp, my_id))
1889
                        else:
1890
                            self.outf.write(fp + '\n')
1891
        finally:
1892
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1893
1894
1895
class cmd_unknowns(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1896
    """List unknown files.
1897
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1898
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1899
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1900
    _see_also = ['ls']
1551.10.14 by Aaron Bentley
Add some blank lines
1901
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1902
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1903
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1904
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1905
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1906
1907
1908
class cmd_ignore(Command):
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1909
    """Ignore specified files or patterns.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1910
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
1911
    See ``bzr help patterns`` for details on the syntax of patterns.
1912
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1913
    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
1914
    After adding, editing or deleting that file either indirectly by
1915
    using this command or directly by using an editor, be sure to commit
1916
    it.
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1917
1918
    Note: ignore patterns containing shell wildcards must be quoted from 
1919
    the shell on Unix.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1920
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
1921
    :Examples:
1922
        Ignore the top level Makefile::
1923
1924
            bzr ignore ./Makefile
1925
1926
        Ignore class files in all directories::
1927
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
1928
            bzr ignore "*.class"
1929
1930
        Ignore .o files under the lib directory::
1931
1932
            bzr ignore "lib/**/*.o"
1933
1934
        Ignore .o files under the lib directory::
1935
1936
            bzr ignore "RE:lib/.*\.o"
3257.1.1 by Adeodato Simó
Add an example of some bzrignore cool stuff with Python regexes.
1937
1938
        Ignore everything but the "debian" toplevel directory::
1939
1940
            bzr ignore "RE:(?!debian/).*"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1941
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1942
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
1943
    _see_also = ['status', 'ignored', 'patterns']
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1944
    takes_args = ['name_pattern*']
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1945
    takes_options = [
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1946
        Option('old-default-rules',
1947
               help='Write out the ignore rules bzr < 0.9 always used.')
1948
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1949
    
2063.5.2 by wang
Don't use mutable values as default argument definitions.
1950
    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.
1951
        from bzrlib import ignores
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1952
        if old_default_rules is not None:
1953
            # 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.
1954
            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.
1955
                print pattern
1956
            return
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1957
        if not name_pattern_list:
2063.5.5 by wang
resolve a conflict
1958
            raise errors.BzrCommandError("ignore requires at least one "
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
1959
                                  "NAME_PATTERN or --old-default-rules")
2298.8.4 by Kent Gibson
Fix whitespace and alignment.
1960
        name_pattern_list = [globbing.normalize_pattern(p) 
1961
                             for p in name_pattern_list]
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1962
        for name_pattern in name_pattern_list:
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
1963
            if (name_pattern[0] == '/' or 
1964
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1965
                raise errors.BzrCommandError(
1966
                    "NAME_PATTERN should not be an absolute path")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1967
        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.
1968
        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.
1969
        ignored = globbing.Globster(name_pattern_list)
1970
        matches = []
1971
        tree.lock_read()
1972
        for entry in tree.list_files():
1973
            id = entry[3]
1974
            if id is not None:
1975
                filename = entry[0]
1976
                if ignored.match(filename):
2747.5.3 by Daniel Watkins
Modified to avoid encoding issues.
1977
                    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.
1978
        tree.unlock()
1979
        if len(matches) > 0:
1980
            print "Warning: the following files are version controlled and" \
1981
                  " match your ignore pattern:\n%s" % ("\n".join(matches),)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1982
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
1983
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1984
class cmd_ignored(Command):
1985
    """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
1986
1987
    List all the ignored files and the ignore pattern that caused the file to
1988
    be ignored.
1989
1990
    Alternatively, to list just the files::
1991
1992
        bzr ls --ignored
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1993
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1994
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
1995
    encoding_type = 'replace'
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
1996
    _see_also = ['ignore', 'ls']
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
1997
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1998
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1999
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2000
        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.
2001
        tree.lock_read()
2002
        try:
2003
            for path, file_class, kind, file_id, entry in tree.list_files():
2004
                if file_class != 'I':
2005
                    continue
2006
                ## XXX: Slightly inefficient since this was already calculated
2007
                pat = tree.is_ignored(path)
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
2008
                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.
2009
        finally:
2010
            tree.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2011
2012
2013
class cmd_lookup_revision(Command):
2014
    """Lookup the revision-id from a revision-number
2015
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2016
    :Examples:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2017
        bzr lookup-revision 33
2018
    """
2019
    hidden = True
2020
    takes_args = ['revno']
2021
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2022
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2023
    def run(self, revno):
2024
        try:
2025
            revno = int(revno)
2026
        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
2027
            raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2028
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2029
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2030
2031
2032
class cmd_export(Command):
2374.1.1 by Ian Clatworthy
Help and man page fixes
2033
    """Export current or past revision to a destination directory or archive.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2034
2035
    If no revision is specified this exports the last committed revision.
2036
2037
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
2038
    given, try to find the format with the extension. If no extension
2039
    is found exports to a directory (equivalent to --format=dir).
2040
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
2041
    If root is supplied, it will be used as the root directory inside
2042
    container formats (tar, zip, etc). If it is not supplied it will default
2043
    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
2044
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2045
    If branch is omitted then the branch containing the current working
2046
    directory will be used.
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2047
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
2048
    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
2049
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2050
      =================       =========================
2051
      Supported formats       Autodetected by extension
2052
      =================       =========================
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
2053
         dir                         (none)
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2054
         tar                          .tar
2055
         tbz2                    .tar.bz2, .tbz2
2056
         tgz                      .tar.gz, .tgz
2057
         zip                          .zip
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2058
      =================       =========================
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
2059
    """
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2060
    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.
2061
    takes_options = [
2062
        Option('format',
2063
               help="Type of file to export to.",
2064
               type=unicode),
2065
        'revision',
2066
        Option('root',
2067
               type=str,
2068
               help="Name of the root directory inside the exported file."),
2069
        ]
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2070
    def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2071
        root=None):
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
2072
        from bzrlib.export import export
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2073
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2074
        if branch_or_subdir is None:
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2075
            tree = WorkingTree.open_containing(u'.')[0]
2076
            b = tree.branch
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2077
            subdir = None
2099.1.1 by Daniel Silverstone
Add source branch support to export command
2078
        else:
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
2079
            b, subdir = Branch.open_containing(branch_or_subdir)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2080
            tree = None
2081
2082
        rev_tree = _get_revision_tree('export', revision, branch=b, tree=tree)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
2083
        try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2084
            export(rev_tree, dest, format, root, subdir)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
2085
        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
2086
            raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2087
2088
2089
class cmd_cat(Command):
2374.1.1 by Ian Clatworthy
Help and man page fixes
2090
    """Write the contents of a file as of a given revision to standard output.
2091
2092
    If no revision is nominated, the last revision is used.
2093
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2094
    Note: Take care to redirect standard output when using this command on a
2095
    binary file. 
2374.1.1 by Ian Clatworthy
Help and man page fixes
2096
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2097
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2098
    _see_also = ['ls']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2099
    takes_options = [
2100
        Option('name-from-revision', help='The path name in the old tree.'),
2101
        'revision',
2102
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2103
    takes_args = ['filename']
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
2104
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2105
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2106
    @display_command
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
2107
    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
2108
        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
2109
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
2110
                                         " one revision specifier")
2111
        tree, branch, relpath = \
2112
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2113
        branch.lock_read()
2114
        try:
2115
            return self._run(tree, branch, relpath, filename, revision,
2116
                             name_from_revision)
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2117
        finally:
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
2118
            branch.unlock()
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
2119
2120
    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.
2121
        if tree is None:
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
2122
            tree = b.basis_tree()
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2123
        rev_tree = _get_revision_tree('cat', revision, branch=b)
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2124
2125
        cur_file_id = tree.path2id(relpath)
2126
        old_file_id = rev_tree.path2id(relpath)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2127
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
2128
        if name_from_revision:
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2129
            if old_file_id is None:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2130
                raise errors.BzrCommandError(
2131
                    "%r is not present in revision %s" % (
2132
                        filename, rev_tree.get_revision_id()))
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
2133
            else:
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2134
                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.
2135
        elif cur_file_id is not None:
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2136
            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
2137
        elif old_file_id is not None:
3341.2.1 by Alexander Belchenko
`bzr cat` no more internally used Tree.print_file().
2138
            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
2139
        else:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
2140
            raise errors.BzrCommandError(
2141
                "%r is not present in revision %s" % (
2142
                    filename, rev_tree.get_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):
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3243
        rev_tree = _get_revision_tree('revert', revision, tree=tree)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3244
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
3245
        try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3246
            tree.revert(file_list, rev_tree, not no_backup, pb,
3247
                report_changes=True)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
3248
        finally:
3249
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3250
3251
3252
class cmd_assert_fail(Command):
3253
    """Test reporting of assertion failures"""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3254
    # intended just for use in testing
3255
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3256
    hidden = True
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3257
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3258
    def run(self):
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
3259
        raise AssertionError("always fails")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3260
3261
3262
class cmd_help(Command):
3263
    """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)
3264
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3265
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3266
    _see_also = ['topics']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3267
    takes_options = [
3268
            Option('long', 'Show help on all commands.'),
3269
            ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3270
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
3271
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3272
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3273
    @display_command
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
3274
    def run(self, topic=None, long=False):
2023.1.1 by ghigo
add topics help
3275
        import bzrlib.help
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3276
        if topic is None and long:
3277
            topic = "commands"
2023.1.1 by ghigo
add topics help
3278
        bzrlib.help.help(topic)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3279
3280
3281
class cmd_shell_complete(Command):
3282
    """Show appropriate completions for context.
3283
2023.1.1 by ghigo
add topics help
3284
    For a list of all available commands, say 'bzr shell-complete'.
3285
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3286
    takes_args = ['context?']
3287
    aliases = ['s-c']
3288
    hidden = True
3289
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3290
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3291
    def run(self, context=None):
3292
        import shellcomplete
3293
        shellcomplete.shellcomplete(context)
3294
3295
3296
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
3297
    """Show unmerged/unpulled revisions between two branches.
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3298
    
2023.1.1 by ghigo
add topics help
3299
    OTHER_BRANCH may be local or remote.
3300
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3301
3302
    _see_also = ['merge', 'pull']
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3303
    takes_args = ['other_branch?']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3304
    takes_options = [
3305
            Option('reverse', 'Reverse the order of revisions.'),
3306
            Option('mine-only',
3307
                   'Display changes in the local branch only.'),
3308
            Option('this' , 'Same as --mine-only.'),
3309
            Option('theirs-only',
3310
                   'Display changes in the remote branch only.'),
3311
            Option('other', 'Same as --theirs-only.'),
3312
            'log-format',
3313
            'show-ids',
3314
            'verbose'
3315
            ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
3316
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3317
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
3318
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3319
    def run(self, other_branch=None, reverse=False, mine_only=False,
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
3320
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3321
            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.
3322
        from bzrlib.missing import find_unmerged, iter_log_revisions
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3323
3324
        if this:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3325
            mine_only = this
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3326
        if other:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3327
            theirs_only = other
3328
        # TODO: We should probably check that we don't have mine-only and
3329
        #       theirs-only set, but it gets complicated because we also have
3330
        #       this and other which could be used.
3331
        restrict = 'all'
3332
        if mine_only:
3333
            restrict = 'local'
3334
        elif theirs_only:
3335
            restrict = 'remote'
2528.1.1 by Martin Pool
Better option names for missing (elliot)
3336
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3337
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
3338
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
3339
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
3340
            other_branch = parent
3341
            if other_branch is None:
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3342
                raise errors.BzrCommandError("No peer location known"
2485.8.17 by Vincent Ladeuil
Fix the fix.
3343
                                             " or specified.")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
3344
            display_url = urlutils.unescape_for_display(parent,
3345
                                                        self.outf.encoding)
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
3346
            self.outf.write("Using saved parent location: "
3347
                    + display_url + "\n")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
3348
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3349
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
3350
        if remote_branch.base == local_branch.base:
3351
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3352
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3353
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
3354
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3355
            try:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
3356
                local_extra, remote_extra = find_unmerged(
3357
                    local_branch, remote_branch, restrict)
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
3358
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3359
                if log_format is None:
3360
                    registry = log.log_formatter_registry
3361
                    log_format = registry.get_default(local_branch)
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
3362
                lf = log_format(to_file=self.outf,
3363
                                show_ids=show_ids,
3364
                                show_timezone='original')
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3365
                if reverse is False:
3427.3.4 by John Arbash Meinel
Fix cmd_missing for --this or --other
3366
                    if local_extra is not None:
3367
                        local_extra.reverse()
3368
                    if remote_extra is not None:
3369
                        remote_extra.reverse()
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3370
3371
                status_code = 0
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3372
                if local_extra and not theirs_only:
2485.8.17 by Vincent Ladeuil
Fix the fix.
3373
                    self.outf.write("You have %d extra revision(s):\n" %
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3374
                                    len(local_extra))
2485.8.13 by Vincent Ladeuil
merge bzr.dev@2495
3375
                    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.
3376
                                        local_branch.repository,
3377
                                        verbose):
3378
                        lf.log_revision(revision)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3379
                    printed_local = True
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3380
                    status_code = 1
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3381
                else:
3382
                    printed_local = False
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3383
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3384
                if remote_extra and not mine_only:
3385
                    if printed_local is True:
2485.8.17 by Vincent Ladeuil
Fix the fix.
3386
                        self.outf.write("\n\n\n")
3387
                    self.outf.write("You are missing %d revision(s):\n" %
2485.8.11 by Vincent Ladeuil
Fix some display leaks in tests.
3388
                                    len(remote_extra))
2485.8.13 by Vincent Ladeuil
merge bzr.dev@2495
3389
                    for revision in iter_log_revisions(remote_extra,
3390
                                        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.
3391
                                        verbose):
3392
                        lf.log_revision(revision)
3427.3.7 by John Arbash Meinel
Update how 'bzr missing' works when given --mine-only or --theirs-only
3393
                    status_code = 1
3394
3395
                if mine_only and not local_extra:
3396
                    # 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
3397
                    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
3398
                elif theirs_only and not remote_extra:
3399
                    # 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
3400
                    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
3401
                elif not (mine_only or theirs_only or local_extra or
3402
                          remote_extra):
3403
                    # We checked both branches, and neither one had extra
3404
                    # revisions
2485.8.17 by Vincent Ladeuil
Fix the fix.
3405
                    self.outf.write("Branches are up to date.\n")
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3406
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3407
                remote_branch.unlock()
3408
        finally:
3409
            local_branch.unlock()
3410
        if not status_code and parent is None and other_branch is not None:
3411
            local_branch.lock_write()
3412
            try:
3413
                # handle race conditions - a parent might be set while we run.
3414
                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
3415
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
3416
            finally:
3417
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
3418
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3419
3420
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
3421
class cmd_pack(Command):
3422
    """Compress the data within a repository."""
3423
3424
    _see_also = ['repositories']
3425
    takes_args = ['branch_or_repo?']
3426
3427
    def run(self, branch_or_repo='.'):
3428
        dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3429
        try:
3430
            branch = dir.open_branch()
3431
            repository = branch.repository
3432
        except errors.NotBranchError:
3433
            repository = dir.open_repository()
3434
        repository.pack()
3435
3436
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3437
class cmd_plugins(Command):
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
3438
    """List the installed plugins.
3439
    
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3440
    This command displays the list of installed plugins including
3441
    version of plugin and a short description of each.
3442
3443
    --verbose shows the path where each plugin is located.
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
3444
3445
    A plugin is an external component for Bazaar that extends the
3446
    revision control system, by adding or replacing code in Bazaar.
3447
    Plugins can do a variety of things, including overriding commands,
3448
    adding new commands, providing additional network transports and
3449
    customizing log output.
3450
3451
    See the Bazaar web site, http://bazaar-vcs.org, for further
3452
    information on plugins including where to find them and how to
3453
    install them. Instructions are also provided there on how to
3454
    write new plugins using the Python programming language.
3455
    """
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3456
    takes_options = ['verbose']
2629.1.1 by Ian Clatworthy
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
3457
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3458
    @display_command
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3459
    def run(self, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3460
        import bzrlib.plugin
3461
        from inspect import getdoc
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
3462
        result = []
2762.2.1 by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square
3463
        for name, plugin in bzrlib.plugin.plugins().items():
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
3464
            version = plugin.__version__
3465
            if version == 'unknown':
3466
                version = ''
3467
            name_ver = '%s %s' % (name, version)
2762.2.1 by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square
3468
            d = getdoc(plugin.module)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3469
            if d:
3193.2.2 by Alexander Belchenko
new formatting of `bzr plugins` output.
3470
                doc = d.split('\n')[0]
3471
            else:
3472
                doc = '(no description)'
3473
            result.append((name_ver, doc, plugin.path()))
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
3474
        for name_ver, doc, path in sorted(result):
3475
            print name_ver
3476
            print '   ', doc
3477
            if verbose:
3478
                print '   ', path
3479
            print
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3480
3481
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
3482
class cmd_testament(Command):
3483
    """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
3484
    takes_options = [
3485
            'revision',
3486
            Option('long', help='Produce long-format testament.'),
3487
            Option('strict',
3488
                   help='Produce a strict-format testament.')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
3489
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3490
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
3491
    def run(self, branch=u'.', revision=None, long=False, strict=False):
3492
        from bzrlib.testament import Testament, StrictTestament
3493
        if strict is True:
3494
            testament_class = StrictTestament
3495
        else:
3496
            testament_class = Testament
3530.2.1 by John Arbash Meinel
'bzr testament' should just open the branch
3497
        if branch == '.':
3498
            b = Branch.open_containing(branch)[0]
3499
        else:
3500
            b = Branch.open(branch)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
3501
        b.lock_read()
3502
        try:
3503
            if revision is None:
3504
                rev_id = b.last_revision()
3505
            else:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
3506
                rev_id = revision[0].as_revision_id(b)
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
3507
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
3508
            if long:
3509
                sys.stdout.writelines(t.as_text_lines())
3510
            else:
3511
                sys.stdout.write(t.as_short_text())
3512
        finally:
3513
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3514
3515
3516
class cmd_annotate(Command):
3517
    """Show the origin of each line in a file.
3518
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
3519
    This prints out the given file with an annotation on the left side
3520
    indicating which revision, author and date introduced the change.
3521
3522
    If the origin is the same for a run of consecutive lines, it is 
3523
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3524
    """
3525
    # 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
3526
    # TODO: if the working copy is modified, show annotations on that 
3527
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
3528
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3529
    takes_args = ['filename']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3530
    takes_options = [Option('all', help='Show annotations on all lines.'),
3531
                     Option('long', help='Show commit date in annotations.'),
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
3532
                     'revision',
3533
                     'show-ids',
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
3534
                     ]
2593.1.1 by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations.
3535
    encoding_type = 'exact'
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3536
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3537
    @display_command
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
3538
    def run(self, filename, all=False, long=False, revision=None,
3539
            show_ids=False):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3540
        from bzrlib.annotate import annotate_file
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
3541
        wt, branch, relpath = \
3542
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3543
        if wt is not None:
3544
            wt.lock_read()
3545
        else:
3546
            branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3547
        try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3548
            tree = _get_revision_tree('annotate', revision, branch=branch)
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
3549
            if wt is not None:
3550
                file_id = wt.path2id(relpath)
3551
            else:
3552
                file_id = tree.path2id(relpath)
2561.2.1 by James Westby
Display a useful error message when annotating a non-existant file (#122656)
3553
            if file_id is None:
2561.2.2 by James Westby
Fix up with comments from Aaron.
3554
                raise errors.NotVersionedError(filename)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3555
            file_version = tree.inventory[file_id].revision
2593.1.1 by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations.
3556
            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.
3557
                          show_ids=show_ids)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
3558
        finally:
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
3559
            if wt is not None:
3560
                wt.unlock()
3561
            else:
3562
                branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
3563
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3564
3565
class cmd_re_sign(Command):
3566
    """Create a digital signature for an existing revision."""
3567
    # TODO be able to replace existing ones.
3568
3569
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
3570
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3571
    takes_options = ['revision']
3572
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
3573
    def run(self, revision_id_list=None, revision=None):
3574
        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
3575
            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
3576
        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
3577
            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)
3578
        b = WorkingTree.open_containing(u'.')[0].branch
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3579
        b.lock_write()
3580
        try:
3581
            return self._run(b, revision_id_list, revision)
3582
        finally:
3583
            b.unlock()
3584
3585
    def _run(self, b, revision_id_list, revision):
3586
        import bzrlib.gpg as gpg
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
3587
        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
3588
        if revision_id_list is not None:
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3589
            b.repository.start_write_group()
3590
            try:
3591
                for revision_id in revision_id_list:
3592
                    b.repository.sign_revision(revision_id, gpg_strategy)
3593
            except:
3594
                b.repository.abort_write_group()
3595
                raise
3596
            else:
3597
                b.repository.commit_write_group()
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3598
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
3599
            if len(revision) == 1:
3600
                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.
3601
                b.repository.start_write_group()
3602
                try:
3603
                    b.repository.sign_revision(rev_id, gpg_strategy)
3604
                except:
3605
                    b.repository.abort_write_group()
3606
                    raise
3607
                else:
3608
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
3609
            elif len(revision) == 2:
3610
                # are they both on rh- if so we can walk between them
3611
                # might be nice to have a range helper for arbitrary
3612
                # revision paths. hmm.
3613
                from_revno, from_revid = revision[0].in_history(b)
3614
                to_revno, to_revid = revision[1].in_history(b)
3615
                if to_revid is None:
3616
                    to_revno = b.revno()
3617
                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
3618
                    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.
3619
                b.repository.start_write_group()
3620
                try:
3621
                    for revno in range(from_revno, to_revno + 1):
3622
                        b.repository.sign_revision(b.get_rev_id(revno),
3623
                                                   gpg_strategy)
3624
                except:
3625
                    b.repository.abort_write_group()
3626
                    raise
3627
                else:
3628
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
3629
            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
3630
                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.
3631
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
3632
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3633
class cmd_bind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
3634
    """Convert the current branch into a checkout of the supplied branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3635
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
3636
    Once converted into a checkout, commits must succeed on the master branch
3637
    before they will be applied to the local branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3638
    """
3639
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3640
    _see_also = ['checkouts', 'unbind']
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3641
    takes_args = ['location?']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3642
    takes_options = []
3643
3644
    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
3645
        b, relpath = Branch.open_containing(u'.')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3646
        if location is None:
3647
            try:
3648
                location = b.get_old_bound_location()
3649
            except errors.UpgradeRequired:
3650
                raise errors.BzrCommandError('No location supplied.  '
3651
                    'This format does not remember old locations.')
3652
            else:
3653
                if location is None:
2230.3.45 by Aaron Bentley
Change error message (mpool)
3654
                    raise errors.BzrCommandError('No location supplied and no '
3655
                        'previous location known')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3656
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
3657
        try:
3658
            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
3659
        except errors.DivergedBranches:
3660
            raise errors.BzrCommandError('These branches have diverged.'
3661
                                         ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3662
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
3663
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3664
class cmd_unbind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
3665
    """Convert the current checkout into a regular branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3666
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
3667
    After unbinding, the local branch is considered independent and subsequent
3668
    commits will be local only.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3669
    """
3670
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3671
    _see_also = ['checkouts', 'bind']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
3672
    takes_args = []
3673
    takes_options = []
3674
3675
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
3676
        b, relpath = Branch.open_containing(u'.')
3677
        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
3678
            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
3679
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3680
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3681
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3682
    """Remove the last committed revision.
3683
3684
    --verbose will print out what is being removed.
3685
    --dry-run will go through all the motions, but not actually
3686
    remove anything.
2747.2.1 by Daniel Watkins
Modified the help message of 'uncommit'.
3687
3688
    If --revision is specified, uncommit revisions to leave the branch at the
3689
    specified revision.  For example, "bzr uncommit -r 15" will leave the
3690
    branch at revision 15.
3691
1551.19.39 by Aaron Bentley
Update 'uncommit' docs
3692
    Uncommit leaves the working tree ready for a new commit.  The only change
3693
    it may make is to restore any pending merges that were present before
3694
    the commit.
1553.5.34 by Martin Pool
Stub lock-breaking command
3695
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
3696
1553.5.34 by Martin Pool
Stub lock-breaking command
3697
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
3698
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
3699
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3700
    # information in shared branches as well.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3701
    _see_also = ['commit']
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
3702
    takes_options = ['verbose', 'revision',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3703
                    Option('dry-run', help='Don\'t actually make changes.'),
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3704
                    Option('force', help='Say yes to all questions.'),
3705
                    Option('local',
3706
                           help="Only remove the commits from the local branch"
3707
                                " when in a checkout."
3708
                           ),
3709
                    ]
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3710
    takes_args = ['location?']
3711
    aliases = []
3101.1.1 by Aaron Bentley
Uncommit doesn't throw when it encounters un-encodable characters
3712
    encoding_type = 'replace'
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3713
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3714
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3715
            dry_run=False, verbose=False,
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3716
            revision=None, force=False, local=False):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3717
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
3718
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3719
        control, relpath = bzrdir.BzrDir.open_containing(location)
3720
        try:
3721
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
3722
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3723
        except (errors.NoWorkingTree, errors.NotLocalUrl):
3724
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
3725
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3726
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
3727
        if tree is not None:
3728
            tree.lock_write()
3729
        else:
3730
            b.lock_write()
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3731
        try:
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3732
            return self._run(b, tree, dry_run, verbose, revision, force,
3733
                             local=local)
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3734
        finally:
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
3735
            if tree is not None:
3736
                tree.unlock()
3737
            else:
3738
                b.unlock()
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3739
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3740
    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.
3741
        from bzrlib.log import log_formatter, show_log
3742
        from bzrlib.uncommit import uncommit
3743
3744
        last_revno, last_rev_id = b.last_revision_info()
3745
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3746
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3747
        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.
3748
            revno = last_revno
3749
            rev_id = last_rev_id
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3750
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3751
            # 'bzr uncommit -r 10' actually means uncommit
3752
            # so that the final tree is at revno 10.
3753
            # but bzrlib.uncommit.uncommit() actually uncommits
3754
            # the revisions that are supplied.
3755
            # 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.
3756
            revno = revision[0].in_history(b).revno + 1
3757
            if revno <= last_revno:
3758
                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
3759
2948.2.2 by John Arbash Meinel
Re-introduce the None check in case someone asks to uncommit *to* the last revision
3760
        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
3761
            self.outf.write('No revisions to uncommit.\n')
3762
            return 1
3763
3764
        lf = log_formatter('short',
3765
                           to_file=self.outf,
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
3766
                           show_timezone='original')
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3767
3768
        show_log(b,
3769
                 lf,
3770
                 verbose=False,
3771
                 direction='forward',
3772
                 start_revision=revno,
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
3773
                 end_revision=last_revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3774
3775
        if dry_run:
3776
            print 'Dry-run, pretending to remove the above revisions.'
3777
            if not force:
3778
                val = raw_input('Press <enter> to continue')
3779
        else:
3780
            print 'The above revision(s) will be removed.'
3781
            if not force:
3782
                val = raw_input('Are you sure [y/N]? ')
3783
                if val.lower() not in ('y', 'yes'):
3784
                    print 'Canceled'
3785
                    return 0
3786
3629.1.1 by John Arbash Meinel
Change 'bzr uncommit' to display the revision ids and log them.
3787
        mutter('Uncommitting from {%s} to {%s}',
3788
               last_rev_id, rev_id)
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3789
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3280.4.1 by John Arbash Meinel
Add uncommit --local.
3790
                 revno=revno, local=local)
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
3791
        note('You can restore the old tip by running:\n'
3792
             '  bzr pull . -r revid:%s', last_rev_id)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3793
3794
1553.5.34 by Martin Pool
Stub lock-breaking command
3795
class cmd_break_lock(Command):
3796
    """Break a dead lock on a repository, branch or working directory.
3797
1553.5.35 by Martin Pool
Start break-lock --show
3798
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
3799
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3800
3801
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
3802
    
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3803
    :Examples:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3804
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
3805
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3806
    takes_args = ['location?']
3807
3808
    def run(self, location=None, show=False):
3809
        if location is None:
3810
            location = u'.'
3811
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
3812
        try:
3813
            control.break_lock()
3814
        except NotImplementedError:
3815
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3816
        
1553.5.35 by Martin Pool
Start break-lock --show
3817
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
3818
class cmd_wait_until_signalled(Command):
3819
    """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3820
3821
    This just prints a line to signal when it is ready, then blocks on stdin.
3822
    """
3823
3824
    hidden = True
3825
3826
    def run(self):
1910.17.6 by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print.
3827
        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
3828
        sys.stdout.flush()
3829
        sys.stdin.readline()
3830
1553.5.35 by Martin Pool
Start break-lock --show
3831
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3832
class cmd_serve(Command):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3833
    """Run the bzr server."""
3834
3835
    aliases = ['server']
3836
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3837
    takes_options = [
3838
        Option('inet',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3839
               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
3840
        Option('port',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3841
               help='Listen for connections on nominated port of the form '
3842
                    '[hostname:]portnumber.  Passing 0 as the port number will '
3843
                    'result in a dynamically allocated port.  The default port is '
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
3844
                    '4155.',
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
3845
               type=str),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3846
        Option('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3847
               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
3848
               type=unicode),
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3849
        Option('allow-writes',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3850
               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`.
3851
                    '--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
3852
                    'the served directory and below.'
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3853
                ),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3854
        ]
3855
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3856
    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.
3857
        from bzrlib import lockdir
2018.5.22 by Andrew Bennetts
Fix cmd_serve after move of bzrlib.transport.smart
3858
        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
3859
        from bzrlib.transport import get_transport
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
3860
        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
3861
        if directory is None:
3862
            directory = os.getcwd()
2044.2.1 by Lukáš Lalinský
Use urlutils.local_path_to_url to get an URL from the directory path.
3863
        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`.
3864
        if not allow_writes:
3865
            url = 'readonly+' + url
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
3866
        chroot_server = ChrootServer(get_transport(url))
3867
        chroot_server.setUp()
3868
        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
3869
        if inet:
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
3870
            smart_server = medium.SmartServerPipeStreamMedium(
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
3871
                sys.stdin, sys.stdout, t)
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
3872
        else:
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
3873
            host = medium.BZR_DEFAULT_INTERFACE
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
3874
            if port is None:
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
3875
                port = medium.BZR_DEFAULT_PORT
2298.4.1 by Andrew Bennetts
Give bzr:// a default port of 4155.
3876
            else:
3877
                if ':' in port:
3878
                    host, port = port.split(':')
3879
                port = int(port)
2018.5.121 by Andrew Bennetts
Fix cmd_serve.
3880
            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
3881
            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
3882
            sys.stdout.flush()
2018.5.69 by Robert Collins
Prevent the smart server sending cruft over stderr to the client.
3883
        # for the duration of this server, no UI output is permitted.
3884
        # note that this may cause problems with blackbox tests. This should
3885
        # be changed with care though, as we dont want to use bandwidth sending
3886
        # progress over stderr to smart server clients!
3887
        old_factory = ui.ui_factory
3118.3.1 by Andrew Bennetts
Reduce lockdir timeout to 0 seconds in cmd_serve.
3888
        old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
2018.5.69 by Robert Collins
Prevent the smart server sending cruft over stderr to the client.
3889
        try:
3890
            ui.ui_factory = ui.SilentUIFactory()
3118.3.1 by Andrew Bennetts
Reduce lockdir timeout to 0 seconds in cmd_serve.
3891
            lockdir._DEFAULT_TIMEOUT_SECONDS = 0
2018.5.69 by Robert Collins
Prevent the smart server sending cruft over stderr to the client.
3892
            smart_server.serve()
3893
        finally:
3894
            ui.ui_factory = old_factory
3118.3.1 by Andrew Bennetts
Reduce lockdir timeout to 0 seconds in cmd_serve.
3895
            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
3896
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3897
1731.2.7 by Aaron Bentley
Add join command
3898
class cmd_join(Command):
3899
    """Combine a subtree into its containing tree.
3900
    
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
3901
    This command is for experimental use only.  It requires the target tree
3902
    to be in dirstate-with-subtree format, which cannot be converted into
3903
    earlier formats.
3904
3905
    The TREE argument should be an independent tree, inside another tree, but
3906
    not part of it.  (Such trees can be produced by "bzr split", but also by
3907
    running "bzr branch" with the target inside a tree.)
3908
3909
    The result is a combined tree, with the subtree no longer an independant
3910
    part.  This is marked as a merge of the subtree into the containing tree,
3911
    and all history is preserved.
3912
3913
    If --reference is specified, the subtree retains its independence.  It can
3914
    be branched by itself, and can be part of multiple projects at the same
3915
    time.  But operations performed in the containing tree, such as commit
3916
    and merge, will recurse into the subtree.
1731.2.7 by Aaron Bentley
Add join command
3917
    """
3918
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3919
    _see_also = ['split']
1731.2.7 by Aaron Bentley
Add join command
3920
    takes_args = ['tree']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3921
    takes_options = [
3922
            Option('reference', help='Join by reference.'),
3923
            ]
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
3924
    hidden = True
1731.2.7 by Aaron Bentley
Add join command
3925
2100.3.11 by Aaron Bentley
Add join --reference support
3926
    def run(self, tree, reference=False):
1731.2.7 by Aaron Bentley
Add join command
3927
        sub_tree = WorkingTree.open(tree)
3928
        parent_dir = osutils.dirname(sub_tree.basedir)
3929
        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
3930
        repo = containing_tree.branch.repository
3931
        if not repo.supports_rich_root():
3932
            raise errors.BzrCommandError(
3933
                "Can't join trees because %s doesn't support rich root data.\n"
3934
                "You can use bzr upgrade on the repository."
3935
                % (repo,))
2100.3.11 by Aaron Bentley
Add join --reference support
3936
        if reference:
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
3937
            try:
2100.3.11 by Aaron Bentley
Add join --reference support
3938
                containing_tree.add_reference(sub_tree)
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
3939
            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
3940
                # XXX: Would be better to just raise a nicely printable
3941
                # exception from the real origin.  Also below.  mbp 20070306
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
3942
                raise errors.BzrCommandError("Cannot join %s.  %s" %
2100.3.11 by Aaron Bentley
Add join --reference support
3943
                                             (tree, e.reason))
3944
        else:
3945
            try:
3946
                containing_tree.subsume(sub_tree)
3947
            except errors.BadSubsumeSource, e:
3948
                raise errors.BzrCommandError("Cannot join %s.  %s" % 
3949
                                             (tree, e.reason))
1553.5.35 by Martin Pool
Start break-lock --show
3950
1731.2.22 by Aaron Bentley
Initial work on split command
3951
3952
class cmd_split(Command):
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
3953
    """Split a subdirectory of a tree into a separate tree.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
3954
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
3955
    This command will produce a target tree in a format that supports
3956
    rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be
3957
    converted into earlier formats like 'dirstate-tags'.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
3958
3959
    The TREE argument should be a subdirectory of a working tree.  That
3960
    subdirectory will be converted into an independent tree, with its own
3961
    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
3962
    """
3963
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
3964
    # join is not un-hidden yet
3965
    #_see_also = ['join']
1731.2.22 by Aaron Bentley
Initial work on split command
3966
    takes_args = ['tree']
3967
3968
    def run(self, tree):
3969
        containing_tree, subdir = WorkingTree.open_containing(tree)
3970
        sub_id = containing_tree.path2id(subdir)
3971
        if sub_id is None:
3972
            raise errors.NotVersionedError(subdir)
1731.2.23 by Aaron Bentley
Throw user-friendly error splitting in shared repo with wrong format
3973
        try:
3974
            containing_tree.extract(sub_id)
3975
        except errors.RootNotRich:
3976
            raise errors.UpgradeRequired(containing_tree.branch.base)
1731.2.22 by Aaron Bentley
Initial work on split command
3977
3978
1551.12.8 by Aaron Bentley
Add merge-directive command
3979
class cmd_merge_directive(Command):
1551.12.32 by Aaron Bentley
Improve merge directive help
3980
    """Generate a merge directive for auto-merge tools.
3981
3982
    A directive requests a merge to be performed, and also provides all the
3983
    information necessary to do so.  This means it must either include a
3984
    revision bundle, or the location of a branch containing the desired
3985
    revision.
3986
3987
    A submit branch (the location to merge into) must be supplied the first
3988
    time the command is issued.  After it has been supplied once, it will
3989
    be remembered as the default.
3990
3991
    A public branch is optional if a revision bundle is supplied, but required
3992
    if --diff or --plain is specified.  It will be remembered as the default
3993
    after the first use.
3994
    """
1551.12.20 by Aaron Bentley
Pull directive registry into command class
3995
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
3996
    takes_args = ['submit_branch?', 'public_branch?']
3997
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
3998
    hidden = True
3999
2681.1.4 by Aaron Bentley
Fix reference to told submit command
4000
    _see_also = ['send']
2520.4.121 by Aaron Bentley
Polish up submit command
4001
1551.12.43 by Aaron Bentley
Misc changes from review
4002
    takes_options = [
4003
        RegistryOption.from_kwargs('patch-type',
2681.1.7 by Aaron Bentley
Fix option grammar
4004
            '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
4005
            title='Patch type',
4006
            value_switches=True,
4007
            enum_switch=False,
4008
            bundle='Bazaar revision bundle (default).',
4009
            diff='Normal unified diff.',
4010
            plain='No patch, just directive.'),
4011
        Option('sign', help='GPG-sign the directive.'), 'revision',
1551.12.26 by Aaron Bentley
Get email working, with optional message
4012
        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
4013
            help='Instead of printing the directive, email to this address.'),
1551.12.27 by Aaron Bentley
support custom message everywhere
4014
        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
4015
            help='Message to use when committing this merge.')
1551.12.27 by Aaron Bentley
support custom message everywhere
4016
        ]
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4017
2530.2.1 by Adeodato Simó
Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
4018
    encoding_type = 'exact'
4019
1551.12.16 by Aaron Bentley
Enable signing merge directives
4020
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
1551.12.27 by Aaron Bentley
support custom message everywhere
4021
            sign=False, revision=None, mail_to=None, message=None):
2490.2.28 by Aaron Bentley
Fix handling of null revision
4022
        from bzrlib.revision import ensure_null, NULL_REVISION
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4023
        include_patch, include_bundle = {
4024
            'plain': (False, False),
4025
            'diff': (True, False),
4026
            'bundle': (True, True),
4027
            }[patch_type]
1551.12.8 by Aaron Bentley
Add merge-directive command
4028
        branch = Branch.open('.')
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4029
        stored_submit_branch = branch.get_submit_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4030
        if submit_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4031
            submit_branch = stored_submit_branch
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4032
        else:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4033
            if stored_submit_branch is None:
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4034
                branch.set_submit_branch(submit_branch)
4035
        if submit_branch is None:
4036
            submit_branch = branch.get_parent()
4037
        if submit_branch is None:
4038
            raise errors.BzrCommandError('No submit branch specified or known')
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4039
4040
        stored_public_branch = branch.get_public_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4041
        if public_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
4042
            public_branch = stored_public_branch
4043
        elif stored_public_branch is None:
4044
            branch.set_public_branch(public_branch)
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4045
        if not include_bundle and public_branch is None:
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
4046
            raise errors.BzrCommandError('No public branch specified or'
4047
                                         ' known')
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4048
        base_revision_id = None
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4049
        if revision is not None:
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4050
            if len(revision) > 2:
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4051
                raise errors.BzrCommandError('bzr merge-directive takes '
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4052
                    '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()
4053
            revision_id = revision[-1].as_revision_id(branch)
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
4054
            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()
4055
                base_revision_id = revision[0].as_revision_id(branch)
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4056
        else:
4057
            revision_id = branch.last_revision()
2490.2.28 by Aaron Bentley
Fix handling of null revision
4058
        revision_id = ensure_null(revision_id)
4059
        if revision_id == NULL_REVISION:
4060
            raise errors.BzrCommandError('No revisions to bundle.')
2520.4.73 by Aaron Bentley
Implement new merge directive format
4061
        directive = merge_directive.MergeDirective2.from_objects(
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
4062
            branch.repository, revision_id, time.time(),
1551.12.8 by Aaron Bentley
Add merge-directive command
4063
            osutils.local_time_offset(), submit_branch,
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4064
            public_branch=public_branch, include_patch=include_patch,
4065
            include_bundle=include_bundle, message=message,
4066
            base_revision_id=base_revision_id)
1551.12.26 by Aaron Bentley
Get email working, with optional message
4067
        if mail_to is None:
4068
            if sign:
4069
                self.outf.write(directive.to_signed(branch))
4070
            else:
4071
                self.outf.writelines(directive.to_lines())
1551.12.16 by Aaron Bentley
Enable signing merge directives
4072
        else:
1551.12.26 by Aaron Bentley
Get email working, with optional message
4073
            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.
4074
            s = SMTPConnection(branch.get_config())
4075
            s.send_email(message)
1551.12.8 by Aaron Bentley
Add merge-directive command
4076
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
4077
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4078
class cmd_send(Command):
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4079
    """Mail or create a merge-directive for submiting changes.
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4080
4081
    A merge directive provides many things needed for requesting merges:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4082
4083
    * A machine-readable description of the merge to perform
4084
4085
    * An optional patch that is a preview of the changes requested
4086
4087
    * 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
4088
      directly from the merge directive, without retrieving data from a
4089
      branch.
4090
4091
    If --no-bundle is specified, then public_branch is needed (and must be
4092
    up-to-date), so that the receiver can perform the merge using the
4093
    public_branch.  The public_branch is always included if known, so that
4094
    people can check it later.
4095
4096
    The submit branch defaults to the parent, but can be overridden.  Both
4097
    submit branch and public branch will be remembered if supplied.
4098
4099
    If a public_branch is known for the submit_branch, that public submit
4100
    branch is used in the merge instructions.  This means that a local mirror
2520.4.122 by Aaron Bentley
Clarify doc
4101
    can be used as your actual submit branch, once you have set public_branch
4102
    for that mirror.
2681.1.6 by Aaron Bentley
Update help to describe available formats
4103
2681.1.30 by Aaron Bentley
Update NEWS and docs
4104
    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
4105
    on Windows (it uses MAPI).  On Linux, it requires the xdg-email utility.
4106
    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
4107
    
4108
    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.
4109
    (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'.
4110
    specific clients are "evolution", "kmail", "mutt", and "thunderbird";
4111
    generic options are "default", "editor", "emacsclient", "mapi", and
3638.2.3 by Neil Martinsen-Burrell
Mention mail_client_registry in NEWS and help
4112
    "xdg-email".  Plugins may also add supported clients.
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4113
4114
    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
4115
    either on the commandline, by setting the submit_to configuration
4116
    option in the branch itself or the child_submit_to configuration option 
4117
    in the submit branch.
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4118
2681.1.6 by Aaron Bentley
Update help to describe available formats
4119
    Two formats are currently supported: "4" uses revision bundle format 4 and
4120
    merge directive format 2.  It is significantly faster and smaller than
4121
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
4122
    default.  "0.9" uses revision bundle format 0.9 and merge directive
4123
    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
4124
    
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
4125
    Merge directives are applied using the merge command or the pull command.
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4126
    """
4127
4128
    encoding_type = 'exact'
4129
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
4130
    _see_also = ['merge', 'pull']
2520.4.121 by Aaron Bentley
Polish up submit command
4131
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4132
    takes_args = ['submit_branch?', 'public_branch?']
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4133
2520.4.121 by Aaron Bentley
Polish up submit command
4134
    takes_options = [
4135
        Option('no-bundle',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4136
               help='Do not include a bundle in the merge directive.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4137
        Option('no-patch', help='Do not include a preview patch in the merge'
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4138
               ' directive.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4139
        Option('remember',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4140
               help='Remember submit and public branch.'),
2520.4.121 by Aaron Bentley
Polish up submit command
4141
        Option('from',
2520.4.132 by Aaron Bentley
Merge from bzr.dev
4142
               help='Branch to generate the submission from, '
4143
               'rather than the one containing the working directory.',
2520.4.121 by Aaron Bentley
Polish up submit command
4144
               short_name='f',
4145
               type=unicode),
3377.2.1 by Martin Pool
doc: send -o, and more on send in user guide
4146
        Option('output', short_name='o',
3377.2.2 by Martin Pool
Say 'merge directive' rather than just 'directive' in help
4147
               help='Write merge directive to this file; '
3377.2.1 by Martin Pool
doc: send -o, and more on send in user guide
4148
                    'use - for stdout.',
2520.4.121 by Aaron Bentley
Polish up submit command
4149
               type=unicode),
2681.1.32 by Aaron Bentley
Fix option grammar
4150
        Option('mail-to', help='Mail the request to this address.',
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4151
               type=unicode),
2520.4.121 by Aaron Bentley
Polish up submit command
4152
        'revision',
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4153
        'message',
2681.1.7 by Aaron Bentley
Fix option grammar
4154
        RegistryOption.from_kwargs('format',
4155
        'Use the specified output format.',
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4156
        **{'4': 'Bundle format 4, Merge Directive 2 (default)',
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
4157
           '0.9': 'Bundle format 0.9, Merge Directive 1',})
2520.4.121 by Aaron Bentley
Polish up submit command
4158
        ]
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4159
4160
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
2520.4.121 by Aaron Bentley
Polish up submit command
4161
            no_patch=False, revision=None, remember=False, output=None,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4162
            format='4', mail_to=None, message=None, **kwargs):
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4163
        return self._run(submit_branch, revision, public_branch, remember,
4164
                         format, no_bundle, no_patch, output,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4165
                         kwargs.get('from', '.'), mail_to, message)
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4166
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4167
    def _run(self, submit_branch, revision, public_branch, remember, format,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4168
             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.
4169
        from bzrlib.revision import NULL_REVISION
3060.2.1 by Lukáš Lalinský
Fix misplaced branch lock in cmd_send.
4170
        branch = Branch.open_containing(from_)[0]
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
4171
        if output is None:
4172
            outfile = StringIO()
4173
        elif output == '-':
2520.4.121 by Aaron Bentley
Polish up submit command
4174
            outfile = self.outf
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4175
        else:
2520.4.121 by Aaron Bentley
Polish up submit command
4176
            outfile = open(output, 'wb')
3060.2.1 by Lukáš Lalinský
Fix misplaced branch lock in cmd_send.
4177
        # we may need to write data into branch's repository to calculate
4178
        # the data to send.
4179
        branch.lock_write()
2520.4.121 by Aaron Bentley
Polish up submit command
4180
        try:
2681.1.10 by Aaron Bentley
Clean up handling of unknown mail clients
4181
            if output is None:
2681.1.13 by Aaron Bentley
Add support for submit_to config option
4182
                config = branch.get_config()
4183
                if mail_to is None:
4184
                    mail_to = config.get_user_option('submit_to')
4185
                mail_client = config.get_mail_client()
2520.4.121 by Aaron Bentley
Polish up submit command
4186
            if remember and submit_branch is None:
4187
                raise errors.BzrCommandError(
4188
                    '--remember requires a branch to be specified.')
4189
            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.
4190
            remembered_submit_branch = None
2520.4.121 by Aaron Bentley
Polish up submit command
4191
            if submit_branch is None:
4192
                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.
4193
                remembered_submit_branch = "submit"
2520.4.121 by Aaron Bentley
Polish up submit command
4194
            else:
4195
                if stored_submit_branch is None or remember:
4196
                    branch.set_submit_branch(submit_branch)
4197
            if submit_branch is None:
4198
                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.
4199
                remembered_submit_branch = "parent"
2520.4.121 by Aaron Bentley
Polish up submit command
4200
            if submit_branch is None:
4201
                raise errors.BzrCommandError('No submit branch known or'
4202
                                             ' specified')
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
4203
            if remembered_submit_branch is not None:
4204
                note('Using saved %s location "%s" to determine what '
4205
                        'changes to submit.', remembered_submit_branch,
4206
                        submit_branch)
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4207
3251.1.2 by Jelmer Vernooij
``bzr send`` now supports new ``child_submit_to`` option in the submit branch
4208
            if mail_to is None:
3251.1.3 by Jelmer Vernooij
Fix formatting.
4209
                submit_config = Branch.open(submit_branch).get_config()
4210
                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
4211
2520.4.121 by Aaron Bentley
Polish up submit command
4212
            stored_public_branch = branch.get_public_branch()
4213
            if public_branch is None:
4214
                public_branch = stored_public_branch
4215
            elif stored_public_branch is None or remember:
4216
                branch.set_public_branch(public_branch)
4217
            if no_bundle and public_branch is None:
4218
                raise errors.BzrCommandError('No public branch specified or'
4219
                                             ' known')
4220
            base_revision_id = None
2747.3.1 by Aaron Bentley
'send' and 'bundle' now handle partial ranges correctly (#61685)
4221
            revision_id = None
2520.4.121 by Aaron Bentley
Polish up submit command
4222
            if revision is not None:
4223
                if len(revision) > 2:
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4224
                    raise errors.BzrCommandError('bzr send takes '
2520.4.121 by Aaron Bentley
Polish up submit command
4225
                        '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()
4226
                revision_id = revision[-1].as_revision_id(branch)
2520.4.121 by Aaron Bentley
Polish up submit command
4227
                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()
4228
                    base_revision_id = revision[0].as_revision_id(branch)
2747.3.1 by Aaron Bentley
'send' and 'bundle' now handle partial ranges correctly (#61685)
4229
            if revision_id is None:
2520.4.121 by Aaron Bentley
Polish up submit command
4230
                revision_id = branch.last_revision()
4231
            if revision_id == NULL_REVISION:
4232
                raise errors.BzrCommandError('No revisions to submit.')
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4233
            if format == '4':
4234
                directive = merge_directive.MergeDirective2.from_objects(
4235
                    branch.repository, revision_id, time.time(),
4236
                    osutils.local_time_offset(), submit_branch,
4237
                    public_branch=public_branch, include_patch=not no_patch,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4238
                    include_bundle=not no_bundle, message=message,
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4239
                    base_revision_id=base_revision_id)
4240
            elif format == '0.9':
4241
                if not no_bundle:
4242
                    if not no_patch:
4243
                        patch_type = 'bundle'
4244
                    else:
4245
                        raise errors.BzrCommandError('Format 0.9 does not'
4246
                            ' permit bundle with no patch')
4247
                else:
4248
                    if not no_patch:
4249
                        patch_type = 'diff'
4250
                    else:
4251
                        patch_type = None
4252
                directive = merge_directive.MergeDirective.from_objects(
4253
                    branch.repository, revision_id, time.time(),
4254
                    osutils.local_time_offset(), submit_branch,
4255
                    public_branch=public_branch, patch_type=patch_type,
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4256
                    message=message)
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4257
2520.4.121 by Aaron Bentley
Polish up submit command
4258
            outfile.writelines(directive.to_lines())
2681.1.8 by Aaron Bentley
Add Thunderbird support to bzr send
4259
            if output is None:
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4260
                subject = '[MERGE] '
4261
                if message is not None:
4262
                    subject += message
4263
                else:
4264
                    revision = branch.repository.get_revision(revision_id)
2681.3.5 by Lukáš Lalinsky
Don't send e-mails with multi-line subjects.
4265
                    subject += revision.get_summary()
3251.2.1 by Aaron Bentley
Use nick/revno-based names for merge directives
4266
                basename = directive.get_disk_name(branch)
2681.1.11 by Aaron Bentley
Add docstrings, add compose_merge_request
4267
                mail_client.compose_merge_request(mail_to, subject,
3251.2.1 by Aaron Bentley
Use nick/revno-based names for merge directives
4268
                                                  outfile.getvalue(), basename)
2520.4.121 by Aaron Bentley
Polish up submit command
4269
        finally:
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4270
            if output != '-':
2520.4.121 by Aaron Bentley
Polish up submit command
4271
                outfile.close()
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
4272
            branch.unlock()
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
4273
2654.3.1 by Aaron Bentley
Rename submit to send, make -o required, support -o- for stdout
4274
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4275
class cmd_bundle_revisions(cmd_send):
4276
4277
    """Create a merge-directive for submiting changes.
4278
4279
    A merge directive provides many things needed for requesting merges:
4280
4281
    * A machine-readable description of the merge to perform
4282
4283
    * An optional patch that is a preview of the changes requested
4284
4285
    * An optional bundle of revision data, so that the changes can be applied
4286
      directly from the merge directive, without retrieving data from a
4287
      branch.
4288
4289
    If --no-bundle is specified, then public_branch is needed (and must be
4290
    up-to-date), so that the receiver can perform the merge using the
4291
    public_branch.  The public_branch is always included if known, so that
4292
    people can check it later.
4293
4294
    The submit branch defaults to the parent, but can be overridden.  Both
4295
    submit branch and public branch will be remembered if supplied.
4296
4297
    If a public_branch is known for the submit_branch, that public submit
4298
    branch is used in the merge instructions.  This means that a local mirror
4299
    can be used as your actual submit branch, once you have set public_branch
4300
    for that mirror.
2681.1.6 by Aaron Bentley
Update help to describe available formats
4301
4302
    Two formats are currently supported: "4" uses revision bundle format 4 and
4303
    merge directive format 2.  It is significantly faster and smaller than
4304
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
4305
    default.  "0.9" uses revision bundle format 0.9 and merge directive
4306
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4307
    """
4308
2681.1.9 by Aaron Bentley
Add support for mail-from-editor
4309
    takes_options = [
4310
        Option('no-bundle',
4311
               help='Do not include a bundle in the merge directive.'),
4312
        Option('no-patch', help='Do not include a preview patch in the merge'
4313
               ' directive.'),
4314
        Option('remember',
4315
               help='Remember submit and public branch.'),
4316
        Option('from',
4317
               help='Branch to generate the submission from, '
4318
               'rather than the one containing the working directory.',
4319
               short_name='f',
4320
               type=unicode),
4321
        Option('output', short_name='o', help='Write directive to this file.',
4322
               type=unicode),
4323
        'revision',
4324
        RegistryOption.from_kwargs('format',
4325
        'Use the specified output format.',
4326
        **{'4': 'Bundle format 4, Merge Directive 2 (default)',
4327
           '0.9': 'Bundle format 0.9, Merge Directive 1',})
4328
        ]
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4329
    aliases = ['bundle']
4330
4331
    _see_also = ['send', 'merge']
4332
4333
    hidden = True
4334
4335
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4336
            no_patch=False, revision=None, remember=False, output=None,
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4337
            format='4', **kwargs):
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4338
        if output is None:
4339
            output = '-'
2681.1.2 by Aaron Bentley
Add support for selecting bundle format
4340
        return self._run(submit_branch, revision, public_branch, remember,
4341
                         format, no_bundle, no_patch, output,
2681.1.12 by Aaron Bentley
Fix bundle command
4342
                         kwargs.get('from', '.'), None, None)
2681.1.1 by Aaron Bentley
Split 'send' into 'send' and 'bundle'.
4343
4344
2220.2.2 by Martin Pool
Add tag command and basic implementation
4345
class cmd_tag(Command):
2664.1.1 by Joachim Nilsson
Change tag description for "help commands" to make it easier to find
4346
    """Create, remove or modify a tag naming a revision.
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4347
    
4348
    Tags give human-meaningful names to revisions.  Commands that take a -r
4349
    (--revision) option can be given -rtag:X, where X is any previously
4350
    created tag.
4351
2220.2.41 by Martin Pool
Fix tag help (fullermd)
4352
    Tags are stored in the branch.  Tags are copied from one branch to another
4353
    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.
4354
4355
    It is an error to give a tag name that already exists unless you pass 
4356
    --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
4357
3566.2.2 by Benjamin Peterson
fix markup
4358
    To rename a tag (change the name but keep it on the same revsion), run ``bzr
4359
    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.
4360
    """
2220.2.2 by Martin Pool
Add tag command and basic implementation
4361
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4362
    _see_also = ['commit', 'tags']
2220.2.2 by Martin Pool
Add tag command and basic implementation
4363
    takes_args = ['tag_name']
4364
    takes_options = [
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4365
        Option('delete',
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4366
            help='Delete this tag rather than placing it.',
4367
            ),
4368
        Option('directory',
4369
            help='Branch in which to place the tag.',
4370
            short_name='d',
4371
            type=unicode,
4372
            ),
4373
        Option('force',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4374
            help='Replace existing tags.',
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4375
            ),
2220.2.6 by Martin Pool
Add tag -r option
4376
        'revision',
2220.2.2 by Martin Pool
Add tag command and basic implementation
4377
        ]
4378
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4379
    def run(self, tag_name,
4380
            delete=None,
4381
            directory='.',
4382
            force=None,
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4383
            revision=None,
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4384
            ):
2220.2.2 by Martin Pool
Add tag command and basic implementation
4385
        branch, relpath = Branch.open_containing(directory)
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4386
        branch.lock_write()
4387
        try:
4388
            if delete:
4389
                branch.tags.delete_tag(tag_name)
4390
                self.outf.write('Deleted tag %s.\n' % tag_name)
2220.2.21 by Martin Pool
Add tag --delete command and implementation
4391
            else:
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
4392
                if revision:
4393
                    if len(revision) != 1:
4394
                        raise errors.BzrCommandError(
4395
                            "Tags can only be placed on a single revision, "
4396
                            "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()
4397
                    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.
4398
                else:
4399
                    revision_id = branch.last_revision()
4400
                if (not force) and branch.tags.has_tag(tag_name):
4401
                    raise errors.TagAlreadyExists(tag_name)
4402
                branch.tags.set_tag(tag_name, revision_id)
4403
                self.outf.write('Created tag %s.\n' % tag_name)
4404
        finally:
4405
            branch.unlock()
2220.2.2 by Martin Pool
Add tag command and basic implementation
4406
4407
2220.2.24 by Martin Pool
Add tags command
4408
class cmd_tags(Command):
4409
    """List tags.
4410
3007.1.1 by Adeodato Simó
Small fix to tags' help.
4411
    This command shows a table of tag names and the revisions they reference.
2220.2.24 by Martin Pool
Add tags command
4412
    """
4413
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4414
    _see_also = ['tag']
2220.2.24 by Martin Pool
Add tags command
4415
    takes_options = [
4416
        Option('directory',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
4417
            help='Branch whose tags should be displayed.',
2220.2.24 by Martin Pool
Add tags command
4418
            short_name='d',
4419
            type=unicode,
4420
            ),
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
4421
        RegistryOption.from_kwargs('sort',
4422
            'Sort tags by different criteria.', title='Sorting',
4423
            alpha='Sort tags lexicographically (default).',
4424
            time='Sort tags chronologically.',
4425
            ),
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
4426
        'show-ids',
2220.2.24 by Martin Pool
Add tags command
4427
    ]
4428
4429
    @display_command
4430
    def run(self,
4431
            directory='.',
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
4432
            sort='alpha',
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
4433
            show_ids=False,
2220.2.24 by Martin Pool
Add tags command
4434
            ):
4435
        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.
4436
        tags = branch.tags.get_tag_dict().items()
3553.1.1 by Robert Collins
Do not scan history for tags when none are present.
4437
        if not tags:
4438
            return
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
4439
        if sort == 'alpha':
4440
            tags.sort()
4441
        elif sort == 'time':
4442
            timestamps = {}
4443
            for tag, revid in tags:
4444
                try:
4445
                    revobj = branch.repository.get_revision(revid)
4446
                except errors.NoSuchRevision:
4447
                    timestamp = sys.maxint # place them at the end
4448
                else:
4449
                    timestamp = revobj.timestamp
4450
                timestamps[revid] = timestamp
4451
            tags.sort(key=lambda x: timestamps[x[1]])
4452
        if not show_ids:
4453
            # [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4454
            revno_map = branch.get_revision_id_to_revno_map()
4455
            tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4456
                        for tag, revid in tags ]
4457
        for tag, revspec in tags:
4458
            self.outf.write('%-20s %s\n' % (tag, revspec))
2220.2.24 by Martin Pool
Add tags command
4459
4460
2796.2.5 by Aaron Bentley
Implement reconfigure command
4461
class cmd_reconfigure(Command):
2796.2.15 by Aaron Bentley
More updates from review
4462
    """Reconfigure the type of a bzr directory.
4463
4464
    A target configuration must be specified.
4465
4466
    For checkouts, the bind-to location will be auto-detected if not specified.
4467
    The order of preference is
4468
    1. For a lightweight checkout, the current bound location.
4469
    2. For branches that used to be checkouts, the previously-bound location.
4470
    3. The push location.
4471
    4. The parent location.
4472
    If none of these is available, --bind-to must be specified.
4473
    """
2796.2.5 by Aaron Bentley
Implement reconfigure command
4474
3535.4.1 by Marius Kruger
Update reconfigure help to say exactly what it wil do.
4475
    _see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
2796.2.5 by Aaron Bentley
Implement reconfigure command
4476
    takes_args = ['location?']
4477
    takes_options = [RegistryOption.from_kwargs('target_type',
4478
                     title='Target type',
4479
                     help='The type to reconfigure the directory to.',
4480
                     value_switches=True, enum_switch=False,
3535.4.1 by Marius Kruger
Update reconfigure help to say exactly what it wil do.
4481
                     branch='Reconfigure to be an unbound branch '
4482
                        'with no working tree.',
4483
                     tree='Reconfigure to be an unbound branch '
4484
                        'with a working tree.',
4485
                     checkout='Reconfigure to be a bound branch '
4486
                        'with a working tree.',
4487
                     lightweight_checkout='Reconfigure to be a lightweight'
4488
                     ' checkout (with no local history).',
4489
                     standalone='Reconfigure to be a standalone branch '
4490
                        '(i.e. stop using shared repository).',
3311.2.6 by Aaron Bentley
rename 'sharing' to 'use-shared'
4491
                     use_shared='Reconfigure to use a shared repository.'),
2796.2.5 by Aaron Bentley
Implement reconfigure command
4492
                     Option('bind-to', help='Branch to bind checkout to.',
4493
                            type=str),
4494
                     Option('force',
4495
                        help='Perform reconfiguration even if local changes'
4496
                        ' will be lost.')
4497
                     ]
4498
4499
    def run(self, location=None, target_type=None, bind_to=None, force=False):
4500
        directory = bzrdir.BzrDir.open(location)
2796.2.15 by Aaron Bentley
More updates from review
4501
        if target_type is None:
2830.2.4 by Martin Pool
Fix previously hidden NameError in reconfigure
4502
            raise errors.BzrCommandError('No target configuration specified')
2796.2.15 by Aaron Bentley
More updates from review
4503
        elif target_type == 'branch':
2796.2.5 by Aaron Bentley
Implement reconfigure command
4504
            reconfiguration = reconfigure.Reconfigure.to_branch(directory)
4505
        elif target_type == 'tree':
4506
            reconfiguration = reconfigure.Reconfigure.to_tree(directory)
4507
        elif target_type == 'checkout':
4508
            reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4509
                                                                  bind_to)
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
4510
        elif target_type == 'lightweight-checkout':
4511
            reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4512
                directory, bind_to)
3311.2.6 by Aaron Bentley
rename 'sharing' to 'use-shared'
4513
        elif target_type == 'use-shared':
4514
            reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
3311.2.5 by Aaron Bentley
Implement reconfigure --standalone and --sharing
4515
        elif target_type == 'standalone':
4516
            reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
2796.2.5 by Aaron Bentley
Implement reconfigure command
4517
        reconfiguration.apply(force)
4518
4519
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4520
class cmd_switch(Command):
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4521
    """Set the branch of a checkout and update.
4522
    
4523
    For lightweight checkouts, this changes the branch being referenced.
4524
    For heavyweight checkouts, this checks that there are no local commits
4525
    versus the current bound branch, then it makes the local branch a mirror
4526
    of the new location and binds to it.
4527
    
4528
    In both cases, the working tree is updated and uncommitted changes
4529
    are merged. The user can commit or revert these as they desire.
4530
4531
    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
4532
4533
    The path to the branch to switch to can be specified relative to the parent
4534
    directory of the current branch. For example, if you are currently in a
4535
    checkout of /path/to/branch, specifying 'newbranch' will find a branch at
4536
    /path/to/newbranch.
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4537
    """
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4538
4539
    takes_args = ['to_location']
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4540
    takes_options = [Option('force',
4541
                        help='Switch even if local commits will be lost.')
4542
                     ]
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4543
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4544
    def run(self, to_location, force=False):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
4545
        from bzrlib import switch
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4546
        tree_location = '.'
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
4547
        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
4548
        try:
4549
            to_branch = Branch.open(to_location)
4550
        except errors.NotBranchError:
4551
            to_branch = Branch.open(
4552
                control_dir.open_branch().base + '../' + to_location)
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
4553
        switch.switch(control_dir, to_branch, force)
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
4554
        note('Switched to branch: %s',
4555
            urlutils.unescape_for_display(to_branch.base, 'utf-8'))
4556
4557
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4558
class cmd_hooks(Command):
4559
    """Show a branch's currently registered hooks.
4560
    """
4561
3254.2.9 by Daniel Watkins
Made cmd_hooks hidden.
4562
    hidden = True
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4563
    takes_args = ['path?']
4564
4565
    def run(self, path=None):
4566
        if path is None:
4567
            path = '.'
4568
        branch_hooks = Branch.open(path).hooks
4569
        for hook_type in branch_hooks:
4570
            hooks = branch_hooks[hook_type]
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
4571
            self.outf.write("%s:\n" % (hook_type,))
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4572
            if hooks:
4573
                for hook in hooks:
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
4574
                    self.outf.write("  %s\n" %
4575
                                    (branch_hooks.get_hook_name(hook),))
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4576
            else:
3254.2.4 by Daniel Watkins
Changed output to conform to tests.
4577
                self.outf.write("  <no hooks installed>\n")
3254.2.1 by Daniel Watkins
Added cmd_hooks.
4578
4579
2524.1.1 by Aaron Bentley
Revert broken changes
4580
def _create_prefix(cur_transport):
4581
    needed = [cur_transport]
4582
    # Recurse upwards until we can create a directory successfully
4583
    while True:
4584
        new_transport = cur_transport.clone('..')
4585
        if new_transport.base == cur_transport.base:
2604.1.1 by Martin Pool
Fix unbound variable in _create_prefix (thanks vila)
4586
            raise errors.BzrCommandError(
4587
                "Failed to create path prefix for %s."
4588
                % cur_transport.base)
2524.1.1 by Aaron Bentley
Revert broken changes
4589
        try:
4590
            new_transport.mkdir('.')
4591
        except errors.NoSuchFile:
4592
            needed.append(new_transport)
4593
            cur_transport = new_transport
4594
        else:
4595
            break
4596
    # Now we only need to create child directories
4597
    while needed:
4598
        cur_transport = needed.pop()
4599
        cur_transport.ensure_base()
4600
2604.1.1 by Martin Pool
Fix unbound variable in _create_prefix (thanks vila)
4601
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
4602
# these get imported and then picked up by the scan for cmd_*
4603
# TODO: Some more consistent way to split command definitions across files;
4604
# 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'.
4605
# aliases.  ideally we would avoid loading the implementation until the
4606
# details were needed.
2022.1.2 by John Arbash Meinel
rename version_info => cmd_version_info
4607
from bzrlib.cmd_version_info import cmd_version_info
1185.35.4 by Aaron Bentley
Implemented remerge
4608
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2520.4.35 by Aaron Bentley
zap obsolete changeset commands, add bundle-info command
4609
from bzrlib.bundle.commands import (
4610
    cmd_bundle_info,
4611
    )
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
4612
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.
4613
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
4614
        cmd_weave_plan_merge, cmd_weave_merge_text