Changeset 1218 for trunk/lib/SVN.cc

Timestamp:

Oct 10, 2010, 4:27:39 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #371. Remove variable binary_ in SVNblame, which was not
used. SVNblame will now fail if ued on binary file (but we don't call
blame on binary files). The SVN class now takes care of svn errors and
translate them into exceptions via the cleanup function.

File:

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

trunk/lib/SVN.cc

@@ -181 +181 @@
 
 
-  svn_error_t* SVN::client_blame(const std::string& path,
-                                 svn_client_blame_receiver_t receiver,
-                                 void *baton, svn_revnum_t rev)
+  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
@@ -216 +216 @@
                                        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;
   }
 
@@ -328 +327 @@
     if (info->repos_root_URL)
       rurb->path=info->repos_root_URL;
-
     return SVN_NO_ERROR;
   }