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