/brz/remove-bazaar

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