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