/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/workingtree.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
463
463
        return (file_obj, stat_value)
464
464
 
465
465
    def get_file_text(self, file_id, path=None, filtered=True):
466
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
467
 
        try:
468
 
            return my_file.read()
469
 
        finally:
470
 
            my_file.close()
 
466
        return self.get_file(file_id, path=path, filtered=filtered).read()
471
467
 
472
468
    def get_file_byname(self, filename, filtered=True):
473
469
        path = self.abspath(filename)
527
523
 
528
524
        # Now we have the parents of this content
529
525
        annotator = self.branch.repository.texts.get_annotator()
530
 
        text = self.get_file_text(file_id)
 
526
        text = self.get_file(file_id).read()
531
527
        this_key =(file_id, default_revision)
532
528
        annotator.add_special_text(this_key, file_parent_keys, text)
533
529
        annotations = [(key[-1], line)