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