/brz/remove-bazaar

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