/brz/remove-bazaar

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