/brz/remove-bazaar

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