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