Rev 1392: Deal with absent content. in file:///data/jelmer/bzr-svn/stackable/
Jelmer Vernooij
jelmer at samba.org
Sat Jun 28 04:03:25 BST 2008
At file:///data/jelmer/bzr-svn/stackable/
------------------------------------------------------------
revno: 1392
revision-id: jelmer at samba.org-20080628030324-xuw01kyj3in23yrv
parent: jelmer at samba.org-20080628021542-7gdny8vrapok9v7u
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: stackable
timestamp: Sat 2008-06-28 05:03:24 +0200
message:
Deal with absent content.
modified:
versionedfiles.py versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
=== modified file 'versionedfiles.py'
--- a/versionedfiles.py 2008-06-28 01:53:01 +0000
+++ b/versionedfiles.py 2008-06-28 03:03:24 +0000
@@ -15,7 +15,7 @@
from bzrlib import debug, osutils, urlutils
from bzrlib.trace import mutter
-from bzrlib.versionedfile import FulltextContentFactory, VersionedFiles
+from bzrlib.versionedfile import FulltextContentFactory, VersionedFiles, AbsentContentFactory
from cStringIO import StringIO
@@ -104,6 +104,8 @@
yield FulltextContentFactory((k,), None,
sha1=osutils.sha_strings(lines),
text=''.join(lines))
+ else:
+ yield AbsentContentFactory((k,))
class FakeRevisionTexts(FakeVersionedFiles):
@@ -113,6 +115,7 @@
super(FakeRevisionTexts, self).__init__(self.repository.get_parent_map, self.get_lines)
def get_lines(self, key):
+ self.mutter("get revision text(%r)", key)
return osutils.split_lines(self.repository.get_revision_xml(key))
# TODO: annotate, iter_lines_added_or_present_in_keys, keys
More information about the bazaar-commits
mailing list