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