/brz/remove-bazaar

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