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