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