/brz/remove-bazaar

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