Changeset 1152

Timestamp:

Aug 7, 2010, 4:31:18 PM (13 years ago)

Author:

Peter Johansson

Message:

allow config file to override svn property (fixes #326). Adding two new files (split.h and split.cc) from yat.

Location:

trunk

Files:

• lib/Configuration.cc (modified) (8 diffs)
• lib/Configuration.h (modified) (4 diffs)
• lib/SVNproperty.cc (modified) (1 diff)
• test/config_test.cc (modified) (4 diffs)
• yat/Makefile.am (modified) (2 diffs)
• yat/split.cc (added)
• yat/split.h (added)

trunk/lib/Configuration.cc

@@ -26 +26 @@
 #include "Colors.h"
 #include "Functor.h"
+
+#include "yat/split.h"
 
 #include <algorithm>
@@ -311 +313 @@
         }
       } 
+      else if (section == "svn_props") {
+        svn_props_.push_back(std::make_pair(lhs, empty_str_map_));
+        std::vector<std::string> vec;
+        yat::utility::split(vec, rhs, ';');
+        for (size_t i=0; i<vec.size(); ++i) {
+          std::vector<std::string> vec2;
+          yat::utility::split(vec2, vec[i], '=');
+          std::string key = trim(vec2[0]);
+          std::string value("");
+          if (vec2.size() >= 2)
+            value = trim(vec2[1]);
+          svn_props_.back().second[key] = value;
+        }
+      }
       else if (section == "image") {
         if (lhs == "format") {
@@ -370 +386 @@
       instance_ = new Configuration;
       instance_->load();
+      std::cerr << "construct config\n";
     }
     return *instance_;
@@ -507 +524 @@
     output_blame_information_ = true;
     output_file_ = true;
+
   }
 
@@ -522 +540 @@
 
 
-  const std::map<std::string, std::string>*
-  Configuration::svn_properties(const std::string&) const
-  {
-    return NULL;
+  const std::map<std::string, std::string>&
+  Configuration::svn_properties(const std::string& filename) const
+  {
+    // reverse backwards as we prefer to to pick properties defined later 
+    std::vector<props>::const_reverse_iterator iter = 
+      find_fn(svn_props_.rbegin(), svn_props_.rend(), filename);
+    if (iter==svn_props_.rend())
+      return empty_str_map_;
+    return iter->second;
   }
 
@@ -612 +635 @@
        << "[author-color]\n"
        << "# jdoe = 000000\n";
-    typedef std::map<std::string,std::string> str_map;
+    typedef Configuration::str_map str_map;
     for (str_map::const_iterator i(conf.author_color_.begin());
          i!=conf.author_color_.end(); ++i) {
@@ -618 +641 @@
     }
 
+    typedef Configuration::props props;
     os << "\n"
-       << "### Section for setting trac environment\n"
+       << "### Section for overriding svn properties.\n"
+       << "### The format is the same as for section auto-props in subversion\n"
+       << "### config file\n"
+       << "[svn-props]\n";
+    os << "# COPYING = svndigest:ignore\n";
+    std::vector<props>::const_iterator p=conf.svn_props_.begin(); 
+    for ( ; p!=conf.svn_props_.end(); ++p) {
+      os << p->first << " = ";
+      const str_map& map = p->second;
+      str_map::const_iterator end = map.end();
+      for (str_map::const_iterator i=map.begin(); i!=end; ++i) {
+        if (i != map.begin())
+          os << ";";
+        os << i->first << "=" << i->second;
+      }
+      os << "\n";
+    }
+
+
+    os << "\n"
+       << "### Section for setting trac environment.\n"
        << "[trac]\n"
        << "# If trac-root is set, svndigest will create anchors to "
@@ -626 +670 @@
     if (!conf.trac_root().empty())
       os << "trac-root = " << conf.trac_root() << "\n";
+
+    os << "\n"
+       << "### Section for setting dictionary for file names.\n"
+       << "### Prior looking for file name pattern in section " 
+       << "[parsing-codons],\n"
+       << "### the file name may be translated according to the rules \n"
+       << "### in this section. In default setting there is, for example,\n"
+       << "### a rule to translate `<FILENAME>.in' to `<FILENAME>'.\n"
+       << "### The format of the entries is:\n"
+       << "###    file-name-pattern = new-name\n"
+       << "### Left hand side may contain wildcards (such as '*' and '?').\n"
+       << "### Right hand side may contain \"$i\", which will be replaced \n"
+       << "### with the ith wild card in lhs string.\n";
 
     if (!conf.dictionary_.empty()) {

trunk/lib/Configuration.h

@@ -121 +121 @@
        \return NULL if there is no prop for \a filename in config
      */
-    const std::map<std::string, std::string>* 
+    const std::map<std::string, std::string>& 
     svn_properties(const std::string& filename) const;
 
@@ -152 +152 @@
     bool equal_false(std::string) const;
     bool equal_true(std::string) const;
+
+    /**
+       find first element in range, [first, last) for which
+       element->first matches filename.
+
+       Iterator->first must return string, i.e., [first, last) is
+       often a range of pair<string, T>
+
+       If no match is found, last is returned.
+     */
+    template<typename Iterator>
+    Iterator find_fn(Iterator first, Iterator last,
+                     const std::string& filename) const;
+
     /// 
     /// @brief load deafult configuration
@@ -190 +204 @@
     std::string trac_root_;
 
-    std::vector<std::map<std::string, std::string> > svn_props_;
+    typedef std::map<std::string, std::string> str_map;
+    typedef std::pair<std::string, str_map> props;
+    std::vector<props> svn_props_;
+    const str_map empty_str_map_;
   };
 
@@ -226 +243 @@
   };
 
+  // template implementation
+
+  template<typename Iterator>
+  Iterator Configuration::find_fn(Iterator first, Iterator last,
+                                  const std::string& filename) const
+  {
+    for( ; first!=last; ++first) {
+      if (fnmatch(first->first.c_str(), filename.c_str()))
+        return first;
+    }
+    return last;
+  }
+
+
 }} // end of namespace svndigest and namespace theplu
 

trunk/lib/SVNproperty.cc

@@ -40 +40 @@
     const Configuration& config = Configuration::instance();
     typedef std::map<std::string, std::string> str_map;
-    const str_map* props = config.svn_properties(file_name(path));
-    std::map<std::string, std::string>::const_iterator i;
-    std::map<std::string, std::string>::const_iterator e;
-    if (props) {
-      i = props->begin();
-      e = props->end();
-      // we can not use map::insert because we want config to have precedence
-      for ( ; i!=e; ++i)
-        property_[i->first] = i->second;
-    }
+    const str_map& props = config.svn_properties(file_name(path));
+    std::map<std::string, std::string>::const_iterator i = props.begin();
+    std::map<std::string, std::string>::const_iterator e = props.end();
+    // we can not use map::insert because we want config to have precedence
+    for ( ; i!=e; ++i)
+      property_[i->first] = i->second;
     
     i = property_.begin();

trunk/test/config_test.cc

@@ -29 +29 @@
   void test_codon(test::Suite&);
   void test_read_write(test::Suite&);
+  void test_props(test::Suite&);
 }} // end of namespace svndigest and theplu
 
@@ -39 +40 @@
   test_codon(suite);
   test_read_write(suite);
+  test_props(suite);
                                                                                 
   if (suite.ok()) {
@@ -54 +56 @@
   void test_codon(test::Suite& suite)
   {
+    suite.out() << "test codons" << std::endl;
     const Configuration& c(Configuration::instance());
     if (!c.codon("foo.h")){
@@ -69 +72 @@
   }
   
+  void test_props(test::Suite& suite)
+  {
+    suite.out() << "test props" << std::endl;
+    Configuration& conf(Configuration::instance());
+    std::stringstream ss;
+    ss << "[svn_props]\n"
+       << "foo* = svndigest:ignore\n"
+       << "bar* = svn:eol-style=native;svncopyright:ignore\n";
+    conf.load(ss);
+    const std::map<std::string, std::string>& props =
+      conf.svn_properties("foo_bla_bla");
+    if (props.find("svndigest:ignore")==props.end()) {
+        suite.out() << "property svndigest:ignore not set for foo_bla_bla\n";
+        suite.add(false);
+    }
+    const std::map<std::string, std::string>& props2 =
+      conf.svn_properties("bar_bla_bla");
+    std::map<std::string, std::string>::const_iterator it =
+      props2.find("svn:eol-style");
+    if (!suite.add(it != props2.end()))
+      suite.out() <<"expected property 'svn:eol-style' set for bar_bla_bla\n";
+    else if (!suite.add(it->second == "native"))
+      suite.out() << "expected 'svn:eol-style' set to 'native' "
+                  << "for bar_bla_bla\n";
+    // checking that we return empty map for files not mentioned in config
+    suite.out() << "props3" << std::endl;
+    const std::map<std::string, std::string>& props3 =
+      conf.svn_properties("nothing-nothing");
+    suite.add(props3.empty());
+  }
+
   void test_read_write(test::Suite& suite)
   {

trunk/yat/Makefile.am

@@ -36 +36 @@
 noinst_HEADERS += OptionHelp.h
 noinst_HEADERS += OptionSwitch.h
+noinst_HEADERS += split.h
 noinst_HEADERS += utility.h
 
@@ -46 +47 @@
 libyat_a_SOURCES += OptionHelp.cc
 libyat_a_SOURCES += OptionSwitch.cc
+libyat_a_SOURCES += split.cc