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