Changeset 1222

Timestamp:

Oct 17, 2010, 5:51:36 PM (13 years ago)

Author:

Peter Johansson

Message:

merge trunk changes to visitor branch

Location:

branches/visitor

Files:

• . (modified) (1 prop)
• bin/Parameter.cc (modified) (5 diffs)
• bin/svndigestParameter.cc (modified) (3 diffs)
• lib/File.cc (modified) (2 diffs)
• lib/Node.cc (modified) (1 diff)
• lib/SVN.cc (modified) (6 diffs)
• lib/SVN.h (modified) (6 diffs)
• lib/SVNblame.cc (modified) (3 diffs)
• lib/SVNblame.h (modified) (2 diffs)
• lib/rmdirhier.cc (modified) (3 diffs)
• m4/apache_LICENSE-2.0.txt (modified) (1 prop)
• m4/ax_cxx_check_flag.m4 (modified) (1 prop)
• m4/ax_cxxcpp_check_flag.m4 (modified) (1 prop)
• m4/ax_ld_check_flag.m4 (modified) (1 prop)
• m4/find_apr.m4 (modified) (1 prop)
• m4/pkg.m4 (modified) (1 prop)
• m4/version.m4 (modified) (1 prop)
• m4/yat_add_flag.m4 (modified) (1 prop)
• test/Makefile.am (modified) (1 diff)
• test/cmd_format_test.sh (modified) (1 diff)
• test/config2_test.sh (modified) (1 diff)
• test/config3_test.sh (modified) (1 diff)
• test/error_test.sh (copied) (copied from trunk/test/error_test.sh)
• test/init.sh.in (modified) (1 diff)
• test/svncopyright_test.sh (modified) (1 diff)

branches/visitor/bin/Parameter.cc

@@ -97 +97 @@
       check_existence(root_.value());
       check_readable(root_.value());
+      check_is_dir(root_.value());
       chdir(root_.value());
       root_.value(pwd());
@@ -116 +117 @@
       if (S_ISDIR(nodestat.st_mode)) {
         std::stringstream ss;
-        ss << cmd_.program_name() << ": `" << config_file_.value() 
+        ss << cmd_.program_name() << ": '" << config_file_.value() 
            << "' is a directory";
         throw yat::utility::cmd_error(ss.str());
@@ -130 +131 @@
       return;
     std::stringstream ss;
-    ss << cmd_.program_name() << ": cannot stat `" << path << "': " 
+    ss << cmd_.program_name() << ": cannot stat '" << path << "': " 
        << strerror(errno);
     throw yat::utility::cmd_error(ss.str());
@@ -136 +137 @@
 
   
+  void Parameter::check_is_dir(std::string path) const
+  {
+    if (node_exist(path)) {
+      struct stat buf;
+      stat(path.c_str(), &buf);
+      if (S_ISDIR(buf.st_mode))
+        return;
+    }
+    std::stringstream ss;
+    ss << cmd_.program_name() << ": '" << path << "': " 
+       << strerror(errno);
+    throw yat::utility::cmd_error(ss.str());
+  }
+
+  
   void Parameter::check_readable(std::string path) const
   {
@@ -141 +157 @@
       return;
     std::stringstream ss;
-    ss << cmd_.program_name() << ": cannot open `" << path << "': " 
+    ss << cmd_.program_name() << ": cannot open '" << path << "': " 
        << strerror(errno);
     throw yat::utility::cmd_error(ss.str());

branches/visitor/bin/svndigestParameter.cc

@@ -85 +85 @@
     std::string save_wd = pwd();
 
-    // check root but not if -g option given
     if (!generate_config()) {
       // check target (only if we write report)
@@ -91 +90 @@
         check_existence(target_.value());
         check_readable(target_.value());
+        check_is_dir(target_.value());
         std::string base_root = file_name(root());
         std::string path = concatenate_path(target_.value(),base_root); 
         if (access_rights(target_.value(), "w")) {
           std::stringstream ss;
-          ss << "svndigest: cannot create directory `" << path 
+          ss << "svndigest: cannot create directory '" << path 
              << "': " << strerror(errno);
           throw yat::utility::cmd_error(ss.str());
@@ -101 +101 @@
         if (node_exist(path) && !force()) {
           std::stringstream ss;
-          ss << "svndigest: cannot create directory `" << path << "' "
+          ss << "svndigest: cannot create directory '" << path << "' "
              << strerror(EEXIST);
           throw yat::utility::cmd_error(ss.str());

branches/visitor/lib/File.cc

@@ -205 +205 @@
   {
     if (verbose)
-      std::cout << "Parsing " << path_ << std::endl; 
+      std::cout << "Parsing '" << path_ << "'" << std::endl; 
     stats_.reset();
     std::string cache_dir = directory_name(path()) + std::string(".svndigest/"); 
@@ -343 +343 @@
       return;
     if (verbose)
-      std::cout << "Updating copyright in " << path_ << std::endl; 
+      std::cout << "Updating copyright in '" << path_ << "'" << std::endl; 
     update_copyright(new_block, start_line, end_line);
   }

branches/visitor/lib/Node.cc

@@ -203 +203 @@
       return;
     if (verbose)
-      std::cout << "Printing output for " << path_ << std::endl;
+      std::cout << "Printing output for '" << path_ << "'" << std::endl;
     const SVNlog& log = this->log();
     typedef std::map<std::string, Stats*>::const_iterator iter;

branches/visitor/lib/SVN.cc

@@ -38 +38 @@
 #include <subversion-1/svn_subst.h>
 
+#include <string>
+
 namespace theplu {
 namespace svndigest {
+
+
+  SVNException::SVNException(const std::string& msg, svn_error_t* error)
+    : std::runtime_error(""), error_(error), msg_(msg) 
+  {
+    ref_count_ = new int(1);
+    if (error_) {
+      apr_size_t bufsize=255;
+      char buf[255];
+      msg_ = svn_err_best_message(error_, buf, bufsize);
+    }
+    if (msg.size()) {
+      msg_ += msg;
+    }
+  }
+
+  SVNException::SVNException(const SVNException& other)
+    : std::runtime_error(other), error_(other.error_), msg_(other.msg_),
+      ref_count_(other.ref_count_)
+  {
+    ++(*ref_count_);
+  }
+
+
+  SVNException::~SVNException(void) throw() 
+  {
+    --(*ref_count_);
+    if (!(*ref_count_)) {
+      delete ref_count_;
+      ref_count_=NULL;
+      svn_error_clear(error_);
+      error_=SVN_NO_ERROR;
+    }
+  }
+
+
+  const char* SVNException::what(void) const throw()
+  {
+    return msg_.c_str();
+  }
+
+
+  const svn_error_t* SVNException::error(void) const
+  {
+    return error_;
+  }
 
 
@@ -100 +148 @@
                               context_->cancel_baton, pool_))){
       if (err->apr_err == SVN_ERR_WC_NOT_DIRECTORY)
-        cleanup_failed_init(err, std::string(err->message), true);
+        cleanup_failed_init(err, std::string(err->message));
       cleanup_failed_init(err, "SVN: svn_wc_adm_open3 failed");
     }
@@ -128 +176 @@
                     std::string message, bool mute)
   {
-    if (!mute)
-      svn_handle_error2(err,stderr,false,"svndigest: ");
     svn_error_clear(err);
     if (pool){
@@ -135 +181 @@
       pool=NULL;
     }
-    if (message.length()>0)
-      throw SVNException(message);
-  }
-
-
-  void SVN::cleanup_failed_init(svn_error_t *err, const std::string& message,
-                                bool mute)
-  {
-    cleanup(err,pool_, "", true);
+    assert(message.size()); // compatible with r1213
+    if (!mute)
+      throw SVNException(message, err);
+    // mute implies we don't wanna hear the message from svn_error_t
     throw SVNException(message);
   }
 
 
-  svn_error_t* SVN::client_blame(const std::string& path,
-                                 svn_client_blame_receiver_t receiver,
-                                 void *baton, svn_revnum_t rev)
+  void SVN::cleanup_failed_init(svn_error_t *err, const std::string& message)
+  {
+    assert(message.size()); // compatible with r1213
+    cleanup(err,pool_, message, true);
+    assert(false && "cleanup should throw");
+  }
+
+
+  void SVN::client_blame(const std::string& path,
+                         svn_client_blame_receiver_t receiver,
+                         void *baton, svn_revnum_t rev)
   {
     svn_opt_revision_t head;
     head.kind=svn_opt_revision_number;
     head.value.number=rev;
-    return client_blame_call(path, receiver, baton, head);
-  }
-
-  svn_error_t* SVN::client_blame(const std::string& path,
-                                 svn_client_blame_receiver_t receiver,
-                                 void *baton)
+    client_blame_call(path, receiver, baton, head);
+  }
+
+  void SVN::client_blame(const std::string& path,
+                         svn_client_blame_receiver_t receiver,
+                         void *baton)
   {
     svn_opt_revision_t head;
     head.kind = ( svn_path_is_url(path.c_str()) ?
                   svn_opt_revision_head : svn_opt_revision_base );
-    return client_blame_call(path, receiver, baton, head);
-  }
-
-
-  svn_error_t* SVN::client_blame_call(const std::string& path,
-                                      svn_client_blame_receiver_t receiver,
-                                      void *baton, svn_opt_revision_t& head)
+    client_blame_call(path, receiver, baton, head);
+  }
+
+
+  void SVN::client_blame_call(const std::string& path,
+                              svn_client_blame_receiver_t receiver,
+                              void *baton, svn_opt_revision_t& head)
   {
     // Setup to use all revisions
@@ -183 +232 @@
                                        false, receiver, baton, context_,
                                        subpool);
-    if (err && err->apr_err!=SVN_ERR_CLIENT_IS_BINARY_FILE)
+    if (err)
       // cleanup will throw an exception
       cleanup(err, subpool, "SVN::client_blame: svn_client_blame3 failed");
     svn_pool_destroy(subpool);
-    return err;
   }
 
@@ -295 +343 @@
     if (info->repos_root_URL)
       rurb->path=info->repos_root_URL;
-
     return SVN_NO_ERROR;
   }

branches/visitor/lib/SVN.h

@@ -50 +50 @@
   ///
   struct SVNException : public std::runtime_error
-  { inline SVNException(const std::string& msg) : runtime_error(msg) {} };
+  { 
+    SVNException(const std::string& msg, svn_error_t* error=NULL);
+
+    /**
+       Copy constructor
+     */
+    SVNException(const SVNException& other);
+
+    /**
+       Destructor
+     */
+    virtual ~SVNException(void) throw();
+
+    /**
+       override base implementation
+     */
+    const char* what(void) const throw();
+
+    /**
+       access svn_error_t
+     */
+    const svn_error_t* error(void) const;
+  private:
+    svn_error_t* error_;
+    std::string msg_;
+    int* ref_count_;
+
+    // assignment not allowed
+    SVNException& operator=(const SVNException&);
+  };
 
   /**
@@ -96 +125 @@
 
        \a path can be either a URL or an WC target.
-
-       \return SVN_NO_ERROR or SVN_ERR_CLIENT_IS_BINARY_FILE, the
-       latter can be used to trigger on binary files. Note that errors
-       return from underlying subversion API must be cleared by the
-       receiver.
-
-       \see Subversion API (svn_error_clear).
-    */
-    svn_error_t * client_blame(const std::string& path,
-                               svn_client_blame_receiver_t receiver,
-                               void *baton);
+    */
+    void client_blame(const std::string& path,
+                      svn_client_blame_receiver_t receiver,
+                      void *baton);
 
     /**
@@ -112 +134 @@
        \a rev can be set.
      */
-    svn_error_t * client_blame(const std::string& path,
-                               svn_client_blame_receiver_t receiver,
-                               void *baton, svn_revnum_t rev);
+    void client_blame(const std::string& path,
+                      svn_client_blame_receiver_t receiver,
+                      void *baton, svn_revnum_t rev);
 
     /**
@@ -227 +249 @@
        @brief Free resources when svn API calls fail.
 
-       This function will write an error message to stdout, free \a
-       err and \a pool resources. If \a err or \a pool are a NULL
-       pointers the function will do nothing with these resources. If
-       \a mute is true, no error message is written.
-
-       cleanup will throw a SVNException if \a message has
-       length>0. The default bahaviour is to free resources and return
-       normally.
+       This function will free \a pool resources and throw an
+       exception holding the \a message. If mute is false, the thrown
+       exception also contains \a err.
+
+       \throw cleanup will throw a SVNException
 
        @see SVNException
@@ -251 +270 @@
        @see SVNException
     */
-    void cleanup_failed_init(svn_error_t *err, const std::string& message,
-                             bool mute=false);
+    void cleanup_failed_init(svn_error_t *err, const std::string& message);
 
     static SVN* instance_;
@@ -276 +294 @@
     */
     static svn_error_t*
-    root_url_receiver(void *baton, const char *path, const svn_info_t *info,
-                      apr_pool_t *pool);
-
-    svn_error_t* client_blame_call(const std::string& path,
-                                   svn_client_blame_receiver_t receiver,
-                                   void *baton, svn_opt_revision_t& head);
+    root_url_receiver(void *baton, const char *path, 
+                      const svn_info_t *info, apr_pool_t *pool);
+
+    void client_blame_call(const std::string& path,
+                           svn_client_blame_receiver_t receiver,
+                           void *baton, svn_opt_revision_t& head);
 
     svn_wc_adm_access_t* adm_access_;

branches/visitor/lib/SVNblame.cc

@@ -31 +31 @@
 
   SVNblame::SVNblame(const std::string& path)
-    : binary_(false), instance_(SVN::instance())
+    : instance_(SVN::instance())
   {
-    if (svn_error_t* err=
-        instance_->client_blame(path.c_str(), blame_receiver,
-                                static_cast<void*>(&blame_receiver_baton_))) {
-      // SVN_ERR_CLIENT_IS_BINARY_FILE is the only error allowed to
-      // escape the client_blame call
-      svn_error_clear(err);
-      binary_=true;
-    }
+    instance_->client_blame(path.c_str(), blame_receiver,
+                            static_cast<void*>(&blame_receiver_baton_));
     blame_info_iterator_ = blame_receiver_baton_.blame_info.begin();
   }
@@ -46 +40 @@
 
   SVNblame::SVNblame(const std::string& path, svn_revnum_t rev)
-    : binary_(false), instance_(SVN::instance())
+    : instance_(SVN::instance())
   {
-    if (svn_error_t* err=
-        instance_->client_blame(path.c_str(), blame_receiver,
-                                static_cast<void*>(&blame_receiver_baton_),
-                                rev)) {
-      // SVN_ERR_CLIENT_IS_BINARY_FILE is the only error allowed to
-      // escape the client_blame call
-      svn_error_clear(err);
-      binary_=true;
-    }
+    instance_->client_blame(path.c_str(), blame_receiver,
+                            static_cast<void*>(&blame_receiver_baton_),
+                            rev);
     blame_info_iterator_ = blame_receiver_baton_.blame_info.begin();
   }
@@ -75 +63 @@
   {
     return (*blame_info_iterator_)->author;
-  }
-
-
-  bool SVNblame::binary(void)
-  {
-    return binary_;
   }
 

branches/visitor/lib/SVNblame.h

@@ -76 +76 @@
     */
     std::string author(void);
-
-    /**
-       Returns true if item is binary false otherwise
-
-       Binary files are invalid for 'svn blame'.
-    */
-    bool binary(void);
 
     /**
@@ -164 +157 @@
     };
 
-    // binary_ is true if item in any revision has been binary.
-    bool binary_;
     // blame_info_iterator_ is used in statistics analysis to traverse
     // blame_receiver_baton.blame_info vector through calls to next().

branches/visitor/lib/rmdirhier.cc

@@ -25 +25 @@
 #include "utility.h"
 
+#include <cstdio>
 #include <cstring>
 #include <dirent.h>
@@ -75 +76 @@
       // Make sure file is removable before removing it
       chmod(dir.c_str(),S_IWRITE);
-      if (unlink(dir.c_str()))
+      if (remove(dir.c_str()))
         throw FileDeleteError(concatenate_path(pwd(),dir));
       return;
@@ -97 +98 @@
     // Remove the directory from its parent
     chdir("..");
-    if (rmdir(dir.c_str()))
+    if (remove(dir.c_str()))
       throw DirectoryDeleteError(concatenate_path(pwd(),dir));
   }

branches/visitor/test/Makefile.am

@@ -39 +39 @@
 distributed_TESTS += config3_test.sh
 distributed_TESTS += copyright2_test.sh
+distributed_TESTS += error_test.sh
 distributed_TESTS += repo_status_test.sh
 distributed_TESTS += repo_test.sh

branches/visitor/test/cmd_format_test.sh

@@ -27 +27 @@
 SVNDIGEST_run 1 -f --format=banana
 test -s stderr || exit_fail
-grep 'invalid argument.*banana.*format' stderr || exit_fail
+$GREP 'invalid argument.*banana.*format' stderr || exit_fail
 
 SVNDIGEST_run 0 -g --format=svg --anchor-format=svg
-grep 'format = svg' stdout || exit_fail
-grep 'anchor_format = svg' stdout || exit_fail
+$GREP 'format = svg' stdout || exit_fail
+$GREP 'anchor_format = svg' stdout || exit_fail
 
 exit_success;

branches/visitor/test/config2_test.sh

@@ -36 +36 @@
 
 SVNDIGEST_run 1 -g --config-file tmp_config
-grep 'unknown format.* apple' stderr || exit_fail
+$GREP 'unknown format.* apple' stderr || exit_fail
 
 exit_success

branches/visitor/test/config3_test.sh

@@ -28 +28 @@
 SVNDIGEST_run 0 -g --config-file /dev/null
 SVNDIGEST_run 1 -g --config-file .
-grep 'is a directory' stderr || exit_fail
+$GREP 'is a directory' stderr || exit_fail
 
 exit_success

branches/visitor/test/init.sh.in

@@ -54 +54 @@
 test -z "$srcdir" && srcdir="@srcdir@";
 test -z "$SVN" && SVN=svn;
+test -z "$GREP" && GREP=@GREP@;
 
 # some helpful derived variables

branches/visitor/test/svncopyright_test.sh

@@ -31 +31 @@
 done
 
-$SVNCOPYRIGHT --version | head -n 1 | grep svncopyright || exit_fail
+$SVNCOPYRIGHT --version | head -n 1 | $GREP svncopyright || exit_fail
 
 exit_success