Changeset 1358

Timestamp:

Jun 1, 2011, 1:38:22 AM (11 years ago)

Author:

Peter Johansson

Message:

rewrite of svncopyright to use its own Stats class, which means it's no longer using the cache. This version is slow and there are lots of space for speed-ups and there is no cache functionality yet. refs #385

Location:

trunk/lib

Files:

• CopyrightStats.cc (added)
• CopyrightStats.h (added)
• CopyrightVisitor.cc (modified) (4 diffs)
• Makefile.am (modified) (2 diffs)

trunk/lib/CopyrightVisitor.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2010 Peter Johansson
+  Copyright (C) 2010, 2011 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -23 +23 @@
 
 #include "Configuration.h"
+#include "CopyrightStats.h"
 #include "Directory.h"
 #include "File.h"
@@ -175 +176 @@
       return;
     }
-    std::map<int, std::set<Alias> > map;
-    create_year2alias(map, file);
+    if (verbose_)
+      std::cout << "Parsing '" << file.path() << "'\n";
+    CopyrightStats stats(file.path(), ignore_cache_, alias_, year2rev_);
+    const std::map<int, std::set<Alias> >& map = stats.map();
+    assert(!map.empty());
     std::string new_block = copyright_block(map, prefix);
     if (old_block==new_block)
@@ -231 +235 @@
     if (file.ignore() || file.svncopyright_ignore())
       return;
-    file.parse(verbose_, ignore_cache_);
     update_copyright(file);
-    file.stats().reset();
+
+    //file.parse(verbose_, ignore_cache_);
+    //update_copyright(file);
+    //file.stats().reset();
   }
 

trunk/lib/Makefile.am

@@ -29 +29 @@
 noinst_HEADERS = AddStats.h Alias.h BlameStats.h CacheCopyer.h ClassicStats.h \
   Colors.h Commitment.h Configuration.h \
-  CopyrightVisitor.h css.h \
+  CopyrightStats.h CopyrightVisitor.h css.h \
   Date.h Directory.h DirectoryPrinter.h File.h FilePrinter.h \
   first_page.h Functor.h \
@@ -52 +52 @@
 libsvndigest_core_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
   CacheCopyer.cc ClassicStats.cc Colors.cc \
-  Commitment.cc Configuration.cc CopyrightVisitor.cc \
+  Commitment.cc Configuration.cc CopyrightStats.cc CopyrightVisitor.cc \
   css.cc Date.cc Directory.cc File.cc \
   Functor.cc HtmlBuf.cc HtmlStream.cc \