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