Changeset 303

Timestamp:

May 11, 2007, 10:13:00 PM (16 years ago)

Author:

Peter Johansson

Message:

Sorting authors in copyright statement in same order as stated in config file. fixes #172

Location:

trunk

Files:

• bin/svndigest.cc (modified) (1 diff)
• lib/Alias.cc (added)
• lib/Alias.h (added)
• lib/Configuration.cc (modified) (4 diffs)
• lib/Configuration.h (modified) (3 diffs)
• lib/Directory.cc (modified) (2 diffs)
• lib/Directory.h (modified) (1 diff)
• lib/File.cc (modified) (6 diffs)
• lib/File.h (modified) (1 diff)
• lib/Makefile.am (modified) (2 diffs)
• lib/Node.h (modified) (2 diffs)
• lib/utility.cc (modified) (1 diff)
• lib/utility.h (modified) (1 diff)

trunk/bin/svndigest.cc

@@ -183 +183 @@
       if (option->verbose())
         std::cout << "Updating copyright statements" << std::endl;
-      std::map<std::string, std::string> alias(config.copyright_alias());
+      std::map<std::string, Alias> alias(config.copyright_alias());
       tree.print_copyright(alias);
     }

trunk/lib/Configuration.cc

@@ -31 +31 @@
 #include <string>
 #include <sstream>
+#include <stdexcept>
 #include <utility>
 
@@ -41 +42 @@
   Configuration::Configuration(void)
   {
+  }
+
+
+  const std::map<std::string,Alias>& Configuration::copyright_alias(void) const
+  {
+    return copyright_alias_;
   }
 
@@ -72 +79 @@
         getline(ss, tmp);
         std::string name = trim(tmp);
-        copyright_alias_[key] = name;
+        std::map<std::string,Alias>::iterator iter = 
+          copyright_alias_.lower_bound(key);
+        if (iter!=copyright_alias_.end() && iter->first==key){
+          std::stringstream mess;
+          mess << "svndigest: invalid config file: "
+               << "in copright-alias section" << key + "defined twice.";
+          throw std::runtime_error(mess.str());
+        }
+        
+        // insert alias
+        copyright_alias_.insert(iter,std::make_pair(key, Alias(name,copyright_alias_.size())));
       }
       else if (section == "trac"){
@@ -126 +143 @@
        << "[copyright-alias]\n"
        << "# jdoe = John Doe\n";
-    
-    typedef std::map<std::string, std::string> map; 
-    for (map::const_iterator i=conf.copyright_alias().begin();
-         i!=conf.copyright_alias().end(); ++i) {
-      os << i->first << " = " << i->second << " \n";
+
+    typedef std::vector<std::pair<std::string, Alias> > vector;
+    vector vec;
+    std::back_insert_iterator<vector> back_insert_iterator(vec);
+    vec.reserve(conf.copyright_alias().size());
+    std::copy(conf.copyright_alias().begin(), conf.copyright_alias().end(),
+              back_insert_iterator);
+    // sort with respect to Alias.id
+    IdCompare id;
+    PairSecondCompare<const std::string, Alias, IdCompare> comp(id);
+    std::sort(vec.begin(),vec.end(), comp);
+              
+
+    for (vector::const_iterator i(vec.begin()); i!=vec.end(); ++i) {
+      os << i->first << " = " << i->second.name() << " \n";
     }
 

trunk/lib/Configuration.h

@@ -25 +25 @@
 */
 
+#include "Alias.h"
+
 #include <iostream>
-#include <map>
+#include <vector>
 #include <string>
 #include <utility>
@@ -55 +57 @@
     /// @brief Aliases for Copyright
     ///
-    inline const std::map<std::string, std::string>&
-    copyright_alias(void) const { return copyright_alias_; }
+    const std::map<std::string, Alias>& copyright_alias(void) const;
 
     ///
@@ -82 +83 @@
     static Configuration* instance_;
 
-    std::map<std::string, std::string> copyright_alias_;
+    std::map<std::string, Alias> copyright_alias_;
 
     std::string trac_root_;

trunk/lib/Directory.cc

@@ -24 +24 @@
 
 #include "Directory.h"
+
+#include "Alias.h"
 #include "File.h"
 #include "html_utility.h"
@@ -220 +222 @@
 
 
-  void Directory::print_copyright
-  (std::map<std::string, std::string>& alias) const {
+  void Directory::print_copyright(std::map<std::string, Alias>& alias) const {
     if (!ignore()){
       // print daughter nodes, i.e, this function is recursive

trunk/lib/Directory.h

@@ -79 +79 @@
     const Stats& parse(const bool verbose=false);
 
-    void print_copyright(std::map<std::string, std::string>&) const;
+    void print_copyright(std::map<std::string, Alias>&) const;
 
   private:

trunk/lib/File.cc

@@ -24 +24 @@
 
 #include "File.h"
+
+#include "Alias.h"
 #include "html_utility.h"
 #include "Stats.h"
@@ -101 +103 @@
 
 
-  void File::print_copyright (std::map<std::string,std::string>& alias) const{
+  void File::print_copyright(std::map<std::string, Alias>& alias) const 
+  {
     if (ignore())
       return;
@@ -108 +111 @@
     SVNlog log(path());
 
-    typedef map<int, set<string> > Container;
-    Container copyright;
-
-    
+    map<int, set<Alias> > year_authors;
+
     assert(log.author().size()==log.date().size());
     vector<string>::const_iterator author=log.author().begin();
@@ -120 +121 @@
 
       // find username in map of aliases
-      map<string, string>::iterator name = alias.lower_bound(*author);
+      std::map<string,Alias>::iterator name(alias.lower_bound(*author));
+
       // if alias exist insert alias
       if (name != alias.end() && name->first==*author)
-        copyright[timeinfo->tm_year].insert(name->second);
+        year_authors[timeinfo->tm_year].insert(name->second);
       else {
         // else insert user name
-        copyright[timeinfo->tm_year].insert(*author);
+        Alias a(*author,alias.size());
+        year_authors[timeinfo->tm_year].insert(a);
         std::cerr << "svndigest: warning: no copyright alias found for `" 
                   << *author << "`\n";
         // insert alias to avoid multiple warnings.
-        alias.insert(name, std::make_pair(*author, *author));
+        alias.insert(name, std::make_pair(*author, a));
       }
     }
@@ -176 +179 @@
           found_copyright = true;
           // Printing copyright statement
-          for (Container::const_iterator i=copyright.begin();
-               i!=copyright.end();) {
-            tmp << prefix << "Copyright (C) "
-                << 1900+i->first;
-            Container::const_iterator j = i;
-            assert(i!=copyright.end());
-            while (++j!=copyright.end() && i->second == j->second){
-              tmp << ", " << 1900+(j->first);
-            }
-            // printing authors
-            for (set<string>::iterator a=i->second.begin();
-                 a!=i->second.end(); ++a){
-              if (a!=i->second.begin())
-                tmp << ",";
-              tmp << " " << *a;
-            }
-            tmp << "\n";
-            i = j;
+          for (map<int, set<Alias> >::const_iterator i(year_authors.begin());
+               i!=year_authors.end();) {
+          tmp << prefix << "Copyright (C) "
+              << 1900+i->first;
+          map<int, set<Alias> >::const_iterator j = i;
+          assert(i!=year_authors.end());
+          while (++j!=year_authors.end() && 
+                 i->second == j->second){
+            tmp << ", " << 1900+(j->first);
+          }
+          // printing authors
+          std::vector<Alias> vec_alias;
+          back_insert_iterator<std::vector<Alias> > ii(vec_alias);
+          std::copy(i->second.begin(), i->second.end(), ii);
+          // sort with respect to id
+          std::sort(vec_alias.begin(), vec_alias.end(), IdCompare());
+          for (std::vector<Alias>::iterator a=vec_alias.begin();
+               a!=vec_alias.end(); ++a){
+            if (a!=vec_alias.begin())
+              tmp << ",";
+            tmp << " " << a->name();
+          }
+          tmp << "\n";
+          i = j;
           }
         }
@@ -203 +212 @@
     // finally move printed temporary file to original file
     rename(tmpname, path().c_str());
+    
   }
 }} // end of namespace svndigest and namespace theplu

trunk/lib/File.h

@@ -66 +66 @@
     void print_blame(std::ofstream&, const std::string line_type) const;
 
-    void print_copyright(std::map<std::string, std::string>&) const;
+    void print_copyright(std::map<std::string, Alias>&) const;
 
   private:

trunk/lib/Makefile.am

@@ -26 +26 @@
 noinst_LTLIBRARIES = libsvndigest.la
 
-noinst_HEADERS = ColumnStream.h Commitment.h Configuration.h css.h\
+noinst_HEADERS = Alias.h ColumnStream.h Commitment.h Configuration.h css.h\
   Date.h Directory.h File.h first_page.h Gnuplot.h GnuplotFE.h \
   HtmlStream.h html_utility.h Node.h Parser.h rmdirhier.h \
@@ -32 +32 @@
   SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h
 
-libsvndigest_la_SOURCES = ColumnStream.cc Commitment.cc Configuration.cc \
+libsvndigest_la_SOURCES = Alias.cc ColumnStream.cc \
+  Commitment.cc Configuration.cc \
   css.cc Date.cc Directory.cc File.cc first_page.cc\
   Gnuplot.cc GnuplotFE.cc HtmlStream.cc \

trunk/lib/Node.h

@@ -39 +39 @@
 namespace theplu{
 namespace svndigest{
+
+  class Alias;
 
   ///
@@ -145 +147 @@
     void print_author_summary(std::ostream&, std::string, const SVNlog&) const; 
 
-    virtual void 
-    print_copyright(std::map<std::string, std::string>&) const=0;
+    virtual void print_copyright(std::map<std::string,Alias>& ) const=0;
 
     /**

trunk/lib/utility.cc

@@ -193 +193 @@
   {}
     
-
 }} // end of namespace svndigest and namespace theplu

trunk/lib/utility.h

@@ -222 +222 @@
               (!(y.second<x.second) && (x.first<y.first))); 
     }
+  };
+
+  template <class T1,class T2, class T3>
+  struct PairSecondCompare
+  {
+
+    ///
+    /// @brief Constructor
+    ///
+    explicit PairSecondCompare(const T3& comp)
+      : compare_(comp) {}
+
+    ///
+    /// @return true if x.second<y.second or (x.second==y.second and
+    /// x.first<y.first)
+    ///
+    inline bool operator()(const std::pair<T1,T2>& x,
+                           const std::pair<T1,T2>& y) const
+    { return compare_(x.second,y.second); }
+
+  private:
+    T3 compare_;
+
   };