Checkout
rhuijben
committed
on 19 Dec 12
Fulfill a promise of a deprecated rangelist api by refactoring some code.
Document that we don't promise this behavior in the newer api, and… Show more
Fulfill a promise of a deprecated rangelist api by refactoring some code.

Document that we don't promise this behavior in the newer api, and point users

of an internal api towards an internal api that might help users fulfill this

promise.

* subversion/include/private/svn_mergeinfo_private.h

 (svn_rangelist__parse): Add pointer.

 (svn_rangelist__combine_adjecent_ranges): Add function.

* subversion/include/svn_mergeinfo.h

 (svn_rangelist_merge2): Document real behavior.

 (svn_rangelist_merge): Document the old promise as difference.

* subversion/libsvn_subr/deprecated.c

 (includes): Add svn_mergeinfo_private.h.

 (svn_rangelist_merge): Call svn_rangelist__combine_adjecent_ranges on the

   to be returned rangelist to fulfill promise.

* subversion/libsvn_subr/mergeinfo.c

 (svn_rangelist__combine_adjecent_ranges): New function. Extracted from

   parse_revision_line.

 (parse_revision_line): Call svn_rangelist__combine_adjecent_ranges.

* subversion/tests/libsvn_subr/mergeinfo-test.c

 (test_funcs): Expect 'test_rangelist_merge' to pass, because it uses

   svn_rangelist_merge.

Show less