/brz/remove-bazaar

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