/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-04 22:17:22 UTC
  • mfrom: (5815.3.15 use-tree-annotate)
  • Revision ID: pqm@pqm.ubuntu.com-20110504221722-fz5hr1xagchptyje
(jelmer) Avoid directly accessing VersionedFiles.annotate();
 rather, access it through RevisionTree.annotate_iter(). (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4693
4693
    @display_command
4694
4694
    def run(self, filename, all=False, long=False, revision=None,
4695
4695
            show_ids=False, directory=None):
4696
 
        from bzrlib.annotate import annotate_file, annotate_file_tree
 
4696
        from bzrlib.annotate import (
 
4697
            annotate_file_tree,
 
4698
            )
4697
4699
        wt, branch, relpath = \
4698
4700
            _open_directory_or_containing_tree_or_branch(filename, directory)
4699
4701
        if wt is not None:
4714
4716
            annotate_file_tree(wt, file_id, self.outf, long, all,
4715
4717
                show_ids=show_ids)
4716
4718
        else:
4717
 
            file_version = tree.get_file_revision(file_id)
4718
 
            annotate_file(branch, file_version, file_id, long, all, self.outf,
4719
 
                          show_ids=show_ids)
 
4719
            annotate_file_tree(tree, file_id, self.outf, long, all,
 
4720
                show_ids=show_ids, branch=branch)
4720
4721
 
4721
4722
 
4722
4723
class cmd_re_sign(Command):