Changeset 234 for trunk/bin

Timestamp:

Apr 9, 2007, 2:08:26 PM (16 years ago)

Author:

Peter Johansson

Message:

fixes #87 and #95 and #103 and #104 and #80 and #108, and refs #69

Location:

trunk/bin

Files:

• Parameter.cc (modified) (4 diffs)
• svndigest.cc (modified) (6 diffs)

trunk/bin/Parameter.cc

@@ -24 +24 @@
 
 #include "Parameter.h"
+
+#include "ColumnStream.h"
 #include "utility.h"
 #include <config.h> // this header file is created by configure
@@ -43 +45 @@
       bool ok=false;
       std::string myargv(argv[i]);
-      if (myargv=="-c" || myargv=="--config"){
+      if (myargv=="--config-file"){
         if (++i<argc){
           config_file_= std::string(argv[i]);
@@ -136 +138 @@
 
     if (config_file_.empty())
-      runtime_error(string("svndigest: Parameter --config requires argument."));
+      runtime_error(string("svndigest: Parameter --config-file requires argument."));
 
   }
@@ -157 +159 @@
   {
     defaults();
-    std::cout << "\n"
-              << "usage: svndigest [options]\n"
-              << "\n"
-              << "svndigest traverses a directory structure (controlled by\n"
-              << "subversion) and calculates developer statistics entries.\n"
-              << "The top level directory of the directory structure to\n"
-              << "traverse is set with the -r option. The result is written to\n"
-              << "the current working directory or a directory set with the\n"
-              << "-t option.\n"
-              << "\n"
-              << "Valid options:\n"
-              << "  --copyright    : update copyright statement\n" 
-              << "  -c [--config] arg : configuration file ["
-              << config_file_ << "]\n"
-              << "  -f [--force]   : remove target directory/file if it exists\n"
-              << "                   [no force]. NOTE recursive delete.\n"
-              << "  -g [--generate-config] : write configuration file " 
-              << "to standard output and exit\n"
-              << "  -h [--help]    : display this help and exit\n"
-              << "  -r [--root] arg : svn controlled directory to perform\n"
-              << "                    statistics calculation on [" 
-              << root_ << "]\n"
-              << "  -rev [--revisions]: Use revision numbers as time scale\n"
-              << "                      instead of dates [dates].\n"
-              << "  -t [--target] arg : output directory [" 
-              << targetdir_ << "]\n"
-              << "  -v [--verbose] : explain what is being done\n"
-              << "  --version      : print version information and exit\n"
-              << std::endl;
+
+    ColumnStream cs(std::cout, 1);
+    cs.width(0)=68;
+    cs.margin(0)=2;
+    ColumnStream cs2(std::cout, 3);
+    cs2.width(0)=24;
+    cs2.width(1)=2;
+    cs2.width(2)=50;
+    cs2.margin(0)=2;
+
+    std::cout << "usage: svndigest [options]\n"
+              << "\n";
+
+    cs << "svndigest traverses a directory structure (controlled by "
+       << "subversion) and calculates developer statistics entries. "
+       << "The top level directory of the directory structure to "
+       << "traverse is set with the -r option. The result is written to "
+       << "the current working directory or a directory set with the "
+       << "-t option.\n";
+    std::cout << "\nValid options:\n";
+
+    cs2  << "--copyright\t:\tupdate copyright statement\n" 
+         << "--config-file arg\t:\tconfiguration file [" 
+         << config_file_ << "]\n"
+         << "-f [--force]\t:\tremove target directory/file if it exists "
+         << "[no force]. NOTE recursive delete.\n"
+         << "-g [--generate-config]\t:\twrite configuration file " 
+         << "to standard output and exit\n"
+         << "-h [--help]\t:\tdisplay this help and exit\n"
+         << "-r [--root] arg\t:\tsvn controlled directory to perform "
+         << "statistics calculation on [" << root_ << "]\n"
+         << "-rev [--revisions]\t:\tUse revision numbers as time scale "
+         << "instead of dates [dates].\n"
+         << "-t [--target] arg\t:\toutput directory [" << targetdir_ << "]\n"
+         << "-v [--verbose]\t:\texplain what is being done\n"
+         << "--version\t:\tprint version information and exit\n";
+    std::cout << std::endl;
   }
 

trunk/bin/svndigest.cc

@@ -32 +32 @@
 #include "SVN.h"
 #include "SVNinfo.h"
+#include "SVNlog.h"
 #include "utility.h"
 
@@ -129 +130 @@
   stats+=tree.parse(option->verbose());
 
-  // Retrieve commit dates.
-  std::vector<std::string> commit_dates;
+  // Retrieve commit dates etc from SVNlog.
   try {
     if (option->verbose())
       std::cout << "Retrieving commit dates" << std::endl;
     svn->setup_ra_session(repo);
-    commit_dates=svn->commit_dates(repo);
   }
   catch (SVNException e) {
@@ -141 +140 @@
     exit(-1);
   }
-  // Is this line needed?
-  svn->setup_ra_session(repo);
-  std::vector<std::string> authors=svn->authors(repo);
+  SVNlog svnlog(repo);
 
   // remove target if needed
@@ -155 +152 @@
     std::cout << "Generating output" << std::endl;
   if (!option->revisions())
-    GnuplotFE::instance()->set_dates(commit_dates);
+    GnuplotFE::instance()->set_dates(svnlog.date());
   chdir(option->targetdir().c_str());
   mkdir(tree.name());
@@ -162 +159 @@
                                  +tree.name()+"'");
   print_css("svndigest.css");
-  print_main_page(tree.name(), commit_dates, stats);
+  print_main_page(tree.name(), svnlog, stats);
   mkdir("all");
   for (std::set<std::string>::const_iterator i = stats.authors().begin();
@@ -180 +177 @@
         std::cout << "Updating copyright statements" << std::endl;
       std::map<std::string, std::string> alias(config->copyright_alias());
-      tree.print_copyright(commit_dates, authors, alias);
+      tree.print_copyright(alias);
     }
     catch (const std::runtime_error& x) {