Changeset 1238

Timestamp:

Oct 24, 2010, 12:05:25 AM (13 years ago)

Author:

Peter Johansson

Message:

remove print_copyright from Node interface since we use traverse to traverse node tree and only need to update copyright on File

Location:

trunk

Files:

• lib/Directory.cc (modified) (1 diff)
• lib/Directory.h (modified) (1 diff)
• lib/File.h (modified) (1 diff)
• lib/Node.cc (modified) (1 diff)
• lib/Node.h (modified) (1 diff)
• test/copyright.cc (modified) (3 diffs)

trunk/lib/Directory.cc

@@ -272 +272 @@
 
 
-  void Directory::print_copyright(std::map<std::string, Alias>& alias, 
-                                  bool verbose,
-                                  const std::map<int,svn_revnum_t>& y2r) const 
-  {
-    if (!ignore() && !svncopyright_ignore()) {
-      // print daughter nodes, i.e, this function is recursive
-      for (NodeConstIterator i = daughters_.begin(); i!=daughters_.end(); ++i)
-        (*i)->print_copyright(alias, verbose, y2r);
-    }
-  }
-
-
   void Directory::traverse(NodeVisitor& visitor)
   {

trunk/lib/Directory.h

@@ -94 +94 @@
     std::string output_path(void) const;
 
-    using Node::print_copyright;
-    /**
-       virtual function typically called from Node::print_copyright
-    */
-    void print_copyright(std::map<std::string, Alias>&, bool verbose,
-                         const std::map<int, svn_revnum_t>&) const;
-
     /**
        Calls visitor.enter(*this). If enter returns true, daughter

trunk/lib/File.h

@@ -72 +72 @@
     const StatsCollection& parse(bool verbose, bool ignore);
 
-    using Node::print_copyright;
     /**
        @throw std::runtime_error when a file error is encountered

trunk/lib/Node.cc

@@ -309 +309 @@
 
   
-  void Node::print_copyright(std::map<std::string,Alias>& alias, 
-                             bool verbose) const
-  {
-    // map with last rev for every year
-    std::map<int, svn_revnum_t> year2rev;
-    // get log for entire project
-    SVNlog log(SVNinfo(path()).repos_root_url());
-    typedef SVNlog::container::const_iterator LogIterator;
-    for (LogIterator i=log.commits().begin(); i!=log.commits().end(); ++i){
-      time_t sec = str2time(i->date());
-      tm* timeinfo = gmtime(&sec);
-      // ignore commits in repository not present in wc
-      year2rev[timeinfo->tm_year] = std::min(i->revision(), last_changed_rev());
-    }
-    print_copyright(alias, verbose, year2rev);
-  }
-
-
   const StatsCollection& Node::stats(void) const
   {

trunk/lib/Node.h

@@ -171 +171 @@
                               const std::string& line_type, 
                               const SVNlog&) const; 
-
-    /**
-       creates a map from year to last rev for that year and call
-       virtual function.
-     */
-    void print_copyright(std::map<std::string,Alias>&, bool) const;
-
-    /**
-       typically called from function above 
-     */
-    virtual void print_copyright(std::map<std::string,Alias>&, bool,
-                                 const std::map<int,svn_revnum_t>&) const=0;
 
     /**

trunk/test/copyright.cc

@@ -25 +25 @@
 #include "lib/Configuration.h"
 #include "lib/File.h"
+#include "lib/main_utility.h"
 #include "lib/SVN.h"
 #include "lib/SVNinfo.h"
@@ -68 +69 @@
   // warn about missing Copyright statement only in verbose mode
   if (suite.verbose()){
-    std::string config_str("[copyright]\nmissing-copyright-warning=yes");
-    std::stringstream ss(config_str);
+    std::stringstream ss;
+    ss << "[copyright]\n"
+       << "missing-copyright-warning=yes\n"
+       << "[copyright-alias]\n"
+       << "jari = jh\n"
+       << "peter = pj\n";
     Configuration& config = Configuration::instance();
     config.load(ss);
@@ -85 +90 @@
   File file(0,filename,"");
   
-  suite.out() << "Get stats for file" << std::endl;
-  file.parse(suite.verbose(), true);
-  
-  suite.out() << "Updating copyright statements" << std::endl;
-  std::map<std::string, Alias> alias;
-  alias["jari"]=Alias("jh", 1);
-  alias["peter"]=Alias("pj", 2);
-  
-  file.print_copyright(alias, suite.verbose());
+  update_copyright(file, suite.verbose(), false);
 
   is.open(filename.c_str());