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