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