Ignore:
Timestamp:
Jul 25, 2010, 12:06:27 AM (11 years ago)
Author:
Peter Johansson
Message:

refs #326. Let SVNproperty retrieve info from config file

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/SVNproperty.cc

    r1137 r1144  
    2222
    2323#include "SVNproperty.h"
     24
     25#include "Configuration.h"
    2426#include "SVN.h"
     27#include "utility.h"
    2528
    2629#include <string>
     
    3437  {
    3538    SVN::instance()->client_proplist(path, property_);
    36     std::map<std::string, std::string>::const_iterator i = property_.begin();
    37     std::map<std::string, std::string>::const_iterator e = property_.end();
     39
     40    const Configuration& config = Configuration::instance();
     41    typedef std::map<std::string, std::string> str_map;
     42    const str_map* props = config.svn_properties(file_name(path));
     43    std::map<std::string, std::string>::const_iterator i;
     44    std::map<std::string, std::string>::const_iterator e;
     45    if (props) {
     46      i = props->begin();
     47      e = props->end();
     48      // we can not use map::insert because we want config to have precedence
     49      for ( ; i!=e; ++i)
     50        property_[i->first] = i->second;
     51    }
     52   
     53    i = property_.begin();
     54    e = property_.end();
    3855    for ( ; i!=e ; ++i)
    3956      if (i->first == "svndigest:ignore")
Note: See TracChangeset for help on using the changeset viewer.