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