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