Rev 1807: Disable caching in revmeta if necessary. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1807
revision-id: jelmer at samba.org-20080904173309-rjw4hwrcnxcdpvas
parent: jelmer at samba.org-20080904154701-jvb1fcryb93unbn7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-09-04 19:33:09 +0200
message:
  Disable caching in revmeta if necessary.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
  tags.py                        tags.py-20080822211316-scblu3akdvu0b64c-1
=== modified file 'repository.py'
--- a/repository.py	2008-09-04 15:47:01 +0000
+++ b/repository.py	2008-09-04 17:33:09 +0000
@@ -142,6 +142,7 @@
         self.branchprop_list = PathPropertyProvider(self._log)
 
         self._revmeta_provider = revmeta.RevisionMetadataProvider(self, 
+                use_cache,
                 self.transport.has_capability("commit-revprops") in (True, None))
 
     def get_revmap(self):

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-09-04 07:58:37 +0000
+++ b/revmeta.py	2008-09-04 17:33:09 +0000
@@ -329,12 +329,16 @@
 
 class RevisionMetadataProvider(object):
 
-    def __init__(self, repository, check_revprops):
+    def __init__(self, repository, cache, check_revprops):
         self._revmeta_cache = {}
         self.repository = repository
         self._get_fileprops_fn = self.repository.branchprop_list.get_properties
         self._log = repository._log
         self.check_revprops = check_revprops
+        if cache:
+            self._revmeta_cls = CachingRevisionMetadata
+        else:
+            self._revmeta_cls = RevisionMetadata
 
     def get_revision(self, path, revnum, changes=None, revprops=None, changed_fileprops=None, 
                      metabranch=None):
@@ -346,7 +350,7 @@
                 cached._changed_fileprops = changed_fileprops
             return self._revmeta_cache[path,revnum]
 
-        ret = CachingRevisionMetadata(self.repository, self.check_revprops, self._get_fileprops_fn,
+        ret = self._revmeta_cls(self.repository, self.check_revprops, self._get_fileprops_fn,
                                self._log, self.repository.uuid, path, revnum, changes, revprops, 
                                changed_fileprops=changed_fileprops, 
                                metabranch=metabranch)

=== modified file 'tags.py'
--- a/tags.py	2008-09-01 01:30:13 +0000
+++ b/tags.py	2008-09-04 17:33:09 +0000
@@ -21,6 +21,8 @@
 from bzrlib.plugins.svn import commit, core, mapping, properties
 
 class SubversionTags(BasicTags):
+    """Subversion tags object."""
+
     def __init__(self, branch):
         self.branch = branch
         self.repository = branch.repository