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