/brz/remove-bazaar

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