Changeset 1144

Timestamp:

Jul 25, 2010, 12:06:27 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #326. Let SVNproperty retrieve info from config file

Location:

trunk/lib

Files:

• Configuration.cc (modified) (1 diff)
• Configuration.h (modified) (2 diffs)
• SVNproperty.cc (modified) (2 diffs)

trunk/lib/Configuration.cc

@@ -522 +522 @@
 
 
+  const std::map<std::string, std::string>*
+  Configuration::svn_properties(const std::string&) const
+  {
+    return NULL;
+  }
+
+
   std::string Configuration::trac_root(void) const
   {

trunk/lib/Configuration.h

@@ -113 +113 @@
      */
     bool output_file(void) const;
+
+    /**
+       svn properties set in config file
+
+       This is supposed to be used only in SVNproperty class
+
+       \return NULL if there is no prop for \a filename in config
+     */
+    const std::map<std::string, std::string>* 
+    svn_properties(const std::string& filename) const;
 
     ///
@@ -179 +189 @@
     bool output_file_;
     std::string trac_root_;
+
+    std::vector<std::map<std::string, std::string> > svn_props_;
   };
 

trunk/lib/SVNproperty.cc

@@ -22 +22 @@
 
 #include "SVNproperty.h"
+
+#include "Configuration.h"
 #include "SVN.h"
+#include "utility.h"
 
 #include <string>
@@ -34 +37 @@
   {
     SVN::instance()->client_proplist(path, property_);
-    std::map<std::string, std::string>::const_iterator i = property_.begin();
-    std::map<std::string, std::string>::const_iterator e = property_.end();
+
+    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;
+    }
+    
+    i = property_.begin();
+    e = property_.end();
     for ( ; i!=e ; ++i)
       if (i->first == "svndigest:ignore")