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