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