Ticket #7715: 7715-optimize-eligible-r8342.diff

trac/versioncontrol/svn_fs.py

@@ -786 +786 @@
         return fs.node_prop(self.root, self._scoped_path_utf8, name,
                             self.pool())
 
+    def get_branch_origin(self):
+        root_and_path = fs.closest_copy(self.root, self._scoped_path_utf8)
+        if root_and_path:
+            return fs.revision_root_revision(root_path[0])
+
     def get_copy_ancestry(self):
         ancestors = []
         previous = (self._scoped_path_utf8, self._requested_rev, self.root)

trac/versioncontrol/svn_prop.py

@@ -142 +142 @@
                                                spath, revs)]
                     if has_eligible:
                         first_rev = branch_starts.get(spath)
-                        eligible = set(repos._get_node_revs(spath, target_rev,
-                                                            first_rev))
+                        if not first_rev:
+                            first_rev = node.get_branch_origin()
+                        eligible = set(xrange(first_rev or 1, target_rev))
                         eligible -= set(Ranges(revs))
                         blocked = self._get_blocked_revs(props, name, spath)
                         eligible -= set(Ranges(blocked))
+                        if eligible:
+                            noderevs = repos._get_node_revs(spath, target_rev, 
+                                                            min(eligible))
+                            eligible &= set(noderevs)
                         eligible = to_ranges(eligible)
                         row.append(self._get_revs_link(_('eligible'), context,
                                                        spath, eligible))