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/18 16:16:09 UTC
svn commit: r1898192 - in /subversion/branches/pristines-on-demand-on-mwf: ./ subversion/include/ subversion/libsvn_fs_x/ subversion/libsvn_subr/utf8proc/ subversion/tests/cmdline/ subversion/tests/cmdline/svntest/ tools/buildbot/slaves/win32-vcpkg/ to...
Author: julianfoad
Date: Fri Feb 18 16:16:08 2022
New Revision: 1898192
URL: http://svn.apache.org/viewvc?rev=1898192&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: sync with trunk.
Modified:
subversion/branches/pristines-on-demand-on-mwf/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_fs_x/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/utf8proc/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/externals_tests.py
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/stat_tests.py
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/verify.py
subversion/branches/pristines-on-demand-on-mwf/tools/buildbot/slaves/win32-vcpkg/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt
subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt
Propchange: subversion/branches/pristines-on-demand-on-mwf/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1897695-1898191
Merged /subversion/branches/multi-wc-format:r1897968-1898186
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h?rev=1898192&r1=1898191&r2=1898192&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h Fri Feb 18 16:16:08 2022
@@ -3300,13 +3300,13 @@ typedef struct svn_wc_info_t
int wc_format;
/**
- * The oldest supporter working copy format.
+ * The oldest supported working copy format, #SVN_WC__SUPPORTED_VERSION.
* @since New in 1.15.
*/
int wc_format_min;
/**
- * The newest supporter working copy format.
+ * The newest supported working copy format, #SVN_WC__VERSION.
* @since New in 1.15.
*/
int wc_format_max;
@@ -3556,7 +3556,8 @@ svn_wc_mark_missing_deleted(const char *
*
* If the administrative area does not exist, then create it and
* initialize it to an unlocked state. The format of the new
- * administrative area will always be the newset supported format.
+ * administrative area will be the library's default format
+ * (#SVN_WC__DEFAULT_VERSION).
*
* If the administrative area already exists then the given @a url
* must match the URL in the administrative area and the given
@@ -7456,9 +7457,10 @@ typedef svn_error_t * (*svn_wc_upgrade_g
/**
- * Upgrade the working copy at @a local_abspath to the latest metadata
- * storage format. @a local_abspath should be an absolute path to the
- * root of the working copy.
+ * Upgrade the working copy at @a local_abspath to the library's
+ * default metadata storage format (#SVN_WC__DEFAULT_VERSION).
+ * @a local_abspath should be an absolute path to the root of the
+ * working copy.
*
* If @a cancel_func is non-NULL, invoke it with @a cancel_baton at
* various points during the operation. If it returns an error
@@ -7473,8 +7475,9 @@ typedef svn_error_t * (*svn_wc_upgrade_g
* repository uuid, @a repos_info_func (if non-NULL) will be called
* with @a repos_info_baton to provide the missing information.
*
- * @since New in 1.7
+ * @since New in 1.7.
* @deprecated Provided for backward compatibility with the 1.14 API.
+ * @see svn_wc__upgrade()
*/
SVN_DEPRECATED
svn_error_t *
Propchange: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/libsvn_fs_x:r1897030-1898191
Merged /subversion/branches/multi-wc-format/subversion/libsvn_fs_x:r1897945-1898186
Propchange: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/utf8proc/
------------------------------------------------------------------------------
Merged /subversion/branches/multi-wc-format/subversion/libsvn_subr/utf8proc:r1897945-1898186
Merged /subversion/trunk/subversion/libsvn_subr/utf8proc:r1897030-1898191
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/externals_tests.py?rev=1898192&r1=1898191&r2=1898192&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/externals_tests.py Fri Feb 18 16:16:08 2022
@@ -3296,7 +3296,7 @@ def file_external_versioned_obstruction(
sbox.build()
wc_dir = sbox.wc_dir
- expected_output = verify.RegexOutput('r2 committed .*')
+ expected_output = verify.RegexOutput(b'r2 committed .*')
svntest.actions.run_and_verify_svnmucc(expected_output, [],
'-U', sbox.repo_url, '-m', 'r2: set external',
'propset', 'svn:externals', '^/A/mu mu-ext', 'A')
@@ -3321,7 +3321,7 @@ def file_external_versioned_obstruction(
# external obstruction then when the external is deleted the
# versioned node is missing from disk and wc.db. Not really sure
# what should happen, perhaps a not-present node?
- expected_output = verify.RegexOutput('r3 committed .*')
+ expected_output = verify.RegexOutput(b'r3 committed .*')
svntest.actions.run_and_verify_svnmucc(expected_output, [],
'-U', sbox.repo_url, '-m', 'r3: copy file',
'cp', 'head', 'A/mu', 'A/mu-ext',
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/stat_tests.py?rev=1898192&r1=1898191&r2=1898192&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/stat_tests.py Fri Feb 18 16:16:08 2022
@@ -1950,7 +1950,7 @@ def modified_modulo_translation(sbox):
# CRLF it.
with open(sbox.ospath('iota'), 'wb') as f:
- f.write("This is the file 'iota'.\r\n")
+ f.write(b"This is the file 'iota'.\r\n")
# Run status. Expect some output.
# TODO: decide how such files should show in the output; whether they
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/verify.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/verify.py?rev=1898192&r1=1898191&r2=1898192&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/verify.py Fri Feb 18 16:16:08 2022
@@ -28,6 +28,7 @@ import re, sys
from difflib import unified_diff, ndiff
import pprint
import logging
+import itertools
import svntest
@@ -295,9 +296,9 @@ class RegexListOutput(ExpectedOutput):
if len(self.expected) != len(actual):
logger.warn('# Expected %d lines; actual %d lines' %
(len(self.expected), len(actual)))
- for e, a in map(None, self.expected_res, actual):
+ for e, a in itertools.zip_longest(self.expected_res, actual):
if e is not None and a is not None and regex_fullmatch(e, a):
- logger.warn("| " + a.rstrip())
+ logger.warn("| " + repr(a))
else:
if e is not None:
logger.warn("| -" + repr(e.pattern))
Propchange: subversion/branches/pristines-on-demand-on-mwf/tools/buildbot/slaves/win32-vcpkg/
------------------------------------------------------------------------------
Merged /subversion/trunk/tools/buildbot/slaves/win32-vcpkg:r1897030-1898191
Merged /subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-vcpkg:r1897945-1898186
Merged /subversion/branches/better-pristines/tools/buildbot/slaves/win32-vcpkg:r1807118-1843075
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt?rev=1898192&r1=1898191&r2=1898192&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt Fri Feb 18 16:16:08 2022
@@ -88,7 +88,7 @@ cannot necessarily compile or run agains
<p>There may be limited cases where the behavior of old APIs has been
slightly modified from previous releases. These are cases where edge cases
-of the functionality has been deemed buggy, and therefore improved or removed.
+of the functionality have been deemed buggy, and therefore improved or removed.
Please consult the
<a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/api-errata/[major-minor]/"
>API errata</a> for more detailed information on what these APIs are
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt?rev=1898192&r1=1898191&r2=1898192&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt Fri Feb 18 16:16:08 2022
@@ -88,7 +88,7 @@ cannot necessarily compile or run agains
<p>There may be limited cases where the behavior of old APIs has been
slightly modified from previous releases. These are cases where edge cases
-of the functionality has been deemed buggy, and therefore improved or removed.
+of the functionality have been deemed buggy, and therefore improved or removed.
Please consult the
<a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/api-errata/[major-minor]/"
>API errata</a> for more detailed information on what these APIs are