Changeset 123 for trunk/lib

Timestamp:

Jul 30, 2006, 12:42:54 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses ticket:23. Removed 'svn log' for revision-date extraction.

Location:

trunk/lib

Files:

• CommitStat.cc (deleted)
• CommitStat.h (deleted)
• Gnuplot.h (modified) (1 diff)
• GnuplotFE.h (modified) (3 diffs)
• Makefile.am (modified) (1 diff)
• SVN.cc (modified) (8 diffs)
• SVN.h (modified) (5 diffs)

trunk/lib/Gnuplot.h

@@ -49 +49 @@
   /// The Gnuplot class creates a pipe to 'gnuplot' and facilitates
   /// communication with the gnuplot binary.
+  ///
+  /// @see GnuplotFE
   ///
   class Gnuplot

trunk/lib/GnuplotFE.h

@@ -35 +35 @@
   ///
   /// The GnuplotFE class is a front end to the Gnuplot class. This is
-  /// a utility function needed to communicate plotting related
+  /// a utility class needed to communicate plotting related
   /// information between objects.
   ///
@@ -43 +43 @@
   ///
   /// @see Design Patterns (the singleton pattern).
+  /// @see Gnuplot
   ///
   class GnuplotFE : public Gnuplot
@@ -85 +86 @@
     ///
     inline void set_dates(const std::vector<std::string>& date,
-                          const std::string& format="%Y-%m-%d")
+                          const std::string& format="%Y-%m-%dT%H:%M:%SZ")
     { date_=date; date_input_format_=format; }
 

trunk/lib/Makefile.am

@@ -25 +25 @@
 noinst_LIBRARIES = libsvnstat.a
 
-noinst_HEADERS = CommitStat.h Directory.h File.h Gnuplot.h GnuplotFE.h  \
-  Node.h Parser.h rmdirhier.h Stats.h SVN.h utility.h
+noinst_HEADERS = Directory.h File.h Gnuplot.h GnuplotFE.h Node.h  \
+  Parser.h rmdirhier.h Stats.h SVN.h utility.h
 
-libsvnstat_a_SOURCES = CommitStat.cc Directory.cc File.cc Gnuplot.cc  \
-  GnuplotFE.cc Node.cc Parser.cc rmdirhier.cc Stats.cc SVN.cc utility.cc
+libsvnstat_a_SOURCES = Directory.cc File.cc Gnuplot.cc GnuplotFE.cc \
+  Node.cc Parser.cc rmdirhier.cc Stats.cc SVN.cc utility.cc
 
 INCLUDES = -I$(SVN_PATH)/include/subversion-1 -I$(APR_PATH)/include/apr-0

trunk/lib/SVN.cc

@@ -44 +44 @@
     // doing, most bits here are stolen from subversion source for the
     // svn command line binary (subverion/svn/main.c)
+
+    svn_error_t* err=NULL;
 
     // initialize something (APR subsystem and more). The APR
@@ -56 +58 @@
     if (apr_allocator_create(&allocator_))
       throw SVNException("SVN(void): apr_allocator_create failed");
-
     apr_allocator_max_free_set(allocator_,SVN_ALLOCATOR_RECOMMENDED_MAX_FREE);
     pool_ = svn_pool_create_ex(NULL, allocator_);
@@ -62 +63 @@
 
     // initialize the repository access library
-    svn_error_t* err = svn_ra_initialize(pool_);
-    if (err) {
+    if ((err=svn_ra_initialize(pool_))) {
       // destroys pool and clears err
       svn_cmdline_handle_exit_error(err, pool_, "svnstat: ");
@@ -74 +74 @@
     // command line option to change the location of the .subversion
     // stuff (compare with the svn binary).
-    err = svn_config_ensure(NULL, pool_);
-    if (err) {
+    if ((err=svn_config_ensure(NULL, pool_))) {
       // destroys pool and clears err
       svn_cmdline_handle_exit_error(err, pool_, "svnstat: ");
@@ -83 +82 @@
 
     // create a client context object
-    err = svn_client_create_context(&context_, pool_);
-    if (err) {
+    if ((err=svn_client_create_context(&context_, pool_))) {
       // destroys pool and clears err
       svn_cmdline_handle_exit_error(err, pool_, "svnstat: ");
@@ -91 +89 @@
     }
 
-    err = svn_config_get_config(&(context_->config), NULL, pool_);
-    if (err) {
+    if ((err=svn_config_get_config(&(context_->config), NULL, pool_))) {
       // destroys pool and clears err
       svn_cmdline_handle_exit_error(err, pool_, "svnstat: ");
@@ -121 +118 @@
 
 
+  std::vector<std::string> SVN::commit_dates(const std::string& path)
+  {
+    // Allocate space in pool_ for apr_path (here a string).
+    apr_array_header_t* apr_path=apr_array_make(pool_,1,4);
+    // Copy path to apr_path.
+    (*((const char **) apr_array_push(apr_path))) =
+      apr_pstrdup(pool_, svn_path_internal_style(path.c_str(),pool_));
+
+    // Setup to retrieve all commit logs.
+    svn_opt_revision_t peg, start, head;
+    peg.kind=svn_opt_revision_unspecified;
+    start.kind=svn_opt_revision_number;
+    start.value.number=0;
+    head.kind=svn_opt_revision_head;
+    svn_error_t* err=NULL;
+    // Retrieving the last revision is only needed for the reserve
+    // call below, not needed for the functionality here.
+    if ((err=svn_ra_get_latest_revnum(ra_session_,&(head.value.number),pool_))) {
+      svn_cmdline_handle_exit_error(err, pool_, "svnstat: ");
+      throw SVNException("commit_dates: svn_ra_get_latest_revnum failed");
+    }
+    // The struct we want to pass through to all log_message_receiver
+    // calls, here we only want to push all commit dates into a
+    // std::vector<std::string>.
+    struct log_receiver_baton lb;
+    lb.commit_dates.reserve(head.value.number+1); // revision 0 is also stored.
+    if ((err=svn_client_log3(apr_path, &peg, &start, &head, 0, false, true,
+                             log_message_receiver, static_cast<void*>(&lb),
+                             context_, pool_))) {
+      svn_cmdline_handle_exit_error(err, pool_, "svnstat: ");
+      throw SVNException("commit_dates: svn_client_log3 failed");
+    }
+    return lb.commit_dates;
+  }
+
+
+  svn_error_t *
+  SVN::info_receiver(void *baton, const char *, const svn_info_t *info,
+                     apr_pool_t *)
+  {
+    if (!info || !info->repos_root_URL)
+      throw SVNException("Failed to acquire repository root URL"); 
+    static_cast<struct info_receiver_baton*>(baton)->repos_root_url=
+      info->repos_root_URL;
+    return SVN_NO_ERROR;
+  }
+
+
+  svn_error_t *
+  SVN::log_message_receiver(void *baton, apr_hash_t *changed_paths,
+                            svn_revnum_t rev, const char *author,
+                            const char *date, const char *msg, apr_pool_t *pool)
+  {
+    struct log_receiver_baton *lb=static_cast<struct log_receiver_baton*>(baton);
+    if (date && date[0])
+      lb->commit_dates.push_back(date);
+    else
+      throw SVNException("No date defined for revision: " + rev); 
+    return SVN_NO_ERROR;
+  }
+
+
+  std::string SVN::repository(const std::string& path)
+  {
+    struct info_receiver_baton ib;
+    if (svn_client_info(path.c_str(), NULL, NULL, info_receiver,
+                        static_cast<void*>(&ib), false, context_, pool_))
+      throw SVNException("repository: svn_client_info failed");
+    return ib.repos_root_url;
+  }
+
+
+  void SVN::setup_ra_session(const std::string& path) {
+    // get a session to the repository
+    if (svn_client_open_ra_session(&ra_session_, path.c_str(), context_,pool_)) {
+      // Jari, should the error space be cleared?
+      throw SVNException("setup_ra_session: svn_client_open_ra_session failed");
+    }
+  }
+
+
   void SVN::setup_wc_adm_access(const std::string& path)
   {
@@ -128 +206 @@
     if (svn_wc_adm_open3(&adm_access_, NULL, canonical_path, false, -1,
                          context_->cancel_func,context_->cancel_baton, pool_))
-      // should the error space be cleared?
+      // Jari, should the error space be cleared?
       throw SVNException("setup_wc_adm_access: svn_wc_adm_open3 failed");
   }

trunk/lib/SVN.h

@@ -26 +26 @@
 
 #include <stdexcept>
+#include <string>
+#include <vector>
 
+// Jari, most of these can be replaced with forward declarations.
 #include <apr_allocator.h>
 #include <svn_client.h>
+#include <svn_ra.h>
 #include <svn_wc.h>
 
@@ -48 +52 @@
   /// SVN provides one single global access point to the underlying
   /// subversion API and makes sure that there is only one point of
-  /// access to the binary.
+  /// access for the binary.
   ///
   /// @see Design Patterns (the singleton pattern). Subversion API
@@ -68 +72 @@
 
     ///
+    /// @brief Get revision dates.
+    ///
+    /// Get dates for all commits to the repository. \a root can be a
+    /// repository path or a path within a working copy. In the latter
+    /// case the corresponding repository will be used to retrieve
+    /// commit dates.
+    ///
+    /// @return Revision dates in a vector where revision is
+    /// implicitly defined by vector index, i.e., element 56 in the
+    /// resulting vector implies revision 56.
+    ///
+    /// @note Currently revision 0 (repositoy creation) is not
+    /// supported.
+    ///
+    /// @throw Various error messages generated from the subversion
+    /// API.
+    ///
+    std::vector<std::string> commit_dates(const std::string& path);
+
+    ///
     /// @brief Get an instance of SVN.
     ///
-    /// @throw Throws a SVNException if one is received from the
-    /// underlying constructor call.
+    /// @throw Throws an SVNException if initialization fails in the
+    /// underlying subversion API calls.
     ///
     /// @todo Make sure that the underlying constructor performs
@@ -80 +104 @@
 
     ///
-    /// @throws SCNException if access setup fails.
+    /// @brief Determine the repository root URL for \a path.
+    ///
+    /// @throws SVNException if repository location cannot be
+    /// determined.
+    ///
+    /// @return The repository root URL.
+    ///
+    std::string repository(const std::string& path);
+
+    ///
+    /// @throws SVNException if session setup fails.
+    ///
+    void setup_ra_session(const std::string& path);
+
+    ///
+    /// @throws SVNException if access setup fails.
     ///
     void setup_wc_adm_access(const std::string& path);
@@ -111 +150 @@
     static SVN* instance_;
 
-    // subversion API stuff
+    // Subversion API stuff
+
+    // Info receiver
+    struct info_receiver_baton {
+      std::string repos_root_url;
+    };
+    static svn_error_t * info_receiver(void *baton, const char *path,
+                                       const svn_info_t *info, apr_pool_t *pool);
+
+    // Log message receiver
+    struct log_receiver_baton {
+      std::vector<std::string> commit_dates;
+    };
+    static svn_error_t *
+    log_message_receiver(void *baton, apr_hash_t *changed_paths,
+                         svn_revnum_t rev, const char *author, const char *date,
+                         const char *msg, apr_pool_t *pool);
+
     svn_wc_adm_access_t* adm_access_;
     apr_allocator_t* allocator_;
     svn_client_ctx_t* context_;
     apr_pool_t* pool_;
+    svn_ra_session_t* ra_session_;
   };