/brz/remove-bazaar

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