Changeset 1152 for trunk/lib/SVNproperty.cc

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.

File:

• trunk/lib/SVNproperty.cc (modified) (1 diff)

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();