Changeset 501

Timestamp:

Oct 19, 2007, 9:14:45 PM (14 years ago)

Author:

Peter Johansson

Message:

added function calling svn blame for specific revision. refs #24.

Location:

trunk/lib

Files:

• SVN.cc (modified) (1 diff)
• SVN.h (modified) (2 diffs)
• SVNblame.cc (modified) (1 diff)
• SVNblame.h (modified) (1 diff)

trunk/lib/SVN.cc

@@ -146 +146 @@
   svn_error_t* 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)
   {
+    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)
+  {
     // Setup to use all revisions
-    svn_opt_revision_t peg, start, head;
+    svn_opt_revision_t peg, start;
     peg.kind=svn_opt_revision_unspecified;
     start.kind=svn_opt_revision_number;
     start.value.number=0;
-    head.kind = ( svn_path_is_url(path.c_str()) ?
-                  svn_opt_revision_head : svn_opt_revision_base );
     apr_pool_t *subpool = svn_pool_create(pool_);
     svn_error_t* err=svn_client_blame3(path.c_str(), &peg, &start, &head,

trunk/lib/SVN.h

@@ -103 +103 @@
 
     /**
+       \brief Same as function above with the extension that revision
+       \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);
+
+    /**
        \brief Call the underlying svn_client_info for \a path with \a
        receiver and \a baton.
@@ -262 +270 @@
                       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);
+
     svn_wc_adm_access_t* adm_access_;
     apr_allocator_t* allocator_;

trunk/lib/SVNblame.cc

@@ -38 +38 @@
         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;
+    }
+    blame_info_iterator_ = blame_receiver_baton_.blame_info.begin();
+  }
+
+
+  SVNblame::SVNblame(const std::string& path, svn_revnum_t rev)
+    : binary_(false), 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

trunk/lib/SVNblame.h

@@ -54 +54 @@
     */
     explicit SVNblame(const std::string& path);
+
+    /**
+       @brief The contructor.
+
+       The constructor performs an 'svn blame -r rev' on \a path and
+       initializes the SVNblame object for statistics traversal using
+       SVNblame::next_line() and SVNblame::valid().
+    */
+    SVNblame(const std::string& path, svn_revnum_t rev);
 
     /**