/brz/remove-bazaar

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