Changeset 240

Timestamp:

Apr 28, 2007, 3:43:54 AM (14 years ago)

Author:

Peter Johansson

Message:

removed -rev flag (there is still --revsions). Changed help output to be more gnu-like. Changed default config-file to be <ROOT>/.svndigest/config.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• bin/Parameter.cc (modified) (4 diffs)
• bin/Parameter.h (modified) (1 diff)

trunk/ChangeLog

@@ -22 +22 @@
 ======================================================================
 
-
+version 0.6:
+  - Removed option flag '-rev'
+  
 version 0.5:
   - Updated documentation.

trunk/bin/Parameter.cc

@@ -73 +73 @@
         }
       }
-      else if (myargv=="-rev" || myargv=="--revisions") {
+      else if (myargv=="--revisions") {
           revisions_=true;
           ok=true;
@@ -135 +135 @@
     // return back to cwd
     if (chdir(workdir.c_str()))
-      runtime_error(string("svndigest: Failed to access cwd: ") + workdir);
-
-    if (config_file_.empty())
-      runtime_error(string("svndigest: Parameter --config-file requires argument."));
-
+      throw runtime_error(string("svndigest: Failed to access cwd: ") + workdir);
+
+  }
+
+
+  std::string Parameter::config_file(void) const
+  {
+    // not default
+    if (!config_file_.empty())
+      return config_file_;
+    
+    // default behaviour
+    return root()+"/.svndigest/config";
   }
 
@@ -145 +153 @@
   void Parameter::defaults(void)
   {
-    config_file_ = getenv("HOME")+"/.svndigest/config";
+    config_file_ = "";
     copyright_=false;
     force_=false;
@@ -180 +188 @@
     std::cout << "\nValid options:\n";
 
-    cs2  << "--copyright\t:\tupdate copyright statement\n" 
-         << "--config-file arg\t:\tconfiguration file [" 
-         << config_file_ << "]\n"
-         << "-f [--force]\t:\tremove target directory/file if it exists "
-         << "[no force]. NOTE recursive delete.\n"
-         << "-g [--generate-config]\t:\twrite configuration file " 
+    cs2  << "    --copyright\t:\tupdate copyright statement\n" 
+         << "    --config-file=ARG\t:\tconfiguration file " 
+         << "[<ROOT>/.svndigest/config]\n"
+         << "-f, --force\t:\tremove target directory/file if it exists "
+         << "NOTE recursive delete.\n"
+         << "-g, --generate-config\t:\twrite configuration file " 
          << "to standard output and exit\n"
-         << "-h [--help]\t:\tdisplay this help and exit\n"
-         << "-r [--root] arg\t:\tsvn controlled directory to perform "
+         << "-h, --help\t:\tdisplay this help and exit\n"
+         << "-r, --root=ROOT\t:\tsvn controlled directory to perform "
          << "statistics calculation on [" << root_ << "]\n"
-         << "-rev [--revisions]\t:\tUse revision numbers as time scale "
+         << "    --revisions\t:\tUse revision numbers as time scale "
          << "instead of dates [dates].\n"
-         << "-t [--target] arg\t:\toutput directory [" << targetdir_ << "]\n"
-         << "-v [--verbose]\t:\texplain what is being done\n"
-         << "--version\t:\tprint version information and exit\n";
+         << "-t, --target=TARGET\t:\toutput directory [" << targetdir_ << "]\n"
+         << "-v, --verbose\t:\texplain what is being done\n"
+         << "    --version\t:\tprint version information and exit\n";
     std::cout << std::endl;
   }

trunk/bin/Parameter.h

@@ -36 +36 @@
   public:
     Parameter(const int argc,const char *argv[]);
-    inline std::string config_file(void) const { return config_file_; }
+    std::string config_file(void) const;
     inline bool copyright(void) const { return copyright_; }
     /// @todo