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