Changeset 423

Timestamp:

Jun 29, 2007, 8:43:29 PM (14 years ago)

Author:

Peter Johansson

Message:

fixes #224

Location:

trunk/bin

Files:

• Parameter.cc (modified) (3 diffs)
• Parameter.h (modified) (2 diffs)
• svndigest.cc (modified) (1 diff)

trunk/bin/Parameter.cc

@@ -71 +71 @@
           ok=true;
         }
+      }
+      else if (myargv=="--report") {
+          report_=true;
+          ok=true;
+      }
+      else if (myargv=="--no-report") {
+          report_=false;
+          ok=true;
       }
       else if (myargv=="--revisions") {
@@ -156 +164 @@
     force_=false;
     generate_config_=false;
+    report_=false;
     revisions_=false;
     root_=".";
@@ -187 +196 @@
          << "[<ROOT>/.svndigest/config]\n"
          << "-f, --force\tif sub-directory named <ROOT> exists in "
-         << "target directory, remove sub-directory before writing results.\n"
+         << "target directory, remove sub-directory before writing results\n"
          << "-g, --generate-config\twrite configuration file " 
          << "to standard output and exit\n"
          << "-h, --help\tdisplay this help and exit\n"
+         << "    --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"
-         << "    --revisions\tUse revision numbers as time scale "
-         << "instead of dates [dates].\n"
          << "-t, --target=TARGET\toutput directory [" << targetdir_ << "]\n"
          << "-v, --verbose\texplain what is being done\n"

trunk/bin/Parameter.h

@@ -41 +41 @@
     inline bool force(void) const { return force_; }
     inline bool generate_config(void) const { return generate_config_; }
+    inline bool report(void) const { return report_; }
     inline bool revisions(void) const { return revisions_; }
     /// @return absolute path to root directory
@@ -58 +59 @@
     bool force_;
     bool generate_config_;
+    bool report_;
     bool revisions_;
     std::string root_;

trunk/bin/svndigest.cc

@@ -146 +146 @@
   stats+=tree->parse(option->verbose());
 
-  // remove target if needed
-  if (need_to_erase_target) {
+  if (option->report()) {
+    // remove target if needed
+    if (need_to_erase_target) {
       if (option->verbose())
         std::cout << "Removing old target tree: " << target_path << "\n";
       rmdirhier(target_path);
-  }
-
-  if (option->verbose())
-    std::cout << "Generating output" << std::endl;
-  if (!option->revisions())
-    GnuplotFE::instance()->set_dates(SVNlog(repo).date());
-  chdir(option->targetdir().c_str());
-  mkdir(tree->name());
-  chdir(tree->name().c_str());
-  GnuplotFE::instance()->command(std::string("cd '")+option->targetdir()+"/"
-                                 +tree->name()+"'");
-  print_css("svndigest.css");
-  SVNlog local_log(option->root());
-  print_main_page(tree->name(), local_log, stats, 
-                  tree->url());
-  mkdir("all");
-  mkdir("images");
-  touch("all/index.html");
-  touch("images/index.html");
-  for (std::set<std::string>::const_iterator i = stats.authors().begin();
-       i!=stats.authors().end(); ++i) {
-    mkdir(*i);
-    touch(std::string(*i+"/index.html"));
-  }
-  try {
-    tree->print(option->verbose());
-  }
-  catch (const std::runtime_error& x) {
-    std::cerr << "svndigest: " << x.what() << std::endl;
-    exit(-1);
+    }
+
+    if (option->verbose())
+      std::cout << "Generating output" << std::endl;
+    if (!option->revisions())
+      GnuplotFE::instance()->set_dates(SVNlog(repo).date());
+    chdir(option->targetdir().c_str());
+    mkdir(tree->name());
+    chdir(tree->name().c_str());
+    GnuplotFE::instance()->command(std::string("cd '")+option->targetdir()+"/"
+                                   +tree->name()+"'");
+    print_css("svndigest.css");
+    SVNlog local_log(option->root());
+    print_main_page(tree->name(), local_log, stats, 
+                    tree->url());
+    mkdir("all");
+    mkdir("images");
+    touch("all/index.html");
+    touch("images/index.html");
+    for (std::set<std::string>::const_iterator i = stats.authors().begin();
+         i!=stats.authors().end(); ++i) {
+      mkdir(*i);
+      touch(std::string(*i+"/index.html"));
+    }
+    try {
+      tree->print(option->verbose());
+    }
+    catch (const std::runtime_error& x) {
+      std::cerr << "svndigest: " << x.what() << std::endl;
+      exit(-1);
+    }
   }