/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
22
import bzrlib.trace
23
from bzrlib.trace import mutter, note, log_error, warning
1371 by Martin Pool
- raise NotBranchError if format file can't be read
24
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
25
from bzrlib.errors import DivergedBranches
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
26
from bzrlib.branch import Branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
27
from bzrlib import BZRDIR
28
from bzrlib.commands import Command
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
29
from bzrlib.revisionspec import RevisionSpec
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
30
from bzrlib.workingtree import WorkingTree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
31
32
33
class cmd_status(Command):
34
    """Display status summary.
35
36
    This reports on versioned and unknown files, reporting them
37
    grouped by state.  Possible states are:
38
39
    added
40
        Versioned in the working copy but not in the previous revision.
41
42
    removed
43
        Versioned in the previous revision but removed or deleted
44
        in the working copy.
45
46
    renamed
47
        Path of this file changed from the previous revision;
48
        the text may also have changed.  This includes files whose
49
        parent directory was renamed.
50
51
    modified
52
        Text has changed since the previous revision.
53
54
    unchanged
55
        Nothing about this file has changed since the previous revision.
56
        Only shown with --all.
57
58
    unknown
59
        Not versioned and not matching an ignore pattern.
60
61
    To see ignored files use 'bzr ignored'.  For details in the
62
    changes to file texts, use 'bzr diff'.
63
64
    If no arguments are specified, the status of the entire working
65
    directory is shown.  Otherwise, only the status of the specified
66
    files or directories is reported.  If a directory is given, status
67
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
68
69
    If a revision argument is given, the status is calculated against
70
    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
71
    """
1185.1.11 by Robert Collins
fixme note for bzr status
72
    # XXX: FIXME: bzr status should accept a -r option to show changes
73
    # relative to a revision, or between revisions
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
74
75
    takes_args = ['file*']
1092.3.4 by Robert Collins
update symlink branch to integration
76
    takes_options = ['all', 'show-ids']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
77
    aliases = ['st', 'stat']
78
    
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
79
    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;
80
        if file_list:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
81
            b = Branch.open_containing(file_list[0])
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
82
            tree = WorkingTree(b.base, b)
83
            file_list = [tree.relpath(x) for x in file_list]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
84
            # special case: only one path was given and it's the root
85
            # of the branch
86
            if file_list == ['']:
87
                file_list = None
88
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
89
            b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
90
            
91
        from bzrlib.status import show_status
92
        show_status(b, show_unchanged=all, show_ids=show_ids,
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
93
                    specific_files=file_list, revision=revision)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
94
95
96
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
97
    """Write out metadata for a revision.
98
    
99
    The revision to print can either be specified by a specific
100
    revision identifier, or you can use --revision.
101
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
102
103
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
104
    takes_args = ['revision_id?']
105
    takes_options = ['revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
106
    
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
107
    def run(self, revision_id=None, revision=None):
108
109
        if revision_id is not None and revision is not None:
110
            raise BzrCommandError('You can only supply one of revision_id or --revision')
111
        if revision_id is None and revision is None:
112
            raise BzrCommandError('You must supply either --revision or a revision_id')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
113
        b = Branch.open_containing('.')
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
114
        if revision_id is not None:
115
            sys.stdout.write(b.get_revision_xml_file(revision_id).read())
116
        elif revision is not None:
117
            for rev in revision:
118
                if rev is None:
119
                    raise BzrCommandError('You cannot specify a NULL revision.')
120
                revno, rev_id = rev.in_history(b)
121
                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
122
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
123
124
class cmd_revno(Command):
125
    """Show current revision number.
126
127
    This is equal to the number of revisions on this branch."""
128
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
129
        print Branch.open_containing('.').revno()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
130
1182 by Martin Pool
- more disentangling of xml storage format from objects
131
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
132
class cmd_revision_info(Command):
133
    """Show revision number and revision id for a given revision identifier.
134
    """
135
    hidden = True
136
    takes_args = ['revision_info*']
137
    takes_options = ['revision']
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
138
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
139
140
        revs = []
141
        if revision is not None:
142
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
143
        if revision_info_list is not None:
144
            for rev in revision_info_list:
145
                revs.append(RevisionSpec(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
146
        if len(revs) == 0:
147
            raise BzrCommandError('You must supply a revision identifier')
148
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
149
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
150
151
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
152
            revinfo = rev.in_history(b)
153
            if revinfo.revno is None:
154
                print '     %s' % revinfo.rev_id
155
            else:
156
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
157
158
    
159
class cmd_add(Command):
160
    """Add specified files or directories.
161
162
    In non-recursive mode, all the named items are added, regardless
163
    of whether they were previously ignored.  A warning is given if
164
    any of the named files are already versioned.
165
166
    In recursive mode (the default), files are treated the same way
167
    but the behaviour for directories is different.  Directories that
168
    are already versioned do not give a warning.  All directories,
169
    whether already versioned or not, are searched for files or
170
    subdirectories that are neither versioned or ignored, and these
171
    are added.  This search proceeds recursively into versioned
172
    directories.  If no names are given '.' is assumed.
173
174
    Therefore simply saying 'bzr add' will version all files that
175
    are currently unknown.
176
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
177
    Adding a file whose parent directory is not versioned will
178
    implicitly add the parent, and so on up to the root. This means
179
    you should never need to explictly add a directory, they'll just
180
    get added when you add a file in the directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
181
    """
182
    takes_args = ['file*']
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
183
    takes_options = ['no-recurse', 'quiet']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
184
    
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
185
    def run(self, file_list, no_recurse=False, quiet=False):
186
        from bzrlib.add import smart_add, add_reporter_print, add_reporter_null
187
        if quiet:
188
            reporter = add_reporter_null
189
        else:
190
            reporter = add_reporter_print
191
        smart_add(file_list, not no_recurse, reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
192
193
194
class cmd_mkdir(Command):
195
    """Create a new versioned directory.
196
197
    This is equivalent to creating the directory and then adding it.
198
    """
199
    takes_args = ['dir+']
200
201
    def run(self, dir_list):
202
        b = None
203
        
204
        for d in dir_list:
205
            os.mkdir(d)
206
            if not b:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
207
                b = Branch.open_containing(d)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
208
            b.add([d])
209
            print 'added', d
210
211
212
class cmd_relpath(Command):
213
    """Show path of a file relative to root"""
214
    takes_args = ['filename']
215
    hidden = True
216
    
217
    def run(self, filename):
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
218
        branch = Branch.open_containing(filename)
219
        print WorkingTree(branch.base, branch).relpath(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
220
221
222
class cmd_inventory(Command):
223
    """Show inventory of the current working copy or a revision."""
224
    takes_options = ['revision', 'show-ids']
225
    
226
    def run(self, revision=None, show_ids=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
227
        b = Branch.open_containing('.')
228
        if revision is None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
229
            inv = b.read_working_inventory()
230
        else:
231
            if len(revision) > 1:
232
                raise BzrCommandError('bzr inventory --revision takes'
233
                    ' exactly one revision identifier')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
234
            inv = b.get_revision_inventory(revision[0].in_history(b).rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
235
236
        for path, entry in inv.entries():
237
            if show_ids:
238
                print '%-50s %s' % (path, entry.file_id)
239
            else:
240
                print path
241
242
243
class cmd_move(Command):
244
    """Move files to a different directory.
245
246
    examples:
247
        bzr move *.txt doc
248
249
    The destination must be a versioned directory in the same branch.
250
    """
251
    takes_args = ['source$', 'dest']
252
    def run(self, source_list, dest):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
253
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
254
255
        # TODO: glob expansion on windows?
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
256
        tree = WorkingTree(b.base, b)
257
        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;
258
259
260
class cmd_rename(Command):
261
    """Change the name of an entry.
262
263
    examples:
264
      bzr rename frob.c frobber.c
265
      bzr rename src/frob.c lib/frob.c
266
267
    It is an error if the destination name exists.
268
269
    See also the 'move' command, which moves files into a different
270
    directory without changing their name.
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
271
    """
272
    # TODO: Some way to rename multiple files without invoking 
273
    # bzr for each one?"""
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
274
    takes_args = ['from_name', 'to_name']
275
    
276
    def run(self, from_name, to_name):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
277
        b = Branch.open_containing('.')
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
278
        tree = WorkingTree(b.base, b)
279
        b.rename_one(tree.relpath(from_name), tree.relpath(to_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
280
281
282
class cmd_mv(Command):
283
    """Move or rename a file.
284
285
    usage:
286
        bzr mv OLDNAME NEWNAME
287
        bzr mv SOURCE... DESTINATION
288
289
    If the last argument is a versioned directory, all the other names
290
    are moved into it.  Otherwise, there must be exactly two arguments
291
    and the file is changed to a new name, which must not already exist.
292
293
    Files cannot be moved between branches.
294
    """
295
    takes_args = ['names*']
296
    def run(self, names_list):
297
        if len(names_list) < 2:
298
            raise BzrCommandError("missing file argument")
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
299
        b = Branch.open_containing(names_list[0])
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
300
        tree = WorkingTree(b.base, b)
301
        rel_names = [tree.relpath(x) for x in names_list]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
302
        
303
        if os.path.isdir(names_list[-1]):
304
            # move into existing directory
305
            for pair in b.move(rel_names[:-1], rel_names[-1]):
306
                print "%s => %s" % pair
307
        else:
308
            if len(names_list) != 2:
309
                raise BzrCommandError('to mv multiple files the destination '
310
                                      '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.
311
            b.rename_one(rel_names[0], rel_names[1])
312
            print "%s => %s" % (rel_names[0], rel_names[1])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
313
            
314
    
315
316
317
class cmd_pull(Command):
318
    """Pull any changes from another branch into the current one.
319
320
    If the location is omitted, the last-used location will be used.
321
    Both the revision history and the working directory will be
322
    updated.
323
324
    This command only works on branches that have not diverged.  Branches are
325
    considered diverged if both branches have had commits without first
326
    pulling from the other.
327
328
    If branches have diverged, you can use 'bzr merge' to pull the text changes
329
    from one into the other.
330
    """
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
331
    takes_options = ['remember']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
332
    takes_args = ['location?']
333
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
334
    def run(self, location=None, remember=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
335
        from bzrlib.merge import merge
336
        import tempfile
337
        from shutil import rmtree
338
        import errno
339
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
340
        br_to = Branch.open_containing('.')
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
341
        stored_loc = br_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
342
        if location is None:
343
            if stored_loc is None:
344
                raise BzrCommandError("No pull location known or specified.")
345
            else:
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
346
                print "Using saved location: %s" % stored_loc
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
347
                location = stored_loc
348
        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
349
        br_from = Branch.open(location)
350
        br_from.lock_read()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
351
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
352
            br_from.setup_caching(cache_root)
1185.2.3 by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes;
353
            location = br_from.base
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
354
            old_revno = br_to.revno()
1442 by Robert Collins
only do a local merge during pull if the revision history changed
355
            old_revision_history = br_to.revision_history()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
356
            try:
357
                br_to.update_revisions(br_from)
358
            except DivergedBranches:
359
                raise BzrCommandError("These branches have diverged."
360
                    "  Try merge.")
1442 by Robert Collins
only do a local merge during pull if the revision history changed
361
            new_revision_history = br_to.revision_history()
362
            if new_revision_history != old_revision_history:
363
                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
364
            if stored_loc is None or remember:
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
365
                br_to.set_parent(location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
366
        finally:
1439 by Robert Collins
fix a prior bad merge of cmd_pull, which had resulted in double opens of remote branches
367
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
368
            rmtree(cache_root)
369
370
371
372
class cmd_branch(Command):
373
    """Create a new copy of a branch.
374
375
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
376
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
377
378
    To retrieve the branch as of a particular revision, supply the --revision
379
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
380
381
    --basis is to speed up branching from remote branches.  When specified, it
382
    copies all the file-contents, inventory and revision data from the basis
383
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
384
    """
385
    takes_args = ['from_location', 'to_location?']
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
386
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
387
    aliases = ['get', 'clone']
388
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
389
    def run(self, from_location, to_location=None, revision=None, basis=None):
1393.1.5 by Martin Pool
- move copy_branch into bzrlib.clone
390
        from bzrlib.clone import copy_branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
391
        import tempfile
392
        import errno
393
        from shutil import rmtree
394
        cache_root = tempfile.mkdtemp()
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
395
        if revision is None:
396
            revision = [None]
397
        elif len(revision) > 1:
398
            raise BzrCommandError(
399
                'bzr branch --revision takes exactly 1 revision value')
400
        try:
401
            br_from = Branch.open(from_location)
402
        except OSError, e:
403
            if e.errno == errno.ENOENT:
404
                raise BzrCommandError('Source location "%s" does not'
405
                                      ' exist.' % to_location)
406
            else:
407
                raise
408
        br_from.lock_read()
409
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
410
            br_from.setup_caching(cache_root)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
411
            if basis is not None:
412
                basis_branch = Branch.open_containing(basis)
413
            else:
414
                basis_branch = None
1185.8.4 by Aaron Bentley
Fixed branch -r
415
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
416
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
417
            else:
1390 by Robert Collins
pair programming worx... merge integration and weave
418
                revision_id = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
419
            if to_location is None:
420
                to_location = os.path.basename(from_location.rstrip("/\\"))
421
            try:
422
                os.mkdir(to_location)
423
            except OSError, e:
424
                if e.errno == errno.EEXIST:
425
                    raise BzrCommandError('Target directory "%s" already'
426
                                          ' exists.' % to_location)
427
                if e.errno == errno.ENOENT:
428
                    raise BzrCommandError('Parent of "%s" does not exist.' %
429
                                          to_location)
430
                else:
431
                    raise
432
            try:
1391 by Robert Collins
merge from integration
433
                copy_branch(br_from, to_location, revision_id, basis_branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
434
            except bzrlib.errors.NoSuchRevision:
435
                rmtree(to_location)
436
                msg = "The branch %s has no revision %d." % (from_location, revision[0])
437
                raise BzrCommandError(msg)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
438
            except bzrlib.errors.UnlistableBranch:
439
                msg = "The branch %s cannot be used as a --basis"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
440
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
441
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
442
            rmtree(cache_root)
443
444
445
class cmd_renames(Command):
446
    """Show list of renamed files.
447
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
448
    # TODO: Option to show renames between two historical versions.
449
450
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
451
    takes_args = ['dir?']
452
453
    def run(self, dir='.'):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
454
        b = Branch.open_containing(dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
455
        old_inv = b.basis_tree().inventory
456
        new_inv = b.read_working_inventory()
457
458
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
459
        renames.sort()
460
        for old_name, new_name in renames:
461
            print "%s => %s" % (old_name, new_name)        
462
463
464
class cmd_info(Command):
465
    """Show statistical information about a branch."""
466
    takes_args = ['branch?']
467
    
468
    def run(self, branch=None):
469
        import info
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
470
        b = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
471
        info.show_info(b)
472
473
474
class cmd_remove(Command):
475
    """Make a file unversioned.
476
477
    This makes bzr stop tracking changes to a versioned file.  It does
478
    not delete the working copy.
479
    """
480
    takes_args = ['file+']
481
    takes_options = ['verbose']
1424 by Robert Collins
add rm alias to remove
482
    aliases = ['rm']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
483
    
484
    def run(self, file_list, verbose=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
485
        b = Branch.open_containing(file_list[0])
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
486
        tree = WorkingTree(b.base, b)
487
        b.remove([tree.relpath(f) for f in file_list], verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
488
489
490
class cmd_file_id(Command):
491
    """Print file_id of a particular file or directory.
492
493
    The file_id is assigned when the file is first added and remains the
494
    same through all revisions where the file exists, even when it is
495
    moved or renamed.
496
    """
497
    hidden = True
498
    takes_args = ['filename']
499
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
500
        b = Branch.open_containing(filename)
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
501
        tree = WorkingTree(b.base, b)
502
        i = b.inventory.path2id(tree.relpath(filename))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
503
        if i == None:
504
            raise BzrError("%r is not a versioned file" % filename)
505
        else:
506
            print i
507
508
509
class cmd_file_path(Command):
510
    """Print path of file_ids to a file or directory.
511
512
    This prints one line for each directory down to the target,
513
    starting at the branch root."""
514
    hidden = True
515
    takes_args = ['filename']
516
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
517
        b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
518
        inv = b.inventory
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
519
        tree = WorkingTree(b.base, b)
520
        fid = inv.path2id(tree.relpath(filename))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
521
        if fid == None:
522
            raise BzrError("%r is not a versioned file" % filename)
523
        for fip in inv.get_idpath(fid):
524
            print fip
525
526
527
class cmd_revision_history(Command):
528
    """Display list of revision ids on this branch."""
529
    hidden = True
530
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
531
        for patchid in Branch.open_containing('.').revision_history():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
532
            print patchid
533
534
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
535
class cmd_ancestry(Command):
536
    """List all revisions merged into this branch."""
537
    hidden = True
538
    def run(self):
539
        b = find_branch('.')
1241 by Martin Pool
- rename last_patch to last_revision
540
        for revision_id in b.get_ancestry(b.last_revision()):
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
541
            print revision_id
542
543
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
544
class cmd_directories(Command):
545
    """Display list of versioned directories in this branch."""
546
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
547
        for name, ie in Branch.open_containing('.').read_working_inventory().directories():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
548
            if name == '':
549
                print '.'
550
            else:
551
                print name
552
553
554
class cmd_init(Command):
555
    """Make a directory into a versioned branch.
556
557
    Use this to create an empty branch, or before importing an
558
    existing project.
559
560
    Recipe for importing a tree of files:
561
        cd ~/project
562
        bzr init
563
        bzr add -v .
564
        bzr status
565
        bzr commit -m 'imported project'
566
    """
567
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
568
        Branch.initialize('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
569
570
571
class cmd_diff(Command):
572
    """Show differences in working tree.
573
    
574
    If files are listed, only the changes in those files are listed.
575
    Otherwise, all changes for the tree are listed.
576
577
    examples:
578
        bzr diff
579
        bzr diff -r1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
580
        bzr diff -r1..2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
581
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
582
    # TODO: Allow diff across branches.
583
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
584
    #       or a graphical diff.
585
586
    # TODO: Python difflib is not exactly the same as unidiff; should
587
    #       either fix it up or prefer to use an external diff.
588
589
    # TODO: If a directory is given, diff everything under that.
590
591
    # TODO: Selected-file diff is inefficient and doesn't show you
592
    #       deleted files.
593
594
    # TODO: This probably handles non-Unix newlines poorly.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
595
    
596
    takes_args = ['file*']
597
    takes_options = ['revision', 'diff-options']
598
    aliases = ['di', 'dif']
599
600
    def run(self, revision=None, file_list=None, diff_options=None):
601
        from bzrlib.diff import show_diff
602
603
        if file_list:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
604
            b = Branch.open_containing(file_list[0])
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
605
            tree = WorkingTree(b.base, b)
606
            file_list = [tree.relpath(f) for f in file_list]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
607
            if file_list == ['']:
608
                # just pointing to top-of-tree
609
                file_list = None
610
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
611
            b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
612
613
        if revision is not None:
614
            if len(revision) == 1:
615
                show_diff(b, revision[0], specific_files=file_list,
616
                          external_diff_options=diff_options)
617
            elif len(revision) == 2:
618
                show_diff(b, revision[0], specific_files=file_list,
619
                          external_diff_options=diff_options,
620
                          revision2=revision[1])
621
            else:
622
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
623
        else:
624
            show_diff(b, None, specific_files=file_list,
625
                      external_diff_options=diff_options)
626
627
        
628
629
630
class cmd_deleted(Command):
631
    """List files deleted in the working tree.
632
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
633
    # TODO: Show files deleted since a previous revision, or
634
    # between two revisions.
635
    # TODO: Much more efficient way to do this: read in new
636
    # directories with readdir, rather than stating each one.  Same
637
    # level of effort but possibly much less IO.  (Or possibly not,
638
    # if the directories are very large...)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
639
    def run(self, show_ids=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
640
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
641
        old = b.basis_tree()
642
        new = b.working_tree()
643
        for path, ie in old.inventory.iter_entries():
644
            if not new.has_id(ie.file_id):
645
                if show_ids:
646
                    print '%-50s %s' % (path, ie.file_id)
647
                else:
648
                    print path
649
650
651
class cmd_modified(Command):
652
    """List files modified in working tree."""
653
    hidden = True
654
    def run(self):
655
        from bzrlib.delta import compare_trees
656
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
657
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
658
        td = compare_trees(b.basis_tree(), b.working_tree())
659
1398 by Robert Collins
integrate in Gustavos x-bit patch
660
        for path, id, kind, text_modified, meta_modified in td.modified:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
661
            print path
662
663
664
665
class cmd_added(Command):
666
    """List files added in working tree."""
667
    hidden = True
668
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
669
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
670
        wt = b.working_tree()
671
        basis_inv = b.basis_tree().inventory
672
        inv = wt.inventory
673
        for file_id in inv:
674
            if file_id in basis_inv:
675
                continue
676
            path = inv.id2path(file_id)
677
            if not os.access(b.abspath(path), os.F_OK):
678
                continue
679
            print path
680
                
681
        
682
683
class cmd_root(Command):
684
    """Show the tree root directory.
685
686
    The root is the nearest enclosing directory with a .bzr control
687
    directory."""
688
    takes_args = ['filename?']
689
    def run(self, filename=None):
690
        """Print the branch root."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
691
        b = Branch.open_containing(filename)
1185.2.3 by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes;
692
        print b.base
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
693
694
695
class cmd_log(Command):
696
    """Show log of this branch.
697
698
    To request a range of logs, you can use the command -r begin:end
699
    -r revision requests a specific revision, -r :end or -r begin: are
700
    also valid.
701
702
    --message allows you to give a regular expression, which will be evaluated
703
    so that only matching entries will be displayed.
704
    """
705
1393.1.55 by Martin Pool
doc
706
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
707
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
708
    takes_args = ['filename?']
709
    takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
710
                     'long', 'message', 'short',]
711
    
712
    def run(self, filename=None, timezone='original',
713
            verbose=False,
714
            show_ids=False,
715
            forward=False,
716
            revision=None,
717
            message=None,
718
            long=False,
719
            short=False):
720
        from bzrlib.log import log_formatter, show_log
721
        import codecs
722
723
        direction = (forward and 'forward') or 'reverse'
724
        
725
        if filename:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
726
            b = Branch.open_containing(filename)
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
727
            tree = WorkingTree(b.base, b)
728
            fp = tree.relpath(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
729
            if fp:
730
                file_id = b.read_working_inventory().path2id(fp)
731
            else:
732
                file_id = None  # points to branch root
733
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
734
            b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
735
            file_id = None
736
737
        if revision is None:
738
            rev1 = None
739
            rev2 = None
740
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
741
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
742
        elif len(revision) == 2:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
743
            rev1 = revision[0].in_history(b).revno
744
            rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
745
        else:
746
            raise BzrCommandError('bzr log --revision takes one or two values.')
747
748
        if rev1 == 0:
749
            rev1 = None
750
        if rev2 == 0:
751
            rev2 = None
752
753
        mutter('encoding log as %r' % bzrlib.user_encoding)
754
755
        # use 'replace' so that we don't abort if trying to write out
756
        # in e.g. the default C locale.
757
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
758
759
        if not short:
760
            log_format = 'long'
761
        else:
762
            log_format = 'short'
763
        lf = log_formatter(log_format,
764
                           show_ids=show_ids,
765
                           to_file=outf,
766
                           show_timezone=timezone)
767
768
        show_log(b,
769
                 lf,
770
                 file_id,
771
                 verbose=verbose,
772
                 direction=direction,
773
                 start_revision=rev1,
774
                 end_revision=rev2,
775
                 search=message)
776
777
778
779
class cmd_touching_revisions(Command):
780
    """Return revision-ids which affected a particular file.
781
782
    A more user-friendly interface is "bzr log FILE"."""
783
    hidden = True
784
    takes_args = ["filename"]
785
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
786
        b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
787
        inv = b.read_working_inventory()
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
788
        tree = WorkingTree(b.base, b)
789
        file_id = inv.path2id(tree.relpath(filename))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
790
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
791
            print "%6d %s" % (revno, what)
792
793
794
class cmd_ls(Command):
795
    """List files in a tree.
796
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
797
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
798
    hidden = True
799
    def run(self, revision=None, verbose=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
800
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
801
        if revision == None:
802
            tree = b.working_tree()
803
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
804
            tree = b.revision_tree(revision.in_history(b).rev_id)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
805
        for fp, fc, kind, fid, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
806
            if verbose:
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
807
                kindch = entry.kind_character()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
808
                print '%-8s %s%s' % (fc, fp, kindch)
809
            else:
810
                print fp
811
812
813
814
class cmd_unknowns(Command):
815
    """List unknown files."""
816
    def run(self):
817
        from bzrlib.osutils import quotefn
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
818
        for f in Branch.open_containing('.').unknowns():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
819
            print quotefn(f)
820
821
822
823
class cmd_ignore(Command):
824
    """Ignore a command or pattern.
825
826
    To remove patterns from the ignore list, edit the .bzrignore file.
827
828
    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
829
    from the branch root.  Otherwise, it is compared to only the last
830
    component of the path.  To match a file only in the root directory,
831
    prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
832
833
    Ignore patterns are case-insensitive on case-insensitive systems.
834
835
    Note: wildcards must be quoted from the shell on Unix.
836
837
    examples:
838
        bzr ignore ./Makefile
839
        bzr ignore '*.class'
840
    """
1185.16.4 by Martin Pool
- doc and todo for ignore command
841
    # TODO: Complain if the filename is absolute
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
842
    takes_args = ['name_pattern']
843
    
844
    def run(self, name_pattern):
845
        from bzrlib.atomicfile import AtomicFile
846
        import os.path
847
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
848
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
849
        ifn = b.abspath('.bzrignore')
850
851
        if os.path.exists(ifn):
852
            f = open(ifn, 'rt')
853
            try:
854
                igns = f.read().decode('utf-8')
855
            finally:
856
                f.close()
857
        else:
858
            igns = ''
859
860
        # TODO: If the file already uses crlf-style termination, maybe
861
        # we should use that for the newly added lines?
862
863
        if igns and igns[-1] != '\n':
864
            igns += '\n'
865
        igns += name_pattern + '\n'
866
867
        try:
868
            f = AtomicFile(ifn, 'wt')
869
            f.write(igns.encode('utf-8'))
870
            f.commit()
871
        finally:
872
            f.close()
873
874
        inv = b.working_tree().inventory
875
        if inv.path2id('.bzrignore'):
876
            mutter('.bzrignore is already versioned')
877
        else:
878
            mutter('need to make new .bzrignore file versioned')
879
            b.add(['.bzrignore'])
880
881
882
883
class cmd_ignored(Command):
884
    """List ignored files and the patterns that matched them.
885
886
    See also: bzr ignore"""
887
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
888
        tree = Branch.open_containing('.').working_tree()
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
889
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
890
            if file_class != 'I':
891
                continue
892
            ## XXX: Slightly inefficient since this was already calculated
893
            pat = tree.is_ignored(path)
894
            print '%-50s %s' % (path, pat)
895
896
897
class cmd_lookup_revision(Command):
898
    """Lookup the revision-id from a revision-number
899
900
    example:
901
        bzr lookup-revision 33
902
    """
903
    hidden = True
904
    takes_args = ['revno']
905
    
906
    def run(self, revno):
907
        try:
908
            revno = int(revno)
909
        except ValueError:
910
            raise BzrCommandError("not a valid revision-number: %r" % revno)
911
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
912
        print Branch.open_containing('.').get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
913
914
915
class cmd_export(Command):
916
    """Export past revision to destination directory.
917
918
    If no revision is specified this exports the last committed revision.
919
920
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
921
    given, try to find the format with the extension. If no extension
922
    is found exports to a directory (equivalent to --format=dir).
923
924
    Root may be the top directory for tar, tgz and tbz2 formats. If none
925
    is given, the top directory will be the root name of the file."""
926
    # TODO: list known exporters
927
    takes_args = ['dest']
928
    takes_options = ['revision', 'format', 'root']
929
    def run(self, dest, revision=None, format=None, root=None):
930
        import os.path
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
931
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
932
        if revision is None:
1241 by Martin Pool
- rename last_patch to last_revision
933
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
934
        else:
935
            if len(revision) != 1:
936
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
937
            rev_id = revision[0].in_history(b).rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
938
        t = b.revision_tree(rev_id)
1185.12.1 by Aaron Bentley
Fixed export
939
        arg_root, ext = os.path.splitext(os.path.basename(dest))
940
        if ext in ('.gz', '.bz2'):
941
            new_root, new_ext = os.path.splitext(arg_root)
942
            if new_ext == '.tar':
943
                arg_root = new_root
944
                ext = new_ext + ext
945
        if root is None:
946
            root = arg_root
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
947
        if not format:
948
            if ext in (".tar",):
949
                format = "tar"
1185.12.1 by Aaron Bentley
Fixed export
950
            elif ext in (".tar.gz", ".tgz"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
951
                format = "tgz"
1185.12.1 by Aaron Bentley
Fixed export
952
            elif ext in (".tar.bz2", ".tbz2"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
953
                format = "tbz2"
954
            else:
955
                format = "dir"
956
        t.export(dest, format, root)
957
958
959
class cmd_cat(Command):
960
    """Write a file's text from a previous revision."""
961
962
    takes_options = ['revision']
963
    takes_args = ['filename']
964
965
    def run(self, filename, revision=None):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
966
        if revision is None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
967
            raise BzrCommandError("bzr cat requires a revision number")
968
        elif len(revision) != 1:
969
            raise BzrCommandError("bzr cat --revision takes exactly one number")
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
970
        b = Branch.open_containing('.')
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
971
        tree = WorkingTree(b.base, b)
972
        b.print_file(tree.relpath(filename), revision[0].in_history(b).revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
973
974
975
class cmd_local_time_offset(Command):
976
    """Show the offset in seconds from GMT to local time."""
977
    hidden = True    
978
    def run(self):
979
        print bzrlib.osutils.local_time_offset()
980
981
982
983
class cmd_commit(Command):
984
    """Commit changes into a new revision.
985
    
986
    If no arguments are given, the entire tree is committed.
987
988
    If selected files are specified, only changes to those files are
989
    committed.  If a directory is specified then the directory and everything 
990
    within it is committed.
991
992
    A selected-file commit may fail in some cases where the committed
993
    tree would be invalid, such as trying to commit a file in a
994
    newly-added directory that is not itself committed.
995
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
996
    # TODO: Run hooks on tree to-be-committed, and after commit.
997
998
    # TODO: Strict commit that fails if there are unknown or deleted files.
999
    # TODO: Give better message for -s, --summary, used by tla people
1000
1001
    # XXX: verbose currently does nothing
1002
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1003
    takes_args = ['selected*']
1004
    takes_options = ['message', 'file', 'verbose', 'unchanged']
1005
    aliases = ['ci', 'checkin']
1006
1007
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1008
            unchanged=False):
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1009
        from bzrlib.errors import PointlessCommit, ConflictsInTree
1167 by Martin Pool
- split commit message editor functions out into own file
1010
        from bzrlib.msgeditor import edit_commit_message
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1011
        from bzrlib.status import show_status
1012
        from cStringIO import StringIO
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1013
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1014
        b = Branch.open_containing('.')
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
1015
        tree = WorkingTree(b.base, b)
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1016
        if selected_list:
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
1017
            selected_list = [tree.relpath(s) for s in selected_list]
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1018
            
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1019
        if message is None and not file:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1020
            catcher = StringIO()
1021
            show_status(b, specific_files=selected_list,
1022
                        to_file=catcher)
1023
            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.
1024
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1025
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1026
                raise BzrCommandError("please specify a commit message"
1027
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1028
        elif message and file:
1029
            raise BzrCommandError("please specify either --message or --file")
1030
        
1031
        if file:
1032
            import codecs
1033
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1034
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1035
        if message == "":
1036
                raise BzrCommandError("empty commit message specified")
1037
            
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1038
        try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1039
            b.commit(message,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1040
                     specific_files=selected_list,
1041
                     allow_pointless=unchanged)
1042
        except PointlessCommit:
1043
            # FIXME: This should really happen before the file is read in;
1044
            # perhaps prepare the commit; get the message; then actually commit
1045
            raise BzrCommandError("no changes to commit",
1046
                                  ["use --unchanged to commit anyhow"])
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1047
        except ConflictsInTree:
1048
            raise BzrCommandError("Conflicts detected in working tree.  "
1049
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1050
1051
1052
class cmd_check(Command):
1053
    """Validate consistency of branch history.
1054
1055
    This command checks various invariants about the branch storage to
1056
    detect data corruption or bzr bugs.
1057
    """
1058
    takes_args = ['dir?']
1449 by Robert Collins
teach check about ghosts
1059
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1060
1449 by Robert Collins
teach check about ghosts
1061
    def run(self, dir='.', verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1062
        from bzrlib.check import check
1449 by Robert Collins
teach check about ghosts
1063
        check(Branch.open_containing(dir), verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1064
1065
1066
class cmd_scan_cache(Command):
1067
    hidden = True
1068
    def run(self):
1069
        from bzrlib.hashcache import HashCache
1070
1071
        c = HashCache('.')
1072
        c.read()
1073
        c.scan()
1074
            
1075
        print '%6d stats' % c.stat_count
1076
        print '%6d in hashcache' % len(c._cache)
1077
        print '%6d files removed from cache' % c.removed_count
1078
        print '%6d hashes updated' % c.update_count
1079
        print '%6d files changed too recently to cache' % c.danger_count
1080
1081
        if c.needs_write:
1082
            c.write()
1083
            
1084
1085
1086
class cmd_upgrade(Command):
1087
    """Upgrade branch storage to current format.
1088
1089
    The check command or bzr developers may sometimes advise you to run
1090
    this command.
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1091
1092
    This version of this command upgrades from the full-text storage
1093
    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;
1094
    """
1095
    takes_args = ['dir?']
1096
1097
    def run(self, dir='.'):
1098
        from bzrlib.upgrade import upgrade
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1099
        upgrade(dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1100
1101
1102
class cmd_whoami(Command):
1103
    """Show bzr user id."""
1104
    takes_options = ['email']
1105
    
1106
    def run(self, email=False):
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1107
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1108
            b = bzrlib.branch.Branch.open_containing('.')
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1109
            config = bzrlib.config.BranchConfig(b)
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1110
        except NotBranchError:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1111
            config = bzrlib.config.GlobalConfig()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1112
        
1113
        if email:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1114
            print config.user_email()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1115
        else:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1116
            print config.username()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1117
1118
1119
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1120
    """Run internal test suite.
1121
    
1122
    This creates temporary test directories in the working directory,
1123
    but not existing data is affected.  These directories are deleted
1124
    if the tests pass, or left behind to help in debugging if they
1125
    fail.
1126
    
1127
    If arguments are given, they are regular expressions that say
1128
    which tests should run."""
1129
    # TODO: --list should give a list of all available tests
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1130
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1131
    takes_args = ['testspecs*']
1132
    takes_options = ['verbose']
1133
    def run(self, testspecs_list=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1134
        import bzrlib.ui
1135
        from bzrlib.selftest import selftest
1136
        # we don't want progress meters from the tests to go to the
1137
        # real output; and we don't want log messages cluttering up
1138
        # the real logs.
1139
        save_ui = bzrlib.ui.ui_factory
1140
        bzrlib.trace.info('running tests...')
1141
        try:
1142
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1143
            if testspecs_list is not None:
1144
                pattern = '|'.join(testspecs_list)
1145
            else:
1146
                pattern = ".*"
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1147
            result = selftest(verbose=verbose, 
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1148
                              pattern=pattern)
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
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1195
        branch1 = Branch.open_containing(branch)
1196
        branch2 = Branch.open_containing(other)
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:
1260
            branch = Branch.open_containing('.').get_parent()
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:
1317
            b = Branch.open_containing('.')
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:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1325
            Branch.open_containing('.').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
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1397
        b = Branch.open_containing('.')
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)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1410
        br_remote = Branch.open_containing(remote)
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
1439
        b = Branch.open_containing(branch)
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
1458
    This prints out the given file with an annotation on the 
1459
    left side indicating which revision, author and date introduced the 
1460
    change.
1461
    """
1462
    # TODO: annotate directories; showing when each file was last changed
1463
    # TODO: annotate a previous version of a file
1464
    aliases = ['blame', 'praise']
1465
    takes_args = ['filename']
1466
1467
    def run(self, filename):
1468
        from bzrlib.annotate import annotate_file
1469
        b = Branch.open_containing(filename)
1470
        b.lock_read()
1471
        try:
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
1472
            tree = WorkingTree(b.base, b)
1473
            rp = tree.relpath(filename)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1474
            tree = b.revision_tree(b.last_revision())
1475
            file_id = tree.inventory.path2id(rp)
1476
            file_version = tree.inventory[file_id].revision
1477
            annotate_file(b, file_version, file_id, sys.stdout)
1478
        finally:
1479
            b.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
1480
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1481
1482
class cmd_re_sign(Command):
1483
    """Create a digital signature for an existing revision."""
1484
    # TODO be able to replace existing ones.
1485
1486
    hidden = True # is this right ?
1487
    takes_args = ['revision_id?']
1488
    takes_options = ['revision']
1489
    
1490
    def run(self, revision_id=None, revision=None):
1491
        import bzrlib.config as config
1492
        import bzrlib.gpg as gpg
1493
        if revision_id is not None and revision is not None:
1494
            raise BzrCommandError('You can only supply one of revision_id or --revision')
1495
        if revision_id is None and revision is None:
1496
            raise BzrCommandError('You must supply either --revision or a revision_id')
1497
        b = Branch.open_containing('.')
1498
        gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1499
        if revision_id is not None:
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1500
            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.
1501
        elif revision is not None:
1502
            for rev in revision:
1503
                if rev is None:
1504
                    raise BzrCommandError('You cannot specify a NULL revision.')
1505
                revno, rev_id = rev.in_history(b)
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1506
                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.
1507
1508
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
1509
# these get imported and then picked up by the scan for cmd_*
1510
# TODO: Some more consistent way to split command definitions across files;
1511
# we do need to load at least some information about them to know of 
1512
# aliases.
1513
from bzrlib.conflicts import cmd_resolve, cmd_conflicts