/brz/remove-bazaar

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