Changeset 91 for trunk

Timestamp:

Mar 23, 2006, 11:56:17 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Fixes #4, #19, #32, #34: Started to implement subversion API usage.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• bin/Makefile.am (modified) (1 diff)
• bin/svnstat.cc (modified) (3 diffs)
• lib/Directory.cc (modified) (5 diffs)
• lib/Directory.h (modified) (3 diffs)
• lib/Makefile.am (modified) (2 diffs)
• lib/Node.cc (modified) (1 diff)
• lib/Node.h (modified) (3 diffs)
• lib/SVN.cc (added)
• lib/SVN.h (added)

trunk/ChangeLog

@@ -22 +22 @@
 
 version 0.x:
+  - Using subversion API instead of system calls.
   - Added copyright statement to files.
   - Proper version information is displayed using --version option.

trunk/bin/Makefile.am

@@ -28 +28 @@
 noinst_HEADERS = Parameter.h rmdirhier.h
 
-LDADD = @top_srcdir@/lib/libsvnstat.a
+LDADD = @top_srcdir@/lib/libsvnstat.a -L/usr/local/apr/lib \
+  -lsvn_client-1 -lsvn_wc-1 -lsvn_ra-1 -lsvn_subr-1 -lapr-0
 
-INCLUDES = -I@top_srcdir@/lib
+INCLUDES = -I@top_srcdir@/lib -I/usr/local/include/subversion-1 -I/usr/local/apr/include/apr-0
+
+# Needed to compile svn API stuff
+svnstat_CXXFLAGS = -Wno-long-long
 
 clean-local: 

trunk/bin/svnstat.cc

@@ -23 +23 @@
 
 #include "Parameter.h"
+
 #include "CommitStat.h"
 #include "Directory.h"
 #include "GnuplotFE.h"
 #include "rmdirhier.h"
+#include "SVN.h"
 
 #include <stdexcept>
@@ -50 +52 @@
   Parameter option(argc,argv);
 
+  SVN* svn=SVN::instance();
+  try {
+    svn->setup_wc_adm_access(option.root());
+  }
+  catch (SVNException e) {
+    std::cerr << "\nsvtstat: " << e.what() << "\nsvnstat: " << option.root()
+              << " is not under subversion control\n" << std::endl;
+    exit(-1);
+  }
+
   if (createdir(option.targetdir(),option.force())) {
     std::cerr << "\nFailed to create target directory '" << option.targetdir()
@@ -63 +75 @@
     GnuplotFE::instance()->set_dates(cs.date());
   }
-  
-  string prefix("svnstat_");
-  Directory tree(option.root(),prefix);
-  tree.purge(option.verbose());
+
+  Directory tree(option.root(),"svnstat_");
   tree.parse(option.verbose());
 

trunk/lib/Directory.cc

@@ -25 +25 @@
 #include "File.h"
 #include "Node.h"
+#include "SVN.h"
 
 #include <algorithm>
@@ -40 +41 @@
 namespace svnstat{
 
+
   Directory::Directory(const std::string& path, const std::string& output)
     : Node(path,output)
@@ -45 +47 @@
     using namespace std;
     DIR* directory=opendir(path.c_str());    // C API from dirent.h
-    if (!directory) {
-      // Jari, throw exception
-      cerr << "ERROR: opendir() failed; terminating" << endl;
-      exit(1);
-    }
+    if (!directory)
+      throw NodeException("ERROR: opendir() failed; " + path +
+                          " is not a directory");
     list<string> entries;
     struct dirent* entry;
@@ -55 +55 @@
     while ((entry=readdir(directory)))       // C API from dirent.h
       entries.push_back(string(entry->d_name));
-    if (errno) {
-      // Jari, throw exception
-      cerr << "ERROR: readdir() failure; terminating" << endl;
-      exit(1);
-    }
+    if (errno)
+      throw NodeException("ERROR: readdir() failed on " + path);
     closedir(directory);
 
-    // Jari, change this to some STL algo?
+    SVN* svn=SVN::instance();
     for (list<string>::iterator i=entries.begin(); i!=entries.end(); i++)
       if ((*i)!=string(".") && (*i)!=string("..") && (*i)!=string(".svn")) {
         string fullpath(path_+'/'+(*i));
-        struct stat nodestat;                // C api from sys/stat.h
-        lstat(fullpath.c_str(),&nodestat);   // C api from sys/stat.h
-        if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
-          daughters_.push_back(new Directory(fullpath, output_name()+"_"));
-        else
-          daughters_.push_back(new File(fullpath,output_name()+"_"));
+        switch (svn->version_controlled(fullpath)) {
+        case SVN::uptodate:
+          struct stat nodestat;                // C api from sys/stat.h
+          lstat(fullpath.c_str(),&nodestat);   // C api from sys/stat.h
+          if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
+            daughters_.push_back(new Directory(fullpath, output_name()+"_"));
+          else
+            daughters_.push_back(new File(fullpath,output_name()+"_"));
+          break;
+        case SVN::unresolved:
+          throw NodeException(fullpath+" is not up to date");
+        case SVN::unversioned: ; // do nothing
+        }
       }
   }
@@ -122 +126 @@
   }
 
-  void Directory::purge(const bool verbose) 
-  {
-    if (verbose)
-      std::cout << "Purging " << path_ << std::endl;
-    for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); )
-      if (!((*i)->subversion_controlled())) {
-        delete *i;
-        i=daughters_.erase(i);
-      }
-      else {
-        (*i)->purge(verbose);
-        i++;
-      }
-  }
-
 }} // end of namespace svnstat and namespace theplu

trunk/lib/Directory.h

@@ -39 +39 @@
   {
   public:
+
     ///
     /// @brief Constructor
@@ -62 +63 @@
     void print(const bool verbose=false) const;
 
-    void purge(const bool verbose=false);
-
   private:
     ///
@@ -70 +69 @@
     Directory(const Directory&);
 
-    typedef std::list<Node*>::iterator NodeIterator;
-    typedef std::list<Node*>::const_iterator NodeConstIter_;
-    std::list<Node*> daughters_;
+    typedef std::list<Node*> NodeContainer;
+    typedef NodeContainer::iterator NodeIterator;
+    typedef NodeContainer::const_iterator NodeConstIterator;
+    NodeContainer daughters_;
   };
 

trunk/lib/Makefile.am

@@ -3 +3 @@
 ## $Id$
 
-# Copyright (C) 2005, 2006 Jari Häkkinen
+# Copyright (C) 2005 Jari Häkkinen
+# Copyright (C) 2006 Jari Häkkinen, Peter Johansson
 #
 # This file is part of svnstat, http://lev.thep.lu.se/trac/svnstat
@@ -25 +26 @@
 
 noinst_HEADERS = CommitStat.h Directory.h File.h Gnuplot.h GnuplotFE.h  \
-  Node.h Stats.h utility.h
+  Node.h Stats.h SVN.h utility.h
 
 libsvnstat_a_SOURCES = CommitStat.cc Directory.cc File.cc Gnuplot.cc  \
-  GnuplotFE.cc Node.cc Stats.cc utility.cc
+  GnuplotFE.cc Node.cc Stats.cc SVN.cc utility.cc
+
+INCLUDES = -I/usr/local/include/subversion-1 -I/usr/local/apr/include/apr-0
+
+# Needed to compile svn API stuff
+libsvnstat_a_CXXFLAGS = -Wno-long-long

trunk/lib/Node.cc

@@ -66 +66 @@
 
 
-  bool Node::subversion_controlled(void) const
-  {
-    std::string system_call = "svn proplist " + path_ + ">&/dev/null";
-    return !system(system_call.c_str());
-  }
-
 }} // end of namespace svnstat and namespace theplu

trunk/lib/Node.h

@@ -29 +29 @@
 #include <ostream>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 
 namespace theplu{
 namespace svnstat{
+
+  ///
+  /// If something goes wrong in the use of the Node or its derived
+  /// classes, a NodeException is thrown.
+  ///
+  struct NodeException : public std::runtime_error
+  { inline NodeException(const std::string& msg) : runtime_error(msg) {} };
 
   ///
@@ -40 +48 @@
   {
   public:
+
+    /// 
+    /// @brief Constructor 
+    /// 
+    //    Node(void) : path_("JARI_trixar"), stats_("JARI_trixar") { };
+
     /// 
     /// @brief Constructor 
@@ -73 +87 @@
     virtual const Stats& parse(const bool verbose=false)=0;
 
+    inline const std::string& path(void) const { return path_; }
+
     ///
     /// Function printing HTML in current working directory
     ///
     virtual void print(const bool verbose=false) const=0;
-
-    ///
-    ///
-    ///
-    inline virtual void purge(const bool verbose=false) 
-    { /* Nothing to be done */ };
-
-    ///
-    /// Check if the node is under subversion control. This is done by
-    /// checking the return status of 'svn proplist <Node>.
-    ///
-    /// @return True if subversion controlled, false otherwise.
-    ///
-    bool subversion_controlled(void) const;
 
   protected: