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