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