/brz/remove-bazaar

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