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