/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1
# Copyright (C) 2004, 2005 by Canonical Ltd
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
17
18
import sys
19
import os
20
21
import bzrlib
1460 by Robert Collins
merge from martin.
22
from bzrlib import BZRDIR
23
from bzrlib.commands import Command
24
from bzrlib.branch import Branch
1371 by Martin Pool
- raise NotBranchError if format file can't be read
25
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError, NotBranchError
1441 by Robert Collins
tests passing is a good idea - move the branch open in cmd_branch to ensure this, and remove noise from the test suite
26
from bzrlib.errors import DivergedBranches
1185.16.43 by Martin Pool
- clean up handling of option objects
27
from bzrlib.option import Option
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
28
from bzrlib.revisionspec import RevisionSpec
1460 by Robert Collins
merge from martin.
29
import bzrlib.trace
30
from bzrlib.trace import mutter, note, log_error, warning
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
31
from bzrlib.workingtree import WorkingTree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
32
33
34
class cmd_status(Command):
35
    """Display status summary.
36
37
    This reports on versioned and unknown files, reporting them
38
    grouped by state.  Possible states are:
39
40
    added
41
        Versioned in the working copy but not in the previous revision.
42
43
    removed
44
        Versioned in the previous revision but removed or deleted
45
        in the working copy.
46
47
    renamed
48
        Path of this file changed from the previous revision;
49
        the text may also have changed.  This includes files whose
50
        parent directory was renamed.
51
52
    modified
53
        Text has changed since the previous revision.
54
55
    unchanged
56
        Nothing about this file has changed since the previous revision.
57
        Only shown with --all.
58
59
    unknown
60
        Not versioned and not matching an ignore pattern.
61
62
    To see ignored files use 'bzr ignored'.  For details in the
63
    changes to file texts, use 'bzr diff'.
64
65
    If no arguments are specified, the status of the entire working
66
    directory is shown.  Otherwise, only the status of the specified
67
    files or directories is reported.  If a directory is given, status
68
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
69
70
    If a revision argument is given, the status is calculated against
71
    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
72
    """
1185.1.11 by Robert Collins
fixme note for bzr status
73
    # XXX: FIXME: bzr status should accept a -r option to show changes
74
    # relative to a revision, or between revisions
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
75
76
    takes_args = ['file*']
1092.3.4 by Robert Collins
update symlink branch to integration
77
    takes_options = ['all', 'show-ids']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
78
    aliases = ['st', 'stat']
79
    
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
80
    def run(self, all=False, show_ids=False, file_list=None, revision=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
81
        if file_list:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
82
            b, relpath = Branch.open_containing(file_list[0])
83
            if relpath == '' and len(file_list) == 1:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
84
                file_list = None
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
85
            else:
86
                # generate relative paths.
87
                # note that if this is a remote branch, we would want
88
                # relpath against the transport. RBC 20051018
89
                tree = WorkingTree(b.base, b)
90
                file_list = [tree.relpath(x) for x in file_list]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
91
        else:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
92
            b = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
93
            
94
        from bzrlib.status import show_status
95
        show_status(b, show_unchanged=all, show_ids=show_ids,
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
96
                    specific_files=file_list, revision=revision)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
97
98
99
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
100
    """Write out metadata for a revision.
101
    
102
    The revision to print can either be specified by a specific
103
    revision identifier, or you can use --revision.
104
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
105
106
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
107
    takes_args = ['revision_id?']
108
    takes_options = ['revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
109
    
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
110
    def run(self, revision_id=None, revision=None):
111
112
        if revision_id is not None and revision is not None:
113
            raise BzrCommandError('You can only supply one of revision_id or --revision')
114
        if revision_id is None and revision is None:
115
            raise BzrCommandError('You must supply either --revision or a revision_id')
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
116
        b = Branch.open_containing('.')[0]
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
117
        if revision_id is not None:
118
            sys.stdout.write(b.get_revision_xml_file(revision_id).read())
119
        elif revision is not None:
120
            for rev in revision:
121
                if rev is None:
122
                    raise BzrCommandError('You cannot specify a NULL revision.')
123
                revno, rev_id = rev.in_history(b)
124
                sys.stdout.write(b.get_revision_xml_file(rev_id).read())
1185.1.29 by Robert Collins
merge merge tweaks from aaron, which includes latest .dev
125
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
126
127
class cmd_revno(Command):
128
    """Show current revision number.
129
130
    This is equal to the number of revisions on this branch."""
131
    def run(self):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
132
        print Branch.open_containing('.')[0].revno()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
133
1182 by Martin Pool
- more disentangling of xml storage format from objects
134
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
135
class cmd_revision_info(Command):
136
    """Show revision number and revision id for a given revision identifier.
137
    """
138
    hidden = True
139
    takes_args = ['revision_info*']
140
    takes_options = ['revision']
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
141
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
142
143
        revs = []
144
        if revision is not None:
145
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
146
        if revision_info_list is not None:
147
            for rev in revision_info_list:
148
                revs.append(RevisionSpec(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
149
        if len(revs) == 0:
150
            raise BzrCommandError('You must supply a revision identifier')
151
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
152
        b = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
153
154
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
155
            revinfo = rev.in_history(b)
156
            if revinfo.revno is None:
157
                print '     %s' % revinfo.rev_id
158
            else:
159
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
160
161
    
162
class cmd_add(Command):
163
    """Add specified files or directories.
164
165
    In non-recursive mode, all the named items are added, regardless
166
    of whether they were previously ignored.  A warning is given if
167
    any of the named files are already versioned.
168
169
    In recursive mode (the default), files are treated the same way
170
    but the behaviour for directories is different.  Directories that
171
    are already versioned do not give a warning.  All directories,
172
    whether already versioned or not, are searched for files or
173
    subdirectories that are neither versioned or ignored, and these
174
    are added.  This search proceeds recursively into versioned
175
    directories.  If no names are given '.' is assumed.
176
177
    Therefore simply saying 'bzr add' will version all files that
178
    are currently unknown.
179
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
180
    Adding a file whose parent directory is not versioned will
181
    implicitly add the parent, and so on up to the root. This means
182
    you should never need to explictly add a directory, they'll just
183
    get added when you add a file in the directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
184
    """
185
    takes_args = ['file*']
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
186
    takes_options = ['no-recurse', 'quiet']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
187
    
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
188
    def run(self, file_list, no_recurse=False, quiet=False):
189
        from bzrlib.add import smart_add, add_reporter_print, add_reporter_null
190
        if quiet:
191
            reporter = add_reporter_null
192
        else:
193
            reporter = add_reporter_print
194
        smart_add(file_list, not no_recurse, reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
195
196
197
class cmd_mkdir(Command):
198
    """Create a new versioned directory.
199
200
    This is equivalent to creating the directory and then adding it.
201
    """
202
    takes_args = ['dir+']
203
204
    def run(self, dir_list):
205
        b = None
206
        
207
        for d in dir_list:
208
            os.mkdir(d)
209
            if not b:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
210
                b = Branch.open_containing(d)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
211
            b.add([d])
212
            print 'added', d
213
214
215
class cmd_relpath(Command):
216
    """Show path of a file relative to root"""
217
    takes_args = ['filename']
218
    hidden = True
219
    
220
    def run(self, filename):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
221
        branch, relpath = Branch.open_containing(filename)
222
        print relpath
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
223
224
225
class cmd_inventory(Command):
226
    """Show inventory of the current working copy or a revision."""
227
    takes_options = ['revision', 'show-ids']
228
    
229
    def run(self, revision=None, show_ids=False):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
230
        b = Branch.open_containing('.')[0]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
231
        if revision is None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
232
            inv = b.read_working_inventory()
233
        else:
234
            if len(revision) > 1:
235
                raise BzrCommandError('bzr inventory --revision takes'
236
                    ' exactly one revision identifier')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
237
            inv = b.get_revision_inventory(revision[0].in_history(b).rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
238
239
        for path, entry in inv.entries():
240
            if show_ids:
241
                print '%-50s %s' % (path, entry.file_id)
242
            else:
243
                print path
244
245
246
class cmd_move(Command):
247
    """Move files to a different directory.
248
249
    examples:
250
        bzr move *.txt doc
251
252
    The destination must be a versioned directory in the same branch.
253
    """
254
    takes_args = ['source$', 'dest']
255
    def run(self, source_list, dest):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
256
        b = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
257
258
        # TODO: glob expansion on windows?
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
259
        tree = WorkingTree(b.base, b)
260
        b.move([tree.relpath(s) for s in source_list], tree.relpath(dest))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
261
262
263
class cmd_rename(Command):
264
    """Change the name of an entry.
265
266
    examples:
267
      bzr rename frob.c frobber.c
268
      bzr rename src/frob.c lib/frob.c
269
270
    It is an error if the destination name exists.
271
272
    See also the 'move' command, which moves files into a different
273
    directory without changing their name.
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
274
    """
275
    # TODO: Some way to rename multiple files without invoking 
276
    # bzr for each one?"""
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
277
    takes_args = ['from_name', 'to_name']
278
    
279
    def run(self, from_name, to_name):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
280
        b = Branch.open_containing('.')[0]
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
281
        tree = WorkingTree(b.base, b)
282
        b.rename_one(tree.relpath(from_name), tree.relpath(to_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
283
284
285
class cmd_mv(Command):
286
    """Move or rename a file.
287
288
    usage:
289
        bzr mv OLDNAME NEWNAME
290
        bzr mv SOURCE... DESTINATION
291
292
    If the last argument is a versioned directory, all the other names
293
    are moved into it.  Otherwise, there must be exactly two arguments
294
    and the file is changed to a new name, which must not already exist.
295
296
    Files cannot be moved between branches.
297
    """
298
    takes_args = ['names*']
299
    def run(self, names_list):
300
        if len(names_list) < 2:
301
            raise BzrCommandError("missing file argument")
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
302
        b = Branch.open_containing(names_list[0])[0]
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
303
        tree = WorkingTree(b.base, b)
304
        rel_names = [tree.relpath(x) for x in names_list]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
305
        
306
        if os.path.isdir(names_list[-1]):
307
            # move into existing directory
308
            for pair in b.move(rel_names[:-1], rel_names[-1]):
309
                print "%s => %s" % pair
310
        else:
311
            if len(names_list) != 2:
312
                raise BzrCommandError('to mv multiple files the destination '
313
                                      'must be a versioned directory')
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
314
            b.rename_one(rel_names[0], rel_names[1])
315
            print "%s => %s" % (rel_names[0], rel_names[1])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
316
            
317
    
318
319
320
class cmd_pull(Command):
321
    """Pull any changes from another branch into the current one.
322
323
    If the location is omitted, the last-used location will be used.
324
    Both the revision history and the working directory will be
325
    updated.
326
327
    This command only works on branches that have not diverged.  Branches are
328
    considered diverged if both branches have had commits without first
329
    pulling from the other.
330
331
    If branches have diverged, you can use 'bzr merge' to pull the text changes
332
    from one into the other.
333
    """
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
334
    takes_options = ['remember']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
335
    takes_args = ['location?']
336
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
337
    def run(self, location=None, remember=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
338
        from bzrlib.merge import merge
339
        import tempfile
340
        from shutil import rmtree
341
        import errno
342
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
343
        br_to = Branch.open_containing('.')[0]
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
344
        stored_loc = br_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
345
        if location is None:
346
            if stored_loc is None:
347
                raise BzrCommandError("No pull location known or specified.")
348
            else:
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
349
                print "Using saved location: %s" % stored_loc
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
350
                location = stored_loc
351
        cache_root = tempfile.mkdtemp()
1441 by Robert Collins
tests passing is a good idea - move the branch open in cmd_branch to ensure this, and remove noise from the test suite
352
        br_from = Branch.open(location)
353
        br_from.lock_read()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
354
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
355
            br_from.setup_caching(cache_root)
1185.2.3 by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes;
356
            location = br_from.base
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
357
            old_revno = br_to.revno()
1442 by Robert Collins
only do a local merge during pull if the revision history changed
358
            old_revision_history = br_to.revision_history()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
359
            try:
360
                br_to.update_revisions(br_from)
361
            except DivergedBranches:
362
                raise BzrCommandError("These branches have diverged."
363
                    "  Try merge.")
1442 by Robert Collins
only do a local merge during pull if the revision history changed
364
            new_revision_history = br_to.revision_history()
365
            if new_revision_history != old_revision_history:
366
                merge(('.', -1), ('.', old_revno), check_clean=False)
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
367
            if stored_loc is None or remember:
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
368
                br_to.set_parent(location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
369
        finally:
1439 by Robert Collins
fix a prior bad merge of cmd_pull, which had resulted in double opens of remote branches
370
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
371
            rmtree(cache_root)
372
373
374
375
class cmd_branch(Command):
376
    """Create a new copy of a branch.
377
378
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
379
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
380
381
    To retrieve the branch as of a particular revision, supply the --revision
382
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
383
384
    --basis is to speed up branching from remote branches.  When specified, it
385
    copies all the file-contents, inventory and revision data from the basis
386
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
387
    """
388
    takes_args = ['from_location', 'to_location?']
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
389
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
390
    aliases = ['get', 'clone']
391
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
392
    def run(self, from_location, to_location=None, revision=None, basis=None):
1393.1.5 by Martin Pool
- move copy_branch into bzrlib.clone
393
        from bzrlib.clone import copy_branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
394
        import tempfile
395
        import errno
396
        from shutil import rmtree
397
        cache_root = tempfile.mkdtemp()
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
398
        if revision is None:
399
            revision = [None]
400
        elif len(revision) > 1:
401
            raise BzrCommandError(
402
                'bzr branch --revision takes exactly 1 revision value')
403
        try:
404
            br_from = Branch.open(from_location)
405
        except OSError, e:
406
            if e.errno == errno.ENOENT:
407
                raise BzrCommandError('Source location "%s" does not'
408
                                      ' exist.' % to_location)
409
            else:
410
                raise
411
        br_from.lock_read()
412
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
413
            br_from.setup_caching(cache_root)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
414
            if basis is not None:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
415
                basis_branch = Branch.open_containing(basis)[0]
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
416
            else:
417
                basis_branch = None
1185.8.4 by Aaron Bentley
Fixed branch -r
418
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
419
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
420
            else:
1390 by Robert Collins
pair programming worx... merge integration and weave
421
                revision_id = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
422
            if to_location is None:
423
                to_location = os.path.basename(from_location.rstrip("/\\"))
424
            try:
425
                os.mkdir(to_location)
426
            except OSError, e:
427
                if e.errno == errno.EEXIST:
428
                    raise BzrCommandError('Target directory "%s" already'
429
                                          ' exists.' % to_location)
430
                if e.errno == errno.ENOENT:
431
                    raise BzrCommandError('Parent of "%s" does not exist.' %
432
                                          to_location)
433
                else:
434
                    raise
435
            try:
1391 by Robert Collins
merge from integration
436
                copy_branch(br_from, to_location, revision_id, basis_branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
437
            except bzrlib.errors.NoSuchRevision:
438
                rmtree(to_location)
439
                msg = "The branch %s has no revision %d." % (from_location, revision[0])
440
                raise BzrCommandError(msg)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
441
            except bzrlib.errors.UnlistableBranch:
442
                msg = "The branch %s cannot be used as a --basis"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
443
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
444
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
445
            rmtree(cache_root)
446
447
448
class cmd_renames(Command):
449
    """Show list of renamed files.
450
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
451
    # TODO: Option to show renames between two historical versions.
452
453
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
454
    takes_args = ['dir?']
455
456
    def run(self, dir='.'):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
457
        b = Branch.open_containing(dir)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
458
        old_inv = b.basis_tree().inventory
459
        new_inv = b.read_working_inventory()
460
461
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
462
        renames.sort()
463
        for old_name, new_name in renames:
464
            print "%s => %s" % (old_name, new_name)        
465
466
467
class cmd_info(Command):
468
    """Show statistical information about a branch."""
469
    takes_args = ['branch?']
470
    
471
    def run(self, branch=None):
472
        import info
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
473
        b = Branch.open_containing(branch)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
474
        info.show_info(b)
475
476
477
class cmd_remove(Command):
478
    """Make a file unversioned.
479
480
    This makes bzr stop tracking changes to a versioned file.  It does
481
    not delete the working copy.
482
    """
483
    takes_args = ['file+']
484
    takes_options = ['verbose']
1424 by Robert Collins
add rm alias to remove
485
    aliases = ['rm']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
486
    
487
    def run(self, file_list, verbose=False):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
488
        b = Branch.open_containing(file_list[0])[0]
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
489
        tree = WorkingTree(b.base, b)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
490
        tree.remove([tree.relpath(f) for f in file_list], verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
491
492
493
class cmd_file_id(Command):
494
    """Print file_id of a particular file or directory.
495
496
    The file_id is assigned when the file is first added and remains the
497
    same through all revisions where the file exists, even when it is
498
    moved or renamed.
499
    """
500
    hidden = True
501
    takes_args = ['filename']
502
    def run(self, filename):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
503
        b, relpath = Branch.open_containing(filename)
504
        i = b.inventory.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
505
        if i == None:
506
            raise BzrError("%r is not a versioned file" % filename)
507
        else:
508
            print i
509
510
511
class cmd_file_path(Command):
512
    """Print path of file_ids to a file or directory.
513
514
    This prints one line for each directory down to the target,
515
    starting at the branch root."""
516
    hidden = True
517
    takes_args = ['filename']
518
    def run(self, filename):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
519
        b, relpath = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
520
        inv = b.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
521
        fid = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
522
        if fid == None:
523
            raise BzrError("%r is not a versioned file" % filename)
524
        for fip in inv.get_idpath(fid):
525
            print fip
526
527
528
class cmd_revision_history(Command):
529
    """Display list of revision ids on this branch."""
530
    hidden = True
531
    def run(self):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
532
        for patchid in Branch.open_containing('.')[0].revision_history():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
533
            print patchid
534
535
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
536
class cmd_ancestry(Command):
537
    """List all revisions merged into this branch."""
538
    hidden = True
539
    def run(self):
540
        b = find_branch('.')
1241 by Martin Pool
- rename last_patch to last_revision
541
        for revision_id in b.get_ancestry(b.last_revision()):
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
542
            print revision_id
543
544
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
545
class cmd_directories(Command):
546
    """Display list of versioned directories in this branch."""
547
    def run(self):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
548
        for name, ie in Branch.open_containing('.')[0].read_working_inventory().directories():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
549
            if name == '':
550
                print '.'
551
            else:
552
                print name
553
554
555
class cmd_init(Command):
556
    """Make a directory into a versioned branch.
557
558
    Use this to create an empty branch, or before importing an
559
    existing project.
560
561
    Recipe for importing a tree of files:
562
        cd ~/project
563
        bzr init
564
        bzr add -v .
565
        bzr status
566
        bzr commit -m 'imported project'
567
    """
568
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
569
        Branch.initialize('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
570
571
572
class cmd_diff(Command):
573
    """Show differences in working tree.
574
    
575
    If files are listed, only the changes in those files are listed.
576
    Otherwise, all changes for the tree are listed.
577
578
    examples:
579
        bzr diff
580
        bzr diff -r1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
581
        bzr diff -r1..2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
582
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
583
    # TODO: Allow diff across branches.
584
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
585
    #       or a graphical diff.
586
587
    # TODO: Python difflib is not exactly the same as unidiff; should
588
    #       either fix it up or prefer to use an external diff.
589
590
    # TODO: If a directory is given, diff everything under that.
591
592
    # TODO: Selected-file diff is inefficient and doesn't show you
593
    #       deleted files.
594
595
    # TODO: This probably handles non-Unix newlines poorly.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
596
    
597
    takes_args = ['file*']
598
    takes_options = ['revision', 'diff-options']
599
    aliases = ['di', 'dif']
600
601
    def run(self, revision=None, file_list=None, diff_options=None):
602
        from bzrlib.diff import show_diff
603
604
        if file_list:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
605
            b = Branch.open_containing(file_list[0])[0]
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
606
            tree = WorkingTree(b.base, b)
607
            file_list = [tree.relpath(f) for f in file_list]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
608
            if file_list == ['']:
609
                # just pointing to top-of-tree
610
                file_list = None
611
        else:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
612
            b = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
613
614
        if revision is not None:
615
            if len(revision) == 1:
616
                show_diff(b, revision[0], specific_files=file_list,
617
                          external_diff_options=diff_options)
618
            elif len(revision) == 2:
619
                show_diff(b, revision[0], specific_files=file_list,
620
                          external_diff_options=diff_options,
621
                          revision2=revision[1])
622
            else:
623
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
624
        else:
625
            show_diff(b, None, specific_files=file_list,
626
                      external_diff_options=diff_options)
627
628
        
629
630
631
class cmd_deleted(Command):
632
    """List files deleted in the working tree.
633
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
634
    # TODO: Show files deleted since a previous revision, or
635
    # between two revisions.
636
    # TODO: Much more efficient way to do this: read in new
637
    # directories with readdir, rather than stating each one.  Same
638
    # level of effort but possibly much less IO.  (Or possibly not,
639
    # if the directories are very large...)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
640
    def run(self, show_ids=False):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
641
        b = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
642
        old = b.basis_tree()
643
        new = b.working_tree()
644
        for path, ie in old.inventory.iter_entries():
645
            if not new.has_id(ie.file_id):
646
                if show_ids:
647
                    print '%-50s %s' % (path, ie.file_id)
648
                else:
649
                    print path
650
651
652
class cmd_modified(Command):
653
    """List files modified in working tree."""
654
    hidden = True
655
    def run(self):
656
        from bzrlib.delta import compare_trees
657
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
658
        b = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
659
        td = compare_trees(b.basis_tree(), b.working_tree())
660
1398 by Robert Collins
integrate in Gustavos x-bit patch
661
        for path, id, kind, text_modified, meta_modified in td.modified:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
662
            print path
663
664
665
666
class cmd_added(Command):
667
    """List files added in working tree."""
668
    hidden = True
669
    def run(self):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
670
        b = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
671
        wt = b.working_tree()
672
        basis_inv = b.basis_tree().inventory
673
        inv = wt.inventory
674
        for file_id in inv:
675
            if file_id in basis_inv:
676
                continue
677
            path = inv.id2path(file_id)
678
            if not os.access(b.abspath(path), os.F_OK):
679
                continue
680
            print path
681
                
682
        
683
684
class cmd_root(Command):
685
    """Show the tree root directory.
686
687
    The root is the nearest enclosing directory with a .bzr control
688
    directory."""
689
    takes_args = ['filename?']
690
    def run(self, filename=None):
691
        """Print the branch root."""
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
692
        b = Branch.open_containing(filename)[0]
1185.2.3 by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes;
693
        print b.base
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
694
695
696
class cmd_log(Command):
697
    """Show log of this branch.
698
699
    To request a range of logs, you can use the command -r begin:end
700
    -r revision requests a specific revision, -r :end or -r begin: are
701
    also valid.
702
    """
703
1393.1.55 by Martin Pool
doc
704
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
705
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
706
    takes_args = ['filename?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
707
    takes_options = [Option('forward', 
708
                            help='show from oldest to newest'),
709
                     'timezone', 'verbose', 
710
                     'show-ids', 'revision',
1185.16.57 by Martin Pool
[merge] from aaron
711
                     Option('line', help='format with one line per revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
712
                     'long', 
713
                     Option('message',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
714
                            help='show revisions whose message matches this regexp',
715
                            type=str),
1185.16.57 by Martin Pool
[merge] from aaron
716
                     Option('short', help='use moderately short format'),
717
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
718
    
719
    def run(self, filename=None, timezone='original',
720
            verbose=False,
721
            show_ids=False,
722
            forward=False,
723
            revision=None,
724
            message=None,
725
            long=False,
1185.12.25 by Aaron Bentley
Added one-line log format
726
            short=False,
727
            line=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
728
        from bzrlib.log import log_formatter, show_log
729
        import codecs
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
730
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
731
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
732
        direction = (forward and 'forward') or 'reverse'
733
        
734
        if filename:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
735
            b, fp = Branch.open_containing(filename)
736
            if fp != '':
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
737
                file_id = b.read_working_inventory().path2id(fp)
738
            else:
739
                file_id = None  # points to branch root
740
        else:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
741
            b, relpath = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
742
            file_id = None
743
744
        if revision is None:
745
            rev1 = None
746
            rev2 = None
747
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
748
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
749
        elif len(revision) == 2:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
750
            rev1 = revision[0].in_history(b).revno
751
            rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
752
        else:
753
            raise BzrCommandError('bzr log --revision takes one or two values.')
754
755
        if rev1 == 0:
756
            rev1 = None
757
        if rev2 == 0:
758
            rev2 = None
759
760
        mutter('encoding log as %r' % bzrlib.user_encoding)
761
762
        # use 'replace' so that we don't abort if trying to write out
763
        # in e.g. the default C locale.
764
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
765
1185.12.25 by Aaron Bentley
Added one-line log format
766
        log_format = 'long'
767
        if short:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
768
            log_format = 'short'
1185.12.25 by Aaron Bentley
Added one-line log format
769
        if line:
770
            log_format = 'line'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
771
        lf = log_formatter(log_format,
772
                           show_ids=show_ids,
773
                           to_file=outf,
774
                           show_timezone=timezone)
775
776
        show_log(b,
777
                 lf,
778
                 file_id,
779
                 verbose=verbose,
780
                 direction=direction,
781
                 start_revision=rev1,
782
                 end_revision=rev2,
783
                 search=message)
784
785
786
787
class cmd_touching_revisions(Command):
788
    """Return revision-ids which affected a particular file.
789
790
    A more user-friendly interface is "bzr log FILE"."""
791
    hidden = True
792
    takes_args = ["filename"]
793
    def run(self, filename):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
794
        b, relpath = Branch.open_containing(filename)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
795
        inv = b.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
796
        file_id = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
797
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
798
            print "%6d %s" % (revno, what)
799
800
801
class cmd_ls(Command):
802
    """List files in a tree.
803
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
804
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
805
    hidden = True
806
    def run(self, revision=None, verbose=False):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
807
        b, relpath = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
808
        if revision == None:
809
            tree = b.working_tree()
810
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
811
            tree = b.revision_tree(revision.in_history(b).rev_id)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
812
        for fp, fc, kind, fid, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
813
            if verbose:
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
814
                kindch = entry.kind_character()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
815
                print '%-8s %s%s' % (fc, fp, kindch)
816
            else:
817
                print fp
818
819
820
821
class cmd_unknowns(Command):
822
    """List unknown files."""
823
    def run(self):
824
        from bzrlib.osutils import quotefn
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
825
        for f in Branch.open_containing('.')[0].unknowns():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
826
            print quotefn(f)
827
828
829
830
class cmd_ignore(Command):
831
    """Ignore a command or pattern.
832
833
    To remove patterns from the ignore list, edit the .bzrignore file.
834
835
    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
836
    from the branch root.  Otherwise, it is compared to only the last
837
    component of the path.  To match a file only in the root directory,
838
    prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
839
840
    Ignore patterns are case-insensitive on case-insensitive systems.
841
842
    Note: wildcards must be quoted from the shell on Unix.
843
844
    examples:
845
        bzr ignore ./Makefile
846
        bzr ignore '*.class'
847
    """
1185.16.4 by Martin Pool
- doc and todo for ignore command
848
    # TODO: Complain if the filename is absolute
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
849
    takes_args = ['name_pattern']
850
    
851
    def run(self, name_pattern):
852
        from bzrlib.atomicfile import AtomicFile
853
        import os.path
854
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
855
        b, relpath = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
856
        ifn = b.abspath('.bzrignore')
857
858
        if os.path.exists(ifn):
859
            f = open(ifn, 'rt')
860
            try:
861
                igns = f.read().decode('utf-8')
862
            finally:
863
                f.close()
864
        else:
865
            igns = ''
866
867
        # TODO: If the file already uses crlf-style termination, maybe
868
        # we should use that for the newly added lines?
869
870
        if igns and igns[-1] != '\n':
871
            igns += '\n'
872
        igns += name_pattern + '\n'
873
874
        try:
875
            f = AtomicFile(ifn, 'wt')
876
            f.write(igns.encode('utf-8'))
877
            f.commit()
878
        finally:
879
            f.close()
880
881
        inv = b.working_tree().inventory
882
        if inv.path2id('.bzrignore'):
883
            mutter('.bzrignore is already versioned')
884
        else:
885
            mutter('need to make new .bzrignore file versioned')
886
            b.add(['.bzrignore'])
887
888
889
890
class cmd_ignored(Command):
891
    """List ignored files and the patterns that matched them.
892
893
    See also: bzr ignore"""
894
    def run(self):
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
895
        tree = Branch.open_containing('.')[0].working_tree()
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
896
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
897
            if file_class != 'I':
898
                continue
899
            ## XXX: Slightly inefficient since this was already calculated
900
            pat = tree.is_ignored(path)
901
            print '%-50s %s' % (path, pat)
902
903
904
class cmd_lookup_revision(Command):
905
    """Lookup the revision-id from a revision-number
906
907
    example:
908
        bzr lookup-revision 33
909
    """
910
    hidden = True
911
    takes_args = ['revno']
912
    
913
    def run(self, revno):
914
        try:
915
            revno = int(revno)
916
        except ValueError:
917
            raise BzrCommandError("not a valid revision-number: %r" % revno)
918
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
919
        print Branch.open_containing('.')[0].get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
920
921
922
class cmd_export(Command):
923
    """Export past revision to destination directory.
924
925
    If no revision is specified this exports the last committed revision.
926
927
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
928
    given, try to find the format with the extension. If no extension
929
    is found exports to a directory (equivalent to --format=dir).
930
931
    Root may be the top directory for tar, tgz and tbz2 formats. If none
932
    is given, the top directory will be the root name of the file."""
933
    # TODO: list known exporters
934
    takes_args = ['dest']
935
    takes_options = ['revision', 'format', 'root']
936
    def run(self, dest, revision=None, format=None, root=None):
937
        import os.path
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
938
        b = Branch.open_containing('.')[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
939
        if revision is None:
1241 by Martin Pool
- rename last_patch to last_revision
940
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
941
        else:
942
            if len(revision) != 1:
943
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
944
            rev_id = revision[0].in_history(b).rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
945
        t = b.revision_tree(rev_id)
1185.12.1 by Aaron Bentley
Fixed export
946
        arg_root, ext = os.path.splitext(os.path.basename(dest))
947
        if ext in ('.gz', '.bz2'):
948
            new_root, new_ext = os.path.splitext(arg_root)
949
            if new_ext == '.tar':
950
                arg_root = new_root
951
                ext = new_ext + ext
952
        if root is None:
953
            root = arg_root
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
954
        if not format:
955
            if ext in (".tar",):
956
                format = "tar"
1185.12.1 by Aaron Bentley
Fixed export
957
            elif ext in (".tar.gz", ".tgz"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
958
                format = "tgz"
1185.12.1 by Aaron Bentley
Fixed export
959
            elif ext in (".tar.bz2", ".tbz2"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
960
                format = "tbz2"
961
            else:
962
                format = "dir"
963
        t.export(dest, format, root)
964
965
966
class cmd_cat(Command):
967
    """Write a file's text from a previous revision."""
968
969
    takes_options = ['revision']
970
    takes_args = ['filename']
971
972
    def run(self, filename, revision=None):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
973
        if revision is None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
974
            raise BzrCommandError("bzr cat requires a revision number")
975
        elif len(revision) != 1:
976
            raise BzrCommandError("bzr cat --revision takes exactly one number")
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
977
        b, relpath = Branch.open_containing(filename)
978
        b.print_file(relpath, revision[0].in_history(b).revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
979
980
981
class cmd_local_time_offset(Command):
982
    """Show the offset in seconds from GMT to local time."""
983
    hidden = True    
984
    def run(self):
985
        print bzrlib.osutils.local_time_offset()
986
987
988
989
class cmd_commit(Command):
990
    """Commit changes into a new revision.
991
    
992
    If no arguments are given, the entire tree is committed.
993
994
    If selected files are specified, only changes to those files are
995
    committed.  If a directory is specified then the directory and everything 
996
    within it is committed.
997
998
    A selected-file commit may fail in some cases where the committed
999
    tree would be invalid, such as trying to commit a file in a
1000
    newly-added directory that is not itself committed.
1001
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1002
    # TODO: Run hooks on tree to-be-committed, and after commit.
1003
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1004
    # TODO: Strict commit that fails if there are deleted files.
1005
    #       (what does "deleted files" mean ??)
1006
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1007
    # TODO: Give better message for -s, --summary, used by tla people
1008
1009
    # XXX: verbose currently does nothing
1010
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1011
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1012
    takes_options = ['message', 'verbose', 
1013
                     Option('unchanged',
1014
                            help='commit even if nothing has changed'),
1015
                     Option('file', type=str, 
1016
                            argname='msgfile',
1017
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1018
                     Option('strict',
1019
                            help="refuse to commit if there are unknown "
1020
                            "files in the working tree."),
1185.16.43 by Martin Pool
- clean up handling of option objects
1021
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1022
    aliases = ['ci', 'checkin']
1023
1024
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1025
            unchanged=False, strict=False):
1026
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1027
                StrictCommitFailed)
1167 by Martin Pool
- split commit message editor functions out into own file
1028
        from bzrlib.msgeditor import edit_commit_message
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1029
        from bzrlib.status import show_status
1030
        from cStringIO import StringIO
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1031
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1032
        b = Branch.open_containing('.')[0]
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
1033
        tree = WorkingTree(b.base, b)
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1034
        if selected_list:
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
1035
            selected_list = [tree.relpath(s) for s in selected_list]
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1036
        if message is None and not file:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1037
            catcher = StringIO()
1038
            show_status(b, specific_files=selected_list,
1039
                        to_file=catcher)
1040
            message = edit_commit_message(catcher.getvalue())
1393.3.2 by Jelmer Vernooij
Fix error message when an empty commit message was specified (when using an editor). Previously bzr warned that it wanted either --message or --file.
1041
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1042
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1043
                raise BzrCommandError("please specify a commit message"
1044
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1045
        elif message and file:
1046
            raise BzrCommandError("please specify either --message or --file")
1047
        
1048
        if file:
1049
            import codecs
1050
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1051
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1052
        if message == "":
1053
                raise BzrCommandError("empty commit message specified")
1054
            
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1055
        try:
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1056
            b.commit(message, specific_files=selected_list,
1057
                     allow_pointless=unchanged, strict=strict)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1058
        except PointlessCommit:
1059
            # FIXME: This should really happen before the file is read in;
1060
            # perhaps prepare the commit; get the message; then actually commit
1061
            raise BzrCommandError("no changes to commit",
1062
                                  ["use --unchanged to commit anyhow"])
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1063
        except ConflictsInTree:
1064
            raise BzrCommandError("Conflicts detected in working tree.  "
1065
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1066
        except StrictCommitFailed:
1067
            raise BzrCommandError("Commit refused because there are unknown "
1068
                                  "files in the working tree.")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1069
1070
1071
class cmd_check(Command):
1072
    """Validate consistency of branch history.
1073
1074
    This command checks various invariants about the branch storage to
1075
    detect data corruption or bzr bugs.
1076
    """
1077
    takes_args = ['dir?']
1449 by Robert Collins
teach check about ghosts
1078
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1079
1449 by Robert Collins
teach check about ghosts
1080
    def run(self, dir='.', verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1081
        from bzrlib.check import check
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1082
        check(Branch.open_containing(dir)[0], verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1083
1084
1085
class cmd_scan_cache(Command):
1086
    hidden = True
1087
    def run(self):
1088
        from bzrlib.hashcache import HashCache
1089
1090
        c = HashCache('.')
1091
        c.read()
1092
        c.scan()
1093
            
1094
        print '%6d stats' % c.stat_count
1095
        print '%6d in hashcache' % len(c._cache)
1096
        print '%6d files removed from cache' % c.removed_count
1097
        print '%6d hashes updated' % c.update_count
1098
        print '%6d files changed too recently to cache' % c.danger_count
1099
1100
        if c.needs_write:
1101
            c.write()
1102
            
1103
1104
1105
class cmd_upgrade(Command):
1106
    """Upgrade branch storage to current format.
1107
1108
    The check command or bzr developers may sometimes advise you to run
1109
    this command.
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1110
1111
    This version of this command upgrades from the full-text storage
1112
    used by bzr 0.0.8 and earlier to the weave format (v5).
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1113
    """
1114
    takes_args = ['dir?']
1115
1116
    def run(self, dir='.'):
1117
        from bzrlib.upgrade import upgrade
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1118
        upgrade(dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1119
1120
1121
class cmd_whoami(Command):
1122
    """Show bzr user id."""
1123
    takes_options = ['email']
1124
    
1125
    def run(self, email=False):
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1126
        try:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1127
            b = bzrlib.branch.Branch.open_containing('.')[0]
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1128
            config = bzrlib.config.BranchConfig(b)
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1129
        except NotBranchError:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1130
            config = bzrlib.config.GlobalConfig()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1131
        
1132
        if email:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1133
            print config.user_email()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1134
        else:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1135
            print config.username()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1136
1137
1138
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1139
    """Run internal test suite.
1140
    
1141
    This creates temporary test directories in the working directory,
1142
    but not existing data is affected.  These directories are deleted
1143
    if the tests pass, or left behind to help in debugging if they
1144
    fail.
1145
    
1146
    If arguments are given, they are regular expressions that say
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1147
    which tests should run.
1148
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1149
    # TODO: --list should give a list of all available tests
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1150
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1151
    takes_args = ['testspecs*']
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1152
    takes_options = ['verbose', 
1153
                     Option('one', help='stop when one test fails'),
1154
                    ]
1155
1156
    def run(self, testspecs_list=None, verbose=False, one=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1157
        import bzrlib.ui
1158
        from bzrlib.selftest import selftest
1159
        # we don't want progress meters from the tests to go to the
1160
        # real output; and we don't want log messages cluttering up
1161
        # the real logs.
1162
        save_ui = bzrlib.ui.ui_factory
1163
        bzrlib.trace.info('running tests...')
1164
        try:
1165
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1166
            if testspecs_list is not None:
1167
                pattern = '|'.join(testspecs_list)
1168
            else:
1169
                pattern = ".*"
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1170
            result = selftest(verbose=verbose, 
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1171
                              pattern=pattern,
1172
                              stop_on_failure=one)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1173
            if result:
1174
                bzrlib.trace.info('tests passed')
1175
            else:
1176
                bzrlib.trace.info('tests failed')
1177
            return int(not result)
1178
        finally:
1179
            bzrlib.ui.ui_factory = save_ui
1180
1181
1182
def show_version():
1183
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
1184
    # is bzrlib itself in a branch?
1185
    bzrrev = bzrlib.get_bzr_revision()
1186
    if bzrrev:
1187
        print "  (bzr checkout, revision %d {%s})" % bzrrev
1188
    print bzrlib.__copyright__
1189
    print "http://bazaar-ng.org/"
1190
    print
1191
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1192
    print "you may use, modify and redistribute it under the terms of the GNU"
1193
    print "General Public License version 2 or later."
1194
1195
1196
class cmd_version(Command):
1197
    """Show version of bzr."""
1198
    def run(self):
1199
        show_version()
1200
1201
class cmd_rocks(Command):
1202
    """Statement of optimism."""
1203
    hidden = True
1204
    def run(self):
1205
        print "it sure does!"
1206
1207
1208
class cmd_find_merge_base(Command):
1209
    """Find and print a base revision for merging two branches.
1210
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1211
    # TODO: Options to specify revisions on either side, as if
1212
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1213
    takes_args = ['branch', 'other']
1214
    hidden = True
1215
    
1216
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1217
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
1218
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1219
        branch1 = Branch.open_containing(branch)[0]
1220
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1221
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1222
        history_1 = branch1.revision_history()
1223
        history_2 = branch2.revision_history()
1224
1241 by Martin Pool
- rename last_patch to last_revision
1225
        last1 = branch1.last_revision()
1226
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1227
1228
        source = MultipleRevisionSources(branch1, branch2)
1229
        
1230
        base_rev_id = common_ancestor(last1, last2, source)
1231
1232
        print 'merge base is revision %s' % base_rev_id
1233
        
1234
        return
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1235
1236
        if base_revno is None:
1237
            raise bzrlib.errors.UnrelatedBranches()
1238
1239
        print ' r%-6d in %s' % (base_revno, branch)
1240
1241
        other_revno = branch2.revision_id_to_revno(base_revid)
1242
        
1243
        print ' r%-6d in %s' % (other_revno, other)
1244
1245
1246
1247
class cmd_merge(Command):
1248
    """Perform a three-way merge.
1249
    
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1250
    The branch is the branch you will merge from.  By default, it will
1251
    merge the latest revision.  If you specify a revision, that
1252
    revision will be merged.  If you specify two revisions, the first
1253
    will be used as a BASE, and the second one as OTHER.  Revision
1254
    numbers are always relative to the specified branch.
1255
1256
    By default bzr will try to merge in all new work from the other
1257
    branch, automatically determining an appropriate base.  If this
1258
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1259
    
1260
    Examples:
1261
1262
    To merge the latest revision from bzr.dev
1263
    bzr merge ../bzr.dev
1264
1265
    To merge changes up to and including revision 82 from bzr.dev
1266
    bzr merge -r 82 ../bzr.dev
1267
1268
    To merge the changes introduced by 82, without previous changes:
1269
    bzr merge -r 81..82 ../bzr.dev
1270
    
1271
    merge refuses to run if there are any uncommitted changes, unless
1272
    --force is given.
1273
    """
1274
    takes_args = ['branch?']
1275
    takes_options = ['revision', 'force', 'merge-type']
1276
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1277
    def run(self, branch=None, revision=None, force=False, 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1278
            merge_type=None):
1279
        from bzrlib.merge import merge
1280
        from bzrlib.merge_core import ApplyMerge3
1281
        if merge_type is None:
1282
            merge_type = ApplyMerge3
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1283
        if branch is None:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1284
            branch = Branch.open_containing('.')[0].get_parent()
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1285
            if branch is None:
1286
                raise BzrCommandError("No merge location known or specified.")
1287
            else:
1288
                print "Using saved location: %s" % branch 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1289
        if revision is None or len(revision) < 1:
1290
            base = [None, None]
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1291
            other = [branch, -1]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1292
        else:
1293
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1294
                base = [None, None]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1295
                other = [branch, revision[0].in_history(branch).revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1296
            else:
1297
                assert len(revision) == 2
1298
                if None in revision:
1299
                    raise BzrCommandError(
1300
                        "Merge doesn't permit that revision specifier.")
1185.5.1 by John Arbash Meinel
Applying bad-merge revision patch.
1301
                b = Branch.open(branch)
1302
1303
                base = [branch, revision[0].in_history(b).revno]
1304
                other = [branch, revision[1].in_history(b).revno]
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1305
1306
        try:
1307
            merge(other, base, check_clean=(not force), merge_type=merge_type)
1308
        except bzrlib.errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
1309
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1310
                 "candidates are:\n  "
1311
                 + "\n  ".join(e.bases)
1312
                 + "\n"
1313
                 "please specify an explicit base with -r,\n"
1314
                 "and (if you want) report this to the bzr developers\n")
1315
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1316
1317
1318
class cmd_revert(Command):
1319
    """Reverse all changes since the last commit.
1320
1321
    Only versioned files are affected.  Specify filenames to revert only 
1322
    those files.  By default, any files that are changed will be backed up
1323
    first.  Backup files have a '~' appended to their name.
1324
    """
1325
    takes_options = ['revision', 'no-backup']
1326
    takes_args = ['file*']
1327
    aliases = ['merge-revert']
1328
1329
    def run(self, revision=None, no_backup=False, file_list=None):
1330
        from bzrlib.merge import merge
1331
        from bzrlib.commands import parse_spec
1332
1333
        if file_list is not None:
1334
            if len(file_list) == 0:
1335
                raise BzrCommandError("No files specified")
1336
        if revision is None:
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1337
            revno = -1
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1338
        elif len(revision) != 1:
1339
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1340
        else:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1341
            b = Branch.open_containing('.')[0]
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1342
            revno = revision[0].in_history(b).revno
1343
        merge(('.', revno), parse_spec('.'),
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1344
              check_clean=False,
1345
              ignore_zero=True,
1346
              backup_files=not no_backup,
1347
              file_list=file_list)
1348
        if not file_list:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1349
            Branch.open_containing('.')[0].set_pending_merges([])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1350
1351
1352
class cmd_assert_fail(Command):
1353
    """Test reporting of assertion failures"""
1354
    hidden = True
1355
    def run(self):
1356
        assert False, "always fails"
1357
1358
1359
class cmd_help(Command):
1360
    """Show help on a command or other topic.
1361
1362
    For a list of all available commands, say 'bzr help commands'."""
1363
    takes_options = ['long']
1364
    takes_args = ['topic?']
1365
    aliases = ['?']
1366
    
1367
    def run(self, topic=None, long=False):
1368
        import help
1369
        if topic is None and long:
1370
            topic = "commands"
1371
        help.help(topic)
1372
1373
1374
class cmd_shell_complete(Command):
1375
    """Show appropriate completions for context.
1376
1377
    For a list of all available commands, say 'bzr shell-complete'."""
1378
    takes_args = ['context?']
1379
    aliases = ['s-c']
1380
    hidden = True
1381
    
1382
    def run(self, context=None):
1383
        import shellcomplete
1384
        shellcomplete.shellcomplete(context)
1385
1386
1228 by Martin Pool
- add fetch command as builtin
1387
class cmd_fetch(Command):
1388
    """Copy in history from another branch but don't merge it.
1389
1390
    This is an internal method used for pull and merge."""
1391
    hidden = True
1392
    takes_args = ['from_branch', 'to_branch']
1393
    def run(self, from_branch, to_branch):
1394
        from bzrlib.fetch import Fetcher
1395
        from bzrlib.branch import Branch
1396
        from_b = Branch(from_branch)
1397
        to_b = Branch(to_branch)
1398
        Fetcher(to_b, from_b)
1399
        
1400
1401
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1402
class cmd_missing(Command):
1403
    """What is missing in this branch relative to other branch.
1404
    """
1228 by Martin Pool
- add fetch command as builtin
1405
    # TODO: rewrite this in terms of ancestry so that it shows only
1406
    # unmerged things
1407
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1408
    takes_args = ['remote?']
1409
    aliases = ['mis', 'miss']
1410
    # We don't have to add quiet to the list, because 
1411
    # unknown options are parsed as booleans
1412
    takes_options = ['verbose', 'quiet']
1413
1414
    def run(self, remote=None, verbose=False, quiet=False):
1415
        from bzrlib.errors import BzrCommandError
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1416
        from bzrlib.missing import show_missing
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1417
1418
        if verbose and quiet:
1419
            raise BzrCommandError('Cannot pass both quiet and verbose')
1420
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1421
        b = Branch.open_containing('.')[0]
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1422
        parent = b.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1423
        if remote is None:
1424
            if parent is None:
1425
                raise BzrCommandError("No missing location known or specified.")
1426
            else:
1427
                if not quiet:
1428
                    print "Using last location: %s" % parent
1429
                remote = parent
1430
        elif parent is None:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1431
            # We only update parent if it did not exist, missing
1432
            # should not change the parent
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
1433
            b.set_parent(remote)
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1434
        br_remote = Branch.open_containing(remote)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1435
        return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1436
1437
1438
class cmd_plugins(Command):
1439
    """List plugins"""
1440
    hidden = True
1441
    def run(self):
1442
        import bzrlib.plugin
1443
        from inspect import getdoc
1444
        for plugin in bzrlib.plugin.all_plugins:
1445
            if hasattr(plugin, '__path__'):
1446
                print plugin.__path__[0]
1447
            elif hasattr(plugin, '__file__'):
1448
                print plugin.__file__
1449
            else:
1450
                print `plugin`
1451
                
1452
            d = getdoc(plugin)
1453
            if d:
1454
                print '\t', d.split('\n')[0]
1455
1456
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
1457
class cmd_testament(Command):
1458
    """Show testament (signing-form) of a revision."""
1459
    takes_options = ['revision', 'long']
1460
    takes_args = ['branch?']
1461
    def run(self, branch='.', revision=None, long=False):
1462
        from bzrlib.testament import Testament
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1463
        b = Branch.open_containing(branch)[0]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
1464
        b.lock_read()
1465
        try:
1466
            if revision is None:
1467
                rev_id = b.last_revision()
1468
            else:
1469
                rev_id = revision[0].in_history(b).rev_id
1470
            t = Testament.from_revision(b, rev_id)
1471
            if long:
1472
                sys.stdout.writelines(t.as_text_lines())
1473
            else:
1474
                sys.stdout.write(t.as_short_text())
1475
        finally:
1476
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1477
1478
1479
class cmd_annotate(Command):
1480
    """Show the origin of each line in a file.
1481
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1482
    This prints out the given file with an annotation on the left side
1483
    indicating which revision, author and date introduced the change.
1484
1485
    If the origin is the same for a run of consecutive lines, it is 
1486
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1487
    """
1488
    # TODO: annotate directories; showing when each file was last changed
1489
    # TODO: annotate a previous version of a file
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1490
    # TODO: if the working copy is modified, show annotations on that 
1491
    #       with new uncommitted lines marked
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1492
    aliases = ['blame', 'praise']
1493
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1494
    takes_options = [Option('all', help='show annotations on all lines'),
1495
                     Option('long', help='show date in annotations'),
1496
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1497
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1498
    def run(self, filename, all=False, long=False):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1499
        from bzrlib.annotate import annotate_file
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1500
        b, relpath = Branch.open_containing(filename)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1501
        b.lock_read()
1502
        try:
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
1503
            tree = WorkingTree(b.base, b)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1504
            tree = b.revision_tree(b.last_revision())
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1505
            file_id = tree.inventory.path2id(relpath)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1506
            file_version = tree.inventory[file_id].revision
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1507
            annotate_file(b, file_version, file_id, long, all, sys.stdout)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1508
        finally:
1509
            b.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
1510
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1511
1512
class cmd_re_sign(Command):
1513
    """Create a digital signature for an existing revision."""
1514
    # TODO be able to replace existing ones.
1515
1516
    hidden = True # is this right ?
1517
    takes_args = ['revision_id?']
1518
    takes_options = ['revision']
1519
    
1520
    def run(self, revision_id=None, revision=None):
1521
        import bzrlib.config as config
1522
        import bzrlib.gpg as gpg
1523
        if revision_id is not None and revision is not None:
1524
            raise BzrCommandError('You can only supply one of revision_id or --revision')
1525
        if revision_id is None and revision is None:
1526
            raise BzrCommandError('You must supply either --revision or a revision_id')
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1527
        b = Branch.open_containing('.')[0]
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1528
        gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1529
        if revision_id is not None:
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1530
            b.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.
1531
        elif revision is not None:
1532
            for rev in revision:
1533
                if rev is None:
1534
                    raise BzrCommandError('You cannot specify a NULL revision.')
1535
                revno, rev_id = rev.in_history(b)
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1536
                b.sign_revision(rev_id, gpg_strategy)
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1537
1538
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
1539
# these get imported and then picked up by the scan for cmd_*
1540
# TODO: Some more consistent way to split command definitions across files;
1541
# we do need to load at least some information about them to know of 
1542
# aliases.
1543
from bzrlib.conflicts import cmd_resolve, cmd_conflicts