← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Ian Clatworthy
  • Date: 2007-07-09 05:23:16 UTC
  • mfrom: (2593.1.5 bzr.annotate_fixes)
  • mto: This revision was merged to the branch mainline in revision 2594.
  • Revision ID: ian.clatworthy@internode.on.net-20070709052316-v812p7fielxa3th7
(Adeodato Simó) Merge annotate changes to make it behave in a non-ASCII world

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3100
3100
                     'revision',
3101
3101
                     'show-ids',
3102
3102
                     ]
 
3103
    encoding_type = 'exact'
3103
3104
 
3104
3105
    @display_command
3105
3106
    def run(self, filename, all=False, long=False, revision=None,
3120
3121
                raise errors.NotVersionedError(filename)
3121
3122
            tree = branch.repository.revision_tree(revision_id)
3122
3123
            file_version = tree.inventory[file_id].revision
3123
 
            annotate_file(branch, file_version, file_id, long, all, sys.stdout,
 
3124
            annotate_file(branch, file_version, file_id, long, all, self.outf,
3124
3125
                          show_ids=show_ids)
3125
3126
        finally:
3126
3127
            branch.unlock()