/brz/remove-bazaar

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