Changeset 159

Timestamp:

Aug 14, 2006, 9:39:49 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixes #63. Moved directory tree creation up. Improved target dir checking/erasing code.

File:

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

trunk/bin/svndigest.cc

@@ -13 +13 @@
   svndigest is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
@@ -37 +37 @@
 #include <unistd.h>
 
-using namespace std;
+///
+/// @brief Check whether \a path already exists or not.
+///
+/// @return True if \a path exists, false otherwise.
+///
+bool check_target(const std::string& path)
+{
+  struct stat buf;
+  return !stat(path.c_str(),&buf);
+}
+
 
 int main(const int argc,const char* argv[])
@@ -62 +72 @@
   }
 
+  // check if target already exists and behave appropriately
+  std::string target_path=option->targetdir() + '/' + file_name(option->root());
+  bool need_to_erase_target = check_target(target_path);
+  if (need_to_erase_target && !option->force())
+    throw std::runtime_error(std::string("svndigest: directory (") +
+                             target_path + ") already exists");
+
   // Extract repository location
   std::string repo;
@@ -74 +91 @@
   }
 
+  // build directory tree already here ... if WC is upto date with
+  // repo an exception is thrown. This avoids several costly
+  // statements below and will not remove a digest tree below if a
+  // tree already exists.
+  Directory tree(0,option->root(),"");
+  tree.parse(option->verbose());
+
   // Retrieve commit dates.
   std::vector<std::string> commit_dates;
@@ -85 +109 @@
   }
 
-  // check if target already exists and behave appropriately
-  std::string root_path(option->targetdir()+'/'+file_name(option->root()));
-  struct stat buf;
-  if (!stat(root_path.c_str(),&buf))
-    // root_path already exists
-    if (option->force()) {
-      // force true -> removal of root_path
+  // remove target if needed
+  if (need_to_erase_target) {
       if (option->verbose())
-        std::cout << "rm -rf " << root_path << "\n";
-      rmdirhier(root_path);
-    }
-    else {
-      // force false -> exit 
-      std::cerr << "\nsvndigest: " << root_path << ": directory already exists"
-                << std::endl;
-      exit(-1);
-    }
+        std::cout << "rm -rf " << target_path << "\n";
+      rmdirhier(target_path);
+  }
 
   if (!option->revisions())
     GnuplotFE::instance()->set_dates(commit_dates);
-
-  Directory tree(0,option->root(),"");
-  tree.parse(option->verbose());
-
-  GnuplotFE::instance()->command(string("cd '")+option->targetdir()+"'");
+  GnuplotFE::instance()->command(std::string("cd '")+option->targetdir()+"'");
   chdir(option->targetdir().c_str());
   try {
@@ -125 +134 @@
   exit(0);        // normal exit
 }
-
-