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