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