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