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