/brz/remove-bazaar

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