Changeset 315 for trunk

Timestamp:

May 17, 2007, 2:06:17 PM (16 years ago)

Author:

Peter Johansson

Message:

fixes #186 catch exception thrown when node is not up to date

File:

• trunk/bin/svndigest.cc (modified) (6 diffs)

trunk/bin/svndigest.cc

@@ -37 +37 @@
 #include "utility.h"
 
+#include <cassert>
 #include <iostream>
 #include <fstream>
@@ -132 +133 @@
   if (option->verbose())
     std::cout << "Building directory tree" << std::endl;
-  Directory tree(0,option->root(),"");
+  Directory* tree=NULL;
+  try {
+    tree = new Directory(0,option->root(),"");
+  }
+  catch (NodeException e) {
+    std::cerr << "svndigest: " << e.what() << std::endl;
+  }
+  assert(tree);
+
   if (option->verbose())
     std::cout << "Parsing directory tree" << std::endl;
   Stats stats(option->root());
-  stats+=tree.parse(option->verbose());
+  stats+=tree->parse(option->verbose());
 
   // Retrieve commit dates etc from SVNlog.
@@ -162 +171 @@
     GnuplotFE::instance()->set_dates(svnlog.date());
   chdir(option->targetdir().c_str());
-  mkdir(tree.name());
-  chdir(tree.name().c_str());
+  mkdir(tree->name());
+  chdir(tree->name().c_str());
   GnuplotFE::instance()->command(std::string("cd '")+option->targetdir()+"/"
-                                 +tree.name()+"'");
+                                 +tree->name()+"'");
   print_css("svndigest.css");
   SVNlog local_log(option->root());
-  print_main_page(tree.name(), local_log, stats, 
+  print_main_page(tree->name(), local_log, stats, 
                   SVNinfo(option->root()).url());
   mkdir("all");
@@ -180 +189 @@
     }
   try {
-    tree.print(option->verbose());
+    tree->print(option->verbose());
   }
   catch (const std::runtime_error& x) {
@@ -191 +200 @@
         std::cout << "Updating copyright statements" << std::endl;
       std::map<std::string, Alias> alias(config.copyright_alias());
-      tree.print_copyright(alias);
+      tree->print_copyright(alias);
     }
     catch (const std::runtime_error& x) {
@@ -202 +211 @@
 
   delete option;
+  delete tree;
   if (option->verbose())
     std::cout << "Done!" << std::endl;