/brz/remove-bazaar

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