提交: 757a363095f7fc59c3fda724ec066340e2a42849 - allura (git)

allura

Commit MetaInfo

• 修訂: 757a363095f7fc59c3fda724ec066340e2a42849 (tree)
• 時間: 2012-07-13 01:23:06
• 作者: Dave Brondsema <dbrondsema@geek...>
• Commiter: Cory Johns

Log Message

[#4523] use regex object so that tests pass (mim does not support $regex)

Change Summary

• modified: Allura/allura/model/repo.py
• modified: Allura/allura/model/repo_refresh.py

差異

--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -326,7 +326,7 @@ class Tree(RepoObject):
         lc_index = dict(
             (lc.object_id, lc.commit_info)
             for lc in LastCommitDoc.m.find(dict(
-                    _id={"$regex": "^{}:".format(self.repo._id)},
+                    _id=re.compile("^{}:".format(self.repo._id)),
                     object_id={'$in': oids})))
         results = []
         def _get_last_commit(oid):

--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -1,6 +1,7 @@
 import logging
 from itertools import chain
 from cPickle import dumps
+import re
 
 import bson
 
@@ -312,7 +313,7 @@ def compute_diffs(repo_id, tree_cache, rhs_ci):
             d['object_id']
             for d in last_commit_collection.find(
                 dict(object_id={'$in': rhs_tree_ids},
-                     _id={"$regex": "^{}:".format(repo_id)}),
+                     _id=re.compile("^{}:".format(repo_id))),
                 { 'object_id': 1, '_id': 0 }))
         for tree_id in rhs_tree_ids:
             if tree_id not in last_commits: