You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by vm...@apache.org on 2012/12/23 07:28:21 UTC
svn commit: r1425420 - in /subversion/branches/javahl-ra: ./
subversion/bindings/javahl/native/ subversion/bindings/swig/
subversion/bindings/swig/include/
subversion/bindings/swig/python/libsvn_swig_py/ subversion/include/
subversion/include/private/ ...
Author: vmpn
Date: Sun Dec 23 06:28:21 2012
New Revision: 1425420
URL: http://svn.apache.org/viewvc?rev=1425420&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with JavaHL changes on trunk@1367113
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.h
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/javahl-ra/subversion/bindings/swig/core.i
subversion/branches/javahl-ra/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/javahl-ra/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/javahl-ra/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/javahl-ra/subversion/include/svn_client.h
subversion/branches/javahl-ra/subversion/include/svn_mergeinfo.h
subversion/branches/javahl-ra/subversion/libsvn_client/diff.c
subversion/branches/javahl-ra/subversion/libsvn_client/merge.c
subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.c
subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.h
subversion/branches/javahl-ra/subversion/libsvn_client/ra.c
subversion/branches/javahl-ra/subversion/libsvn_fs_util/fs-util.c
subversion/branches/javahl-ra/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/javahl-ra/subversion/libsvn_repos/log.c
subversion/branches/javahl-ra/subversion/libsvn_repos/rev_hunt.c
subversion/branches/javahl-ra/subversion/libsvn_subr/deprecated.c
subversion/branches/javahl-ra/subversion/libsvn_subr/mergeinfo.c
subversion/branches/javahl-ra/subversion/svndumpfilter/main.c
subversion/branches/javahl-ra/subversion/svnrdump/load_editor.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1367113
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp Sun Dec 23 06:28:21 2012
@@ -977,7 +977,7 @@ CreateJ::CommitInfo(const svn_commit_inf
}
jobject
-CreateJ::RevisionRangeList(apr_array_header_t *ranges)
+CreateJ::RevisionRangeList(svn_rangelist_t *ranges)
{
JNIEnv *env = JNIUtil::getEnv();
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.h?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.h (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.h Sun Dec 23 06:28:21 2012
@@ -77,7 +77,7 @@ class CreateJ
CommitInfo(const svn_commit_info_t *info);
static jobject
- RevisionRangeList(apr_array_header_t *ranges);
+ RevisionRangeList(svn_rangelist_t *ranges);
static jobject
StringSet(apr_array_header_t *strings);
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp Sun Dec 23 06:28:21 2012
@@ -760,7 +760,7 @@ SVNClient::getMergeinfo(const char *targ
jstring jpath = JNIUtil::makeJString((const char *) path);
jobject jranges =
- CreateJ::RevisionRangeList((apr_array_header_t *) val);
+ CreateJ::RevisionRangeList((svn_rangelist_t *) val);
env->CallVoidMethod(jmergeinfo, addRevisions, jpath, jranges);
Modified: subversion/branches/javahl-ra/subversion/bindings/swig/core.i
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/swig/core.i?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/swig/core.i (original)
+++ subversion/branches/javahl-ra/subversion/bindings/swig/core.i Sun Dec 23 06:28:21 2012
@@ -259,34 +259,34 @@
/* -----------------------------------------------------------------------
input rangelist
*/
-%apply apr_array_header_t *RANGELIST {
- apr_array_header_t *rangeinput,
- const apr_array_header_t *rangelist,
- apr_array_header_t *from,
- apr_array_header_t *to,
- apr_array_header_t *changes,
- apr_array_header_t *eraser,
- apr_array_header_t *whiteboard,
- apr_array_header_t *rangelist1,
- apr_array_header_t *rangelist2
+%apply svn_rangelist_t *RANGELIST {
+ svn_rangelist_t *rangeinput,
+ const svn_rangelist_t *rangelist,
+ svn_rangelist_t *from,
+ svn_rangelist_t *to,
+ svn_rangelist_t *changes,
+ svn_rangelist_t *eraser,
+ svn_rangelist_t *whiteboard,
+ svn_rangelist_t *rangelist1,
+ svn_rangelist_t *rangelist2
}
/* -----------------------------------------------------------------------
output rangelist
*/
-%apply apr_array_header_t **RANGELIST {
- apr_array_header_t **rangelist,
- apr_array_header_t **inheritable_rangelist,
- apr_array_header_t **deleted,
- apr_array_header_t **added,
- apr_array_header_t **output
+%apply svn_rangelist_t **RANGELIST {
+ svn_rangelist_t **rangelist,
+ svn_rangelist_t **inheritable_rangelist,
+ svn_rangelist_t **deleted,
+ svn_rangelist_t **added,
+ svn_rangelist_t **output
}
/* -----------------------------------------------------------------------
input and output rangelist
*/
-%apply apr_array_header_t **RANGELIST_INOUT {
- apr_array_header_t **rangelist_inout
+%apply svn_rangelist_t **RANGELIST_INOUT {
+ svn_rangelist_t **rangelist_inout
}
/* -----------------------------------------------------------------------
@@ -1145,15 +1145,15 @@ svn_swig_mergeinfo_sort(apr_hash_t **mer
}
static svn_error_t *
-svn_swig_rangelist_merge(apr_array_header_t **rangelist_inout,
- apr_array_header_t *changes,
+svn_swig_rangelist_merge(svn_rangelist_t **rangelist_inout,
+ svn_rangelist_t *changes,
apr_pool_t *pool)
{
return svn_rangelist_merge(rangelist_inout, changes, pool);
}
static svn_error_t *
-svn_swig_rangelist_reverse(apr_array_header_t **rangelist_inout,
+svn_swig_rangelist_reverse(svn_rangelist_t **rangelist_inout,
apr_pool_t *pool)
{
return svn_rangelist_reverse(*rangelist_inout, pool);
Modified: subversion/branches/javahl-ra/subversion/bindings/swig/include/svn_containers.swg
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/swig/include/svn_containers.swg?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/swig/include/svn_containers.swg (original)
+++ subversion/branches/javahl-ra/subversion/bindings/swig/include/svn_containers.swg Sun Dec 23 06:28:21 2012
@@ -692,10 +692,11 @@
/* -----------------------------------------------------------------------
Input of apr_array_header_t * <svn_merge_range_t *>
+ (that is: svn_rangelist_t *)
*/
#ifdef SWIGPYTHON
-%typemap(in) apr_array_header_t *RANGELIST {
- $1 = (apr_array_header_t *) svn_swig_py_seq_to_array($input,
+%typemap(in) svn_rangelist_t *RANGELIST {
+ $1 = (svn_rangelist_t *) svn_swig_py_seq_to_array($input,
sizeof(const svn_merge_range_t *),
svn_swig_py_unwrap_struct_ptr,
$descriptor(svn_merge_range_t *),
@@ -707,7 +708,7 @@
#endif
#ifdef SWIGRUBY
-%typemap(in) apr_array_header_t *RANGELIST {
+%typemap(in) svn_rangelist_t *RANGELIST {
$1 = svn_swig_rb_array_to_apr_array_merge_range($input, _global_pool);
}
#endif
@@ -809,7 +810,7 @@
Output of
apr_hash_t * <const char *,
apr_hash_t * <const char *,
- array_header_t * <svn_merge_range_t *>>>
+ apr_array_header_t * <svn_merge_range_t *>>>
*/
#ifdef SWIGRUBY
%typemap(argout) apr_hash_t **MERGEINFO_CATALOG
@@ -831,9 +832,10 @@
/* -----------------------------------------------------------------------
Output of apr_array_header_t * <svn_merge_range_t *>
+ (that is: svn_rangelist_t *)
*/
#ifdef SWIGPYTHON
-%typemap(argout) apr_array_header_t **RANGELIST {
+%typemap(argout) svn_rangelist_t **RANGELIST {
%append_output
(svn_swig_py_pointerlist_to_list(*$1, $descriptor(svn_merge_range_t *),
_global_py_pool));
@@ -842,10 +844,10 @@
}
}
-%typemap(in) apr_array_header_t **RANGELIST_INOUT ($*1_ltype temp)
+%typemap(in) svn_rangelist_t **RANGELIST_INOUT ($*1_ltype temp)
{
$1 = &temp;
- *$1 = (apr_array_header_t *) svn_swig_py_seq_to_array($input,
+ *$1 = (svn_rangelist_t *) svn_swig_py_seq_to_array($input,
sizeof(const svn_merge_range_t *),
svn_swig_py_unwrap_struct_ptr,
$descriptor(svn_merge_range_t *),
@@ -858,11 +860,11 @@
#endif
#ifdef SWIGRUBY
-%typemap(argout) apr_array_header_t **RANGELIST {
+%typemap(argout) svn_rangelist_t **RANGELIST {
%append_output(svn_swig_rb_apr_array_to_array_merge_range(*$1));
}
-%typemap(in) apr_array_header_t **RANGELIST_INOUT ($*1_ltype temp)
+%typemap(in) svn_rangelist_t **RANGELIST_INOUT ($*1_ltype temp)
{
$1 = &temp;
*$1 = svn_swig_rb_array_to_apr_array_merge_range($input, _global_pool);
@@ -870,8 +872,8 @@
#endif
#if defined(SWIGPYTHON) || defined(SWIGRUBY)
-%typemap(argout) apr_array_header_t **RANGELIST_INOUT =
- apr_array_header_t **RANGELIST;
+%typemap(argout) svn_rangelist_t **RANGELIST_INOUT =
+ svn_rangelist_t **RANGELIST;
#endif
/* -----------------------------------------------------------------------
Modified: subversion/branches/javahl-ra/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/branches/javahl-ra/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Sun Dec 23 06:28:21 2012
@@ -988,7 +988,7 @@ apr_hash_t *svn_swig_py_mergeinfo_from_d
PyObject *key = PyList_GetItem(keys, i);
PyObject *value = PyDict_GetItem(dict, key);
const char *pathname = make_string_from_ob(key, pool);
- const apr_array_header_t *ranges = svn_swig_py_seq_to_array(value,
+ const svn_rangelist_t *ranges = svn_swig_py_seq_to_array(value,
sizeof(const svn_merge_range_t *),
svn_swig_py_unwrap_struct_ptr,
svn_swig_TypeQuery("svn_merge_range_t *"),
Modified: subversion/branches/javahl-ra/subversion/include/private/svn_mergeinfo_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/private/svn_mergeinfo_private.h?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/private/svn_mergeinfo_private.h (original)
+++ subversion/branches/javahl-ra/subversion/include/private/svn_mergeinfo_private.h Sun Dec 23 06:28:21 2012
@@ -41,7 +41,7 @@ extern "C" {
/* Set inheritability of all ranges in RANGELIST to INHERITABLE.
If RANGELIST is NULL do nothing. */
void
-svn_rangelist__set_inheritance(apr_array_header_t *rangelist,
+svn_rangelist__set_inheritance(svn_rangelist_t *rangelist,
svn_boolean_t inheritable);
/* Parse a rangelist from the string STR. Set *RANGELIST to the result,
@@ -52,7 +52,7 @@ svn_rangelist__set_inheritance(apr_array
* Unlike svn_mergeinfo_parse(), this does not sort the ranges into order
* or combine adjacent and overlapping ranges. */
svn_error_t *
-svn_rangelist__parse(apr_array_header_t **rangelist,
+svn_rangelist__parse(svn_rangelist_t **rangelist,
const char *str,
apr_pool_t *result_pool);
@@ -239,7 +239,7 @@ svn_mergeinfo__is_noninheritable(svn_mer
/* Return a rangelist with one svn_merge_range_t * element defined by START,
END, and INHERITABLE. The rangelist and its contents are allocated in
RESULT_POOL. */
-apr_array_header_t *
+svn_rangelist_t *
svn_rangelist__initialize(svn_revnum_t start,
svn_revnum_t end,
svn_boolean_t inheritable,
@@ -277,7 +277,7 @@ svn_mergeinfo__mergeinfo_from_segments(s
* RESULT_POOL. See svn_rangelist_merge2() for details of inheritability
* etc. */
svn_error_t *
-svn_rangelist__merge_many(apr_array_header_t *merged_rangelist,
+svn_rangelist__merge_many(svn_rangelist_t *merged_rangelist,
svn_mergeinfo_t mergeinfo,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/branches/javahl-ra/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_client.h?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_client.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_client.h Sun Dec 23 06:28:21 2012
@@ -3676,9 +3676,8 @@ svn_client_suggest_merge_sources(apr_arr
/**
* Get the mergeinfo for a single target node (ignoring any subtrees).
*
- * Set @a *mergeinfo to a hash mapping <tt>const char *</tt> merge
- * source URLs to <tt>apr_array_header_t *</tt> rangelists (arrays of
- * <tt>svn_merge_range_t *</tt> ranges) describing the ranges which
+ * Set @a *mergeinfo to a hash mapping <tt>const char *</tt> merge source
+ * URLs to <tt>svn_rangelist_t *</tt> rangelists describing the ranges which
* have been merged into @a path_or_url as of @a peg_revision, per
* @a path_or_url's explicit mergeinfo or inherited mergeinfo if no
* explicit mergeinfo if found. If no explicit or inherited mergeinfo
Modified: subversion/branches/javahl-ra/subversion/include/svn_mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_mergeinfo.h?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_mergeinfo.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_mergeinfo.h Sun Dec 23 06:28:21 2012
@@ -113,8 +113,8 @@ extern "C" {
*
* (a) Strings (@c svn_string_t *) containing "unparsed mergeinfo".
*
- * (b) A "rangelist". An array (@c apr_array_header_t *) of non-overlapping
- * merge ranges (@c svn_merge_range_t *), sorted as said by
+ * (b) @c svn_rangelist_t, called a "rangelist". An array of non-
+ * overlapping merge ranges (@c svn_merge_range_t *), sorted as said by
* @c svn_sort_compare_ranges(). An empty range list is represented by
* an empty array. Unless specifically noted otherwise, all APIs require
* rangelists that describe only forward ranges, i.e. the range's start
@@ -139,6 +139,7 @@ extern "C" {
* else, such as an RA session root.
*/
+typedef apr_array_header_t svn_rangelist_t;
typedef apr_hash_t *svn_mergeinfo_t;
typedef apr_hash_t *svn_mergeinfo_catalog_t;
@@ -295,8 +296,8 @@ svn_mergeinfo_remove2(svn_mergeinfo_t *m
* @since New in 1.5.
*/
svn_error_t *
-svn_rangelist_diff(apr_array_header_t **deleted, apr_array_header_t **added,
- const apr_array_header_t *from, const apr_array_header_t *to,
+svn_rangelist_diff(svn_rangelist_t **deleted, svn_rangelist_t **added,
+ const svn_rangelist_t *from, const svn_rangelist_t *to,
svn_boolean_t consider_inheritance,
apr_pool_t *pool);
@@ -319,8 +320,8 @@ svn_rangelist_diff(apr_array_header_t **
* @since New in 1.8.
*/
svn_error_t *
-svn_rangelist_merge2(apr_array_header_t *rangelist,
- const apr_array_header_t *changes,
+svn_rangelist_merge2(svn_rangelist_t *rangelist,
+ const svn_rangelist_t *changes,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -334,8 +335,8 @@ svn_rangelist_merge2(apr_array_header_t
*/
SVN_DEPRECATED
svn_error_t *
-svn_rangelist_merge(apr_array_header_t **rangelist,
- const apr_array_header_t *changes,
+svn_rangelist_merge(svn_rangelist_t **rangelist,
+ const svn_rangelist_t *changes,
apr_pool_t *pool);
/** Removes @a eraser (the subtrahend) from @a whiteboard (the
@@ -352,8 +353,8 @@ svn_rangelist_merge(apr_array_header_t *
* @since New in 1.5.
*/
svn_error_t *
-svn_rangelist_remove(apr_array_header_t **output, const apr_array_header_t *eraser,
- const apr_array_header_t *whiteboard,
+svn_rangelist_remove(svn_rangelist_t **output, const svn_rangelist_t *eraser,
+ const svn_rangelist_t *whiteboard,
svn_boolean_t consider_inheritance,
apr_pool_t *pool);
@@ -406,9 +407,9 @@ svn_mergeinfo_intersect(svn_mergeinfo_t
* @since New in 1.5.
*/
svn_error_t *
-svn_rangelist_intersect(apr_array_header_t **rangelist,
- const apr_array_header_t *rangelist1,
- const apr_array_header_t *rangelist2,
+svn_rangelist_intersect(svn_rangelist_t **rangelist,
+ const svn_rangelist_t *rangelist1,
+ const svn_rangelist_t *rangelist2,
svn_boolean_t consider_inheritance,
apr_pool_t *pool);
@@ -423,7 +424,7 @@ svn_rangelist_intersect(apr_array_header
* @since New in 1.5.
*/
svn_error_t *
-svn_rangelist_reverse(apr_array_header_t *rangelist, apr_pool_t *pool);
+svn_rangelist_reverse(svn_rangelist_t *rangelist, apr_pool_t *pool);
/** Take an array of svn_merge_range_t *'s in @a rangelist, and convert it
* back to a text format rangelist in @a output. If @a rangelist contains
@@ -433,7 +434,7 @@ svn_rangelist_reverse(apr_array_header_t
*/
svn_error_t *
svn_rangelist_to_string(svn_string_t **output,
- const apr_array_header_t *rangelist,
+ const svn_rangelist_t *rangelist,
apr_pool_t *pool);
/** Return a deep copy of @c svn_merge_range_t *'s in @a rangelist excluding
@@ -448,8 +449,8 @@ svn_rangelist_to_string(svn_string_t **o
* @since New in 1.7.
*/
svn_error_t *
-svn_rangelist_inheritable2(apr_array_header_t **inheritable_rangelist,
- const apr_array_header_t *rangelist,
+svn_rangelist_inheritable2(svn_rangelist_t **inheritable_rangelist,
+ const svn_rangelist_t *rangelist,
svn_revnum_t start,
svn_revnum_t end,
svn_boolean_t inheritable,
@@ -463,8 +464,8 @@ svn_rangelist_inheritable2(apr_array_hea
*/
SVN_DEPRECATED
svn_error_t *
-svn_rangelist_inheritable(apr_array_header_t **inheritable_rangelist,
- const apr_array_header_t *rangelist,
+svn_rangelist_inheritable(svn_rangelist_t **inheritable_rangelist,
+ const svn_rangelist_t *rangelist,
svn_revnum_t start,
svn_revnum_t end,
apr_pool_t *pool);
@@ -551,8 +552,8 @@ svn_mergeinfo_dup(svn_mergeinfo_t mergei
*
* @since New in 1.5.
*/
-apr_array_header_t *
-svn_rangelist_dup(const apr_array_header_t *rangelist, apr_pool_t *pool);
+svn_rangelist_t *
+svn_rangelist_dup(const svn_rangelist_t *rangelist, apr_pool_t *pool);
/**
Modified: subversion/branches/javahl-ra/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_client/diff.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_client/diff.c Sun Dec 23 06:28:21 2012
@@ -103,7 +103,7 @@ display_mergeinfo_diff(const char *old_m
hi; hi = apr_hash_next(hi))
{
const char *from_path = svn__apr_hash_index_key(hi);
- apr_array_header_t *merge_revarray = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *merge_revarray = svn__apr_hash_index_val(hi);
svn_string_t *merge_revstr;
svn_pool_clear(iterpool);
@@ -120,7 +120,7 @@ display_mergeinfo_diff(const char *old_m
hi; hi = apr_hash_next(hi))
{
const char *from_path = svn__apr_hash_index_key(hi);
- apr_array_header_t *merge_revarray = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *merge_revarray = svn__apr_hash_index_val(hi);
svn_string_t *merge_revstr;
svn_pool_clear(iterpool);
Modified: subversion/branches/javahl-ra/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_client/merge.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_client/merge.c Sun Dec 23 06:28:21 2012
@@ -274,7 +274,7 @@ typedef struct merge_cmd_baton_t {
See http://subversion.tigris.org/issues/show_bug.cgi?id=3432.
Updated during each call to do_directory_merge(). May be NULL if there
is no gap. */
- apr_array_header_t *implicit_src_gap;
+ svn_rangelist_t *implicit_src_gap;
svn_client_ctx_t *ctx; /* Client context for callbacks, etc. */
@@ -823,7 +823,7 @@ split_mergeinfo_on_revision(svn_mergeinf
{
int i;
const char *merge_source_path = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
svn_pool_clear(iterpool);
@@ -845,7 +845,7 @@ split_mergeinfo_on_revision(svn_mergeinf
than REVISION. Remove the younger rangelists from
*MERGEINFO and put them in *YOUNGER_MERGEINFO. */
int j;
- apr_array_header_t *younger_rangelist =
+ svn_rangelist_t *younger_rangelist =
apr_array_make(pool, 1, sizeof(svn_merge_range_t *));
for (j = i; j < rangelist->nelts; j++)
@@ -1048,9 +1048,9 @@ filter_self_referential_mergeinfo(apr_ar
{
int j;
const char *source_path = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
const char *merge_source_url;
- apr_array_header_t *adjusted_rangelist =
+ svn_rangelist_t *adjusted_rangelist =
apr_array_make(iterpool, 0, sizeof(svn_merge_range_t *));
merge_source_url =
@@ -3210,8 +3210,8 @@ notification_receiver(void *baton, const
* effect is to discard any non-inheritable input ranges. Therefore the
* ranges in *OUT_RANGELIST will always be inheritable. */
static svn_error_t *
-rangelist_intersect_range(apr_array_header_t **out_rangelist,
- const apr_array_header_t *in_rangelist,
+rangelist_intersect_range(svn_rangelist_t **out_rangelist,
+ const svn_rangelist_t *in_rangelist,
svn_revnum_t rev1,
svn_revnum_t rev2,
svn_boolean_t consider_inheritance,
@@ -3222,7 +3222,7 @@ rangelist_intersect_range(apr_array_head
if (rev1 < rev2)
{
- apr_array_header_t *simple_rangelist =
+ svn_rangelist_t *simple_rangelist =
svn_rangelist__initialize(rev1, rev2, TRUE, scratch_pool);
SVN_ERR(svn_rangelist_intersect(out_rangelist,
@@ -3382,7 +3382,7 @@ adjust_deleted_subtree_ranges(svn_client
}
else
{
- apr_array_header_t *deleted_rangelist;
+ svn_rangelist_t *deleted_rangelist;
svn_revnum_t rev_primary_url_deleted;
/* PRIMARY_URL@older_rev exists, so it was deleted at some
@@ -3451,7 +3451,7 @@ adjust_deleted_subtree_ranges(svn_client
}
else /* PRIMARY_URL@peg_rev exists. */
{
- apr_array_header_t *non_existent_rangelist;
+ svn_rangelist_t *non_existent_rangelist;
svn_location_segment_t *segment =
APR_ARRAY_IDX(segments, (segments->nelts - 1),
svn_location_segment_t *);
@@ -3553,7 +3553,7 @@ fix_deleted_subtree_ranges(const merge_s
svn_client__merge_path_t *child =
APR_ARRAY_IDX(children_with_mergeinfo, i, svn_client__merge_path_t *);
svn_client__merge_path_t *parent;
- apr_array_header_t *deleted_rangelist, *added_rangelist;
+ svn_rangelist_t *deleted_rangelist, *added_rangelist;
SVN_ERR_ASSERT(child);
if (child->absent)
@@ -3905,7 +3905,7 @@ static svn_error_t *
filter_merged_revisions(svn_client__merge_path_t *parent,
svn_client__merge_path_t *child,
const char *mergeinfo_path,
- apr_array_header_t *target_rangelist,
+ svn_rangelist_t *target_rangelist,
svn_revnum_t revision1,
svn_revnum_t revision2,
svn_boolean_t child_inherits_implicit,
@@ -3914,7 +3914,7 @@ filter_merged_revisions(svn_client__merg
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- apr_array_header_t *requested_rangelist,
+ svn_rangelist_t *requested_rangelist,
*target_implicit_rangelist, *explicit_rangelist;
/* Convert REVISION1 and REVISION2 to a rangelist.
@@ -3933,7 +3933,7 @@ filter_merged_revisions(svn_client__merg
if (revision1 > revision2) /* This is a reverse merge. */
{
- apr_array_header_t *added_rangelist, *deleted_rangelist;
+ svn_rangelist_t *added_rangelist, *deleted_rangelist;
/* The revert range and will need to be reversed for
our svn_rangelist_* APIs to work properly. */
@@ -3989,7 +3989,7 @@ filter_merged_revisions(svn_client__merg
}
else /* We need to check CHILD's implicit mergeinfo. */
{
- apr_array_header_t *implicit_rangelist;
+ svn_rangelist_t *implicit_rangelist;
SVN_ERR(ensure_implicit_mergeinfo(parent,
child,
@@ -4166,7 +4166,7 @@ calculate_remaining_ranges(svn_client__m
scratch_pool);
/* Intersection of TARGET_MERGEINFO and the merge history
described by SOURCE. */
- apr_array_header_t *target_rangelist;
+ svn_rangelist_t *target_rangelist;
svn_revnum_t child_base_revision;
/* Since this function should only be called when honoring mergeinfo and
@@ -4322,7 +4322,7 @@ find_gaps_in_merge_source_history(svn_re
= (source->loc1->rev < source->loc2->rev) ? source->loc2 : source->loc1;
const char *merge_src_fspath = svn_client__pathrev_fspath(primary_src,
scratch_pool);
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
SVN_ERR_ASSERT(source->ancestral);
@@ -4377,13 +4377,13 @@ find_gaps_in_merge_source_history(svn_re
}
else if (apr_hash_count(implicit_src_mergeinfo) > 1) /* Rename */
{
- apr_array_header_t *requested_rangelist =
+ svn_rangelist_t *requested_rangelist =
svn_rangelist__initialize(MIN(source->loc1->rev, source->loc2->rev),
MAX(source->loc1->rev, source->loc2->rev),
TRUE, scratch_pool);
- apr_array_header_t *implicit_rangelist =
+ svn_rangelist_t *implicit_rangelist =
apr_array_make(scratch_pool, 2, sizeof(svn_merge_range_t *));
- apr_array_header_t *gap_rangelist;
+ svn_rangelist_t *gap_rangelist;
SVN_ERR(svn_rangelist__merge_many(implicit_rangelist,
implicit_src_mergeinfo,
@@ -4713,8 +4713,8 @@ update_wc_mergeinfo(svn_mergeinfo_catalo
for (hi = apr_hash_first(scratch_pool, merges); hi; hi = apr_hash_next(hi))
{
const char *local_abspath = svn__apr_hash_index_key(hi);
- apr_array_header_t *ranges = svn__apr_hash_index_val(hi);
- apr_array_header_t *rangelist;
+ svn_rangelist_t *ranges = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist;
svn_error_t *err;
const char *local_abspath_rel_to_target;
const char *fspath;
@@ -4846,7 +4846,7 @@ update_wc_mergeinfo(svn_mergeinfo_catalo
MERGEINFO_PATH to MERGE_B->target. */
static svn_error_t *
record_skips(const char *mergeinfo_path,
- const apr_array_header_t *rangelist,
+ const svn_rangelist_t *rangelist,
svn_boolean_t is_rollback,
apr_hash_t *skipped_abspaths,
merge_cmd_baton_t *merge_b,
@@ -6259,7 +6259,7 @@ log_changed_revs(void *baton,
static void
merge_range_find_extremes(svn_revnum_t *min_rev_p,
svn_revnum_t *max_rev_p,
- const apr_array_header_t *rangelist)
+ const svn_rangelist_t *rangelist)
{
int i;
@@ -6325,16 +6325,16 @@ get_log(svn_ra_session_t *ra_session,
Use POOL for temporary allocations. */
static svn_error_t *
-remove_noop_merge_ranges(apr_array_header_t **operative_ranges_p,
+remove_noop_merge_ranges(svn_rangelist_t **operative_ranges_p,
svn_ra_session_t *ra_session,
- const apr_array_header_t *ranges,
+ const svn_rangelist_t *ranges,
apr_pool_t *pool)
{
int i;
svn_revnum_t oldest_rev, youngest_rev;
apr_array_header_t *changed_revs =
apr_array_make(pool, ranges->nelts, sizeof(svn_revnum_t));
- apr_array_header_t *operative_ranges =
+ svn_rangelist_t *operative_ranges =
apr_array_make(ranges->pool, ranges->nelts, ranges->elt_size);
/* Find the revision extremes of the RANGES we have. */
@@ -6522,7 +6522,7 @@ combine_range_with_segments(apr_array_he
static svn_error_t *
normalize_merge_sources_internal(apr_array_header_t **merge_sources_p,
const svn_client__pathrev_t *source_loc,
- const apr_array_header_t *merge_range_ts,
+ const svn_rangelist_t *merge_range_ts,
svn_ra_session_t *ra_session,
svn_client_ctx_t *ctx,
apr_pool_t *result_pool,
@@ -6699,7 +6699,7 @@ static svn_error_t *
normalize_merge_sources(apr_array_header_t **merge_sources_p,
const char *source_path_or_url,
const svn_client__pathrev_t *source_loc,
- const apr_array_header_t *ranges_to_merge,
+ const svn_rangelist_t *ranges_to_merge,
svn_ra_session_t *ra_session,
svn_client_ctx_t *ctx,
apr_pool_t *result_pool,
@@ -6707,7 +6707,7 @@ normalize_merge_sources(apr_array_header
{
const char *source_abspath_or_url;
svn_revnum_t youngest_rev = SVN_INVALID_REVNUM;
- apr_array_header_t *merge_range_ts;
+ svn_rangelist_t *merge_range_ts;
int i;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
@@ -6786,14 +6786,14 @@ normalize_merge_sources(apr_array_header
Allocate *FILTERED_RANGELIST in POOL. */
static svn_error_t *
-filter_natural_history_from_mergeinfo(apr_array_header_t **filtered_rangelist,
+filter_natural_history_from_mergeinfo(svn_rangelist_t **filtered_rangelist,
const char *source_rel_path,
svn_mergeinfo_t implicit_mergeinfo,
svn_merge_range_t *requested_range,
apr_pool_t *pool)
{
/* Make the REQUESTED_RANGE into a rangelist. */
- apr_array_header_t *requested_rangelist =
+ svn_rangelist_t *requested_rangelist =
svn_rangelist__initialize(requested_range->start, requested_range->end,
requested_range->inheritable, pool);
@@ -6804,7 +6804,7 @@ filter_natural_history_from_mergeinfo(ap
if (implicit_mergeinfo
&& (requested_range->start < requested_range->end))
{
- apr_array_header_t *implied_rangelist =
+ svn_rangelist_t *implied_rangelist =
apr_hash_get(implicit_mergeinfo, source_rel_path,
APR_HASH_KEY_STRING);
@@ -6891,7 +6891,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
merge_cmd_baton_t *merge_b,
apr_pool_t *scratch_pool)
{
- apr_array_header_t *remaining_ranges;
+ svn_rangelist_t *remaining_ranges;
svn_client_ctx_t *ctx = merge_b->ctx;
svn_merge_range_t range;
svn_mergeinfo_t target_mergeinfo;
@@ -6968,7 +6968,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
if (!merge_b->record_only)
{
- apr_array_header_t *ranges_to_merge = remaining_ranges;
+ svn_rangelist_t *ranges_to_merge = remaining_ranges;
const char *target_relpath = ""; /* relative to root of merge */
int i;
@@ -7115,7 +7115,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
{
const char *mergeinfo_path = svn_client__pathrev_fspath(primary_src,
scratch_pool);
- apr_array_header_t *filtered_rangelist;
+ svn_rangelist_t *filtered_rangelist;
/* Filter any ranges from TARGET_WCPATH's own history, there is no
need to record this explicitly in mergeinfo, it is already part
@@ -7866,7 +7866,7 @@ record_mergeinfo_for_dir_merge(svn_merge
{
const char *child_repos_path;
const char *child_merge_src_fspath;
- apr_array_header_t *child_merge_rangelist;
+ svn_rangelist_t *child_merge_rangelist;
apr_hash_t *child_merges;
svn_client__merge_path_t *child =
APR_ARRAY_IDX(notify_b->children_with_mergeinfo, i,
@@ -7972,7 +7972,7 @@ record_mergeinfo_for_dir_merge(svn_merge
{
svn_error_t *err;
svn_mergeinfo_t subtree_history_as_mergeinfo;
- apr_array_header_t *child_merge_src_rangelist;
+ svn_rangelist_t *child_merge_src_rangelist;
svn_client__pathrev_t *subtree_mergeinfo_pathrev
= svn_client__pathrev_create_with_relpath(
merge_b->target->loc.repos_root_url,
@@ -8133,7 +8133,7 @@ record_mergeinfo_for_added_subtrees(
svn_node_kind_t added_path_kind;
svn_mergeinfo_t merge_mergeinfo;
svn_mergeinfo_t adds_history_as_mergeinfo;
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
const char *rel_added_path;
const char *added_path_mergeinfo_fspath;
svn_client__pathrev_t *added_path_pathrev;
@@ -8222,8 +8222,8 @@ typedef struct log_noop_baton_t
/* Initially empty rangelists allocated in POOL. The rangelists are
* populated across multiple invocations of log_noop_revs(). */
- apr_array_header_t *operative_ranges;
- apr_array_header_t *merged_ranges;
+ svn_rangelist_t *operative_ranges;
+ svn_rangelist_t *merged_ranges;
/* Pool to store the rangelists. */
apr_pool_t *pool;
@@ -8240,7 +8240,7 @@ typedef struct log_noop_baton_t
This turns the special case of a single incoming younger range into O(1).
*/
static svn_error_t *
-rangelist_merge_revision(apr_array_header_t *rangelist,
+rangelist_merge_revision(svn_rangelist_t *rangelist,
svn_revnum_t revision,
apr_pool_t *result_pool)
{
@@ -8316,7 +8316,7 @@ log_noop_revs(void *baton,
const char *fspath = svn__apr_hash_index_key(hi);
const char *rel_path;
const char *cwmi_abspath;
- apr_array_header_t *paths_explicit_rangelist = NULL;
+ svn_rangelist_t *paths_explicit_rangelist = NULL;
svn_boolean_t mergeinfo_inherited = FALSE;
/* Adjust REL_PATH so it is relative to the merge source then use it to
@@ -8366,8 +8366,8 @@ log_noop_revs(void *baton,
if (paths_explicit_rangelist)
{
- apr_array_header_t *intersecting_range;
- apr_array_header_t *rangelist;
+ svn_rangelist_t *intersecting_range;
+ svn_rangelist_t *rangelist;
rangelist = svn_rangelist__initialize(revision - 1, revision, TRUE,
scratch_pool);
@@ -8424,13 +8424,13 @@ remove_noop_subtree_ranges(const merge_s
int i;
svn_client__merge_path_t *root_child =
APR_ARRAY_IDX(children_with_mergeinfo, 0, svn_client__merge_path_t *);
- apr_array_header_t *requested_ranges;
- apr_array_header_t *subtree_gap_ranges;
- apr_array_header_t *subtree_remaining_ranges;
+ svn_rangelist_t *requested_ranges;
+ svn_rangelist_t *subtree_gap_ranges;
+ svn_rangelist_t *subtree_remaining_ranges;
log_noop_baton_t log_gap_baton;
svn_merge_range_t *oldest_gap_rev;
svn_merge_range_t *youngest_gap_rev;
- apr_array_header_t *inoperative_ranges;
+ svn_rangelist_t *inoperative_ranges;
apr_pool_t *iterpool;
assert(session_url_is(ra_session, source->loc2->url, scratch_pool));
@@ -10070,7 +10070,7 @@ find_unsynced_ranges(const svn_client__p
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- apr_array_header_t *potentially_unmerged_ranges = NULL;
+ svn_rangelist_t *potentially_unmerged_ranges = NULL;
/* Convert all the unmerged history to a rangelist. */
if (apr_hash_count(unmerged_catalog))
@@ -10993,7 +10993,7 @@ svn_client_merge_reintegrate(const char
static svn_error_t *
merge_peg_locked(const char *source_path_or_url,
const svn_opt_revision_t *source_peg_revision,
- const apr_array_header_t *ranges_to_merge,
+ const svn_rangelist_t *ranges_to_merge,
const char *target_abspath,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
@@ -11131,7 +11131,7 @@ location_on_branch_at_rev(const branch_h
hi = apr_hash_next(hi))
{
const char *fspath = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
int i;
for (i = 0; i < rangelist->nelts; i++)
Modified: subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.c Sun Dec 23 06:28:21 2012
@@ -1258,7 +1258,7 @@ struct filter_log_entry_baton_t
/* A rangelist describing all the revisions potentially merged or
potentially eligible for merging (see FILTERING_MERGED) based on
the target's explicit or inherited mergeinfo. */
- const apr_array_header_t *rangelist;
+ const svn_rangelist_t *rangelist;
/* The wrapped svn_log_entry_receiver_t callback and baton which
filter_log_entry_with_rangelist() is acting as a filter for. */
@@ -1290,7 +1290,7 @@ filter_log_entry_with_rangelist(void *ba
apr_pool_t *pool)
{
struct filter_log_entry_baton_t *fleb = baton;
- apr_array_header_t *intersection, *this_rangelist;
+ svn_rangelist_t *intersection, *this_rangelist;
if (fleb->ctx->cancel_func)
SVN_ERR(fleb->ctx->cancel_func(fleb->ctx->cancel_baton));
@@ -1331,7 +1331,7 @@ filter_log_entry_with_rangelist(void *ba
{
apr_hash_index_t *hi;
svn_boolean_t all_subtrees_have_this_rev = TRUE;
- apr_array_header_t *this_rev_rangelist =
+ svn_rangelist_t *this_rev_rangelist =
svn_rangelist__initialize(log_entry->revision - 1,
log_entry->revision, TRUE, pool);
apr_pool_t *iterpool = svn_pool_create(pool);
@@ -1404,7 +1404,7 @@ filter_log_entry_with_rangelist(void *ba
if (ancestor_is_self /* Explicit mergeinfo on TARGET_PATH_AFFECTED */
&& (change->action != 'M'))
{
- apr_array_header_t *rangelist = apr_hash_get(
+ svn_rangelist_t *rangelist = apr_hash_get(
nearest_ancestor_mergeinfo, path, APR_HASH_KEY_STRING);
svn_merge_range_t *youngest_range = APR_ARRAY_IDX(
rangelist, rangelist->nelts - 1, svn_merge_range_t *);
@@ -1423,7 +1423,7 @@ filter_log_entry_with_rangelist(void *ba
hi2 = apr_hash_next(hi2))
{
const char *mergeinfo_path = svn__apr_hash_index_key(hi2);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi2);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi2);
/* Does the mergeinfo for PATH reflect if
LOG_ENTRY->REVISION was previously merged
@@ -1497,7 +1497,7 @@ static svn_error_t *
logs_for_mergeinfo_rangelist(const char *source_url,
const apr_array_header_t *merge_source_fspaths,
svn_boolean_t filtering_merged,
- const apr_array_header_t *rangelist,
+ const svn_rangelist_t *rangelist,
svn_mergeinfo_catalog_t target_mergeinfo_catalog,
const char *target_fspath,
svn_boolean_t discover_changed_paths,
@@ -1648,8 +1648,8 @@ svn_client_mergeinfo_log2(svn_boolean_t
svn_mergeinfo_t source_history;
svn_mergeinfo_t target_history;
- apr_array_header_t *master_noninheritable_rangelist;
- apr_array_header_t *master_inheritable_rangelist;
+ svn_rangelist_t *master_noninheritable_rangelist;
+ svn_rangelist_t *master_inheritable_rangelist;
apr_array_header_t *merge_source_fspaths =
apr_array_make(scratch_pool, 1, sizeof(const char *));
apr_hash_index_t *hi_catalog;
@@ -1884,7 +1884,7 @@ svn_client_mergeinfo_log2(svn_boolean_t
{
/* The inheritable rangelist merged from SUBTREE_SOURCE_HISTORY
to SUBTREE_PATH. */
- apr_array_header_t *subtree_merged_rangelist =
+ svn_rangelist_t *subtree_merged_rangelist =
apr_array_make(scratch_pool, 1, sizeof(svn_merge_range_t *));
SVN_ERR(svn_rangelist__merge_many(master_inheritable_rangelist,
@@ -1921,9 +1921,9 @@ svn_client_mergeinfo_log2(svn_boolean_t
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *deleted_rangelist;
- apr_array_header_t *added_rangelist;
- apr_array_header_t *subtree_merged_rangelist =
+ svn_rangelist_t *deleted_rangelist;
+ svn_rangelist_t *added_rangelist;
+ svn_rangelist_t *subtree_merged_rangelist =
svn__apr_hash_index_val(hi);
svn_pool_clear(iterpool);
@@ -1959,7 +1959,7 @@ svn_client_mergeinfo_log2(svn_boolean_t
else
{
/* Create the starting rangelist for what might be eligible. */
- apr_array_header_t *source_master_rangelist =
+ svn_rangelist_t *source_master_rangelist =
apr_array_make(scratch_pool, 1, sizeof(svn_merge_range_t *));
SVN_ERR(svn_rangelist__merge_many(source_master_rangelist,
@@ -1996,7 +1996,7 @@ svn_client_mergeinfo_log2(svn_boolean_t
= APR_ARRAY_IDX(master_inheritable_rangelist,
master_inheritable_rangelist->nelts - 1,
svn_merge_range_t *);
- apr_array_header_t *youngest_rangelist =
+ svn_rangelist_t *youngest_rangelist =
svn_rangelist__initialize(youngest_range->end - 1,
youngest_range->end,
youngest_range->inheritable,
@@ -2007,9 +2007,9 @@ svn_client_mergeinfo_log2(svn_boolean_t
hi = apr_hash_next(hi))
{
const char *key = svn__apr_hash_index_key(hi);
- apr_array_header_t *subtree_merged_rangelist =
+ svn_rangelist_t *subtree_merged_rangelist =
svn__apr_hash_index_val(hi);
- apr_array_header_t *intersecting_rangelist;
+ svn_rangelist_t *intersecting_rangelist;
svn_pool_clear(iterpool);
SVN_ERR(svn_rangelist_intersect(&intersecting_rangelist,
Modified: subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.h?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.h Sun Dec 23 06:28:21 2012
@@ -65,7 +65,7 @@ typedef struct svn_client__merge_path_t
with the youngest start revisions come first. In both the forward and
reverse merge cases the ranges should never overlap. This rangelist
may be empty but should never be NULL unless ABSENT is true. */
- apr_array_header_t *remaining_ranges;
+ svn_rangelist_t *remaining_ranges;
svn_mergeinfo_t pre_merge_mergeinfo; /* Explicit or inherited mergeinfo
on ABSPATH prior to a merge.
Modified: subversion/branches/javahl-ra/subversion/libsvn_client/ra.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_client/ra.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_client/ra.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_client/ra.c Sun Dec 23 06:28:21 2012
@@ -896,8 +896,8 @@ svn_client__get_youngest_common_ancestor
{
const char *path = svn__apr_hash_index_key(hi);
apr_ssize_t path_len = svn__apr_hash_index_klen(hi);
- apr_array_header_t *ranges1 = svn__apr_hash_index_val(hi);
- apr_array_header_t *ranges2, *common;
+ svn_rangelist_t *ranges1 = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *ranges2, *common;
ranges2 = apr_hash_get(history2, path, path_len);
if (ranges2)
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_util/fs-util.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_util/fs-util.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_util/fs-util.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_util/fs-util.c Sun Dec 23 06:28:21 2012
@@ -163,7 +163,7 @@ svn_fs__append_to_merged_froms(svn_merge
for (hi = apr_hash_first(pool, input); hi; hi = apr_hash_next(hi))
{
const char *path = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
apr_hash_set(*output, svn_fspath__join(path, rel_path, pool),
APR_HASH_KEY_STRING, svn_rangelist_dup(rangelist, pool));
Modified: subversion/branches/javahl-ra/subversion/libsvn_repos/load-fs-vtable.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_repos/load-fs-vtable.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_repos/load-fs-vtable.c Sun Dec 23 06:28:21 2012
@@ -264,7 +264,7 @@ renumber_mergeinfo_revs(svn_string_t **f
for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi))
{
const char *merge_source;
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
struct parse_baton *pb = rb->pb;
int i;
const void *key;
Modified: subversion/branches/javahl-ra/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_repos/log.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_repos/log.c Sun Dec 23 06:28:21 2012
@@ -1177,7 +1177,7 @@ send_log(svn_revnum_t rev,
{
const char *mergeinfo_path =
svn__apr_hash_index_key(hi2);
- apr_array_header_t *rangelist =
+ svn_rangelist_t *rangelist =
svn__apr_hash_index_val(hi2);
/* Check whether CHANGED_PATH at revision REV is a child of
@@ -1397,7 +1397,7 @@ struct path_list_range
the paths can be accessed by revision. */
struct rangelist_path
{
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
const char *path;
};
@@ -1735,8 +1735,8 @@ reduce_search(apr_array_header_t *paths,
for (i = 0; i < paths->nelts; ++i)
{
const char *path = APR_ARRAY_IDX(paths, i, const char *);
- apr_array_header_t *ranges = apr_hash_get(processed, path,
- APR_HASH_KEY_STRING);
+ svn_rangelist_t *ranges = apr_hash_get(processed, path,
+ APR_HASH_KEY_STRING);
int j;
if (!ranges)
@@ -1807,8 +1807,8 @@ store_search(svn_mergeinfo_t processed,
for (i = 0; i < paths->nelts; ++i)
{
const char *path = APR_ARRAY_IDX(paths, i, const char *);
- apr_array_header_t *ranges = apr_array_make(processed_pool, 1,
- sizeof(svn_merge_range_t*));
+ svn_rangelist_t *ranges = apr_array_make(processed_pool, 1,
+ sizeof(svn_merge_range_t*));
svn_merge_range_t *range = apr_palloc(processed_pool,
sizeof(svn_merge_range_t));
Modified: subversion/branches/javahl-ra/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_repos/rev_hunt.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_repos/rev_hunt.c Sun Dec 23 06:28:21 2012
@@ -1291,7 +1291,7 @@ find_merged_revisions(apr_array_header_t
hi = apr_hash_next(hi))
{
apr_pool_t *iterpool3;
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
const char *path;
int j;
Modified: subversion/branches/javahl-ra/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_subr/deprecated.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_subr/deprecated.c Sun Dec 23 06:28:21 2012
@@ -1073,8 +1073,8 @@ svn_mergeinfo_inheritable(svn_mergeinfo_
}
svn_error_t *
-svn_rangelist_inheritable(apr_array_header_t **inheritable_rangelist,
- const apr_array_header_t *rangelist,
+svn_rangelist_inheritable(svn_rangelist_t **inheritable_rangelist,
+ const svn_rangelist_t *rangelist,
svn_revnum_t start,
svn_revnum_t end,
apr_pool_t *pool)
@@ -1086,8 +1086,8 @@ svn_rangelist_inheritable(apr_array_head
}
svn_error_t *
-svn_rangelist_merge(apr_array_header_t **rangelist,
- const apr_array_header_t *changes,
+svn_rangelist_merge(svn_rangelist_t **rangelist,
+ const svn_rangelist_t *changes,
apr_pool_t *pool)
{
return svn_error_trace(svn_rangelist_merge2(*rangelist, changes,
Modified: subversion/branches/javahl-ra/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_subr/mergeinfo.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_subr/mergeinfo.c Sun Dec 23 06:28:21 2012
@@ -243,7 +243,7 @@ get_type_of_intersection(const svn_merge
*/
static svn_error_t *
combine_with_lastrange(const svn_merge_range_t *new_range,
- apr_array_header_t *rangelist,
+ svn_rangelist_t *rangelist,
svn_boolean_t consider_inheritance,
apr_pool_t *result_pool)
{
@@ -491,7 +491,7 @@ range_to_string(const svn_merge_range_t
*/
static svn_error_t *
parse_rangelist(const char **input, const char *end,
- apr_array_header_t *rangelist,
+ svn_rangelist_t *rangelist,
apr_pool_t *pool)
{
const char *curr = *input;
@@ -599,7 +599,7 @@ parse_rangelist(const char **input, cons
}
svn_error_t *
-svn_rangelist__parse(apr_array_header_t **rangelist,
+svn_rangelist__parse(svn_rangelist_t **rangelist,
const char *str,
apr_pool_t *result_pool)
{
@@ -616,9 +616,9 @@ parse_revision_line(const char **input,
apr_pool_t *scratch_pool)
{
const char *pathname = "";
- apr_array_header_t *existing_rangelist;
- apr_array_header_t *rangelist = apr_array_make(scratch_pool, 1,
- sizeof(svn_merge_range_t *));
+ svn_rangelist_t *existing_rangelist;
+ svn_rangelist_t *rangelist = apr_array_make(scratch_pool, 1,
+ sizeof(svn_merge_range_t *));
SVN_ERR(parse_pathname(input, end, &pathname, scratch_pool));
@@ -767,7 +767,7 @@ svn_mergeinfo_parse(svn_mergeinfo_t *mer
Any new elements inserted into RANGELIST are allocated in RESULT_POOL.*/
static void
-adjust_remaining_ranges(apr_array_header_t *rangelist,
+adjust_remaining_ranges(svn_rangelist_t *rangelist,
int *range_index,
apr_pool_t *result_pool)
{
@@ -911,8 +911,8 @@ adjust_remaining_ranges(apr_array_header
}
svn_error_t *
-svn_rangelist_merge2(apr_array_header_t *rangelist,
- const apr_array_header_t *changes,
+svn_rangelist_merge2(svn_rangelist_t *rangelist,
+ const svn_rangelist_t *changes,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1187,7 +1187,7 @@ range_swap_endpoints(svn_merge_range_t *
}
svn_error_t *
-svn_rangelist_reverse(apr_array_header_t *rangelist, apr_pool_t *pool)
+svn_rangelist_reverse(svn_rangelist_t *rangelist, apr_pool_t *pool)
{
int i, swap_index;
svn_merge_range_t range;
@@ -1213,7 +1213,7 @@ svn_rangelist_reverse(apr_array_header_t
}
void
-svn_rangelist__set_inheritance(apr_array_header_t *rangelist,
+svn_rangelist__set_inheritance(svn_rangelist_t *rangelist,
svn_boolean_t inheritable)
{
if (rangelist)
@@ -1243,7 +1243,7 @@ svn_mergeinfo__set_inheritance(svn_merge
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
if (rangelist)
svn_rangelist__set_inheritance(rangelist, inheritable);
@@ -1285,9 +1285,9 @@ svn_mergeinfo__set_inheritance(svn_merge
Allocate the contents of *OUTPUT in POOL. */
static svn_error_t *
-rangelist_intersect_or_remove(apr_array_header_t **output,
- const apr_array_header_t *rangelist1,
- const apr_array_header_t *rangelist2,
+rangelist_intersect_or_remove(svn_rangelist_t **output,
+ const svn_rangelist_t *rangelist1,
+ const svn_rangelist_t *rangelist2,
svn_boolean_t do_remove,
svn_boolean_t consider_inheritance,
apr_pool_t *pool)
@@ -1469,9 +1469,9 @@ rangelist_intersect_or_remove(apr_array_
svn_error_t *
-svn_rangelist_intersect(apr_array_header_t **output,
- const apr_array_header_t *rangelist1,
- const apr_array_header_t *rangelist2,
+svn_rangelist_intersect(svn_rangelist_t **output,
+ const svn_rangelist_t *rangelist1,
+ const svn_rangelist_t *rangelist2,
svn_boolean_t consider_inheritance,
apr_pool_t *pool)
{
@@ -1480,9 +1480,9 @@ svn_rangelist_intersect(apr_array_header
}
svn_error_t *
-svn_rangelist_remove(apr_array_header_t **output,
- const apr_array_header_t *eraser,
- const apr_array_header_t *whiteboard,
+svn_rangelist_remove(svn_rangelist_t **output,
+ const svn_rangelist_t *eraser,
+ const svn_rangelist_t *whiteboard,
svn_boolean_t consider_inheritance,
apr_pool_t *pool)
{
@@ -1491,8 +1491,8 @@ svn_rangelist_remove(apr_array_header_t
}
svn_error_t *
-svn_rangelist_diff(apr_array_header_t **deleted, apr_array_header_t **added,
- const apr_array_header_t *from, const apr_array_header_t *to,
+svn_rangelist_diff(svn_rangelist_t **deleted, svn_rangelist_t **added,
+ const svn_rangelist_t *from, const svn_rangelist_t *to,
svn_boolean_t consider_inheritance,
apr_pool_t *pool)
{
@@ -1553,12 +1553,12 @@ mergeinfo_hash_diff_cb(const void *key,
/* hash_a is FROM mergeinfo,
hash_b is TO mergeinfo. */
struct mergeinfo_diff_baton *cb = baton;
- apr_array_header_t *from_rangelist, *to_rangelist;
+ svn_rangelist_t *from_rangelist, *to_rangelist;
const char *path = key;
if (status == svn_hash_diff_key_both)
{
/* Record any deltas (additions or deletions). */
- apr_array_header_t *deleted_rangelist, *added_rangelist;
+ svn_rangelist_t *deleted_rangelist, *added_rangelist;
from_rangelist = apr_hash_get(cb->from, path, APR_HASH_KEY_STRING);
to_rangelist = apr_hash_get(cb->to, path, APR_HASH_KEY_STRING);
SVN_ERR(svn_rangelist_diff(&deleted_rangelist, &added_rangelist,
@@ -1696,7 +1696,7 @@ svn_mergeinfo_merge2(svn_mergeinfo_t mer
if (res == 0)
{
- apr_array_header_t *rl1, *rl2;
+ svn_rangelist_t *rl1, *rl2;
rl1 = elt1.value;
rl2 = elt2.value;
@@ -1814,8 +1814,8 @@ svn_mergeinfo_intersect2(svn_mergeinfo_t
hi; hi = apr_hash_next(hi))
{
const char *path = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist1 = svn__apr_hash_index_val(hi);
- apr_array_header_t *rangelist2;
+ svn_rangelist_t *rangelist1 = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist2;
svn_pool_clear(iterpool);
rangelist2 = apr_hash_get(mergeinfo2, path, APR_HASH_KEY_STRING);
@@ -1850,7 +1850,7 @@ svn_mergeinfo_remove2(svn_mergeinfo_t *m
svn_error_t *
svn_rangelist_to_string(svn_string_t **output,
- const apr_array_header_t *rangelist,
+ const svn_rangelist_t *rangelist,
apr_pool_t *pool)
{
svn_stringbuf_t *buf = svn_stringbuf_create_empty(pool);
@@ -1977,7 +1977,7 @@ svn_mergeinfo_dup(svn_mergeinfo_t mergei
{
const char *path = svn__apr_hash_index_key(hi);
apr_ssize_t pathlen = svn__apr_hash_index_klen(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
apr_hash_set(new_mergeinfo, apr_pstrmemdup(pool, path, pathlen), pathlen,
svn_rangelist_dup(rangelist, pool));
@@ -2005,8 +2005,8 @@ svn_mergeinfo_inheritable2(svn_mergeinfo
{
const char *key = svn__apr_hash_index_key(hi);
apr_ssize_t keylen = svn__apr_hash_index_klen(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
- apr_array_header_t *inheritable_rangelist;
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *inheritable_rangelist;
if (!path || svn_path_compare_paths(path, key) == 0)
SVN_ERR(svn_rangelist_inheritable2(&inheritable_rangelist, rangelist,
@@ -2028,8 +2028,8 @@ svn_mergeinfo_inheritable2(svn_mergeinfo
svn_error_t *
-svn_rangelist_inheritable2(apr_array_header_t **inheritable_rangelist,
- const apr_array_header_t *rangelist,
+svn_rangelist_inheritable2(svn_rangelist_t **inheritable_rangelist,
+ const svn_rangelist_t *rangelist,
svn_revnum_t start,
svn_revnum_t end,
svn_boolean_t inheritable,
@@ -2066,7 +2066,7 @@ svn_rangelist_inheritable2(apr_array_hea
{
/* We want only the non-inheritable ranges bound by START
and END removed. */
- apr_array_header_t *ranges_inheritable =
+ svn_rangelist_t *ranges_inheritable =
svn_rangelist__initialize(start, end, inheritable, scratch_pool);
if (rangelist->nelts)
@@ -2092,7 +2092,7 @@ svn_mergeinfo__remove_empty_rangelists(s
for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
{
const char *path = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
if (rangelist->nelts == 0)
{
@@ -2208,7 +2208,7 @@ svn_mergeinfo__add_suffix_to_mergeinfo(s
hi = apr_hash_next(hi))
{
const char *fspath = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
apr_hash_set(*out_mergeinfo,
svn_fspath__join(fspath, suffix_relpath, result_pool),
@@ -2219,11 +2219,11 @@ svn_mergeinfo__add_suffix_to_mergeinfo(s
return SVN_NO_ERROR;
}
-apr_array_header_t *
-svn_rangelist_dup(const apr_array_header_t *rangelist, apr_pool_t *pool)
+svn_rangelist_t *
+svn_rangelist_dup(const svn_rangelist_t *rangelist, apr_pool_t *pool)
{
- apr_array_header_t *new_rl = apr_array_make(pool, rangelist->nelts,
- sizeof(svn_merge_range_t *));
+ svn_rangelist_t *new_rl = apr_array_make(pool, rangelist->nelts,
+ sizeof(svn_merge_range_t *));
int i;
for (i = 0; i < rangelist->nelts; i++)
@@ -2362,7 +2362,7 @@ svn_mergeinfo__get_range_endpoints(svn_r
for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
if (rangelist->nelts)
{
@@ -2438,7 +2438,7 @@ svn_mergeinfo__filter_mergeinfo_by_range
if (mergeinfo)
{
apr_hash_index_t *hi;
- apr_array_header_t *filter_rangelist =
+ svn_rangelist_t *filter_rangelist =
svn_rangelist__initialize(oldest_rev, youngest_rev, TRUE,
scratch_pool);
@@ -2447,11 +2447,11 @@ svn_mergeinfo__filter_mergeinfo_by_range
hi = apr_hash_next(hi))
{
const char *path = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
if (rangelist->nelts)
{
- apr_array_header_t *new_rangelist;
+ svn_rangelist_t *new_rangelist;
SVN_ERR(rangelist_intersect_or_remove(
&new_rangelist, filter_rangelist, rangelist,
@@ -2486,8 +2486,8 @@ svn_mergeinfo__adjust_mergeinfo_rangelis
{
int i;
const char *path = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
- apr_array_header_t *adjusted_rangelist =
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *adjusted_rangelist =
apr_array_make(result_pool, rangelist->nelts,
sizeof(svn_merge_range_t *));
@@ -2532,7 +2532,7 @@ svn_mergeinfo__is_noninheritable(svn_mer
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
int i;
for (i = 0; i < rangelist->nelts; i++)
@@ -2547,13 +2547,13 @@ svn_mergeinfo__is_noninheritable(svn_mer
return FALSE;
}
-apr_array_header_t *
+svn_rangelist_t *
svn_rangelist__initialize(svn_revnum_t start,
svn_revnum_t end,
svn_boolean_t inheritable,
apr_pool_t *result_pool)
{
- apr_array_header_t *rangelist =
+ svn_rangelist_t *rangelist =
apr_array_make(result_pool, 1, sizeof(svn_merge_range_t *));
svn_merge_range_t *range = apr_pcalloc(result_pool, sizeof(*range));
@@ -2577,7 +2577,7 @@ svn_mergeinfo__mergeinfo_from_segments(s
{
svn_location_segment_t *segment =
APR_ARRAY_IDX(segments, i, svn_location_segment_t *);
- apr_array_header_t *path_ranges;
+ svn_rangelist_t *path_ranges;
svn_merge_range_t *range;
const char *source_path;
@@ -2615,7 +2615,7 @@ svn_mergeinfo__mergeinfo_from_segments(s
}
svn_error_t *
-svn_rangelist__merge_many(apr_array_header_t *merged_rangelist,
+svn_rangelist__merge_many(svn_rangelist_t *merged_rangelist,
svn_mergeinfo_t merge_history,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -2629,7 +2629,7 @@ svn_rangelist__merge_many(apr_array_head
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *subtree_rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *subtree_rangelist = svn__apr_hash_index_val(hi);
svn_pool_clear(iterpool);
SVN_ERR(svn_rangelist_merge2(merged_rangelist, subtree_rangelist,
Modified: subversion/branches/javahl-ra/subversion/svndumpfilter/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/svndumpfilter/main.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/svndumpfilter/main.c (original)
+++ subversion/branches/javahl-ra/subversion/svndumpfilter/main.c Sun Dec 23 06:28:21 2012
@@ -766,7 +766,7 @@ adjust_mergeinfo(svn_string_t **final_va
for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi))
{
const char *merge_source = svn__apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
+ svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
struct parse_baton_t *pb = rb->pb;
/* Determine whether the merge_source is a part of the prefix. */
Modified: subversion/branches/javahl-ra/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/svnrdump/load_editor.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/svnrdump/load_editor.c (original)
+++ subversion/branches/javahl-ra/subversion/svnrdump/load_editor.c Sun Dec 23 06:28:21 2012
@@ -250,7 +250,7 @@ renumber_mergeinfo_revs(svn_string_t **f
for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
struct parse_baton *pb = rb->pb;
int i;
const void *path;
Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1425420&r1=1425419&r2=1425420&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c Sun Dec 23 06:28:21 2012
@@ -78,7 +78,7 @@ verify_mergeinfo_parse(const char *input
{
const void *path;
void *val;
- apr_array_header_t *ranges;
+ svn_rangelist_t *ranges;
svn_merge_range_t *range;
int j;
@@ -236,7 +236,7 @@ test_mergeinfo_dup(apr_pool_t *pool)
{
apr_hash_t *orig_mergeinfo, *copied_mergeinfo;
apr_pool_t *subpool;
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
/* Assure that copies which should be empty turn out that way. */
subpool = svn_pool_create(pool);
@@ -399,7 +399,7 @@ range_to_string(svn_merge_range_t *range
verified (e.g. "svn_rangelist_intersect"), while TYPE is a word
describing what the ranges being examined represent. */
static svn_error_t *
-verify_ranges_match(const apr_array_header_t *actual_rangelist,
+verify_ranges_match(const svn_rangelist_t *actual_rangelist,
svn_merge_range_t *expected_ranges, int nbr_expected,
const char *func_verified, const char *type,
apr_pool_t *pool)
@@ -436,7 +436,7 @@ verify_mergeinfo_deltas(apr_hash_t *delt
const char *func_verified, const char *type,
apr_pool_t *pool)
{
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
if (apr_hash_count(deltas) != 1)
/* Deltas on "/trunk" expected. */
@@ -479,7 +479,7 @@ test_diff_mergeinfo(apr_pool_t *pool)
static svn_error_t *
test_rangelist_reverse(apr_pool_t *pool)
{
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
svn_merge_range_t expected_rangelist[3] =
{ {10, 9, TRUE}, {7, 4, TRUE}, {3, 2, TRUE} };
@@ -494,7 +494,7 @@ test_rangelist_reverse(apr_pool_t *pool)
static svn_error_t *
test_rangelist_intersect(apr_pool_t *pool)
{
- apr_array_header_t *rangelist1, *rangelist2, *intersection;
+ svn_rangelist_t *rangelist1, *rangelist2, *intersection;
/* Expected intersection when considering inheritance. */
svn_merge_range_t intersection_consider_inheritance[] =
@@ -562,7 +562,7 @@ test_mergeinfo_intersect(apr_pool_t *poo
{
svn_merge_range_t expected_intersection[3] =
{ {0, 1, TRUE}, {2, 4, TRUE}, {11, 12, TRUE} };
- apr_array_header_t *rangelist;
+ svn_rangelist_t *rangelist;
apr_hash_t *intersection;
SVN_ERR(svn_mergeinfo_parse(&info1, "/trunk: 1-6,12-16\n/foo: 31", pool));
@@ -728,7 +728,7 @@ test_merge_mergeinfo(apr_pool_t *pool)
for (j = 0; j < mergeinfo[i].expected_paths; j++)
{
- apr_array_header_t *rangelist =
+ svn_rangelist_t *rangelist =
apr_hash_get(info1, mergeinfo[i].path_rngs[j].path,
APR_HASH_KEY_STRING);
if (!rangelist)
@@ -751,7 +751,7 @@ test_remove_rangelist(apr_pool_t *pool)
{
int i, j;
svn_error_t *err, *child_err;
- apr_array_header_t *output, *eraser, *whiteboard;
+ svn_rangelist_t *output, *eraser, *whiteboard;
/* Struct for svn_rangelist_remove test data.
Parse WHITEBOARD and ERASER to hashes and then get the rangelist for
@@ -938,7 +938,7 @@ randomly_fill_rev_array(svn_boolean_t *r
/* Set *RANGELIST to a rangelist representing the revisions that are marked
* with TRUE in the array REVS[RANDOM_REV_ARRAY_LENGTH]. */
static svn_error_t *
-rev_array_to_rangelist(apr_array_header_t **rangelist,
+rev_array_to_rangelist(svn_rangelist_t **rangelist,
svn_boolean_t *revs,
apr_pool_t *pool)
{
@@ -980,7 +980,7 @@ test_rangelist_remove_randomly(apr_pool_
svn_boolean_t first_revs[RANDOM_REV_ARRAY_LENGTH],
second_revs[RANDOM_REV_ARRAY_LENGTH],
expected_revs[RANDOM_REV_ARRAY_LENGTH];
- apr_array_header_t *first_rangelist, *second_rangelist,
+ svn_rangelist_t *first_rangelist, *second_rangelist,
*expected_rangelist, *actual_rangelist;
/* There will be at most RANDOM_REV_ARRAY_LENGTH ranges in
expected_rangelist. */
@@ -1038,7 +1038,7 @@ test_rangelist_intersect_randomly(apr_po
svn_boolean_t first_revs[RANDOM_REV_ARRAY_LENGTH],
second_revs[RANDOM_REV_ARRAY_LENGTH],
expected_revs[RANDOM_REV_ARRAY_LENGTH];
- apr_array_header_t *first_rangelist, *second_rangelist,
+ svn_rangelist_t *first_rangelist, *second_rangelist,
*expected_rangelist, *actual_rangelist;
/* There will be at most RANDOM_REV_ARRAY_LENGTH ranges in
expected_rangelist. */
@@ -1105,7 +1105,7 @@ test_remove_mergeinfo(apr_pool_t *pool)
static svn_error_t *
test_rangelist_to_string(apr_pool_t *pool)
{
- apr_array_header_t *result;
+ svn_rangelist_t *result;
svn_string_t *output;
svn_string_t *expected = svn_string_create("3,5,7-11,13-14", pool);
@@ -1162,7 +1162,7 @@ test_rangelist_merge(apr_pool_t *pool)
{
int i;
svn_error_t *err, *child_err;
- apr_array_header_t *rangelist1, *rangelist2;
+ svn_rangelist_t *rangelist1, *rangelist2;
/* Struct for svn_rangelist_merge test data. Similar to
mergeinfo_merge_test_data struct in svn_mergeinfo_merge() test. */
@@ -1359,7 +1359,7 @@ test_rangelist_diff(apr_pool_t *pool)
{
int i;
svn_error_t *err, *child_err;
- apr_array_header_t *from, *to, *added, *deleted;
+ svn_rangelist_t *from, *to, *added, *deleted;
/* Structure containing two ranges to diff and the expected output of the
diff both when considering and ignoring range inheritance. */