Changeset 573 for branches

Timestamp:

Mar 18, 2008, 2:11:36 PM (15 years ago)

Author:

Peter Johansson

Message:

fixes #281

Location:

branches/0.6-stable

Files:

• bin/svndigest.cc (modified) (1 diff)
• lib/SVN.cc (modified) (3 diffs)
• lib/SVN.h (modified) (4 diffs)

branches/0.6-stable/bin/svndigest.cc

@@ -96 +96 @@
   }
   catch (SVNException e) {
-    std::cerr << "\nsvndigest: " << e.what()
-              << "\nsvndigest: failed to initilize subversion access for "
-              << option->root() << std::endl;
+    std::cerr << "svndigest: " << e.what() << "\n";
     exit(-1);
   }

branches/0.6-stable/lib/SVN.cc

@@ -98 +98 @@
     // setup, maybe this is unnecessary?
     const char* canonical_path=svn_path_internal_style(path.c_str(), pool_);
-    if (svn_error_t *err=svn_wc_adm_open3(&adm_access_, NULL, canonical_path,
-                                          false, -1, context_->cancel_func,
-                                          context_->cancel_baton, pool_))
+    if ((err=svn_wc_adm_open3(&adm_access_, NULL, canonical_path,
+                              false, -1, context_->cancel_func,
+                              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, "SVN: svn_wc_adm_open3 failed");
+    }
 
     // get a session to the repository
     struct root_url_receiver_baton rurb;
     client_info(path, root_url_receiver, static_cast<void*>(&rurb));
-    if (svn_error_t *err=svn_client_open_ra_session(&ra_session_,
-                                                    rurb.path.c_str(),
-                                                    context_, pool_))
+    if ((err=svn_client_open_ra_session(&ra_session_,
+                                        rurb.path.c_str(),
+                                        context_, pool_)))
       cleanup_failed_init(err, "SVN: svn_client_open_ra_session failed");
   }
@@ -125 +128 @@
 
   void SVN::cleanup(svn_error_t *err,apr_pool_t *pool,
-                    const std::string& message)
-  {
-    svn_handle_error2(err,stderr,false,"svndigest: ");
+                    std::string message, bool mute)
+  {
+    if (!mute)
+      svn_handle_error2(err,stderr,false,"svndigest: ");
     svn_error_clear(err);
     if (pool){
@@ -138 +142 @@
 
 
-  void SVN::cleanup_failed_init(svn_error_t *err, const std::string& message)
-  {
-    cleanup(err,pool_);
+  void SVN::cleanup_failed_init(svn_error_t *err, const std::string& message,
+                                bool mute)
+  {
+    cleanup(err,pool_, "", true);
     throw SVNException(message);
   }

branches/0.6-stable/lib/SVN.h

@@ -203 +203 @@
     ///
     SVN(const SVN&);
+    SVN& operator=(const SVN&);
 
     ///
@@ -214 +215 @@
        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.
+       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
@@ -223 +225 @@
     */
     void cleanup(svn_error_t *err, apr_pool_t *pool,
-                 const std::string& message=std::string());
+                 std::string message=std::string(), bool mute=false);
 
     /**
@@ -235 +237 @@
        @see SVNException
     */
-    void cleanup_failed_init(svn_error_t *err, const std::string& message);
+    void cleanup_failed_init(svn_error_t *err, const std::string& message,
+                             bool mute=false);
 
     static SVN* instance_;