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