Changeset 116

Timestamp:

Jun 30, 2006, 2:04:54 PM (17 years ago)

Author:

Peter Johansson

Message:

fixes #48 #49

Location:

trunk/bin

Files:

• Parameter.cc (modified) (8 diffs)
• Parameter.h (modified) (1 diff)

trunk/bin/Parameter.cc

@@ -23 +23 @@
 
 #include "Parameter.h"
+#include "utility.h"
 #include <config.h> // this header file is created by configure
 
@@ -50 +51 @@
         if (++i<argc){
           root_= std::string(argv[i]);
-          // if last character is '/' remove
-          if (*root_.rbegin()=='/')
-            root_.erase(root_.begin()+root_.size()-1);
           ok=true;
         }
@@ -63 +61 @@
         if (++i<argc){
           targetdir_= std::string(argv[i]);
-          // if last character is '/' remove
-          if (*targetdir_.rbegin()=='/')
-            targetdir_.erase(targetdir_.begin()+targetdir_.size()-1);
           ok=true;
         }
@@ -89 +84 @@
   void Parameter::analyse(void)
   {
+
     struct stat buf;
     // check that root directory exists
@@ -99 +95 @@
                                ": No such directory.");
     }
+      
+    // making root absolute
+    std::string workdir(pwd());
+    chdir(root_.c_str());
+    root_ = pwd();
+    // remove trailing '/'
+    if (*root_.rbegin()=='/')
+      root_.erase(root_.begin()+root_.size()-1);
+
+    // making targetdir absolute
+    chdir(targetdir_.c_str());
+    targetdir_ = pwd();
+    // remove trailing '/'
+    if (*targetdir_.rbegin()=='/')
+      root_.erase(targetdir_.begin()+targetdir_.size()-1);
+
+    chdir(workdir.c_str());
+
   }
 
@@ -114 +128 @@
   void Parameter::help(void)
   {
+    defaults();
     std::cout << "\n"
               << "usage: svnstat [options]\n"
@@ -120 +135 @@
               << "subversion) and calculates developer statistics entries.\n"
               << "The top level directory of the directory structure to\n"
-              << "traverse is set with the -t option."
-              << "The result is written to a\n"
-              << "sub-directory, svnstat, that is created in the current\n"
-              << "working directory.\n"
+              << "traverse is set with the -r option. The result is written to\n"
+              << "the current working directory or a directory set with the\n"
+              << "-t option.\n"
               << "\n"
               << "Valid options:\n"
@@ -130 +144 @@
               << "  -h [--help]    : display this help and exit\n"
               << "  -r [--root] arg : svn controlled directory to perform\n"
-              << "                    statistics calculation on [.]\n"
+              << "                    statistics calculation on [" 
+              << root_ << "]\n"
               << "  -rev [--revisions]: Use revision numbers as time scale\n"
               << "                      instead of dates [dates].\n"
-              << "  -t [--target] arg : output directory [.]\n"
+              << "  -t [--target] arg : output directory [" 
+              << targetdir_ << "]\n"
               << "  -v [--verbose] : explain what is being done\n"
               << "  --version      : print version information and exit\n"

trunk/bin/Parameter.h

@@ -36 +36 @@
     inline bool force(void) const { return force_; }
     inline bool revisions(void) const { return revisions_; }
+    /// @return absolute path to root directory
     inline const std::string& root(void) const { return root_; }
+    /// @return absolute path to target directory
     inline const std::string& targetdir(void) const { return targetdir_; }
     inline bool verbose(void) const { return verbose_; }