/brz/remove-bazaar

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