/brz/remove-bazaar

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