File fix-missing-log-item-closure.patch of Package subversion

Overview Repositories Revisions Requests Users Attributes Meta

File fix-missing-log-item-closure.patch of Package subversion (Revision 01b59f0fba436858f8a89c93fa1aca2d)

Currently displaying revision 01b59f0fba436858f8a89c93fa1aca2d , Show latest

Index: subversion-1.14.x/subversion/libsvn_ra_serf/log.c
===================================================================
--- subversion-1.14.x/subversion/libsvn_ra_serf/log.c	(revision 1921195)
+++ subversion-1.14.x/subversion/libsvn_ra_serf/log.c	(working copy)
@@ -299,7 +299,9 @@
                                                         "subtractive-merge",
                                                         FALSE);
 
+      SVN_ERR_ASSERT(attrs);
       rev_str = svn_hash_gets(attrs, "revision");
+
       if (rev_str)
         {
           apr_int64_t rev;
Index: subversion-1.14.x/subversion/libsvn_repos/log.c
===================================================================
--- subversion-1.14.x/subversion/libsvn_repos/log.c	(revision 1921195)
+++ subversion-1.14.x/subversion/libsvn_repos/log.c	(working copy)
@@ -1325,6 +1325,12 @@
       baton.found_rev_of_interest = FALSE;
       baton.rev = rev;
       baton.log_target_history_as_mergeinfo = log_target_history_as_mergeinfo;
+#if 1
+      /* Is REV a merged revision we've already sent? */
+      if (nested_merges && handling_merged_revision && svn_bit_array__get(nested_merges, rev))
+	baton.inner = NULL;
+      else
+#endif
       baton.inner = callbacks->path_change_receiver;
       baton.inner_baton = callbacks->path_change_receiver_baton;
 
@@ -1334,6 +1340,15 @@
     }
   else
     {
+#if 1
+      /* Is REV a merged revision we've already sent? */
+      if (nested_merges && handling_merged_revision && svn_bit_array__get(nested_merges, rev))
+        {
+	  my_callbacks.path_change_receiver = NULL;
+	  callbacks = &my_callbacks;
+	}
+#endif
+      baton.inner = callbacks->path_change_receiver;
       baton.found_rev_of_interest = TRUE;
     }
 
@@ -1352,6 +1367,17 @@
         {
           if (svn_bit_array__get(nested_merges, rev))
             {
+#if 0
+	      if (baton.inner)
+		{
+		  /* Pass a scratch pool to ensure no temporary state stored
+		     by the receiver callback persists. */
+		  scratch_pool = svn_pool_create(pool);
+		  SVN_ERR(callbacks->revision_receiver(callbacks->revision_receiver_baton,
+						       &log_entry, scratch_pool));
+		  svn_pool_destroy(scratch_pool);
+		}
+#endif
               /* We already sent REV. */
               return SVN_NO_ERROR;
             }
@@ -1371,7 +1397,23 @@
                                            &log_entry, scratch_pool));
       svn_pool_destroy(scratch_pool);
     }
+#if 0
+  else if (baton.inner)
+    {
+      apr_pool_t *scratch_pool;
+      svn_repos_log_entry_t empty_log_entry = { 0 };
 
+      /* Send the empty revision.  */
+      empty_log_entry.revision = SVN_INVALID_REVNUM;
+      /* Pass a scratch pool to ensure no temporary state stored
+         by the receiver callback persists. */
+      scratch_pool = svn_pool_create(pool);
+      SVN_ERR(callbacks->revision_receiver(callbacks->revision_receiver_baton,
+					   &empty_log_entry, scratch_pool));
+      svn_pool_destroy(scratch_pool);
+    }
+#endif
+
   return SVN_NO_ERROR;
 }
 
@@ -1719,8 +1761,8 @@
         int limit,
         svn_boolean_t strict_node_history,
         svn_boolean_t include_merged_revisions,
+        svn_boolean_t subtractive_merge,
         svn_boolean_t handling_merged_revisions,
-        svn_boolean_t subtractive_merge,
         svn_boolean_t ignore_missing_locations,
         const apr_array_header_t *revprops,
         svn_boolean_t descending_order,
@@ -1773,7 +1815,7 @@
 {
   apr_array_header_t *combined_list = NULL;
   svn_repos_log_entry_t empty_log_entry = { 0 };
-  apr_pool_t *iterpool;
+  apr_pool_t *iterpool, *scratch_pool;
   int i;
 
   if (apr_hash_count(added_mergeinfo) == 0
@@ -1811,8 +1853,14 @@
 
   /* Send the empty revision.  */
   empty_log_entry.revision = SVN_INVALID_REVNUM;
-  return (callbacks->revision_receiver)(callbacks->revision_receiver_baton,
-                                        &empty_log_entry, pool);
+  /* Pass a scratch pool to ensure no temporary state stored
+     by the receiver callback persists. */
+  scratch_pool = svn_pool_create(pool);
+  SVN_ERR(callbacks->revision_receiver(callbacks->revision_receiver_baton,
+				       &empty_log_entry, scratch_pool));
+  svn_pool_destroy(scratch_pool);
+
+  return SVN_NO_ERROR;
 }
 
 /* This is used by do_logs to differentiate between forward and
Index: subversion-1.14.x/subversion/mod_dav_svn/reports/log.c
===================================================================
--- subversion-1.14.x/subversion/mod_dav_svn/reports/log.c	(revision 1921195)
+++ subversion-1.14.x/subversion/mod_dav_svn/reports/log.c	(working copy)
@@ -61,6 +61,9 @@
      callbacks. */
   svn_boolean_t needs_log_item;
 
+  /* Whether we've written the </S:log-item> closure for the current report. */
+  svn_boolean_t needs_log_item_closure;
+
   /* How deep we are in the log message tree.  We only need to surpress the
      SVN_INVALID_REVNUM message if the stack_depth is 0. */
   int stack_depth;
@@ -107,6 +110,7 @@
       SVN_ERR(dav_svn__brigade_printf(lrb->bb, lrb->output,
                                       "<S:log-item>" DEBUG_CR));
       lrb->needs_log_item = FALSE;
+      lrb->needs_log_item_closure = TRUE;
     }
 
   return SVN_NO_ERROR;
@@ -233,7 +237,10 @@
       /* If the stack depth is zero, we've seen the last revision, so don't
          send it, just return.  The footer will be sent later. */
       if (lrb->stack_depth == 0)
-        return SVN_NO_ERROR;
+	{
+	  if (lrb->needs_log_item_closure == FALSE)
+	    return SVN_NO_ERROR;
+	}
       else
         lrb->stack_depth--;
     }
@@ -322,6 +329,7 @@
 
   SVN_ERR(dav_svn__brigade_puts(lrb->bb, lrb->output,
                                 "</S:log-item>" DEBUG_CR));
+  lrb->needs_log_item_closure = FALSE;
 
   /* In general APR will flush the brigade every 8000 bytes through the filter
      stack, but log items may not be generated that fast, especially in
@@ -493,6 +501,7 @@
   lrb.output = output;
   lrb.needs_header = TRUE;
   lrb.needs_log_item = TRUE;
+  lrb.needs_log_item_closure = FALSE;
   lrb.stack_depth = 0;
   /* lrb.requested_custom_revprops set above */

Places

File fix-missing-log-item-closure.patch of Package subversion (Revision 01b59f0fba436858f8a89c93fa1aca2d)

Places