/brz/remove-bazaar

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