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