/brz/remove-bazaar

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