提交: f712b011404d8ff8953557e632bb80505c24172f - allura (git)

allura

Commit MetaInfo

• 修訂: f712b011404d8ff8953557e632bb80505c24172f (tree)
• 時間: 2011-10-06 02:14:56
• 作者: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#2020] Add tests for new git objects

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

Change Summary

• modified: Allura/allura/model/repo.py
• modified: Allura/allura/model/repo_refresh.py
• modified: Allura/allura/model/repository.py
• modified: Allura/test.ini
• modified: ForgeGit/forgegit/tests/model/test_repository.py

差異

--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -10,6 +10,7 @@ from pylons import g
 
 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
 
@@ -22,8 +23,11 @@ from .session import repository_orm_session
 
 log = logging.getLogger(__name__)
 
+# Some schema types
 SUser = dict(name=str, email=str, date=datetime)
 SObjType=S.OneOf('blob', 'tree', 'submodule')
+
+# Used for when we're going to batch queries using $in
 QSIZE = 100
 README_RE = re.compile('^README(\.[^.]*)?$', re.IGNORECASE)
 
@@ -88,7 +92,7 @@ CommitRunDoc = collection(
 
 class RepoObject(object):
 
-    def __repr__(self):
+    def __repr__(self): # pragma no cover
         return '<%s %s>' % (
             self.__class__.__name__, self._id)
 
@@ -105,10 +109,17 @@ class RepoObject(object):
             self._id)
         return id.replace('.', '/')
 
+    @LazyProperty
+    def legacy(self):
+        return Object(object_id=self._id)
+
 class Commit(RepoObject):
     # Ephemeral attrs
     repo=None
 
+    def set_context(self, repo):
+        self.repo = repo
+
     @LazyProperty
     def author_url(self):
         u = User.by_email_address(self.authored.email)
@@ -125,10 +136,10 @@ class Commit(RepoObject):
             self.tree_id = self.repo.compute_tree(self)
         if self.tree_id is None:
             return None
-        t = Tree.query.get(object_id=self.tree_id)
+        t = Tree.query.get(_id=self.tree_id)
         if t is None:
             self.tree_id = self.repo.compute_tree(self)
-            t = Tree.query.get(object_id=self.tree_id)
+            t = Tree.query.get(_id=self.tree_id)
         if t is not None: t.set_context(self)
         return t
 
@@ -138,21 +149,15 @@ class Commit(RepoObject):
         first_line = message.split('\n')[0]
         return h.text.truncate(first_line, 50)
 
-    def get_path(self, path):
-        '''Return the blob on the given path'''
-        if path.startswith('/'): path = path[1:]
-        path_parts = path.split('/')
-        return self.tree.get_blob(path_parts[-1], path_parts[:-1])
-
     def shorthand_id(self):
-        return self.repo.shorthand_for_commit(self)
+        return self.repo.shorthand_for_commit(self._id)
 
     @LazyProperty
     def symbolic_ids(self):
-        return self.repo.symbolics_for_commit(self)
+        return self.repo.symbolics_for_commit(self.legacy)
 
     def url(self):
-        return self.repo.url_for_commit(self)
+        return self.repo.url_for_commit(self.legacy)
 
     def log_iter(self, skip, count):
         for oids in utils.chunked_iter(commitlog(self._id), QSIZE):
@@ -161,16 +166,23 @@ class Commit(RepoObject):
                 (ci._id, ci) for ci in self.query.find(dict(
                         _id={'$in': oids})))
             for oid in oids:
-                ci = commits[oid]
-                ci.set_context(self.repo)
-                yield ci
+                if skip:
+                    skip -= 1
+                    continue
+                if count:
+                    count -= 1
+                    ci = commits[oid]
+                    ci.set_context(self.repo)
+                    yield ci
+                else:
+                    break
 
     def log(self, skip, count):
         return list(self.log_iter(skip, count))
 
     def count_revisions(self):
         result = 0
-        for oid in commitlog(self): result += 1
+        for oid in commitlog(self._id): result += 1
         return result
 
     def context(self):
@@ -217,7 +229,8 @@ class Tree(RepoObject):
         for x in self.blob_ids:
             if README_RE.match(x.name):
                 name = x.name
-                text = h.really_unicode(self.repo.blob_text(x.id))
+                text = self.repo.open_blob(Object(object_id=x.id)).read()
+                text = h.really_unicode(text)
                 break
         if text == '':
             text = '<p><em>Empty File</em></p>'
@@ -231,9 +244,9 @@ class Tree(RepoObject):
 
     def ls(self):
         # Load last commit info
-        oids = [ x.id for x in chain(self.tree_ids, self.object_ids, self.other_ids) ]
+        oids = [ x.id for x in chain(self.tree_ids, self.blob_ids, self.other_ids) ]
         lc_index = dict(
-            (lc.object_id, lc.commit)
+            (lc.object_id, lc.commit_info)
             for lc in LastCommitDoc.m.find(dict(
                     repo_id=self.repo._id,
                     object_id={'$in': oids})))
@@ -293,7 +306,7 @@ class Tree(RepoObject):
         return d
 
     def is_blob(self, name):
-        return self.by_name[name].type == 'blob'
+        return self.by_name[name]['type'] == 'blob'
 
 mapper(Commit, CommitDoc, repository_orm_session)
 mapper(Tree, TreeDoc, repository_orm_session)

--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -3,7 +3,6 @@ from itertools import chain
 from cPickle import dumps
 
 import bson
-from tg import config
 
 from ming.base import Object
 
@@ -63,7 +62,7 @@ def refresh_repo(repo, all_commits=False, notify=True):
 
     # Send notifications
     if notify:
-        send_notifications(commit_ids)
+        send_notifications(repo, commit_ids)
 
 def refresh_commit_trees(ci, cache):
     '''Refresh the list of trees included withn a commit'''
@@ -221,7 +220,8 @@ def unknown_commit_ids(all_commit_ids):
     '''filter out all commit ids that have already been cached'''
     result = []
     for chunk in utils.chunked_iter(all_commit_ids, QSIZE):
-        q = CommitDoc.m.find(_id={'$in':chunk})
+        chunk = list(chunk)
+        q = CommitDoc.m.find(dict(_id={'$in':chunk}))
         known_commit_ids = set(ci._id for ci in q)
         result += [ oid for oid in chunk if oid not in known_commit_ids ]
     return result
@@ -280,12 +280,13 @@ def compute_diffs(repo_id, tree_cache, rhs_ci):
 def send_notifications(repo, commit_ids):
     '''Create appropriate notification and feed objects for a refresh'''
     from allura.model import Feed, Notification
+    from allura.model.repository import config
     commit_msgs = []
     for oids in utils.chunked_iter(commit_ids, QSIZE):
         chunk = list(oids)
         index = dict(
             (doc._id, doc)
-            for doc in CommitDoc.m.find(dict(_id={'$in':chunk})))
+            for doc in Commit.query.find(dict(_id={'$in':chunk})))
         for oid in chunk:
             ci = index[oid]
             href = '%s%sci/%s/' % (

--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -303,9 +303,9 @@ class Repository(Artifact):
 
     def refresh(self, all_commits=False, notify=True):
         '''Find any new commits in the repository and update'''
+        self._impl.refresh_heads()
         if asbool(tg.config.get('scm.new_refresh')):
             refresh_repo(self, all_commits, notify)
-        self._impl.refresh_heads()
         self.status = 'analyzing'
         session(self).flush()
         sess = session(Commit)

--- a/Allura/test.ini
+++ b/Allura/test.ini
@@ -52,6 +52,8 @@ ew.url_base = /nf/_ew_/
 static.script_name = /nf/_static_/
 static.url_base = /nf/_static_/
 
+scm.new_refresh = true
+
 scm.host.ro.git = git://git.localhost$path
 scm.host.rw.git = ssh://$username@localhost:8022/scm-repo$path
 scm.host.https.git = https://$username@localhost:8022/scm-repo$path

--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -7,8 +7,59 @@ from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
+from allura import model as M
 from forgegit import model as GM
 
+class TestNewGit(unittest.TestCase):
+
+    def setUp(self):
+        setup_basic_test()
+        setup_global_objects()
+        h.set_context('test', 'src')
+        repo_dir = pkg_resources.resource_filename(
+            'forgegit', 'tests/data')
+        self.repo = GM.Repository(
+            name='testgit.git',
+            fs_path=repo_dir,
+            url_path = '/test/',
+            tool = 'git',
+            status = 'creating')
+        self.repo.refresh()
+        self.rev = M.repo.Commit.query.get(_id=self.repo.heads[0]['object_id'])
+        self.rev.repo = self.repo
+        ThreadLocalORMSession.flush_all()
+        ThreadLocalORMSession.close_all()
+
+    def test_commit(self):
+        assert self.rev.primary() is self.rev
+        assert self.rev.index_id().startswith('allura/model/repo/Commit#')
+        self.rev.author_url
+        self.rev.committer_url
+        assert self.rev.tree._id == self.rev.tree_id
+        assert self.rev.summary == self.rev.message.splitlines()[0]
+        assert self.rev.shorthand_id() == '[1e146e]'
+        assert self.rev.symbolic_ids == (['master'], [])
+        assert self.rev.url() == (
+            '/p/test/src/ci/'
+            '1e146e67985dcd71c74de79613719bef7bddca4a/')
+        all_cis = self.rev.log(0, 1000)
+        assert len(all_cis) == 4
+        assert self.rev.log(1,1000) == all_cis[1:]
+        assert self.rev.log(0,3) == all_cis[:3]
+        assert self.rev.log(1,2) == all_cis[1:3]
+        for ci in all_cis:
+            ci.count_revisions()
+            ci.context()
+        self.rev.tree.ls()
+        print self.rev.tree.readme()
+        assert self.rev.tree.path() == '/'
+        assert self.rev.tree.url() == (
+            '/p/test/src/ci/'
+            '1e146e67985dcd71c74de79613719bef7bddca4a/'
+            'tree/')
+        self.rev.tree.by_name['README']
+        assert self.rev.tree.is_blob('README') == True
+
 class TestGitRepo(unittest.TestCase):
 
     def setUp(self):