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