/brz/remove-bazaar

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