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