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