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