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