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