Changeset 247 for branches

Timestamp:

Apr 29, 2007, 12:53:22 AM (16 years ago)

Author:

Peter Johansson

Message:

mergin trunk into branches/test-suite

Location:

branches/test-suite

Files:

• ChangeLog (modified) (1 diff)
• bin/Parameter.cc (modified) (5 diffs)
• bin/Parameter.h (modified) (1 diff)
• lib/Directory.cc (modified) (2 diffs)
• lib/File.cc (modified) (1 diff)
• lib/Makefile.am (modified) (1 diff)
• lib/Stats.cc (modified) (2 diffs)
• lib/Stats.h (modified) (1 diff)
• lib/html_utility.cc (modified) (1 diff)

branches/test-suite/ChangeLog

@@ -22 +22 @@
 ======================================================================
 
-
+version 0.6:
+  - Removed option flag '-rev'
+  
 version 0.5:
   - Updated documentation.

branches/test-suite/bin/Parameter.cc

@@ -73 +73 @@
         }
       }
-      else if (myargv=="-rev" || myargv=="--revisions") {
+      else if (myargv=="--revisions") {
           revisions_=true;
           ok=true;
@@ -135 +135 @@
     // return back to cwd
     if (chdir(workdir.c_str()))
-      runtime_error(string("svndigest: Failed to access cwd: ") + workdir);
-
-    if (config_file_.empty())
-      runtime_error(string("svndigest: Parameter --config-file requires argument."));
-
+      throw runtime_error(string("svndigest: Failed to access cwd: ") + workdir);
+
+  }
+
+
+  std::string Parameter::config_file(void) const
+  {
+    // not default
+    if (!config_file_.empty())
+      return config_file_;
+    
+    // default behaviour
+    return root()+"/.svndigest/config";
   }
 
@@ -145 +153 @@
   void Parameter::defaults(void)
   {
-    config_file_ = getenv("HOME")+"/.svndigest/config";
+    config_file_ = "";
     copyright_=false;
     force_=false;
@@ -163 +171 @@
     cs.width(0)=68;
     cs.margin(0)=2;
-    ColumnStream cs2(std::cout, 3);
+    ColumnStream cs2(std::cout, 2);
     cs2.width(0)=24;
-    cs2.width(1)=2;
-    cs2.width(2)=50;
+    cs2.width(2)=52;
     cs2.margin(0)=2;
 
@@ -180 +187 @@
     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 " 
+    cs2  << "    --copyright\tupdate copyright statement\n" 
+         << "    --config-file=ARG\tconfiguration file " 
+         << "[<ROOT>/.svndigest/config]\n"
+         << "-f, --force\tremove target directory/file if it exists "
+         << "NOTE recursive delete.\n"
+         << "-g, --generate-config\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 "
+         << "-h, --help\tdisplay this help and exit\n"
+         << "-r, --root=ROOT\tsvn controlled directory to perform "
          << "statistics calculation on [" << root_ << "]\n"
-         << "-rev [--revisions]\t:\tUse revision numbers as time scale "
+         << "    --revisions\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";
+         << "-t, --target=TARGET\toutput directory [" << targetdir_ << "]\n"
+         << "-v, --verbose\texplain what is being done\n"
+         << "    --version\tprint version information and exit\n";
     std::cout << std::endl;
   }

branches/test-suite/bin/Parameter.h

@@ -36 +36 @@
   public:
     Parameter(const int argc,const char *argv[]);
-    inline std::string config_file(void) const { return config_file_; }
+    std::string config_file(void) const;
     inline bool copyright(void) const { return copyright_; }
     /// @todo

branches/test-suite/lib/Directory.cc

@@ -171 +171 @@
     os << "../../";
     if (user=="all")
-      os << stats_.plot(imagedir+"/index.png", local_path(),line_type);
+      os << stats_.plot(imagedir+"/index.png", line_type);
     else
       os << imagedir << "/index.png";
@@ -182 +182 @@
     os << "<th>Code</th>\n";
     os << "<th>Comments</th>\n";
-    os << "<th>Empty</th>\n";
+    os << "<th>Other</th>\n";
     os << "<th>Revision</th>\n";
     os << "<th>Author</th>\n";

branches/test-suite/lib/File.cc

@@ -74 +74 @@
     os << "../../";
     if (user=="all")
-      os << stats_.plot(imagefile, local_path(),line_type);
+      os << stats_.plot(imagefile,line_type);
     else
       os << imagefile;

branches/test-suite/lib/Makefile.am

@@ -26 +26 @@
 noinst_LTLIBRARIES = libsvndigest.la
 
-noinst_HEADERS = ColumnStream.h Configuration.h 
+noinst_HEADERS = ColumnStream.h Configuration.h \
   Date.h Directory.h File.h Gnuplot.h GnuplotFE.h \
   HtmlStream.h html_utility.h Node.h Parser.h rmdirhier.h \

branches/test-suite/lib/Stats.cc

@@ -157 +157 @@
 
   std::string Stats::plot(const std::string& filename,
-                          const std::string& title,
                           const std::string& linetype) const
   {
@@ -163 +162 @@
     gp->command("set term png");
     gp->command("set output '"+filename+"'");
-    gp->command("set title '"+title+"'");
     gp->command("set xtics nomirror");
     gp->command("set ytics nomirror");

branches/test-suite/lib/Stats.h

@@ -97 +97 @@
     /// Create statistics graph.
     ///
-    std::string plot(const std::string&, const std::string&,
-                     const std::string&) const;
+    std::string plot(const std::string&, const std::string&) const;
 
     ///

branches/test-suite/lib/html_utility.cc

@@ -366 +366 @@
     else
       os << "<li>";
-    os << anchor(user+"/empty/"+path, "Empty", level, 
+    os << anchor(user+"/empty/"+path, "Other", level, 
                  "View statistics of empty lines");
     os << "</li>"