/brz/remove-bazaar

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