Changeset 195

Timestamp:

Sep 7, 2006, 3:44:35 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Added more verbose output. Improved error diagnstics in SVN.

Location:

trunk

Files:

• bin/svndigest.cc (modified) (9 diffs)
• configure.ac (modified) (1 diff)
• lib/SVN.cc (modified) (1 diff)

trunk/bin/svndigest.cc

@@ -56 +56 @@
   try {
     option = new Parameter(argc,argv);
+    if (option->verbose())
+      std::cout << "Done parsing parameters" << std::endl;
   }
   catch (std::runtime_error e) {
@@ -65 +67 @@
   SVN* svn=SVN::instance();
   try {
+    if (option->verbose())
+      std::cout << "Connecting to WC adminstative area" << std::endl;
     svn->setup_wc_adm_access(option->root());
   }
@@ -74 +78 @@
 
   // check if target already exists and behave appropriately
+  if (option->verbose())
+    std::cout << "Checking target directory" << std::endl;
   std::string target_path=option->targetdir() + '/' + file_name(option->root());
   bool need_to_erase_target = check_target(target_path);
@@ -83 +89 @@
   std::string repo;
   try {
+    if (option->verbose())
+      std::cout << "Acquiring repository information" << std::endl;
     repo=SVNinfo(option->root()).repos_root_url();
   }
@@ -96 +104 @@
   // statements below and will not remove a digest tree below if a
   // tree already exists.
+  if (option->verbose())
+    std::cout << "Building directory tree" << std::endl;
   Directory tree(0,option->root(),"");
+  if (option->verbose())
+    std::cout << "Parsing directory tree" << std::endl;
   tree.parse(option->verbose());
 
@@ -102 +114 @@
   std::vector<std::string> commit_dates;
   try {
+    if (option->verbose())
+      std::cout << "Retrieving commit dates" << std::endl;
     svn->setup_ra_session(repo);
     commit_dates=svn->commit_dates(repo);
@@ -113 +127 @@
   if (need_to_erase_target) {
       if (option->verbose())
-        std::cout << "rm -rf " << target_path << "\n";
+        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(commit_dates);
@@ -127 +143 @@
     std::cerr << "svndigest: " << x.what() << std::endl;
   }
+  if (option->verbose())
+    std::cout << "Finalizing" << std::endl;
   std::string css(file_name(option->root())+"/svndigest.css");
   std::ofstream os(css.c_str());
@@ -133 +151 @@
 
   delete option;
+  if (option->verbose())
+    std::cout << "Done!" << std::endl;
   exit(0);        // normal exit
 }

trunk/configure.ac

@@ -27 +27 @@
 
 AC_PREREQ(2.57)
-AC_INIT([[svndigest]],[0.5],[jari@thep.lu.se])
+AC_INIT([[svndigest]],[pre0.6],[jari@thep.lu.se])
 AC_CONFIG_SRCDIR([lib/File.h])
 AC_CONFIG_AUX_DIR([autotools])

trunk/lib/SVN.cc

@@ -167 +167 @@
                                          false, subpool);
         if (err)
-          cleanup(err, subpool, "property: svn_subst_detranslate_string failed");
+          cleanup(err, subpool,
+                  path +
+                  " property: svn_subst_detranslate_string failed on key " +
+                  static_cast<const char*>(key));
         property[static_cast<const char*>(key)]=value->data;
       }