Commit: 376f70a5beb1c86fadcf721ab079bc042bd876ab - allura (git)

allura

Commit MetaInfo

• Revision: 376f70a5beb1c86fadcf721ab079bc042bd876ab (tree)
• Time: 2011-10-06 02:14:56
• Author: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#2020] Add tests (and support) for SVN on new-style commits

Signed-off-by: Rick Copeland <[e-mail]>

Change Summary

• modified: Allura/allura/model/repo.py
• modified: Allura/allura/model/repository.py
• modified: ForgeSVN/forgesvn/model/svn.py
• modified: ForgeSVN/forgesvn/tests/model/test_repository.py

Incremental Difference

--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -7,12 +7,13 @@ from datetime import datetime
 from collections import defaultdict
 
 from pylons import g
+import pymongo.errors
 
 from ming import Field, Index, collection
 from ming import schema as S
 from ming.base import Object
 from ming.utils import LazyProperty
-from ming.orm import mapper
+from ming.orm import mapper, session
 
 from allura.lib import utils
 from allura.lib import helpers as h
@@ -117,6 +118,20 @@ class RepoObject(object):
     def object_id(self):
         return self._id
 
+    @classmethod
+    def upsert(cls, id):
+        isnew = False
+        r = cls.query.get(_id=id)
+        if r is not None: return r, isnew
+        try:
+            r = cls(_id=id)
+            session(r).flush(r)
+            isnew = True
+        except pymongo.errors.DuplicateKeyError: # pragma no cover
+            session(r).expunge(r)
+            r = cls.query.get(_id=id)
+        return r, isnew
+
 class Commit(RepoObject):
     # Ephemeral attrs
     repo=None
@@ -137,12 +152,12 @@ class Commit(RepoObject):
     @LazyProperty
     def tree(self):
         if self.tree_id is None:
-            self.tree_id = self.repo.compute_tree(self)
+            self.tree_id = self.repo.compute_tree_new(self)
         if self.tree_id is None:
             return None
         t = Tree.query.get(_id=self.tree_id)
         if t is None:
-            self.tree_id = self.repo.compute_tree(self)
+            self.tree_id = self.repo.compute_tree_new(self)
             t = Tree.query.get(_id=self.tree_id)
         if t is not None: t.set_context(self)
         return t

--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -97,6 +97,10 @@ class RepositoryImplementation(object):
         '''Used in hg and svn to compute a git-like-tree lazily'''
         raise NotImplementedError, 'compute_tree'
 
+    def compute_tree_new(self, commit, path='/'):
+        '''Used in hg and svn to compute a git-like-tree lazily with the new models'''
+        raise NotImplementedError, 'compute_tree'
+
     def open_blob(self, blob): # pragma no cover
         '''Return a file-like object that contains the contents of the blob'''
         raise NotImplementedError, 'open_blob'
@@ -199,6 +203,8 @@ class Repository(Artifact):
         return self._impl.url_for_commit(commit)
     def compute_tree(self, commit, path='/'):
         return self._impl.compute_tree(commit, path)
+    def compute_tree_new(self, commit, path='/'):
+        return self._impl.compute_tree_new(commit, path)
 
     def _log(self, rev, skip, max_count):
         ci = self.commit(rev)

--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -310,6 +310,40 @@ class SVNImplementation(M.RepositoryImplementation):
         session(tree).flush(tree)
         return tree_id
 
+    def compute_tree_new(self, commit, tree_path='/'):
+        from allura.model import repo as RM
+        tree_path = tree_path[:-1]
+        tree_id = self._tree_oid(commit.object_id, tree_path)
+        tree, isnew = RM.Tree.upsert(tree_id)
+        if not isnew: return tree_id
+        log.debug('Computing tree for %s: %s',
+                 self._revno(commit.object_id), tree_path)
+        rev = self._revision(commit.object_id)
+        try:
+            infos = self._svn.info2(
+                self._url + tree_path,
+                revision=rev,
+                depth=pysvn.depth.immediates)
+        except pysvn.ClientError:
+            log.exception('Error computing tree for %s: %s(%s)',
+                          self._repo, commit, tree_path)
+            tree.delete()
+            return None
+        log.debug('Compute tree for %d paths', len(infos))
+        for path, info in infos[1:]:
+            if info.kind == pysvn.node_kind.dir:
+                tree.tree_ids.append(Object(
+                        id=self._tree_oid(commit.object_id, path),
+                        name=path))
+            elif info.kind == pysvn.node_kind.file:
+                tree.blob_ids.append(Object(
+                        id=self._tree_oid(commit.object_id, path),
+                        name=path))
+            else:
+                assert False
+        session(tree).flush(tree)
+        return tree_id
+
     def _tree_oid(self, commit_id, path):
         data = 'tree\n%s\n%s' % (commit_id, h.really_unicode(path))
         return sha1(data.encode('utf-8')).hexdigest()

--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -51,12 +51,10 @@ class TestNewRepo(unittest.TestCase):
             ci.context()
         self.rev.tree.ls()
         assert self.rev.tree.readme() == (
-            'README', '<pre>This is readme\nAnother line\n</pre>')
+            'README', '<pre>This is readme\nAnother Line\n</pre>')
         assert self.rev.tree.path() == '/'
         assert self.rev.tree.url() == (
-            '/p/test/src/ci/'
-            '1c7eb55bbd66ff45906b4a25d4b403899e0ffff1/'
-            'tree/')
+            '/p/test/src/5/tree/')
         self.rev.tree.by_name['README']
         assert self.rev.tree.is_blob('README') == True