Ready to ship 2.5.

diff --git a/comparator.py b/comparator.py
index 9e9a21985798f16c30ff279cac210b2091ae26eb..87b9c757e78de3d6d1a55960e098114ce9d3ed67 100644 (file)
--- a/comparator.py
+++ b/comparator.py
@@ -118,17 +118,20 @@ class CommonReport:
     def cliquefilter(self, predicate):
         self.read_matches()
         filtered = []
+        # Any patch band that matches the predicate keeps the entire clique.
         for clique in self.cliques:
             for (file, start, end) in clique:
                 if predicate(file, start, end):
                     filtered.append(clique)
                     break
-            else:
-                for (treename, properties) in self.trees:
-                    if treename == file.split("/")[0]:
-                        break
-                properties['matches'] -= 1
-                properties['matchlines'] -= end - start + 1
+        # Correct the statistics for each clique not kept.
+        for clique in self.cliques:
+            if clique not in filtered:
+                for (file, start, end) in clique:
+                    for (treename, properties) in self.trees:
+                        if treename == file.split("/")[0]:
+                            properties['matches'] -= 1
+                            properties['matchlines'] -= end - start + 1
         self.cliques = filtered
         self.matches = len(filtered)
 

diff --git a/comparator.spec b/comparator.spec
index 1841c6f7b87a5e29fdd4712ba0675ddabbf268e6..488cd2d703eba9fc714f0ade3cc39dcf3c6da822 100644 (file)
--- a/comparator.spec
+++ b/comparator.spec
@@ -44,8 +44,11 @@ cp comparator.py "$RPM_BUILD_ROOT"${pylib}
 %{_libdir}/python*/site-packages/comparator.py
 
 %changelog
-* Thu Jul  8 2004 Eric S. Raymond <esr@snark.thyrsus.com> - 2.5-1
-- Alan Burlinson's tweaks to ease porting to SunOS.
+* Sat Aug  7 2004 Eric S. Raymond <esr@snark.thyrsus.com> - 2.5-1
+- Alan Burlinson's tweaks to ease porting to SunOS. Emil Sit's 
+  dramatic speedup for SCF-file reads.  Fix incorrect statistics
+  generation with filterator -mfF options -- counts were too high.
+  Documentation fixes.
 
 * Thu Mar 11 2004 Eric S. Raymond <esr@snark.thyrsus.com> 2.4-1
 - Fixed strtok() bug apparently introduced by C library change.