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