/brz/remove-bazaar

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