Changeset 1239 for trunk/lib/File.cc

Timestamp:

Oct 24, 2010, 1:57:56 AM (12 years ago)

Author:

Peter Johansson

Message:

move 'update copyright' code from File class to CopyrightVisitor? class.

File:

• trunk/lib/File.cc (modified) (3 diffs)

trunk/lib/File.cc

@@ -65 +65 @@
   {
     return "blame_output/" + local_path() + ".html";
-  }
-
-
-  std::map<int, std::set<Alias> >
-  File::copyright_map(std::map<std::string, Alias>& alias,
-                      const std::map<int, svn_revnum_t>& year2rev) const
-  {
-    using namespace std;
-    map<int, set<Alias> > year_authors;
-    const Stats& stats = stats_["add"];
-
-    // loop over all years
-    for (std::map<int, svn_revnum_t>::const_iterator rev_iter=year2rev.begin();
-         rev_iter!=year2rev.end(); ++rev_iter) {
-
-      svn_revnum_t last_rev_this_year = rev_iter->second;
-      svn_revnum_t last_rev_last_year = 0;
-      if (rev_iter != year2rev.begin()) {
-        last_rev_last_year = (--rev_iter)->second;
-        ++rev_iter;
-      }
-      // do not go beyond BASE rev of file
-      last_rev_this_year = std::min(last_rev_this_year, last_changed_rev());
-      last_rev_last_year = std::min(last_rev_last_year, last_changed_rev());
-      // loop over authors
-      for (std::set<std::string>::const_iterator a_iter=stats.authors().begin();
-           a_iter!=stats.authors().end(); ++a_iter) {
-
-        // check if anything has been added since last year
-        if ( (stats(LineTypeParser::code, *a_iter, last_rev_this_year) >
-              stats(LineTypeParser::code, *a_iter, last_rev_last_year)) || 
-             (stats(LineTypeParser::comment, *a_iter, last_rev_this_year) >
-              stats(LineTypeParser::comment, *a_iter, last_rev_last_year)) ) {
-        
-        
-          // find username in map of aliases
-          std::map<string,Alias>::iterator name(alias.lower_bound(*a_iter));
-          
-          // if alias exist insert alias
-          if (name != alias.end() && name->first==*a_iter)
-            year_authors[rev_iter->first].insert(name->second);
-          else {
-            // else insert user name
-            Alias a(*a_iter,alias.size());
-            year_authors[rev_iter->first].insert(a);
-            std::cerr << "svncopyright: warning: no copyright alias found for `" 
-                      << *a_iter << "'\n";
-            // insert alias to avoid multiple warnings.
-            alias.insert(name, std::make_pair(*a_iter, a));
-          }
-        }
-      }
-    }
-    return year_authors;
-  }
-
-
-  std::string 
-  File::copyright_block(const std::map<int, std::set<Alias> >& year_authors,
-                        const std::string& prefix) const
-  {
-    using namespace std;
-    stringstream ss;
-    for (map<int, set<Alias> >::const_iterator i(year_authors.begin());
-         i!=year_authors.end();) {
-      ss << prefix << Configuration::instance().copyright_string() << " "
-         << 1900+i->first;
-      map<int, set<Alias> >::const_iterator j = i;
-      assert(i!=year_authors.end());
-      while (++j!=year_authors.end() && 
-             i->second == j->second){
-        ss << ", " << 1900+(j->first);
-      }
-      // printing authors
-      std::vector<Alias> vec_alias;
-      back_insert_iterator<std::vector<Alias> > ii(vec_alias);
-      std::copy(i->second.begin(), i->second.end(), ii);
-      // sort with respect to id
-      std::sort(vec_alias.begin(), vec_alias.end(), IdCompare());
-      for (std::vector<Alias>::iterator a=vec_alias.begin();
-           a!=vec_alias.end(); ++a){
-        if (a!=vec_alias.begin())
-          ss << ",";
-        ss << " " << a->name();
-      }
-      ss << "\n";
-      i = j;
-    }
-    return ss.str();
-  }
-
-  bool File::detect_copyright(std::string& block, size_t& start_at_line,
-                              size_t& end_at_line, std::string& prefix) const
-  {
-    using namespace std;
-    LineTypeParser parser(path());
-    std::ifstream is(path().c_str());
-    std::string line;
-    while (std::getline(is, line)) 
-      parser.parse(line);
-    if (!parser.copyright_found())
-      return false;
-    block = parser.block();
-    start_at_line = parser.start_line();
-    end_at_line = parser.end_line();
-    prefix = parser.prefix();
-    return true;
   }
 
@@ -324 +217 @@
 
 
-  void File::print_copyright(std::map<std::string, Alias>& alias, 
-                             bool verbose,
-                             const std::map<int,svn_revnum_t>& y2rev) const 
-  {
-    if (ignore() || svncopyright_ignore())
-      return;
-
-    std::string old_block;
-    size_t start_line=0;
-    size_t end_line=0;
-    std::string prefix;
-    if (!detect_copyright(old_block, start_line, end_line, prefix)){
-      if (Configuration::instance().missing_copyright_warning())
-        std::cerr << "svncopyright: warning: no copyright statement found in `" 
-                  << path_ << "'\n";
-      return;
-    }
-    std::map<int, std::set<Alias> > map=copyright_map(alias, y2rev);
-    std::string new_block = copyright_block(map, prefix);
-    if (old_block==new_block)
-      return;
-    if (verbose)
-      std::cout << "Updating copyright in '" << path_ << "'" << std::endl; 
-    update_copyright(new_block, start_line, end_line);
-  }
-
-
   void File::print_core(const bool verbose) const 
   {
@@ -411 +277 @@
   }
 
-
-  void File::update_copyright(const std::string& new_block,
-                              size_t start_at_line, size_t end_at_line) const
-  {
-    // embrace filename with brackets #filename#
-    std::string tmpname = concatenate_path(directory_name(path()),
-                                           "#" + file_name(path()) + "#");
-    std::ofstream tmp(tmpname.c_str());
-    assert(tmp);
-    using namespace std;
-    ifstream is(path().c_str());
-    assert(is.good());
-    string line;
-    // Copy lines before block
-    for (size_t i=1; i<start_at_line; ++i){
-      assert(is.good());
-      getline(is, line);
-      tmp << line << "\n";
-    }
-    // Printing copyright statement
-    tmp << new_block;
-    // Ignore old block lines
-    for (size_t i=start_at_line; i<end_at_line; ++i){
-      assert(is.good());
-      getline(is, line);
-    }
-    // Copy lines after block
-    while(is.good()) {
-      char ch=is.get();
-      if (is.good())
-        tmp.put(ch);
-    }
-
-    is.close();
-    tmp.close();
-    
-    // finally rename file 
-    rename(tmpname, path());
-  }
-
-
 }} // end of namespace svndigest and namespace theplu