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