Changeset 1357

Timestamp:

May 18, 2011, 2:13:45 AM (12 years ago)

Author:

Peter Johansson

Message:

avoid merging (copying) map from svn and map from config together but instead extract data directly from them.

Location:

trunk/lib

Files:

• SVNproperty.cc (modified) (1 diff)
• SVNproperty.h (modified) (1 diff)

trunk/lib/SVNproperty.cc

@@ -40 +40 @@
     str_map property;
     SVN::instance()->client_proplist(path, property);
+    add(property.begin(), property.end());
+    const Configuration& config = Configuration::instance();
+    const str_map& props = config.svn_properties(file_name(path));
+    add(props.begin(), props.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 = 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();
-    e = property.end();
-    for ( ; i!=e ; ++i)
+
+  void 
+  SVNproperty::add(std::map<std::string, std::string>::const_iterator i,
+                   std::map<std::string, std::string>::const_iterator last)
+  {
+    for ( ; i!=last ; ++i)
       if (i->first == "svndigest:ignore")
         svndigest_ignore_=true;

trunk/lib/SVNproperty.h

@@ -87 +87 @@
     SVNproperty(const SVNproperty&);
 
+    void add(std::map<std::string, std::string>::const_iterator first,
+             std::map<std::string, std::string>::const_iterator last);
+
     bool binary_;
     bool svncopyright_ignore_;