Changeset 1246

Timestamp:

Oct 30, 2010, 4:41:51 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes #477

Location:

branches/0.8-stable

Files:

• bin/Parameter.cc (modified) (2 diffs)
• bin/Parameter.h (modified) (2 diffs)
• bin/svncopyright.cc (modified) (1 diff)
• bin/svndigest.cc (modified) (2 diffs)
• bin/svndigestParameter.cc (modified) (1 diff)
• lib/Directory.cc (modified) (1 diff)
• lib/Directory.h (modified) (1 diff)
• lib/Node.cc (modified) (2 diffs)
• lib/Node.h (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/link_root_test.sh (added)
• test/parameter_test.cc (added)

branches/0.8-stable/bin/Parameter.cc

@@ -97 +97 @@
       check_existence(root_.value());
       check_readable(root_.value());
+
+      // check that root is directory (or link pointing to directory)
+      struct stat stats;
+      stat(root_.value().c_str(), &stats);
+      if (!S_ISDIR(stats.st_mode)) {
+        std::stringstream ss;
+        ss << cmd_.program_name() << ": '" << root_.value() 
+           << "': Not a directory"; 
+        throw yat::utility::cmd_error(ss.str());
+      }
       chdir(root_.value());
-      root_.value(pwd());
+      root_full_ = pwd();
       chdir(save_wd);
+
+      // take care of when root is a symlink (see ticket #477)
+      lstat(root_.value().c_str(), &stats);
+      if (S_ISLNK(stats.st_mode))
+        root_basename_ = file_name(root_.value());
+      else
+        root_basename_ = file_name(root_full_);
     }
 
@@ -181 +198 @@
   std::string Parameter::root(void) const
   {
-    return root_.value();
-  }
+    return root_full_;
+  }
+
+
+  const std::string& Parameter::root_basename(void) const
+  {
+    assert(root_basename_.size());
+    return root_basename_;
+  }
+
 
   void Parameter::set_default(void)

branches/0.8-stable/bin/Parameter.h

@@ -55 +55 @@
     bool generate_config(void) const ;
     bool ignore_cache(void) const;
-    /// @return absolute path to root directory
+
+    /**
+       @return Dereferenced absolute path to root directory
+    */
     std::string root(void) const;
+
+    /**
+       If --root argument is a link we return the file_name(argument).
+       Otherwise we return file_name(root()). See root(void).
+
+       \return basename of --root argument.
+     */
+    const std::string& root_basename(void) const;
     bool verbose(void) const;
 
@@ -83 +94 @@
     yat::utility::OptionSwitch ignore_cache_;
     yat::utility::OptionArg<std::string> root_;
+    std::string root_basename_;
+    std::string root_full_;
     yat::utility::OptionSwitch verbose_;
   protected:

branches/0.8-stable/bin/svncopyright.cc

@@ -65 +65 @@
     if (option.verbose())
       std::cout << "Building directory tree" << std::endl;
-    Directory tree(0,option.root(),"");
+    Directory tree(0,option.root(),"",option.root_basename());
 
     if (option.verbose())

branches/0.8-stable/bin/svndigest.cc

@@ -109 +109 @@
     if (option.verbose())
       std::cout << "Building directory tree" << std::endl;
-    Directory tree(0,option.root(),"");
+    Directory tree(0,option.root(),"", option.root_basename());
 
     if (option.verbose())
@@ -227 +227 @@
   if (option.verbose())
     std::cout << "Generating output" << std::endl;
-  mkdir(tree.name());
-  chdir(tree.name().c_str());
+  mkdir(option.root_basename());
+  chdir(option.root_basename());
   print_css("svndigest.css");
   print_main_page(tree.name(), tree.log(), stats, tree.url());

branches/0.8-stable/bin/svndigestParameter.cc

@@ -91 +91 @@
         check_existence(target_.value());
         check_readable(target_.value());
-        std::string base_root = file_name(root());
-        std::string path = concatenate_path(target_.value(),base_root); 
+        std::string path = concatenate_path(target_.value(),root_basename()); 
         if (access_rights(target_.value().c_str(), "w")) {
           std::stringstream ss;

branches/0.8-stable/lib/Directory.cc

@@ -50 +50 @@
 
   Directory::Directory(const unsigned int level, const std::string& path, 
-                       const std::string& output)
-    : Node(level,path,output)
+                       const std::string& output, const std::string& project)
+    : Node(level,path,output,project)
   {
     output_dir_=local_path();

branches/0.8-stable/lib/Directory.h

@@ -53 +53 @@
     ///
     Directory(const unsigned int level, const std::string& path, 
-              const std::string& output="");
+              const std::string& output="", const std::string& project="");
 
     ///

branches/0.8-stable/lib/Node.cc

@@ -46 +46 @@
 
   Node::Node(const unsigned int level, const std::string& path, 
-             const std::string& local_path)
+             const std::string& local_path, const std::string& project)
     : level_(level), path_(path), stats_(path), log_(NULL),  
       svninfo_(path)
@@ -54 +54 @@
     svndigest_ignore_=property.svndigest_ignore();
     if (Node::project_==std::string()) // no root directory in local path
-      Node::project_ = file_name(path);
+      Node::project_ = project;
     else if (local_path.empty())
       local_path_ = file_name(path);

branches/0.8-stable/lib/Node.h

@@ -58 +58 @@
     /// @brief Constructor 
     /// 
-    Node(const unsigned int, const std::string&, const std::string&);
+    Node(const unsigned int, const std::string&, const std::string&, 
+         const std::string& = "");
 
     ///

branches/0.8-stable/test/Makefile.am

@@ -28 +28 @@
 EXTRA_PROGRAMS = cache_partial_test color_test \
   config_test copyright_test date_test \
-  graph_test htmlstream_test \
+  graph_test htmlstream_test parameter_test \
   parser_test stats_test trac_test utility_test
 
 CLEANFILES = $(EXTRA_PROGRAMS)
+
+parameter_test_SOURCES = parameter_test.cc $(top_srcdir)/bin/Parameter.cc \
+  $(top_srcdir)/bin/svndigestParameter.cc
 
 distributed_TESTS =
@@ -38 +41 @@
 distributed_TESTS += config3_test.sh
 distributed_TESTS += copyright2_test.sh
+distributed_TESTS += link_root_test.sh
 distributed_TESTS += repo_status_test.sh
 distributed_TESTS += repo_test.sh