You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/10/26 12:18:11 UTC
svn commit: r1189109 - in
/subversion/branches/showing-merge-info/subversion/svn: cl.h util.c
Author: julianfoad
Date: Wed Oct 26 10:18:10 2011
New Revision: 1189109
URL: http://svn.apache.org/viewvc?rev=1189109&view=rev
Log:
On the 'showing-merge-info' branch: Rename the function to abbreviate a
rangelist.
* subversion/svn/cl.h,
subversion/svn/util.c
(svn_cl__rangelist_to_string_elided): Rename to
'svn_cl__rangelist_to_string_abbreviated'.
Modified:
subversion/branches/showing-merge-info/subversion/svn/cl.h
subversion/branches/showing-merge-info/subversion/svn/util.c
Modified: subversion/branches/showing-merge-info/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/svn/cl.h?rev=1189109&r1=1189108&r2=1189109&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/svn/cl.h (original)
+++ subversion/branches/showing-merge-info/subversion/svn/cl.h Wed Oct 26 10:18:10 2011
@@ -850,11 +850,11 @@ svn_cl__find_merge_source_branch(svn_cli
* MAX_RANGES, print the first few ranges, an ellipsis "...", and the last
* range, such that the total number of ranges printed is MAX_RANGES-1. */
svn_error_t *
-svn_cl__rangelist_to_string_elided(const char **ranges_string,
- apr_array_header_t *ranges,
- int max_ranges,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_cl__rangelist_to_string_abbreviated(const char **ranges_string,
+ apr_array_header_t *ranges,
+ int max_ranges,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
#ifdef __cplusplus
}
Modified: subversion/branches/showing-merge-info/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/svn/util.c?rev=1189109&r1=1189108&r2=1189109&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/svn/util.c (original)
+++ subversion/branches/showing-merge-info/subversion/svn/util.c Wed Oct 26 10:18:10 2011
@@ -1473,11 +1473,11 @@ svn_cl__find_merge_source_branch(svn_cli
}
svn_error_t *
-svn_cl__rangelist_to_string_elided(const char **ranges_string,
- apr_array_header_t *ranges,
- int max_ranges,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_cl__rangelist_to_string_abbreviated(const char **ranges_string,
+ apr_array_header_t *ranges,
+ int max_ranges,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
if (ranges->nelts <= max_ranges)
{