/brz/remove-bazaar

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