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