/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.34 by Martin Pool
Stub lock-breaking command
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2
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.
7
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.
12
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
19
1508.1.20 by Robert Collins
Create a checkout command.
20
import errno
1185.65.29 by Robert Collins
Implement final review suggestions.
21
import os
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
22
import codecs
1508.1.20 by Robert Collins
Create a checkout command.
23
from shutil import rmtree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
24
import sys
25
26
import bzrlib
1508.1.25 by Robert Collins
Update per review comments.
27
import bzrlib.branch
28
from bzrlib.branch import Branch
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.
29
import bzrlib.bzrdir as bzrdir
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
30
from bzrlib.commands import Command, display_command
1185.35.4 by Aaron Bentley
Implemented remerge
31
from bzrlib.revision import common_ancestor
1505.1.10 by John Arbash Meinel
Brought back 'optimized' version, for better errors, cleaned up exception handling.
32
import bzrlib.errors as errors
1185.35.4 by Aaron Bentley
Implemented remerge
33
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError, 
1185.35.13 by Aaron Bentley
Merged Martin
34
                           NotBranchError, DivergedBranches, NotConflicted,
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
35
                           NoSuchFile, NoWorkingTree, FileInWrongBranch,
36
                           NotVersionedError)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
37
from bzrlib.log import show_one_log
1534.7.140 by Aaron Bentley
Moved the merge stuff into merge.py
38
from bzrlib.merge import Merge3Merger
1185.16.43 by Martin Pool
- clean up handling of option objects
39
from bzrlib.option import Option
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
40
from bzrlib.progress import DummyProgress, ProgressPhase
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
41
from bzrlib.revisionspec import RevisionSpec
1460 by Robert Collins
merge from martin.
42
import bzrlib.trace
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
43
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
44
from bzrlib.transport.local import LocalTransport
1534.9.10 by Aaron Bentley
Fixed use of ui_factory (which can't be imported directly)
45
import bzrlib.ui
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
46
from bzrlib.workingtree import WorkingTree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
47
48
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
49
def tree_files(file_list, default_branch=u'.'):
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
50
    try:
1508.1.15 by Robert Collins
Merge from mpool.
51
        return internal_tree_files(file_list, default_branch)
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
52
    except FileInWrongBranch, e:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
53
        raise BzrCommandError("%s is not in the same branch as %s" %
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
54
                             (e.path, file_list[0]))
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
55
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
56
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
57
# XXX: Bad function name; should possibly also be a class method of
58
# WorkingTree rather than a function.
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
59
def internal_tree_files(file_list, default_branch=u'.'):
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
60
    """Convert command-line paths to a WorkingTree and relative paths.
61
62
    This is typically used for command-line processors that take one or
63
    more filenames, and infer the workingtree that contains them.
64
65
    The filenames given are not required to exist.
66
67
    :param file_list: Filenames to convert.  
68
69
    :param default_branch: Fallback tree path to use if file_list is empty or None.
70
71
    :return: workingtree, [relative_paths]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
72
    """
73
    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
74
        return WorkingTree.open_containing(default_branch)[0], file_list
75
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
76
    new_list = []
77
    for filename in file_list:
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
78
        try:
79
            new_list.append(tree.relpath(filename))
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
80
        except errors.PathNotChild:
1508.1.15 by Robert Collins
Merge from mpool.
81
            raise FileInWrongBranch(tree.branch, filename)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
82
    return tree, new_list
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
83
84
1553.5.78 by Martin Pool
New bzr init --format option and test
85
def get_format_type(typestring):
86
    """Parse and return a format specifier."""
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
87
    if typestring == "weave":
88
        return bzrdir.BzrDirFormat6()
1553.5.78 by Martin Pool
New bzr init --format option and test
89
    if typestring == "metadir":
90
        return bzrdir.BzrDirMetaFormat1()
91
    if typestring == "knit":
92
        format = bzrdir.BzrDirMetaFormat1()
93
        format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
94
        return format
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
95
    msg = "No known bzr-dir format %s. Supported types are: weave, metadir\n" %\
1553.5.78 by Martin Pool
New bzr init --format option and test
96
        (typestring)
97
    raise BzrCommandError(msg)
98
99
1185.16.112 by mbp at sourcefrog
todo
100
# TODO: Make sure no commands unconditionally use the working directory as a
101
# branch.  If a filename argument is used, the first of them should be used to
102
# specify the branch.  (Perhaps this can be factored out into some kind of
103
# Argument class, representing a file in a branch, where the first occurrence
104
# opens the branch?)
105
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
106
class cmd_status(Command):
107
    """Display status summary.
108
109
    This reports on versioned and unknown files, reporting them
110
    grouped by state.  Possible states are:
111
112
    added
113
        Versioned in the working copy but not in the previous revision.
114
115
    removed
116
        Versioned in the previous revision but removed or deleted
117
        in the working copy.
118
119
    renamed
120
        Path of this file changed from the previous revision;
121
        the text may also have changed.  This includes files whose
122
        parent directory was renamed.
123
124
    modified
125
        Text has changed since the previous revision.
126
127
    unchanged
128
        Nothing about this file has changed since the previous revision.
129
        Only shown with --all.
130
131
    unknown
132
        Not versioned and not matching an ignore pattern.
133
134
    To see ignored files use 'bzr ignored'.  For details in the
135
    changes to file texts, use 'bzr diff'.
136
137
    If no arguments are specified, the status of the entire working
138
    directory is shown.  Otherwise, only the status of the specified
139
    files or directories is reported.  If a directory is given, status
140
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
141
142
    If a revision argument is given, the status is calculated against
143
    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
144
    """
1185.16.76 by Martin Pool
doc
145
    
146
    # TODO: --no-recurse, --recurse options
147
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
148
    takes_args = ['file*']
1185.34.4 by Jelmer Vernooij
Support -r option to bzr status. The backend code already handled
149
    takes_options = ['all', 'show-ids', 'revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
150
    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()
151
152
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
153
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
154
    @display_command
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
155
    def run(self, all=False, show_ids=False, file_list=None, revision=None):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
156
        from bzrlib.status import show_tree_status
1185.85.15 by John Arbash Meinel
Updated bzr status, adding test_cat
157
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
158
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
159
            
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
160
        show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
1185.85.84 by John Arbash Meinel
[merge] bzr.dev 1573, lots of updates
161
                         specific_files=file_list, revision=revision,
162
                         to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
163
164
165
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
166
    """Write out metadata for a revision.
167
    
168
    The revision to print can either be specified by a specific
169
    revision identifier, or you can use --revision.
170
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
171
172
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
173
    takes_args = ['revision_id?']
174
    takes_options = ['revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
175
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
176
    @display_command
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
177
    def run(self, revision_id=None, revision=None):
178
179
        if revision_id is not None and revision is not None:
180
            raise BzrCommandError('You can only supply one of revision_id or --revision')
181
        if revision_id is None and revision is None:
182
            raise 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)
183
        b = WorkingTree.open_containing(u'.')[0].branch
1185.85.72 by John Arbash Meinel
Fix some of the tests.
184
185
        # TODO: jam 20060112 should cat-revision always output utf-8?
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
186
        if revision_id is not None:
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
187
            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.
188
        elif revision is not None:
189
            for rev in revision:
190
                if rev is None:
191
                    raise BzrCommandError('You cannot specify a NULL revision.')
192
                revno, rev_id = rev.in_history(b)
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
193
                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
194
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
195
196
class cmd_revno(Command):
197
    """Show current revision number.
198
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
199
    This is equal to the number of revisions on this branch.
200
    """
201
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
202
    takes_args = ['location?']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
203
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
204
    @display_command
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
205
    def run(self, location=u'.'):
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
206
        self.outf.write(str(Branch.open_containing(location)[0].revno()))
207
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
208
1182 by Martin Pool
- more disentangling of xml storage format from objects
209
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
210
class cmd_revision_info(Command):
211
    """Show revision number and revision id for a given revision identifier.
212
    """
213
    hidden = True
214
    takes_args = ['revision_info*']
215
    takes_options = ['revision']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
216
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
217
    @display_command
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
218
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
219
220
        revs = []
221
        if revision is not None:
222
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
223
        if revision_info_list is not None:
224
            for rev in revision_info_list:
225
                revs.append(RevisionSpec(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
226
        if len(revs) == 0:
227
            raise BzrCommandError('You must supply a revision identifier')
228
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
229
        b = WorkingTree.open_containing(u'.')[0].branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
230
231
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
232
            revinfo = rev.in_history(b)
233
            if revinfo.revno is None:
234
                print '     %s' % revinfo.rev_id
235
            else:
236
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
237
238
    
239
class cmd_add(Command):
240
    """Add specified files or directories.
241
242
    In non-recursive mode, all the named items are added, regardless
243
    of whether they were previously ignored.  A warning is given if
244
    any of the named files are already versioned.
245
246
    In recursive mode (the default), files are treated the same way
247
    but the behaviour for directories is different.  Directories that
248
    are already versioned do not give a warning.  All directories,
249
    whether already versioned or not, are searched for files or
250
    subdirectories that are neither versioned or ignored, and these
251
    are added.  This search proceeds recursively into versioned
252
    directories.  If no names are given '.' is assumed.
253
254
    Therefore simply saying 'bzr add' will version all files that
255
    are currently unknown.
256
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
257
    Adding a file whose parent directory is not versioned will
258
    implicitly add the parent, and so on up to the root. This means
259
    you should never need to explictly add a directory, they'll just
260
    get added when you add a file in the directory.
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
261
262
    --dry-run will show which files would be added, but not actually 
263
    add them.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
264
    """
265
    takes_args = ['file*']
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
266
    takes_options = ['no-recurse', 'dry-run', 'verbose']
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()
267
    encoding_type = 'replace'
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
268
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
269
    def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
270
        import bzrlib.add
271
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()
272
        action = bzrlib.add.AddAction(to_file=self.outf,
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
273
            should_add=(not dry_run), should_print=(not is_quiet()))
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
274
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
275
        added, ignored = bzrlib.add.smart_add(file_list, not no_recurse, 
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
276
                                              action=action)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
277
        if len(ignored) > 0:
278
            for glob in sorted(ignored.keys()):
279
                match_len = len(ignored[glob])
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
280
                if verbose:
281
                    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()
282
                        self.outf.write("ignored %s matching \"%s\"\n" 
283
                                        % (path, glob))
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
284
                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()
285
                    self.outf.write("ignored %d file(s) matching \"%s\"\n"
286
                                    % (match_len, glob))
287
            self.outf.write("If you wish to add some of these files,"
288
                            " please add them by name.\n")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
289
290
291
class cmd_mkdir(Command):
292
    """Create a new versioned directory.
293
294
    This is equivalent to creating the directory and then adding it.
295
    """
296
    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()
297
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
298
299
    def run(self, dir_list):
300
        for d in dir_list:
301
            os.mkdir(d)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
302
            wt, dd = WorkingTree.open_containing(d)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
303
            wt.add([dd])
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()
304
            self.outf.write('added ')
305
            self.outf.write(d)
306
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
307
308
309
class cmd_relpath(Command):
310
    """Show path of a file relative to root"""
311
    takes_args = ['filename']
312
    hidden = True
313
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
314
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
315
    def run(self, filename):
1185.85.19 by John Arbash Meinel
Updated bzr relpath
316
        # TODO: jam 20050106 Can relpath return a munged path if
317
        #       sys.stdout encoding cannot represent it?
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
318
        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()
319
        self.outf.write(relpath)
320
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
321
322
323
class cmd_inventory(Command):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
324
    """Show inventory of the current working copy or a revision.
325
326
    It is possible to limit the output to a particular entry
327
    type using the --kind option.  For example; --kind file.
328
    """
329
    takes_options = ['revision', 'show-ids', 'kind']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
330
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
331
    @display_command
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
332
    def run(self, revision=None, show_ids=False, kind=None):
333
        if kind and kind not in ['file', 'directory', 'symlink']:
334
            raise BzrCommandError('invalid kind specified')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
335
        tree = WorkingTree.open_containing(u'.')[0]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
336
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
337
            inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
338
        else:
339
            if len(revision) > 1:
340
                raise BzrCommandError('bzr inventory --revision takes'
341
                    ' exactly one revision identifier')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
342
            inv = tree.branch.repository.get_revision_inventory(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
343
                revision[0].in_history(tree.branch).rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
344
345
        for path, entry in inv.entries():
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
346
            if kind and kind != entry.kind:
347
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
348
            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()
349
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
350
            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()
351
                self.outf.write(path)
352
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
353
354
355
class cmd_mv(Command):
356
    """Move or rename a file.
357
358
    usage:
359
        bzr mv OLDNAME NEWNAME
360
        bzr mv SOURCE... DESTINATION
361
362
    If the last argument is a versioned directory, all the other names
363
    are moved into it.  Otherwise, there must be exactly two arguments
364
    and the file is changed to a new name, which must not already exist.
365
366
    Files cannot be moved between branches.
367
    """
368
    takes_args = ['names*']
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
369
    aliases = ['move', 'rename']
370
1185.85.26 by John Arbash Meinel
bzr mv should succeed even if it can't display the paths.
371
    encoding_type = 'replace'
372
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
373
    def run(self, names_list):
374
        if len(names_list) < 2:
375
            raise BzrCommandError("missing file argument")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
376
        tree, rel_names = tree_files(names_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
377
        
378
        if os.path.isdir(names_list[-1]):
379
            # move into existing directory
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
380
            for pair in tree.move(rel_names[:-1], rel_names[-1]):
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
381
                self.outf.write("%s => %s\n" % pair)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
382
        else:
383
            if len(names_list) != 2:
384
                raise BzrCommandError('to mv multiple files the destination '
385
                                      'must be a versioned directory')
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
386
            tree.rename_one(rel_names[0], rel_names[1])
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
387
            self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
388
            
389
    
390
class cmd_pull(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
391
    """Turn this branch into a mirror of another branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
392
393
    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
394
    considered diverged if the destination branch's most recent commit is one
395
    that has not been merged (directly or indirectly) into the parent.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
396
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
397
    If branches have diverged, you can use 'bzr merge' to integrate the changes
398
    from one into the other.  Once one branch has merged, the other should
399
    be able to pull it again.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
400
401
    If branches have diverged, you can use 'bzr merge' to pull the text changes
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
402
    from one into the other.  Once one branch has merged, the other should
403
    be able to pull it again.
404
405
    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
406
    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
407
408
    If there is no default location set, the first pull will set it.  After
409
    that, you can omit the location to use the default.  To change the
410
    default, use --remember.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
411
    """
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
412
    takes_options = ['remember', 'overwrite', 'revision', 'verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
413
    takes_args = ['location?']
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
414
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
415
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
416
    def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
417
        # FIXME: too much stuff is in the command class
418
        try:
419
            tree_to = WorkingTree.open_containing(u'.')[0]
420
            branch_to = tree_to.branch
421
        except NoWorkingTree:
422
            tree_to = None
423
            branch_to = Branch.open_containing(u'.')[0] 
424
        stored_loc = branch_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
425
        if location is None:
426
            if stored_loc is None:
427
                raise BzrCommandError("No pull location known or specified.")
428
            else:
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
429
                self.outf.write("Using saved location: %s\n" % stored_loc)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
430
                location = stored_loc
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
431
1614.2.12 by Olaf Conradi
Merge bzr.dev
432
        if branch_to.get_parent() is None or remember:
433
            branch_to.set_parent(location)
1614.2.8 by Olaf Conradi
Added testcases for using pull with --remember. Moved remember code to
434
1614.2.12 by Olaf Conradi
Merge bzr.dev
435
        branch_from = Branch.open(location)
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
436
1185.76.4 by Erik BÃ¥gfors
expanded tabs
437
        if revision is None:
438
            rev_id = None
1185.76.3 by Erik BÃ¥gfors
changes for pull --revision based on input from John
439
        elif len(revision) == 1:
1614.2.12 by Olaf Conradi
Merge bzr.dev
440
            rev_id = revision[0].in_history(branch_from).rev_id
1185.76.4 by Erik BÃ¥gfors
expanded tabs
441
        else:
442
            raise BzrCommandError('bzr pull --revision takes one value.')
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
443
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
444
        old_rh = branch_to.revision_history()
445
        if tree_to is not None:
1614.2.12 by Olaf Conradi
Merge bzr.dev
446
            count = tree_to.pull(branch_from, overwrite, rev_id)
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
447
        else:
1614.2.12 by Olaf Conradi
Merge bzr.dev
448
            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
449
        note('%d revision(s) pulled.' % (count,))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
450
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
451
        if verbose:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
452
            new_rh = branch_to.revision_history()
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
453
            if old_rh != new_rh:
454
                # Something changed
455
                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
456
                show_changed_revisions(branch_to, old_rh, new_rh,
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
457
                                       to_file=self.outf)
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
458
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
459
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
460
class cmd_push(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
461
    """Update a mirror of this branch.
462
    
463
    The target branch will not have its working tree populated because this
464
    is both expensive, and is not supported on remote file systems.
465
    
466
    Some smart servers or protocols *may* put the working tree in place in
467
    the future.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
468
469
    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
470
    considered diverged if the destination branch's most recent commit is one
471
    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.
472
473
    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
474
    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.
475
    
476
    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
477
    do a merge (see bzr help merge) from the other branch, and commit that.
478
    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
479
480
    If there is no default push location set, the first push will set it.
481
    After that, you can omit the location to use the default.  To change the
482
    default, use --remember.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
483
    """
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
484
    takes_options = ['remember', 'overwrite', 'verbose',
1495 by Robert Collins
Add a --create-prefix to the new push command.
485
                     Option('create-prefix', 
486
                            help='Create the path leading up to the branch '
487
                                 'if it does not already exist')]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
488
    takes_args = ['location?']
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
489
    encoding_type = 'replace'
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
490
1495 by Robert Collins
Add a --create-prefix to the new push command.
491
    def run(self, location=None, remember=False, overwrite=False,
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
492
            create_prefix=False, verbose=False):
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
493
        # FIXME: Way too big!  Put this into a function called from the
494
        # command.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
495
        from bzrlib.transport import get_transport
496
        
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
497
        tree_from = WorkingTree.open_containing(u'.')[0]
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
498
        br_from = tree_from.branch
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
499
        stored_loc = tree_from.branch.get_push_location()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
500
        if location is None:
501
            if stored_loc is None:
502
                raise BzrCommandError("No push location known or specified.")
503
            else:
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
504
                self.outf.write("Using saved location: %s" % stored_loc)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
505
                location = stored_loc
1614.2.9 by Olaf Conradi
Added testcases for using push with --remember. Moved remember code to
506
        if br_from.get_push_location() is None or remember:
507
            br_from.set_push_location(location)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
508
        try:
1563.2.38 by Robert Collins
make push preserve tree formats.
509
            dir_to = bzrlib.bzrdir.BzrDir.open(location)
510
            br_to = dir_to.open_branch()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
511
        except NotBranchError:
512
            # create a branch.
513
            transport = get_transport(location).clone('..')
1495 by Robert Collins
Add a --create-prefix to the new push command.
514
            if not create_prefix:
515
                try:
516
                    transport.mkdir(transport.relpath(location))
517
                except NoSuchFile:
518
                    raise BzrCommandError("Parent directory of %s "
519
                                          "does not exist." % location)
520
            else:
521
                current = transport.base
522
                needed = [(transport, transport.relpath(location))]
523
                while needed:
524
                    try:
525
                        transport, relpath = needed[-1]
526
                        transport.mkdir(relpath)
527
                        needed.pop()
528
                    except NoSuchFile:
529
                        new_transport = transport.clone('..')
530
                        needed.append((new_transport,
531
                                       new_transport.relpath(transport.base)))
532
                        if new_transport.base == transport.base:
1616.1.16 by Martin Pool
typo
533
                            raise BzrCommandError("Could not create "
1495 by Robert Collins
Add a --create-prefix to the new push command.
534
                                                  "path prefix.")
1563.2.38 by Robert Collins
make push preserve tree formats.
535
            dir_to = br_from.bzrdir.clone(location)
536
            br_to = dir_to.open_branch()
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.
537
        old_rh = br_to.revision_history()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
538
        try:
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.
539
            try:
1563.2.38 by Robert Collins
make push preserve tree formats.
540
                tree_to = dir_to.open_workingtree()
541
            except errors.NotLocalUrl:
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.
542
                # TODO: This should be updated for branches which don't have a
543
                # working tree, as opposed to ones where we just couldn't 
544
                # update the tree.
1558.7.4 by Aaron Bentley
Adjust push warning [Matthew Fuller]
545
                warning('This transport does not update the working '
546
                        'tree of: %s' % (br_to.base,))
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.
547
                count = br_to.pull(br_from, overwrite)
1563.2.38 by Robert Collins
make push preserve tree formats.
548
            except NoWorkingTree:
549
                count = br_to.pull(br_from, overwrite)
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.
550
            else:
551
                count = tree_to.pull(br_from, overwrite)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
552
        except DivergedBranches:
553
            raise BzrCommandError("These branches have diverged."
554
                                  "  Try a merge then push with overwrite.")
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
555
        note('%d revision(s) pushed.' % (count,))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
556
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
557
        if verbose:
558
            new_rh = br_to.revision_history()
559
            if old_rh != new_rh:
560
                # Something changed
561
                from bzrlib.log import show_changed_revisions
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
562
                show_changed_revisions(br_to, old_rh, new_rh,
563
                                       to_file=self.outf)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
564
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
565
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
566
class cmd_branch(Command):
567
    """Create a new copy of a branch.
568
569
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
570
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
571
572
    To retrieve the branch as of a particular revision, supply the --revision
573
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
574
575
    --basis is to speed up branching from remote branches.  When specified, it
576
    copies all the file-contents, inventory and revision data from the basis
577
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
578
    """
579
    takes_args = ['from_location', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
580
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
581
    aliases = ['get', 'clone']
582
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
583
    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
584
        if revision is None:
585
            revision = [None]
586
        elif len(revision) > 1:
587
            raise BzrCommandError(
588
                'bzr branch --revision takes exactly 1 revision value')
589
        try:
590
            br_from = Branch.open(from_location)
591
        except OSError, e:
592
            if e.errno == errno.ENOENT:
593
                raise BzrCommandError('Source location "%s" does not'
594
                                      ' exist.' % to_location)
595
            else:
596
                raise
597
        br_from.lock_read()
598
        try:
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
599
            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.
600
                basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
601
            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.
602
                basis_dir = None
1185.8.4 by Aaron Bentley
Fixed branch -r
603
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
604
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
605
            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.
606
                # FIXME - wt.last_revision, fallback to branch, fall back to
607
                # None or perhaps NULL_REVISION to mean copy nothing
608
                # RBC 20060209
609
                revision_id = br_from.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
610
            if to_location is None:
611
                to_location = os.path.basename(from_location.rstrip("/\\"))
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
612
                name = None
613
            else:
614
                name = os.path.basename(to_location) + '\n'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
615
            try:
616
                os.mkdir(to_location)
617
            except OSError, e:
618
                if e.errno == errno.EEXIST:
619
                    raise BzrCommandError('Target directory "%s" already'
620
                                          ' exists.' % to_location)
621
                if e.errno == errno.ENOENT:
622
                    raise BzrCommandError('Parent of "%s" does not exist.' %
623
                                          to_location)
624
                else:
625
                    raise
626
            try:
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
627
                # preserve whatever source format we have.
628
                dir = br_from.bzrdir.sprout(to_location, revision_id, basis_dir)
629
                branch = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
630
            except bzrlib.errors.NoSuchRevision:
631
                rmtree(to_location)
1466 by Robert Collins
revision may be None in cmd_branch, do not treat as an int.
632
                msg = "The branch %s has no revision %s." % (from_location, revision[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
633
                raise BzrCommandError(msg)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
634
            except bzrlib.errors.UnlistableBranch:
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
635
                rmtree(to_location)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
636
                msg = "The branch %s cannot be used as a --basis" % (basis,)
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
637
                raise BzrCommandError(msg)
638
            if name:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
639
                branch.control_files.put_utf8('branch-name', name)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
640
            note('Branched %d revision(s).' % branch.revno())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
641
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
642
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
643
644
1508.1.20 by Robert Collins
Create a checkout command.
645
class cmd_checkout(Command):
646
    """Create a new checkout of an existing branch.
647
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
648
    If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
649
    the branch found in '.'. This is useful if you have removed the working tree
650
    or if it was never created - i.e. if you pushed the branch to its current
651
    location using SFTP.
652
    
1508.1.20 by Robert Collins
Create a checkout command.
653
    If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
654
    be used.  In other words, "checkout ../foo/bar" will attempt to create ./bar.
655
656
    To retrieve the branch as of a particular revision, supply the --revision
657
    parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
658
    out of date [so you cannot commit] but it may be useful (i.e. to examine old
659
    code.)
660
661
    --basis is to speed up checking out from remote branches.  When specified, it
662
    uses the inventory and file contents from the basis branch in preference to the
663
    branch being checked out. [Not implemented yet.]
664
    """
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
665
    takes_args = ['branch_location?', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
666
    takes_options = ['revision', # , 'basis']
667
                     Option('lightweight',
668
                            help="perform a lightweight checkout. Lightweight "
669
                                 "checkouts depend on access to the branch for "
670
                                 "every operation. Normal checkouts can perform "
671
                                 "common operations like diff and status without "
672
                                 "such access, and also support local commits."
673
                            ),
674
                     ]
1508.1.20 by Robert Collins
Create a checkout command.
675
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
676
    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'
677
            lightweight=False):
1508.1.20 by Robert Collins
Create a checkout command.
678
        if revision is None:
679
            revision = [None]
680
        elif len(revision) > 1:
681
            raise BzrCommandError(
682
                'bzr checkout --revision takes exactly 1 revision value')
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
683
        if branch_location is None:
684
            branch_location = bzrlib.osutils.getcwd()
685
            to_location = branch_location
1508.1.20 by Robert Collins
Create a checkout command.
686
        source = Branch.open(branch_location)
687
        if len(revision) == 1 and revision[0] is not None:
688
            revision_id = revision[0].in_history(source)[1]
689
        else:
690
            revision_id = None
691
        if to_location is None:
692
            to_location = os.path.basename(branch_location.rstrip("/\\"))
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
693
        # if the source and to_location are the same, 
694
        # and there is no working tree,
695
        # then reconstitute a branch
696
        if (bzrlib.osutils.abspath(to_location) == 
697
            bzrlib.osutils.abspath(branch_location)):
698
            try:
699
                source.bzrdir.open_workingtree()
700
            except errors.NoWorkingTree:
701
                source.bzrdir.create_workingtree()
702
                return
1508.1.20 by Robert Collins
Create a checkout command.
703
        try:
704
            os.mkdir(to_location)
705
        except OSError, e:
706
            if e.errno == errno.EEXIST:
707
                raise BzrCommandError('Target directory "%s" already'
708
                                      ' exists.' % to_location)
709
            if e.errno == errno.ENOENT:
710
                raise BzrCommandError('Parent of "%s" does not exist.' %
711
                                      to_location)
712
            else:
713
                raise
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
714
        old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
715
        bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
716
        try:
717
            if lightweight:
718
                checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
719
                bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
720
            else:
721
                checkout_branch =  bzrlib.bzrdir.BzrDir.create_branch_convenience(
722
                    to_location, force_new_tree=False)
723
                checkout = checkout_branch.bzrdir
724
                checkout_branch.bind(source)
725
                if revision_id is not None:
726
                    rh = checkout_branch.revision_history()
727
                    checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
728
            checkout.create_workingtree(revision_id)
729
        finally:
730
            bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
1508.1.20 by Robert Collins
Create a checkout command.
731
732
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
733
class cmd_renames(Command):
734
    """Show list of renamed files.
735
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
736
    # TODO: Option to show renames between two historical versions.
737
738
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
739
    takes_args = ['dir?']
740
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
741
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
742
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
743
        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()
744
        old_inv = tree.basis_tree().inventory
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
745
        new_inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
746
747
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
748
        renames.sort()
749
        for old_name, new_name in renames:
1185.85.32 by John Arbash Meinel
Updated bzr renames
750
            self.outf.write("%s => %s\n" % (old_name, new_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
751
752
1508.1.24 by Robert Collins
Add update command for use with checkouts.
753
class cmd_update(Command):
754
    """Update a tree to have the latest code committed to its branch.
755
    
756
    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.
757
    conflicts. If you have any local changes, you will still 
758
    need to commit them after the update for the update to be complete.
759
    
760
    If you want to discard your local changes, you can just do a 
761
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
762
    """
763
    takes_args = ['dir?']
764
765
    def run(self, dir='.'):
766
        tree = WorkingTree.open_containing(dir)[0]
767
        tree.lock_write()
768
        try:
769
            if tree.last_revision() == tree.branch.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
770
                # may be up to date, check master too.
771
                master = tree.branch.get_master_branch()
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
772
                if master is None or master.last_revision == tree.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
773
                    note("Tree is up to date.")
774
                    return
1508.1.24 by Robert Collins
Add update command for use with checkouts.
775
            conflicts = tree.update()
776
            note('Updated to revision %d.' %
777
                 (tree.branch.revision_id_to_revno(tree.last_revision()),))
778
            if conflicts != 0:
779
                return 1
780
            else:
781
                return 0
782
        finally:
783
            tree.unlock()
784
785
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
786
class cmd_info(Command):
787
    """Show statistical information about a branch."""
788
    takes_args = ['branch?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
789
    takes_options = ['verbose']
1624.3.18 by Olaf Conradi
Move to using bzrlib API for blackbox test cases.
790
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
791
    @display_command
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
792
    def run(self, branch=None, verbose=False):
1534.5.15 by Robert Collins
Review fixups
793
        import bzrlib.info
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
794
        bzrlib.info.show_bzrdir_info(bzrdir.BzrDir.open_containing(branch)[0],
795
                                     verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
796
797
798
class cmd_remove(Command):
799
    """Make a file unversioned.
800
801
    This makes bzr stop tracking changes to a versioned file.  It does
802
    not delete the working copy.
803
    """
804
    takes_args = ['file+']
805
    takes_options = ['verbose']
1424 by Robert Collins
add rm alias to remove
806
    aliases = ['rm']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
807
    
808
    def run(self, file_list, verbose=False):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
809
        tree, file_list = tree_files(file_list)
1185.12.105 by Aaron Bentley
Substituted branch_files for equivalent code
810
        tree.remove(file_list, verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
811
812
813
class cmd_file_id(Command):
814
    """Print file_id of a particular file or directory.
815
816
    The file_id is assigned when the file is first added and remains the
817
    same through all revisions where the file exists, even when it is
818
    moved or renamed.
819
    """
820
    hidden = True
821
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
822
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
823
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
824
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
825
        tree, relpath = WorkingTree.open_containing(filename)
826
        i = tree.inventory.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
827
        if i == None:
828
            raise BzrError("%r is not a versioned file" % filename)
829
        else:
1185.85.34 by John Arbash Meinel
Updating 'bzr file-id' exposed that we weren't allowing unicode file ids. Enabling them reveals a lot more bugs.
830
            self.outf.write(i)
831
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
832
833
834
class cmd_file_path(Command):
835
    """Print path of file_ids to a file or directory.
836
837
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
838
    starting at the branch root.
839
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
840
    hidden = True
841
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
842
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
843
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
844
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
845
        tree, relpath = WorkingTree.open_containing(filename)
846
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
847
        fid = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
848
        if fid == None:
849
            raise BzrError("%r is not a versioned file" % filename)
850
        for fip in inv.get_idpath(fid):
1185.85.43 by John Arbash Meinel
Found a bug in 'bzr file-path'
851
            self.outf.write(fip)
1185.85.35 by John Arbash Meinel
Updated file-path
852
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
853
854
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
855
class cmd_reconcile(Command):
856
    """Reconcile bzr metadata in a branch.
857
858
    This can correct data mismatches that may have been caused by
859
    previous ghost operations or bzr upgrades. You should only
860
    need to run this command if 'bzr check' or a bzr developer 
861
    advises you to run it.
862
863
    If a second branch is provided, cross-branch reconciliation is
864
    also attempted, which will check that data like the tree root
865
    id which was not present in very early bzr versions is represented
866
    correctly in both branches.
867
868
    At the same time it is run it may recompress data resulting in 
869
    a potential saving in disk space or performance gain.
870
871
    The branch *MUST* be on a listable system such as local disk or sftp.
872
    """
873
    takes_args = ['branch?']
874
875
    def run(self, branch="."):
876
        from bzrlib.reconcile import reconcile
877
        dir = bzrlib.bzrdir.BzrDir.open(branch)
878
        reconcile(dir)
879
880
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
881
class cmd_revision_history(Command):
882
    """Display list of revision ids on this branch."""
883
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
884
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
885
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
886
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
887
        branch = WorkingTree.open_containing(u'.')[0].branch
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
888
        for patchid in branch.revision_history():
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
889
            self.outf.write(patchid)
890
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
891
892
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
893
class cmd_ancestry(Command):
894
    """List all revisions merged into this branch."""
895
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
896
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
897
    @display_command
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
898
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
899
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
900
        b = tree.branch
901
        # FIXME. should be tree.last_revision
1551.3.11 by Aaron Bentley
Merge from Robert
902
        for revision_id in b.repository.get_ancestry(b.last_revision()):
1185.85.42 by John Arbash Meinel
I haven't been running the full test enough. Found some bugs in bzr ancestry.
903
            if revision_id is None:
904
                continue
905
            self.outf.write(revision_id)
906
            self.outf.write('\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
907
908
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
909
class cmd_init(Command):
910
    """Make a directory into a versioned branch.
911
912
    Use this to create an empty branch, or before importing an
913
    existing project.
914
1662.1.19 by Martin Pool
Better error message when initting existing tree
915
    If there is a repository in a parent directory of the location, then 
916
    the history of the branch will be stored in the repository.  Otherwise
917
    init creates a standalone branch which carries its own history in 
918
    .bzr.
919
920
    If there is already a branch at the location but it has no working tree,
921
    the tree can be populated with 'bzr checkout'.
922
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
923
    Recipe for importing a tree of files:
924
        cd ~/project
925
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
926
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
927
        bzr status
928
        bzr commit -m 'imported project'
929
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
930
    takes_args = ['location?']
1553.5.78 by Martin Pool
New bzr init --format option and test
931
    takes_options = [
932
                     Option('format', 
933
                            help='Create a specific format rather than the'
934
                                 ' current default format. Currently this '
1626.1.3 by Martin Pool
Better help for --format options (Jos Backus)
935
                                 ' option only accepts "metadir"',
1553.5.78 by Martin Pool
New bzr init --format option and test
936
                            type=get_format_type),
937
                     ]
938
    def run(self, location=None, format=None):
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
939
        from bzrlib.branch import Branch
940
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
941
            location = u'.'
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
942
        else:
943
            # The path has to exist to initialize a
944
            # branch inside of it.
945
            # Just using os.mkdir, since I don't
946
            # believe that we want to create a bunch of
947
            # locations if the user supplies an extended path
948
            if not os.path.exists(location):
949
                os.mkdir(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
950
        try:
1662.1.19 by Martin Pool
Better error message when initting existing tree
951
            existing_bzrdir = bzrdir.BzrDir.open(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
952
        except NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
953
            # really a NotBzrDir error...
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
954
            bzrdir.BzrDir.create_branch_convenience(location, format=format)
955
        else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
956
            if existing_bzrdir.has_branch():
957
                if existing_bzrdir.has_workingtree():
958
                    raise errors.AlreadyBranchError(location)
959
                else:
960
                    raise errors.BranchExistsWithoutWorkingTree(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
961
            else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
962
                existing_bzrdir.create_branch()
963
                existing_bzrdir.create_workingtree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
964
965
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
966
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
967
    """Create a shared repository to hold branches.
968
969
    New branches created under the repository directory will store their revisions
970
    in the repository, not in the branch directory, if the branch format supports
971
    shared storage.
972
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
973
    example:
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
974
        bzr init-repo repo
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
975
        bzr init repo/trunk
976
        bzr checkout --lightweight repo/trunk trunk-checkout
977
        cd trunk-checkout
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
978
        (add files here)
979
    """
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
980
    takes_args = ["location"] 
981
    takes_options = [Option('format', 
982
                            help='Use a specific format rather than the'
1624.1.1 by Robert Collins
Trivial ui change to make knits clearly experimental.
983
                            ' current default format. Currently this'
1666.1.10 by Robert Collins
Oops, formating error.
984
                            ' option accepts "weave", "metadir" and "knit"',
1624.2.1 by Erik BÃ¥gfors
support for --tree in bzr init-repo
985
                            type=get_format_type),
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
986
                     Option('trees',
1624.2.1 by Erik BÃ¥gfors
support for --tree in bzr init-repo
987
                             help='Allows branches in repository to have'
988
                             ' a working tree')]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
989
    aliases = ["init-repo"]
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
990
    def run(self, location, format=None, trees=False):
1558.5.1 by Aaron Bentley
Added make-repository command
991
        from bzrlib.bzrdir import BzrDirMetaFormat1
992
        from bzrlib.transport import get_transport
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
993
        if format is None:
994
            format = BzrDirMetaFormat1()
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
995
        transport = get_transport(location)
996
        if not transport.has('.'):
997
            transport.mkdir('')
998
        newdir = format.initialize_on_transport(transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
999
        repo = newdir.create_repository(shared=True)
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
1000
        repo.set_make_working_trees(trees)
1558.5.1 by Aaron Bentley
Added make-repository command
1001
1002
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1003
class cmd_diff(Command):
1004
    """Show differences in working tree.
1005
    
1006
    If files are listed, only the changes in those files are listed.
1007
    Otherwise, all changes for the tree are listed.
1008
1009
    examples:
1010
        bzr diff
1011
        bzr diff -r1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
1012
        bzr diff -r1..2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1013
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1014
    # TODO: Allow diff across branches.
1015
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1016
    #       or a graphical diff.
1017
1018
    # TODO: Python difflib is not exactly the same as unidiff; should
1019
    #       either fix it up or prefer to use an external diff.
1020
1021
    # TODO: If a directory is given, diff everything under that.
1022
1023
    # TODO: Selected-file diff is inefficient and doesn't show you
1024
    #       deleted files.
1025
1026
    # TODO: This probably handles non-Unix newlines poorly.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1027
    
1028
    takes_args = ['file*']
1029
    takes_options = ['revision', 'diff-options']
1030
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1031
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1032
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1033
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1034
    def run(self, revision=None, file_list=None, diff_options=None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1035
        from bzrlib.diff import diff_cmd_helper, show_diff_trees
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1036
        try:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1037
            tree1, file_list = internal_tree_files(file_list)
1038
            tree2 = None
1508.1.15 by Robert Collins
Merge from mpool.
1039
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1040
            b2 = None
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
1041
        except FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1042
            if len(file_list) != 2:
1043
                raise BzrCommandError("Files are in different branches")
1044
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1045
            tree1, file1 = WorkingTree.open_containing(file_list[0])
1046
            tree2, file2 = WorkingTree.open_containing(file_list[1])
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1047
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
1048
                # FIXME diff those two files. rbc 20051123
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1049
                raise BzrCommandError("Files are in different branches")
1050
            file_list = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1051
        if revision is not None:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1052
            if tree2 is not None:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1053
                raise 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.
1054
            if (len(revision) == 1) or (revision[1].spec is None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1055
                return diff_cmd_helper(tree1, file_list, diff_options,
1056
                                       revision[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1057
            elif len(revision) == 2:
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1058
                return diff_cmd_helper(tree1, file_list, diff_options,
1059
                                       revision[0], revision[1])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1060
            else:
1061
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1062
        else:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1063
            if tree2 is not None:
1064
                return show_diff_trees(tree1, tree2, sys.stdout, 
1065
                                       specific_files=file_list,
1066
                                       external_diff_options=diff_options)
1508.1.15 by Robert Collins
Merge from mpool.
1067
            else:
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1068
                return diff_cmd_helper(tree1, file_list, diff_options)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1069
1070
1071
class cmd_deleted(Command):
1072
    """List files deleted in the working tree.
1073
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1074
    # TODO: Show files deleted since a previous revision, or
1075
    # between two revisions.
1076
    # TODO: Much more efficient way to do this: read in new
1077
    # directories with readdir, rather than stating each one.  Same
1078
    # level of effort but possibly much less IO.  (Or possibly not,
1079
    # if the directories are very large...)
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1080
    takes_options = ['show-ids']
1081
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1082
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1083
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1084
        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()
1085
        old = tree.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1086
        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
1087
            if not tree.has_id(ie.file_id):
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1088
                self.outf.write(path)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1089
                if show_ids:
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1090
                    self.outf.write(' ')
1091
                    self.outf.write(ie.file_id)
1092
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1093
1094
1095
class cmd_modified(Command):
1096
    """List files modified in working tree."""
1097
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1098
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1099
    def run(self):
1100
        from bzrlib.delta import compare_trees
1101
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1102
        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()
1103
        td = compare_trees(tree.basis_tree(), tree)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1104
1398 by Robert Collins
integrate in Gustavos x-bit patch
1105
        for path, id, kind, text_modified, meta_modified in td.modified:
1185.85.50 by John Arbash Meinel
Updated cmd_modified
1106
            self.outf.write(path)
1107
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1108
1109
1110
class cmd_added(Command):
1111
    """List files added in working tree."""
1112
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1113
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1114
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1115
        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()
1116
        basis_inv = wt.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1117
        inv = wt.inventory
1118
        for file_id in inv:
1119
            if file_id in basis_inv:
1120
                continue
1121
            path = inv.id2path(file_id)
1548 by Martin Pool
Fix 'bzr added' typo, and tests for that command.
1122
            if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1123
                continue
1185.85.52 by John Arbash Meinel
Updated cmd_added, which obviously had no tests, because it had a bug in it.
1124
            self.outf.write(path)
1125
            self.outf.write('\n')
1185.85.53 by John Arbash Meinel
Updated cmd_root
1126
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1127
1128
class cmd_root(Command):
1129
    """Show the tree root directory.
1130
1131
    The root is the nearest enclosing directory with a .bzr control
1132
    directory."""
1133
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1134
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1135
    def run(self, filename=None):
1136
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1137
        tree = WorkingTree.open_containing(filename)[0]
1185.85.53 by John Arbash Meinel
Updated cmd_root
1138
        self.outf.write(tree.basedir)
1139
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1140
1141
1142
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1143
    """Show log of a branch, file, or directory.
1144
1145
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1146
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1147
    To request a range of logs, you can use the command -r begin..end
1148
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1149
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1150
1151
    examples:
1152
        bzr log
1153
        bzr log foo.c
1154
        bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1155
    """
1156
1393.1.55 by Martin Pool
doc
1157
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1158
1626.1.2 by Martin Pool
Better help message for log command.
1159
    takes_args = ['location?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1160
    takes_options = [Option('forward', 
1161
                            help='show from oldest to newest'),
1626.1.2 by Martin Pool
Better help message for log command.
1162
                     'timezone', 
1163
                     Option('verbose', 
1164
                             help='show files changed in each revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1165
                     'show-ids', 'revision',
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1166
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1167
                     'line', 'long', 
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1168
                     Option('message',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1169
                            help='show revisions whose message matches this regexp',
1170
                            type=str),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1171
                     'short',
1185.16.57 by Martin Pool
[merge] from aaron
1172
                     ]
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()
1173
    encoding_type = 'replace'
1174
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1175
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1176
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1177
            verbose=False,
1178
            show_ids=False,
1179
            forward=False,
1180
            revision=None,
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1181
            log_format=None,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1182
            message=None,
1183
            long=False,
1185.12.25 by Aaron Bentley
Added one-line log format
1184
            short=False,
1185
            line=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1186
        from bzrlib.log import log_formatter, show_log
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
1187
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1188
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1189
        direction = (forward and 'forward') or 'reverse'
1190
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1191
        # log everything
1192
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1193
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1194
            # find the file id to log:
1195
1626.1.2 by Martin Pool
Better help message for log command.
1196
            dir, fp = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1197
            b = dir.open_branch()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1198
            if fp != '':
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1199
                try:
1200
                    # might be a tree:
1201
                    inv = dir.open_workingtree().inventory
1202
                except (errors.NotBranchError, errors.NotLocalUrl):
1203
                    # either no tree, or is remote.
1204
                    inv = b.basis_tree().inventory
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1205
                file_id = inv.path2id(fp)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1206
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1207
            # local dir only
1208
            # FIXME ? log the current subdir only RBC 20060203 
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.
1209
            dir, relpath = bzrdir.BzrDir.open_containing('.')
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1210
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1211
1212
        if revision is None:
1213
            rev1 = None
1214
            rev2 = None
1215
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1216
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1217
        elif len(revision) == 2:
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
1218
            if revision[0].spec is None:
1219
                # missing begin-range means first revision
1220
                rev1 = 1
1221
            else:
1222
                rev1 = revision[0].in_history(b).revno
1223
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
1224
            if revision[1].spec is None:
1225
                # missing end-range means last known revision
1226
                rev2 = b.revno()
1227
            else:
1228
                rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1229
        else:
1230
            raise BzrCommandError('bzr log --revision takes one or two values.')
1231
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
1232
        # By this point, the revision numbers are converted to the +ve
1233
        # form if they were supplied in the -ve form, so we can do
1234
        # this comparison in relative safety
1235
        if rev1 > rev2:
1236
            (rev2, rev1) = (rev1, rev2)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1237
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1238
        if (log_format == None):
1553.2.9 by Erik BÃ¥gfors
log_formatter => log_format for "named" formatters
1239
            default = bzrlib.config.BranchConfig(b).log_format()
1553.2.4 by Erik BÃ¥gfors
Support for setting the default log format at a configuration option
1240
            log_format = get_log_format(long=long, short=short, line=line, default=default)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1241
        lf = log_formatter(log_format,
1242
                           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()
1243
                           to_file=self.outf,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1244
                           show_timezone=timezone)
1245
1246
        show_log(b,
1247
                 lf,
1248
                 file_id,
1249
                 verbose=verbose,
1250
                 direction=direction,
1251
                 start_revision=rev1,
1252
                 end_revision=rev2,
1253
                 search=message)
1254
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1255
1553.2.4 by Erik BÃ¥gfors
Support for setting the default log format at a configuration option
1256
def get_log_format(long=False, short=False, line=False, default='long'):
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1257
    log_format = default
1258
    if long:
1259
        log_format = 'long'
1260
    if short:
1261
        log_format = 'short'
1262
    if line:
1263
        log_format = 'line'
1264
    return log_format
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1265
1266
1267
class cmd_touching_revisions(Command):
1268
    """Return revision-ids which affected a particular file.
1269
1270
    A more user-friendly interface is "bzr log FILE"."""
1271
    hidden = True
1272
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1273
    encoding_type = 'replace'
1274
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1275
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1276
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1277
        tree, relpath = WorkingTree.open_containing(filename)
1278
        b = tree.branch
1279
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1280
        file_id = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1281
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1282
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1283
1284
1285
class cmd_ls(Command):
1286
    """List files in a tree.
1287
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1288
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1289
    hidden = True
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1290
    takes_options = ['verbose', 'revision',
1291
                     Option('non-recursive',
1292
                            help='don\'t recurse into sub-directories'),
1293
                     Option('from-root',
1294
                            help='Print all paths from the root of the branch.'),
1295
                     Option('unknown', help='Print unknown files'),
1296
                     Option('versioned', help='Print versioned files'),
1297
                     Option('ignored', help='Print ignored files'),
1298
1299
                     Option('null', help='Null separate the files'),
1300
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1301
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1302
    def run(self, revision=None, verbose=False, 
1303
            non_recursive=False, from_root=False,
1304
            unknown=False, versioned=False, ignored=False,
1305
            null=False):
1306
1307
        if verbose and null:
1308
            raise BzrCommandError('Cannot set both --verbose and --null')
1309
        all = not (unknown or versioned or ignored)
1310
1311
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1312
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1313
        tree, relpath = WorkingTree.open_containing(u'.')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1314
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1315
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1316
        elif relpath:
1317
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1318
        if revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1319
            tree = tree.branch.repository.revision_tree(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1320
                revision[0].in_history(tree.branch).rev_id)
1185.85.13 by John Arbash Meinel
Moving bzr ls to encoded output.
1321
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1322
        for fp, fc, kind, fid, entry in tree.list_files():
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1323
            if fp.startswith(relpath):
1324
                fp = fp[len(relpath):]
1325
                if non_recursive and '/' in fp:
1326
                    continue
1327
                if not all and not selection[fc]:
1328
                    continue
1329
                if verbose:
1330
                    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()
1331
                    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.
1332
                elif null:
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()
1333
                    self.outf.write(fp)
1334
                    self.outf.write('\0')
1335
                    self.outf.flush()
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1336
                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()
1337
                    self.outf.write(fp)
1338
                    self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1339
1340
1341
class cmd_unknowns(Command):
1342
    """List unknown files."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1343
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1344
    def run(self):
1345
        from bzrlib.osutils import quotefn
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1346
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1185.85.57 by John Arbash Meinel
Updated cmd_unknowns
1347
            self.outf.write(quotefn(f))
1348
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1349
1350
1351
class cmd_ignore(Command):
1352
    """Ignore a command or pattern.
1353
1354
    To remove patterns from the ignore list, edit the .bzrignore file.
1355
1356
    If the pattern contains a slash, it is compared to the whole path
1185.16.4 by Martin Pool
- doc and todo for ignore command
1357
    from the branch root.  Otherwise, it is compared to only the last
1358
    component of the path.  To match a file only in the root directory,
1359
    prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1360
1361
    Ignore patterns are case-insensitive on case-insensitive systems.
1362
1363
    Note: wildcards must be quoted from the shell on Unix.
1364
1365
    examples:
1366
        bzr ignore ./Makefile
1367
        bzr ignore '*.class'
1368
    """
1185.16.4 by Martin Pool
- doc and todo for ignore command
1369
    # TODO: Complain if the filename is absolute
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1370
    takes_args = ['name_pattern']
1371
    
1372
    def run(self, name_pattern):
1373
        from bzrlib.atomicfile import AtomicFile
1374
        import os.path
1375
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1376
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1377
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1378
1379
        if os.path.exists(ifn):
1380
            f = open(ifn, 'rt')
1381
            try:
1382
                igns = f.read().decode('utf-8')
1383
            finally:
1384
                f.close()
1385
        else:
1386
            igns = ''
1387
1388
        # TODO: If the file already uses crlf-style termination, maybe
1389
        # we should use that for the newly added lines?
1390
1391
        if igns and igns[-1] != '\n':
1392
            igns += '\n'
1393
        igns += name_pattern + '\n'
1394
1395
        try:
1396
            f = AtomicFile(ifn, 'wt')
1397
            f.write(igns.encode('utf-8'))
1398
            f.commit()
1399
        finally:
1400
            f.close()
1401
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1402
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1403
        if inv.path2id('.bzrignore'):
1404
            mutter('.bzrignore is already versioned')
1405
        else:
1406
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1407
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1408
1409
1410
class cmd_ignored(Command):
1411
    """List ignored files and the patterns that matched them.
1412
1413
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1414
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1415
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1416
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1417
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1418
            if file_class != 'I':
1419
                continue
1420
            ## XXX: Slightly inefficient since this was already calculated
1421
            pat = tree.is_ignored(path)
1422
            print '%-50s %s' % (path, pat)
1423
1424
1425
class cmd_lookup_revision(Command):
1426
    """Lookup the revision-id from a revision-number
1427
1428
    example:
1429
        bzr lookup-revision 33
1430
    """
1431
    hidden = True
1432
    takes_args = ['revno']
1433
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1434
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1435
    def run(self, revno):
1436
        try:
1437
            revno = int(revno)
1438
        except ValueError:
1439
            raise BzrCommandError("not a valid revision-number: %r" % revno)
1440
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1441
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1442
1443
1444
class cmd_export(Command):
1445
    """Export past revision to destination directory.
1446
1447
    If no revision is specified this exports the last committed revision.
1448
1449
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1450
    given, try to find the format with the extension. If no extension
1451
    is found exports to a directory (equivalent to --format=dir).
1452
1453
    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
1454
    is given, the top directory will be the root name of the file.
1455
1456
    Note: export of tree with non-ascii filenames to zip is not supported.
1457
1551.3.11 by Aaron Bentley
Merge from Robert
1458
     Supported formats       Autodetected by extension
1459
     -----------------       -------------------------
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1460
         dir                            -
1461
         tar                          .tar
1462
         tbz2                    .tar.bz2, .tbz2
1463
         tgz                      .tar.gz, .tgz
1464
         zip                          .zip
1465
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1466
    takes_args = ['dest']
1467
    takes_options = ['revision', 'format', 'root']
1468
    def run(self, dest, revision=None, format=None, root=None):
1469
        import os.path
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
1470
        from bzrlib.export import export
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1471
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1472
        b = tree.branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1473
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1474
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1475
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1476
        else:
1477
            if len(revision) != 1:
1478
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1479
            rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1480
        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.
1481
        try:
1482
            export(t, dest, format, root)
1483
        except errors.NoSuchExportFormat, e:
1484
            raise BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1485
1486
1487
class cmd_cat(Command):
1488
    """Write a file's text from a previous revision."""
1489
1490
    takes_options = ['revision']
1491
    takes_args = ['filename']
1492
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1493
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1494
    def run(self, filename, revision=None):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1495
        if revision is not None and len(revision) != 1:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1496
            raise BzrCommandError("bzr cat --revision takes exactly one number")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1497
        tree = None
1498
        try:
1499
            tree, relpath = WorkingTree.open_containing(filename)
1500
            b = tree.branch
1501
        except NotBranchError:
1502
            pass
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1503
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1504
        if tree is None:
1505
            b, relpath = Branch.open_containing(filename)
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1506
        if revision is None:
1507
            revision_id = b.last_revision()
1508
        else:
1509
            revision_id = revision[0].in_history(b).rev_id
1510
        b.print_file(relpath, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1511
1512
1513
class cmd_local_time_offset(Command):
1514
    """Show the offset in seconds from GMT to local time."""
1515
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1516
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1517
    def run(self):
1518
        print bzrlib.osutils.local_time_offset()
1519
1520
1521
1522
class cmd_commit(Command):
1523
    """Commit changes into a new revision.
1524
    
1525
    If no arguments are given, the entire tree is committed.
1526
1527
    If selected files are specified, only changes to those files are
1528
    committed.  If a directory is specified then the directory and everything 
1529
    within it is committed.
1530
1531
    A selected-file commit may fail in some cases where the committed
1532
    tree would be invalid, such as trying to commit a file in a
1533
    newly-added directory that is not itself committed.
1534
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1535
    # TODO: Run hooks on tree to-be-committed, and after commit.
1536
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1537
    # TODO: Strict commit that fails if there are deleted files.
1538
    #       (what does "deleted files" mean ??)
1539
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1540
    # TODO: Give better message for -s, --summary, used by tla people
1541
1542
    # XXX: verbose currently does nothing
1543
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1544
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1545
    takes_options = ['message', 'verbose', 
1546
                     Option('unchanged',
1547
                            help='commit even if nothing has changed'),
1548
                     Option('file', type=str, 
1549
                            argname='msgfile',
1550
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1551
                     Option('strict',
1552
                            help="refuse to commit if there are unknown "
1553
                            "files in the working tree."),
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1554
                     Option('local',
1555
                            help="perform a local only commit in a bound "
1556
                                 "branch. Such commits are not pushed to "
1557
                                 "the master branch until a normal commit "
1558
                                 "is performed."
1559
                            ),
1185.16.43 by Martin Pool
- clean up handling of option objects
1560
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1561
    aliases = ['ci', 'checkin']
1562
1563
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1564
            unchanged=False, strict=False, local=False):
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1565
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1566
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1567
                StrictCommitFailed)
1185.33.76 by Martin Pool
Fix import error.
1568
        from bzrlib.msgeditor import edit_commit_message, \
1569
                make_commit_message_template
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1570
        from tempfile import TemporaryFile
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1571
1185.33.77 by Martin Pool
doc
1572
        # TODO: Need a blackbox test for invoking the external editor; may be
1573
        # slightly problematic to run this cross-platform.
1574
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1575
        # TODO: do more checks that the commit will succeed before 
1576
        # spending the user's valuable time typing a commit message.
1577
        #
1578
        # TODO: if the commit *does* happen to fail, then save the commit 
1579
        # message to a temporary file where it can be recovered
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1580
        tree, selected_list = tree_files(selected_list)
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1581
        if local and not tree.branch.get_bound_location():
1582
            raise errors.LocalRequiresBoundBranch()
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1583
        if message is None and not file:
1185.33.76 by Martin Pool
Fix import error.
1584
            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
1585
            message = edit_commit_message(template)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1586
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1587
                raise BzrCommandError("please specify a commit message"
1588
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1589
        elif message and file:
1590
            raise BzrCommandError("please specify either --message or --file")
1591
        
1592
        if file:
1593
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1594
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1595
        if message == "":
1596
                raise BzrCommandError("empty commit message specified")
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1597
        
1598
        if verbose:
1599
            reporter = ReportCommitToLog()
1600
        else:
1601
            reporter = NullCommitReporter()
1602
        
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1603
        try:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1604
            tree.commit(message, specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1605
                        allow_pointless=unchanged, strict=strict, local=local,
1606
                        reporter=reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1607
        except PointlessCommit:
1608
            # FIXME: This should really happen before the file is read in;
1609
            # perhaps prepare the commit; get the message; then actually commit
1610
            raise BzrCommandError("no changes to commit",
1611
                                  ["use --unchanged to commit anyhow"])
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1612
        except ConflictsInTree:
1613
            raise BzrCommandError("Conflicts detected in working tree.  "
1614
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1615
        except StrictCommitFailed:
1616
            raise BzrCommandError("Commit refused because there are unknown "
1617
                                  "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
1618
        except errors.BoundBranchOutOfDate, e:
1619
            raise BzrCommandError(str(e)
1587.1.12 by Robert Collins
Update help message to be more bound branch friendly.
1620
                                  + ' Either unbind, update, or'
1621
                                    ' pass --local to commit.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1622
1623
1624
class cmd_check(Command):
1625
    """Validate consistency of branch history.
1626
1627
    This command checks various invariants about the branch storage to
1628
    detect data corruption or bzr bugs.
1629
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1630
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
1631
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1632
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1633
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1634
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1635
        if branch is None:
1636
            tree = WorkingTree.open_containing()[0]
1637
            branch = tree.branch
1638
        else:
1639
            branch = Branch.open(branch)
1640
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1641
1642
1643
class cmd_scan_cache(Command):
1644
    hidden = True
1645
    def run(self):
1646
        from bzrlib.hashcache import HashCache
1647
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1648
        c = HashCache(u'.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1649
        c.read()
1650
        c.scan()
1651
            
1652
        print '%6d stats' % c.stat_count
1653
        print '%6d in hashcache' % len(c._cache)
1654
        print '%6d files removed from cache' % c.removed_count
1655
        print '%6d hashes updated' % c.update_count
1656
        print '%6d files changed too recently to cache' % c.danger_count
1657
1658
        if c.needs_write:
1659
            c.write()
1534.5.16 by Robert Collins
Review feedback.
1660
1661
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1662
class cmd_upgrade(Command):
1663
    """Upgrade branch storage to current format.
1664
1665
    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.
1666
    this command. When the default format has changed you may also be warned
1667
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1668
    """
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1669
    takes_args = ['url?']
1534.5.13 by Robert Collins
Correct buggy test.
1670
    takes_options = [
1671
                     Option('format', 
1672
                            help='Upgrade to a specific format rather than the'
1624.1.1 by Robert Collins
Trivial ui change to make knits clearly experimental.
1673
                                 ' current default format. Currently this'
1666.1.10 by Robert Collins
Oops, formating error.
1674
                                 ' option accepts "weave", "metadir" and'
1675
                                 ' "knit".',
1534.5.13 by Robert Collins
Correct buggy test.
1676
                            type=get_format_type),
1677
                    ]
1678
1679
1680
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1681
        from bzrlib.upgrade import upgrade
1534.5.13 by Robert Collins
Correct buggy test.
1682
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1683
1684
1685
class cmd_whoami(Command):
1686
    """Show bzr user id."""
1687
    takes_options = ['email']
1688
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1689
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1690
    def run(self, email=False):
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1691
        try:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1692
            b = WorkingTree.open_containing(u'.')[0].branch
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1693
            config = bzrlib.config.BranchConfig(b)
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1694
        except NotBranchError:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1695
            config = bzrlib.config.GlobalConfig()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1696
        
1697
        if email:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1698
            print config.user_email()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1699
        else:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1700
            print config.username()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1701
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.
1702
1185.35.14 by Aaron Bentley
Implemented nick command
1703
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
1704
    """Print or set the branch nickname.  
1705
1185.35.14 by Aaron Bentley
Implemented nick command
1706
    If unset, the tree root directory name is used as the nickname
1707
    To print the current nickname, execute with no argument.  
1708
    """
1709
    takes_args = ['nickname?']
1710
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1711
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
1712
        if nickname is None:
1713
            self.printme(branch)
1714
        else:
1715
            branch.nick = nickname
1716
1717
    @display_command
1718
    def printme(self, branch):
1719
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1720
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.
1721
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1722
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1723
    """Run internal test suite.
1724
    
1725
    This creates temporary test directories in the working directory,
1726
    but not existing data is affected.  These directories are deleted
1727
    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
1728
    fail and --keep-output is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1729
    
1730
    If arguments are given, they are regular expressions that say
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1731
    which tests should run.
1552 by Martin Pool
Improved help text for bzr selftest
1732
1733
    If the global option '--no-plugins' is given, plugins are not loaded
1734
    before running the selftests.  This has two effects: features provided or
1735
    modified by plugins will not be tested, and tests provided by plugins will
1736
    not be run.
1737
1738
    examples:
1739
        bzr selftest ignore
1740
        bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1741
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1742
    # 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.
1743
1744
    # NB: this is used from the class without creating an instance, which is
1745
    # why it does not have a self parameter.
1746
    def get_transport_type(typestring):
1747
        """Parse and return a transport specifier."""
1748
        if typestring == "sftp":
1749
            from bzrlib.transport.sftp import SFTPAbsoluteServer
1750
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1751
        if typestring == "memory":
1752
            from bzrlib.transport.memory import MemoryServer
1753
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1754
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
1755
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1756
            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.
1757
        msg = "No known transport type %s. Supported types are: sftp\n" %\
1758
            (typestring)
1759
        raise BzrCommandError(msg)
1760
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1761
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1762
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
1763
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1764
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1765
                     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.
1766
                            help='keep output directories when tests fail'),
1767
                     Option('transport', 
1768
                            help='Use a different transport by default '
1769
                                 'throughout the test suite.',
1770
                            type=get_transport_type),
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1771
                    ]
1772
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1773
    def run(self, testspecs_list=None, verbose=False, one=False,
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.
1774
            keep_output=False, transport=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1775
        import bzrlib.ui
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1776
        from bzrlib.tests import selftest
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1777
        # we don't want progress meters from the tests to go to the
1778
        # real output; and we don't want log messages cluttering up
1779
        # the real logs.
1780
        save_ui = bzrlib.ui.ui_factory
1781
        bzrlib.trace.info('running tests...')
1782
        try:
1783
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1784
            if testspecs_list is not None:
1785
                pattern = '|'.join(testspecs_list)
1786
            else:
1787
                pattern = ".*"
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1788
            result = selftest(verbose=verbose, 
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1789
                              pattern=pattern,
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1790
                              stop_on_failure=one, 
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.
1791
                              keep_output=keep_output,
1792
                              transport=transport)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1793
            if result:
1794
                bzrlib.trace.info('tests passed')
1795
            else:
1796
                bzrlib.trace.info('tests failed')
1797
            return int(not result)
1798
        finally:
1799
            bzrlib.ui.ui_factory = save_ui
1800
1801
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1802
def _get_bzr_branch():
1803
    """If bzr is run from a branch, return Branch or None"""
1804
    import bzrlib.errors
1805
    from bzrlib.branch import Branch
1806
    from bzrlib.osutils import abspath
1807
    from os.path import dirname
1808
    
1809
    try:
1810
        branch = Branch.open(dirname(abspath(dirname(__file__))))
1811
        return branch
1812
    except bzrlib.errors.BzrError:
1813
        return None
1814
    
1815
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1816
def show_version():
1817
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
1818
    # is bzrlib itself in a branch?
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1819
    branch = _get_bzr_branch()
1820
    if branch:
1821
        rh = branch.revision_history()
1822
        revno = len(rh)
1185.62.1 by John Arbash Meinel
bzr --version prints branch nickname.
1823
        print "  bzr checkout, revision %d" % (revno,)
1824
        print "  nick: %s" % (branch.nick,)
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1825
        if rh:
1826
            print "  revid: %s" % (rh[-1],)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1827
    print bzrlib.__copyright__
1828
    print "http://bazaar-ng.org/"
1829
    print
1830
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1831
    print "you may use, modify and redistribute it under the terms of the GNU"
1832
    print "General Public License version 2 or later."
1833
1834
1835
class cmd_version(Command):
1836
    """Show version of bzr."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1837
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1838
    def run(self):
1839
        show_version()
1840
1841
class cmd_rocks(Command):
1842
    """Statement of optimism."""
1843
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1844
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1845
    def run(self):
1846
        print "it sure does!"
1847
1848
1849
class cmd_find_merge_base(Command):
1850
    """Find and print a base revision for merging two branches.
1851
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1852
    # TODO: Options to specify revisions on either side, as if
1853
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1854
    takes_args = ['branch', 'other']
1855
    hidden = True
1856
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1857
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1858
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1859
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
1860
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1861
        branch1 = Branch.open_containing(branch)[0]
1862
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1863
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1864
        history_1 = branch1.revision_history()
1865
        history_2 = branch2.revision_history()
1866
1241 by Martin Pool
- rename last_patch to last_revision
1867
        last1 = branch1.last_revision()
1868
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1869
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
1870
        source = MultipleRevisionSources(branch1.repository, 
1871
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1872
        
1873
        base_rev_id = common_ancestor(last1, last2, source)
1874
1875
        print 'merge base is revision %s' % base_rev_id
1876
        
1877
        return
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1878
1879
        if base_revno is None:
1880
            raise bzrlib.errors.UnrelatedBranches()
1881
1882
        print ' r%-6d in %s' % (base_revno, branch)
1883
1884
        other_revno = branch2.revision_id_to_revno(base_revid)
1885
        
1886
        print ' r%-6d in %s' % (other_revno, other)
1887
1888
1889
1890
class cmd_merge(Command):
1891
    """Perform a three-way merge.
1892
    
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1893
    The branch is the branch you will merge from.  By default, it will
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1894
    merge the latest revision.  If you specify a revision, that
1895
    revision will be merged.  If you specify two revisions, the first
1896
    will be used as a BASE, and the second one as OTHER.  Revision
1897
    numbers are always relative to the specified branch.
1898
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
1899
    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
1900
    branch, automatically determining an appropriate base.  If this
1901
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1902
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
1903
    Merge will do its best to combine the changes in two branches, but there
1904
    are some kinds of problems only a human can fix.  When it encounters those,
1905
    it will mark a conflict.  A conflict means that you need to fix something,
1906
    before you should commit.
1907
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
1908
    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
1909
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1910
    If there is no default branch set, the first merge will set it. After
1911
    that, you can omit the branch to use the default.  To change the
1614.2.2 by Olaf Conradi
Merge command:
1912
    default, use --remember.
1913
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1914
    Examples:
1915
1916
    To merge the latest revision from bzr.dev
1917
    bzr merge ../bzr.dev
1918
1919
    To merge changes up to and including revision 82 from bzr.dev
1920
    bzr merge -r 82 ../bzr.dev
1921
1922
    To merge the changes introduced by 82, without previous changes:
1923
    bzr merge -r 81..82 ../bzr.dev
1924
    
1925
    merge refuses to run if there are any uncommitted changes, unless
1926
    --force is given.
1927
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1928
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
1929
    takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1185.18.1 by Aaron Bentley
Added --show-base to merge
1930
                     Option('show-base', help="Show base revision text in "
1931
                            "conflicts")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1932
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1933
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1614.2.2 by Olaf Conradi
Merge command:
1934
            show_base=False, reprocess=False, remember=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1935
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
1936
            merge_type = Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
1937
1938
        tree = WorkingTree.open_containing(u'.')[0]
1939
        stored_loc = tree.branch.get_parent()
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1940
        if branch is None:
1614.2.2 by Olaf Conradi
Merge command:
1941
            if stored_loc is None:
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1942
                raise BzrCommandError("No merge branch known or specified.")
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1943
            else:
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1944
                print "Using saved branch: %s" % stored_loc
1945
                branch = stored_loc
1614.2.2 by Olaf Conradi
Merge command:
1946
1614.2.6 by Olaf Conradi
Add testcase for --remember when merge fails. It should still remember
1947
        if tree.branch.get_parent() is None or remember:
1948
            tree.branch.set_parent(branch)
1949
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1950
        if revision is None or len(revision) < 1:
1951
            base = [None, None]
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1952
            other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
1953
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1954
        else:
1955
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1956
                base = [None, None]
1645.1.1 by Aaron Bentley
Implement single-file merge
1957
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
1958
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1959
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1960
            else:
1961
                assert len(revision) == 2
1962
                if None in revision:
1963
                    raise BzrCommandError(
1964
                        "Merge doesn't permit that revision specifier.")
1645.1.1 by Aaron Bentley
Implement single-file merge
1965
                b, path = Branch.open_containing(branch)
1185.5.1 by John Arbash Meinel
Applying bad-merge revision patch.
1966
1967
                base = [branch, revision[0].in_history(b).revno]
1968
                other = [branch, revision[1].in_history(b).revno]
1645.1.1 by Aaron Bentley
Implement single-file merge
1969
        if path != "":
1970
            interesting_files = [path]
1971
        else:
1972
            interesting_files = None
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
1973
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1974
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
1975
            try:
1976
                conflict_count = merge(other, base, check_clean=(not force),
1977
                                       merge_type=merge_type, 
1978
                                       reprocess=reprocess,
1979
                                       show_base=show_base, 
1645.1.1 by Aaron Bentley
Implement single-file merge
1980
                                       pb=pb, file_list=interesting_files)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
1981
            finally:
1982
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
1983
            if conflict_count != 0:
1984
                return 1
1985
            else:
1986
                return 0
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1987
        except bzrlib.errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
1988
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1989
                 "candidates are:\n  "
1990
                 + "\n  ".join(e.bases)
1991
                 + "\n"
1992
                 "please specify an explicit base with -r,\n"
1993
                 "and (if you want) report this to the bzr developers\n")
1994
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1995
1996
1185.35.4 by Aaron Bentley
Implemented remerge
1997
class cmd_remerge(Command):
1998
    """Redo a merge.
1999
    """
2000
    takes_args = ['file*']
2001
    takes_options = ['merge-type', 'reprocess',
2002
                     Option('show-base', help="Show base revision text in "
2003
                            "conflicts")]
2004
2005
    def run(self, file_list=None, merge_type=None, show_base=False,
2006
            reprocess=False):
2007
        from bzrlib.merge import merge_inner, transform_tree
2008
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2009
            merge_type = Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2010
        tree, file_list = tree_files(file_list)
2011
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2012
        try:
1508.1.15 by Robert Collins
Merge from mpool.
2013
            pending_merges = tree.pending_merges() 
1185.35.4 by Aaron Bentley
Implemented remerge
2014
            if len(pending_merges) != 1:
2015
                raise BzrCommandError("Sorry, remerge only works after normal"
2016
                                      + " merges.  Not cherrypicking or"
2017
                                      + "multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2018
            repository = tree.branch.repository
1508.1.15 by Robert Collins
Merge from mpool.
2019
            base_revision = common_ancestor(tree.branch.last_revision(), 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2020
                                            pending_merges[0], repository)
2021
            base_tree = repository.revision_tree(base_revision)
2022
            other_tree = repository.revision_tree(pending_merges[0])
1185.35.4 by Aaron Bentley
Implemented remerge
2023
            interesting_ids = None
2024
            if file_list is not None:
2025
                interesting_ids = set()
2026
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2027
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2028
                    if file_id is None:
2029
                        raise NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2030
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2031
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2032
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2033
                    
1508.1.15 by Robert Collins
Merge from mpool.
2034
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2035
                        interesting_ids.add(ie.file_id)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2036
            transform_tree(tree, tree.basis_tree(), interesting_ids)
1185.35.4 by Aaron Bentley
Implemented remerge
2037
            if file_list is None:
1508.1.15 by Robert Collins
Merge from mpool.
2038
                restore_files = list(tree.iter_conflicts())
1185.35.4 by Aaron Bentley
Implemented remerge
2039
            else:
2040
                restore_files = file_list
2041
            for filename in restore_files:
2042
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2043
                    restore(tree.abspath(filename))
1185.35.4 by Aaron Bentley
Implemented remerge
2044
                except NotConflicted:
2045
                    pass
1551.5.1 by Aaron Bentley
Stop using deprecated api in remerge
2046
            conflicts =  merge_inner(tree.branch, other_tree, base_tree,
2047
                                     this_tree=tree,
1185.35.4 by Aaron Bentley
Implemented remerge
2048
                                     interesting_ids = interesting_ids, 
2049
                                     other_rev_id=pending_merges[0], 
2050
                                     merge_type=merge_type, 
2051
                                     show_base=show_base,
2052
                                     reprocess=reprocess)
2053
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2054
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2055
        if conflicts > 0:
2056
            return 1
2057
        else:
2058
            return 0
2059
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2060
class cmd_revert(Command):
2061
    """Reverse all changes since the last commit.
2062
2063
    Only versioned files are affected.  Specify filenames to revert only 
2064
    those files.  By default, any files that are changed will be backed up
2065
    first.  Backup files have a '~' appended to their name.
2066
    """
2067
    takes_options = ['revision', 'no-backup']
2068
    takes_args = ['file*']
2069
    aliases = ['merge-revert']
2070
2071
    def run(self, revision=None, no_backup=False, file_list=None):
2072
        from bzrlib.commands import parse_spec
2073
        if file_list is not None:
2074
            if len(file_list) == 0:
2075
                raise BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2076
        else:
2077
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2078
        
2079
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2080
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2081
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2082
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2083
        elif len(revision) != 1:
2084
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
2085
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2086
            rev_id = revision[0].in_history(tree.branch).rev_id
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2087
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
2088
        try:
2089
            tree.revert(file_list, 
2090
                        tree.branch.repository.revision_tree(rev_id),
2091
                        not no_backup, pb)
2092
        finally:
2093
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2094
2095
2096
class cmd_assert_fail(Command):
2097
    """Test reporting of assertion failures"""
2098
    hidden = True
2099
    def run(self):
2100
        assert False, "always fails"
2101
2102
2103
class cmd_help(Command):
2104
    """Show help on a command or other topic.
2105
2106
    For a list of all available commands, say 'bzr help commands'."""
1553.4.3 by Michael Ellerman
Add custom description for help's --long option, this fixes bug #31217.
2107
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2108
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2109
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2110
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2111
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2112
    def run(self, topic=None, long=False):
2113
        import help
2114
        if topic is None and long:
2115
            topic = "commands"
2116
        help.help(topic)
2117
2118
2119
class cmd_shell_complete(Command):
2120
    """Show appropriate completions for context.
2121
2122
    For a list of all available commands, say 'bzr shell-complete'."""
2123
    takes_args = ['context?']
2124
    aliases = ['s-c']
2125
    hidden = True
2126
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2127
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2128
    def run(self, context=None):
2129
        import shellcomplete
2130
        shellcomplete.shellcomplete(context)
2131
2132
1228 by Martin Pool
- add fetch command as builtin
2133
class cmd_fetch(Command):
2134
    """Copy in history from another branch but don't merge it.
2135
2136
    This is an internal method used for pull and merge."""
2137
    hidden = True
2138
    takes_args = ['from_branch', 'to_branch']
2139
    def run(self, from_branch, to_branch):
2140
        from bzrlib.fetch import Fetcher
2141
        from bzrlib.branch import Branch
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2142
        from_b = Branch.open(from_branch)
2143
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2144
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2145
2146
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2147
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2148
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2149
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2150
    OTHER_BRANCH may be local or remote."""
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2151
    takes_args = ['other_branch?']
2152
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2153
                     Option('mine-only', 
2154
                            'Display changes in the local branch only'),
2155
                     Option('theirs-only', 
2156
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik BÃ¥gfors
cover the missing command with formatters as well
2157
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2158
                     'line',
2159
                     'long', 
2160
                     'short',
2161
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2162
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2163
                     ]
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2164
2165
    def run(self, other_branch=None, reverse=False, mine_only=False,
1553.2.6 by Erik BÃ¥gfors
Make default formatter work for the missing command
2166
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2167
            show_ids=False, verbose=False):
2168
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2169
        from bzrlib.log import log_formatter
1185.46.5 by Aaron Bentley
Use unicode pathname in cmd_missing
2170
        local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2171
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2172
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2173
            other_branch = parent
2174
            if other_branch is None:
2175
                raise BzrCommandError("No missing location known or specified.")
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2176
            print "Using last location: " + local_branch.get_parent()
2177
        remote_branch = bzrlib.branch.Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2178
        if remote_branch.base == local_branch.base:
2179
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2180
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2181
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2182
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2183
            try:
2184
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2185
                if (log_format == None):
2186
                    default = bzrlib.config.BranchConfig(local_branch).log_format()
2187
                    log_format = get_log_format(long=long, short=short, line=line, default=default)
2188
                lf = log_formatter(log_format, sys.stdout,
2189
                                   show_ids=show_ids,
2190
                                   show_timezone='original')
2191
                if reverse is False:
2192
                    local_extra.reverse()
2193
                    remote_extra.reverse()
2194
                if local_extra and not theirs_only:
2195
                    print "You have %d extra revision(s):" % len(local_extra)
2196
                    for data in iter_log_data(local_extra, local_branch.repository,
2197
                                              verbose):
2198
                        lf.show(*data)
2199
                    printed_local = True
2200
                else:
2201
                    printed_local = False
2202
                if remote_extra and not mine_only:
2203
                    if printed_local is True:
2204
                        print "\n\n"
2205
                    print "You are missing %d revision(s):" % len(remote_extra)
2206
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2207
                                              verbose):
2208
                        lf.show(*data)
2209
                if not remote_extra and not local_extra:
2210
                    status_code = 0
2211
                    print "Branches are up to date."
2212
                else:
2213
                    status_code = 1
2214
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2215
                remote_branch.unlock()
2216
        finally:
2217
            local_branch.unlock()
2218
        if not status_code and parent is None and other_branch is not None:
2219
            local_branch.lock_write()
2220
            try:
2221
                # handle race conditions - a parent might be set while we run.
2222
                if local_branch.get_parent() is None:
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2223
                    local_branch.set_parent(other_branch)
2224
            finally:
2225
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2226
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2227
2228
2229
class cmd_plugins(Command):
2230
    """List plugins"""
2231
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2232
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2233
    def run(self):
2234
        import bzrlib.plugin
2235
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2236
        for name, plugin in bzrlib.plugin.all_plugins().items():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2237
            if hasattr(plugin, '__path__'):
2238
                print plugin.__path__[0]
2239
            elif hasattr(plugin, '__file__'):
2240
                print plugin.__file__
2241
            else:
2242
                print `plugin`
2243
                
2244
            d = getdoc(plugin)
2245
            if d:
2246
                print '\t', d.split('\n')[0]
2247
2248
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2249
class cmd_testament(Command):
2250
    """Show testament (signing-form) of a revision."""
2251
    takes_options = ['revision', 'long']
2252
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2253
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2254
    def run(self, branch=u'.', revision=None, long=False):
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2255
        from bzrlib.testament import Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2256
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2257
        b.lock_read()
2258
        try:
2259
            if revision is None:
2260
                rev_id = b.last_revision()
2261
            else:
2262
                rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2263
            t = Testament.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2264
            if long:
2265
                sys.stdout.writelines(t.as_text_lines())
2266
            else:
2267
                sys.stdout.write(t.as_short_text())
2268
        finally:
2269
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2270
2271
2272
class cmd_annotate(Command):
2273
    """Show the origin of each line in a file.
2274
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2275
    This prints out the given file with an annotation on the left side
2276
    indicating which revision, author and date introduced the change.
2277
2278
    If the origin is the same for a run of consecutive lines, it is 
2279
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2280
    """
2281
    # TODO: annotate directories; showing when each file was last changed
2282
    # TODO: annotate a previous version of a file
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2283
    # TODO: if the working copy is modified, show annotations on that 
2284
    #       with new uncommitted lines marked
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2285
    aliases = ['blame', 'praise']
2286
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2287
    takes_options = [Option('all', help='show annotations on all lines'),
2288
                     Option('long', help='show date in annotations'),
2289
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2290
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2291
    @display_command
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2292
    def run(self, filename, all=False, long=False):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2293
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2294
        tree, relpath = WorkingTree.open_containing(filename)
2295
        branch = tree.branch
2296
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2297
        try:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2298
            file_id = tree.inventory.path2id(relpath)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2299
            tree = branch.repository.revision_tree(branch.last_revision())
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2300
            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
2301
            annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2302
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2303
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2304
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2305
2306
class cmd_re_sign(Command):
2307
    """Create a digital signature for an existing revision."""
2308
    # TODO be able to replace existing ones.
2309
2310
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2311
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2312
    takes_options = ['revision']
2313
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2314
    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.
2315
        import bzrlib.config as config
2316
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2317
        if revision_id_list is not None and revision is not None:
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2318
            raise 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
2319
        if revision_id_list is None and revision is None:
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2320
            raise 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)
2321
        b = WorkingTree.open_containing(u'.')[0].branch
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2322
        gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2323
        if revision_id_list is not None:
2324
            for revision_id in revision_id_list:
2325
                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.
2326
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2327
            if len(revision) == 1:
2328
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2329
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2330
            elif len(revision) == 2:
2331
                # are they both on rh- if so we can walk between them
2332
                # might be nice to have a range helper for arbitrary
2333
                # revision paths. hmm.
2334
                from_revno, from_revid = revision[0].in_history(b)
2335
                to_revno, to_revid = revision[1].in_history(b)
2336
                if to_revid is None:
2337
                    to_revno = b.revno()
2338
                if from_revno is None or to_revno is None:
2339
                    raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2340
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2341
                    b.repository.sign_revision(b.get_rev_id(revno), 
2342
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2343
            else:
2344
                raise 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.
2345
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2346
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2347
class cmd_bind(Command):
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2348
    """Bind the current branch to a master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2349
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2350
    After binding, commits must succeed on the master branch
2351
    before they are executed on the local one.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2352
    """
2353
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2354
    takes_args = ['location']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2355
    takes_options = []
2356
2357
    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
2358
        b, relpath = Branch.open_containing(u'.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2359
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2360
        try:
2361
            b.bind(b_other)
2362
        except DivergedBranches:
2363
            raise BzrCommandError('These branches have diverged.'
1505.1.12 by John Arbash Meinel
Fixing up the error message for a failed bind.
2364
                                  ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2365
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2366
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2367
class cmd_unbind(Command):
2368
    """Bind the current branch to its parent.
2369
2370
    After unbinding, the local branch is considered independent.
2371
    """
2372
2373
    takes_args = []
2374
    takes_options = []
2375
2376
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2377
        b, relpath = Branch.open_containing(u'.')
2378
        if not b.unbind():
2379
            raise BzrCommandError('Local branch is not bound')
2380
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2381
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2382
class cmd_uncommit(bzrlib.commands.Command):
2383
    """Remove the last committed revision.
2384
2385
    By supplying the --all flag, it will not only remove the entry 
2386
    from revision_history, but also remove all of the entries in the
2387
    stores.
2388
2389
    --verbose will print out what is being removed.
2390
    --dry-run will go through all the motions, but not actually
2391
    remove anything.
2392
    
2393
    In the future, uncommit will create a changeset, which can then
2394
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
2395
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
2396
1553.5.34 by Martin Pool
Stub lock-breaking command
2397
    # TODO: jam 20060108 Add an option to allow uncommit to remove
2398
    # unreferenced information in 'branch-as-repostory' branches.
2399
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2400
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2401
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2402
                    Option('dry-run', help='Don\'t actually make changes'),
2403
                    Option('force', help='Say yes to all questions.')]
2404
    takes_args = ['location?']
2405
    aliases = []
2406
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2407
    def run(self, location=None, 
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2408
            dry_run=False, verbose=False,
2409
            revision=None, force=False):
2410
        from bzrlib.branch import Branch
2411
        from bzrlib.log import log_formatter
2412
        import sys
2413
        from bzrlib.uncommit import uncommit
2414
2415
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2416
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2417
        control, relpath = bzrdir.BzrDir.open_containing(location)
2418
        try:
2419
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2420
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2421
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2422
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2423
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2424
2425
        if revision is None:
2426
            revno = b.revno()
2427
            rev_id = b.last_revision()
2428
        else:
2429
            revno, rev_id = revision[0].in_history(b)
2430
        if rev_id is None:
2431
            print 'No revisions to uncommit.'
2432
2433
        for r in range(revno, b.revno()+1):
2434
            rev_id = b.get_rev_id(r)
2435
            lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2436
            lf.show(r, b.repository.get_revision(rev_id), None)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2437
2438
        if dry_run:
2439
            print 'Dry-run, pretending to remove the above revisions.'
2440
            if not force:
2441
                val = raw_input('Press <enter> to continue')
2442
        else:
2443
            print 'The above revision(s) will be removed.'
2444
            if not force:
2445
                val = raw_input('Are you sure [y/N]? ')
2446
                if val.lower() not in ('y', 'yes'):
2447
                    print 'Canceled'
2448
                    return 0
2449
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2450
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2451
                revno=revno)
2452
2453
1553.5.34 by Martin Pool
Stub lock-breaking command
2454
class cmd_break_lock(Command):
2455
    """Break a dead lock on a repository, branch or working directory.
2456
1553.5.35 by Martin Pool
Start break-lock --show
2457
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
2458
    holding the lock has been stopped.
1553.5.35 by Martin Pool
Start break-lock --show
2459
    
2460
    example:
2461
        bzr break-lock .
1553.5.34 by Martin Pool
Stub lock-breaking command
2462
    """
1553.5.35 by Martin Pool
Start break-lock --show
2463
    takes_args = ['location']
2464
    takes_options = [Option('show',
2465
                            help="just show information on the lock, " \
2466
                                 "don't break it"),
2467
                    ]
2468
    def run(self, location, show=False):
1626.1.1 by Martin Pool
Disable break-lock command until it works properly
2469
        raise NotImplementedError("sorry, break-lock is not complete yet; "
2470
                "you can remove the 'held' directory manually to break the lock")
1553.5.35 by Martin Pool
Start break-lock --show
2471
2472
2473
# command-line interpretation helper for merge-related commands
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2474
def merge(other_revision, base_revision,
2475
          check_clean=True, ignore_zero=False,
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2476
          this_dir=None, backup_files=False, merge_type=Merge3Merger,
1553.5.35 by Martin Pool
Start break-lock --show
2477
          file_list=None, show_base=False, reprocess=False,
1534.9.6 by Aaron Bentley
Disable merge progress bars, except from the merge command
2478
          pb=DummyProgress()):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2479
    """Merge changes into a tree.
2480
2481
    base_revision
2482
        list(path, revno) Base for three-way merge.  
2483
        If [None, None] then a base will be automatically determined.
2484
    other_revision
2485
        list(path, revno) Other revision for three-way merge.
2486
    this_dir
2487
        Directory to merge changes into; '.' by default.
2488
    check_clean
2489
        If true, this_dir must have no uncommitted changes before the
2490
        merge begins.
2491
    ignore_zero - If true, suppress the "zero conflicts" message when 
2492
        there are no conflicts; should be set when doing something we expect
2493
        to complete perfectly.
2494
    file_list - If supplied, merge only changes to selected files.
2495
2496
    All available ancestors of other_revision and base_revision are
2497
    automatically pulled into the branch.
2498
2499
    The revno may be -1 to indicate the last revision on the branch, which is
2500
    the typical case.
2501
2502
    This function is intended for use from the command line; programmatic
2503
    clients might prefer to call merge.merge_inner(), which has less magic 
2504
    behavior.
2505
    """
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
2506
    from bzrlib.merge import Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2507
    if this_dir is None:
2508
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
2509
    this_tree = WorkingTree.open_containing(this_dir)[0]
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2510
    if show_base and not merge_type is Merge3Merger:
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2511
        raise BzrCommandError("Show-base is not supported for this merge"
2512
                              " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
2513
    if reprocess and not merge_type.supports_reprocess:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2514
        raise BzrCommandError("Conflict reduction is not supported for merge"
2515
                              " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2516
    if reprocess and show_base:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2517
        raise BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2518
    try:
2519
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2520
        merger.pp = ProgressPhase("Merge phase", 5, pb)
2521
        merger.pp.next_phase()
2522
        merger.check_basis(check_clean)
2523
        merger.set_other(other_revision)
2524
        merger.pp.next_phase()
2525
        merger.set_base(base_revision)
2526
        if merger.base_rev_id == merger.other_rev_id:
2527
            note('Nothing to do.')
2528
            return 0
2529
        merger.backup_files = backup_files
2530
        merger.merge_type = merge_type 
2531
        merger.set_interesting_files(file_list)
2532
        merger.show_base = show_base 
2533
        merger.reprocess = reprocess
2534
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
2535
        if file_list is None:
2536
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2537
    finally:
2538
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2539
    return conflicts
2540
2541
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2542
# these get imported and then picked up by the scan for cmd_*
2543
# TODO: Some more consistent way to split command definitions across files;
2544
# 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'.
2545
# aliases.  ideally we would avoid loading the implementation until the
2546
# details were needed.
1185.35.4 by Aaron Bentley
Implemented remerge
2547
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
2548
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
2549
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2550
        cmd_weave_plan_merge, cmd_weave_merge_text