/brz/remove-bazaar

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