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