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