Changeset 1225

Timestamp:

Oct 17, 2010, 10:36:40 PM (13 years ago)

Author:

Peter Johansson

Message:

refs #476. Inital version of a CopyrightVisitor?.

Location:

branches/visitor/lib

Files:

• CopyrightVisitor.cc (added)
• CopyrightVisitor.h (added)
• Directory.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• Node.h (modified) (2 diffs)
• NodeVisitor.h (modified) (2 diffs)
• main_utility.cc (modified) (3 diffs)
• main_utility.h (modified) (1 diff)

branches/visitor/lib/Directory.h

@@ -99 +99 @@
 
     /**
-       Calls visitor.enter(*this), traverses daughter nodes, and calls
-       visitor.leave(*this).
+       Calls visitor.enter(*this). If enter returns true, daughter
+       nodes are traverses. Finally visitor visitor.leave(*this) i called.
      */
     void traverse(NodeVisitor& visitor);

branches/visitor/lib/Makefile.am

@@ -31 +31 @@
 
 noinst_HEADERS = AddStats.h Alias.h BlameStats.h ClassicStats.h \
-  Colors.h Commitment.h Configuration.h css.h \
+  Colors.h Commitment.h Configuration.h CopyrightVisitor.h css.h \
   Date.h Directory.h File.h first_page.h Functor.h \
   Graph.h \
@@ -42 +42 @@
 libsvndigest_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
   ClassicStats.cc Colors.cc \
-  Commitment.cc Configuration.cc \
+  Commitment.cc Configuration.cc CopyrightVisitor.cc \
   css.cc Date.cc Directory.cc File.cc first_page.cc\
   Functor.cc Graph.cc HtmlBuf.cc HtmlStream.cc \

branches/visitor/lib/Node.h

@@ -184 +184 @@
 
     /**
+       \return true if svncopyright::ignore property was set
+     */
+    bool svncopyright_ignore(void) const;
+
+    /**
        @brief Check if item used to create this object has been
        assigned property svndigest:ignore.
@@ -207 +212 @@
     
   protected:
-    /**
-       \return true if svncopyright::ignore property was set
-     */
-    bool svncopyright_ignore(void) const;
-
     ///
     /// print path in html format (with anchors) to @a os

branches/visitor/lib/NodeVisitor.h

@@ -39 +39 @@
        \brief Destructor
     */
-    virtual ~NodeVisitor(void);
+    virtual ~NodeVisitor(void) {};
 
     /**
@@ -46 +46 @@
        This is a chance for the visitor to do some action before
        traversing daughter nodes.
+
+       \return true if we should traverse daughter nodes
      */
-    virtual void enter(Directory& dir)=0;
+    virtual bool enter(Directory& dir)=0;
 
     /**

branches/visitor/lib/main_utility.cc

@@ -23 +23 @@
 
 #include "Configuration.h"
+#include "CopyrightVisitor.h"
 #include "Node.h"
 #include "utility.h"
@@ -58 +59 @@
 
 
-  void update_copyright(const Node& tree, bool verbose)
+  void update_copyright(Node& tree, bool verbose)
   {
     if (verbose)
@@ -64 +65 @@
     const Configuration& config = Configuration::instance();
     std::map<std::string, Alias> alias(config.copyright_alias());
-    tree.print_copyright(alias, verbose);
+
+    // map with last rev for every year
+    std::map<int, svn_revnum_t> year2rev;
+    // get log for entire project
+    SVNlog log(SVNinfo(tree.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(), 
+                                             tree.last_changed_rev());
+    }
+
+    CopyrightVisitor visitor(alias, verbose, year2rev);
+    tree.traverse(visitor);
   }
 

branches/visitor/lib/main_utility.h

@@ -46 +46 @@
      \brief update copyright statements in \a node
    */
-  void update_copyright(const Node& node, bool verbose);
+  void update_copyright(Node& node, bool verbose);
 
 }} // end of namespace svndigest end of namespace theplu