/brz/remove-bazaar

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