Login | Register
My pages Projects Community openCollabNet

Discussions > svn > svn commit: r35136 - trunk/subversion/libsvn_client

subversion
Discussion topic

Back to topic list

svn commit: r35136 - trunk/subversion/libsvn_client

Author hwright
Full name Hyrum K. Wright
Date 2009-01-09 14:06:09 PST
Message Author: hwright
Date: Fri Jan 9 14:06:13 2009
New Revision: 35136

Log:
Remove the use of a deprecated function.

* subversion/libsvn_cl​ient/mergeinfo.c
  (logs_for_mergeinfo_rangelist): Use the newest log API.

Modified:
   trunk/subversion/lib​svn_client/mergeinfo​.c

Modified: trunk/subversion/lib​svn_client/mergeinfo​.c
URL: http://svn.collab.ne​t/viewvc/svn/trunk/s​ubversion/libsvn_cli​ent/mergeinfo.c?path​rev=35136&r1=351​35&r2=35136
====================​====================​====================​==================
--- trunk/subversion/lib​svn_client/mergeinfo​.c Fri Jan 9 13:18:56 2009 (r35135)
+++ trunk/subversion/lib​svn_client/mergeinfo​.c Fri Jan 9 14:06:13 2009 (r35136)
@@ -1086,7 +1086,8 @@ logs_for_mergeinfo_r​angelist(const char
 {
   apr_array_header_t *target;
   svn_merge_range_t *oldest_range, *youngest_range;
- svn_opt_revision_t oldest_rev, youngest_rev;
+ svn_opt_revision_range_t *revision_range;
+ apr_array_header_t *ranges;
   struct filter_log_entry_baton_t fleb;
 
   if (! rangelist->nelts)
@@ -1101,13 +1102,17 @@ logs_for_mergeinfo_r​angelist(const char
   APR_ARRAY_PUSH(target, const char *) = source_url;
 
   /* Calculate and construct the bounds of our log request. */
+ revision_range = apr_pcalloc(pool, sizeof(*revision_range));
   youngest_range = APR_ARRAY_IDX(rangelist, rangelist->nelts - 1,
                                  svn_merge_range_t *);
- youngest_rev.kind = svn_opt_revision_number;
- youngest_rev.value.number = youngest_range->end;
+ revision_range->start.kind = svn_opt_revision_number;
+ revision_range->s​tart.value.number = youngest_range->end;
   oldest_range = APR_ARRAY_IDX(rangelist, 0, svn_merge_range_t *);
- oldest_rev.kind = svn_opt_revision_number;
- oldest_rev.value.number = oldest_range->start;
+ revision_range->end.kind = svn_opt_revision_number;
+ revision_range->e​nd.value.number = oldest_range->start;
+
+ ranges = apr_array_make(pool, 1, sizeof(svn_opt_revision_range_t *));
+ APR_ARRAY_PUSH(ranges, svn_opt_revision_range_t *) = revision_range;
 
   /* Build the log filtering callback baton. */
   fleb.rangelist = rangelist;
@@ -1116,8 +1121,8 @@ logs_for_mergeinfo_r​angelist(const char
   fleb.ctx = ctx;
 
   /* Drive the log. */
- SVN_ERR(svn_client_log4(target, &youngest_rev, &oldest_rev, &youngest_rev,
- 0, discover_changed_paths, FALSE, FALSE, revprops,
+ SVN_ERR(svn_client_log5(target, &revision_range->start, ranges, 0,
+ discover_changed_paths, FALSE, FALSE, revprops,
                           filter_log_entry_wit​h_rangelist, &fleb, ctx, pool));
 
   /* Check for cancellation. */

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r35136 - trunk/subversion/libsvn_client hwright Hyrum K. Wright 2009-01-09 14:06:09 PST
Messages per page: