Changeset 646 for branches/replacing_gnuplot/bin

Timestamp:

Jun 4, 2008, 12:05:22 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Merged trunk changes r608:645 to replacing_gnuplot branch.

Location:

branches/replacing_gnuplot/bin

Files:

• Makefile.am (modified) (1 diff)
• Parameter.cc (modified) (9 diffs)
• Parameter.h (modified) (2 diffs)
• svndigest.cc (modified) (1 diff)

branches/replacing_gnuplot/bin/Makefile.am

@@ -30 +30 @@
 noinst_HEADERS = Parameter.h
 
-LDADD = $(STATICFLAG) @top_builddir@/lib/libsvndigest.la
+LDADD = @top_builddir@/lib/libsvndigest.la $(SVNDIGEST_LIBS)
+AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
 
-AM_CPPFLAGS = -I@top_srcdir@/lib
+AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
+AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
+
 
 # install versioned binary (excluding patch version)

branches/replacing_gnuplot/bin/Parameter.cc

@@ -42 +42 @@
 
   Parameter::Parameter( int argc, char *argv[])
-  {
-    defaults();
+    : config_file_(""), copyright_(false), force_(false), 
+      generate_config_(false), ignore_cache_(false), report_(true),
+      revisions_(false), root_("."), root_node_("."), targetdir_("."), 
+      verbose_(false)
+  {
     for (int i=1; i<argc; ++i) {
-      bool ok=false;
       std::stringstream ss(argv[i]);
       std::string myargv("");
@@ -54 +56 @@
       if (myargv=="--config-file"){
         if (value.size()) {
-          config_file_= value;
-          ok=true;
+          config_file_.value()= value;
         }
         else if (++i<argc){
-          config_file_= std::string(argv[i]);
-          ok=true;
+          config_file_.value()= std::string(argv[i]);
+        }
+        else {
+          missing_argument(myargv);
         }
       }
       else if (myargv=="--copyright"){
-          copyright_=true;
-          ok=true;
+          copyright_.value()=true;
       }
       else if (myargv=="-f" || myargv=="--force"){
-          force_=true;
-          ok=true;
+          force_.value()=true;
       }
       else if (myargv=="-g" || myargv=="--generate-config"){
-          generate_config_=true;
-          ok=true;
+          generate_config_.value()=true;
       }
       else if (myargv=="-h" || myargv=="--help"){
@@ -79 +79 @@
       }
       else if (myargv=="--ignore-cache"){
-          ignore_cache_=true;
-          ok=true;
+          ignore_cache_.value()=true;
       }
       else if (myargv=="-r" || myargv=="--root"){
         if (value.size()) {
-          root_= value;
-          ok=true;
+          root_.value()= value;
         }
         else if (++i<argc){
-          root_= std::string(argv[i]);
-          ok=true;
+          root_.value()= std::string(argv[i]);
+        }
+        else {
+          missing_argument(myargv);
         }
       }
       else if (myargv=="--report") {
-          report_=true;
-          ok=true;
+          report_.value()=true;
       }
       else if (myargv=="--no-report") {
-          report_=false;
-          ok=true;
+          report_.value()=false;
       }
       else if (myargv=="--revisions") {
-          revisions_=true;
-          ok=true;
+          revisions_.value()=true;
       }
       else if (myargv=="-t" || myargv=="--target"){
         if (value.size()) {
-          targetdir_= value;
-          ok=true;
+          targetdir_.value()= value;
         }
         else if (++i<argc){
-          targetdir_= std::string(argv[i]);
-          ok=true;
+          targetdir_.value()= std::string(argv[i]);
+        }
+        else {
+          missing_argument(myargv);
         }
       }
       else if (myargv=="-v" || myargv=="--verbose"){
-          verbose_=true;
-          ok=true;
+          verbose_.value()=true;
       }
       else if (myargv=="--version"){
-        version_=true;
-        ok=true;
+        version();
+        exit(0);
       }
       else if (myargv=="-vf" || myargv=="-fv"){
-          verbose_=true;
-          force_=true;
-          ok=true;
-      }
-
-      if (!ok)
+          verbose_.value()=true;
+          force_.value()=true;
+      }
+      else {
         throw std::runtime_error("svndigest: invalid option: " + myargv +
                                  "\nTry `svndigest --help' for usage.");
+      } 
+  }
+
+    analyse();
+  }
+
+
+  void Parameter::analyse(void)
+  {
+    using namespace std;
+
+    string workdir(pwd()); // remember current working directory (cwd).
+
+    if (!node_exist(root_.value()))
+      throw runtime_error(string("svndigest: cannot stat `" + root_.value() +
+                                 "': no such file or directory"));
+
+    if (access_rights(root_.value(), "r"))
+      throw runtime_error(string("svndigest: cannot open `" + root_.value() +
+                                 "' for reading: Permission denied"));
+
+    // Check whether root is directory or file
+    struct stat nodestat;
+    stat(root_.value().c_str(), &nodestat);
+    if (S_ISDIR(nodestat.st_mode)) {
+      chdir(root_.value().c_str());
+      root_node_.value() = root_.value() = pwd();
     }
-
-    if (version_){
-      version(verbose_);
-      exit(0);
-    }     
-    analyse();
-  }
-
-
-  void Parameter::analyse(void)
-  {
-    using namespace std;
-
-    string workdir(pwd()); // remember current working directory (cwd).
-
-    bool root_ok = node_exist(root_) && !access_rights(root_, "r");
-    
-    if (root_ok) {
-      // Check that root_ is a directory
-      struct stat nodestat;
-      stat(root_.c_str(), &nodestat);
-      if (!S_ISDIR(nodestat.st_mode))
-        throw runtime_error(string("svndigest: accessing `") + root_ +
-                            "': Not a directory.");
+    else {
+      std::string fname = file_name(root_.value());
+      root_.value() = directory_name(root_.value());
+      chdir(root_.value().c_str());
+      root_.value() = pwd();
+      root_node_.value() = root_.value() + "/" + fname;
     }
-
-    // Checking that root_ exists and retrieve the absolute path to root_
-    if (!root_ok || chdir(root_.c_str()))
-      throw runtime_error(string("svndigest: Root directory (") + root_ +
-                          ") access failed.");
-    root_ = pwd();
-
-      
 
     // need to get back to cwd if relative paths are used.
@@ -172 +168 @@
     // Checking that targetdir_ exists and retrieve the absolute path
     // to targetdir_
-    if (chdir(targetdir_.c_str()))
-      throw runtime_error(string("svndigest: Target directory (") + targetdir_ +
-                          ") access failed.");
-    targetdir_ = pwd();
-    // Checking write permissions for targetdir_
-    if (access_rights(targetdir_,"w"))
-      throw runtime_error(string("svndigest: No write permission on target ") +
-                                 "directory (" + targetdir_ +").");
+    if (report()) {
+      if (chdir(targetdir_.value().c_str()))
+        throw runtime_error(string("svndigest: Target directory (") + 
+                            targetdir_.value() + ") access failed.");
+      targetdir_.value() = pwd();
+      // Checking write permissions for targetdir_
+      if (access_rights(targetdir_.value(),"w"))
+        throw runtime_error(string("svndigest: No write permission on target ") +
+                            "directory (" + targetdir_.value() +").");
+    }
 
     // return back to cwd
@@ -191 +189 @@
   {
     // not default
-    if (!config_file_.empty())
-      return config_file_;
+    if (!config_file_.value().empty())
+      return config_file_.value();
     
     // default behaviour
@@ -199 +197 @@
 
 
-  void Parameter::defaults(void)
-  {
-    config_file_ = "";
-    copyright_=false;
-    force_=false;
-    generate_config_=false;
-    ignore_cache_=false;
-    report_=true;
-    revisions_=false;
-    root_=".";
-    targetdir_=".";
-    verbose_=false;
-    version_=false;
-  }
-
-
-  void Parameter::help(void)
-  {
-    defaults();
-
+  void Parameter::help(void) const
+  {
     ColumnStream cs(std::cout, 1);
     cs.width(0)=79;
     cs.margin(0)=0;
     ColumnStream cs2(std::cout, 2);
-    cs2.width(0)=24;
+    // Widest line should fit exactly
+    cs2.width(0)=21;
     cs2.width(1)=52;
     cs2.margin(0)=2;
+    // Gnits standard suggest three characters gap between option and description
+    cs2.margin(1)=3;
 
     std::cout << "Usage: svndigest [OPTION]...\n"
@@ -235 +218 @@
        << "short options too.\n";
 
-    cs2  << "    --copyright\tupdate copyright statement\n" 
-         << "    --config-file=ARG\tconfiguration file " 
+    cs2  << "    --config-file=ARG\tconfiguration file " 
          << "[<ROOT>/.svndigest/config]\n"
+         << "    --copyright\tupdate copyright statement\n" 
          << "-f, --force\tif sub-directory named <ROOT> exists in "
          << "target directory, remove sub-directory before writing results\n"
@@ -243 +226 @@
          << "to standard output and exit\n"
          << "-h, --help\tdisplay this help and exit\n"
-         << "    --ignore-cache\tIgnore cache files and analyze "
+         << "    --ignore-cache\tignore cache files and analyze "
          << "everything from repository\n"
-         << "    --no-report\tCreate no HTML report\n"
-         << "    --revisions\tUse revision numbers as time scale "
+         << "    --no-report\tcreate no HTML report\n"
+         << "    --revisions\tuse revision numbers as time scale "
          << "instead of dates [dates]\n"
          << "-r, --root=ROOT\tsvn controlled directory to perform "
-         << "statistics calculation on [" << root_ << "]\n"
-         << "-t, --target=TARGET\toutput directory [" << targetdir_ << "]\n"
+         << "statistics calculation on [" << root_.default_value() << "]\n"
+         << "-t, --target=TARGET\toutput directory [" 
+         << targetdir_.default_value() << "]\n"
          << "-v, --verbose\texplain what is being done\n"
          << "    --version\tprint version information and exit\n";
@@ -259 +243 @@
 
 
+  void Parameter::missing_argument(std::string opt) const
+  {
+    if (opt.size()>0 && opt[0]=='-')
+      opt = opt.substr(1);
+    if (opt.size()>0 && opt[0]=='-')
+      opt = opt.substr(1);
+    std::stringstream ss;
+    ss << "svndigest: option requires an argument -- " << opt << "\n"
+       << "Try `svndigest --help' for usage."; 
+    throw std::runtime_error(ss.str());
+  }
+
   void Parameter::version(bool verbose) const
   {
     ColumnStream cs(std::cout, 1);
     cs.width(0)=79;
-    cs << PACKAGE_STRING;
-    cs << " (";
-    if (DEV_BUILD)
-      cs << "r" << svn_revision() << " ";
-    cs << "compiled " << __DATE__ ", " << __TIME__ << ")\n";
-    
+    cs << PACKAGE_STRING << version_string() << "\n";
     cs << "\nCopyright (C) " << svn_year() 
        << " Jari H\u00E4kkinen and Peter Johansson.\n"

branches/replacing_gnuplot/bin/Parameter.h

@@ -26 +26 @@
 */
 
+#include "Option.h"
+
 #include <map>
 #include <string>
@@ -37 +39 @@
     Parameter( int argc, char *argv[]);
     std::string config_file(void) const;
-    inline bool copyright(void) const { return copyright_; }
+    inline bool copyright(void) const { return copyright_.value(); }
     /// @todo
-    inline bool force(void) const { return force_; }
-    inline bool generate_config(void) const { return generate_config_; }
-    inline bool ignore_cache(void) const { return ignore_cache_; }
-    inline bool report(void) const { return report_; }
-    inline bool revisions(void) const { return revisions_; }
+    inline bool force(void) const { return force_.value(); }
+    inline bool generate_config(void) const { return generate_config_.value(); }
+    // Until we fix caching (#313) ignore caching
+    //inline bool ignore_cache(void) const { return ignore_cache_.value(); }
+    inline bool ignore_cache(void) const { return true; }
+    inline bool report(void) const { return report_.value(); }
+    inline bool revisions(void) const { return revisions_.value(); }
     /// @return absolute path to root directory
-    inline const std::string& root(void) const { return root_; }
+    inline const std::string& root(void) const { return root_.value(); }
+    /// @return absolute path to root node
+    inline const std::string& root_node(void) const {return root_node_.value();}
     /// @return absolute path to target directory
-    inline const std::string& targetdir(void) const { return targetdir_; }
-    inline bool verbose(void) const { return verbose_; }
+    inline const std::string& targetdir(void) const 
+    { return targetdir_.value(); }
+    inline bool verbose(void) const { return verbose_.value(); }
 
   private:
     void analyse(void);
-    void defaults(void);
-    void help(void);
+    void help(void) const;
+    void missing_argument(std::string opt) const;
     void version(bool=false) const;
 
-    std::string config_file_;
-    bool copyright_;
-    bool force_;
-    bool generate_config_;
-    bool ignore_cache_;
-    bool report_;
-    bool revisions_;
-    std::string root_;
-    std::string targetdir_;
-    bool verbose_;
-    bool version_;
+    Option<std::string> config_file_;
+    Option<bool> copyright_;
+    Option<bool> force_;
+    Option<bool> generate_config_;
+    Option<bool> ignore_cache_;
+    Option<bool> report_;
+    Option<bool> revisions_;
+    Option<std::string> root_;
+    Option<std::string> root_node_;
+    Option<std::string> targetdir_;
+    Option<bool> verbose_;
   };
 

branches/replacing_gnuplot/bin/svndigest.cc

@@ -160 +160 @@
     if (option->verbose())
       std::cout << "Generating output" << std::endl;
-    if (!option->revisions())
-      GnuplotFE::instance()->set_dates(SVNlog(repo).date());
+    if (!option->revisions()) {
+      SVNlog log(repo);
+      std::vector<std::string> dates;
+      dates.reserve(log.commits().size());
+      for (size_t i=0; i<log.commits().size(); ++i) {
+        assert(static_cast<svn_revnum_t>(i)==log.commits()[i].revision());
+        dates.push_back(log.commits()[i].date());
+      }
+      GnuplotFE::instance()->set_dates(dates);
+    }
     chdir(option->targetdir().c_str());
     mkdir(tree->name());