Changeset 1115 for trunk/lib/SVNlog.cc

Timestamp:

Jul 3, 2010, 10:13:59 PM (11 years ago)

Author:

Peter Johansson

Message:

Merging patch release 0.7.5 to the trunk. Delta 0.7.5 - 0.7.4

File:

• trunk/lib/SVNlog.cc (modified) (4 diffs)

trunk/lib/SVNlog.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -28 +28 @@
 #include <algorithm>
 #include <cassert>
+#include <iostream>
 #include <stdexcept>
 #include <sstream>
@@ -92 +93 @@
   {
     struct log_receiver_baton *lb=static_cast<struct log_receiver_baton*>(baton);
-    if (!date || !date[0])
-      throw SVNException("No date defined for revision: " + rev); 
+    std::string d;
+    if (date && date[0])
+      d = date;
+    else if (!lb->commits.empty()) {
+      // FIXME: this is a bit hackish to fix the problem reported in
+      // ticket #458. If we lack read permission for rev, no date is
+      // retrived and we use the date of the previous rev. That should
+      // be OK if we call the super-root and previous rev truly is
+      // rev-1 (super-root contains all revs). That should be the
+      // typical case where this happens. If this would happen when
+      // calling the log of a sub-node (e.g. the trunk) this could be
+      // problematic because log is more or less sparse and when
+      // merging two sparse logs together this workaround could have
+      // strange effects such as rev+1 having a earlier date than
+      // rev. To ensure that we only allow this workaround when
+      // calling super-root, we have the assert below:
+      std::cerr << "no date defined for revision: " << rev << "\n";
+      assert(rev == lb->commits.rbegin()->revision()+1);
+      d = lb->commits.rbegin()->date();
+    }
+    else {
+      std::stringstream msg;
+      msg << "No date defined for revision: " << rev;
+      throw SVNException(msg.str()); 
+    }
     std::string a;
     if (author && author[0])
@@ -100 +124 @@
     if (msg)
       message = msg;
-    lb->commits.insert(lb->commits.end(), Commitment(a, date, message, rev));
+    lb->commits.insert(lb->commits.end(), Commitment(a, d, message, rev));
     return SVN_NO_ERROR;
   }