Changeset 1108

Timestamp:

Jul 1, 2010, 3:14:23 PM (13 years ago)

Author:

Peter Johansson

Message:

refs #458. If we lack read permission for rev, no date is retrived and
we use the date of the previous rev. This should be OK in the case
when call the log for the entire repository, but might be problematic
when calling logs of sub-nodes. Added an assertion to check that we
don't use the workaround when calling log for a sub-node.

File:

• branches/0.7-stable/lib/SVNlog.cc (modified) (2 diffs)

branches/0.7-stable/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
@@ -92 +92 @@
   {
     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, let's do the following check:
+      assert(rev == lb->commits.rbegin()->rev()+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])