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