Changeset 1508

Timestamp:

Aug 31, 2012, 1:22:43 PM (11 years ago)

Author:

Peter Johansson

Message:

fixes #521. copy svncopyright cache files as well.

Location:

trunk

Files:

• lib/CacheCopyer.cc (modified) (4 diffs)
• lib/CacheCopyer.h (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)

trunk/lib/CacheCopyer.cc

@@ -32 +32 @@
 #include <string>
 
+#include <iostream>
+
 namespace theplu {
 namespace svndigest {
@@ -40 +42 @@
 
 
-  bool CacheCopyer::enter(Directory& dir) 
+  void
+  CacheCopyer::copy(const std::string& src, const std::string& trg_dir) const
+  {
+    if (!node_exist(src))
+      return;
+    if (access_rights(src, "r"))
+      throw yat::utility::errno_error("'" + src + "': ");
+    std::string target_file =
+      concatenate_path(trg_dir, file_name(src));
+
+    if (verbose_)
+      std::cout << src << " -> " << target_file << "\n";
+    copy_file(src, target_file);
+  }
+
+
+  bool CacheCopyer::enter(Directory& dir)
   {
     if (dir.svndigest_ignore() && dir.svncopyright_ignore())
@@ -52 +70 @@
     return true;
   }
-  
 
-  void CacheCopyer::leave(Directory& dir) 
+
+  void CacheCopyer::leave(Directory& dir)
   {
   }
-  
+
 
   void CacheCopyer::visit(File& file)
@@ -64 +82 @@
       return;
     std::string src_file = file.cache_name();
-    if (!node_exist(src_file))
-      return;
-    if (access_rights(src_file, "r"))
-      throw yat::utility::errno_error(src_file + ": ");
-    std::string target_file = 
-      concatenate_path(target_, directory_name(file.local_path()));
-    target_file = concatenate_path(target_file, 
-                                   ".svndigest/"+file_name(src_file));
-    if (verbose_)
-      std::cout << src_file << " -> " << target_file << "\n";
-    copy_file(src_file, target_file);
+
+    std::string target_dir =
+      concatenate_path(target_,
+                       directory_name(file.local_path())+"/.svndigest");
+
+    if (!file.svndigest_ignore())
+      copy(src_file, target_dir);
+
+    replace(src_file, "svndigest-cache", "svncopyright-cache");
+    if (!file.svncopyright_ignore())
+      copy(src_file, target_dir);
+
   }
 

trunk/lib/CacheCopyer.h

@@ -52 +52 @@
 
     /**
-       Updating copyright in \a file 
+       Updating copyright in \a file
      */
     void visit(File& file);
 
   private:
+    void copy(const std::string& src, const std::string& trg_dir) const;
+
     std::string target_;
     bool verbose_;

trunk/test/Makefile.am

@@ -64 +64 @@
 
 # tests not yet passing are listed here
-XFAIL_TESTS = svndigest_copy_cache_test2.sh
+XFAIL_TESTS =
 
 noinst_HEADERS = Suite.h