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