Changeset 579

Timestamp:

Mar 18, 2008, 3:11:51 PM (16 years ago)

Author:

Peter Johansson

Message:

Merged patch release 0.6.5 to the trunk. Delta 0.6.5 - 0.6.4

Location:

trunk

Files:

• ChangeLog (modified) (2 diffs)
• NEWS (modified) (2 diffs)
• bin/Parameter.cc (modified) (2 diffs)
• bin/svndigest.cc (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• lib/File.cc (modified) (2 diffs)
• lib/SVN.cc (modified) (5 diffs)
• lib/SVN.h (modified) (5 diffs)

trunk/ChangeLog

@@ -4 +4 @@
 Copyright (C) 2005, 2006 Jari Häkkinen
 Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+Copyright (C) 2008 Peter Johansson
 
 This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -30 +31 @@
   - http://trac.thep.lu.se/svndigest/log/trunk?rev=HEAD&stop_rev=418
   - http://trac.thep.lu.se/svndigest/query?milestone=0.7&order=id
+
+version 0.6.5:
+  - http://trac.thep.lu.se/trac/svndigest/log/branches/0.6-stable?rev=575&stop_rev=491
+  - http://trac.thep.lu.se/trac/svndigest/query?milestone=0.6.5&order=id
 
 version 0.6.4:

trunk/NEWS

@@ -3 +3 @@
 See the end of this file for copyrights and conditions.
 
+<<<<<<< .working
 Version 0.7 (released DATE)
   - configure option --enable-wctests is removed (ticket:295)
@@ -10 +11 @@
   http://trac.thep.lu.se/svndigest/query?status=closed&milestone=0.7
 
+=======
+version 0.6.5 (released 18 March 2008)
+  - Fixed color bug in blame output (ticket:278)
+  - Improved error handling when --root parameter is incorrect.
+
+  A complete list of closed tickets can be found here [[br]]
+  http://trac.thep.lu.se/trac/svndigest/query?status=closed&milestone=0.6.5
+
+>>>>>>> .merge-right.r578
 version 0.6.4 (released 14 October 2007)
   - fixed bug stats were double counted when root was a file (ticket:272)

trunk/bin/Parameter.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -146 +147 @@
     string workdir(pwd()); // remember current working directory (cwd).
 
+    bool root_ok = node_exist(root_) && !access_rights(root_, "r");
+    
+    if (root_ok) {
+      // Check that root_ is a directory
+      struct stat nodestat;
+      stat(root_.c_str(), &nodestat);
+      if (!S_ISDIR(nodestat.st_mode))
+        throw runtime_error(string("svndigest: accessing `") + root_ +
+                            "': Not a directory.");
+    }
+
     // Checking that root_ exists and retrieve the absolute path to root_
-    if (chdir(root_.c_str()))
+    if (!root_ok || chdir(root_.c_str()))
       throw runtime_error(string("svndigest: Root directory (") + root_ +
                           ") access failed.");
     root_ = pwd();
+
+      
 
     // need to get back to cwd if relative paths are used.

trunk/bin/svndigest.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -100 +101 @@
   }
   catch (SVNException e) {
-    std::cerr << "\nsvndigest: " << e.what()
-              << "\nsvndigest: failed to initilize subversion access for "
-              << option->root() << std::endl;
+    std::cerr << "svndigest: " << e.what() << "\n";
     exit(-1);
   }

trunk/configure.ac

@@ -13 +13 @@
 # Copyright (C) 2006 Jari Häkkinen
 # Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2008 Peter Johansson
 #
 # This file is part of svndigest, http://trac.thep.lu.se/svndigest

trunk/lib/File.cc

@@ -34 +34 @@
 #include "SVNlog.h"
 
+#include <algorithm>
 #include <cassert>
 #include <cstdio>
@@ -229 +230 @@
     else {
       last = Date(GnuplotFE::instance()->dates().back()).seconds();
-      first = Date(GnuplotFE::instance()->dates()[0]).seconds();
+      // earliest date corresponds either to revision 0 or revision 1 
+      first = std::min(Date(GnuplotFE::instance()->dates()[0]).seconds(),
+                       Date(GnuplotFE::instance()->dates()[1]).seconds());
     }
     // color is calculated linearly on time, c = kt + m

trunk/lib/SVN.cc

@@ -4 +4 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -98 +99 @@
     // setup, maybe this is unnecessary?
     const char* canonical_path=svn_path_internal_style(path.c_str(), pool_);
-    if (svn_error_t *err=svn_wc_adm_open3(&adm_access_, NULL, canonical_path,
-                                          false, -1, context_->cancel_func,
-                                          context_->cancel_baton, pool_))
+    if ((err=svn_wc_adm_open3(&adm_access_, NULL, canonical_path,
+                              false, -1, context_->cancel_func,
+                              context_->cancel_baton, pool_))){
+      if (err->apr_err == SVN_ERR_WC_NOT_DIRECTORY)
+        cleanup_failed_init(err, std::string(err->message), true);
       cleanup_failed_init(err, "SVN: svn_wc_adm_open3 failed");
+    }
 
     // get a session to the repository
     struct root_url_receiver_baton rurb;
     client_info(path, root_url_receiver, static_cast<void*>(&rurb));
-    if (svn_error_t *err=svn_client_open_ra_session(&ra_session_,
-                                                    rurb.path.c_str(),
-                                                    context_, pool_))
+    if ((err=svn_client_open_ra_session(&ra_session_,
+                                        rurb.path.c_str(),
+                                        context_, pool_)))
       cleanup_failed_init(err, "SVN: svn_client_open_ra_session failed");
   }
@@ -118 +122 @@
       svn_error_clear(svn_wc_adm_close(adm_access_));
     svn_pool_destroy(pool_);
-    apr_allocator_destroy(allocator_);
+    pool_=NULL;
     // other apr resources acquired in svn_cmdline_init are destroyed
     // at program exit, ok since SVN is a singleton
@@ -125 +129 @@
 
   void SVN::cleanup(svn_error_t *err,apr_pool_t *pool,
-                    const std::string& message)
-  {
-    svn_handle_error2(err,stderr,false,"svndigest: ");
+                    std::string message, bool mute)
+  {
+    if (!mute)
+      svn_handle_error2(err,stderr,false,"svndigest: ");
     svn_error_clear(err);
-    if (pool)
+    if (pool){
       svn_pool_destroy(pool);
+      pool=NULL;
+    }
     if (message.length()>0)
       throw SVNException(message);
@@ -136 +143 @@
 
 
-  void SVN::cleanup_failed_init(svn_error_t *err, const std::string& message)
-  {
-    cleanup(err,pool_);
-    apr_allocator_destroy(allocator_);
+  void SVN::cleanup_failed_init(svn_error_t *err, const std::string& message,
+                                bool mute)
+  {
+    cleanup(err,pool_, "", true);
     throw SVNException(message);
   }

trunk/lib/SVN.h

@@ -7 +7 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -211 +212 @@
     ///
     SVN(const SVN&);
+    SVN& operator=(const SVN&);
 
     ///
@@ -222 +224 @@
        This function will write an error message to stdout, free \a
        err and \a pool resources. If \a err or \a pool are a NULL
-       pointers the function will do nothing with these resources.
+       pointers the function will do nothing with these resources. If
+       \a mute is true, no error message is written.
 
        cleanup will throw a SVNException if \a message has
@@ -231 +234 @@
     */
     void cleanup(svn_error_t *err, apr_pool_t *pool,
-                 const std::string& message=std::string());
+                 std::string message=std::string(), bool mute=false);
 
     /**
@@ -243 +246 @@
        @see SVNException
     */
-    void cleanup_failed_init(svn_error_t *err, const std::string& message);
+    void cleanup_failed_init(svn_error_t *err, const std::string& message,
+                             bool mute=false);
 
     static SVN* instance_;