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