/brz/remove-bazaar

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