/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
                ),
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1211
         Option('append-revisions-only',
1212
                help='Never change revnos or the existing log.'
1213
                '  Append revisions to it only.')
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1214
         ]
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1215
    def run(self, location=None, format=None, append_revisions_only=False):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1216
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1217
            format = bzrdir.format_registry.make_bzrdir('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1218
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1219
            location = u'.'
1830.4.5 by Wouter van Heyst
cleanup
1220
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1221
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1222
1223
        # The path has to exist to initialize a
1224
        # branch inside of it.
1225
        # Just using os.mkdir, since I don't
1226
        # believe that we want to create a bunch of
1227
        # locations if the user supplies an extended path
1228
        # TODO: create-prefix
1229
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1230
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1231
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1232
            pass
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1233
                    
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1234
        try:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1235
            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
1236
        except errors.NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1237
            # really a NotBzrDir error...
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1238
            branch = bzrdir.BzrDir.create_branch_convenience(location,
1239
                                                             format=format)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1240
        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
1241
            from bzrlib.transport.local import LocalTransport
1662.1.19 by Martin Pool
Better error message when initting existing tree
1242
            if existing_bzrdir.has_branch():
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1243
                if (isinstance(to_transport, LocalTransport)
1244
                    and not existing_bzrdir.has_workingtree()):
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1245
                        raise errors.BranchExistsWithoutWorkingTree(location)
1246
                raise errors.AlreadyBranchError(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1247
            else:
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1248
                branch = existing_bzrdir.create_branch()
1662.1.19 by Martin Pool
Better error message when initting existing tree
1249
                existing_bzrdir.create_workingtree()
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
1250
        if append_revisions_only:
1251
            try:
1252
                branch.set_append_revisions_only(True)
1253
            except errors.UpgradeRequired:
1254
                raise errors.BzrCommandError('This branch format cannot be set'
1255
                    ' to append-revisions-only.  Try --experimental-branch6')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1256
1257
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1258
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1259
    """Create a shared repository to hold branches.
1260
1261
    New branches created under the repository directory will store their revisions
1262
    in the repository, not in the branch directory, if the branch format supports
1263
    shared storage.
1264
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1265
    example:
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1266
        bzr init-repo repo
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1267
        bzr init repo/trunk
1268
        bzr checkout --lightweight repo/trunk trunk-checkout
1269
        cd trunk-checkout
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1270
        (add files here)
1271
    """
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1272
    takes_args = ["location"]
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1273
    takes_options = [RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1274
                            help='Specify a format for this repository. See'
1275
                                 ' "bzr help formats" for details',
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1276
                            registry=bzrdir.format_registry,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1277
                            converter=bzrdir.format_registry.make_bzrdir,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1278
                            value_switches=True, title='Repository format'),
1624.2.4 by Erik Bågfors
rename --tree to --trees
1279
                     Option('trees',
1624.2.1 by Erik Bågfors
support for --tree in bzr init-repo
1280
                             help='Allows branches in repository to have'
1281
                             ' a working tree')]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1282
    aliases = ["init-repo"]
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1283
    def run(self, location, format=None, trees=False):
1284
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1285
            format = bzrdir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1286
1287
        if location is None:
1288
            location = '.'
1289
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1290
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1291
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1292
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1293
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1294
            pass
1295
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1296
        newdir = format.initialize_on_transport(to_transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
1297
        repo = newdir.create_repository(shared=True)
1624.2.4 by Erik Bågfors
rename --tree to --trees
1298
        repo.set_make_working_trees(trees)
1558.5.1 by Aaron Bentley
Added make-repository command
1299
1300
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1301
class cmd_diff(Command):
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1302
    """Show differences in the working tree or between revisions.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1303
    
1304
    If files are listed, only the changes in those files are listed.
1305
    Otherwise, all changes for the tree are listed.
1306
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1307
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1308
    produces patches suitable for "patch -p1".
1309
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1310
    examples:
1311
        bzr diff
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1312
            Shows the difference in the working tree versus the last commit
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1313
        bzr diff -r1
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1314
            Difference between the working tree and revision 1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
1315
        bzr diff -r1..2
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1316
            Difference between revision 2 and revision 1
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1317
        bzr diff --diff-prefix old/:new/
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1318
            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.
1319
        bzr diff bzr.mine bzr.dev
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1320
            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.
1321
        bzr diff foo.c
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1322
            Show just the differences for 'foo.c'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1323
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1324
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1325
    #       or a graphical diff.
1326
1327
    # TODO: Python difflib is not exactly the same as unidiff; should
1328
    #       either fix it up or prefer to use an external diff.
1329
1330
    # TODO: Selected-file diff is inefficient and doesn't show you
1331
    #       deleted files.
1332
1333
    # TODO: This probably handles non-Unix newlines poorly.
2197.2.1 by Martin Pool
Refactor cmd_diff
1334
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1335
    takes_args = ['file*']
2190.2.1 by Martin Pool
remove global registration of short options
1336
    takes_options = ['revision', 'diff-options',
2193.3.1 by Martin Pool
Finish removal of global short-option table
1337
        Option('prefix', type=str,
1338
               short_name='p',
2190.2.1 by Martin Pool
remove global registration of short options
1339
               help='Set prefixes to added to old and new filenames, as '
1340
                    'two values separated by a colon.'),
1341
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1342
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1343
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1344
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1345
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1346
    def run(self, revision=None, file_list=None, diff_options=None,
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1347
            prefix=None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1348
        from bzrlib.diff import diff_cmd_helper, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1349
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1350
        if (prefix is None) or (prefix == '0'):
1351
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
1352
            old_label = ''
1353
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1354
        elif prefix == '1':
1355
            old_label = 'old/'
1356
            new_label = 'new/'
2197.2.1 by Martin Pool
Refactor cmd_diff
1357
        elif ':' in prefix:
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1358
            old_label, new_label = prefix.split(":")
2197.2.1 by Martin Pool
Refactor cmd_diff
1359
        else:
1360
            raise BzrCommandError(
1361
                "--prefix expects two values separated by a colon")
1362
1363
        if revision and len(revision) > 2:
1364
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1365
                                         ' one or two revision specifiers')
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1366
        
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1367
        try:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1368
            tree1, file_list = internal_tree_files(file_list)
1369
            tree2 = None
1508.1.15 by Robert Collins
Merge from mpool.
1370
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1371
            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
1372
        except errors.FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1373
            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
1374
                raise errors.BzrCommandError("Files are in different branches")
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1375
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1376
            tree1, file1 = WorkingTree.open_containing(file_list[0])
1377
            tree2, file2 = WorkingTree.open_containing(file_list[1])
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1378
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
1379
                # 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
1380
                raise errors.BzrCommandError("Files are in different branches")
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1381
            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
1382
        except errors.NotBranchError:
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1383
            if (revision is not None and len(revision) == 2
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
1384
                and not revision[0].needs_branch()
1385
                and not revision[1].needs_branch()):
1711.2.100 by John Arbash Meinel
clean up comment.
1386
                # If both revision specs include a branch, we can
1387
                # diff them without needing a local working tree
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1388
                tree1, tree2 = None, None
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
1389
            else:
1390
                raise
2197.2.1 by Martin Pool
Refactor cmd_diff
1391
1392
        if tree2 is not None:
1393
            if revision is not None:
1394
                # FIXME: but there should be a clean way to diff between
1395
                # non-default versions of two trees, it's not hard to do
1396
                # internally...
1397
                raise errors.BzrCommandError(
1398
                        "Sorry, diffing arbitrary revisions across branches "
1399
                        "is not implemented yet")
1400
            return show_diff_trees(tree1, tree2, sys.stdout, 
1401
                                   specific_files=file_list,
1402
                                   external_diff_options=diff_options,
1403
                                   old_label=old_label, new_label=new_label)
1404
1405
        return diff_cmd_helper(tree1, file_list, diff_options,
1406
                               revision_specs=revision,
1407
                               old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1408
1409
1410
class cmd_deleted(Command):
1411
    """List files deleted in the working tree.
1412
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1413
    # TODO: Show files deleted since a previous revision, or
1414
    # between two revisions.
1415
    # TODO: Much more efficient way to do this: read in new
1416
    # directories with readdir, rather than stating each one.  Same
1417
    # level of effort but possibly much less IO.  (Or possibly not,
1418
    # if the directories are very large...)
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1419
    takes_options = ['show-ids']
1420
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1421
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1422
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1423
        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()
1424
        old = tree.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1425
        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
1426
            if not tree.has_id(ie.file_id):
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1427
                self.outf.write(path)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1428
                if show_ids:
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1429
                    self.outf.write(' ')
1430
                    self.outf.write(ie.file_id)
1431
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1432
1433
1434
class cmd_modified(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1435
    """List files modified in working tree.
1436
1437
    See also: "bzr status".
1438
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1439
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1440
    hidden = True
1551.10.14 by Aaron Bentley
Add some blank lines
1441
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1442
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1443
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1444
        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.
1445
        td = tree.changes_from(tree.basis_tree())
1398 by Robert Collins
integrate in Gustavos x-bit patch
1446
        for path, id, kind, text_modified, meta_modified in td.modified:
1685.1.80 by Wouter van Heyst
more code cleanup
1447
            self.outf.write(path + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1448
1449
1450
class cmd_added(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1451
    """List files added in working tree.
1452
1453
    See also: "bzr status".
1454
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1455
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1456
    hidden = True
1551.10.14 by Aaron Bentley
Add some blank lines
1457
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1458
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1459
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1460
        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()
1461
        basis_inv = wt.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1462
        inv = wt.inventory
1463
        for file_id in inv:
1464
            if file_id in basis_inv:
1465
                continue
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1466
            if inv.is_root(file_id) and len(basis_inv) == 0:
1467
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1468
            path = inv.id2path(file_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1469
            if not os.access(osutils.abspath(path), os.F_OK):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1470
                continue
1685.1.80 by Wouter van Heyst
more code cleanup
1471
            self.outf.write(path + '\n')
1185.85.53 by John Arbash Meinel
Updated cmd_root
1472
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1473
1474
class cmd_root(Command):
1475
    """Show the tree root directory.
1476
1477
    The root is the nearest enclosing directory with a .bzr control
1478
    directory."""
1479
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1480
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1481
    def run(self, filename=None):
1482
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1483
        tree = WorkingTree.open_containing(filename)[0]
1685.1.80 by Wouter van Heyst
more code cleanup
1484
        self.outf.write(tree.basedir + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1485
1486
1487
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1488
    """Show log of a branch, file, or directory.
1489
1490
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1491
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1492
    To request a range of logs, you can use the command -r begin..end
1493
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1494
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1495
1496
    examples:
1497
        bzr log
1498
        bzr log foo.c
1499
        bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1500
    """
1501
1393.1.55 by Martin Pool
doc
1502
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1503
1626.1.2 by Martin Pool
Better help message for log command.
1504
    takes_args = ['location?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1505
    takes_options = [Option('forward', 
1506
                            help='show from oldest to newest'),
1626.1.2 by Martin Pool
Better help message for log command.
1507
                     'timezone', 
1508
                     Option('verbose', 
2193.3.3 by Martin Pool
Fix up other short options
1509
                             short_name='v',
1626.1.2 by Martin Pool
Better help message for log command.
1510
                             help='show files changed in each revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1511
                     'show-ids', 'revision',
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1512
                     'log-format',
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1513
                     Option('message',
2193.3.3 by Martin Pool
Fix up other short options
1514
                            short_name='m',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1515
                            help='show revisions whose message matches this regexp',
1516
                            type=str),
1185.16.57 by Martin Pool
[merge] from aaron
1517
                     ]
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()
1518
    encoding_type = 'replace'
1519
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1520
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1521
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1522
            verbose=False,
1523
            show_ids=False,
1524
            forward=False,
1525
            revision=None,
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1526
            log_format=None,
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1527
            message=None):
1528
        from bzrlib.log import show_log
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
1529
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1530
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1531
        direction = (forward and 'forward') or 'reverse'
1532
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1533
        # log everything
1534
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1535
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1536
            # find the file id to log:
1537
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
1538
            tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1539
                location)
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1540
            if fp != '':
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
1541
                if tree is None:
1542
                    tree = b.basis_tree()
1543
                inv = tree.inventory
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1544
                file_id = inv.path2id(fp)
2100.1.1 by wang
Running ``bzr log`` on nonexistent file gives an error instead of the
1545
                if file_id is None:
1546
                    raise errors.BzrCommandError(
1547
                        "Path does not have any revision history: %s" %
1548
                        location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1549
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1550
            # local dir only
1551
            # 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.
1552
            if revision is not None \
1553
                    and len(revision) > 0 and revision[0].get_branch():
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1554
                location = revision[0].get_branch()
1555
            else:
1556
                location = '.'
1557
            dir, relpath = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1558
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1559
2230.4.1 by Aaron Bentley
Get log as fast branch5
1560
        b.lock_read()
1561
        try:
1562
            if revision is None:
1563
                rev1 = None
1564
                rev2 = None
1565
            elif len(revision) == 1:
1566
                rev1 = rev2 = revision[0].in_history(b).revno
1567
            elif len(revision) == 2:
1568
                if revision[1].get_branch() != revision[0].get_branch():
1569
                    # b is taken from revision[0].get_branch(), and
1570
                    # show_log will use its revision_history. Having
1571
                    # different branches will lead to weird behaviors.
1572
                    raise errors.BzrCommandError(
1573
                        "Log doesn't accept two revisions in different"
1574
                        " branches.")
1575
                if revision[0].spec is None:
1576
                    # missing begin-range means first revision
1577
                    rev1 = 1
1578
                else:
1579
                    rev1 = revision[0].in_history(b).revno
1580
1581
                if revision[1].spec is None:
1582
                    # missing end-range means last known revision
1583
                    rev2 = b.revno()
1584
                else:
1585
                    rev2 = revision[1].in_history(b).revno
1586
            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
1587
                raise errors.BzrCommandError(
2230.4.1 by Aaron Bentley
Get log as fast branch5
1588
                    'bzr log --revision takes one or two values.')
1589
1590
            # By this point, the revision numbers are converted to the +ve
1591
            # form if they were supplied in the -ve form, so we can do
1592
            # this comparison in relative safety
1593
            if rev1 > rev2:
1594
                (rev2, rev1) = (rev1, rev2)
1595
1596
            if log_format is None:
1597
                log_format = log.log_formatter_registry.get_default(b)
1598
1599
            lf = log_format(show_ids=show_ids, to_file=self.outf,
1600
                            show_timezone=timezone)
1601
1602
            show_log(b,
1603
                     lf,
1604
                     file_id,
1605
                     verbose=verbose,
1606
                     direction=direction,
1607
                     start_revision=rev1,
1608
                     end_revision=rev2,
1609
                     search=message)
1610
        finally:
1611
            b.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1612
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1613
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1614
def get_log_format(long=False, short=False, line=False, default='long'):
1615
    log_format = default
1616
    if long:
1617
        log_format = 'long'
1618
    if short:
1619
        log_format = 'short'
1620
    if line:
1621
        log_format = 'line'
1622
    return log_format
1623
1624
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1625
class cmd_touching_revisions(Command):
1626
    """Return revision-ids which affected a particular file.
1627
1685.1.80 by Wouter van Heyst
more code cleanup
1628
    A more user-friendly interface is "bzr log FILE".
1629
    """
1630
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1631
    hidden = True
1632
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1633
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1634
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1635
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1636
        tree, relpath = WorkingTree.open_containing(filename)
1637
        b = tree.branch
1638
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1639
        file_id = inv.path2id(relpath)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1640
        for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1641
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1642
1643
1644
class cmd_ls(Command):
1645
    """List files in a tree.
1646
    """
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1647
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1648
    takes_args = ['path?']
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1649
    # 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.
1650
    takes_options = ['verbose', 'revision',
1651
                     Option('non-recursive',
1652
                            help='don\'t recurse into sub-directories'),
1653
                     Option('from-root',
1654
                            help='Print all paths from the root of the branch.'),
1655
                     Option('unknown', help='Print unknown files'),
1656
                     Option('versioned', help='Print versioned files'),
1657
                     Option('ignored', help='Print ignored files'),
1658
1659
                     Option('null', help='Null separate the files'),
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1660
                     'kind', 'show-ids'
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1661
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1662
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1663
    def run(self, revision=None, verbose=False, 
1664
            non_recursive=False, from_root=False,
1665
            unknown=False, versioned=False, ignored=False,
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1666
            null=False, kind=None, show_ids=False, path=None):
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1667
1668
        if kind and kind not in ('file', 'directory', 'symlink'):
1669
            raise errors.BzrCommandError('invalid kind specified')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1670
1671
        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
1672
            raise errors.BzrCommandError('Cannot set both --verbose and --null')
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1673
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1674
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1675
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1676
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1677
        if path is None:
1678
            fs_path = '.'
1679
            prefix = ''
1680
        else:
1681
            if from_root:
1682
                raise errors.BzrCommandError('cannot specify both --from-root'
1683
                                             ' and PATH')
1684
            fs_path = path
1685
            prefix = path
2215.3.3 by Aaron Bentley
Get ls working on branches
1686
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1687
            fs_path)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1688
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1689
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1690
        elif relpath:
1691
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1692
        if revision is not None:
2215.3.3 by Aaron Bentley
Get ls working on branches
1693
            tree = branch.repository.revision_tree(
1694
                revision[0].in_history(branch).rev_id)
1695
        elif tree is None:
1696
            tree = branch.basis_tree()
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1697
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1698
        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.
1699
            if fp.startswith(relpath):
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1700
                fp = osutils.pathjoin(prefix, fp[len(relpath):])
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1701
                if non_recursive and '/' in fp:
1702
                    continue
1703
                if not all and not selection[fc]:
1704
                    continue
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1705
                if kind is not None and fkind != kind:
1706
                    continue
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1707
                if verbose:
1708
                    kindch = entry.kind_character()
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1709
                    outstring = '%-8s %s%s' % (fc, fp, kindch)
1710
                    if show_ids and fid is not None:
1711
                        outstring = "%-50s %s" % (outstring, fid)
1712
                    self.outf.write(outstring + '\n')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1713
                elif null:
1685.1.80 by Wouter van Heyst
more code cleanup
1714
                    self.outf.write(fp + '\0')
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1715
                    if show_ids:
1716
                        if fid is not None:
1717
                            self.outf.write(fid)
1718
                        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()
1719
                    self.outf.flush()
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1720
                else:
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1721
                    if fid is not None:
1722
                        my_id = fid
1723
                    else:
1724
                        my_id = ''
1725
                    if show_ids:
1726
                        self.outf.write('%-50s %s\n' % (fp, my_id))
1727
                    else:
1728
                        self.outf.write(fp + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1729
1730
1731
class cmd_unknowns(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1732
    """List unknown files.
1733
1734
    See also: "bzr ls --unknown".
1735
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1736
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1737
    hidden = True
1551.10.14 by Aaron Bentley
Add some blank lines
1738
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1739
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1740
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1741
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1742
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1743
1744
1745
class cmd_ignore(Command):
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1746
    """Ignore specified files or patterns.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1747
1748
    To remove patterns from the ignore list, edit the .bzrignore file.
1749
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1750
    Trailing slashes on patterns are ignored. 
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1751
    If the pattern contains a slash or is a regular expression, it is compared 
1752
    to the whole path from the branch root.  Otherwise, it is compared to only
1753
    the last component of the path.  To match a file only in the root 
1754
    directory, prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1755
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1756
    Ignore patterns specifying absolute paths are not allowed.
1757
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1758
    Ignore patterns may include globbing wildcards such as:
1759
      ? - Matches any single character except '/'
1760
      * - Matches 0 or more characters except '/'
1761
      /**/ - Matches 0 or more directories in a path
1762
      [a-z] - Matches a single character from within a group of characters
1763
 
1764
    Ignore patterns may also be Python regular expressions.  
1765
    Regular expression ignore patterns are identified by a 'RE:' prefix 
1766
    followed by the regular expression.  Regular expression ignore patterns
1767
    may not include named or numbered groups.
1768
1769
    Note: ignore patterns containing shell wildcards must be quoted from 
1770
    the shell on Unix.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1771
1772
    examples:
1773
        bzr ignore ./Makefile
1774
        bzr ignore '*.class'
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1775
        bzr ignore 'lib/**/*.o'
1776
        bzr ignore 'RE:lib/.*\.o'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1777
    """
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1778
    takes_args = ['name_pattern*']
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1779
    takes_options = [
1780
                     Option('old-default-rules',
1781
                            help='Out the ignore rules bzr < 0.9 always used.')
1782
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1783
    
2063.5.2 by wang
Don't use mutable values as default argument definitions.
1784
    def run(self, name_pattern_list=None, old_default_rules=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1785
        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.
1786
        if old_default_rules is not None:
1787
            # 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.
1788
            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.
1789
                print pattern
1790
            return
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1791
        if not name_pattern_list:
2063.5.5 by wang
resolve a conflict
1792
            raise errors.BzrCommandError("ignore requires at least one "
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
1793
                                  "NAME_PATTERN or --old-default-rules")
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1794
        for name_pattern in name_pattern_list:
1795
            if name_pattern[0] == '/':
1796
                raise errors.BzrCommandError(
1797
                    "NAME_PATTERN should not be an absolute path")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1798
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1799
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1800
        if os.path.exists(ifn):
1801
            f = open(ifn, 'rt')
1802
            try:
1803
                igns = f.read().decode('utf-8')
1804
            finally:
1805
                f.close()
1806
        else:
1807
            igns = ''
1808
1809
        # TODO: If the file already uses crlf-style termination, maybe
1810
        # we should use that for the newly added lines?
1811
1812
        if igns and igns[-1] != '\n':
1813
            igns += '\n'
2063.5.3 by wang
Change error message. Use spaces instead of tabs.
1814
        for name_pattern in name_pattern_list:
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1815
            igns += name_pattern.rstrip('/') + '\n'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1816
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
1817
        f = AtomicFile(ifn, 'wb')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1818
        try:
1819
            f.write(igns.encode('utf-8'))
1820
            f.commit()
1821
        finally:
1822
            f.close()
1823
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1824
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1825
        if inv.path2id('.bzrignore'):
1826
            mutter('.bzrignore is already versioned')
1827
        else:
1828
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1829
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1830
1831
1832
class cmd_ignored(Command):
1833
    """List ignored files and the patterns that matched them.
1834
1835
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1836
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1837
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1838
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1839
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1840
            if file_class != 'I':
1841
                continue
1842
            ## XXX: Slightly inefficient since this was already calculated
1843
            pat = tree.is_ignored(path)
1844
            print '%-50s %s' % (path, pat)
1845
1846
1847
class cmd_lookup_revision(Command):
1848
    """Lookup the revision-id from a revision-number
1849
1850
    example:
1851
        bzr lookup-revision 33
1852
    """
1853
    hidden = True
1854
    takes_args = ['revno']
1855
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1856
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1857
    def run(self, revno):
1858
        try:
1859
            revno = int(revno)
1860
        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
1861
            raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1862
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1863
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1864
1865
1866
class cmd_export(Command):
1867
    """Export past revision to destination directory.
1868
1869
    If no revision is specified this exports the last committed revision.
1870
1871
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1872
    given, try to find the format with the extension. If no extension
1873
    is found exports to a directory (equivalent to --format=dir).
1874
1875
    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
1876
    is given, the top directory will be the root name of the file.
1877
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1878
    If branch is omitted then the branch containing the CWD will be used.
1879
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1880
    Note: export of tree with non-ascii filenames to zip is not supported.
1881
1551.3.11 by Aaron Bentley
Merge from Robert
1882
     Supported formats       Autodetected by extension
1883
     -----------------       -------------------------
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1884
         dir                            -
1885
         tar                          .tar
1886
         tbz2                    .tar.bz2, .tbz2
1887
         tgz                      .tar.gz, .tgz
1888
         zip                          .zip
1889
    """
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1890
    takes_args = ['dest', 'branch?']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1891
    takes_options = ['revision', 'format', 'root']
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1892
    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.
1893
        from bzrlib.export import export
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1894
1895
        if branch is None:
1896
            tree = WorkingTree.open_containing(u'.')[0]
1897
            b = tree.branch
1898
        else:
1899
            b = Branch.open(branch)
1900
            
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1901
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1902
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1903
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1904
        else:
1905
            if len(revision) != 1:
2067.3.3 by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes
1906
                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.
1907
            rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1908
        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.
1909
        try:
1910
            export(t, dest, format, root)
1911
        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
1912
            raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1913
1914
1915
class cmd_cat(Command):
1916
    """Write a file's text from a previous revision."""
1917
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1918
    takes_options = ['revision', 'name-from-revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1919
    takes_args = ['filename']
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
1920
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1921
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1922
    @display_command
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1923
    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
1924
        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
1925
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
1926
                                        " one number")
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1927
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1928
        tree = None
1907.4.5 by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
1929
        try:
1930
            tree, relpath = WorkingTree.open_containing(filename)
1931
            b = tree.branch
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1932
        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.
1933
            pass
1934
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1935
        if revision is not None and revision[0].get_branch() is not None:
1936
            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.
1937
        if tree is None:
1938
            b, relpath = Branch.open_containing(filename)
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1939
            tree = b.basis_tree()
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1940
        if revision is None:
1941
            revision_id = b.last_revision()
1942
        else:
1943
            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
1944
1945
        cur_file_id = tree.path2id(relpath)
1946
        rev_tree = b.repository.revision_tree(revision_id)
1947
        old_file_id = rev_tree.path2id(relpath)
1948
        
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1949
        if name_from_revision:
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
1950
            if old_file_id is None:
1951
                raise errors.BzrCommandError("%r is not present in revision %s"
1952
                                                % (filename, revision_id))
1953
            else:
1954
                rev_tree.print_file(old_file_id)
2073.2.2 by wang
Make the decision tree a little clearer. Add more tests for exceptions.
1955
        elif cur_file_id is not None:
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1956
            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
1957
        elif old_file_id is not None:
1958
            rev_tree.print_file(old_file_id)
1959
        else:
1960
            raise errors.BzrCommandError("%r is not present in revision %s" %
1961
                                         (filename, revision_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1962
1963
1964
class cmd_local_time_offset(Command):
1965
    """Show the offset in seconds from GMT to local time."""
1966
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1967
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1968
    def run(self):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1969
        print osutils.local_time_offset()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1970
1971
1972
1973
class cmd_commit(Command):
1974
    """Commit changes into a new revision.
1975
    
1976
    If no arguments are given, the entire tree is committed.
1977
1978
    If selected files are specified, only changes to those files are
1979
    committed.  If a directory is specified then the directory and everything 
1980
    within it is committed.
1981
1982
    A selected-file commit may fail in some cases where the committed
1983
    tree would be invalid, such as trying to commit a file in a
1984
    newly-added directory that is not itself committed.
1985
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1986
    # TODO: Run hooks on tree to-be-committed, and after commit.
1987
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1988
    # TODO: Strict commit that fails if there are deleted files.
1989
    #       (what does "deleted files" mean ??)
1990
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1991
    # TODO: Give better message for -s, --summary, used by tla people
1992
1993
    # XXX: verbose currently does nothing
1994
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1995
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1996
    takes_options = ['message', 'verbose', 
1997
                     Option('unchanged',
1998
                            help='commit even if nothing has changed'),
1999
                     Option('file', type=str, 
2193.3.3 by Martin Pool
Fix up other short options
2000
                            short_name='F',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
2001
                            argname='msgfile',
2002
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2003
                     Option('strict',
2004
                            help="refuse to commit if there are unknown "
2005
                            "files in the working tree."),
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
2006
                     Option('local',
2007
                            help="perform a local only commit in a bound "
2008
                                 "branch. Such commits are not pushed to "
2009
                                 "the master branch until a normal commit "
2010
                                 "is performed."
2011
                            ),
1185.16.43 by Martin Pool
- clean up handling of option objects
2012
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2013
    aliases = ['ci', 'checkin']
2014
2015
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
2016
            unchanged=False, strict=False, local=False):
1607.1.5 by Robert Collins
Make commit verbose mode work!.
2017
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2018
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2019
                StrictCommitFailed)
1185.33.76 by Martin Pool
Fix import error.
2020
        from bzrlib.msgeditor import edit_commit_message, \
2021
                make_commit_message_template
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2022
1185.33.77 by Martin Pool
doc
2023
        # TODO: Need a blackbox test for invoking the external editor; may be
2024
        # slightly problematic to run this cross-platform.
2025
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
2026
        # TODO: do more checks that the commit will succeed before 
2027
        # 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
2028
        tree, selected_list = tree_files(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
2029
        if selected_list == ['']:
2030
            # workaround - commit of root of tree should be exactly the same
2031
            # as just default commit in that tree, and succeed even though
2032
            # selected-file merge commit is not done yet
2033
            selected_list = []
2034
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
2035
        if local and not tree.branch.get_bound_location():
2036
            raise errors.LocalRequiresBoundBranch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2037
2149.1.4 by Aaron Bentley
Add additional test that callback is called with a Commit instance
2038
        def get_message(commit_obj):
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2039
            """Callback to get commit message"""
2040
            my_message = message
2041
            if my_message is None and not file:
2042
                template = make_commit_message_template(tree, selected_list)
2043
                my_message = edit_commit_message(template)
2044
                if my_message is None:
2045
                    raise errors.BzrCommandError("please specify a commit"
2046
                        " message with either --message or --file")
2047
            elif my_message and file:
2048
                raise errors.BzrCommandError(
2049
                    "please specify either --message or --file")
2050
            if file:
2051
                my_message = codecs.open(file, 'rt', 
2052
                                         bzrlib.user_encoding).read()
2053
            if my_message == "":
2054
                raise errors.BzrCommandError("empty commit message specified")
2055
            return my_message
1607.1.5 by Robert Collins
Make commit verbose mode work!.
2056
        
2057
        if verbose:
2058
            reporter = ReportCommitToLog()
2059
        else:
2060
            reporter = NullCommitReporter()
2089.1.1 by wang
If a commit fails, the commit message is stored in a file at the root of
2061
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2062
        try:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
2063
            tree.commit(message_callback=get_message,
2064
                        specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
2065
                        allow_pointless=unchanged, strict=strict, local=local,
2066
                        reporter=reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2067
        except PointlessCommit:
2068
            # FIXME: This should really happen before the file is read in;
2069
            # perhaps prepare the commit; get the message; then actually commit
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2070
            raise errors.BzrCommandError("no changes to commit."
2071
                              " use --unchanged to commit anyhow")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
2072
        except ConflictsInTree:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2073
            raise errors.BzrCommandError('Conflicts detected in working '
2074
                'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'
2075
                ' resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
2076
        except StrictCommitFailed:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2077
            raise errors.BzrCommandError("Commit refused because there are"
2078
                              " 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
2079
        except errors.BoundBranchOutOfDate, e:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
2080
            raise errors.BzrCommandError(str(e) + "\n"
2081
            'To commit to master branch, run update and then commit.\n'
2082
            'You can also pass --local to commit to continue working '
2083
            'disconnected.')
2111.1.1 by Martin Pool
Fix #32054, save message if commit fails.
2084
2085
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2086
class cmd_check(Command):
2087
    """Validate consistency of branch history.
2088
2089
    This command checks various invariants about the branch storage to
2090
    detect data corruption or bzr bugs.
2091
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
2092
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
2093
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2094
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
2095
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2096
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
2097
        if branch is None:
2098
            tree = WorkingTree.open_containing()[0]
2099
            branch = tree.branch
2100
        else:
2101
            branch = Branch.open(branch)
2102
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2103
2104
2105
class cmd_upgrade(Command):
2106
    """Upgrade branch storage to current format.
2107
2108
    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.
2109
    this command. When the default format has changed you may also be warned
2110
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2111
    """
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
2112
    takes_args = ['url?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2113
    takes_options = [
2221.4.9 by Aaron Bentley
Zap trailing whitespace
2114
                    RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2115
                        help='Upgrade to a specific format.  See "bzr help'
2116
                             ' formats" for details',
2221.4.9 by Aaron Bentley
Zap trailing whitespace
2117
                        registry=bzrdir.format_registry,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
2118
                        converter=bzrdir.format_registry.make_bzrdir,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2119
                        value_switches=True, title='Branch format'),
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2120
                    ]
2121
2122
2123
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2124
        from bzrlib.upgrade import upgrade
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2125
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
2126
            format = bzrdir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2127
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2128
2129
2130
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
2131
    """Show or set bzr user id.
2132
    
2133
    examples:
2134
        bzr whoami --email
2135
        bzr whoami 'Frank Chu <fchu@example.com>'
2136
    """
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2137
    takes_options = [ Option('email',
2138
                             help='display email address only'),
2139
                      Option('branch',
2140
                             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
2141
                                  'globally'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2142
                    ]
2143
    takes_args = ['name?']
2144
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2145
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2146
    @display_command
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2147
    def run(self, email=False, branch=False, name=None):
2148
        if name is None:
2149
            # use branch if we're inside one; otherwise global config
2150
            try:
1816.2.10 by Robey Pointer
code style changes
2151
                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
2152
            except errors.NotBranchError:
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2153
                c = config.GlobalConfig()
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2154
            if email:
1816.2.10 by Robey Pointer
code style changes
2155
                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
2156
            else:
1816.2.10 by Robey Pointer
code style changes
2157
                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
2158
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2159
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
2160
        # display a warning if an email address isn't included in the given name.
2161
        try:
2162
            config.extract_email_address(name)
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
2163
        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
2164
            warning('"%s" does not seem to contain an email address.  '
2165
                    '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
2166
        
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2167
        # use global config unless --branch given
2168
        if branch:
1816.2.10 by Robey Pointer
code style changes
2169
            c = Branch.open_containing('.')[0].get_config()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2170
        else:
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2171
            c = config.GlobalConfig()
2172
        c.set_user_option('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2173
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.
2174
1185.35.14 by Aaron Bentley
Implemented nick command
2175
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
2176
    """Print or set the branch nickname.  
2177
1185.35.14 by Aaron Bentley
Implemented nick command
2178
    If unset, the tree root directory name is used as the nickname
2179
    To print the current nickname, execute with no argument.  
2180
    """
2181
    takes_args = ['nickname?']
2182
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2183
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
2184
        if nickname is None:
2185
            self.printme(branch)
2186
        else:
2187
            branch.nick = nickname
2188
2189
    @display_command
2190
    def printme(self, branch):
2191
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2192
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.
2193
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2194
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2195
    """Run internal test suite.
2196
    
2213.2.1 by Martin Pool
Add selftest --first flag
2197
    This creates temporary test directories in the working directory, but not
2198
    existing data is affected.  These directories are deleted if the tests
2199
    pass, or left behind to help in debugging if they fail and --keep-output
2200
    is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2201
    
2213.2.1 by Martin Pool
Add selftest --first flag
2202
    If arguments are given, they are regular expressions that say which tests
2203
    should run.  Tests matching any expression are run, and other tests are
2204
    not run.
2205
2206
    Alternatively if --first is given, matching tests are run first and then
2207
    all other tests are run.  This is useful if you have been working in a
2208
    particular area, but want to make sure nothing else was broken.
1552 by Martin Pool
Improved help text for bzr selftest
2209
2210
    If the global option '--no-plugins' is given, plugins are not loaded
2211
    before running the selftests.  This has two effects: features provided or
2212
    modified by plugins will not be tested, and tests provided by plugins will
2213
    not be run.
2214
2213.2.1 by Martin Pool
Add selftest --first flag
2215
    examples::
1552 by Martin Pool
Improved help text for bzr selftest
2216
        bzr selftest ignore
2213.2.1 by Martin Pool
Add selftest --first flag
2217
            run only tests relating to 'ignore'
1552 by Martin Pool
Improved help text for bzr selftest
2218
        bzr --no-plugins selftest -v
2213.2.1 by Martin Pool
Add selftest --first flag
2219
            disable plugins and list tests as they're run
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2220
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2221
    # 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.
2222
2223
    # NB: this is used from the class without creating an instance, which is
2224
    # why it does not have a self parameter.
2225
    def get_transport_type(typestring):
2226
        """Parse and return a transport specifier."""
2227
        if typestring == "sftp":
2228
            from bzrlib.transport.sftp import SFTPAbsoluteServer
2229
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
2230
        if typestring == "memory":
2231
            from bzrlib.transport.memory import MemoryServer
2232
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
2233
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
2234
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
2235
            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.
2236
        msg = "No known transport type %s. Supported types are: sftp\n" %\
2237
            (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
2238
        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.
2239
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2240
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
2241
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
2242
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2243
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
2244
                     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.
2245
                            help='keep output directories when tests fail'),
2246
                     Option('transport', 
2247
                            help='Use a different transport by default '
2248
                                 'throughout the test suite.',
2249
                            type=get_transport_type),
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
2250
                     Option('benchmark', help='run the bzr bencharks.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2251
                     Option('lsprof-timed',
2252
                            help='generate lsprof output for benchmarked'
2253
                                 ' sections of code.'),
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2254
                     Option('cache-dir', type=str,
2255
                            help='a directory to cache intermediate'
2256
                                 ' benchmark steps'),
2172.4.3 by Alexander Belchenko
Change name of option to '--clean-output' and provide tests
2257
                     Option('clean-output',
2172.4.2 by Alexander Belchenko
Update NEWS and help for '--clean' option
2258
                            help='clean temporary tests directories'
2259
                                 ' without running tests'),
2213.2.1 by Martin Pool
Add selftest --first flag
2260
                     Option('first',
2261
                            help='run all tests, but run specified tests first',
2262
                            )
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2263
                     ]
2204.3.4 by Alexander Belchenko
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback
2264
    encoding_type = 'replace'
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2265
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2266
    def run(self, testspecs_list=None, verbose=None, one=False,
2267
            keep_output=False, transport=None, benchmark=None,
2213.2.1 by Martin Pool
Add selftest --first flag
2268
            lsprof_timed=None, cache_dir=None, clean_output=False,
2269
            first=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2270
        import bzrlib.ui
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
2271
        from bzrlib.tests import selftest
2272
        import bzrlib.benchmarks as benchmarks
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
2273
        from bzrlib.benchmarks import tree_creator
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2274
2172.4.3 by Alexander Belchenko
Change name of option to '--clean-output' and provide tests
2275
        if clean_output:
2276
            from bzrlib.tests import clean_selftest_output
2277
            clean_selftest_output()
2172.4.1 by Alexander Belchenko
'bzr selftest --clean' allows easily clean temporary tests directories
2278
            return 0
2279
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2280
        if cache_dir is not None:
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
2281
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2282
        print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
2283
        print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2284
        print
2095.4.1 by Martin Pool
Better progress bars during tests
2285
        if testspecs_list is not None:
2286
            pattern = '|'.join(testspecs_list)
2287
        else:
2288
            pattern = ".*"
2289
        if benchmark:
2290
            test_suite_factory = benchmarks.test_suite
2291
            if verbose is None:
2292
                verbose = True
2293
            # TODO: should possibly lock the history file...
2197.1.1 by Martin Pool
Use line buffering to write .perf_history
2294
            benchfile = open(".perf_history", "at", buffering=1)
2095.4.1 by Martin Pool
Better progress bars during tests
2295
        else:
2296
            test_suite_factory = None
2297
            if verbose is None:
2298
                verbose = False
2299
            benchfile = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2300
        try:
2095.4.1 by Martin Pool
Better progress bars during tests
2301
            result = selftest(verbose=verbose, 
2302
                              pattern=pattern,
2303
                              stop_on_failure=one, 
2304
                              keep_output=keep_output,
2305
                              transport=transport,
2306
                              test_suite_factory=test_suite_factory,
2307
                              lsprof_timed=lsprof_timed,
2213.2.1 by Martin Pool
Add selftest --first flag
2308
                              bench_history=benchfile,
2309
                              matching_tests_first=first,
2310
                              )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2311
        finally:
2095.4.1 by Martin Pool
Better progress bars during tests
2312
            if benchfile is not None:
2313
                benchfile.close()
2314
        if result:
2315
            info('tests passed')
2316
        else:
2317
            info('tests failed')
2318
        return int(not result)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2319
2320
2321
class cmd_version(Command):
2322
    """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2323
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2324
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2325
    def run(self):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
2326
        from bzrlib.version import show_version
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2327
        show_version()
2328
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2329
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2330
class cmd_rocks(Command):
2331
    """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2332
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2333
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2334
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2335
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2336
    def run(self):
2337
        print "it sure does!"
2338
2339
2340
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.
2341
    """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2342
    # TODO: Options to specify revisions on either side, as if
2343
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2344
    takes_args = ['branch', 'other']
2345
    hidden = True
2346
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2347
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2348
    def run(self, branch, other):
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
2349
        from bzrlib.revision import MultipleRevisionSources
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2350
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2351
        branch1 = Branch.open_containing(branch)[0]
2352
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2353
1241 by Martin Pool
- rename last_patch to last_revision
2354
        last1 = branch1.last_revision()
2355
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2356
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
2357
        source = MultipleRevisionSources(branch1.repository, 
2358
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2359
        
2360
        base_rev_id = common_ancestor(last1, last2, source)
2361
2362
        print 'merge base is revision %s' % base_rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2363
2364
2365
class cmd_merge(Command):
2366
    """Perform a three-way merge.
2367
    
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2368
    The branch is the branch you will merge from.  By default, it will merge
2369
    the latest revision.  If you specify a revision, that revision will be
2370
    merged.  If you specify two revisions, the first will be used as a BASE,
2371
    and the second one as OTHER.  Revision numbers are always relative to the
2372
    specified branch.
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2373
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2374
    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
2375
    branch, automatically determining an appropriate base.  If this
2376
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2377
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
2378
    Merge will do its best to combine the changes in two branches, but there
2379
    are some kinds of problems only a human can fix.  When it encounters those,
2380
    it will mark a conflict.  A conflict means that you need to fix something,
2381
    before you should commit.
2382
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2383
    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
2384
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2385
    If there is no default branch set, the first merge will set it. After
2386
    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.
2387
    default, use --remember. The value will only be saved if the remote
2388
    location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
2389
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
2390
    The results of the merge are placed into the destination working
2391
    directory, where they can be reviewed (with bzr diff), tested, and then
2392
    committed to record the result of the merge.
2393
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2394
    Examples:
2395
2396
    To merge the latest revision from bzr.dev
2397
    bzr merge ../bzr.dev
2398
2399
    To merge changes up to and including revision 82 from bzr.dev
2400
    bzr merge -r 82 ../bzr.dev
2401
2402
    To merge the changes introduced by 82, without previous changes:
2403
    bzr merge -r 81..82 ../bzr.dev
2404
    
2405
    merge refuses to run if there are any uncommitted changes, unless
2406
    --force is given.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2407
2408
    The following merge types are available:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2409
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2410
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
2411
    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)
2412
        Option('show-base', help="Show base revision text in "
2413
               "conflicts"),
2414
        Option('uncommitted', help='Apply uncommitted changes'
2415
               ' from a working copy, instead of branch changes'),
2416
        Option('pull', help='If the destination is already'
2417
                ' completely merged into the source, pull from the'
2418
                ' source rather than merging. When this happens,'
2419
                ' you do not need to commit the result.'),
2420
        Option('directory',
2421
            help='branch to merge into, '
2422
                 'rather than the one containing the working directory',
2423
            short_name='d',
2424
            type=unicode,
2425
            ),
2426
    ]
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2427
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2428
    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)
2429
            show_base=False, reprocess=False, remember=False,
2430
            uncommitted=False, pull=False,
2431
            directory=None,
2432
            ):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2433
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2434
            merge_type = _mod_merge.Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
2435
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
2436
        if directory is None: directory = u'.'
2437
        tree = WorkingTree.open_containing(directory)[0]
1551.11.9 by Aaron Bentley
Apply change reporting to merge
2438
        change_reporter = delta.ChangeReporter(tree.inventory)
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
2439
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2440
        if branch is not None:
2441
            try:
1773.4.3 by Martin Pool
[merge] bzr.dev
2442
                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
2443
            except errors.NotABundle:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2444
                pass # Continue on considering this url a Branch
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2445
            else:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2446
                conflicts = merge_bundle(reader, tree, not force, merge_type,
1551.11.9 by Aaron Bentley
Apply change reporting to merge
2447
                                         reprocess, show_base, change_reporter)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2448
                if conflicts == 0:
2449
                    return 0
2450
                else:
2451
                    return 1
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2452
1907.4.10 by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path.
2453
        if revision is None \
2454
                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
2455
            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
2456
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2457
        if revision is None or len(revision) < 1:
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2458
            if uncommitted:
2459
                base = [branch, -1]
2460
                other = [branch, None]
2461
            else:
2462
                base = [None, None]
2463
                other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
2464
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2465
        else:
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2466
            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
2467
                raise errors.BzrCommandError('Cannot use --uncommitted and'
2468
                                             ' --revision at the same time.')
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
2469
            branch = revision[0].get_branch() or branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2470
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
2471
                base = [None, None]
1907.4.11 by Matthieu Moy
Canceled an incorrect "path = None".
2472
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
2473
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2474
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2475
            else:
2476
                assert len(revision) == 2
2477
                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
2478
                    raise errors.BzrCommandError(
1907.4.10 by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path.
2479
                        "Merge doesn't permit empty revision specifier.")
1907.4.12 by Matthieu Moy
Made merge work with two revisions in different branches.
2480
                base_branch, path = Branch.open_containing(branch)
2481
                branch1 = revision[1].get_branch() or branch
2482
                other_branch, path1 = Branch.open_containing(branch1)
2483
                if revision[0].get_branch() is not None:
2484
                    # then path was obtained from it, and is None.
2485
                    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
2486
1907.4.12 by Matthieu Moy
Made merge work with two revisions in different branches.
2487
                base = [branch, revision[0].in_history(base_branch).revno]
2488
                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
2489
2490
        if tree.branch.get_parent() is None or remember:
2491
            tree.branch.set_parent(other_branch.base)
2492
1645.1.1 by Aaron Bentley
Implement single-file merge
2493
        if path != "":
2494
            interesting_files = [path]
2495
        else:
2496
            interesting_files = None
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2497
        pb = ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2498
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2499
            try:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
2500
                conflict_count = _merge_helper(
2501
                    other, base, check_clean=(not force),
2502
                    merge_type=merge_type,
2503
                    reprocess=reprocess,
2504
                    show_base=show_base,
2149.2.1 by Jan Hudec
Option --pull for merge command.
2505
                    pull=pull,
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
2506
                    this_dir=directory,
1551.11.13 by Aaron Bentley
Merge bzr.dev
2507
                    pb=pb, file_list=interesting_files,
1551.11.9 by Aaron Bentley
Apply change reporting to merge
2508
                    change_reporter=change_reporter)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2509
            finally:
2510
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
2511
            if conflict_count != 0:
2512
                return 1
2513
            else:
2514
                return 0
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2515
        except errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
2516
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2517
                 "candidates are:\n  "
2518
                 + "\n  ".join(e.bases)
2519
                 + "\n"
2520
                 "please specify an explicit base with -r,\n"
2521
                 "and (if you want) report this to the bzr developers\n")
2522
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2523
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2524
    # TODO: move up to common parent; this isn't merge-specific anymore. 
2525
    def _get_remembered_parent(self, tree, supplied_location, verb_string):
2526
        """Use tree.branch's parent if none was supplied.
2527
2528
        Report if the remembered location was used.
2529
        """
2530
        if supplied_location is not None:
2531
            return supplied_location
2532
        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
2533
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2534
        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
2535
            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
2536
        display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2537
        self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2538
        return stored_location
2539
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2540
1185.35.4 by Aaron Bentley
Implemented remerge
2541
class cmd_remerge(Command):
2542
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2543
2544
    Use this if you want to try a different merge technique while resolving
2545
    conflicts.  Some merge techniques are better than others, and remerge 
2546
    lets you try different ones on different files.
2547
2548
    The options for remerge have the same meaning and defaults as the ones for
2549
    merge.  The difference is that remerge can (only) be run when there is a
2550
    pending merge, and it lets you specify particular files.
2551
2552
    Examples:
2553
    $ bzr remerge --show-base
2554
        Re-do the merge of all conflicted files, and show the base text in
2555
        conflict regions, in addition to the usual THIS and OTHER texts.
2556
2557
    $ bzr remerge --merge-type weave --reprocess foobar
2558
        Re-do the merge of "foobar", using the weave merge algorithm, with
2559
        additional processing to reduce the size of conflict regions.
2560
    
2561
    The following merge types are available:"""
1185.35.4 by Aaron Bentley
Implemented remerge
2562
    takes_args = ['file*']
2563
    takes_options = ['merge-type', 'reprocess',
2564
                     Option('show-base', help="Show base revision text in "
2565
                            "conflicts")]
2566
2567
    def run(self, file_list=None, merge_type=None, show_base=False,
2568
            reprocess=False):
2569
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2570
            merge_type = _mod_merge.Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2571
        tree, file_list = tree_files(file_list)
2572
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2573
        try:
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2574
            parents = tree.get_parent_ids()
2575
            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
2576
                raise errors.BzrCommandError("Sorry, remerge only works after normal"
2577
                                             " merges.  Not cherrypicking or"
2578
                                             " multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2579
            repository = tree.branch.repository
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2580
            base_revision = common_ancestor(parents[0],
2581
                                            parents[1], repository)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2582
            base_tree = repository.revision_tree(base_revision)
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2583
            other_tree = repository.revision_tree(parents[1])
1185.35.4 by Aaron Bentley
Implemented remerge
2584
            interesting_ids = None
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2585
            new_conflicts = []
2586
            conflicts = tree.conflicts()
1185.35.4 by Aaron Bentley
Implemented remerge
2587
            if file_list is not None:
2588
                interesting_ids = set()
2589
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2590
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2591
                    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
2592
                        raise errors.NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2593
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2594
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2595
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2596
                    
1508.1.15 by Robert Collins
Merge from mpool.
2597
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2598
                        interesting_ids.add(ie.file_id)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2599
                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
2600
            else:
2080.2.3 by John Arbash Meinel
remerge only supports text or content conflicts
2601
                # Remerge only supports resolving contents conflicts
2602
                allowed_conflicts = ('text conflict', 'contents conflict')
2603
                restore_files = [c.path for c in conflicts
2604
                                 if c.typestring in allowed_conflicts]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2605
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2606
            tree.set_conflicts(ConflictList(new_conflicts))
2080.2.1 by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
2607
            if file_list is not None:
1185.35.4 by Aaron Bentley
Implemented remerge
2608
                restore_files = file_list
2609
            for filename in restore_files:
2610
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2611
                    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
2612
                except errors.NotConflicted:
1185.35.4 by Aaron Bentley
Implemented remerge
2613
                    pass
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2614
            conflicts = _mod_merge.merge_inner(
2615
                                      tree.branch, other_tree, base_tree,
2616
                                      this_tree=tree,
2617
                                      interesting_ids=interesting_ids,
2618
                                      other_rev_id=parents[1],
2619
                                      merge_type=merge_type,
2620
                                      show_base=show_base,
2621
                                      reprocess=reprocess)
1185.35.4 by Aaron Bentley
Implemented remerge
2622
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2623
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2624
        if conflicts > 0:
2625
            return 1
2626
        else:
2627
            return 0
2628
2023.1.1 by ghigo
add topics help
2629
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2630
class cmd_revert(Command):
1551.8.27 by Aaron Bentley
Update docs again
2631
    """Revert files to a previous revision.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2632
1551.8.27 by Aaron Bentley
Update docs again
2633
    Giving a list of files will revert only those files.  Otherwise, all files
2634
    will be reverted.  If the revision is not specified with '--revision', the
2635
    last committed revision is used.
1551.8.26 by Aaron Bentley
Update revert help text
2636
2637
    To remove only some changes, without reverting to a prior version, use
2638
    merge instead.  For example, "merge . --r-2..-3" will remove the changes
2639
    introduced by -2, without affecting the changes introduced by -1.  Or
2640
    to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2641
    
2642
    By default, any files that have been manually changed will be backed up
2643
    first.  (Files changed only by merge are not backed up.)  Backup files have
1551.8.27 by Aaron Bentley
Update docs again
2644
    '.~#~' appended to their name, where # is a number.
2645
2646
    When you provide files, you can use their current pathname or the pathname
2647
    from the target revision.  So you can use revert to "undelete" a file by
2648
    name.  If you name a directory, all the contents of that directory will be
2649
    reverted.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2650
    """
2651
    takes_options = ['revision', 'no-backup']
2652
    takes_args = ['file*']
2653
    aliases = ['merge-revert']
2654
2655
    def run(self, revision=None, no_backup=False, file_list=None):
2656
        if file_list is not None:
2657
            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
2658
                raise errors.BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2659
        else:
2660
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2661
        
2662
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2663
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2664
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2665
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2666
        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
2667
            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.
2668
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2669
            rev_id = revision[0].in_history(tree.branch).rev_id
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2670
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2671
        try:
2672
            tree.revert(file_list, 
2673
                        tree.branch.repository.revision_tree(rev_id),
2225.1.1 by Aaron Bentley
Added revert change display, with tests
2674
                        not no_backup, pb, report_changes=True)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2675
        finally:
2676
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2677
2678
2679
class cmd_assert_fail(Command):
2680
    """Test reporting of assertion failures"""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2681
    # intended just for use in testing
2682
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2683
    hidden = True
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2684
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2685
    def run(self):
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2686
        raise AssertionError("always fails")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2687
2688
2689
class cmd_help(Command):
2690
    """Show help on a command or other topic.
2691
2023.1.1 by ghigo
add topics help
2692
    For a list of all available commands, say 'bzr help commands'.
2693
    """
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
2694
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2695
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2696
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2697
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2698
    @display_command
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
2699
    def run(self, topic=None, long=False):
2023.1.1 by ghigo
add topics help
2700
        import bzrlib.help
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2701
        if topic is None and long:
2702
            topic = "commands"
2023.1.1 by ghigo
add topics help
2703
        bzrlib.help.help(topic)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2704
2705
2706
class cmd_shell_complete(Command):
2707
    """Show appropriate completions for context.
2708
2023.1.1 by ghigo
add topics help
2709
    For a list of all available commands, say 'bzr shell-complete'.
2710
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2711
    takes_args = ['context?']
2712
    aliases = ['s-c']
2713
    hidden = True
2714
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2715
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2716
    def run(self, context=None):
2717
        import shellcomplete
2718
        shellcomplete.shellcomplete(context)
2719
2720
1228 by Martin Pool
- add fetch command as builtin
2721
class cmd_fetch(Command):
2722
    """Copy in history from another branch but don't merge it.
2723
2023.1.1 by ghigo
add topics help
2724
    This is an internal method used for pull and merge.
2725
    """
1228 by Martin Pool
- add fetch command as builtin
2726
    hidden = True
2727
    takes_args = ['from_branch', 'to_branch']
2728
    def run(self, from_branch, to_branch):
2729
        from bzrlib.fetch import Fetcher
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2730
        from_b = Branch.open(from_branch)
2731
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2732
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2733
2734
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2735
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2736
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2737
2023.1.1 by ghigo
add topics help
2738
    OTHER_BRANCH may be local or remote.
2739
    """
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2740
    takes_args = ['other_branch?']
2741
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2742
                     Option('mine-only', 
2743
                            'Display changes in the local branch only'),
2744
                     Option('theirs-only', 
2745
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik Bågfors
cover the missing command with formatters as well
2746
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2747
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2748
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2749
                     ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2750
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2751
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2752
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2753
    def run(self, other_branch=None, reverse=False, mine_only=False,
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2754
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2755
            show_ids=False, verbose=False):
2756
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2757
        from bzrlib.log import log_formatter
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2758
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2759
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2760
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2761
            other_branch = parent
2762
            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
2763
                raise errors.BzrCommandError("No peer location known or specified.")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
2764
            display_url = urlutils.unescape_for_display(parent,
2765
                                                        self.outf.encoding)
2766
            print "Using last location: " + display_url
2767
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2768
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2769
        if remote_branch.base == local_branch.base:
2770
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2771
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2772
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2773
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2774
            try:
2775
                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'.
2776
                if (log_format is None):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
2777
                    log_format = log.log_formatter_registry.get_default(
2778
                        local_branch)
2779
                lf = log_format(to_file=self.outf,
2780
                                show_ids=show_ids,
2781
                                show_timezone='original')
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2782
                if reverse is False:
2783
                    local_extra.reverse()
2784
                    remote_extra.reverse()
2785
                if local_extra and not theirs_only:
2786
                    print "You have %d extra revision(s):" % len(local_extra)
2787
                    for data in iter_log_data(local_extra, local_branch.repository,
2788
                                              verbose):
2789
                        lf.show(*data)
2790
                    printed_local = True
2791
                else:
2792
                    printed_local = False
2793
                if remote_extra and not mine_only:
2794
                    if printed_local is True:
2795
                        print "\n\n"
2796
                    print "You are missing %d revision(s):" % len(remote_extra)
2797
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2798
                                              verbose):
2799
                        lf.show(*data)
2800
                if not remote_extra and not local_extra:
2801
                    status_code = 0
2802
                    print "Branches are up to date."
2803
                else:
2804
                    status_code = 1
2805
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2806
                remote_branch.unlock()
2807
        finally:
2808
            local_branch.unlock()
2809
        if not status_code and parent is None and other_branch is not None:
2810
            local_branch.lock_write()
2811
            try:
2812
                # handle race conditions - a parent might be set while we run.
2813
                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
2814
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2815
            finally:
2816
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2817
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2818
2819
2820
class cmd_plugins(Command):
2821
    """List plugins"""
2822
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2823
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2824
    def run(self):
2825
        import bzrlib.plugin
2826
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2827
        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'.
2828
            if getattr(plugin, '__path__', None) is not None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2829
                print plugin.__path__[0]
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2830
            elif getattr(plugin, '__file__', None) is not None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2831
                print plugin.__file__
2832
            else:
1963.2.4 by Robey Pointer
remove usage of hasattr
2833
                print repr(plugin)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2834
                
2835
            d = getdoc(plugin)
2836
            if d:
2837
                print '\t', d.split('\n')[0]
2838
2839
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2840
class cmd_testament(Command):
2841
    """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
2842
    takes_options = ['revision', 
2843
                     Option('long', help='Produce long-format testament'), 
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2844
                     Option('strict', help='Produce a strict-format'
2845
                            ' testament')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2846
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2847
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2848
    def run(self, branch=u'.', revision=None, long=False, strict=False):
2849
        from bzrlib.testament import Testament, StrictTestament
2850
        if strict is True:
2851
            testament_class = StrictTestament
2852
        else:
2853
            testament_class = Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2854
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2855
        b.lock_read()
2856
        try:
2857
            if revision is None:
2858
                rev_id = b.last_revision()
2859
            else:
2860
                rev_id = revision[0].in_history(b).rev_id
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2861
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2862
            if long:
2863
                sys.stdout.writelines(t.as_text_lines())
2864
            else:
2865
                sys.stdout.write(t.as_short_text())
2866
        finally:
2867
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2868
2869
2870
class cmd_annotate(Command):
2871
    """Show the origin of each line in a file.
2872
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2873
    This prints out the given file with an annotation on the left side
2874
    indicating which revision, author and date introduced the change.
2875
2876
    If the origin is the same for a run of consecutive lines, it is 
2877
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2878
    """
2879
    # 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
2880
    # TODO: if the working copy is modified, show annotations on that 
2881
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
2882
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2883
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2884
    takes_options = [Option('all', help='show annotations on all lines'),
2885
                     Option('long', help='show date in annotations'),
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2886
                     'revision',
2887
                     'show-ids',
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2888
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2889
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2890
    @display_command
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2891
    def run(self, filename, all=False, long=False, revision=None,
2892
            show_ids=False):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2893
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2894
        tree, relpath = WorkingTree.open_containing(filename)
2895
        branch = tree.branch
2896
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2897
        try:
1694.2.6 by Martin Pool
[merge] bzr.dev
2898
            if revision is None:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2899
                revision_id = branch.last_revision()
1694.2.6 by Martin Pool
[merge] bzr.dev
2900
            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
2901
                raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
1694.2.6 by Martin Pool
[merge] bzr.dev
2902
            else:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2903
                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).
2904
            file_id = tree.inventory.path2id(relpath)
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2905
            tree = branch.repository.revision_tree(revision_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2906
            file_version = tree.inventory[file_id].revision
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2907
            annotate_file(branch, file_version, file_id, long, all, sys.stdout,
2908
                          show_ids=show_ids)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2909
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2910
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2911
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2912
2913
class cmd_re_sign(Command):
2914
    """Create a digital signature for an existing revision."""
2915
    # TODO be able to replace existing ones.
2916
2917
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2918
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2919
    takes_options = ['revision']
2920
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2921
    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.
2922
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2923
        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
2924
            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
2925
        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
2926
            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)
2927
        b = WorkingTree.open_containing(u'.')[0].branch
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
2928
        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
2929
        if revision_id_list is not None:
2930
            for revision_id in revision_id_list:
2931
                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.
2932
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2933
            if len(revision) == 1:
2934
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2935
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2936
            elif len(revision) == 2:
2937
                # are they both on rh- if so we can walk between them
2938
                # might be nice to have a range helper for arbitrary
2939
                # revision paths. hmm.
2940
                from_revno, from_revid = revision[0].in_history(b)
2941
                to_revno, to_revid = revision[1].in_history(b)
2942
                if to_revid is None:
2943
                    to_revno = b.revno()
2944
                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
2945
                    raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2946
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2947
                    b.repository.sign_revision(b.get_rev_id(revno), 
2948
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2949
            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
2950
                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.
2951
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2952
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2953
class cmd_bind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
2954
    """Convert the current branch into a checkout of the supplied branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2955
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
2956
    Once converted into a checkout, commits must succeed on the master branch
2957
    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.
2958
2959
    See "help checkouts" for more information on checkouts.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2960
    """
2961
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2962
    takes_args = ['location?']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2963
    takes_options = []
2964
2965
    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
2966
        b, relpath = Branch.open_containing(u'.')
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2967
        if location is None:
2968
            try:
2969
                location = b.get_old_bound_location()
2970
            except errors.UpgradeRequired:
2971
                raise errors.BzrCommandError('No location supplied.  '
2972
                    'This format does not remember old locations.')
2973
            else:
2974
                if location is None:
2230.3.45 by Aaron Bentley
Change error message (mpool)
2975
                    raise errors.BzrCommandError('No location supplied and no '
2976
                        'previous location known')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2977
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2978
        try:
2979
            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
2980
        except errors.DivergedBranches:
2981
            raise errors.BzrCommandError('These branches have diverged.'
2982
                                         ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2983
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2984
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2985
class cmd_unbind(Command):
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
2986
    """Convert the current checkout into a regular branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2987
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
2988
    After unbinding, the local branch is considered independent and subsequent
2989
    commits will be local only.
2245.7.1 by James Westby
Add a help topic describing checkouts and how they work.
2990
2991
    See "help checkouts" for more information on checkouts.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2992
    """
2993
2994
    takes_args = []
2995
    takes_options = []
2996
2997
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2998
        b, relpath = Branch.open_containing(u'.')
2999
        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
3000
            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
3001
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
3002
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
3003
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3004
    """Remove the last committed revision.
3005
3006
    --verbose will print out what is being removed.
3007
    --dry-run will go through all the motions, but not actually
3008
    remove anything.
3009
    
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
3010
    In the future, uncommit will create a revision bundle, which can then
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3011
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
3012
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
3013
1553.5.34 by Martin Pool
Stub lock-breaking command
3014
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
3015
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
3016
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3017
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
3018
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3019
                    Option('dry-run', help='Don\'t actually make changes'),
3020
                    Option('force', help='Say yes to all questions.')]
3021
    takes_args = ['location?']
3022
    aliases = []
3023
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3024
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3025
            dry_run=False, verbose=False,
3026
            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
3027
        from bzrlib.log import log_formatter, show_log
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3028
        import sys
3029
        from bzrlib.uncommit import uncommit
3030
3031
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
3032
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3033
        control, relpath = bzrdir.BzrDir.open_containing(location)
3034
        try:
3035
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
3036
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3037
        except (errors.NoWorkingTree, errors.NotLocalUrl):
3038
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
3039
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3040
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3041
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3042
        if revision is None:
3043
            revno = b.revno()
3044
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
3045
            # 'bzr uncommit -r 10' actually means uncommit
3046
            # so that the final tree is at revno 10.
3047
            # but bzrlib.uncommit.uncommit() actually uncommits
3048
            # the revisions that are supplied.
3049
            # So we need to offset it by one
3050
            revno = revision[0].in_history(b).revno+1
3051
3052
        if revno <= b.revno():
3053
            rev_id = b.get_rev_id(revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3054
        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
3055
            self.outf.write('No revisions to uncommit.\n')
3056
            return 1
3057
3058
        lf = log_formatter('short',
3059
                           to_file=self.outf,
3060
                           show_timezone='original')
3061
3062
        show_log(b,
3063
                 lf,
3064
                 verbose=False,
3065
                 direction='forward',
3066
                 start_revision=revno,
3067
                 end_revision=b.revno())
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3068
3069
        if dry_run:
3070
            print 'Dry-run, pretending to remove the above revisions.'
3071
            if not force:
3072
                val = raw_input('Press <enter> to continue')
3073
        else:
3074
            print 'The above revision(s) will be removed.'
3075
            if not force:
3076
                val = raw_input('Are you sure [y/N]? ')
3077
                if val.lower() not in ('y', 'yes'):
3078
                    print 'Canceled'
3079
                    return 0
3080
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
3081
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
3082
                revno=revno)
3083
3084
1553.5.34 by Martin Pool
Stub lock-breaking command
3085
class cmd_break_lock(Command):
3086
    """Break a dead lock on a repository, branch or working directory.
3087
1553.5.35 by Martin Pool
Start break-lock --show
3088
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
3089
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3090
3091
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
3092
    
3093
    example:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3094
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
3095
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3096
    takes_args = ['location?']
3097
3098
    def run(self, location=None, show=False):
3099
        if location is None:
3100
            location = u'.'
3101
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
3102
        try:
3103
            control.break_lock()
3104
        except NotImplementedError:
3105
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
3106
        
1553.5.35 by Martin Pool
Start break-lock --show
3107
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
3108
class cmd_wait_until_signalled(Command):
3109
    """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3110
3111
    This just prints a line to signal when it is ready, then blocks on stdin.
3112
    """
3113
3114
    hidden = True
3115
3116
    def run(self):
1910.17.6 by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print.
3117
        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
3118
        sys.stdout.flush()
3119
        sys.stdin.readline()
3120
1553.5.35 by Martin Pool
Start break-lock --show
3121
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3122
class cmd_serve(Command):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3123
    """Run the bzr server."""
3124
3125
    aliases = ['server']
3126
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3127
    takes_options = [
3128
        Option('inet',
3129
               help='serve on stdin/out for use from inetd or sshd'),
3130
        Option('port',
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
3131
               help='listen for connections on nominated port of the form '
3132
                    '[hostname:]portnumber. Passing 0 as the port number will '
3133
                    'result in a dynamically allocated port.',
3134
               type=str),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3135
        Option('directory',
3136
               help='serve contents of directory',
3137
               type=unicode),
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3138
        Option('allow-writes',
3139
               help='By default the server is a readonly server. Supplying '
3140
                    '--allow-writes enables write access to the contents of '
3141
                    'the served directory and below. '
3142
                ),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3143
        ]
3144
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3145
    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
3146
        from bzrlib.transport import smart
3147
        from bzrlib.transport import get_transport
3148
        if directory is None:
3149
            directory = os.getcwd()
2044.2.1 by Lukáš Lalinský
Use urlutils.local_path_to_url to get an URL from the directory path.
3150
        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`.
3151
        if not allow_writes:
3152
            url = 'readonly+' + url
3153
        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
3154
        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.
3155
            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
3156
        elif port is not None:
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
3157
            if ':' in port:
3158
                host, port = port.split(':')
3159
            else:
3160
                host = '127.0.0.1'
3161
            server = smart.SmartTCPServer(t, host=host, port=int(port))
3162
            print 'listening on port: ', server.port
3163
            sys.stdout.flush()
1910.19.8 by Andrew Bennetts
Give a sensible error if insufficient options are passed to 'bzr serve'.
3164
        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
3165
            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
3166
        server.serve()
3167
1553.5.35 by Martin Pool
Start break-lock --show
3168
3169
# 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
3170
def _merge_helper(other_revision, base_revision,
3171
                  check_clean=True, ignore_zero=False,
3172
                  this_dir=None, backup_files=False,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
3173
                  merge_type=None,
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
3174
                  file_list=None, show_base=False, reprocess=False,
2149.2.1 by Jan Hudec
Option --pull for merge command.
3175
                  pull=False,
1551.11.9 by Aaron Bentley
Apply change reporting to merge
3176
                  pb=DummyProgress(),
3177
                  change_reporter=None):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3178
    """Merge changes into a tree.
3179
3180
    base_revision
3181
        list(path, revno) Base for three-way merge.  
3182
        If [None, None] then a base will be automatically determined.
3183
    other_revision
3184
        list(path, revno) Other revision for three-way merge.
3185
    this_dir
3186
        Directory to merge changes into; '.' by default.
3187
    check_clean
3188
        If true, this_dir must have no uncommitted changes before the
3189
        merge begins.
3190
    ignore_zero - If true, suppress the "zero conflicts" message when 
3191
        there are no conflicts; should be set when doing something we expect
3192
        to complete perfectly.
3193
    file_list - If supplied, merge only changes to selected files.
3194
3195
    All available ancestors of other_revision and base_revision are
3196
    automatically pulled into the branch.
3197
3198
    The revno may be -1 to indicate the last revision on the branch, which is
3199
    the typical case.
3200
3201
    This function is intended for use from the command line; programmatic
3202
    clients might prefer to call merge.merge_inner(), which has less magic 
3203
    behavior.
3204
    """
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
3205
    # Loading it late, so that we don't always have to import bzrlib.merge
3206
    if merge_type is None:
3207
        merge_type = _mod_merge.Merge3Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3208
    if this_dir is None:
3209
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
3210
    this_tree = WorkingTree.open_containing(this_dir)[0]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3211
    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
3212
        raise errors.BzrCommandError("Show-base is not supported for this merge"
3213
                                     " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
3214
    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
3215
        raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3216
                                     " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3217
    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
3218
        raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3219
    try:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3220
        merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
1551.11.9 by Aaron Bentley
Apply change reporting to merge
3221
                                   pb=pb, change_reporter=change_reporter)
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3222
        merger.pp = ProgressPhase("Merge phase", 5, pb)
3223
        merger.pp.next_phase()
3224
        merger.check_basis(check_clean)
3225
        merger.set_other(other_revision)
3226
        merger.pp.next_phase()
3227
        merger.set_base(base_revision)
3228
        if merger.base_rev_id == merger.other_rev_id:
3229
            note('Nothing to do.')
3230
            return 0
2149.2.1 by Jan Hudec
Option --pull for merge command.
3231
        if file_list is None:
3232
            if pull and merger.base_rev_id == merger.this_rev_id:
3233
                count = merger.this_tree.pull(merger.this_branch,
3234
                        False, merger.other_rev_id)
3235
                note('%d revision(s) pulled.' % (count,))
3236
                return 0
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3237
        merger.backup_files = backup_files
3238
        merger.merge_type = merge_type 
3239
        merger.set_interesting_files(file_list)
3240
        merger.show_base = show_base 
3241
        merger.reprocess = reprocess
3242
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
3243
        if file_list is None:
3244
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3245
    finally:
3246
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3247
    return conflicts
3248
3249
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3250
# Compatibility
3251
merge = _merge_helper
3252
3253
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
3254
# these get imported and then picked up by the scan for cmd_*
3255
# TODO: Some more consistent way to split command definitions across files;
3256
# 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'.
3257
# aliases.  ideally we would avoid loading the implementation until the
3258
# details were needed.
2022.1.2 by John Arbash Meinel
rename version_info => cmd_version_info
3259
from bzrlib.cmd_version_info import cmd_version_info
1185.35.4 by Aaron Bentley
Implemented remerge
3260
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
3261
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.
3262
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
3263
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3264
        cmd_weave_plan_merge, cmd_weave_merge_text