You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/07/11 18:36:45 UTC
svn commit: r1502279 - in /subversion/branches/1.8.x-r1502267: ./
subversion/include/private/ subversion/libsvn_fs_base/
subversion/libsvn_fs_fs/ subversion/libsvn_ra_local/
subversion/libsvn_ra_serf/ subversion/libsvn_ra_svn/
subversion/libsvn_subr/ s...
Author: danielsh
Date: Thu Jul 11 16:36:44 2013
New Revision: 1502279
URL: http://svn.apache.org/r1502279
Log:
On the 1.8.x-r1502267 branch, backport r1502267 from trunk, with the
following changes:
* subversion/include/svn_version.h: Revert all r1502267 changes here.
(svn_ver_check_list2): Revert addition of new API.
(svn_ver_check_list): Revert deprecation.
* subversion/include/private/svn_subr_private.h
(svn_ver_check_list2): Add it here instead, as a macro which aliases..
(svn_ver__check_list2): .. this new function.
* subversion/libsvn_subr/version.c
(svn_ver__check_list2): Implement svn_ver_check_list2() under this name.
* (everywhere): Add svn_subr_private.h includes to see svn_ver_check_list2().
Modified:
subversion/branches/1.8.x-r1502267/ (props changed)
subversion/branches/1.8.x-r1502267/subversion/include/private/svn_subr_private.h
subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_base/fs.c
subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_fs/fs.c
subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_serf/serf.c
subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_svn/client.c
subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/auth.c
subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/deprecated.c
subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/version.c
subversion/branches/1.8.x-r1502267/subversion/svn/svn.c (contents, props changed)
subversion/branches/1.8.x-r1502267/subversion/svnadmin/svnadmin.c
subversion/branches/1.8.x-r1502267/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/1.8.x-r1502267/subversion/svnlook/svnlook.c
subversion/branches/1.8.x-r1502267/subversion/svnmucc/svnmucc.c
subversion/branches/1.8.x-r1502267/subversion/svnserve/svnserve.c
subversion/branches/1.8.x-r1502267/subversion/svnsync/svnsync.c
subversion/branches/1.8.x-r1502267/subversion/svnversion/svnversion.c
Propchange: subversion/branches/1.8.x-r1502267/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1502267
Modified: subversion/branches/1.8.x-r1502267/subversion/include/private/svn_subr_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/include/private/svn_subr_private.h?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/include/private/svn_subr_private.h (original)
+++ subversion/branches/1.8.x-r1502267/subversion/include/private/svn_subr_private.h Thu Jul 11 16:36:44 2013
@@ -26,6 +26,7 @@
#include "svn_types.h"
#include "svn_io.h"
+#include "svn_version.h"
#ifdef __cplusplus
@@ -331,6 +332,18 @@ svn_version__at_least(svn_version_t *ver
int minor,
int patch);
+/** Like svn_ver_check_list(), but with a @a comparator parameter.
+ * Private backport of svn_ver_check_list2() from trunk.
+ */
+svn_error_t *
+svn_ver__check_list2(const svn_version_t *my_version,
+ const svn_version_checklist_t *checklist,
+ svn_boolean_t (*comparator)(const svn_version_t *,
+ const svn_version_t *));
+
+/** To minimize merge churn in callers, alias the trunk name privately. */
+#define svn_ver_check_list2 svn_ver__check_list2
+
/** @} */
#ifdef __cplusplus
Modified: subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_base/fs.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_base/fs.c Thu Jul 11 16:36:44 2013
@@ -65,6 +65,8 @@
#include "../libsvn_fs/fs-loader.h"
#include "private/svn_fs_util.h"
+#include "private/svn_subr_private.h"
+
/* Checking for return values, and reporting errors. */
@@ -1427,7 +1429,7 @@ svn_fs_base__init(const svn_version_t *l
return svn_error_createf(SVN_ERR_VERSION_MISMATCH, NULL,
_("Unsupported FS loader version (%d) for bdb"),
loader_version->major);
- SVN_ERR(svn_ver_check_list(base_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(base_version(), checklist, svn_ver_equal));
SVN_ERR(check_bdb_version());
SVN_ERR(svn_fs_bdb__init(common_pool));
Modified: subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_fs/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_fs/fs.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/libsvn_fs_fs/fs.c Thu Jul 11 16:36:44 2013
@@ -41,6 +41,7 @@
#include "rep-cache.h"
#include "svn_private_config.h"
#include "private/svn_fs_util.h"
+#include "private/svn_subr_private.h"
#include "../libsvn_fs/fs-loader.h"
@@ -449,7 +450,7 @@ svn_fs_fs__init(const svn_version_t *loa
return svn_error_createf(SVN_ERR_VERSION_MISMATCH, NULL,
_("Unsupported FS loader version (%d) for fsfs"),
loader_version->major);
- SVN_ERR(svn_ver_check_list(fs_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(fs_version(), checklist, svn_ver_equal));
*vtable = &library_vtable;
return SVN_NO_ERROR;
Modified: subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_local/ra_plugin.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_local/ra_plugin.c Thu Jul 11 16:36:44 2013
@@ -41,6 +41,7 @@
#include "private/svn_repos_private.h"
#include "private/svn_fspath.h"
#include "private/svn_atomic.h"
+#include "private/svn_subr_private.h"
#define APR_WANT_STRFUNC
#include <apr_want.h>
@@ -1745,7 +1746,7 @@ svn_ra_local__init(const svn_version_t *
"ra_local"),
loader_version->major);
- SVN_ERR(svn_ver_check_list(ra_local_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(ra_local_version(), checklist, svn_ver_equal));
#ifndef SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL
/* This assumes that POOL was the pool used to load the dso. */
Modified: subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_serf/serf.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_serf/serf.c Thu Jul 11 16:36:44 2013
@@ -1212,7 +1212,7 @@ svn_ra_serf__init(const svn_version_t *l
int serf_minor;
int serf_patch;
- SVN_ERR(svn_ver_check_list(ra_serf_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(ra_serf_version(), checklist, svn_ver_equal));
/* Simplified version check to make sure we can safely use the
VTABLE parameter. The RA loader does a more exhaustive check. */
Modified: subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_svn/client.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/libsvn_ra_svn/client.c Thu Jul 11 16:36:44 2013
@@ -50,6 +50,7 @@
#include "svn_private_config.h"
#include "private/svn_fspath.h"
+#include "private/svn_subr_private.h"
#include "../libsvn_ra/ra_loader.h"
@@ -2731,7 +2732,7 @@ svn_ra_svn__init(const svn_version_t *lo
{ NULL, NULL }
};
- SVN_ERR(svn_ver_check_list(svn_ra_svn_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(svn_ra_svn_version(), checklist, svn_ver_equal));
/* Simplified version check to make sure we can safely use the
VTABLE parameter. The RA loader does a more exhaustive check. */
Modified: subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/auth.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/auth.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/auth.c Thu Jul 11 16:36:44 2013
@@ -36,6 +36,7 @@
#include "svn_dso.h"
#include "svn_version.h"
#include "private/svn_dep_compat.h"
+#include "private/svn_subr_private.h"
#include "auth.h"
@@ -478,7 +479,8 @@ svn_auth_get_platform_specific_provider(
check_list[0].version_query = version_function;
check_list[1].label = NULL;
check_list[1].version_query = NULL;
- SVN_ERR(svn_ver_check_list(svn_subr_version(), check_list));
+ SVN_ERR(svn_ver_check_list2(svn_subr_version(), check_list,
+ svn_ver_equal));
}
if (apr_dso_sym(&provider_function_symbol,
dso,
Modified: subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/deprecated.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/deprecated.c Thu Jul 11 16:36:44 2013
@@ -47,6 +47,7 @@
#include "opt.h"
#include "private/svn_opt_private.h"
#include "private/svn_mergeinfo_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -1301,4 +1302,10 @@ svn_subst_build_keywords(svn_subst_keywo
return SVN_NO_ERROR;
}
-
+/*** From version.c ***/
+svn_error_t *
+svn_ver_check_list(const svn_version_t *my_version,
+ const svn_version_checklist_t *checklist)
+{
+ return svn_ver_check_list2(my_version, checklist, svn_ver_compatible);
+}
Modified: subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/version.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/libsvn_subr/version.c Thu Jul 11 16:36:44 2013
@@ -75,8 +75,10 @@ svn_boolean_t svn_ver_equal(const svn_ve
svn_error_t *
-svn_ver_check_list(const svn_version_t *my_version,
- const svn_version_checklist_t *checklist)
+svn_ver__check_list2(const svn_version_t *my_version,
+ const svn_version_checklist_t *checklist,
+ svn_boolean_t (*comparator)(const svn_version_t *,
+ const svn_version_t *))
{
svn_error_t *err = SVN_NO_ERROR;
int i;
@@ -84,12 +86,17 @@ svn_ver_check_list(const svn_version_t *
for (i = 0; checklist[i].label != NULL; ++i)
{
const svn_version_t *lib_version = checklist[i].version_query();
- if (!svn_ver_compatible(my_version, lib_version))
+ if (!comparator(my_version, lib_version))
err = svn_error_createf(SVN_ERR_VERSION_MISMATCH, err,
- _("Version mismatch in '%s':"
+ _("Version mismatch in '%s'%s:"
" found %d.%d.%d%s,"
" expected %d.%d.%d%s"),
checklist[i].label,
+ comparator == svn_ver_equal
+ ? _(" (expecting equality)")
+ : comparator == svn_ver_compatible
+ ? _(" (expecting compatibility)")
+ : "",
lib_version->major, lib_version->minor,
lib_version->patch, lib_version->tag,
my_version->major, my_version->minor,
Modified: subversion/branches/1.8.x-r1502267/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/svn/svn.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/svn/svn.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/svn/svn.c Thu Jul 11 16:36:44 2013
@@ -56,6 +56,7 @@
#include "private/svn_opt_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -1640,7 +1641,7 @@ check_lib_versions(void)
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Propchange: subversion/branches/1.8.x-r1502267/subversion/svn/svn.c
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/svn/svn.c:r1502267
Modified: subversion/branches/1.8.x-r1502267/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/svnadmin/svnadmin.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/svnadmin/svnadmin.c Thu Jul 11 16:36:44 2013
@@ -140,7 +140,7 @@ check_lib_versions(void)
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Modified: subversion/branches/1.8.x-r1502267/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/svndumpfilter/svndumpfilter.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/svndumpfilter/svndumpfilter.c Thu Jul 11 16:36:44 2013
@@ -45,6 +45,7 @@
#include "private/svn_mergeinfo_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
#ifdef _WIN32
typedef apr_status_t (__stdcall *open_fn_t)(apr_file_t **, apr_pool_t *);
@@ -1176,7 +1177,7 @@ check_lib_versions(void)
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Modified: subversion/branches/1.8.x-r1502267/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/svnlook/svnlook.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/svnlook/svnlook.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/svnlook/svnlook.c Thu Jul 11 16:36:44 2013
@@ -58,6 +58,7 @@
#include "private/svn_cmdline_private.h"
#include "private/svn_fspath.h"
#include "private/svn_io_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -397,7 +398,7 @@ check_lib_versions(void)
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Modified: subversion/branches/1.8.x-r1502267/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/svnmucc/svnmucc.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/svnmucc/svnmucc.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/svnmucc/svnmucc.c Thu Jul 11 16:36:44 2013
@@ -57,6 +57,7 @@
#include "private/svn_cmdline_private.h"
#include "private/svn_ra_private.h"
#include "private/svn_string_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -85,7 +86,7 @@ init(const char *application)
if (svn_cmdline_init(application, stderr))
exit(EXIT_FAILURE);
- err = svn_ver_check_list(&my_version, checklist);
+ err = svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
if (err)
handle_error(err, NULL);
Modified: subversion/branches/1.8.x-r1502267/subversion/svnserve/svnserve.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/svnserve/svnserve.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/svnserve/svnserve.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/svnserve/svnserve.c Thu Jul 11 16:36:44 2013
@@ -54,6 +54,7 @@
#include "private/svn_dep_compat.h"
#include "private/svn_cmdline_private.h"
#include "private/svn_atomic.h"
+#include "private/svn_subr_private.h"
#include "winservice.h"
@@ -465,7 +466,7 @@ check_lib_versions(void)
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Modified: subversion/branches/1.8.x-r1502267/subversion/svnsync/svnsync.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/svnsync/svnsync.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/svnsync/svnsync.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/svnsync/svnsync.c Thu Jul 11 16:36:44 2013
@@ -38,6 +38,7 @@
#include "private/svn_opt_private.h"
#include "private/svn_ra_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
#include "sync.h"
@@ -312,7 +313,7 @@ check_lib_versions(void)
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Modified: subversion/branches/1.8.x-r1502267/subversion/svnversion/svnversion.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1502267/subversion/svnversion/svnversion.c?rev=1502279&r1=1502278&r2=1502279&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1502267/subversion/svnversion/svnversion.c (original)
+++ subversion/branches/1.8.x-r1502267/subversion/svnversion/svnversion.c Thu Jul 11 16:36:44 2013
@@ -29,6 +29,7 @@
#include "private/svn_opt_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -110,7 +111,7 @@ check_lib_versions(void)
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
/*