subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1135982 - in /subversion/trunk/subversion/include: svn_client.h svn_fs.h svn_ra.h svn_repos.h svn_types.h
Date Wed, 15 Jun 2011 09:48:51 GMT
Author: julianfoad
Date: Wed Jun 15 09:48:50 2011
New Revision: 1135982

URL: http://svn.apache.org/viewvc?rev=1135982&view=rev
Log:
Fix up some public API changes since v1.6.  Move a constant back to the
header where it was, and fix up some deprecation mark-up.

* subversion/include/svn_client.h
  (svn_client_merge3, svn_client_merge_peg3, svn_client_export4): Add a
    missing 'SVN_DEPRECATED'.
  (svn_client_mergeinfo_log_merged, svn_client_mergeinfo_log_eligible): Add
    a reference to the replacement function svn_client_mergeinfo_log()
    within the '@deprecated' clause.
  (SVN_INFO_SIZE_UNKNOWN): Move to here ...

* subversion/include/svn_types.h
  (SVN_INFO_SIZE_UNKNOWN): ... from here, reverting r1097240, following
    r1133417 which moved the corresponding structure.

* subversion/include/svn_ra.h
  (svn_ra_get_mergeinfo): Add a missing 'SVN_DEPRECATED'.

* subversion/include/svn_fs.h
  (svn_fs_get_mergeinfo): Add a missing 'SVN_DEPRECATED' and correct the
    previous version mentioned in the '@deprecated' clause.

* subversion/include/svn_repos.h
  (svn_repos_fs_get_mergeinfo2): Same.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/include/svn_fs.h
    subversion/trunk/subversion/include/svn_ra.h
    subversion/trunk/subversion/include/svn_repos.h
    subversion/trunk/subversion/include/svn_types.h

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1135982&r1=1135981&r2=1135982&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Jun 15 09:48:50 2011
@@ -3227,6 +3227,7 @@ svn_client_merge4(const char *source1,
  *
  * @since New in 1.5.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_merge3(const char *source1,
                   const svn_opt_revision_t *revision1,
@@ -3353,6 +3354,7 @@ svn_client_merge_peg4(const char *source
  *
  * @since New in 1.5.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_merge_peg3(const char *source,
                       const apr_array_header_t *ranges_to_merge,
@@ -3503,8 +3505,8 @@ svn_client_mergeinfo_log(svn_boolean_t f
  * Similar to svn_client_mergeinfo_log(), but finds only merged revisions
  * and always operates at @a depth #svn_depth_empty.
  *
- * @deprecated Provided for backwards compatibility with the 1.6 API.
- *
+ * @deprecated Provided for backwards compatibility with the 1.6 API. Use
+ * svn_client_mergeinfo_log() instead.
  * @since New in 1.5.
  */
 SVN_DEPRECATED
@@ -3524,8 +3526,8 @@ svn_client_mergeinfo_log_merged(const ch
  * Similar to svn_client_mergeinfo_log(), but finds only eligible revisions
  * and always operates at @a depth #svn_depth_empty.
  *
- * @deprecated Provided for backwards compatibility with the 1.6 API.
- *
+ * @deprecated Provided for backwards compatibility with the 1.6 API. Use
+ * svn_client_mergeinfo_log() instead.
  * @since New in 1.5.
  */
 SVN_DEPRECATED
@@ -4710,10 +4712,10 @@ svn_client_export5(svn_revnum_t *result_
  * Similar to svn_client_export5(), but with @a ignore_keywords set
  * to FALSE.
  *
- * @deprecated Provided for backward compatibility with the 1.5 API.
- *
+ * @deprecated Provided for backward compatibility with the 1.6 API.
  * @since New in 1.5.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_client_export4(svn_revnum_t *result_rev,
                    const char *from_path_or_url,
@@ -5184,6 +5186,14 @@ svn_client_unlock(const apr_array_header
  * @{
  */
 
+/** The size of the file is unknown.
+ * Used as value in fields of type @c apr_size_t in #svn_info_t.
+ *
+ * @since New in 1.5
+ * @deprecated Provided for backward compatibility with the 1.6 API.
+ */
+#define SVN_INFO_SIZE_UNKNOWN ((apr_size_t) -1)
+
 /**
  * A structure which describes various system-generated metadata about
  * a working-copy path or URL.

Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1135982&r1=1135981&r2=1135982&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Wed Jun 15 09:48:50 2011
@@ -1520,8 +1520,9 @@ svn_fs_get_mergeinfo2(svn_mergeinfo_cata
  * Similar to svn_fs_get_mergeinfo2(), but with
  * @a validate_inherited_mergeinfo always passed as FALSE.
  *
- * @deprecated Provided for backward compatibility with the 1.7 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_get_mergeinfo(svn_mergeinfo_catalog_t *catalog,
                      svn_fs_root_t *root,

Modified: subversion/trunk/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra.h?rev=1135982&r1=1135981&r2=1135982&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_ra.h (original)
+++ subversion/trunk/subversion/include/svn_ra.h Wed Jun 15 09:48:50 2011
@@ -1059,6 +1059,7 @@ svn_ra_get_mergeinfo2(svn_ra_session_t *
  *
  * @deprecated Provided for backward compatibility with the 1.6 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_ra_get_mergeinfo(svn_ra_session_t *session,
                      svn_mergeinfo_catalog_t *catalog,

Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1135982&r1=1135981&r2=1135982&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Wed Jun 15 09:48:50 2011
@@ -1785,8 +1785,9 @@ svn_repos_fs_get_mergeinfo2(svn_mergeinf
  * Similar to svn_repos_fs_get_mergeinfo2(), but with
  * @a validate_inherited_mergeinfo always passed as FALSE.
  *
- * @deprecated Provided for backward compatibility with the 1.7 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_fs_get_mergeinfo(svn_mergeinfo_catalog_t *catalog,
                            svn_repos_t *repos,

Modified: subversion/trunk/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_types.h?rev=1135982&r1=1135981&r2=1135982&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_types.h (original)
+++ subversion/trunk/subversion/include/svn_types.h Wed Jun 15 09:48:50 2011
@@ -1206,6 +1206,8 @@ svn_location_segment_t *
 svn_location_segment_dup(const svn_location_segment_t *segment,
                          apr_pool_t *pool);
 
+/** @} */
+
 /** A line number, such as in a file or a stream.
  *
  * @since New in 1.7.
@@ -1218,15 +1220,6 @@ typedef unsigned long svn_linenum_t;
  */
 #define SVN_LINENUM_MAX_VALUE ULONG_MAX
 
-/** @} */
-
-/** The size of the file is unknown.
- * Used as value in fields of type @c apr_size_t.
- *
- * @since New in 1.5
- */
-#define SVN_INFO_SIZE_UNKNOWN ((apr_size_t) -1)
-
 
 #ifdef __cplusplus
 }



Mime
View raw message