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