/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
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
837
        source.create_checkout(to_location, revision_id, lightweight)
1508.1.20 by Robert Collins
Create a checkout command.
838
839
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
840
class cmd_renames(Command):
841
    """Show list of renamed files.
842
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
843
    # TODO: Option to show renames between two historical versions.
844
845
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
846
    takes_args = ['dir?']
847
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
848
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
849
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
850
        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()
851
        old_inv = tree.basis_tree().inventory
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
852
        new_inv = tree.read_working_inventory()
1996.3.30 by John Arbash Meinel
Don't import 'bzrlib.tree' directly in bzrlib.builtins
853
        renames = list(_mod_tree.find_renames(old_inv, new_inv))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
854
        renames.sort()
855
        for old_name, new_name in renames:
1185.85.32 by John Arbash Meinel
Updated bzr renames
856
            self.outf.write("%s => %s\n" % (old_name, new_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
857
858
1508.1.24 by Robert Collins
Add update command for use with checkouts.
859
class cmd_update(Command):
860
    """Update a tree to have the latest code committed to its branch.
861
    
862
    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.
863
    conflicts. If you have any local changes, you will still 
864
    need to commit them after the update for the update to be complete.
865
    
866
    If you want to discard your local changes, you can just do a 
867
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
868
    """
869
    takes_args = ['dir?']
1815.3.1 by Stefan (metze) Metzmacher
add 'up' as alias for 'update'
870
    aliases = ['up']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
871
872
    def run(self, dir='.'):
873
        tree = WorkingTree.open_containing(dir)[0]
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
874
        master = tree.branch.get_master_branch()
875
        if master is not None:
876
            tree.lock_write()
877
        else:
878
            tree.lock_tree_write()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
879
        try:
2014.1.1 by John Arbash Meinel
Stop using pending_merges() in 'bzr update'
880
            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.
881
            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.
882
            if last_rev == tree.branch.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
883
                # may be up to date, check master too.
884
                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.
885
                if master is None or last_rev == master.last_revision():
886
                    revno = tree.branch.revision_id_to_revno(last_rev)
887
                    note("Tree is up to date at revision %d." % (revno,))
888
                    return 0
1508.1.24 by Robert Collins
Add update command for use with checkouts.
889
            conflicts = tree.update()
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
890
            revno = tree.branch.revision_id_to_revno(tree.last_revision())
891
            note('Updated to revision %d.' % (revno,))
2014.1.1 by John Arbash Meinel
Stop using pending_merges() in 'bzr update'
892
            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.
893
                note('Your local commits will now show as pending merges with '
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
894
                     "'bzr status', and can be committed with 'bzr commit'.")
1508.1.24 by Robert Collins
Add update command for use with checkouts.
895
            if conflicts != 0:
896
                return 1
897
            else:
898
                return 0
899
        finally:
900
            tree.unlock()
901
902
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
903
class cmd_info(Command):
1694.2.6 by Martin Pool
[merge] bzr.dev
904
    """Show information about a working tree, branch or repository.
905
906
    This command will show all known locations and formats associated to the
907
    tree, branch or repository.  Statistical information is included with
908
    each report.
909
910
    Branches and working trees will also report any missing revisions.
911
    """
912
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
913
    takes_options = ['verbose']
1694.2.6 by Martin Pool
[merge] bzr.dev
914
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
915
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
916
    def run(self, location=None, verbose=False):
917
        from bzrlib.info import show_bzrdir_info
918
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
919
                         verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
920
921
922
class cmd_remove(Command):
923
    """Make a file unversioned.
924
925
    This makes bzr stop tracking changes to a versioned file.  It does
926
    not delete the working copy.
1551.6.26 by Aaron Bentley
Add support for remove --new
927
928
    You can specify one or more files, and/or --new.  If you specify --new,
929
    only 'added' files will be removed.  If you specify both, then new files
930
    in the specified directories will be removed.  If the directories are
931
    also new, they will also be removed.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
932
    """
1551.6.26 by Aaron Bentley
Add support for remove --new
933
    takes_args = ['file*']
934
    takes_options = ['verbose', Option('new', help='remove newly-added files')]
1424 by Robert Collins
add rm alias to remove
935
    aliases = ['rm']
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
936
    encoding_type = 'replace'
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
    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
939
        tree, file_list = tree_files(file_list)
1551.6.26 by Aaron Bentley
Add support for remove --new
940
        if new is False:
941
            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
942
                raise errors.BzrCommandError('Specify one or more files to'
943
                                             ' remove, or use --new.')
1551.6.26 by Aaron Bentley
Add support for remove --new
944
        else:
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
945
            added = tree.changes_from(tree.basis_tree(),
946
                specific_files=file_list).added
947
            file_list = sorted([f[0] for f in added], reverse=True)
1551.6.26 by Aaron Bentley
Add support for remove --new
948
            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
949
                raise errors.BzrCommandError('No matching files.')
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
950
        tree.remove(file_list, verbose=verbose, to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
951
952
953
class cmd_file_id(Command):
954
    """Print file_id of a particular file or directory.
955
956
    The file_id is assigned when the file is first added and remains the
957
    same through all revisions where the file exists, even when it is
958
    moved or renamed.
959
    """
1685.1.80 by Wouter van Heyst
more code cleanup
960
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
961
    hidden = True
962
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
963
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
964
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
965
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
966
        tree, relpath = WorkingTree.open_containing(filename)
967
        i = tree.inventory.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
968
        if i is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
969
            raise errors.NotVersionedError(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
970
        else:
1685.1.80 by Wouter van Heyst
more code cleanup
971
            self.outf.write(i + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
972
973
974
class cmd_file_path(Command):
975
    """Print path of file_ids to a file or directory.
976
977
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
978
    starting at the branch root.
979
    """
1685.1.80 by Wouter van Heyst
more code cleanup
980
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
981
    hidden = True
982
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
983
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
984
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
985
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
986
        tree, relpath = WorkingTree.open_containing(filename)
987
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
988
        fid = inv.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
989
        if fid is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
990
            raise errors.NotVersionedError(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
991
        for fip in inv.get_idpath(fid):
1685.1.80 by Wouter van Heyst
more code cleanup
992
            self.outf.write(fip + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
993
994
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
995
class cmd_reconcile(Command):
996
    """Reconcile bzr metadata in a branch.
997
998
    This can correct data mismatches that may have been caused by
999
    previous ghost operations or bzr upgrades. You should only
1000
    need to run this command if 'bzr check' or a bzr developer 
1001
    advises you to run it.
1002
1003
    If a second branch is provided, cross-branch reconciliation is
1004
    also attempted, which will check that data like the tree root
1005
    id which was not present in very early bzr versions is represented
1006
    correctly in both branches.
1007
1008
    At the same time it is run it may recompress data resulting in 
1009
    a potential saving in disk space or performance gain.
1010
1011
    The branch *MUST* be on a listable system such as local disk or sftp.
1012
    """
1013
    takes_args = ['branch?']
1014
1015
    def run(self, branch="."):
1016
        from bzrlib.reconcile import reconcile
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1017
        dir = bzrdir.BzrDir.open(branch)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1018
        reconcile(dir)
1019
1020
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1021
class cmd_revision_history(Command):
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1022
    """Display the list of revision ids on a branch."""
1023
    takes_args = ['location?']
1024
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1025
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1026
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1027
    @display_command
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1028
    def run(self, location="."):
1029
        branch = Branch.open_containing(location)[0]
1030
        for revid in branch.revision_history():
1733.2.4 by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history().
1031
            self.outf.write(revid)
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1032
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1033
1034
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1035
class cmd_ancestry(Command):
1036
    """List all revisions merged into this branch."""
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
1037
    takes_args = ['location?']
1038
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1039
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1040
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1041
    @display_command
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
1042
    def run(self, location="."):
1043
        try:
1044
            wt = WorkingTree.open_containing(location)[0]
1045
        except errors.NoWorkingTree:
1046
            b = Branch.open(location)
1047
            last_revision = b.last_revision()
1048
        else:
1049
            b = wt.branch
1050
            last_revision = wt.last_revision()
1051
1052
        revision_ids = b.repository.get_ancestry(last_revision)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1053
        assert revision_ids[0] is None
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
1054
        revision_ids.pop(0)
1055
        for revision_id in revision_ids:
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
1056
            self.outf.write(revision_id + '\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1057
1058
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1059
class cmd_init(Command):
1060
    """Make a directory into a versioned branch.
1061
1062
    Use this to create an empty branch, or before importing an
1063
    existing project.
1064
1662.1.19 by Martin Pool
Better error message when initting existing tree
1065
    If there is a repository in a parent directory of the location, then 
1066
    the history of the branch will be stored in the repository.  Otherwise
1067
    init creates a standalone branch which carries its own history in 
1068
    .bzr.
1069
1070
    If there is already a branch at the location but it has no working tree,
1071
    the tree can be populated with 'bzr checkout'.
1072
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1073
    Recipe for importing a tree of files:
1074
        cd ~/project
1075
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
1076
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1077
        bzr status
1078
        bzr commit -m 'imported project'
1079
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1080
    takes_args = ['location?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1081
    takes_options = [
1082
                     Option('format', 
1083
                            help='Specify a format for this branch. Current'
1084
                                 ' formats are: default, knit, metaweave and'
1085
                                 ' weave. Default is knit; metaweave and'
1086
                                 ' weave are deprecated',
1087
                            type=get_format_type),
1088
                     ]
1089
    def run(self, location=None, format=None):
1090
        if format is None:
1091
            format = get_format_type('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1092
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1093
            location = u'.'
1830.4.5 by Wouter van Heyst
cleanup
1094
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1095
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1096
1097
        # The path has to exist to initialize a
1098
        # branch inside of it.
1099
        # Just using os.mkdir, since I don't
1100
        # believe that we want to create a bunch of
1101
        # locations if the user supplies an extended path
1102
        # TODO: create-prefix
1103
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1104
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1105
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1106
            pass
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1107
                    
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1108
        try:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1109
            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
1110
        except errors.NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1111
            # really a NotBzrDir error...
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1112
            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.
1113
        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
1114
            from bzrlib.transport.local import LocalTransport
1662.1.19 by Martin Pool
Better error message when initting existing tree
1115
            if existing_bzrdir.has_branch():
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1116
                if (isinstance(to_transport, LocalTransport)
1117
                    and not existing_bzrdir.has_workingtree()):
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1118
                        raise errors.BranchExistsWithoutWorkingTree(location)
1119
                raise errors.AlreadyBranchError(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1120
            else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1121
                existing_bzrdir.create_branch()
1122
                existing_bzrdir.create_workingtree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1123
1124
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1125
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1126
    """Create a shared repository to hold branches.
1127
1128
    New branches created under the repository directory will store their revisions
1129
    in the repository, not in the branch directory, if the branch format supports
1130
    shared storage.
1131
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1132
    example:
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1133
        bzr init-repo repo
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1134
        bzr init repo/trunk
1135
        bzr checkout --lightweight repo/trunk trunk-checkout
1136
        cd trunk-checkout
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1137
        (add files here)
1138
    """
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1139
    takes_args = ["location"] 
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1140
    takes_options = [Option('format', 
1141
                            help='Specify a format for this repository.'
1142
                                 ' Current formats are: default, knit,'
1143
                                 ' metaweave and weave. Default is knit;'
1144
                                 ' metaweave and weave are deprecated',
1145
                            type=get_format_type),
1624.2.4 by Erik Bågfors
rename --tree to --trees
1146
                     Option('trees',
1624.2.1 by Erik Bågfors
support for --tree in bzr init-repo
1147
                             help='Allows branches in repository to have'
1148
                             ' a working tree')]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1149
    aliases = ["init-repo"]
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1150
    def run(self, location, format=None, trees=False):
1151
        if format is None:
1152
            format = get_format_type('default')
1153
1154
        if location is None:
1155
            location = '.'
1156
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1157
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1158
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1159
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1160
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1161
            pass
1162
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1163
        newdir = format.initialize_on_transport(to_transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
1164
        repo = newdir.create_repository(shared=True)
1624.2.4 by Erik Bågfors
rename --tree to --trees
1165
        repo.set_make_working_trees(trees)
1558.5.1 by Aaron Bentley
Added make-repository command
1166
1167
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1168
class cmd_diff(Command):
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1169
    """Show differences in the working tree or between revisions.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1170
    
1171
    If files are listed, only the changes in those files are listed.
1172
    Otherwise, all changes for the tree are listed.
1173
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1174
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1175
    produces patches suitable for "patch -p1".
1176
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1177
    examples:
1178
        bzr diff
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1179
            Shows the difference in the working tree versus the last commit
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1180
        bzr diff -r1
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1181
            Difference between the working tree and revision 1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
1182
        bzr diff -r1..2
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1183
            Difference between revision 2 and revision 1
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1184
        bzr diff --diff-prefix old/:new/
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1185
            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.
1186
        bzr diff bzr.mine bzr.dev
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1187
            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.
1188
        bzr diff foo.c
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1189
            Show just the differences for 'foo.c'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1190
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1191
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1192
    #       or a graphical diff.
1193
1194
    # TODO: Python difflib is not exactly the same as unidiff; should
1195
    #       either fix it up or prefer to use an external diff.
1196
1197
    # TODO: Selected-file diff is inefficient and doesn't show you
1198
    #       deleted files.
1199
1200
    # TODO: This probably handles non-Unix newlines poorly.
2197.2.1 by Martin Pool
Refactor cmd_diff
1201
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1202
    takes_args = ['file*']
2190.2.1 by Martin Pool
remove global registration of short options
1203
    takes_options = ['revision', 'diff-options',
2193.3.1 by Martin Pool
Finish removal of global short-option table
1204
        Option('prefix', type=str,
1205
               short_name='p',
2190.2.1 by Martin Pool
remove global registration of short options
1206
               help='Set prefixes to added to old and new filenames, as '
1207
                    'two values separated by a colon.'),
1208
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1209
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1210
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1211
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1212
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1213
    def run(self, revision=None, file_list=None, diff_options=None,
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1214
            prefix=None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1215
        from bzrlib.diff import diff_cmd_helper, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1216
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1217
        if (prefix is None) or (prefix == '0'):
1218
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
1219
            old_label = ''
1220
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1221
        elif prefix == '1':
1222
            old_label = 'old/'
1223
            new_label = 'new/'
2197.2.1 by Martin Pool
Refactor cmd_diff
1224
        elif ':' in prefix:
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1225
            old_label, new_label = prefix.split(":")
2197.2.1 by Martin Pool
Refactor cmd_diff
1226
        else:
1227
            raise BzrCommandError(
1228
                "--prefix expects two values separated by a colon")
1229
1230
        if revision and len(revision) > 2:
1231
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1232
                                         ' one or two revision specifiers')
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1233
        
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1234
        try:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1235
            tree1, file_list = internal_tree_files(file_list)
1236
            tree2 = None
1508.1.15 by Robert Collins
Merge from mpool.
1237
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1238
            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
1239
        except errors.FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1240
            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
1241
                raise errors.BzrCommandError("Files are in different branches")
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1242
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1243
            tree1, file1 = WorkingTree.open_containing(file_list[0])
1244
            tree2, file2 = WorkingTree.open_containing(file_list[1])
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1245
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
1246
                # 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
1247
                raise errors.BzrCommandError("Files are in different branches")
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1248
            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
1249
        except errors.NotBranchError:
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1250
            if (revision is not None and len(revision) == 2
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
1251
                and not revision[0].needs_branch()
1252
                and not revision[1].needs_branch()):
1711.2.100 by John Arbash Meinel
clean up comment.
1253
                # If both revision specs include a branch, we can
1254
                # diff them without needing a local working tree
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1255
                tree1, tree2 = None, None
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
1256
            else:
1257
                raise
2197.2.1 by Martin Pool
Refactor cmd_diff
1258
1259
        if tree2 is not None:
1260
            if revision is not None:
1261
                # FIXME: but there should be a clean way to diff between
1262
                # non-default versions of two trees, it's not hard to do
1263
                # internally...
1264
                raise errors.BzrCommandError(
1265
                        "Sorry, diffing arbitrary revisions across branches "
1266
                        "is not implemented yet")
1267
            return show_diff_trees(tree1, tree2, sys.stdout, 
1268
                                   specific_files=file_list,
1269
                                   external_diff_options=diff_options,
1270
                                   old_label=old_label, new_label=new_label)
1271
1272
        return diff_cmd_helper(tree1, file_list, diff_options,
1273
                               revision_specs=revision,
1274
                               old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1275
1276
1277
class cmd_deleted(Command):
1278
    """List files deleted in the working tree.
1279
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1280
    # TODO: Show files deleted since a previous revision, or
1281
    # between two revisions.
1282
    # TODO: Much more efficient way to do this: read in new
1283
    # directories with readdir, rather than stating each one.  Same
1284
    # level of effort but possibly much less IO.  (Or possibly not,
1285
    # if the directories are very large...)
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1286
    takes_options = ['show-ids']
1287
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1288
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1289
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1290
        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()
1291
        old = tree.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1292
        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
1293
            if not tree.has_id(ie.file_id):
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1294
                self.outf.write(path)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1295
                if show_ids:
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1296
                    self.outf.write(' ')
1297
                    self.outf.write(ie.file_id)
1298
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1299
1300
1301
class cmd_modified(Command):
1302
    """List files modified in working tree."""
1303
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1304
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1305
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1306
        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.
1307
        td = tree.changes_from(tree.basis_tree())
1398 by Robert Collins
integrate in Gustavos x-bit patch
1308
        for path, id, kind, text_modified, meta_modified in td.modified:
1685.1.80 by Wouter van Heyst
more code cleanup
1309
            self.outf.write(path + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1310
1311
1312
class cmd_added(Command):
1313
    """List files added in working tree."""
1314
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1315
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1316
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1317
        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()
1318
        basis_inv = wt.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1319
        inv = wt.inventory
1320
        for file_id in inv:
1321
            if file_id in basis_inv:
1322
                continue
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1323
            if inv.is_root(file_id) and len(basis_inv) == 0:
1324
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1325
            path = inv.id2path(file_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1326
            if not os.access(osutils.abspath(path), os.F_OK):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1327
                continue
1685.1.80 by Wouter van Heyst
more code cleanup
1328
            self.outf.write(path + '\n')
1185.85.53 by John Arbash Meinel
Updated cmd_root
1329
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1330
1331
class cmd_root(Command):
1332
    """Show the tree root directory.
1333
1334
    The root is the nearest enclosing directory with a .bzr control
1335
    directory."""
1336
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1337
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1338
    def run(self, filename=None):
1339
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1340
        tree = WorkingTree.open_containing(filename)[0]
1685.1.80 by Wouter van Heyst
more code cleanup
1341
        self.outf.write(tree.basedir + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1342
1343
1344
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1345
    """Show log of a branch, file, or directory.
1346
1347
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1348
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1349
    To request a range of logs, you can use the command -r begin..end
1350
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1351
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1352
1353
    examples:
1354
        bzr log
1355
        bzr log foo.c
1356
        bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1357
    """
1358
1393.1.55 by Martin Pool
doc
1359
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1360
1626.1.2 by Martin Pool
Better help message for log command.
1361
    takes_args = ['location?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1362
    takes_options = [Option('forward', 
1363
                            help='show from oldest to newest'),
1626.1.2 by Martin Pool
Better help message for log command.
1364
                     'timezone', 
1365
                     Option('verbose', 
2193.3.3 by Martin Pool
Fix up other short options
1366
                             short_name='v',
1626.1.2 by Martin Pool
Better help message for log command.
1367
                             help='show files changed in each revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1368
                     'show-ids', 'revision',
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1369
                     'log-format',
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1370
                     'line', 'long', 
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1371
                     Option('message',
2193.3.3 by Martin Pool
Fix up other short options
1372
                            short_name='m',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1373
                            help='show revisions whose message matches this regexp',
1374
                            type=str),
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1375
                     'short',
1185.16.57 by Martin Pool
[merge] from aaron
1376
                     ]
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()
1377
    encoding_type = 'replace'
1378
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1379
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1380
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1381
            verbose=False,
1382
            show_ids=False,
1383
            forward=False,
1384
            revision=None,
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1385
            log_format=None,
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1386
            message=None,
1387
            long=False,
1388
            short=False,
1389
            line=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1390
        from bzrlib.log import log_formatter, show_log
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
1391
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1392
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1393
        direction = (forward and 'forward') or 'reverse'
1394
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1395
        # log everything
1396
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1397
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1398
            # find the file id to log:
1399
1626.1.2 by Martin Pool
Better help message for log command.
1400
            dir, fp = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1401
            b = dir.open_branch()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1402
            if fp != '':
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1403
                try:
1404
                    # might be a tree:
1405
                    inv = dir.open_workingtree().inventory
1406
                except (errors.NotBranchError, errors.NotLocalUrl):
1407
                    # either no tree, or is remote.
1408
                    inv = b.basis_tree().inventory
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1409
                file_id = inv.path2id(fp)
2100.1.1 by wang
Running ``bzr log`` on nonexistent file gives an error instead of the
1410
                if file_id is None:
1411
                    raise errors.BzrCommandError(
1412
                        "Path does not have any revision history: %s" %
1413
                        location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1414
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1415
            # local dir only
1416
            # 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.
1417
            if revision is not None \
1418
                    and len(revision) > 0 and revision[0].get_branch():
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1419
                location = revision[0].get_branch()
1420
            else:
1421
                location = '.'
1422
            dir, relpath = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1423
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1424
1425
        if revision is None:
1426
            rev1 = None
1427
            rev2 = None
1428
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1429
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1430
        elif len(revision) == 2:
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1431
            if revision[1].get_branch() != revision[0].get_branch():
1907.4.4 by Matthieu Moy
Explain the error messages in the code.
1432
                # b is taken from revision[0].get_branch(), and
1433
                # show_log will use its revision_history. Having
1434
                # 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
1435
                raise errors.BzrCommandError(
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1436
                    "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
1437
            if revision[0].spec is None:
1438
                # missing begin-range means first revision
1439
                rev1 = 1
1440
            else:
1441
                rev1 = revision[0].in_history(b).revno
1442
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
1443
            if revision[1].spec is None:
1444
                # missing end-range means last known revision
1445
                rev2 = b.revno()
1446
            else:
1447
                rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1448
        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
1449
            raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1450
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
1451
        # By this point, the revision numbers are converted to the +ve
1452
        # form if they were supplied in the -ve form, so we can do
1453
        # this comparison in relative safety
1454
        if rev1 > rev2:
1455
            (rev2, rev1) = (rev1, rev2)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1456
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1457
        if (log_format is None):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1458
            default = b.get_config().log_format()
1459
            log_format = get_log_format(long=long, short=short, line=line, 
1460
                                        default=default)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1461
        lf = log_formatter(log_format,
1462
                           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()
1463
                           to_file=self.outf,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1464
                           show_timezone=timezone)
1465
1466
        show_log(b,
1467
                 lf,
1468
                 file_id,
1469
                 verbose=verbose,
1470
                 direction=direction,
1471
                 start_revision=rev1,
1472
                 end_revision=rev2,
1473
                 search=message)
1474
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1475
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1476
def get_log_format(long=False, short=False, line=False, default='long'):
1477
    log_format = default
1478
    if long:
1479
        log_format = 'long'
1480
    if short:
1481
        log_format = 'short'
1482
    if line:
1483
        log_format = 'line'
1484
    return log_format
1485
1486
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1487
class cmd_touching_revisions(Command):
1488
    """Return revision-ids which affected a particular file.
1489
1685.1.80 by Wouter van Heyst
more code cleanup
1490
    A more user-friendly interface is "bzr log FILE".
1491
    """
1492
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1493
    hidden = True
1494
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1495
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1496
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1497
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1498
        tree, relpath = WorkingTree.open_containing(filename)
1499
        b = tree.branch
1500
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1501
        file_id = inv.path2id(relpath)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1502
        for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1503
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1504
1505
1506
class cmd_ls(Command):
1507
    """List files in a tree.
1508
    """
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1509
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1510
    takes_args = ['path?']
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1511
    # TODO: Take a revision or remote path and list that tree instead.
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1512
    takes_options = ['verbose', 'revision',
1513
                     Option('non-recursive',
1514
                            help='don\'t recurse into sub-directories'),
1515
                     Option('from-root',
1516
                            help='Print all paths from the root of the branch.'),
1517
                     Option('unknown', help='Print unknown files'),
1518
                     Option('versioned', help='Print versioned files'),
1519
                     Option('ignored', help='Print ignored files'),
1520
1521
                     Option('null', help='Null separate the files'),
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1522
                     'kind', 'show-ids'
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1523
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1524
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1525
    def run(self, revision=None, verbose=False, 
1526
            non_recursive=False, from_root=False,
1527
            unknown=False, versioned=False, ignored=False,
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1528
            null=False, kind=None, show_ids=False, path=None):
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1529
1530
        if kind and kind not in ('file', 'directory', 'symlink'):
1531
            raise errors.BzrCommandError('invalid kind specified')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1532
1533
        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
1534
            raise errors.BzrCommandError('Cannot set both --verbose and --null')
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1535
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1536
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1537
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1538
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1539
        if path is None:
1540
            fs_path = '.'
1541
            prefix = ''
1542
        else:
1543
            if from_root:
1544
                raise errors.BzrCommandError('cannot specify both --from-root'
1545
                                             ' and PATH')
1546
            fs_path = path
1547
            prefix = path
2215.3.3 by Aaron Bentley
Get ls working on branches
1548
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1549
            fs_path)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1550
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1551
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1552
        elif relpath:
1553
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1554
        if revision is not None:
2215.3.3 by Aaron Bentley
Get ls working on branches
1555
            tree = branch.repository.revision_tree(
1556
                revision[0].in_history(branch).rev_id)
1557
        elif tree is None:
1558
            tree = branch.basis_tree()
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1559
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1560
        for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1561
            if fp.startswith(relpath):
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1562
                fp = osutils.pathjoin(prefix, fp[len(relpath):])
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1563
                if non_recursive and '/' in fp:
1564
                    continue
1565
                if not all and not selection[fc]:
1566
                    continue
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1567
                if kind is not None and fkind != kind:
1568
                    continue
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1569
                if verbose:
1570
                    kindch = entry.kind_character()
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1571
                    outstring = '%-8s %s%s' % (fc, fp, kindch)
1572
                    if show_ids and fid is not None:
1573
                        outstring = "%-50s %s" % (outstring, fid)
1574
                    self.outf.write(outstring + '\n')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1575
                elif null:
1685.1.80 by Wouter van Heyst
more code cleanup
1576
                    self.outf.write(fp + '\0')
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1577
                    if show_ids:
1578
                        if fid is not None:
1579
                            self.outf.write(fid)
1580
                        self.outf.write('\0')
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
1581
                    self.outf.flush()
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1582
                else:
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1583
                    if fid is not None:
1584
                        my_id = fid
1585
                    else:
1586
                        my_id = ''
1587
                    if show_ids:
1588
                        self.outf.write('%-50s %s\n' % (fp, my_id))
1589
                    else:
1590
                        self.outf.write(fp + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1591
1592
1593
class cmd_unknowns(Command):
1594
    """List unknown files."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1595
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1596
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1597
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1598
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1599
1600
1601
class cmd_ignore(Command):
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1602
    """Ignore specified files or patterns.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1603
1604
    To remove patterns from the ignore list, edit the .bzrignore file.
1605
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1606
    Trailing slashes on patterns are ignored. 
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1607
    If the pattern contains a slash or is a regular expression, it is compared 
1608
    to the whole path from the branch root.  Otherwise, it is compared to only
1609
    the last component of the path.  To match a file only in the root 
1610
    directory, prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1611
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1612
    Ignore patterns specifying absolute paths are not allowed.
1613
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1614
    Ignore patterns may include globbing wildcards such as:
1615
      ? - Matches any single character except '/'
1616
      * - Matches 0 or more characters except '/'
1617
      /**/ - Matches 0 or more directories in a path
1618
      [a-z] - Matches a single character from within a group of characters
1619
 
1620
    Ignore patterns may also be Python regular expressions.  
1621
    Regular expression ignore patterns are identified by a 'RE:' prefix 
1622
    followed by the regular expression.  Regular expression ignore patterns
1623
    may not include named or numbered groups.
1624
1625
    Note: ignore patterns containing shell wildcards must be quoted from 
1626
    the shell on Unix.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1627
1628
    examples:
1629
        bzr ignore ./Makefile
1630
        bzr ignore '*.class'
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1631
        bzr ignore 'lib/**/*.o'
1632
        bzr ignore 'RE:lib/.*\.o'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1633
    """
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1634
    takes_args = ['name_pattern*']
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1635
    takes_options = [
1636
                     Option('old-default-rules',
1637
                            help='Out the ignore rules bzr < 0.9 always used.')
1638
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1639
    
2063.5.2 by wang
Don't use mutable values as default argument definitions.
1640
    def run(self, name_pattern_list=None, old_default_rules=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1641
        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.
1642
        if old_default_rules is not None:
1643
            # 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.
1644
            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.
1645
                print pattern
1646
            return
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1647
        if not name_pattern_list:
2063.5.5 by wang
resolve a conflict
1648
            raise errors.BzrCommandError("ignore requires at least one "
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
1649
                                  "NAME_PATTERN or --old-default-rules")
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1650
        for name_pattern in name_pattern_list:
1651
            if name_pattern[0] == '/':
1652
                raise errors.BzrCommandError(
1653
                    "NAME_PATTERN should not be an absolute path")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1654
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1655
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1656
        if os.path.exists(ifn):
1657
            f = open(ifn, 'rt')
1658
            try:
1659
                igns = f.read().decode('utf-8')
1660
            finally:
1661
                f.close()
1662
        else:
1663
            igns = ''
1664
1665
        # TODO: If the file already uses crlf-style termination, maybe
1666
        # we should use that for the newly added lines?
1667
1668
        if igns and igns[-1] != '\n':
1669
            igns += '\n'
2063.5.3 by wang
Change error message. Use spaces instead of tabs.
1670
        for name_pattern in name_pattern_list:
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1671
            igns += name_pattern.rstrip('/') + '\n'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1672
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
1673
        f = AtomicFile(ifn, 'wb')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1674
        try:
1675
            f.write(igns.encode('utf-8'))
1676
            f.commit()
1677
        finally:
1678
            f.close()
1679
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1680
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1681
        if inv.path2id('.bzrignore'):
1682
            mutter('.bzrignore is already versioned')
1683
        else:
1684
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1685
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1686
1687
1688
class cmd_ignored(Command):
1689
    """List ignored files and the patterns that matched them.
1690
1691
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1692
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1693
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1694
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1695
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1696
            if file_class != 'I':
1697
                continue
1698
            ## XXX: Slightly inefficient since this was already calculated
1699
            pat = tree.is_ignored(path)
1700
            print '%-50s %s' % (path, pat)
1701
1702
1703
class cmd_lookup_revision(Command):
1704
    """Lookup the revision-id from a revision-number
1705
1706
    example:
1707
        bzr lookup-revision 33
1708
    """
1709
    hidden = True
1710
    takes_args = ['revno']
1711
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1712
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1713
    def run(self, revno):
1714
        try:
1715
            revno = int(revno)
1716
        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
1717
            raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1718
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1719
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1720
1721
1722
class cmd_export(Command):
1723
    """Export past revision to destination directory.
1724
1725
    If no revision is specified this exports the last committed revision.
1726
1727
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1728
    given, try to find the format with the extension. If no extension
1729
    is found exports to a directory (equivalent to --format=dir).
1730
1731
    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
1732
    is given, the top directory will be the root name of the file.
1733
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1734
    If branch is omitted then the branch containing the CWD will be used.
1735
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1736
    Note: export of tree with non-ascii filenames to zip is not supported.
1737
1551.3.11 by Aaron Bentley
Merge from Robert
1738
     Supported formats       Autodetected by extension
1739
     -----------------       -------------------------
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1740
         dir                            -
1741
         tar                          .tar
1742
         tbz2                    .tar.bz2, .tbz2
1743
         tgz                      .tar.gz, .tgz
1744
         zip                          .zip
1745
    """
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1746
    takes_args = ['dest', 'branch?']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1747
    takes_options = ['revision', 'format', 'root']
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1748
    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.
1749
        from bzrlib.export import export
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1750
1751
        if branch is None:
1752
            tree = WorkingTree.open_containing(u'.')[0]
1753
            b = tree.branch
1754
        else:
1755
            b = Branch.open(branch)
1756
            
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1757
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1758
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1759
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1760
        else:
1761
            if len(revision) != 1:
2067.3.3 by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes
1762
                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.
1763
            rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1764
        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.
1765
        try:
1766
            export(t, dest, format, root)
1767
        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
1768
            raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1769
1770
1771
class cmd_cat(Command):
1772
    """Write a file's text from a previous revision."""
1773
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1774
    takes_options = ['revision', 'name-from-revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1775
    takes_args = ['filename']
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
1776
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1777
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1778
    @display_command
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1779
    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
1780
        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
1781
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
1782
                                        " one number")
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1783
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1784
        tree = None
1907.4.5 by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
1785
        try:
1786
            tree, relpath = WorkingTree.open_containing(filename)
1787
            b = tree.branch
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1788
        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.
1789
            pass
1790
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1791
        if revision is not None and revision[0].get_branch() is not None:
1792
            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.
1793
        if tree is None:
1794
            b, relpath = Branch.open_containing(filename)
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1795
            tree = b.basis_tree()
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1796
        if revision is None:
1797
            revision_id = b.last_revision()
1798
        else:
1799
            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
1800
1801
        cur_file_id = tree.path2id(relpath)
1802
        rev_tree = b.repository.revision_tree(revision_id)
1803
        old_file_id = rev_tree.path2id(relpath)
1804
        
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1805
        if name_from_revision:
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
1806
            if old_file_id is None:
1807
                raise errors.BzrCommandError("%r is not present in revision %s"
1808
                                                % (filename, revision_id))
1809
            else:
1810
                rev_tree.print_file(old_file_id)
2073.2.2 by wang
Make the decision tree a little clearer. Add more tests for exceptions.
1811
        elif cur_file_id is not None:
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1812
            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
1813
        elif old_file_id is not None:
1814
            rev_tree.print_file(old_file_id)
1815
        else:
1816
            raise errors.BzrCommandError("%r is not present in revision %s" %
1817
                                         (filename, revision_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1818
1819
1820
class cmd_local_time_offset(Command):
1821
    """Show the offset in seconds from GMT to local time."""
1822
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1823
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1824
    def run(self):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1825
        print osutils.local_time_offset()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1826
1827
1828
1829
class cmd_commit(Command):
1830
    """Commit changes into a new revision.
1831
    
1832
    If no arguments are given, the entire tree is committed.
1833
1834
    If selected files are specified, only changes to those files are
1835
    committed.  If a directory is specified then the directory and everything 
1836
    within it is committed.
1837
1838
    A selected-file commit may fail in some cases where the committed
1839
    tree would be invalid, such as trying to commit a file in a
1840
    newly-added directory that is not itself committed.
1841
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1842
    # TODO: Run hooks on tree to-be-committed, and after commit.
1843
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1844
    # TODO: Strict commit that fails if there are deleted files.
1845
    #       (what does "deleted files" mean ??)
1846
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1847
    # TODO: Give better message for -s, --summary, used by tla people
1848
1849
    # XXX: verbose currently does nothing
1850
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1851
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1852
    takes_options = ['message', 'verbose', 
1853
                     Option('unchanged',
1854
                            help='commit even if nothing has changed'),
1855
                     Option('file', type=str, 
2193.3.3 by Martin Pool
Fix up other short options
1856
                            short_name='F',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1857
                            argname='msgfile',
1858
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1859
                     Option('strict',
1860
                            help="refuse to commit if there are unknown "
1861
                            "files in the working tree."),
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1862
                     Option('local',
1863
                            help="perform a local only commit in a bound "
1864
                                 "branch. Such commits are not pushed to "
1865
                                 "the master branch until a normal commit "
1866
                                 "is performed."
1867
                            ),
1185.16.43 by Martin Pool
- clean up handling of option objects
1868
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1869
    aliases = ['ci', 'checkin']
1870
1871
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1872
            unchanged=False, strict=False, local=False):
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1873
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1874
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1875
                StrictCommitFailed)
1185.33.76 by Martin Pool
Fix import error.
1876
        from bzrlib.msgeditor import edit_commit_message, \
1877
                make_commit_message_template
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1878
1185.33.77 by Martin Pool
doc
1879
        # TODO: Need a blackbox test for invoking the external editor; may be
1880
        # slightly problematic to run this cross-platform.
1881
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1882
        # TODO: do more checks that the commit will succeed before 
1883
        # 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
1884
        tree, selected_list = tree_files(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
1885
        if selected_list == ['']:
1886
            # workaround - commit of root of tree should be exactly the same
1887
            # as just default commit in that tree, and succeed even though
1888
            # selected-file merge commit is not done yet
1889
            selected_list = []
1890
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1891
        if local and not tree.branch.get_bound_location():
1892
            raise errors.LocalRequiresBoundBranch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1893
2149.1.4 by Aaron Bentley
Add additional test that callback is called with a Commit instance
1894
        def get_message(commit_obj):
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
1895
            """Callback to get commit message"""
1896
            my_message = message
1897
            if my_message is None and not file:
1898
                template = make_commit_message_template(tree, selected_list)
1899
                my_message = edit_commit_message(template)
1900
                if my_message is None:
1901
                    raise errors.BzrCommandError("please specify a commit"
1902
                        " message with either --message or --file")
1903
            elif my_message and file:
1904
                raise errors.BzrCommandError(
1905
                    "please specify either --message or --file")
1906
            if file:
1907
                my_message = codecs.open(file, 'rt', 
1908
                                         bzrlib.user_encoding).read()
1909
            if my_message == "":
1910
                raise errors.BzrCommandError("empty commit message specified")
1911
            return my_message
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1912
        
1913
        if verbose:
1914
            reporter = ReportCommitToLog()
1915
        else:
1916
            reporter = NullCommitReporter()
2089.1.1 by wang
If a commit fails, the commit message is stored in a file at the root of
1917
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1918
        try:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
1919
            tree.commit(message_callback=get_message,
1920
                        specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1921
                        allow_pointless=unchanged, strict=strict, local=local,
1922
                        reporter=reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1923
        except PointlessCommit:
1924
            # FIXME: This should really happen before the file is read in;
1925
            # perhaps prepare the commit; get the message; then actually commit
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
1926
            raise errors.BzrCommandError("no changes to commit."
1927
                              " use --unchanged to commit anyhow")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1928
        except ConflictsInTree:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
1929
            raise errors.BzrCommandError('Conflicts detected in working '
1930
                'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'
1931
                ' resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1932
        except StrictCommitFailed:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
1933
            raise errors.BzrCommandError("Commit refused because there are"
1934
                              " 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
1935
        except errors.BoundBranchOutOfDate, e:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
1936
            raise errors.BzrCommandError(str(e) + "\n"
1937
            'To commit to master branch, run update and then commit.\n'
1938
            'You can also pass --local to commit to continue working '
1939
            'disconnected.')
2111.1.1 by Martin Pool
Fix #32054, save message if commit fails.
1940
1941
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1942
class cmd_check(Command):
1943
    """Validate consistency of branch history.
1944
1945
    This command checks various invariants about the branch storage to
1946
    detect data corruption or bzr bugs.
1947
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1948
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
1949
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1950
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1951
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1952
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1953
        if branch is None:
1954
            tree = WorkingTree.open_containing()[0]
1955
            branch = tree.branch
1956
        else:
1957
            branch = Branch.open(branch)
1958
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1959
1960
1961
class cmd_upgrade(Command):
1962
    """Upgrade branch storage to current format.
1963
1964
    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.
1965
    this command. When the default format has changed you may also be warned
1966
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1967
    """
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1968
    takes_args = ['url?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1969
    takes_options = [
1970
                     Option('format', 
1971
                            help='Upgrade to a specific format. Current formats'
1972
                                 ' are: default, knit, metaweave and weave.'
1973
                                 ' Default is knit; metaweave and weave are'
1974
                                 ' deprecated',
1975
                            type=get_format_type),
1976
                    ]
1977
1978
1979
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1980
        from bzrlib.upgrade import upgrade
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1981
        if format is None:
1982
            format = get_format_type('default')
1983
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1984
1985
1986
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
1987
    """Show or set bzr user id.
1988
    
1989
    examples:
1990
        bzr whoami --email
1991
        bzr whoami 'Frank Chu <fchu@example.com>'
1992
    """
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1993
    takes_options = [ Option('email',
1994
                             help='display email address only'),
1995
                      Option('branch',
1996
                             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
1997
                                  'globally'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1998
                    ]
1999
    takes_args = ['name?']
2000
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2001
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2002
    @display_command
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2003
    def run(self, email=False, branch=False, name=None):
2004
        if name is None:
2005
            # use branch if we're inside one; otherwise global config
2006
            try:
1816.2.10 by Robey Pointer
code style changes
2007
                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
2008
            except errors.NotBranchError:
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2009
                c = config.GlobalConfig()
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2010
            if email:
1816.2.10 by Robey Pointer
code style changes
2011
                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
2012
            else:
1816.2.10 by Robey Pointer
code style changes
2013
                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
2014
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2015
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
2016
        # display a warning if an email address isn't included in the given name.
2017
        try:
2018
            config.extract_email_address(name)
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
2019
        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
2020
            warning('"%s" does not seem to contain an email address.  '
2021
                    '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
2022
        
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2023
        # use global config unless --branch given
2024
        if branch:
1816.2.10 by Robey Pointer
code style changes
2025
            c = Branch.open_containing('.')[0].get_config()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2026
        else:
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2027
            c = config.GlobalConfig()
2028
        c.set_user_option('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2029
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.
2030
1185.35.14 by Aaron Bentley
Implemented nick command
2031
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
2032
    """Print or set the branch nickname.  
2033
1185.35.14 by Aaron Bentley
Implemented nick command
2034
    If unset, the tree root directory name is used as the nickname
2035
    To print the current nickname, execute with no argument.  
2036
    """
2037
    takes_args = ['nickname?']
2038
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2039
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
2040
        if nickname is None:
2041
            self.printme(branch)
2042
        else:
2043
            branch.nick = nickname
2044
2045
    @display_command
2046
    def printme(self, branch):
2047
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2048
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.
2049
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2050
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2051
    """Run internal test suite.
2052
    
2213.2.1 by Martin Pool
Add selftest --first flag
2053
    This creates temporary test directories in the working directory, but not
2054
    existing data is affected.  These directories are deleted if the tests
2055
    pass, or left behind to help in debugging if they fail and --keep-output
2056
    is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2057
    
2213.2.1 by Martin Pool
Add selftest --first flag
2058
    If arguments are given, they are regular expressions that say which tests
2059
    should run.  Tests matching any expression are run, and other tests are
2060
    not run.
2061
2062
    Alternatively if --first is given, matching tests are run first and then
2063
    all other tests are run.  This is useful if you have been working in a
2064
    particular area, but want to make sure nothing else was broken.
1552 by Martin Pool
Improved help text for bzr selftest
2065
2066
    If the global option '--no-plugins' is given, plugins are not loaded
2067
    before running the selftests.  This has two effects: features provided or
2068
    modified by plugins will not be tested, and tests provided by plugins will
2069
    not be run.
2070
2213.2.1 by Martin Pool
Add selftest --first flag
2071
    examples::
1552 by Martin Pool
Improved help text for bzr selftest
2072
        bzr selftest ignore
2213.2.1 by Martin Pool
Add selftest --first flag
2073
            run only tests relating to 'ignore'
1552 by Martin Pool
Improved help text for bzr selftest
2074
        bzr --no-plugins selftest -v
2213.2.1 by Martin Pool
Add selftest --first flag
2075
            disable plugins and list tests as they're run
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2076
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2077
    # 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.
2078
2079
    # NB: this is used from the class without creating an instance, which is
2080
    # why it does not have a self parameter.
2081
    def get_transport_type(typestring):
2082
        """Parse and return a transport specifier."""
2083
        if typestring == "sftp":
2084
            from bzrlib.transport.sftp import SFTPAbsoluteServer
2085
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
2086
        if typestring == "memory":
2087
            from bzrlib.transport.memory import MemoryServer
2088
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
2089
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
2090
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
2091
            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.
2092
        msg = "No known transport type %s. Supported types are: sftp\n" %\
2093
            (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
2094
        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.
2095
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2096
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
2097
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
2098
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2099
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
2100
                     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.
2101
                            help='keep output directories when tests fail'),
2102
                     Option('transport', 
2103
                            help='Use a different transport by default '
2104
                                 'throughout the test suite.',
2105
                            type=get_transport_type),
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
2106
                     Option('benchmark', help='run the bzr bencharks.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2107
                     Option('lsprof-timed',
2108
                            help='generate lsprof output for benchmarked'
2109
                                 ' sections of code.'),
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2110
                     Option('cache-dir', type=str,
2111
                            help='a directory to cache intermediate'
2112
                                 ' benchmark steps'),
2172.4.3 by Alexander Belchenko
Change name of option to '--clean-output' and provide tests
2113
                     Option('clean-output',
2172.4.2 by Alexander Belchenko
Update NEWS and help for '--clean' option
2114
                            help='clean temporary tests directories'
2115
                                 ' without running tests'),
2213.2.1 by Martin Pool
Add selftest --first flag
2116
                     Option('first',
2117
                            help='run all tests, but run specified tests first',
2118
                            )
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2119
                     ]
2204.3.4 by Alexander Belchenko
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback
2120
    encoding_type = 'replace'
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2121
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2122
    def run(self, testspecs_list=None, verbose=None, one=False,
2123
            keep_output=False, transport=None, benchmark=None,
2213.2.1 by Martin Pool
Add selftest --first flag
2124
            lsprof_timed=None, cache_dir=None, clean_output=False,
2125
            first=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2126
        import bzrlib.ui
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
2127
        from bzrlib.tests import selftest
2128
        import bzrlib.benchmarks as benchmarks
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
2129
        from bzrlib.benchmarks import tree_creator
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2130
2172.4.3 by Alexander Belchenko
Change name of option to '--clean-output' and provide tests
2131
        if clean_output:
2132
            from bzrlib.tests import clean_selftest_output
2133
            clean_selftest_output()
2172.4.1 by Alexander Belchenko
'bzr selftest --clean' allows easily clean temporary tests directories
2134
            return 0
2135
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2136
        if cache_dir is not None:
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
2137
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2138
        print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
2139
        print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2140
        print
2095.4.1 by Martin Pool
Better progress bars during tests
2141
        if testspecs_list is not None:
2142
            pattern = '|'.join(testspecs_list)
2143
        else:
2144
            pattern = ".*"
2145
        if benchmark:
2146
            test_suite_factory = benchmarks.test_suite
2147
            if verbose is None:
2148
                verbose = True
2149
            # TODO: should possibly lock the history file...
2197.1.1 by Martin Pool
Use line buffering to write .perf_history
2150
            benchfile = open(".perf_history", "at", buffering=1)
2095.4.1 by Martin Pool
Better progress bars during tests
2151
        else:
2152
            test_suite_factory = None
2153
            if verbose is None:
2154
                verbose = False
2155
            benchfile = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2156
        try:
2095.4.1 by Martin Pool
Better progress bars during tests
2157
            result = selftest(verbose=verbose, 
2158
                              pattern=pattern,
2159
                              stop_on_failure=one, 
2160
                              keep_output=keep_output,
2161
                              transport=transport,
2162
                              test_suite_factory=test_suite_factory,
2163
                              lsprof_timed=lsprof_timed,
2213.2.1 by Martin Pool
Add selftest --first flag
2164
                              bench_history=benchfile,
2165
                              matching_tests_first=first,
2166
                              )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2167
        finally:
2095.4.1 by Martin Pool
Better progress bars during tests
2168
            if benchfile is not None:
2169
                benchfile.close()
2170
        if result:
2171
            info('tests passed')
2172
        else:
2173
            info('tests failed')
2174
        return int(not result)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2175
2176
2177
class cmd_version(Command):
2178
    """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2179
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2180
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2181
    def run(self):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
2182
        from bzrlib.version import show_version
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2183
        show_version()
2184
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2185
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2186
class cmd_rocks(Command):
2187
    """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2188
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2189
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2190
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2191
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2192
    def run(self):
2193
        print "it sure does!"
2194
2195
2196
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.
2197
    """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2198
    # TODO: Options to specify revisions on either side, as if
2199
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2200
    takes_args = ['branch', 'other']
2201
    hidden = True
2202
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2203
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2204
    def run(self, branch, other):
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
2205
        from bzrlib.revision import MultipleRevisionSources
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2206
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2207
        branch1 = Branch.open_containing(branch)[0]
2208
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2209
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2210
        history_1 = branch1.revision_history()
2211
        history_2 = branch2.revision_history()
2212
1241 by Martin Pool
- rename last_patch to last_revision
2213
        last1 = branch1.last_revision()
2214
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2215
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
2216
        source = MultipleRevisionSources(branch1.repository, 
2217
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2218
        
2219
        base_rev_id = common_ancestor(last1, last2, source)
2220
2221
        print 'merge base is revision %s' % base_rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2222
2223
2224
class cmd_merge(Command):
2225
    """Perform a three-way merge.
2226
    
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2227
    The branch is the branch you will merge from.  By default, it will merge
2228
    the latest revision.  If you specify a revision, that revision will be
2229
    merged.  If you specify two revisions, the first will be used as a BASE,
2230
    and the second one as OTHER.  Revision numbers are always relative to the
2231
    specified branch.
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2232
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2233
    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
2234
    branch, automatically determining an appropriate base.  If this
2235
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2236
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
2237
    Merge will do its best to combine the changes in two branches, but there
2238
    are some kinds of problems only a human can fix.  When it encounters those,
2239
    it will mark a conflict.  A conflict means that you need to fix something,
2240
    before you should commit.
2241
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2242
    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
2243
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2244
    If there is no default branch set, the first merge will set it. After
2245
    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.
2246
    default, use --remember. The value will only be saved if the remote
2247
    location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
2248
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2249
    Examples:
2250
2251
    To merge the latest revision from bzr.dev
2252
    bzr merge ../bzr.dev
2253
2254
    To merge changes up to and including revision 82 from bzr.dev
2255
    bzr merge -r 82 ../bzr.dev
2256
2257
    To merge the changes introduced by 82, without previous changes:
2258
    bzr merge -r 81..82 ../bzr.dev
2259
    
2260
    merge refuses to run if there are any uncommitted changes, unless
2261
    --force is given.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2262
2263
    The following merge types are available:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2264
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2265
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
2266
    takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1185.18.1 by Aaron Bentley
Added --show-base to merge
2267
                     Option('show-base', help="Show base revision text in "
2199.1.2 by John Arbash Meinel
Update documentation as per Martin's suggestion.
2268
                            "conflicts"),
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2269
                     Option('uncommitted', help='Apply uncommitted changes'
2149.2.1 by Jan Hudec
Option --pull for merge command.
2270
                            ' from a working copy, instead of branch changes'),
2199.1.2 by John Arbash Meinel
Update documentation as per Martin's suggestion.
2271
                     Option('pull', help='If the destination is already'
2272
                             ' completely merged into the source, pull from the'
2273
                             ' source rather than merging. When this happens,'
2274
                             ' you do not need to commit the result.'),
2149.2.1 by Jan Hudec
Option --pull for merge command.
2275
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2276
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2277
    def help(self):
2278
        from inspect import getdoc
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2279
        return getdoc(self) + '\n' + _mod_merge.merge_type_help()
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2280
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2281
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2282
            show_base=False, reprocess=False, remember=False, 
2149.2.1 by Jan Hudec
Option --pull for merge command.
2283
            uncommitted=False, pull=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2284
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2285
            merge_type = _mod_merge.Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
2286
2287
        tree = WorkingTree.open_containing(u'.')[0]
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
2288
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2289
        if branch is not None:
2290
            try:
1773.4.3 by Martin Pool
[merge] bzr.dev
2291
                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
2292
            except errors.NotABundle:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2293
                pass # Continue on considering this url a Branch
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2294
            else:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2295
                conflicts = merge_bundle(reader, tree, not force, merge_type,
2296
                                            reprocess, show_base)
2297
                if conflicts == 0:
2298
                    return 0
2299
                else:
2300
                    return 1
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2301
1907.4.10 by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path.
2302
        if revision is None \
2303
                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
2304
            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
2305
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2306
        if revision is None or len(revision) < 1:
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2307
            if uncommitted:
2308
                base = [branch, -1]
2309
                other = [branch, None]
2310
            else:
2311
                base = [None, None]
2312
                other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
2313
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2314
        else:
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2315
            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
2316
                raise errors.BzrCommandError('Cannot use --uncommitted and'
2317
                                             ' --revision at the same time.')
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
2318
            branch = revision[0].get_branch() or branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2319
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
2320
                base = [None, None]
1907.4.11 by Matthieu Moy
Canceled an incorrect "path = None".
2321
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
2322
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2323
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2324
            else:
2325
                assert len(revision) == 2
2326
                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
2327
                    raise errors.BzrCommandError(
1907.4.10 by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path.
2328
                        "Merge doesn't permit empty revision specifier.")
1907.4.12 by Matthieu Moy
Made merge work with two revisions in different branches.
2329
                base_branch, path = Branch.open_containing(branch)
2330
                branch1 = revision[1].get_branch() or branch
2331
                other_branch, path1 = Branch.open_containing(branch1)
2332
                if revision[0].get_branch() is not None:
2333
                    # then path was obtained from it, and is None.
2334
                    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
2335
1907.4.12 by Matthieu Moy
Made merge work with two revisions in different branches.
2336
                base = [branch, revision[0].in_history(base_branch).revno]
2337
                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
2338
2339
        if tree.branch.get_parent() is None or remember:
2340
            tree.branch.set_parent(other_branch.base)
2341
1645.1.1 by Aaron Bentley
Implement single-file merge
2342
        if path != "":
2343
            interesting_files = [path]
2344
        else:
2345
            interesting_files = None
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2346
        pb = ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2347
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2348
            try:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
2349
                conflict_count = _merge_helper(
2350
                    other, base, check_clean=(not force),
2351
                    merge_type=merge_type,
2352
                    reprocess=reprocess,
2353
                    show_base=show_base,
2149.2.1 by Jan Hudec
Option --pull for merge command.
2354
                    pull=pull,
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
2355
                    pb=pb, file_list=interesting_files)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2356
            finally:
2357
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
2358
            if conflict_count != 0:
2359
                return 1
2360
            else:
2361
                return 0
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2362
        except errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
2363
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2364
                 "candidates are:\n  "
2365
                 + "\n  ".join(e.bases)
2366
                 + "\n"
2367
                 "please specify an explicit base with -r,\n"
2368
                 "and (if you want) report this to the bzr developers\n")
2369
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2370
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2371
    # TODO: move up to common parent; this isn't merge-specific anymore. 
2372
    def _get_remembered_parent(self, tree, supplied_location, verb_string):
2373
        """Use tree.branch's parent if none was supplied.
2374
2375
        Report if the remembered location was used.
2376
        """
2377
        if supplied_location is not None:
2378
            return supplied_location
2379
        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
2380
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2381
        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
2382
            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
2383
        display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2384
        self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2385
        return stored_location
2386
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2387
1185.35.4 by Aaron Bentley
Implemented remerge
2388
class cmd_remerge(Command):
2389
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2390
2391
    Use this if you want to try a different merge technique while resolving
2392
    conflicts.  Some merge techniques are better than others, and remerge 
2393
    lets you try different ones on different files.
2394
2395
    The options for remerge have the same meaning and defaults as the ones for
2396
    merge.  The difference is that remerge can (only) be run when there is a
2397
    pending merge, and it lets you specify particular files.
2398
2399
    Examples:
2400
    $ bzr remerge --show-base
2401
        Re-do the merge of all conflicted files, and show the base text in
2402
        conflict regions, in addition to the usual THIS and OTHER texts.
2403
2404
    $ bzr remerge --merge-type weave --reprocess foobar
2405
        Re-do the merge of "foobar", using the weave merge algorithm, with
2406
        additional processing to reduce the size of conflict regions.
2407
    
2408
    The following merge types are available:"""
1185.35.4 by Aaron Bentley
Implemented remerge
2409
    takes_args = ['file*']
2410
    takes_options = ['merge-type', 'reprocess',
2411
                     Option('show-base', help="Show base revision text in "
2412
                            "conflicts")]
2413
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2414
    def help(self):
2415
        from inspect import getdoc
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2416
        return getdoc(self) + '\n' + _mod_merge.merge_type_help()
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2417
1185.35.4 by Aaron Bentley
Implemented remerge
2418
    def run(self, file_list=None, merge_type=None, show_base=False,
2419
            reprocess=False):
2420
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2421
            merge_type = _mod_merge.Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2422
        tree, file_list = tree_files(file_list)
2423
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2424
        try:
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2425
            parents = tree.get_parent_ids()
2426
            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
2427
                raise errors.BzrCommandError("Sorry, remerge only works after normal"
2428
                                             " merges.  Not cherrypicking or"
2429
                                             " multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2430
            repository = tree.branch.repository
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2431
            base_revision = common_ancestor(parents[0],
2432
                                            parents[1], repository)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2433
            base_tree = repository.revision_tree(base_revision)
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2434
            other_tree = repository.revision_tree(parents[1])
1185.35.4 by Aaron Bentley
Implemented remerge
2435
            interesting_ids = None
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2436
            new_conflicts = []
2437
            conflicts = tree.conflicts()
1185.35.4 by Aaron Bentley
Implemented remerge
2438
            if file_list is not None:
2439
                interesting_ids = set()
2440
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2441
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2442
                    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
2443
                        raise errors.NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2444
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2445
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2446
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2447
                    
1508.1.15 by Robert Collins
Merge from mpool.
2448
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2449
                        interesting_ids.add(ie.file_id)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2450
                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
2451
            else:
2080.2.3 by John Arbash Meinel
remerge only supports text or content conflicts
2452
                # Remerge only supports resolving contents conflicts
2453
                allowed_conflicts = ('text conflict', 'contents conflict')
2454
                restore_files = [c.path for c in conflicts
2455
                                 if c.typestring in allowed_conflicts]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2456
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2457
            tree.set_conflicts(ConflictList(new_conflicts))
2080.2.1 by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
2458
            if file_list is not None:
1185.35.4 by Aaron Bentley
Implemented remerge
2459
                restore_files = file_list
2460
            for filename in restore_files:
2461
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2462
                    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
2463
                except errors.NotConflicted:
1185.35.4 by Aaron Bentley
Implemented remerge
2464
                    pass
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2465
            conflicts = _mod_merge.merge_inner(
2466
                                      tree.branch, other_tree, base_tree,
2467
                                      this_tree=tree,
2468
                                      interesting_ids=interesting_ids,
2469
                                      other_rev_id=parents[1],
2470
                                      merge_type=merge_type,
2471
                                      show_base=show_base,
2472
                                      reprocess=reprocess)
1185.35.4 by Aaron Bentley
Implemented remerge
2473
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2474
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2475
        if conflicts > 0:
2476
            return 1
2477
        else:
2478
            return 0
2479
2023.1.1 by ghigo
add topics help
2480
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2481
class cmd_revert(Command):
1551.8.27 by Aaron Bentley
Update docs again
2482
    """Revert files to a previous revision.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2483
1551.8.27 by Aaron Bentley
Update docs again
2484
    Giving a list of files will revert only those files.  Otherwise, all files
2485
    will be reverted.  If the revision is not specified with '--revision', the
2486
    last committed revision is used.
1551.8.26 by Aaron Bentley
Update revert help text
2487
2488
    To remove only some changes, without reverting to a prior version, use
2489
    merge instead.  For example, "merge . --r-2..-3" will remove the changes
2490
    introduced by -2, without affecting the changes introduced by -1.  Or
2491
    to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2492
    
2493
    By default, any files that have been manually changed will be backed up
2494
    first.  (Files changed only by merge are not backed up.)  Backup files have
1551.8.27 by Aaron Bentley
Update docs again
2495
    '.~#~' appended to their name, where # is a number.
2496
2497
    When you provide files, you can use their current pathname or the pathname
2498
    from the target revision.  So you can use revert to "undelete" a file by
2499
    name.  If you name a directory, all the contents of that directory will be
2500
    reverted.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2501
    """
2502
    takes_options = ['revision', 'no-backup']
2503
    takes_args = ['file*']
2504
    aliases = ['merge-revert']
2505
2506
    def run(self, revision=None, no_backup=False, file_list=None):
2507
        if file_list is not None:
2508
            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
2509
                raise errors.BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2510
        else:
2511
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2512
        
2513
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2514
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2515
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2516
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2517
        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
2518
            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.
2519
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2520
            rev_id = revision[0].in_history(tree.branch).rev_id
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2521
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2522
        try:
2523
            tree.revert(file_list, 
2524
                        tree.branch.repository.revision_tree(rev_id),
2525
                        not no_backup, pb)
2526
        finally:
2527
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2528
2529
2530
class cmd_assert_fail(Command):
2531
    """Test reporting of assertion failures"""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2532
    # intended just for use in testing
2533
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2534
    hidden = True
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2535
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2536
    def run(self):
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2537
        raise AssertionError("always fails")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2538
2539
2540
class cmd_help(Command):
2541
    """Show help on a command or other topic.
2542
2023.1.1 by ghigo
add topics help
2543
    For a list of all available commands, say 'bzr help commands'.
2544
    """
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
2545
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2546
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2547
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2548
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2549
    @display_command
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
2550
    def run(self, topic=None, long=False):
2023.1.1 by ghigo
add topics help
2551
        import bzrlib.help
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2552
        if topic is None and long:
2553
            topic = "commands"
2023.1.1 by ghigo
add topics help
2554
        bzrlib.help.help(topic)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2555
2556
2557
class cmd_shell_complete(Command):
2558
    """Show appropriate completions for context.
2559
2023.1.1 by ghigo
add topics help
2560
    For a list of all available commands, say 'bzr shell-complete'.
2561
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2562
    takes_args = ['context?']
2563
    aliases = ['s-c']
2564
    hidden = True
2565
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2566
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2567
    def run(self, context=None):
2568
        import shellcomplete
2569
        shellcomplete.shellcomplete(context)
2570
2571
1228 by Martin Pool
- add fetch command as builtin
2572
class cmd_fetch(Command):
2573
    """Copy in history from another branch but don't merge it.
2574
2023.1.1 by ghigo
add topics help
2575
    This is an internal method used for pull and merge.
2576
    """
1228 by Martin Pool
- add fetch command as builtin
2577
    hidden = True
2578
    takes_args = ['from_branch', 'to_branch']
2579
    def run(self, from_branch, to_branch):
2580
        from bzrlib.fetch import Fetcher
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2581
        from_b = Branch.open(from_branch)
2582
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2583
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2584
2585
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2586
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2587
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2588
2023.1.1 by ghigo
add topics help
2589
    OTHER_BRANCH may be local or remote.
2590
    """
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2591
    takes_args = ['other_branch?']
2592
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2593
                     Option('mine-only', 
2594
                            'Display changes in the local branch only'),
2595
                     Option('theirs-only', 
2596
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik Bågfors
cover the missing command with formatters as well
2597
                     'log-format',
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2598
                     'line',
2599
                     'long', 
2600
                     'short',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2601
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2602
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2603
                     ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2604
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2605
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2606
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2607
    def run(self, other_branch=None, reverse=False, mine_only=False,
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2608
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2609
            show_ids=False, verbose=False):
2610
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2611
        from bzrlib.log import log_formatter
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2612
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2613
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2614
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2615
            other_branch = parent
2616
            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
2617
                raise errors.BzrCommandError("No peer location known or specified.")
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2618
            print "Using last location: " + local_branch.get_parent()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2619
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2620
        if remote_branch.base == local_branch.base:
2621
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2622
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2623
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2624
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2625
            try:
2626
                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'.
2627
                if (log_format is None):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2628
                    default = local_branch.get_config().log_format()
2629
                    log_format = get_log_format(long=long, short=short, 
2630
                                                line=line, default=default)
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2631
                lf = log_formatter(log_format,
2632
                                   to_file=self.outf,
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2633
                                   show_ids=show_ids,
2634
                                   show_timezone='original')
2635
                if reverse is False:
2636
                    local_extra.reverse()
2637
                    remote_extra.reverse()
2638
                if local_extra and not theirs_only:
2639
                    print "You have %d extra revision(s):" % len(local_extra)
2640
                    for data in iter_log_data(local_extra, local_branch.repository,
2641
                                              verbose):
2642
                        lf.show(*data)
2643
                    printed_local = True
2644
                else:
2645
                    printed_local = False
2646
                if remote_extra and not mine_only:
2647
                    if printed_local is True:
2648
                        print "\n\n"
2649
                    print "You are missing %d revision(s):" % len(remote_extra)
2650
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2651
                                              verbose):
2652
                        lf.show(*data)
2653
                if not remote_extra and not local_extra:
2654
                    status_code = 0
2655
                    print "Branches are up to date."
2656
                else:
2657
                    status_code = 1
2658
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2659
                remote_branch.unlock()
2660
        finally:
2661
            local_branch.unlock()
2662
        if not status_code and parent is None and other_branch is not None:
2663
            local_branch.lock_write()
2664
            try:
2665
                # handle race conditions - a parent might be set while we run.
2666
                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
2667
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2668
            finally:
2669
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2670
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2671
2672
2673
class cmd_plugins(Command):
2674
    """List plugins"""
2675
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2676
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2677
    def run(self):
2678
        import bzrlib.plugin
2679
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2680
        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'.
2681
            if getattr(plugin, '__path__', None) is not None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2682
                print plugin.__path__[0]
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2683
            elif getattr(plugin, '__file__', None) is not None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2684
                print plugin.__file__
2685
            else:
1963.2.4 by Robey Pointer
remove usage of hasattr
2686
                print repr(plugin)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2687
                
2688
            d = getdoc(plugin)
2689
            if d:
2690
                print '\t', d.split('\n')[0]
2691
2692
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2693
class cmd_testament(Command):
2694
    """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
2695
    takes_options = ['revision', 
2696
                     Option('long', help='Produce long-format testament'), 
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2697
                     Option('strict', help='Produce a strict-format'
2698
                            ' testament')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2699
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2700
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2701
    def run(self, branch=u'.', revision=None, long=False, strict=False):
2702
        from bzrlib.testament import Testament, StrictTestament
2703
        if strict is True:
2704
            testament_class = StrictTestament
2705
        else:
2706
            testament_class = Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2707
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2708
        b.lock_read()
2709
        try:
2710
            if revision is None:
2711
                rev_id = b.last_revision()
2712
            else:
2713
                rev_id = revision[0].in_history(b).rev_id
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2714
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2715
            if long:
2716
                sys.stdout.writelines(t.as_text_lines())
2717
            else:
2718
                sys.stdout.write(t.as_short_text())
2719
        finally:
2720
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2721
2722
2723
class cmd_annotate(Command):
2724
    """Show the origin of each line in a file.
2725
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2726
    This prints out the given file with an annotation on the left side
2727
    indicating which revision, author and date introduced the change.
2728
2729
    If the origin is the same for a run of consecutive lines, it is 
2730
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2731
    """
2732
    # 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
2733
    # TODO: if the working copy is modified, show annotations on that 
2734
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
2735
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2736
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2737
    takes_options = [Option('all', help='show annotations on all lines'),
2738
                     Option('long', help='show date in annotations'),
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2739
                     'revision',
2740
                     'show-ids',
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2741
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2742
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2743
    @display_command
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2744
    def run(self, filename, all=False, long=False, revision=None,
2745
            show_ids=False):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2746
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2747
        tree, relpath = WorkingTree.open_containing(filename)
2748
        branch = tree.branch
2749
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2750
        try:
1694.2.6 by Martin Pool
[merge] bzr.dev
2751
            if revision is None:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2752
                revision_id = branch.last_revision()
1694.2.6 by Martin Pool
[merge] bzr.dev
2753
            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
2754
                raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
1694.2.6 by Martin Pool
[merge] bzr.dev
2755
            else:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2756
                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).
2757
            file_id = tree.inventory.path2id(relpath)
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2758
            tree = branch.repository.revision_tree(revision_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2759
            file_version = tree.inventory[file_id].revision
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2760
            annotate_file(branch, file_version, file_id, long, all, sys.stdout,
2761
                          show_ids=show_ids)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2762
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2763
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2764
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2765
2766
class cmd_re_sign(Command):
2767
    """Create a digital signature for an existing revision."""
2768
    # TODO be able to replace existing ones.
2769
2770
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2771
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2772
    takes_options = ['revision']
2773
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2774
    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.
2775
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2776
        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
2777
            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
2778
        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
2779
            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)
2780
        b = WorkingTree.open_containing(u'.')[0].branch
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
2781
        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
2782
        if revision_id_list is not None:
2783
            for revision_id in revision_id_list:
2784
                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.
2785
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2786
            if len(revision) == 1:
2787
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2788
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2789
            elif len(revision) == 2:
2790
                # are they both on rh- if so we can walk between them
2791
                # might be nice to have a range helper for arbitrary
2792
                # revision paths. hmm.
2793
                from_revno, from_revid = revision[0].in_history(b)
2794
                to_revno, to_revid = revision[1].in_history(b)
2795
                if to_revid is None:
2796
                    to_revno = b.revno()
2797
                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
2798
                    raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2799
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2800
                    b.repository.sign_revision(b.get_rev_id(revno), 
2801
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2802
            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
2803
                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.
2804
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2805
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2806
class cmd_bind(Command):
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2807
    """Bind the current branch to a master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2808
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2809
    After binding, commits must succeed on the master branch
2810
    before they are executed on the local one.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2811
    """
2812
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2813
    takes_args = ['location']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2814
    takes_options = []
2815
2816
    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
2817
        b, relpath = Branch.open_containing(u'.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2818
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2819
        try:
2820
            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
2821
        except errors.DivergedBranches:
2822
            raise errors.BzrCommandError('These branches have diverged.'
2823
                                         ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2824
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2825
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2826
class cmd_unbind(Command):
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2827
    """Unbind the current branch from its master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2828
2829
    After unbinding, the local branch is considered independent.
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2830
    All subsequent commits will be local.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2831
    """
2832
2833
    takes_args = []
2834
    takes_options = []
2835
2836
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2837
        b, relpath = Branch.open_containing(u'.')
2838
        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
2839
            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
2840
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2841
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2842
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2843
    """Remove the last committed revision.
2844
2845
    --verbose will print out what is being removed.
2846
    --dry-run will go through all the motions, but not actually
2847
    remove anything.
2848
    
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
2849
    In the future, uncommit will create a revision bundle, which can then
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2850
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
2851
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
2852
1553.5.34 by Martin Pool
Stub lock-breaking command
2853
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2854
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
2855
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2856
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2857
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2858
                    Option('dry-run', help='Don\'t actually make changes'),
2859
                    Option('force', help='Say yes to all questions.')]
2860
    takes_args = ['location?']
2861
    aliases = []
2862
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2863
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2864
            dry_run=False, verbose=False,
2865
            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
2866
        from bzrlib.log import log_formatter, show_log
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2867
        import sys
2868
        from bzrlib.uncommit import uncommit
2869
2870
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2871
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2872
        control, relpath = bzrdir.BzrDir.open_containing(location)
2873
        try:
2874
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2875
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2876
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2877
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2878
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2879
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2880
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2881
        if revision is None:
2882
            revno = b.revno()
2883
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2884
            # 'bzr uncommit -r 10' actually means uncommit
2885
            # so that the final tree is at revno 10.
2886
            # but bzrlib.uncommit.uncommit() actually uncommits
2887
            # the revisions that are supplied.
2888
            # So we need to offset it by one
2889
            revno = revision[0].in_history(b).revno+1
2890
2891
        if revno <= b.revno():
2892
            rev_id = b.get_rev_id(revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2893
        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
2894
            self.outf.write('No revisions to uncommit.\n')
2895
            return 1
2896
2897
        lf = log_formatter('short',
2898
                           to_file=self.outf,
2899
                           show_timezone='original')
2900
2901
        show_log(b,
2902
                 lf,
2903
                 verbose=False,
2904
                 direction='forward',
2905
                 start_revision=revno,
2906
                 end_revision=b.revno())
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2907
2908
        if dry_run:
2909
            print 'Dry-run, pretending to remove the above revisions.'
2910
            if not force:
2911
                val = raw_input('Press <enter> to continue')
2912
        else:
2913
            print 'The above revision(s) will be removed.'
2914
            if not force:
2915
                val = raw_input('Are you sure [y/N]? ')
2916
                if val.lower() not in ('y', 'yes'):
2917
                    print 'Canceled'
2918
                    return 0
2919
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2920
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2921
                revno=revno)
2922
2923
1553.5.34 by Martin Pool
Stub lock-breaking command
2924
class cmd_break_lock(Command):
2925
    """Break a dead lock on a repository, branch or working directory.
2926
1553.5.35 by Martin Pool
Start break-lock --show
2927
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
2928
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2929
2930
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
2931
    
2932
    example:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2933
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
2934
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2935
    takes_args = ['location?']
2936
2937
    def run(self, location=None, show=False):
2938
        if location is None:
2939
            location = u'.'
2940
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
2941
        try:
2942
            control.break_lock()
2943
        except NotImplementedError:
2944
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2945
        
1553.5.35 by Martin Pool
Start break-lock --show
2946
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
2947
class cmd_wait_until_signalled(Command):
2948
    """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
2949
2950
    This just prints a line to signal when it is ready, then blocks on stdin.
2951
    """
2952
2953
    hidden = True
2954
2955
    def run(self):
1910.17.6 by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print.
2956
        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
2957
        sys.stdout.flush()
2958
        sys.stdin.readline()
2959
1553.5.35 by Martin Pool
Start break-lock --show
2960
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
2961
class cmd_serve(Command):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
2962
    """Run the bzr server."""
2963
2964
    aliases = ['server']
2965
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
2966
    takes_options = [
2967
        Option('inet',
2968
               help='serve on stdin/out for use from inetd or sshd'),
2969
        Option('port',
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
2970
               help='listen for connections on nominated port of the form '
2971
                    '[hostname:]portnumber. Passing 0 as the port number will '
2972
                    'result in a dynamically allocated port.',
2973
               type=str),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
2974
        Option('directory',
2975
               help='serve contents of directory',
2976
               type=unicode),
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
2977
        Option('allow-writes',
2978
               help='By default the server is a readonly server. Supplying '
2979
                    '--allow-writes enables write access to the contents of '
2980
                    'the served directory and below. '
2981
                ),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
2982
        ]
2983
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
2984
    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
2985
        from bzrlib.transport import smart
2986
        from bzrlib.transport import get_transport
2987
        if directory is None:
2988
            directory = os.getcwd()
2044.2.1 by Lukáš Lalinský
Use urlutils.local_path_to_url to get an URL from the directory path.
2989
        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`.
2990
        if not allow_writes:
2991
            url = 'readonly+' + url
2992
        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
2993
        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.
2994
            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
2995
        elif port is not None:
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
2996
            if ':' in port:
2997
                host, port = port.split(':')
2998
            else:
2999
                host = '127.0.0.1'
3000
            server = smart.SmartTCPServer(t, host=host, port=int(port))
3001
            print 'listening on port: ', server.port
3002
            sys.stdout.flush()
1910.19.8 by Andrew Bennetts
Give a sensible error if insufficient options are passed to 'bzr serve'.
3003
        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
3004
            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
3005
        server.serve()
3006
1553.5.35 by Martin Pool
Start break-lock --show
3007
3008
# 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
3009
def _merge_helper(other_revision, base_revision,
3010
                  check_clean=True, ignore_zero=False,
3011
                  this_dir=None, backup_files=False,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
3012
                  merge_type=None,
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
3013
                  file_list=None, show_base=False, reprocess=False,
2149.2.1 by Jan Hudec
Option --pull for merge command.
3014
                  pull=False,
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
3015
                  pb=DummyProgress()):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3016
    """Merge changes into a tree.
3017
3018
    base_revision
3019
        list(path, revno) Base for three-way merge.  
3020
        If [None, None] then a base will be automatically determined.
3021
    other_revision
3022
        list(path, revno) Other revision for three-way merge.
3023
    this_dir
3024
        Directory to merge changes into; '.' by default.
3025
    check_clean
3026
        If true, this_dir must have no uncommitted changes before the
3027
        merge begins.
3028
    ignore_zero - If true, suppress the "zero conflicts" message when 
3029
        there are no conflicts; should be set when doing something we expect
3030
        to complete perfectly.
3031
    file_list - If supplied, merge only changes to selected files.
3032
3033
    All available ancestors of other_revision and base_revision are
3034
    automatically pulled into the branch.
3035
3036
    The revno may be -1 to indicate the last revision on the branch, which is
3037
    the typical case.
3038
3039
    This function is intended for use from the command line; programmatic
3040
    clients might prefer to call merge.merge_inner(), which has less magic 
3041
    behavior.
3042
    """
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
3043
    # Loading it late, so that we don't always have to import bzrlib.merge
3044
    if merge_type is None:
3045
        merge_type = _mod_merge.Merge3Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3046
    if this_dir is None:
3047
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
3048
    this_tree = WorkingTree.open_containing(this_dir)[0]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3049
    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
3050
        raise errors.BzrCommandError("Show-base is not supported for this merge"
3051
                                     " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
3052
    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
3053
        raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3054
                                     " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3055
    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
3056
        raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3057
    try:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3058
        merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3059
                                   pb=pb)
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3060
        merger.pp = ProgressPhase("Merge phase", 5, pb)
3061
        merger.pp.next_phase()
3062
        merger.check_basis(check_clean)
3063
        merger.set_other(other_revision)
3064
        merger.pp.next_phase()
3065
        merger.set_base(base_revision)
3066
        if merger.base_rev_id == merger.other_rev_id:
3067
            note('Nothing to do.')
3068
            return 0
2149.2.1 by Jan Hudec
Option --pull for merge command.
3069
        if file_list is None:
3070
            if pull and merger.base_rev_id == merger.this_rev_id:
3071
                count = merger.this_tree.pull(merger.this_branch,
3072
                        False, merger.other_rev_id)
3073
                note('%d revision(s) pulled.' % (count,))
3074
                return 0
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3075
        merger.backup_files = backup_files
3076
        merger.merge_type = merge_type 
3077
        merger.set_interesting_files(file_list)
3078
        merger.show_base = show_base 
3079
        merger.reprocess = reprocess
3080
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
3081
        if file_list is None:
3082
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3083
    finally:
3084
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3085
    return conflicts
3086
3087
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3088
# Compatibility
3089
merge = _merge_helper
3090
3091
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
3092
# these get imported and then picked up by the scan for cmd_*
3093
# TODO: Some more consistent way to split command definitions across files;
3094
# 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'.
3095
# aliases.  ideally we would avoid loading the implementation until the
3096
# details were needed.
2022.1.2 by John Arbash Meinel
rename version_info => cmd_version_info
3097
from bzrlib.cmd_version_info import cmd_version_info
1185.35.4 by Aaron Bentley
Implemented remerge
3098
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
3099
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.
3100
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
3101
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3102
        cmd_weave_plan_merge, cmd_weave_merge_text