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