← Back to branch summary

~lifeless/bzr-svn/loggerhead

« back to all changes in this revision

Viewing changes to tree.py

  • Committer: Jelmer Vernooij
  • Date: 2008-11-05 20:28:03 UTC
  • mfrom: (1929.1.27 trunk)
  • Revision ID: jelmer@samba.org-20081105202803-h1awtij5tbc553sv
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tree.py
23
23
from bzrlib.revisiontree import RevisionTree
24
24
 
25
25
import os
26
 
import md5
 
26
from bzrlib.osutils import md5
27
27
from cStringIO import StringIO
28
28
import urllib
29
29
 
86
86
        finally:
87
87
            repository.transport.add_connection(conn)
88
88
 
89
 
    def get_file_text(self, file_id):
 
89
    def get_file_text(self, file_id, path=None):
90
90
        return self.file_data[file_id]
91
91
 
92
92
 
194
194
            ie = self.tree._inventory.add_path(self.path, 'file', file_id)
195
195
        ie.revision = revision_id
196
196
 
197
 
        actual_checksum = md5.new(file_data).hexdigest()
 
197
        actual_checksum = md5(file_data).hexdigest()
198
198
        assert(checksum is None or checksum == actual_checksum,
199
199
                "checksum mismatch: %r != %r" % (checksum, actual_checksum))
200
200
 
309
309
    def get_file_byname(self, name):
310
310
        return open(self.abspath(name))
311
311
 
312
 
    def get_file_text(self, file_id):
313
 
        return self.get_file_byname(self.id2path(file_id)).read()
 
312
    def get_file_text(self, file_id, path=None):
 
313
        if path is None:
 
314
            path = self.id2path(file_id)
 
315
        return self.get_file_byname(path).read()
314
316
 
315
317
    def annotate_iter(self, file_id,
316
318
                      default_revision=CURRENT_REVISION):