subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1189281 - in /subversion/trunk/subversion/libsvn_client: mergeinfo.c ra.c
Date Wed, 26 Oct 2011 16:02:02 GMT
Author: julianfoad
Date: Wed Oct 26 16:02:01 2011
New Revision: 1189281

URL: http://svn.apache.org/viewvc?rev=1189281&view=rev
Log:
Open temporary sessions in the pool provided for that purpose, so that they
get closed immediately after use. A follow-up to r1167168.

* subversion/libsvn_client/mergeinfo.c
  (svn_client_mergeinfo_log): As above.

* subversion/libsvn_client/ra.c
  (svn_client__get_youngest_common_ancestor): Same.

Modified:
    subversion/trunk/subversion/libsvn_client/mergeinfo.c
    subversion/trunk/subversion/libsvn_client/ra.c

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1189281&r1=1189280&r2=1189281&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Wed Oct 26 16:02:01 2011
@@ -1722,7 +1722,6 @@ svn_client_mergeinfo_log(svn_boolean_t f
   /* Open RA sessions to the repository for the source and target.
    * ### TODO: As the source and target must be in the same repository, we
    * should share a single session, tracking the two URLs separately. */
-
   if (!finding_merged)
     {
       svn_revnum_t target_peg_revnum;
@@ -1732,7 +1731,7 @@ svn_client_mergeinfo_log(svn_boolean_t f
                                                target_path_or_url, NULL,
                                                target_peg_revision,
                                                target_peg_revision,
-                                               ctx, scratch_pool));
+                                               ctx, sesspool));
 
       SVN_ERR(svn_client__get_history_as_mergeinfo(&target_history, NULL,
                                                    target_peg_revnum,
@@ -1741,7 +1740,6 @@ svn_client_mergeinfo_log(svn_boolean_t f
                                                    target_session, ctx,
                                                    scratch_pool));
     }
-
   {
     svn_revnum_t source_peg_revnum;
 
@@ -1750,7 +1748,7 @@ svn_client_mergeinfo_log(svn_boolean_t f
                                              source_path_or_url, NULL,
                                              source_peg_revision,
                                              source_peg_revision,
-                                             ctx, scratch_pool));
+                                             ctx, sesspool));
 
     SVN_ERR(svn_client__get_history_as_mergeinfo(&source_history, NULL,
                                                  source_peg_revnum,
@@ -1759,7 +1757,7 @@ svn_client_mergeinfo_log(svn_boolean_t f
                                                  source_session, ctx,
                                                  scratch_pool));
   }
-
+  /* Close the source and target sessions. */
   svn_pool_destroy(sesspool);
 
   /* Separate the explicit or inherited mergeinfo on TARGET_PATH_OR_URL, and possibly

Modified: subversion/trunk/subversion/libsvn_client/ra.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/ra.c?rev=1189281&r1=1189280&r2=1189281&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/ra.c (original)
+++ subversion/trunk/subversion/libsvn_client/ra.c Wed Oct 26 16:02:01 2011
@@ -795,13 +795,12 @@ svn_client__get_youngest_common_ancestor
     SVN_ERR(svn_client__ra_session_from_path(&session1, NULL, NULL,
                                              path_or_url1, NULL,
                                              &revision1, &revision1,
-                                             ctx, pool));
+                                             ctx, sesspool));
     SVN_ERR(svn_client__ra_session_from_path(&session2, NULL, NULL,
                                              path_or_url2, NULL,
                                              &revision2, &revision2,
-                                             ctx, pool));
+                                             ctx, sesspool));
   }
-
   /* We're going to cheat and use history-as-mergeinfo because it
      saves us a bunch of annoying custom data comparisons and such. */
   SVN_ERR(svn_client__get_history_as_mergeinfo(&history1,
@@ -816,7 +815,7 @@ svn_client__get_youngest_common_ancestor
                                                SVN_INVALID_REVNUM,
                                                SVN_INVALID_REVNUM,
                                                session2, ctx, pool));
-
+  /* Close the source and target sessions. */
   svn_pool_destroy(sesspool);
 
   /* Loop through the first location's history, check for overlapping



Mime
View raw message