/brz/remove-bazaar

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