You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2022/02/10 15:46:27 UTC
svn commit: r1897943 - in /subversion/branches/multi-wc-format/subversion: include/svn_client.h libsvn_client/checkout.c libsvn_client/upgrade.c tests/cmdline/svntest/main.py tests/svn_test_main.c
Author: julianfoad
Date: Thu Feb 10 15:46:27 2022
New Revision: 1897943
URL: http://svn.apache.org/viewvc?rev=1897943&view=rev
Log:
On the 'multi-wc-format' branch: default to the oldest supported WC version.
* subversion/include/svn_client.h,
subversion/libsvn_client/checkout.c,
subversion/libsvn_client/upgrade.c
(svn_client_checkout4,
svn_client_upgrade2): Default to the oldest supported WC version.
* subversion/tests/cmdline/svntest/main.py
(DEFAULT_COMPATIBLE_VERSION): New.
(wc_format): Default to the oldest supported WC version.
* subversion/tests/svn_test_main.c
(svn_test_main): Default to the oldest supported WC version.
Modified:
subversion/branches/multi-wc-format/subversion/include/svn_client.h
subversion/branches/multi-wc-format/subversion/libsvn_client/checkout.c
subversion/branches/multi-wc-format/subversion/libsvn_client/upgrade.c
subversion/branches/multi-wc-format/subversion/tests/cmdline/svntest/main.py
subversion/branches/multi-wc-format/subversion/tests/svn_test_main.c
Modified: subversion/branches/multi-wc-format/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/include/svn_client.h?rev=1897943&r1=1897942&r2=1897943&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/include/svn_client.h (original)
+++ subversion/branches/multi-wc-format/subversion/include/svn_client.h Thu Feb 10 15:46:27 2022
@@ -1242,9 +1242,9 @@ svn_client_args_to_target_array(apr_arra
* obstructing items.
* @param[in] wc_format_version is the version number of the Subversion
* client that supports the metadata format of the
- * created working copy; @c NULL means the newest
- * supported format. The earliest supported version is
- * returned by svn_client_supported_wc_version().
+ * created working copy; @c NULL means the library's default
+ * format. The earliest supported version is returned by
+ * svn_client_supported_wc_version().
* @param[in] ctx The standard client context, used for authentication and
* notification.
* @param[in] pool Used for any temporary allocation.
@@ -4400,8 +4400,8 @@ svn_client_cleanup(const char *dir,
* format. @a wcroot_dir is the path to the WC root.
*
* @a wc_format_version is the version number of the Subversion client
- * that supports a given WC metadata format; @c NULL means the newest
- * supported format. The earliest supported version is returned by
+ * that supports a given WC metadata format; @c NULL means the library's
+ * default format. The earliest supported version is returned by
* svn_client_supported_wc_version().
*
* Use @a scratch_pool for any temporary allocations.
Modified: subversion/branches/multi-wc-format/subversion/libsvn_client/checkout.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/libsvn_client/checkout.c?rev=1897943&r1=1897942&r2=1897943&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/libsvn_client/checkout.c (original)
+++ subversion/branches/multi-wc-format/subversion/libsvn_client/checkout.c Thu Feb 10 15:46:27 2022
@@ -235,9 +235,9 @@ svn_client_checkout4(svn_revnum_t *resul
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
- /* A NULL wc_format_version translates to the current version. */
+ /* A NULL wc_format_version translates to the default version. */
if (!wc_format_version)
- wc_format_version = svn_client_version();
+ wc_format_version = svn_client_supported_wc_version();
err = svn_client__checkout_internal(result_rev, &sleep_here,
URL, local_abspath,
Modified: subversion/branches/multi-wc-format/subversion/libsvn_client/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/libsvn_client/upgrade.c?rev=1897943&r1=1897942&r2=1897943&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/libsvn_client/upgrade.c (original)
+++ subversion/branches/multi-wc-format/subversion/libsvn_client/upgrade.c Thu Feb 10 15:46:27 2022
@@ -192,9 +192,9 @@ svn_client_upgrade2(const char *path,
{
int wc_format;
- /* A NULL wc_format_version translates to the current version. */
+ /* A NULL wc_format_version translates to the default version. */
if (!wc_format_version)
- wc_format_version = svn_client_version();
+ wc_format_version = svn_client_supported_wc_version();
SVN_ERR(svn_wc__format_from_version(&wc_format,
wc_format_version,
Modified: subversion/branches/multi-wc-format/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/tests/cmdline/svntest/main.py?rev=1897943&r1=1897942&r2=1897943&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/multi-wc-format/subversion/tests/cmdline/svntest/main.py Thu Feb 10 15:46:27 2022
@@ -58,6 +58,7 @@ from svntest import Skip
from svntest.wc import StateItem as Item
SVN_VER_MINOR = 15
+DEFAULT_COMPATIBLE_VERSION = "1.8"
def svn_wc__min_supported_format_version():
return '1.8'
@@ -1740,9 +1741,8 @@ def is_remote_http_connection_allowed():
return options.allow_remote_http_connection
def wc_format():
- minor = (int(options.wc_format_version.split('.')[1])
- if options.wc_format_version
- else SVN_VER_MINOR)
+ ver = (options.wc_format_version or DEFAULT_COMPATIBLE_VERSION)
+ minor = int(ver.split('.')[1])
if minor >= 15 and minor <= SVN_VER_MINOR:
return 32
if minor >= 8 and minor <= 14:
Modified: subversion/branches/multi-wc-format/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/tests/svn_test_main.c?rev=1897943&r1=1897942&r2=1897943&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/tests/svn_test_main.c (original)
+++ subversion/branches/multi-wc-format/subversion/tests/svn_test_main.c Thu Feb 10 15:46:27 2022
@@ -808,7 +808,7 @@ svn_test_main(int argc, const char *argv
svn_test_opts_t opts = { NULL };
opts.fs_type = DEFAULT_FS_TYPE;
- opts.wc_format_version = svn_wc__max_supported_format_version();
+ opts.wc_format_version = svn_wc__min_supported_format_version();
/* Initialize APR (Apache pools) */
if (apr_initialize() != APR_SUCCESS)