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