/brz/remove-bazaar

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