svn commit: r1915557 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sat Feb 3 04:15:02 2024 New Revision: 1915557 URL: http://svn.apache.org/viewvc?rev=1915557=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1915557=1915556=1915557=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sat Feb 3 04:15:02 2024 @@ -27,6 +27,20 @@ Merge https://svn.apache.org/r1 +1: jun66j5, futatuki +https://svn.apache.org/r191;>r191 | svn-role | 2024-02-03 04:00:05 + (Sat, 03 Feb 2024) | 11 lines + +Merge https://svn.apache.org/r1912632;>r1912632 from trunk: + + * https://svn.apache.org/r1912632;>r1912632 + Fix `invalid escape sequence` in Python scripts to prevent many + `SyntaxWarning`s since Python 3.12. + Justification: + Bare \ in regexps are SyntaxWarning as of Python 3.12, will be + SyntaxError in a future release. + Votes: + +1: dsahlberg, futatuki, jun66j5 + + Further changes currently under consideration are listed in each release line's
svn commit: r1915555 - in /subversion/branches/1.14.x: ./ build/ build/generator/ build/generator/swig/ subversion/tests/cmdline/ subversion/tests/cmdline/legacy/ subversion/tests/cmdline/svntest/ too
Author: svn-role
Date: Sat Feb 3 04:00:05 2024
New Revision: 191
URL: http://svn.apache.org/viewvc?rev=191=rev
Log:
Merge r1912632 from trunk:
* r1912632
Fix `invalid escape sequence` in Python scripts to prevent many
`SyntaxWarning`s since Python 3.12.
Justification:
Bare \ in regexps are SyntaxWarning as of Python 3.12, will be
SyntaxError in a future release.
Votes:
+1: dsahlberg, futatuki, jun66j5
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/build/generator/gen_win.py
subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
subversion/branches/1.14.x/build/generator/swig/__init__.py
subversion/branches/1.14.x/build/transform_sql.py
subversion/branches/1.14.x/subversion/tests/cmdline/basic_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/changelist_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/checkout_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/copy_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/diff_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/getopt_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/info_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/legacy/utf8_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/lock_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/merge_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/patch_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/prop_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/special_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/stat_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/svnfsfs_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/svnmover_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/svntest/actions.py
subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py
subversion/branches/1.14.x/subversion/tests/cmdline/svntest/verify.py
subversion/branches/1.14.x/subversion/tests/cmdline/svntest/wc.py
subversion/branches/1.14.x/subversion/tests/cmdline/trans_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/update_tests.py
subversion/branches/1.14.x/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/1.14.x/tools/dist/release.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1912632
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=191=1915554=191=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Feb 3 04:00:05 2024
@@ -34,12 +34,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1912632
- Fix `invalid escape sequence` in Python scripts to prevent many
- `SyntaxWarning`s since Python 3.12.
- Justification:
- Bare \ in regexps are SyntaxWarning as of Python 3.12, will be
- SyntaxError in a future release.
- Votes:
- +1: dsahlberg, futatuki, jun66j5
Modified: subversion/branches/1.14.x/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_win.py?rev=191=1915554=191=diff
==
--- subversion/branches/1.14.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.14.x/build/generator/gen_win.py Sat Feb 3 04:00:05
2024
@@ -574,7 +574,7 @@ class WinGeneratorBase(gen_win_dependenc
# This section parses those dependencies and adds them to the dependency
list
# for this target.
if name.startswith('javahl') or name == 'libsvnjavahl':
- for dep in re.findall('\$\(([^\)]*)_DEPS\)', target.add_deps):
+ for dep in re.findall(r'\$\(([^\)]*)_DEPS\)', target.add_deps):
dep = dep.replace('_', '-')
depends.extend(self.sections[dep].get_targets())
@@ -728,7 +728,7 @@ class WinGeneratorBase(gen_win_dependenc
for dep in self.get_win_depends(target, FILTER_EXTERNALLIBS):
if dep.external_lib:
-for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):
+for elib in re.findall(r
svn commit: r1915339 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sat Jan 20 04:15:02 2024 New Revision: 1915339 URL: http://svn.apache.org/viewvc?rev=1915339=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1915339=1915338=1915339=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sat Jan 20 04:15:02 2024 @@ -2,6 +2,31 @@ Changes in ^/subversion/branches/1.14.x: +https://svn.apache.org/r1915337;>r1915337 | svn-role | 2024-01-20 04:00:02 + (Sat, 20 Jan 2024) | 9 lines + +Merge https://svn.apache.org/r1914518;>r1914518 from trunk: + + * https://svn.apache.org/r1914518;>r1914518 + Fix inconsistency in path argment on Config.which_group() + Justification: + Bug fix. + Votes: + +1: futatuki, dsahlberg + + +https://svn.apache.org/r1915338;>r1915338 | svn-role | 2024-01-20 04:00:04 + (Sat, 20 Jan 2024) | 10 lines + +Merge https://svn.apache.org/r1915316;>r1915316 from trunk: + + * https://svn.apache.org/r1915316;>r1915316 + swig-py: Fix `none_dealloc` error caused by reference count issue in + `apply_textdelta` invoked from `svn.repos.replay()`. + Justification: + Fix Python interpreter crash which often occurs with large repositories. + Votes: + +1: jun66j5, futatuki + + Further changes currently under consideration are listed in each release line's
svn commit: r1915338 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/python/tests/data/repository-deltas.dump subversi
Author: svn-role
Date: Sat Jan 20 04:00:04 2024
New Revision: 1915338
URL: http://svn.apache.org/viewvc?rev=1915338=rev
Log:
Merge r1915316 from trunk:
* r1915316
swig-py: Fix `none_dealloc` error caused by reference count issue in
`apply_textdelta` invoked from `svn.repos.replay()`.
Justification:
Fix Python interpreter crash which often occurs with large repositories.
Votes:
+1: jun66j5, futatuki
Added:
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/data/repository-deltas.dump
- copied unchanged from r1915316,
subversion/trunk/subversion/bindings/swig/python/tests/data/repository-deltas.dump
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/repository.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1915316
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1915338=1915337=1915338=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 20 04:00:04 2024
@@ -43,11 +43,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1915316
- swig-py: Fix `none_dealloc` error caused by reference count issue in
- `apply_textdelta` invoked from `svn.repos.replay()`.
- Justification:
- Fix Python interpreter crash which often occurs with large repositories.
- Votes:
- +1: jun66j5, futatuki
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1915338=1915337=1915338=diff
==
---
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(original)
+++
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Sat Jan 20 04:00:04 2024
@@ -2321,8 +2321,6 @@ static svn_error_t *apply_textdelta(void
in Python. */
if (result == Py_None)
{
- Py_DECREF(result);
-
*handler = svn_delta_noop_window_handler;
*h_baton = NULL;
}
@@ -2839,8 +2837,7 @@ parse_fn3_apply_textdelta(svn_txdelta_wi
{
PyObject *editor = NULL, *baton_item = NULL, *py_pool = NULL;
PyObject *ib = node_baton;
- apr_pool_t *pool;
- PyObject *result;
+ PyObject *result = NULL;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
@@ -2863,13 +2860,12 @@ parse_fn3_apply_textdelta(svn_txdelta_wi
in Python. */
if (result == Py_None)
{
- Py_DECREF(result);
-
*handler = svn_delta_noop_window_handler;
*handler_baton = NULL;
}
else
{
+ apr_pool_t *pool;
/* return the thunk for invoking the handler. the baton creates
new reference of our 'result' reference, which is the handler,
so we release it even if no error. */
@@ -2890,6 +2886,7 @@ parse_fn3_apply_textdelta(svn_txdelta_wi
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/repository.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/tests/repository.py?rev=1915338=1915337=1915338=diff
==
---
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/repository.py
(original)
+++
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/repository.py
Sat Jan 20 04:00:04 2024
@@ -331,6 +331,33 @@ class SubversionRepositoryTestCase(unitt
finally:
stream.close()
+ def test_parse_fns3_apply_textdelta_handler_refcount(self):
+handler = lambda node_baton: None
+handler_ref = weakref.ref(handler)
+
+class ParseFns3(repos.ParseFns3):
+ def __init__(self, handler):
+self.called = set()
+self.handler = handler
+ def apply_textdelta(self, node_baton):
+self.called.add('apply_textdelta')
+return self.handler
+
+dumpfile = os.path.join(os.path.dirname(__file__), 'data',
+'repository-deltas.dump')
+pool = Pool()
+subpool = Pool(pool)
+parser = ParseFns3(handler)
+ptr, baton = repos.make_parse_fns3(parser, subpool)
+with open(dumpfile, "rb") as stream:
+ repos.parse_dumpstream3(stream, ptr, baton, False, None)
+del ptr, baton, stream
+
+self.assertIn('apply_textdelta', parser.called)
+self.assertNot
svn commit: r1915337 - in /subversion/branches/1.14.x: ./ STATUS tools/hook-scripts/mailer/mailer.py
Author: svn-role
Date: Sat Jan 20 04:00:02 2024
New Revision: 1915337
URL: http://svn.apache.org/viewvc?rev=1915337=rev
Log:
Merge r1914518 from trunk:
* r1914518
Fix inconsistency in path argment on Config.which_group()
Justification:
Bug fix.
Votes:
+1: futatuki, dsahlberg
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1914518
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1915337=1915336=1915337=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 20 04:00:02 2024
@@ -44,13 +44,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1914518
- Fix inconsistency in path argment on Config.which_group()
- Justification:
- Bug fix.
- Votes:
- +1: futatuki, dsahlberg
-
* r1915316
swig-py: Fix `none_dealloc` error caused by reference count issue in
`apply_textdelta` invoked from `svn.repos.replay()`.
Modified: subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py?rev=1915337=1915336=1915337=diff
==
--- subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py (original)
+++ subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py Sat Jan 20
04:00:02 2024
@@ -473,7 +473,7 @@ class Commit(Messenger):
# collect the set of groups and the unique sets of params for the options
self.groups = { }
for path, change in self.changelist:
- for (group, params) in self.cfg.which_groups(path, log):
+ for (group, params) in self.cfg.which_groups(to_str(path), log):
# turn the params into a hashable object and stash it away
param_list = sorted(params.items())
# collect the set of paths belonging to this group
@@ -1475,9 +1475,9 @@ class Config:
"Return the path's associated groups."
groups = []
for group, pattern, exclude_pattern, repos_params, search_logmsg_re in
self._group_re:
- match = pattern.match(to_str(path))
+ match = pattern.match(path)
if match:
-if exclude_pattern and exclude_pattern.match(to_str(path)):
+if exclude_pattern and exclude_pattern.match(path):
continue
params = repos_params.copy()
params.update(match.groupdict())
svn commit: r1914970 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Fri Dec 29 04:15:02 2023 New Revision: 1914970 URL: http://svn.apache.org/viewvc?rev=1914970=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1914970=1914969=1914970=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Fri Dec 29 04:15:02 2023 @@ -2,276 +2,6 @@ Changes in ^/subversion/branches/1.14.x: -https://svn.apache.org/r1904478;>r1904478 | svn-role | 2022-10-10 04:00:03 + (Mon, 10 Oct 2022) | 10 lines - -Merge https://svn.apache.org/r1904472;>r1904472 from trunk: - - * https://svn.apache.org/r1904472;>r1904472 - swig-rb: Use Ruby API File.exist? instead of deprecated File.exists? - Justification: - Deprecated API File.exists? is deprecated as of Ruby 2.1 and removed - as of Ruby 3.2. - Votes: -+1: hartmannathan, dsahlberg - - -https://svn.apache.org/r1905107;>r1905107 | svn-role | 2022-11-07 04:00:02 + (Mon, 07 Nov 2022) | 15 lines - -Merge https://svn.apache.org/r1900882;>r1900882 from trunk: - - * https://svn.apache.org/r1900882;>r1900882 - SVN-4899: Replace a call to a function deprecated upstream. - Justification: - No-op on Python 3.2 and newer, but will allow Subversion 1.14.x to be - built by future Python 3.12. Note that Python 3.2 was released 9 years - before Subversion 1.14.0. - Votes: - +1: danielsh, jamessan - -0: futatuki (This breaks Python 2.7 support; - +1 if https://svn.apache.org/r1900890;>r1900890 (see below) is also backported) - -[ Editors note: https://svn.apache.org/r1900890;>r1900890 got backported in https://svn.apache.org/r1905108;>r1905108. ] - - -https://svn.apache.org/r1905108;>r1905108 | svn-role | 2022-11-07 04:00:04 + (Mon, 07 Nov 2022) | 12 lines - -Merge https://svn.apache.org/r1900890;>r1900890 from trunk: - - * https://svn.apache.org/r1900890;>r1900890 - Follow up to https://svn.apache.org/r1900882;>r1900882: Restore Python 2.7 support on autogen.sh - Justification: - autogen.sh is need to build SWIG Python 2 bindings. - We have not actively dropped Python 2.7 support, at least on 1.14.x. - Depends: - https://svn.apache.org/r1900882;>r1900882 - Votes: - +1: futatuki, jun66j5, jamessan - - -https://svn.apache.org/r1905109;>r1905109 | svn-role | 2022-11-07 04:00:05 + (Mon, 07 Nov 2022) | 10 lines - -Merge https://svn.apache.org/r1904193;>r1904193 from trunk: - - * https://svn.apache.org/r1904193;>r1904193 - SVN-4908: Copy locked from svn_wc_status3_t to svn_wc_status2_t - Justification: - Allow PySVN (and other deprecated API users) to detect working copy - locked status. - Votes: - +1: hartmannathan, rhuijben, jamessan - ----- -https://svn.apache.org/r1905110;>r1905110 | svn-role | 2022-11-07 04:00:06 + (Mon, 07 Nov 2022) | 9 lines - -Merge https://svn.apache.org/r1904936;>r1904936 from trunk: - - * https://svn.apache.org/r1904936;>r1904936 - Add @Deprecated decorations to avoid compiler warnings. - Justification: - Avoid some compiler warnings - Votes: - +1: dsahlberg, jamessan - --------- -https://svn.apache.org/r1905111;>r1905111 | svn-role | 2022-11-07 04:00:07 + (Mon, 07 Nov 2022) | 9 lines - -Merge https://svn.apache.org/r1904938;>r1904938 from trunk: - - * https://svn.apache.org/r1904938;>r1904938 - Java binding fixes. - Justification: - Dont crash if someone uses a null message - Votes: - +1: dsahlberg, jamessan - --------- -https://svn.apache.org/r1905112;>r1905112 | svn-role | 2022-11-07 04:00:09 + (Mon, 07 Nov 2022) | 10 lines - -Merge the https://svn.apache.org/r1878379;>r1878379 group from trunk: - - * https://svn.apache.org/r1878379;>r1878379, https://svn.apache.org/r1883719;>r1883719, https://svn.apache.org/r1883722;>r1883722, https://svn.apache.org/r1884610;>r1884610 - Distinguish configure scripts on release mode and non release mode. - Justification: - Building process should not be prevented by swig installed in users - environment when users use release tar balls. - Votes: - +1: futatuki, stsp, jamessan - -
svn commit: r1914276 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sat Dec 2 04:15:01 2023 New Revision: 1914276 URL: http://svn.apache.org/viewvc?rev=1914276=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1914276=1914275=1914276=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sat Dec 2 04:15:01 2023 @@ -267,6 +267,11 @@ Merge https://svn.apache.org/r1 +1: hartmannathan, dsahlberg +https://svn.apache.org/r1914269;>r1914269 | hartmannathan | 2023-12-01 17:39:13 + (Fri, 01 Dec 2023) | 2 lines + +* CHANGES (1.14.x): merge from trunk + + Further changes currently under consideration are listed in each release line's
svn commit: r1914247 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Fri Dec 1 04:15:02 2023 New Revision: 1914247 URL: http://svn.apache.org/viewvc?rev=1914247=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1914247=1914246=1914247=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Fri Dec 1 04:15:02 2023 @@ -255,6 +255,18 @@ Merge https://svn.apache.org/r1 +1: jamessan, futatuki, hartmannathan +https://svn.apache.org/r1914246;>r1914246 | svn-role | 2023-12-01 04:00:02 + (Fri, 01 Dec 2023) | 9 lines + +Merge https://svn.apache.org/r1914220;>r1914220 from trunk: + + * https://svn.apache.org/r1914220;>r1914220 + Update copyright year to 2023. + Justification: + To show correct year in upcoming release. + Votes: + +1: hartmannathan, dsahlberg + + Further changes currently under consideration are listed in each release line's
svn commit: r1914246 - in /subversion/branches/1.14.x: ./ NOTICE STATUS subversion/libsvn_subr/version.c
Author: svn-role
Date: Fri Dec 1 04:00:02 2023
New Revision: 1914246
URL: http://svn.apache.org/viewvc?rev=1914246=rev
Log:
Merge r1914220 from trunk:
* r1914220
Update copyright year to 2023.
Justification:
To show correct year in upcoming release.
Votes:
+1: hartmannathan, dsahlberg
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/NOTICE
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/version.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1914220
Modified: subversion/branches/1.14.x/NOTICE
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/NOTICE?rev=1914246=1914245=1914246=diff
==
--- subversion/branches/1.14.x/NOTICE (original)
+++ subversion/branches/1.14.x/NOTICE Fri Dec 1 04:00:02 2023
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2022 The Apache Software Foundation
+Copyright 2023 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1914246=1914245=1914246=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Dec 1 04:00:02 2023
@@ -34,11 +34,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1914220
- Update copyright year to 2023.
- Justification:
- To show correct year in upcoming release.
- Votes:
- +1: hartmannathan, dsahlberg
-
Modified: subversion/branches/1.14.x/subversion/libsvn_subr/version.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/version.c?rev=1914246=1914245=1914246=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/version.c Fri Dec 1
04:00:02 2023
@@ -143,7 +143,7 @@ svn_version_extended(svn_boolean_t verbo
info->build_time = __TIME__;
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
-(pool, _("Copyright (C) 2022 The Apache Software Foundation.\n"
+(pool, _("Copyright (C) 2023 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see "
svn commit: r1914218 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Thu Nov 30 04:15:02 2023 New Revision: 1914218 URL: http://svn.apache.org/viewvc?rev=1914218=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1914218=1914217=1914218=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Thu Nov 30 04:15:02 2023 @@ -242,6 +242,19 @@ Merge https://svn.apache.org/r1 +1: dsahlberg, stsp, hartmannathan +https://svn.apache.org/r1914201;>r1914201 | hartmannathan | 2023-11-29 04:48:01 + (Wed, 29 Nov 2023) | 10 lines + +Merge https://svn.apache.org/r1903245;>r1903245 from trunk: + + * https://svn.apache.org/r1903245;>r1903245 + * autogen.sh: export environment variable PYTHON, for autoheader and + autoconf + Justification: + Build properly when Python executable is not named python + Votes: + +1: jamessan, futatuki, hartmannathan + + Further changes currently under consideration are listed in each release line's
svn commit: r1914104 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sat Nov 25 04:15:01 2023 New Revision: 1914104 URL: http://svn.apache.org/viewvc?rev=1914104=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1914104=1914103=1914104=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sat Nov 25 04:15:01 2023 @@ -230,6 +230,18 @@ Merge the https://svn.apache.or +1: dsahlberg, jamessan +https://svn.apache.org/r1914102;>r1914102 | svn-role | 2023-11-25 04:00:03 + (Sat, 25 Nov 2023) | 9 lines + +Merge https://svn.apache.org/r1908926;>r1908926 from trunk: + + * https://svn.apache.org/r1908926;>r1908926 + libsvn_client: Pass redirected URL for file externals. + Justification: + Bug fix. Issue #4911. + Votes: + +1: dsahlberg, stsp, hartmannathan + + Further changes currently under consideration are listed in each release line's
svn commit: r1914102 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_client/externals.c
Author: svn-role Date: Sat Nov 25 04:00:03 2023 New Revision: 1914102 URL: http://svn.apache.org/viewvc?rev=1914102=rev Log: Merge r1908926 from trunk: * r1908926 libsvn_client: Pass redirected URL for file externals. Justification: Bug fix. Issue #4911. Votes: +1: dsahlberg, stsp, hartmannathan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/libsvn_client/externals.c Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1908926 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1914102=1914101=1914102=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Sat Nov 25 04:00:03 2023 @@ -35,10 +35,3 @@ Veto-blocked changes: Approved changes: = - - * r1908926 - libsvn_client: Pass redirected URL for file externals. - Justification: - Bug fix. Issue #4911. - Votes: - +1: dsahlberg, stsp, hartmannathan Modified: subversion/branches/1.14.x/subversion/libsvn_client/externals.c URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_client/externals.c?rev=1914102=1914101=1914102=diff == --- subversion/branches/1.14.x/subversion/libsvn_client/externals.c (original) +++ subversion/branches/1.14.x/subversion/libsvn_client/externals.c Sat Nov 25 04:00:03 2023 @@ -917,7 +917,7 @@ handle_external_item_change(svn_client_c SVN_ERR(switch_file_external(local_abspath, new_loc, - new_url, + new_loc->url, _item->peg_revision, _item->revision, parent_dir_abspath,
svn commit: r1913549 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Fri Nov 3 04:15:02 2023 New Revision: 1913549 URL: http://svn.apache.org/viewvc?rev=1913549=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1913549=1913548=1913549=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Fri Nov 3 04:15:02 2023 @@ -218,6 +218,18 @@ Merge the https://svn.apache.or +0: dsahlberg (not enough experience for +1, but looks good) +https://svn.apache.org/r1913547;>r1913547 | svn-role | 2023-11-03 04:00:03 + (Fri, 03 Nov 2023) | 9 lines + +Merge the https://svn.apache.org/r1912724;>r1912724 group from trunk: + + * https://svn.apache.org/r1912724;>r1912724, https://svn.apache.org/r1912743;>r1912743 + Python bindings error handling + Justification: + Improve documentation and error message. Issue #1778 + Votes: + +1: dsahlberg, jamessan + + Further changes currently under consideration are listed in each release line's
svn commit: r1913547 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/swig/python/svn/fs.py subversion/bindings/swig/python/tests/fs.py
Author: svn-role
Date: Fri Nov 3 04:00:03 2023
New Revision: 1913547
URL: http://svn.apache.org/viewvc?rev=1913547=rev
Log:
Merge the r1912724 group from trunk:
* r1912724, r1912743
Python bindings error handling
Justification:
Improve documentation and error message. Issue #1778
Votes:
+1: dsahlberg, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/python/svn/fs.py
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/fs.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1912724,1912743
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1913547=1913546=1913547=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Nov 3 04:00:03 2023
@@ -42,11 +42,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1912724, r1912743
- Python bindings error handling
- Justification:
- Improve documentation and error message. Issue #1778
- Votes:
- +1: dsahlberg, jamessan
-
Modified: subversion/branches/1.14.x/subversion/bindings/swig/python/svn/fs.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/svn/fs.py?rev=1913547=1913546=1913547=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/python/svn/fs.py
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/python/svn/fs.py Fri
Nov 3 04:00:03 2023
@@ -23,6 +23,7 @@
#under the License.
##
+import errno
from libsvn.fs import *
from svn.core import _unprefix_names, Pool, _as_list
_unprefix_names(locals(), 'svn_fs_')
@@ -130,6 +131,18 @@ class FileDiff:
return self.tempfile1, self.tempfile2
def get_pipe(self):
+"""Perform diff and return a file object from which the output can
+be read.
+
+When DIFFOPTIONS is None (the default), use svn's internal diff.
+
+With any other DIFFOPTIONS, exec the external diff found on PATH,
+passing it DIFFOPTIONS. On Windows, exec diff.exe rather than
+diff. If a diff utility is not installed or found on PATH, throws
+FileNotFoundError. Caveat: On some systems, including Windows, an
+external diff may not be available unless installed and added to
+PATH manually.
+"""
self.get_files()
# If diffoptions were provided, then the diff command needs to be
@@ -142,8 +155,17 @@ class FileDiff:
+ [self.tempfile1, self.tempfile2]
# open the pipe, and return the file object for reading from the child.
- p = _subprocess.Popen(cmd, stdout=_subprocess.PIPE, bufsize=-1,
-close_fds=_sys.platform != "win32")
+ try:
+p = _subprocess.Popen(cmd, stdout=_subprocess.PIPE, bufsize=-1,
+ close_fds=_sys.platform != "win32")
+ # When removing Python 2 support: Change to FileNotFoundError and
+ # remove check for ENOENT (FileNotFoundError "Corresponds to errno
+ # ENOENT" according to documentation)
+ except OSError as err:
+if err.errno == errno.ENOENT:
+ err.strerror = "External diff command not found in PATH"
+raise err
+
return _PopenStdoutWrapper(p)
else:
Modified: subversion/branches/1.14.x/subversion/bindings/swig/python/tests/fs.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/tests/fs.py?rev=1913547=1913546=1913547=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/python/tests/fs.py
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/python/tests/fs.py Fri
Nov 3 04:00:03 2023
@@ -107,6 +107,9 @@ class SubversionFSTestCase(unittest.Test
try:
diffout, differr = Popen(["diff"], stdin=PIPE, stderr=PIPE).communicate()
+# When removing Python 2 support: Change to FileNotFoundError and
+# remove check for ENOENT (FileNotFoundError "Corresponds to errno
+# ENOENT" according to documentation)
except OSError as err:
if err.errno == errno.ENOENT:
self.skipTest("'diff' command not present")
svn commit: r1913136 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Fri Oct 20 04:15:03 2023 New Revision: 1913136 URL: http://svn.apache.org/viewvc?rev=1913136=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1913136=1913135=1913136=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Fri Oct 20 04:15:03 2023 @@ -205,6 +205,19 @@ Merge https://svn.apache.org/r1 +0: dsahlberg (reviewed, not tested) +https://svn.apache.org/r1913135;>r1913135 | svn-role | 2023-10-20 04:00:04 + (Fri, 20 Oct 2023) | 10 lines + +Merge the https://svn.apache.org/r1912500;>r1912500 group from trunk: + + * https://svn.apache.org/r1912500;>r1912500, https://svn.apache.org/r1912501;>r1912501, https://svn.apache.org/r1912502;>r1912502, https://svn.apache.org/r1912503;>r1912503, https://svn.apache.org/r1912515;>r1912515, https://svn.apache.org/r1912517;>r1912517, https://svn.apache.org/r1912691;>r1912691 + swig-py: Use pure Python objects as edit/parse_fns3 and decendant batons. + Justification: + Bug fix. Issue #4916, #4917, #4918 + Votes: + +1: futatuki + +0: dsahlberg (not enough experience for +1, but looks good) + + Further changes currently under consideration are listed in each release line's
svn commit: r1913135 - in /subversion/branches/1.14.x: ./ subversion/bindings/swig/ subversion/bindings/swig/python/libsvn_swig_py/ subversion/bindings/swig/python/svn/ subversion/bindings/swig/python
Author: svn-role
Date: Fri Oct 20 04:00:04 2023
New Revision: 1913135
URL: http://svn.apache.org/viewvc?rev=1913135=rev
Log:
Merge the r1912500 group from trunk:
* r1912500, r1912501, r1912502, r1912503, r1912515, r1912517, r1912691
swig-py: Use pure Python objects as edit/parse_fns3 and decendant batons.
Justification:
Bug fix. Issue #4916, #4917, #4918
Votes:
+1: futatuki
+0: dsahlberg (not enough experience for +1, but looks good)
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/1.14.x/subversion/bindings/swig/python/svn/delta.py
subversion/branches/1.14.x/subversion/bindings/swig/python/svn/repos.py
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/delta.py
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/repository.py
subversion/branches/1.14.x/subversion/bindings/swig/svn_delta.i
subversion/branches/1.14.x/subversion/bindings/swig/svn_repos.i
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1912500-1912503,1912515,1912517,1912691
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1913135=1913134=1913135=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Oct 20 04:00:04 2023
@@ -41,11 +41,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1912500, r1912501, r1912502, r1912503, r1912515, r1912517, r1912691
- swig-py: Use pure Python objects as edit/parse_fns3 and decendant batons.
- Justification:
- Bug fix. Issue #4916, #4917, #4918
- Votes:
- +1: futatuki
- +0: dsahlberg (not enough experience for +1, but looks good)
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1913135=1913134=1913135=diff
==
---
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(original)
+++
subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Fri Oct 20 04:00:04 2023
@@ -1762,44 +1762,97 @@ static svn_error_t *type_conversion_erro
/*** Editor Wrapping ***/
-/* this baton is used for the editor, directory, and file batons. */
-typedef struct item_baton {
- PyObject *editor; /* the editor handling the callbacks */
- PyObject *baton; /* the dir/file baton (or NULL for edit baton) */
- apr_pool_t *pool; /* top-level pool */
-} item_baton;
-
-static item_baton *make_baton(apr_pool_t *pool,
- PyObject *editor,
- PyObject *baton)
-{
- item_baton *newb = apr_palloc(pool, sizeof(*newb));
-
- /* Note: We steal the caller's reference to 'baton'. */
- Py_INCREF(editor);
- newb->editor = editor;
- newb->baton = baton;
- newb->pool = pool;
+static PyObject *
+make_baton(apr_pool_t *pool, PyObject *parent, PyObject *baton)
+{
+ PyObject *newb;
+ newb = PyObject_CallMethod(parent, "make_decendant", "O",
+ make_ob_pool, pool, baton);
+ /* We always borrow the reference in ancestor's dict during the C API
+ processing, so that we never leak the reference even the API aborted
+ by some error */
+ Py_XDECREF(newb);
return newb;
}
-static svn_error_t *close_baton(void *baton,
-const char *method)
+/* Get 'editor' and 'baton' from _ItemBaton instance. The caller
+ should be within a Python thread lock. */
+static svn_error_t *
+unwrap_item_baton(PyObject **editor, PyObject **baton, PyObject *item_baton)
{
- item_baton *ib = baton;
+ svn_error_t *err;
+
+ if ((*editor = PyObject_GetAttrString(item_baton, "editor")) == NULL)
+{
+ err = callback_exception_error();
+ *baton = NULL;
+ goto finished;
+}
+ if ((*baton = PyObject_GetAttrString(item_baton, "baton")) == NULL)
+{
+ Py_CLEAR(*editor);
+ err = callback_exception_error();
+ goto finished;
+}
+ err = SVN_NO_ERROR;
+ finished:
+ Py_XDECREF(*editor);
+ Py_XDECREF(*baton);
+ return err;
+}
+
+/* Get 'editor', 'baton', 'pool' from _ItemBaton instance. The caller
+ should be within a Python thread lock. */
+static svn_error_t *
+unwrap_item_baton_with_pool(PyObject **editor, PyObject **baton,
+PyObject **py_p
svn commit: r1911947 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sun Aug 27 04:15:02 2023 New Revision: 1911947 URL: http://svn.apache.org/viewvc?rev=1911947=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1911947=1911946=1911947=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sun Aug 27 04:15:02 2023 @@ -191,6 +191,20 @@ Merge https://svn.apache.org/r1 +1: hartmannathan, stsp, dsahlberg +https://svn.apache.org/r1911946;>r1911946 | svn-role | 2023-08-27 04:00:04 + (Sun, 27 Aug 2023) | 11 lines + +Merge https://svn.apache.org/r1907124;>r1907124 from trunk: + + * https://svn.apache.org/r1907124;>r1907124 + svntest/main.py: Remove wrong comma that broke tests with --enable-sasl + Justification: + Syntax error. + Votes: + +1: stsp, rhuijben + +0: hartmannathan (havent tested yet; intend to upgrade to +1 soon) + +0: dsahlberg (reviewed, not tested) + + Further changes currently under consideration are listed in each release line's
svn commit: r1911946 - in /subversion/branches/1.14.x: ./ STATUS subversion/tests/cmdline/svntest/main.py
Author: svn-role
Date: Sun Aug 27 04:00:04 2023
New Revision: 1911946
URL: http://svn.apache.org/viewvc?rev=1911946=rev
Log:
Merge r1907124 from trunk:
* r1907124
svntest/main.py: Remove wrong comma that broke tests with --enable-sasl
Justification:
Syntax error.
Votes:
+1: stsp, rhuijben
+0: hartmannathan (haven't tested yet; intend to upgrade to +1 soon)
+0: dsahlberg (reviewed, not tested)
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1907124
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1911946=1911945=1911946=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Aug 27 04:00:04 2023
@@ -34,12 +34,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1907124
- svntest/main.py: Remove wrong comma that broke tests with --enable-sasl
- Justification:
- Syntax error.
- Votes:
- +1: stsp, rhuijben
- +0: hartmannathan (haven't tested yet; intend to upgrade to +1 soon)
- +0: dsahlberg (reviewed, not tested)
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py?rev=1911946=1911945=1911946=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py Sun Aug
27 04:00:04 2023
@@ -1360,7 +1360,7 @@ def write_restrictive_svnserve_conf(repo
fp.write("groups-db = groups\n")
if options.enable_sasl:
fp.write("realm = svntest\n"
- "[sasl]\n",
+ "[sasl]\n"
"use-sasl = true\n");
else:
fp.write("password-db = passwd\n")
svn commit: r1911854 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Aug 23 04:15:02 2023 New Revision: 1911854 URL: http://svn.apache.org/viewvc?rev=1911854=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1911854=1911853=1911854=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Aug 23 04:15:02 2023 @@ -179,6 +179,18 @@ Merge https://svn.apache.org/r1 +1: hartmannathan, dsahlberg +https://svn.apache.org/r1911852;>r1911852 | svn-role | 2023-08-23 04:00:03 + (Wed, 23 Aug 2023) | 9 lines + +Merge https://svn.apache.org/r1906502;>r1906502 from trunk: + + * https://svn.apache.org/r1906502;>r1906502 + libsvn_diff: Fix missing pointer dereference in svn:mergeinfo diff parser + Justification: + Bug fix. Code to parse forward merges did not work as intended. + Votes: + +1: hartmannathan, stsp, dsahlberg + + Further changes currently under consideration are listed in each release line's
svn commit: r1911852 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_diff/parse-diff.c
Author: svn-role
Date: Wed Aug 23 04:00:03 2023
New Revision: 1911852
URL: http://svn.apache.org/viewvc?rev=1911852=rev
Log:
Merge r1906502 from trunk:
* r1906502
libsvn_diff: Fix missing pointer dereference in svn:mergeinfo diff parser
Justification:
Bug fix. Code to parse forward merges did not work as intended.
Votes:
+1: hartmannathan, stsp, dsahlberg
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1906502
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1911852=1911851=1911852=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Aug 23 04:00:03 2023
@@ -42,11 +42,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1906502
- libsvn_diff: Fix missing pointer dereference in svn:mergeinfo diff parser
- Justification:
- Bug fix. Code to parse forward merges did not work as intended.
- Votes:
- +1: hartmannathan, stsp, dsahlberg
-
Modified: subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c?rev=1911852=1911851=1911852=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c Wed Aug 23
04:00:03 2023
@@ -1006,7 +1006,7 @@ parse_pretty_mergeinfo_line(svn_boolean_
}
(*number_of_reverse_merges)--;
}
- else if (number_of_forward_merges > 0) /* forward merges */
+ else if (*number_of_forward_merges > 0) /* forward merges */
{
if (patch->reverse)
{
svn commit: r1911305 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Thu Jul 27 04:15:01 2023 New Revision: 1911305 URL: http://svn.apache.org/viewvc?rev=1911305=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1911305=1911304=1911305=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Thu Jul 27 04:15:01 2023 @@ -167,6 +167,18 @@ Merge https://svn.apache.org/r1 +0: rhuijben +https://svn.apache.org/r1911304;>r1911304 | svn-role | 2023-07-27 04:00:03 + (Thu, 27 Jul 2023) | 9 lines + +Merge https://svn.apache.org/r1911278;>r1911278 from trunk: + + * https://svn.apache.org/r1911278;>r1911278 + INSTALL: Improve APR build notes, especially regarding APR 1.7.3 on Windows + Justification: + SVN is unusable with APR 1.7.3 on Windows. + Votes: + +1: hartmannathan, dsahlberg + + Further changes currently under consideration are listed in each release line's
svn commit: r1911304 - in /subversion/branches/1.14.x: ./ INSTALL STATUS
Author: svn-role Date: Thu Jul 27 04:00:03 2023 New Revision: 1911304 URL: http://svn.apache.org/viewvc?rev=1911304=rev Log: Merge r1911278 from trunk: * r1911278 INSTALL: Improve APR build notes, especially regarding APR 1.7.3 on Windows Justification: SVN is unusable with APR 1.7.3 on Windows. Votes: +1: hartmannathan, dsahlberg Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/INSTALL subversion/branches/1.14.x/STATUS Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1911278 Modified: subversion/branches/1.14.x/INSTALL URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/INSTALL?rev=1911304=1911303=1911304=diff == --- subversion/branches/1.14.x/INSTALL (original) +++ subversion/branches/1.14.x/INSTALL Thu Jul 27 04:00:03 2023 @@ -242,22 +242,42 @@ I.INTRODUCTION $ ./configure --with-apr=/usr/local/apache2 \ --with-apr-util=/usr/local/apache2 ... - Be sure to use a native Windows SVN client (as opposed to - Cygwin's version) so that the .dsp files get carriage-returns at - the ends of their lines. Otherwise Visual Studio will complain - that it doesn't recognize the .dsp files. - - If you use APR libraries checked out from svn in an Unix - environment, you need to run the 'buildconf' script in each - library's directory, to regenerate the configure scripts and - other files required for compiling the libraries: + Notes on Windows platforms: - $ cd apr; ./buildconf; ./configure ...; make; make install; cd .. - - $ cd apr-util; ./buildconf; ./configure ...; make; make install; cd .. - - Configure build and install both libraries before running Subversion's - configure script. + * Do not use APR version 1.7.3 as that release contains a bug that +makes it impossible for Subversion to use it properly. This issue +only affects APR builds on Windows. This issue was fixed in APR +version 1.7.4. See: +https://lists.apache.org/thread/xd5t922jvb9423ph4j84rsp5fxks1k0z + + * If you check out APR and APR-util sources from their Subversion +repository, be sure to use a native Windows SVN client (as opposed +to Cygwin's version) so that the .dsp files get carriage-returns at +the ends of their lines. Otherwise Visual Studio will complain that +it doesn't recognize the .dsp files. + + Notes on Unix platforms: + + * If you check out APR and APR-util sources from their Subversion +repository, you need to run the 'buildconf' script in each library's +directory to regenerate the configure scripts and other files +required for compiling the libraries. Afterwards, configure, build, +and install both libraries before running Subversion's configure +script. For example: + + $ cd apr + $ ./buildconf + $ ./configure + $ make + $ make install + $ cd .. + + $ cd apr-util + $ ./buildconf + $ ./configure + $ make + $ make install + $ cd .. 2. SQLite (REQUIRED) Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1911304=1911303=1911304=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Jul 27 04:00:03 2023 @@ -49,10 +49,3 @@ Veto-blocked changes: Approved changes: = - - * r1911278 - INSTALL: Improve APR build notes, especially regarding APR 1.7.3 on Windows - Justification: - SVN is unusable with APR 1.7.3 on Windows. - Votes: - +1: hartmannathan, dsahlberg
svn commit: r1910417 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Thu Jun 15 04:15:02 2023 New Revision: 1910417 URL: http://svn.apache.org/viewvc?rev=1910417=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1910417=1910416=1910417=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Thu Jun 15 04:15:02 2023 @@ -154,6 +154,19 @@ Merge the https://svn.apache.or +1: futatuki, jamessan, rhuijben +https://svn.apache.org/r1910415;>r1910415 | svn-role | 2023-06-15 04:00:05 + (Thu, 15 Jun 2023) | 10 lines + +Merge https://svn.apache.org/r1910098;>r1910098 from trunk: + + * https://svn.apache.org/r1910098;>r1910098 + swig-py: Use `sysconfig` instead of `distutils.sysconfig`. + Justification: + Allow swig-py to build with Python 3.12. + Votes: + +1: jun66j5, futatuki + +0: rhuijben + + Further changes currently under consideration are listed in each release line's
svn commit: r1910415 - in /subversion/branches/1.14.x: ./ STATUS build/generator/gen_win_dependencies.py build/get-py-info.py
Author: svn-role
Date: Thu Jun 15 04:00:05 2023
New Revision: 1910415
URL: http://svn.apache.org/viewvc?rev=1910415=rev
Log:
Merge r1910098 from trunk:
* r1910098
swig-py: Use `sysconfig` instead of `distutils.sysconfig`.
Justification:
Allow swig-py to build with Python 3.12.
Votes:
+1: jun66j5, futatuki
+0: rhuijben
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
subversion/branches/1.14.x/build/get-py-info.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1910098
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1910415=1910414=1910415=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu Jun 15 04:00:05 2023
@@ -48,11 +48,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1910098
- swig-py: Use `sysconfig` instead of `distutils.sysconfig`.
- Justification:
- Allow swig-py to build with Python 3.12.
- Votes:
- +1: jun66j5, futatuki
- +0: rhuijben
Modified: subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_win_dependencies.py?rev=1910415=1910414=1910415=diff
==
--- subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
(original)
+++ subversion/branches/1.14.x/build/generator/gen_win_dependencies.py Thu Jun
15 04:00:05 2023
@@ -1030,12 +1030,13 @@ class GenDependenciesBase(gen_base.Gener
"Find the appropriate options for creating SWIG-based Python modules"
try:
- from distutils import sysconfig
-
- inc_dir = sysconfig.get_python_inc()
- lib_dir = os.path.join(sysconfig.PREFIX, "libs")
+ import sysconfig
except ImportError:
return
+config_vars = sysconfig.get_config_vars()
+inc_dir = config_vars['INCLUDEPY']
+base_dir = config_vars.get('installed_base') or config_vars.get('base')
+lib_dir = os.path.join(base_dir, 'libs')
if sys.version_info[0] >= 3:
if self.swig_version < (3, 0, 10):
Modified: subversion/branches/1.14.x/build/get-py-info.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/get-py-info.py?rev=1910415=1910414=1910415=diff
==
--- subversion/branches/1.14.x/build/get-py-info.py (original)
+++ subversion/branches/1.14.x/build/get-py-info.py Thu Jun 15 04:00:05 2023
@@ -44,15 +44,24 @@ if len(sys.argv) != 2:
usage()
try:
- from distutils import sysconfig
+ if sys.version_info[0] == 2:
+from distutils import sysconfig
+get_include = lambda: sysconfig.get_python_inc()
+get_platinclude = lambda: sysconfig.get_python_inc(plat_specific=1)
+get_purelib = lambda: sysconfig.get_python_lib()
+ else:
+import sysconfig
+get_include = lambda: sysconfig.get_path('include')
+get_platinclude = lambda: sysconfig.get_path('platinclude')
+get_purelib = lambda: sysconfig.get_path('purelib')
except ImportError:
# No information available
print("none")
sys.exit(1)
if sys.argv[1] == '--includes':
- inc = sysconfig.get_python_inc()
- plat = sysconfig.get_python_inc(plat_specific=1)
+ inc = get_include()
+ plat = get_platinclude()
if inc == plat:
print("-I" + inc)
else:
@@ -140,7 +149,7 @@ if sys.argv[1] == '--libs':
sys.exit(0)
if sys.argv[1] == '--site':
- print(sysconfig.get_python_lib())
+ print(get_purelib())
sys.exit(0)
usage()
svn commit: r1905333 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Nov 16 04:15:01 2022 New Revision: 1905333 URL: http://svn.apache.org/viewvc?rev=1905333=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1905333=1905332=1905333=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Nov 16 04:15:01 2022 @@ -125,6 +125,35 @@ Merge https://svn.apache.org/r1 +1: futatuki, jun66j5, jamessan +https://svn.apache.org/r1905330;>r1905330 | svn-role | 2022-11-16 04:00:03 + (Wed, 16 Nov 2022) | 12 lines + +Merge the 1.14.x-https://svn.apache.org/r1903267;>r1903267 branch: + + * https://svn.apache.org/r1903267;>r1903267 + Makefile.in (fast-clean, clean-swig-py): Remove __pycache__ directory + as well as *.pyc + Justification: + We dont want that the release tarballs contains extra directories. + Branch: + 1.14.x-https://svn.apache.org/r1903267;>r1903267 + Votes: + +1: futatuki, jamessan, rhuijben + + +https://svn.apache.org/r1905332;>r1905332 | svn-role | 2022-11-16 04:00:20 + (Wed, 16 Nov 2022) | 11 lines + +Merge the https://svn.apache.org/r1904198;>r1904198 group from trunk: + + * https://svn.apache.org/r1904198;>r1904198, https://svn.apache.org/r1904287;>r1904287 + swig-py: build: Dont pass deprecated options to SWIG = 4.1.0 release + Justification: + Reduce extra deprecation warnings from SWIG. + Depends: + https://svn.apache.org/r1878379;>r1878379, https://svn.apache.org/r1883719;>r1883719, https://svn.apache.org/r1883722;>r1883722, https://svn.apache.org/r1884610;>r1884610 + Votes: + +1: futatuki, jamessan, rhuijben + + Further changes currently under consideration are listed in each release line's
svn commit: r1905332 - in /subversion/branches/1.14.x: ./ STATUS build/ac-macros/swig.m4 build/generator/gen_win_dependencies.py
Author: svn-role
Date: Wed Nov 16 04:00:20 2022
New Revision: 1905332
URL: http://svn.apache.org/viewvc?rev=1905332=rev
Log:
Merge the r1904198 group from trunk:
* r1904198, r1904287
swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release
Justification:
Reduce extra deprecation warnings from SWIG.
Depends:
r1878379, r1883719, r1883722, r1884610
Votes:
+1: futatuki, jamessan, rhuijben
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/build/ac-macros/swig.m4
subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1904198,1904287
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905332=1905331=1905332=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Nov 16 04:00:20 2022
@@ -27,12 +27,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1904198, r1904287
- swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release
- Justification:
- Reduce extra deprecation warnings from SWIG.
- Depends:
- r1878379, r1883719, r1883722, r1884610
- Votes:
- +1: futatuki, jamessan, rhuijben
Modified: subversion/branches/1.14.x/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/ac-macros/swig.m4?rev=1905332=1905331=1905332=diff
==
--- subversion/branches/1.14.x/build/ac-macros/swig.m4 (original)
+++ subversion/branches/1.14.x/build/ac-macros/swig.m4 Wed Nov 16 04:00:20 2022
@@ -182,22 +182,29 @@ suitable Python interpreter is not found
if test "$SWIG_VERSION" -ge "300010"; then
dnl SWIG Python bindings successfully configured, clear the
error message dnl
SWIG_PY_ERRMSG=""
+ if test "$SWIG_VERSION" -lt "40"; then
+SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
+ elif test "$SWIG_VERSION" -lt "401000"; then
+SWIG_PY_OPTS="-python -py3 -nofastunpack"
+ else
+SWIG_PY_OPTS="-python -nofastunpack"
+ fi
+ if test "$SWIG_VERSION" -gt "42"; then
+AC_MSG_WARN([Subversion Python bindings may work,])
+AC_MSG_WARN([but we didn't check with this SWIG version.])
+ fi
else
+ SWIG_PY_OPTS="-no-such-option" # fool proof
SWIG_PY_ERRMSG="SWIG version is not suitable"
AC_MSG_WARN([Subversion Python bindings for Python 3 require
SWIG 3.0.10 or newer])
fi
-if test "$SWIG_VERSION" -lt "40"; then
- SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
-else
- SWIG_PY_OPTS="-python -py3 -nofastunpack"
-fi
else
if test "$SWIG_VERSION" -lt "40"; then
SWIG_PY_OPTS="-python -classic"
dnl SWIG Python bindings successfully configured, clear the
error message dnl
SWIG_PY_ERRMSG=""
else
- SWIG_PY_OPTS="-python -nofastunpack"
+ SWIG_PY_OPTS="-no-such-option" # fool proof
SWIG_PY_ERRMSG="SWIG version is not suitable"
AC_MSG_WARN([Subversion Python bindings for Python 2 require
1.3.24 <= SWIG < 4.0.0])
fi
Modified: subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_win_dependencies.py?rev=1905332=1905331=1905332=diff
==
--- subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
(original)
+++ subversion/branches/1.14.x/build/generator/gen_win_dependencies.py Wed Nov
16 04:00:20 2022
@@ -1044,8 +1044,13 @@ class GenDependenciesBase(gen_base.Gener
return
if self.swig_version < (4, 0, 0):
opts = "-python -py3 -nofastunpack -modern"
- else:
+ elif self.swig_version < (4, 1, 0):
opts = "-python -py3 -nofastunpack"
+ else:
+opts = "-python -nofastunpack"
+ if show_warnings and self.swig_version > (4, 0, 2):
+print("WARNING: Subversion Python bindings may work,\n"
+ "but we didn't check with this SWIG version.")
else:
if not ((1, 3, 24) <= self.swig_version < (4, 0, 0)):
if show_warnings:
svn commit: r1905331 - /subversion/branches/1.14.x-r1903267/
Author: svn-role Date: Wed Nov 16 04:00:18 2022 New Revision: 1905331 URL: http://svn.apache.org/viewvc?rev=1905331=rev Log: Remove the '1.14.x-r1903267' branch, merged in r1905330. Removed: subversion/branches/1.14.x-r1903267/
svn commit: r1905330 - in /subversion/branches/1.14.x: ./ Makefile.in STATUS
Author: svn-role
Date: Wed Nov 16 04:00:03 2022
New Revision: 1905330
URL: http://svn.apache.org/viewvc?rev=1905330=rev
Log:
Merge the 1.14.x-r1903267 branch:
* r1903267
Makefile.in (fast-clean, clean-swig-py): Remove __pycache__ directory
as well as *.pyc
Justification:
We don't want that the release tarballs contains extra directories.
Branch:
1.14.x-r1903267
Votes:
+1: futatuki, jamessan, rhuijben
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/Makefile.in
subversion/branches/1.14.x/STATUS
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1903267
Merged /subversion/branches/1.14.x-r1903267:r1903268-1905329
Modified: subversion/branches/1.14.x/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/Makefile.in?rev=1905330=1905329=1905330=diff
==
--- subversion/branches/1.14.x/Makefile.in (original)
+++ subversion/branches/1.14.x/Makefile.in Wed Nov 16 04:00:03 2022
@@ -457,8 +457,9 @@ fast-clean: doc-clean
done
echo $(CLEAN_FILES) | xargs rm -f --
find $(CTYPES_PYTHON_SRC_DIR) $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
- $(abs_srcdir)/build
$(top_srcdir)/subversion/tests/cmdline/svntest \
- -name "*.pyc" -exec rm {} ';'
+ $(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline \
+ '(' -name "__pycache__" -prune -o -name "*.pyc" ')' \
+ -exec rm -rf {} ';'; \
# clean everything, returning to before './configure' was run.
SVN_CONFIG_SCRIPT_FILES = @SVN_CONFIG_SCRIPT_FILES@
@@ -959,7 +960,9 @@ clean-swig-py:
do \
cd $$d && rm -rf *.lo *.la *.o *.pyc .libs; \
done
- find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) -name "*.pyc" -exec rm {} ';'
+ find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
+ '(' -name "__pycache__" -prune -o -name "*.pyc" ')' \
+ -exec rm -rf {} ';'
extraclean-swig-py: clean-swig-py
$(EXTRACLEAN_SWIG_PY)
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905330=1905329=1905330=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Nov 16 04:00:03 2022
@@ -28,16 +28,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1903267
- Makefile.in (fast-clean, clean-swig-py): Remove __pycache__ directory
- as well as *.pyc
- Justification:
- We don't want that the release tarballs contains extra directories.
- Branch:
- 1.14.x-r1903267
- Votes:
- +1: futatuki, jamessan, rhuijben
-
* r1904198, r1904287
swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release
Justification:
svn commit: r1905261 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sun Nov 13 04:15:02 2022 New Revision: 1905261 URL: http://svn.apache.org/viewvc?rev=1905261=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1905261=1905260=1905261=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sun Nov 13 04:15:02 2022 @@ -15,7 +15,7 @@ Merge https://svn.apache.org/r1 +1: hartmannathan, dsahlberg -https://svn.apache.org/r1905107;>r1905107 | svn-role | 2022-11-07 04:00:02 + (Mon, 07 Nov 2022) | 13 lines +https://svn.apache.org/r1905107;>r1905107 | svn-role | 2022-11-07 04:00:02 + (Mon, 07 Nov 2022) | 15 lines Merge https://svn.apache.org/r1900882;>r1900882 from trunk: @@ -30,6 +30,8 @@ Merge https://svn.apache.org/r1 -0: futatuki (This breaks Python 2.7 support; +1 if https://svn.apache.org/r1900890;>r1900890 (see below) is also backported) +[ Editors note: https://svn.apache.org/r1900890;>r1900890 got backported in https://svn.apache.org/r1905108;>r1905108. ] + https://svn.apache.org/r1905108;>r1905108 | svn-role | 2022-11-07 04:00:04 + (Mon, 07 Nov 2022) | 12 lines
svn commit: r1905174 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Nov 9 04:15:02 2022 New Revision: 1905174 URL: http://svn.apache.org/viewvc?rev=1905174=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1905174=1905173=1905174=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Nov 9 04:15:02 2022 @@ -96,6 +96,33 @@ Merge the https://svn.apache.or +1: futatuki, stsp, jamessan +https://svn.apache.org/r1905172;>r1905172 | svn-role | 2022-11-09 04:00:03 + (Wed, 09 Nov 2022) | 11 lines + +Merge https://svn.apache.org/r1877310;>r1877310 from trunk: + + * https://svn.apache.org/r1877310;>r1877310 + Add a test for issue #4711 invalid xml file produced by svn log --xml + --verbose --use-merge-history --search. + Justification: + Increase test coverage. + Votes: + +0: danielsh (with appropriate Skip()/XFail() annotations if needed) + +1: hartmannathan, jamessan + + +https://svn.apache.org/r1905173;>r1905173 | svn-role | 2022-11-09 04:00:04 + (Wed, 09 Nov 2022) | 10 lines + +Merge https://svn.apache.org/r1904167;>r1904167 from trunk: + + * https://svn.apache.org/r1904167;>r1904167 + swig-py: Fix conditionals by SWIG version and by Python version for proxy + code. + Justification: + swig-py should be built correctly with upcoming SWIG 4.1.0 release. + Votes: + +1: futatuki, jun66j5, jamessan + + Further changes currently under consideration are listed in each release line's
svn commit: r1905172 - in /subversion/branches/1.14.x: ./ STATUS subversion/tests/cmdline/log_tests.py
Author: svn-role
Date: Wed Nov 9 04:00:03 2022
New Revision: 1905172
URL: http://svn.apache.org/viewvc?rev=1905172=rev
Log:
Merge r1877310 from trunk:
* r1877310
Add a test for issue #4711 "invalid xml file produced by svn log --xml
--verbose --use-merge-history --search".
Justification:
Increase test coverage.
Votes:
+0: danielsh (with appropriate Skip()/XFail() annotations if needed)
+1: hartmannathan, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1877310
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905172=1905171=1905172=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Nov 9 04:00:03 2022
@@ -47,15 +47,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1877310
- Add a test for issue #4711 "invalid xml file produced by svn log --xml
- --verbose --use-merge-history --search".
- Justification:
- Increase test coverage.
- Votes:
- +0: danielsh (with appropriate Skip()/XFail() annotations if needed)
- +1: hartmannathan, jamessan
-
* r1904167
swig-py: Fix conditionals by SWIG version and by Python version for proxy
code.
@@ -63,4 +54,3 @@ Approved changes:
swig-py should be built correctly with upcoming SWIG 4.1.0 release.
Votes:
+1: futatuki, jun66j5, jamessan
-
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py?rev=1905172=1905171=1905172=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py Wed Nov 9
04:00:03 2022
@@ -2779,6 +2779,42 @@ def log_on_deleted_deep(sbox):
'',
'-q', '-c', '1-2')
+@XFail()
+@Issue(4711)
+def log_with_merge_history_and_search(sbox):
+ "log --use-merge-history --search"
+
+ sbox.build()
+
+ # r2: create branch
+ sbox.simple_repo_copy('A', 'A2') # r2
+
+ # r3: mod in trunk
+ sbox.simple_append('A/mu', 'line 2')
+ sbox.simple_commit(message='r3: mod')
+ sbox.simple_update()
+
+ # r4: merge
+ svntest.main.run_svn(None, 'merge', sbox.repo_url + '/A', sbox.ospath('A2'))
+ sbox.simple_commit(message='r4: merge')
+ sbox.simple_update()
+
+ # Helper function
+ def count(haystack, needle):
+"""Return the number of times the string NEEDLE occurs in the string
+HAYSTACK."""
+return len(haystack.split(needle)) - 1
+
+ # Check the output is valid
+ # ### Since the test is currently XFail, we only smoke test the output.
+ # ### When fixing this test to PASS, extend this validation.
+ _, output, _ = svntest.main.run_svn(None, 'log', '--xml', '-g',
+ '--search', "this will have no matches",
+ sbox.ospath('A2'))
+
+ output = '\n'.join(output)
+ if count(output, "
svn commit: r1905173 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/swig/include/proxy.swg
Author: svn-role
Date: Wed Nov 9 04:00:04 2022
New Revision: 1905173
URL: http://svn.apache.org/viewvc?rev=1905173=rev
Log:
Merge r1904167 from trunk:
* r1904167
swig-py: Fix conditionals by SWIG version and by Python version for proxy
code.
Justification:
swig-py should be built correctly with upcoming SWIG 4.1.0 release.
Votes:
+1: futatuki, jun66j5, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1904167
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905173=1905172=1905173=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Nov 9 04:00:04 2022
@@ -46,11 +46,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1904167
- swig-py: Fix conditionals by SWIG version and by Python version for proxy
- code.
- Justification:
- swig-py should be built correctly with upcoming SWIG 4.1.0 release.
- Votes:
- +1: futatuki, jun66j5, jamessan
Modified: subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg?rev=1905173=1905172=1905173=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg Wed
Nov 9 04:00:04 2022
@@ -66,7 +66,6 @@
fn()
%}
-#if defined(SWIGPYTHON_PY3)
#if SWIG_VERSION >= 0x04
%pythoncode %{
# -classic and -modern options have been dropped and this variable
@@ -76,7 +75,7 @@
_set_instance_attr =
_swig_setattr_nondynamic_instance_variable(object.__setattr__)
%}
-#else
+#elif defined(SWIGPYTHON_PY3)
%pythoncode %{
# SWIG classes generated with -modern do not define this variable
try:
@@ -90,7 +89,6 @@
_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
%}
-#endif
#else
%pythoncode %{
# SWIG classes generated with -classic do not define this variable,
svn commit: r1905113 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Mon Nov 7 04:15:02 2022 New Revision: 1905113 URL: http://svn.apache.org/viewvc?rev=1905113=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1905113=1905112=1905113=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Mon Nov 7 04:15:02 2022 @@ -15,6 +15,87 @@ Merge https://svn.apache.org/r1 +1: hartmannathan, dsahlberg +https://svn.apache.org/r1905107;>r1905107 | svn-role | 2022-11-07 04:00:02 + (Mon, 07 Nov 2022) | 13 lines + +Merge https://svn.apache.org/r1900882;>r1900882 from trunk: + + * https://svn.apache.org/r1900882;>r1900882 + SVN-4899: Replace a call to a function deprecated upstream. + Justification: + No-op on Python 3.2 and newer, but will allow Subversion 1.14.x to be + built by future Python 3.12. Note that Python 3.2 was released 9 years + before Subversion 1.14.0. + Votes: + +1: danielsh, jamessan + -0: futatuki (This breaks Python 2.7 support; + +1 if https://svn.apache.org/r1900890;>r1900890 (see below) is also backported) + + +https://svn.apache.org/r1905108;>r1905108 | svn-role | 2022-11-07 04:00:04 + (Mon, 07 Nov 2022) | 12 lines + +Merge https://svn.apache.org/r1900890;>r1900890 from trunk: + + * https://svn.apache.org/r1900890;>r1900890 + Follow up to https://svn.apache.org/r1900882;>r1900882: Restore Python 2.7 support on autogen.sh + Justification: + autogen.sh is need to build SWIG Python 2 bindings. + We have not actively dropped Python 2.7 support, at least on 1.14.x. + Depends: + https://svn.apache.org/r1900882;>r1900882 + Votes: + +1: futatuki, jun66j5, jamessan + + +https://svn.apache.org/r1905109;>r1905109 | svn-role | 2022-11-07 04:00:05 + (Mon, 07 Nov 2022) | 10 lines + +Merge https://svn.apache.org/r1904193;>r1904193 from trunk: + + * https://svn.apache.org/r1904193;>r1904193 + SVN-4908: Copy locked from svn_wc_status3_t to svn_wc_status2_t + Justification: + Allow PySVN (and other deprecated API users) to detect working copy + locked status. + Votes: + +1: hartmannathan, rhuijben, jamessan + + +https://svn.apache.org/r1905110;>r1905110 | svn-role | 2022-11-07 04:00:06 + (Mon, 07 Nov 2022) | 9 lines + +Merge https://svn.apache.org/r1904936;>r1904936 from trunk: + + * https://svn.apache.org/r1904936;>r1904936 + Add @Deprecated decorations to avoid compiler warnings. + Justification: + Avoid some compiler warnings + Votes: + +1: dsahlberg, jamessan + + +https://svn.apache.org/r1905111;>r1905111 | svn-role | 2022-11-07 04:00:07 + (Mon, 07 Nov 2022) | 9 lines + +Merge https://svn.apache.org/r1904938;>r1904938 from trunk: + + * https://svn.apache.org/r1904938;>r1904938 + Java binding fixes. + Justification: + Dont crash if someone uses a null message + Votes: + +1: dsahlberg, jamessan + +---- +https://svn.apache.org/r1905112;>r1905112 | svn-role | 2022-11-07 04:00:09 + (Mon, 07 Nov 2022) | 10 lines + +Merge the https://svn.apache.org/r1878379;>r1878379 group from trunk: + + * https://svn.apache.org/r1878379;>r1878379, https://svn.apache.org/r1883719;>r1883719, https://svn.apache.org/r1883722;>r1883722, https://svn.apache.org/r1884610;>r1884610 + Distinguish configure scripts on release mode and non release mode. + Justification: + Building process should not be prevented by swig installed in users + environment when users use release tar balls. + Votes: + +1: futatuki, stsp, jamessan + + Further changes currently under consideration are listed in each release line's
svn commit: r1905111 - in /subversion/branches/1.14.x: ./ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/tigris/subversion/javahl/ subversion/bindings/
Author: svn-role
Date: Mon Nov 7 04:00:07 2022
New Revision: 1905111
URL: http://svn.apache.org/viewvc?rev=1905111=rev
Log:
Merge r1904938 from trunk:
* r1904938
Java binding fixes.
Justification:
Don't crash if someone uses a null message
Votes:
+1: dsahlberg, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1904938
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905111=1905110=1905111=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:07 2022
@@ -64,13 +64,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1904938
- Java binding fixes.
- Justification:
- Don't crash if someone uses a null message
- Votes:
- +1: dsahlberg, jamessan
-
* r1878379, r1883719, r1883722, r1884610
Distinguish configure scripts on release mode and non release mode.
Justification:
Modified:
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java?rev=1905111=1905110=1905111=diff
==
---
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
(original)
+++
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
Mon Nov 7 04:00:07 2022
@@ -85,7 +85,11 @@ class NativeException extends Subversion
*/
public String getMessage()
{
-StringBuffer msg = new StringBuffer(super.getMessage());
+StringBuilder msg = new StringBuilder();
+String message = super.getMessage();
+if (message != null) {
+msg.append(message);
+}
// ### This might be better off in JNIUtil::handleSVNError().
String src = getSource();
if (src != null)
Modified:
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java?rev=1905111=1905110=1905111=diff
==
---
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java
(original)
+++
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java
Mon Nov 7 04:00:07 2022
@@ -88,7 +88,11 @@ class NativeException extends Subversion
*/
public String getMessage()
{
-StringBuffer msg = new StringBuffer(super.getMessage());
+StringBuilder msg = new StringBuilder();
+String message = super.getMessage();
+if (message != null) {
+msg.append(message);
+}
// ### This might be better off in JNIUtil::handleSVNError().
String src = getSource();
if (src != null)
Modified:
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1905111=1905110=1905111=diff
==
---
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Mon Nov 7 04:00:07 2022
@@ -27,6 +27,7 @@ import static org.junit.Assert.*;
import org.apache.subversion.javahl.callback.*;
import org.apache.subversion.javahl.remote.*;
import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.NativeException;
import java.io.File;
import java.io.FileOutputStream;
@@ -4747,6 +4748,17 @@ public class BasicTests extends SVNTests
}
/**
+ * Test getMessage in NativeException
svn commit: r1905110 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Author: svn-role Date: Mon Nov 7 04:00:06 2022 New Revision: 1905110 URL: http://svn.apache.org/viewvc?rev=1905110=rev Log: Merge r1904936 from trunk: * r1904936 Add @Deprecated decorations to avoid compiler warnings. Justification: Avoid some compiler warnings Votes: +1: dsahlberg, jamessan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1904936 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905110=1905109=1905110=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:06 2022 @@ -64,13 +64,6 @@ Veto-blocked changes: Approved changes: = - * r1904936 - Add @Deprecated decorations to avoid compiler warnings. - Justification: - Avoid some compiler warnings - Votes: - +1: dsahlberg, jamessan - * r1904938 Java binding fixes. Justification: Modified: subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1905110=1905109=1905110=diff == --- subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original) +++ subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Mon Nov 7 04:00:06 2022 @@ -1200,6 +1200,7 @@ public class SVNClient implements SVNCli * boolean, boolean, int, String)} instead. * @since 1.0 */ +@Deprecated public long doExport(String srcPath, String destPath, Revision revision, boolean force) throws ClientException @@ -1213,6 +1214,7 @@ public class SVNClient implements SVNCli * boolean, boolean, int, String)} instead. * @since 1.2 */ +@Deprecated public long doExport(String srcPath, String destPath, Revision revision, Revision pegRevision, boolean force, boolean ignoreExternals, boolean recurse, @@ -1251,6 +1253,7 @@ public class SVNClient implements SVNCli * instead. * @since 1.0 */ +@Deprecated public long doSwitch(String path, String url, Revision revision, boolean recurse) throws ClientException @@ -1265,6 +1268,7 @@ public class SVNClient implements SVNCli * boolean)} instead. * @since 1.5 */ +@Deprecated public long doSwitch(String path, String url, Revision revision, Revision pegRevision, int depth, boolean depthIsSticky, boolean ignoreExternals, @@ -1359,6 +1363,7 @@ public class SVNClient implements SVNCli * boolean, boolean)} instead. * @since 1.0 */ +@Deprecated public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse) @@ -1374,6 +1379,7 @@ public class SVNClient implements SVNCli * boolean, boolean)} instead. * @since 1.2 */ +@Deprecated public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse, boolean ignoreAncestry, boolean dryRun)
svn commit: r1905112 - in /subversion/branches/1.14.x: ./ Makefile.in STATUS aclocal.m4 aclocal.m4.in autogen.sh build/ac-macros/swig.m4 configure.ac subversion/bindings/swig/INSTALL
Author: svn-role
Date: Mon Nov 7 04:00:09 2022
New Revision: 1905112
URL: http://svn.apache.org/viewvc?rev=1905112=rev
Log:
Merge the r1878379 group from trunk:
* r1878379, r1883719, r1883722, r1884610
Distinguish configure scripts on release mode and non release mode.
Justification:
Building process should not be prevented by swig installed in users'
environment when users use release tar balls.
Votes:
+1: futatuki, stsp, jamessan
Added:
subversion/branches/1.14.x/aclocal.m4.in
- copied unchanged from r1884610, subversion/trunk/aclocal.m4.in
Removed:
subversion/branches/1.14.x/aclocal.m4
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/Makefile.in
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/autogen.sh
subversion/branches/1.14.x/build/ac-macros/swig.m4
subversion/branches/1.14.x/configure.ac
subversion/branches/1.14.x/subversion/bindings/swig/INSTALL
Propchange: subversion/branches/1.14.x/
--
--- svn:ignore (original)
+++ svn:ignore Mon Nov 7 04:00:09 2022
@@ -14,6 +14,7 @@ TAGS
tags
neon
build-outputs.mk
+aclocal.m4
autogen-standalone.mk
autom4te.cache
gen-make.opts
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1878379,1883719,1883722,1884610
Modified: subversion/branches/1.14.x/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/Makefile.in?rev=1905112=1905111=1905112=diff
==
--- subversion/branches/1.14.x/Makefile.in (original)
+++ subversion/branches/1.14.x/Makefile.in Mon Nov 7 04:00:09 2022
@@ -356,7 +356,7 @@ INSTALL_EXTRA_SWIG_PY=\
$(INSTALL_DATA) "$$i" $(DESTDIR)$(swig_pydir); \
done; \
fi; \
- $(PYTHON) -c 'import compileall; \
+ $(SWIG_PY_PYTHON) -c 'import compileall; \
compileall.compile_dir("$(DESTDIR)$(swig_pydir)", 1, "$(swig_pydir)"); \
compileall.compile_dir("$(DESTDIR)$(swig_pydir_extra)", 1, \
"$(swig_pydir_extra)");'
@@ -396,7 +396,8 @@ HTTPD_VERSION = @HTTPD_VERSION@
HTTPD_WHITELIST = @HTTPD_WHITELIST@
PYTHON = @PYTHON@
-PERL = @PERL@
+SWIG_PY_PYTHON = @SWIG_PY_PYTHON@
+SWIG_PL_PERL = @SWIG_PL_PERL@
JDK = @JDK@
JAVA = @JAVA@
@@ -412,7 +413,7 @@ javahl_compat_CLASSPATH=$(JAVA_CLASSPATH
javahl_tests_CLASSPATH=$(JAVA_CLASSPATH)
javahl_compat_tests_CLASSPATH=$(JAVA_CLASSPATH)
-RUBY = @RUBY@
+SWIG_RB_RUBY = @SWIG_RB_RUBY@
RUBY_MAJOR = @RUBY_MAJOR@
RUBY_MINOR = @RUBY_MINOR@
RDOC = @RDOC@
@@ -474,6 +475,7 @@ local-distclean: local-clean
local-extraclean: extraclean-bindings local-distclean
rm -f $(top_srcdir)/build-outputs.mk \
$(top_srcdir)/subversion/svn_private_config.h.in \
+ $(top_srcdir)/aclocal.m4 \
$(top_srcdir)/configure \
$(top_srcdir)/gen-make.opts \
$(top_srcdir)/build/config.guess \
@@ -881,13 +883,13 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl
$(SWIG_PL_DIR)/native/Makefile.PL
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
+ cd $(SWIG_PL_DIR)/native; $(SWIG_PL_PERL) Makefile.PL PREFIX=$(prefix)
# There is a "readlink -f" command on some systems for the same purpose,
# but it's not as portable (e.g. Mac OS X doesn't have it). These should
# only be used where Python/Perl are known to be available.
READLINK_PY=$(PYTHON) -c 'import sys,os; print(os.path.realpath(sys.argv[1]))'
-READLINK_PL=$(PERL) -e 'use Cwd; print Cwd::realpath(shift)'
+READLINK_PL=$(SWIG_PL_PERL) -e 'use Cwd; print Cwd::realpath(shift)'
swig-pl: autogen-swig-pl $(SWIG_PL_DIR)/native/Makefile
if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL)
$(SWIG_PL_SRC_DIR)`"; then \
@@ -943,7 +945,7 @@ copy-swig-py: autogen-swig-py swig-py $(
check-swig-py: swig-py copy-swig-py
$(TEST_SHLIB_VAR_SWIG_PY) \
cd $(SWIG_PY_DIR); \
- $(PYTHON) $(SWIG_PY_SRC_DIR)/tests/run_all.py
+ $(SWIG_PY_PYTHON) $(SWIG_PY_SRC_DIR)/tests/run_all.py
EXTRACLEAN_SWIG_PY=rm -rf $(SWIG_PY_DIR)/svn_*.c $(SWIG_PY_DIR)/core.c \
$(SWIG_PY_DIR)/[a-z]*.py
@@ -968,7 +970,7 @@ check-swig-rb: swig-rb svnserve
$(TEST_SHLIB_VAR_SWIG_RB) \
cd $(SWIG_RB_DIR); \
check_rb() { \
- $(RUBY) -I $(SWIG_RB_SRC_DIR) $(SWIG_RB_SRC_DIR)/test/run-test.rb
"$$@"; \
+ $(SWIG_RB_RUBY) -I $(SWIG_RB_SRC_DIR)
$(SWIG_RB_SRC_DIR)/test/run-test.rb "$$@"; \
}; \
if check_rb --help 2>&1 | grep -q -- --collector; then \
check_rb -
svn commit: r1905108 - in /subversion/branches/1.14.x: ./ STATUS build/generator/gen_base.py
Author: svn-role Date: Mon Nov 7 04:00:04 2022 New Revision: 1905108 URL: http://svn.apache.org/viewvc?rev=1905108=rev Log: Merge r1900890 from trunk: * r1900890 Follow up to r1900882: Restore Python 2.7 support on autogen.sh Justification: autogen.sh is need to build SWIG Python 2 bindings. We have not actively dropped Python 2.7 support, at least on 1.14.x. Depends: r1900882 Votes: +1: futatuki, jun66j5, jamessan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/build/generator/gen_base.py Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1900890 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905108=1905107=1905108=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:04 2022 @@ -64,16 +64,6 @@ Veto-blocked changes: Approved changes: = - * r1900890 - Follow up to r1900882: Restore Python 2.7 support on autogen.sh - Justification: - autogen.sh is need to build SWIG Python 2 bindings. - We have not actively dropped Python 2.7 support, at least on 1.14.x. - Depends: - r1900882 - Votes: - +1: futatuki, jun66j5, jamessan - * r1904193 SVN-4908: Copy 'locked' from svn_wc_status3_t to svn_wc_status2_t Justification: Modified: subversion/branches/1.14.x/build/generator/gen_base.py URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_base.py?rev=1905108=1905107=1905108=diff == --- subversion/branches/1.14.x/build/generator/gen_base.py (original) +++ subversion/branches/1.14.x/build/generator/gen_base.py Mon Nov 7 04:00:04 2022 @@ -35,6 +35,7 @@ try: except ImportError: # Python <3.0 import ConfigParser as configparser + configparser.ConfigParser.read_file = configparser.ConfigParser.readfp import generator.swig import getversion
svn commit: r1905109 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_wc/deprecated.c
Author: svn-role Date: Mon Nov 7 04:00:05 2022 New Revision: 1905109 URL: http://svn.apache.org/viewvc?rev=1905109=rev Log: Merge r1904193 from trunk: * r1904193 SVN-4908: Copy 'locked' from svn_wc_status3_t to svn_wc_status2_t Justification: Allow PySVN (and other deprecated API users) to detect working copy locked status. Votes: +1: hartmannathan, rhuijben, jamessan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1904193 Merged /subversion/branches/issue-4908:r1903812-1904192 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905109=1905108=1905109=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:05 2022 @@ -64,14 +64,6 @@ Veto-blocked changes: Approved changes: = - * r1904193 - SVN-4908: Copy 'locked' from svn_wc_status3_t to svn_wc_status2_t - Justification: - Allow PySVN (and other deprecated API users) to detect working copy - locked status. - Votes: - +1: hartmannathan, rhuijben, jamessan - * r1904936 Add @Deprecated decorations to avoid compiler warnings. Justification: Modified: subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c?rev=1905109=1905108=1905109=diff == --- subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c (original) +++ subversion/branches/1.14.x/subversion/libsvn_wc/deprecated.c Mon Nov 7 04:00:05 2022 @@ -2799,6 +2799,7 @@ svn_wc__status2_from_3(svn_wc_status2_t } (*status)->entry = entry; + (*status)->locked = old_status->locked; (*status)->copied = old_status->copied; (*status)->repos_lock = svn_lock_dup(old_status->repos_lock, result_pool);
svn commit: r1905107 - in /subversion/branches/1.14.x: ./ STATUS build/generator/gen_base.py
Author: svn-role Date: Mon Nov 7 04:00:02 2022 New Revision: 1905107 URL: http://svn.apache.org/viewvc?rev=1905107=rev Log: Merge r1900882 from trunk: * r1900882 SVN-4899: Replace a call to a function deprecated upstream. Justification: No-op on Python 3.2 and newer, but will allow Subversion 1.14.x to be built by future Python 3.12. Note that Python 3.2 was released 9 years before Subversion 1.14.0. Votes: +1: danielsh, jamessan -0: futatuki (This breaks Python 2.7 support; +1 if r1900890 (see below) is also backported) Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/build/generator/gen_base.py Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1900882 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905107=1905106=1905107=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:02 2022 @@ -64,17 +64,6 @@ Veto-blocked changes: Approved changes: = - * r1900882 - SVN-4899: Replace a call to a function deprecated upstream. - Justification: - No-op on Python 3.2 and newer, but will allow Subversion 1.14.x to be - built by future Python 3.12. Note that Python 3.2 was released 9 years - before Subversion 1.14.0. - Votes: - +1: danielsh, jamessan - -0: futatuki (This breaks Python 2.7 support; - +1 if r1900890 (see below) is also backported) - * r1900890 Follow up to r1900882: Restore Python 2.7 support on autogen.sh Justification: @@ -114,4 +103,3 @@ Approved changes: environment when users use release tar balls. Votes: +1: futatuki, stsp, jamessan - Modified: subversion/branches/1.14.x/build/generator/gen_base.py URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_base.py?rev=1905107=1905106=1905107=diff == --- subversion/branches/1.14.x/build/generator/gen_base.py (original) +++ subversion/branches/1.14.x/build/generator/gen_base.py Mon Nov 7 04:00:02 2022 @@ -76,7 +76,7 @@ class GeneratorBase: # Now read and parse build.conf parser = configparser.ConfigParser() -parser.readfp(open(fname)) +parser.read_file(open(fname)) self.conf = build_path(os.path.abspath(fname))
svn commit: r1904479 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Mon Oct 10 04:15:02 2022 New Revision: 1904479 URL: http://svn.apache.org/viewvc?rev=1904479=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1904479=1904478=1904479=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Mon Oct 10 04:15:02 2022 @@ -2,6 +2,19 @@ Changes in ^/subversion/branches/1.14.x: +https://svn.apache.org/r1904478;>r1904478 | svn-role | 2022-10-10 04:00:03 + (Mon, 10 Oct 2022) | 10 lines + +Merge https://svn.apache.org/r1904472;>r1904472 from trunk: + + * https://svn.apache.org/r1904472;>r1904472 + swig-rb: Use Ruby API File.exist? instead of deprecated File.exists? + Justification: + Deprecated API File.exists? is deprecated as of Ruby 2.1 and removed + as of Ruby 3.2. + Votes: ++1: hartmannathan, dsahlberg + + Further changes currently under consideration are listed in each release line's
svn commit: r1904478 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/swig/ruby/svn/util.rb subversion/bindings/swig/ruby/test/test_wc.rb subversion/bindings/swig/ruby/test/windows_util
Author: svn-role
Date: Mon Oct 10 04:00:03 2022
New Revision: 1904478
URL: http://svn.apache.org/viewvc?rev=1904478=rev
Log:
Merge r1904472 from trunk:
* r1904472
swig-rb: Use Ruby API 'File.exist?' instead of deprecated 'File.exists?'
Justification:
Deprecated API 'File.exists?' is deprecated as of Ruby 2.1 and removed
as of Ruby 3.2.
Votes:
+1: hartmannathan, dsahlberg
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/util.rb
subversion/branches/1.14.x/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/1.14.x/subversion/bindings/swig/ruby/test/windows_util.rb
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1904472
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1904478=1904477=1904478=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Oct 10 04:00:03 2022
@@ -100,12 +100,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1904472
- swig-rb: Use Ruby API 'File.exist?' instead of deprecated 'File.exists?'
- Justification:
- Deprecated API 'File.exists?' is deprecated as of Ruby 2.1 and removed
- as of Ruby 3.2.
- Votes:
-+1: hartmannathan, dsahlberg
-
Modified: subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/util.rb
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/util.rb?rev=1904478=1904477=1904478=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/util.rb
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/ruby/svn/util.rb Mon
Oct 10 04:00:03 2022
@@ -20,7 +20,7 @@
if /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM)
$LOAD_PATH.each do |load_path|
svn_ext_path = File.join(load_path, "svn", "ext")
-if File.exists?(svn_ext_path)
+if File.exist?(svn_ext_path)
svn_ext_path_win = File.expand_path(svn_ext_path)
svn_ext_path_win = svn_ext_path.gsub(File::SEPARATOR,
File::ALT_SEPARATOR)
unless ENV["PATH"].split(";").find {|path| path == svn_ext_path_win}
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/ruby/test/test_wc.rb
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/ruby/test/test_wc.rb?rev=1904478=1904477=1904478=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/ruby/test/test_wc.rb
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/ruby/test/test_wc.rb
Mon Oct 10 04:00:03 2022
@@ -342,11 +342,11 @@ class SvnWcTest < Test::Unit::TestCase
def test_adm_ensure
adm_dir = Dir.glob(File.join(@wc_path, "{.,_}svn")).first
-assert(File.exists?(adm_dir))
+assert(File.exist?(adm_dir))
FileUtils.rm_rf(adm_dir)
-assert(!File.exists?(adm_dir))
+assert(!File.exist?(adm_dir))
Svn::Wc.ensure_adm(@wc_path, @fs.uuid, @repos_uri, @repos_uri, 0)
-assert(File.exists?(adm_dir))
+assert(File.exist?(adm_dir))
end
def test_merge
@@ -474,19 +474,19 @@ EOE
ctx.add(path)
ctx.ci(@wc_path).revision
- assert(File.exists?(path))
+ assert(File.exist?(path))
Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
access.delete(path)
end
- assert(!File.exists?(path))
+ assert(!File.exist?(path))
ctx.revert(path)
- assert(File.exists?(path))
+ assert(File.exist?(path))
Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
access.delete(path, nil, nil, true)
end
- assert(File.exists?(path))
+ assert(File.exist?(path))
end
end
@@ -808,9 +808,9 @@ EOE
ctx.add(path2)
rev2 = ctx.commit(@wc_path).revision
-assert(File.exists?(path2))
+assert(File.exist?(path2))
assert_equal(0, ctx.up(@wc_path, 0))
-assert(!File.exists?(path2))
+assert(!File.exist?(path2))
Svn::Wc::AdmAccess.open(nil, @wc_path) do |access|
editor = access.update_editor('', 0)
assert_equal(0, editor.target_revision)
@@ -848,9 +848,9 @@ EOE
ctx.add(path2)
rev2 = ctx.commit(@wc_path).revision
-assert(File.exists?(path2))
+assert(File.exist?(path2))
assert_equal(0, ctx.up(@wc_path, 0))
-assert(!File.exists?(path2))
+assert(!File.exist?(path2))
notification_count = 0
Svn::Wc::AdmAccess.open(nil, @wc_path) do |access|
svn commit: r1899725 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Mon Apr 11 04:15:02 2022 New Revision: 1899725 URL: http://svn.apache.org/viewvc?rev=1899725=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899725=1899724=1899725=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Mon Apr 11 04:15:02 2022 @@ -2,273 +2,6 @@ Changes in ^/subversion/branches/1.14.x: -https://svn.apache.org/r1889654;>r1889654 | svn-role | 2021-05-08 04:00:13 + (Sat, 08 May 2021) | 7 lines - -Merge https://svn.apache.org/r1889487;>r1889487 from trunk: - - * https://svn.apache.org/r1889487;>r1889487 - swig-py: Fix doubly destroying memory pool with cyclic garbage collector. - Votes: - +1: jun66j5, futatuki - - -https://svn.apache.org/r1896935;>r1896935 | svn-role | 2022-01-12 04:00:13 + (Wed, 12 Jan 2022) | 9 lines - -Merge https://svn.apache.org/r1896877;>r1896877 from trunk: - - * https://svn.apache.org/r1896877;>r1896877 -Fix misleading -r option documentation for some svnadmin subcommands. -Justification: - Documentation should be correct. -Votes: - +1: stsp, dsahlberg, hartmannathan - - -https://svn.apache.org/r1899241;>r1899241 | svn-role | 2022-03-27 14:53:27 + (Sun, 27 Mar 2022) | 9 lines - -Merge https://svn.apache.org/r1887704;>r1887704 from trunk: - - * https://svn.apache.org/r1887704;>r1887704 - Follow up to https://svn.apache.org/r1865987;>r1865987, https://svn.apache.org/r1866588;>r1866588: Unbreak a msgid. - Justification: - subversion.pot should be built correctly. - Votes: - +1: futatuki, jun66j5, markphip - - -https://svn.apache.org/r1899242;>r1899242 | svn-role | 2022-03-27 14:53:30 + (Sun, 27 Mar 2022) | 10 lines - -Merge https://svn.apache.org/r1891908;>r1891908 from trunk: - - * https://svn.apache.org/r1891908;>r1891908 - Fix a bug where «make davautocheck» immediately after configure failed - hard because of an unbuilt dependency. - Justification: - Small fix. Prevents spurious hard fails of make davautocheck. - Votes: - +1: danielsh, dsahlberg, markphip - - -https://svn.apache.org/r1899243;>r1899243 | svn-role | 2022-03-27 14:53:32 + (Sun, 27 Mar 2022) | 10 lines - -Merge https://svn.apache.org/r1885199;>r1885199 from trunk: - - * https://svn.apache.org/r1885199;>r1885199 - swig-py: Skip some tests on Python 2 if default encoding is utf-8. - Justification: - Fix check-swig-py not working at all since https://svn.apache.org/r1889654;>r1889654 merged from https://svn.apache.org/r1889487;>r1889487 - (https://svn.apache.org/r1889487;>r1889487 depends on https://svn.apache.org/r1885199;>r1885199). - Votes: - +1: jun66j5, futatuki - ----- -https://svn.apache.org/r1899255;>r1899255 | svn-role | 2022-03-27 18:03:44 + (Sun, 27 Mar 2022) | 9 lines - -Merge https://svn.apache.org/r1886708;>r1886708 from trunk: - - * https://svn.apache.org/r1886708;>r1886708 - swig-py: Fix dependency of make copy-swig-py target. - Justification: - Fix a regression introduced between 1.13.0 and 1.14.0. - Votes: - +1: futatuki, jun66j5 - --------- -https://svn.apache.org/r1899256;>r1899256 | svn-role | 2022-03-27 18:03:45 + (Sun, 27 Mar 2022) | 7 lines - -Merge the https://svn.apache.org/r1883838;>r1883838 group from trunk: - - * https://svn.apache.org/r1883838;>r1883838, https://svn.apache.org/r1883989;>r1883989, https://svn.apache.org/r1886460;>r1886460, https://svn.apache.org/r1886582;>r1886582 -Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref) -Votes: - +1: stsp, markphip, hartmannathan - ----- -https://svn.apache.org/r1899257;>r1899257 | svn-role | 2022-03-27 18:03:46 + (Sun, 27 Mar 2022) | 9 lines - -Merge the https://svn.apache.org/r1887641;>r1887641 group from trunk: - - * https://svn.apache.org/r1887641;>r1887641, https://svn.apache.org/r1890013;>r1890013 - Fix encoding of error message on failure of system() call. - Justification: - Error messages should b
svn commit: r1899504 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sat Apr 2 04:15:03 2022 New Revision: 1899504 URL: http://svn.apache.org/viewvc?rev=1899504=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899504=1899503=1899504=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sat Apr 2 04:15:03 2022 @@ -265,6 +265,10 @@ Merge https://svn.apache.org/r1 +1: markphip, jun66j5, jcorvel +https://svn.apache.org/r1899490;>r1899490 | markphip | 2022-04-01 14:14:45 + (Fri, 01 Apr 2022) | 2 lines + +Merge https://svn.apache.org/r1899487;>r1899487 from trunk updating CHANGES for 1.14.2 + Further changes currently under consideration are listed in each release line's
svn commit: r1899465 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Fri Apr 1 04:15:03 2022 New Revision: 1899465 URL: http://svn.apache.org/viewvc?rev=1899465=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899465=1899464=1899465=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Fri Apr 1 04:15:03 2022 @@ -198,6 +198,73 @@ Merge the https://svn.apache.or review) +https://svn.apache.org/r1899432;>r1899432 | hartmannathan | 2022-03-31 13:42:04 + (Thu, 31 Mar 2022) | 14 lines + +Merge the 1.14.x-https://svn.apache.org/r1881534;>r1881534-no-crlf branch: + + * https://svn.apache.org/r1881534;>r1881534 + Fix issue #4864 build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE + Justification: + Unblocks cross-compiling SVN. + Notes: + Replacement for veto-blocked https://svn.apache.org/r1881534;>r1881534 group (see below) without the + inconsistent line endings that instigated said veto blockage. + Branch: + 1.14.x-https://svn.apache.org/r1881534;>r1881534-no-crlf + Votes: + +1: hartmannathan, stsp, markphip + + +https://svn.apache.org/r1899434;>r1899434 | hartmannathan | 2022-03-31 13:42:24 + (Thu, 31 Mar 2022) | 9 lines + +Merge https://svn.apache.org/r1896609;>r1896609 from trunk: + + * https://svn.apache.org/r1896609;>r1896609 + Bumps copyright date to 2022 + Justification: + Show correct year in output. + Votes: + +1: hartmannathan, dsahlberg + + +https://svn.apache.org/r1899435;>r1899435 | hartmannathan | 2022-03-31 13:42:28 + (Thu, 31 Mar 2022) | 9 lines + +Merge https://svn.apache.org/r1890231;>r1890231 from trunk: + + * https://svn.apache.org/r1890231;>r1890231 + README: Document new home of our IRC channels at libera.chat + Justification: + Dont send users to the wrong place! + Votes: + +1: hartmannathan, dsahlberg + + +https://svn.apache.org/r1899436;>r1899436 | hartmannathan | 2022-03-31 13:42:40 + (Thu, 31 Mar 2022) | 11 lines + +Merge the 1.14.x-https://svn.apache.org/r1894491;>r1894491 branch: + + * https://svn.apache.org/r1894491;>r1894491 + INSTALL: Document not to build ZLib with ASM optimizations + Justification: + Building ZLib that way causes SVN to segfault. User complained. + Branch: + 1.14.x-https://svn.apache.org/r1894491;>r1894491 + Votes: + +1: hartmannathan, dsahlberg + + +https://svn.apache.org/r1899463;>r1899463 | svn-role | 2022-04-01 04:00:04 + (Fri, 01 Apr 2022) | 9 lines + +Merge https://svn.apache.org/r1884474;>r1884474 from trunk: + + * https://svn.apache.org/r1884474;>r1884474 + Fixes authz tests on Windows + Justification: + Should have been part of the https://svn.apache.org/r1883838;>r1883838 group that was backported + votes: + +1: markphip, jun66j5, jcorvel + + Further changes currently under consideration are listed in each release line's
svn commit: r1899462 - in /subversion/branches/1.10.x: ./ STATUS win-tests.py
Author: svn-role Date: Fri Apr 1 04:00:03 2022 New Revision: 1899462 URL: http://svn.apache.org/viewvc?rev=1899462=rev Log: Merge r1884474 from trunk: * r1884474 Fixes authz tests on Windows Justification: Should have been part of the r1883838 group that was backported votes: +1: jun66j5, markphip, jcorvel Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/win-tests.py Propchange: subversion/branches/1.10.x/ -- Merged /subversion/trunk:r1884474 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899462=1899461=1899462=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Apr 1 04:00:03 2022 @@ -20,10 +20,3 @@ Veto-blocked changes: Approved changes: = - - * r1884474 - Fixes authz tests on Windows - Justification: - Should have been part of the r1883838 group that was backported - votes: - +1: jun66j5, markphip, jcorvel Modified: subversion/branches/1.10.x/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/win-tests.py?rev=1899462=1899461=1899462=diff == --- subversion/branches/1.10.x/win-tests.py (original) +++ subversion/branches/1.10.x/win-tests.py Fri Apr 1 04:00:03 2022 @@ -772,6 +772,9 @@ class Httpd: local_tmp = os.path.join(self.abs_builddir, CMDLINE_TEST_SCRIPT_NATIVE_PATH, 'svn-test-work', 'local_tmp') +repositories = os.path.join(self.abs_builddir, +CMDLINE_TEST_SCRIPT_NATIVE_PATH, +'svn-test-work', 'repositories') return \ '' + '\n' \ ' DAV svn' + '\n' \ @@ -787,6 +790,17 @@ class Httpd: ' ' + '\n' \ ' SVNPathAuthz ' + self.path_authz_option + '\n' \ '' + '\n' \ + '' + '\n' \ + ' DAV svn' + '\n' \ + ' SVNParentPath ' + repositories + '\n' \ + ' AuthzSVNReposRelativeAccessFile "^/authz"\n' \ + ' SVNAdvertiseV2Protocol ' + self.httpv2_option + '\n' \ + ' AuthType Basic' + '\n' \ + ' AuthName "Subversion Repository"' + '\n' \ + ' AuthUserFile' + self._quote(self.httpd_users) + '\n' \ + ' Require valid-user' + '\n' \ + ' SVNPathAuthz ' + self.path_authz_option + '\n' \ + '' + '\n' \ '' + '\n' \ ' DAV svn' + '\n' \ ' SVNParentPath ' + local_tmp + '\n' \
svn commit: r1899463 - in /subversion/branches/1.14.x: ./ STATUS win-tests.py
Author: svn-role Date: Fri Apr 1 04:00:04 2022 New Revision: 1899463 URL: http://svn.apache.org/viewvc?rev=1899463=rev Log: Merge r1884474 from trunk: * r1884474 Fixes authz tests on Windows Justification: Should have been part of the r1883838 group that was backported votes: +1: markphip, jun66j5, jcorvel Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/win-tests.py Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1884474 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899463=1899462=1899463=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Apr 1 04:00:04 2022 @@ -44,10 +44,3 @@ Veto-blocked changes: Approved changes: = - - * r1884474 - Fixes authz tests on Windows - Justification: - Should have been part of the r1883838 group that was backported - votes: - +1: markphip, jun66j5, jcorvel Modified: subversion/branches/1.14.x/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/win-tests.py?rev=1899463=1899462=1899463=diff == --- subversion/branches/1.14.x/win-tests.py (original) +++ subversion/branches/1.14.x/win-tests.py Fri Apr 1 04:00:04 2022 @@ -772,6 +772,9 @@ class Httpd: local_tmp = os.path.join(self.abs_builddir, CMDLINE_TEST_SCRIPT_NATIVE_PATH, 'svn-test-work', 'local_tmp') +repositories = os.path.join(self.abs_builddir, +CMDLINE_TEST_SCRIPT_NATIVE_PATH, +'svn-test-work', 'repositories') return \ '' + '\n' \ ' DAV svn' + '\n' \ @@ -787,6 +790,17 @@ class Httpd: ' ' + '\n' \ ' SVNPathAuthz ' + self.path_authz_option + '\n' \ '' + '\n' \ + '' + '\n' \ + ' DAV svn' + '\n' \ + ' SVNParentPath ' + repositories + '\n' \ + ' AuthzSVNReposRelativeAccessFile "^/authz"\n' \ + ' SVNAdvertiseV2Protocol ' + self.httpv2_option + '\n' \ + ' AuthType Basic' + '\n' \ + ' AuthName "Subversion Repository"' + '\n' \ + ' AuthUserFile' + self._quote(self.httpd_users) + '\n' \ + ' Require valid-user' + '\n' \ + ' SVNPathAuthz ' + self.path_authz_option + '\n' \ + '' + '\n' \ '' + '\n' \ ' DAV svn' + '\n' \ ' SVNParentPath ' + local_tmp + '\n' \
svn commit: r1899378 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Mar 30 05:46:00 2022 New Revision: 1899378 URL: http://svn.apache.org/viewvc?rev=1899378=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899378=1899377=1899378=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Mar 30 05:46:00 2022 @@ -157,6 +157,47 @@ Merge https://svn.apache.org/r1 +1: brane, jun66j5, markphip +https://svn.apache.org/r1899374;>r1899374 | svn-role | 2022-03-30 05:41:48 + (Wed, 30 Mar 2022) | 11 lines + +Merge the 1.14.x-https://svn.apache.org/r1899227;>r1899227 branch: + + * https://svn.apache.org/r1899227;>r1899227 + Dont show unreadable copyfrom paths in svn log -v + Justification: + Makes svn log -v consistent with spec. + Branch: + 1.14.x-https://svn.apache.org/r1899227;>r1899227 + Votes: + +1: hartmannathan, dsahlberg, rhuijben + + +https://svn.apache.org/r1899376;>r1899376 | svn-role | 2022-03-30 05:42:05 + (Wed, 30 Mar 2022) | 9 lines + +Merge https://svn.apache.org/r1898633;>r1898633 from trunk: + + * https://svn.apache.org/r1898633;>r1898633 + Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure + Justification: + Fix test failure + Votes: + +1: jamessan, stsp + + +https://svn.apache.org/r1899377;>r1899377 | svn-role | 2022-03-30 05:42:07 + (Wed, 30 Mar 2022) | 12 lines + +Merge the https://svn.apache.org/r1892470;>r1892470 group from trunk: + + * https://svn.apache.org/r1892470;>r1892470, https://svn.apache.org/r1892471;>r1892471, https://svn.apache.org/r1892541;>r1892541 + Fix an assertion failure triggered by the conflict resolver. + Justification: + Subversion should not crash. User complained. + Votes: + +1: stsp, markphip, rhuijben + +0: dsahlberg (test suite passes for check, davautocheck and + svnserveautocheck. Not enough C experience for a formal + review) + + Further changes currently under consideration are listed in each release line's
svn commit: r1899376 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Author: svn-role
Date: Wed Mar 30 05:42:05 2022
New Revision: 1899376
URL: http://svn.apache.org/viewvc?rev=1899376=rev
Log:
Merge r1898633 from trunk:
* r1898633
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
Justification:
Fix test failure
Votes:
+1: jamessan, stsp
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1898633
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899376=1899375=1899376=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:42:05 2022
@@ -45,13 +45,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1898633
- Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
- Justification:
- Fix test failure
- Votes:
- +1: jamessan, stsp
-
* r1881534
Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
Justification:
Modified:
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1899376=1899375=1899376=diff
==
---
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Wed Mar 30 05:42:05 2022
@@ -4676,7 +4676,20 @@ public class BasicTests extends SVNTests
// RuntimeException("Test exception") is expected here
}
-tunnelAgent.joinAndTest();
+// In this test, there is a race condition that sometimes results in
+// IOException when 'WAIT_TUNNEL' tries to read from a pipe that
+// already has its read end closed. This is not an error, but
+// it's hard to distinguish this case from other IOException which
+// indicate a problem. To reproduce, simply wrap this test's body in
+// a loop. The workaround is to ignore any detected IOException.
+try
+{
+tunnelAgent.join();
+}
+catch (InterruptedException e)
+{
+e.printStackTrace();
+}
}
/**
svn commit: r1899377 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_client/conflicts.c subversion/libsvn_wc/wc_db.c subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: svn-role
Date: Wed Mar 30 05:42:07 2022
New Revision: 1899377
URL: http://svn.apache.org/viewvc?rev=1899377=rev
Log:
Merge the r1892470 group from trunk:
* r1892470, r1892471, r1892541
Fix an assertion failure triggered by the conflict resolver.
Justification:
Subversion should not crash. User complained.
Votes:
+1: stsp, markphip, rhuijben
+0: dsahlberg (test suite passes for 'check', 'davautocheck' and
'svnserveautocheck'. Not enough C experience for a formal
review)
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c
subversion/branches/1.14.x/subversion/libsvn_wc/wc_db.c
subversion/branches/1.14.x/subversion/tests/cmdline/merge_tree_conflict_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1892470-1892471,1892541
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899377=1899376=1899377=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:42:07 2022
@@ -56,13 +56,3 @@ Approved changes:
1.14.x-r1881534-no-crlf
Votes:
+1: hartmannathan, stsp, markphip
-
- * r1892470, r1892471, r1892541
- Fix an assertion failure triggered by the conflict resolver.
- Justification:
- Subversion should not crash. User complained.
- Votes:
- +1: stsp, markphip, rhuijben
- +0: dsahlberg (test suite passes for 'check', 'davautocheck' and
- 'svnserveautocheck'. Not enough C experience for a formal
- review)
Modified: subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c?rev=1899377=1899376=1899377=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c Wed Mar 30
05:42:07 2022
@@ -3014,12 +3014,12 @@ conflict_tree_get_details_local_missing(
deleted_basename,
conflict->pool);
details->moves = moves;
+ details->wc_move_targets = apr_hash_make(conflict->pool);
if (details->moves != NULL)
{
apr_pool_t *iterpool;
int i;
- details->wc_move_targets = apr_hash_make(conflict->pool);
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i < details->moves->nelts; i++)
{
@@ -8583,13 +8583,20 @@ resolve_incoming_move_file_text_merge(sv
* Merge from the local move's target location to the
* incoming move's target location. */
struct conflict_tree_local_missing_details *local_details;
- apr_array_header_t *moves;
local_details = conflict->tree_conflict_local_details;
- moves = svn_hash_gets(local_details->wc_move_targets,
-local_details->move_target_repos_relpath);
- merge_source_abspath =
-APR_ARRAY_IDX(moves, local_details->wc_move_target_idx, const char *);
+ if (local_details->wc_move_targets &&
+ local_details->move_target_repos_relpath)
+{
+ apr_array_header_t *moves;
+ moves = svn_hash_gets(local_details->wc_move_targets,
+local_details->move_target_repos_relpath);
+ merge_source_abspath =
+APR_ARRAY_IDX(moves, local_details->wc_move_target_idx,
+const char *);
+}
+ else
+merge_source_abspath = victim_abspath;
}
else
merge_source_abspath = victim_abspath;
@@ -9769,7 +9776,7 @@ resolve_local_move_dir_merge(svn_client_
NULL, conflict, scratch_pool,
scratch_pool));
- if (details->wc_move_targets)
+ if (details->wc_move_targets && details->move_target_repos_relpath)
{
apr_array_header_t *moves;
@@ -10718,7 +10725,8 @@ describe_incoming_move_merge_conflict_op
struct conflict_tree_incoming_delete_details *details;
details = conflict->tree_conflict_incoming_details;
- if (details->wc_move_targets)
+ if (details->wc_move_targets &&
+ details->move_target_repos_relpath)
{
apr_array_header_t *moves;
@@ -12251,7 +12259,7 @@ svn_client_conflict_option_get_moved_to_
*possible_moved_to_abspaths = apr_array_make(result_pool, 1,
sizeof (const char *));
- i
svn commit: r1899375 - /subversion/branches/1.14.x-r1899227/
Author: svn-role Date: Wed Mar 30 05:42:03 2022 New Revision: 1899375 URL: http://svn.apache.org/viewvc?rev=1899375=rev Log: Remove the '1.14.x-r1899227' branch, merged in r1899374. Removed: subversion/branches/1.14.x-r1899227/
svn commit: r1899374 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_repos/log.c subversion/tests/cmdline/authz_tests.py
Author: svn-role
Date: Wed Mar 30 05:41:48 2022
New Revision: 1899374
URL: http://svn.apache.org/viewvc?rev=1899374=rev
Log:
Merge the 1.14.x-r1899227 branch:
* r1899227
Don't show unreadable copyfrom paths in 'svn log -v'
Justification:
Makes 'svn log -v' consistent with spec.
Branch:
1.14.x-r1899227
Votes:
+1: hartmannathan, dsahlberg, rhuijben
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_repos/log.c
subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1899227
Merged /subversion/branches/1.14.x-r1899227:r1899228-1899373
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899374=1899373=1899374=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:41:48 2022
@@ -45,15 +45,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1899227
- Don't show unreadable copyfrom paths in 'svn log -v'
- Justification:
- Makes 'svn log -v' consistent with spec.
- Branch:
- 1.14.x-r1899227
- Votes:
- +1: hartmannathan, dsahlberg, rhuijben
-
* r1898633
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_repos/log.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_repos/log.c?rev=1899374=1899373=1899374=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_repos/log.c Wed Mar 30
05:41:48 2022
@@ -337,42 +337,36 @@ detect_changed(svn_repos_revision_access
if ( (change->change_kind == svn_fs_path_change_add)
|| (change->change_kind == svn_fs_path_change_replace))
{
- const char *copyfrom_path = change->copyfrom_path;
- svn_revnum_t copyfrom_rev = change->copyfrom_rev;
-
/* the following is a potentially expensive operation since on FSFS
we will follow the DAG from ROOT to PATH and that requires
actually reading the directories along the way. */
if (!change->copyfrom_known)
{
- SVN_ERR(svn_fs_copied_from(_rev, _path,
+ SVN_ERR(svn_fs_copied_from(>copyfrom_rev,
>copyfrom_path,
root, path, iterpool));
change->copyfrom_known = TRUE;
}
- if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_rev))
+ if (change->copyfrom_path &&
SVN_IS_VALID_REVNUM(change->copyfrom_rev))
{
- svn_boolean_t readable = TRUE;
-
if (callbacks->authz_read_func)
{
svn_fs_root_t *copyfrom_root;
+ svn_boolean_t readable;
SVN_ERR(svn_fs_revision_root(_root, fs,
- copyfrom_rev, iterpool));
+ change->copyfrom_rev,
iterpool));
SVN_ERR(callbacks->authz_read_func(,
copyfrom_root,
- copyfrom_path,
+ change->copyfrom_path,
callbacks->authz_read_baton,
iterpool));
if (! readable)
-found_unreadable = TRUE;
-}
-
- if (readable)
-{
- change->copyfrom_path = copyfrom_path;
- change->copyfrom_rev = copyfrom_rev;
+{
+ found_unreadable = TRUE;
+ change->copyfrom_path = NULL;
+ change->copyfrom_rev = SVN_INVALID_REVNUM;
+}
}
}
}
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py?rev=1899374=1899373=1899374=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py Wed Mar
30 05:41:48 2022
@@ -1731,6 +1731,60 @@
svn commit: r1899371 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Mar 30 04:15:02 2022 New Revision: 1899371 URL: http://svn.apache.org/viewvc?rev=1899371=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899371=1899370=1899371=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Mar 30 04:15:02 2022 @@ -2,470 +2,6 @@ Changes in ^/subversion/branches/1.14.x: -https://svn.apache.org/r1877978;>r1877978 | svn-role | 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines - -Merge https://svn.apache.org/r1877788;>r1877788 from trunk: - - * https://svn.apache.org/r1877788;>r1877788 - Fix a broken link in a docstring. - Votes: - +1: danielsh, stsp - - -https://svn.apache.org/r1878211;>r1878211 | svn-role | 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines - -Merge https://svn.apache.org/r1877072;>r1877072 from trunk: - - * https://svn.apache.org/r1877072;>r1877072 - svnmucc: Change an error message to state another possible cause of the - error. - Justification: - Error messages should be accurate. User reported (issue #4854). - Votes: - +1: danielsh, stsp, jcorvel - - -https://svn.apache.org/r1878213;>r1878213 | svn-role | 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines - -Merge https://svn.apache.org/r1877259;>r1877259 from trunk: - -* https://svn.apache.org/r1877259;>r1877259 -Move variable declarations to the start of block the to fix -syntax errors with VC9 (Visual Studio 2008). - Justification: -Our code should be C90. - Votes: -+1: brane, stsp, jcorvel -+0: danielsh (from dev@) - - -https://svn.apache.org/r1878415;>r1878415 | svn-role | 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines - -Merge the https://svn.apache.org/r1876707;>r1876707 group from trunk: - - * https://svn.apache.org/r1876707;>r1876707, https://svn.apache.org/r1876734;>r1876734, https://svn.apache.org/r1877318;>r1877318, https://svn.apache.org/r1877712;>r1877712, https://svn.apache.org/r1878141;>r1878141, https://svn.apache.org/r1878142;>r1878142, https://svn.apache.org/r1878143;>r1878143, - https://svn.apache.org/r1878144;>r1878144 - Various fixes for making the test suite run correctly with Python 3 on - Windows. - Justification: - Our test suite should test Subversion correctly also on Windows with - Python 3 - Votes: - +1: futatuki, jcorvel, stsp - --------- -https://svn.apache.org/r1879245;>r1879245 | svn-role | 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines - -Merge https://svn.apache.org/r1876662;>r1876662 from trunk: - - * https://svn.apache.org/r1876662;>r1876662 - Avoid check for SWIG version for Python bindings when --without-swig is - passed. - Justification: - SWIG python bindings should be able to be built without SWIG when we use - the release tarball - Votes: - +1: futatuki, stsp, rhuijben - ----- -https://svn.apache.org/r1879246;>r1879246 | svn-role | 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines - -Merge https://svn.apache.org/r1876906;>r1876906 from trunk: - - * https://svn.apache.org/r1876906;>r1876906 - Make gen-make.py --debug work with Python 3 - Justification: - We should also be able to build in Debug configuration with Python 3 - on Windows. - Votes: - +1: jcorvel, stsp, rhuijben - ----- -https://svn.apache.org/r1879797;>r1879797 | svn-role | 2020-07-12 04:00:12 + (Sun, 12 Jul 2020) | 10 lines - -Merge https://svn.apache.org/r1876410;>r1876410 from trunk: - - * https://svn.apache.org/r1876410;>r1876410 - Fix the .editorconfig stanza for Makefiles. - Justification: - Make $EDITOR do the right thing on any backport branches we may create - off this stabilization branch. - Votes: - +1: danielsh, stsp, jamessan - --------- -https://svn.apache.org/r1879798;>r1879798 | svn-role | 2020-07-12 04:00:17 + (Sun, 12 Jul 2020) | 9 lines - -Merge https://svn.apache.org/r1878413;>r1878413 from trunk: - - * https://svn.apache.org/r1878413;>r1878413 - autogen.sh: Remove per SWIG bindings checked files on release
svn commit: r1899369 - in /subversion/branches/1.10.x: ./ subversion/include/private/ subversion/libsvn_client/ subversion/libsvn_subr/ subversion/tests/libsvn_subr/
Author: svn-role Date: Wed Mar 30 04:00:07 2022 New Revision: 1899369 URL: http://svn.apache.org/viewvc?rev=1899369=rev Log: Merge the r1872030 group from trunk: * r1872030, r1872031, r1872104, r1872107, r1872108, r1872115, r1872118, r1872121, r1872388, r1872433, r1872910, r1872919, r1872921, r1872922, r1872923, r1872924, r1873294, r1873297, r1875188, r1875189 Fix issue #4840, Merge assertion failure in svn_sort__array_insert Justification: A merge with complex mergeinfo could abort with an assertion failure. Votes: +1: stsp, rhuijben, markphip +1: julianfoad (without r1875188,r1875189) Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h subversion/branches/1.10.x/subversion/libsvn_client/merge.c subversion/branches/1.10.x/subversion/libsvn_subr/mergeinfo.c subversion/branches/1.10.x/subversion/libsvn_subr/sorts.c subversion/branches/1.10.x/subversion/tests/libsvn_subr/mergeinfo-test.c Propchange: subversion/branches/1.10.x/ -- Merged /subversion/trunk:r1872030-1872031,1872104,1872107-1872108,1872115,1872118,1872121,1872388,1872433,1872910,1872919,1872921-1872924,1873294,1873297,1875188-1875189 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899369=1899368=1899369=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Wed Mar 30 04:00:07 2022 @@ -21,13 +21,3 @@ Veto-blocked changes: Approved changes: = - - * r1872030, r1872031, r1872104, r1872107, r1872108, r1872115, r1872118, - r1872121, r1872388, r1872433, r1872910, r1872919, r1872921, r1872922, - r1872923, r1872924, r1873294, r1873297, r1875188, r1875189 - Fix issue #4840, Merge assertion failure in svn_sort__array_insert - Justification: - A merge with complex mergeinfo could abort with an assertion failure. - Votes: - +1: stsp, rhuijben, markphip - +1: julianfoad (without r1875188,r1875189) Modified: subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h?rev=1899369=1899368=1899369=diff == --- subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h (original) +++ subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h Wed Mar 30 04:00:07 2022 @@ -127,6 +127,16 @@ svn_sort__array_insert(apr_array_header_ const void *new_element, int insert_index); +/* Like svn_sort__array_insert() but raise an error if @a insert_index + * is less than 0 or greater than the length of the array. + * + * @note Private. For use by Subversion's own code only. + */ +svn_error_t * +svn_sort__array_insert2(apr_array_header_t *array, +const void *new_element, +int insert_index); + /* Remove @a elements_to_delete elements starting at @a delete_index from the * array @a arr. If @a delete_index is not a valid element of @a arr, @@ -141,6 +151,16 @@ svn_sort__array_delete(apr_array_header_ int delete_index, int elements_to_delete); +/* Like svn_sort__array_delete() but raise an error if attempting + * to delete a range of elements that goes out of bounds of the array. + * + * @note Private. For use by Subversion's own code only. + */ +svn_error_t * +svn_sort__array_delete2(apr_array_header_t *arr, +int delete_index, +int elements_to_delete); + /* Reverse the order of elements in @a array, in place. * * @note Private. For use by Subversion's own code only. Modified: subversion/branches/1.10.x/subversion/libsvn_client/merge.c URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_client/merge.c?rev=1899369=1899368=1899369=diff == --- subversion/branches/1.10.x/subversion/libsvn_client/merge.c (original) +++ subversion/branches/1.10.x/subversion/libsvn_client/merge.c Wed Mar 30 04:00:07 2022 @@ -5951,7 +5951,7 @@ get_most_inclusive_rev(const apr_array_h remaining_ranges is inclusive of END_REV, Slice the first range in to two at END_REV. All the allocations are persistent and allocated from POOL. */ -static void +static svn_error_t * slice_remaining_ranges(apr_array_header_t *children_with_mergeinfo, svn_boolean_t is_rollback, svn_revnum_t end_rev, apr_pool_t *pool) @@ -5981,10 +5981,12
svn commit: r1899342 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Tue Mar 29 04:15:02 2022 New Revision: 1899342 URL: http://svn.apache.org/viewvc?rev=1899342=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899342=1899341=1899342=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Tue Mar 29 04:15:02 2022 @@ -2,6 +2,470 @@ Changes in ^/subversion/branches/1.14.x: +https://svn.apache.org/r1877978;>r1877978 | svn-role | 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines + +Merge https://svn.apache.org/r1877788;>r1877788 from trunk: + + * https://svn.apache.org/r1877788;>r1877788 + Fix a broken link in a docstring. + Votes: + +1: danielsh, stsp + + +https://svn.apache.org/r1878211;>r1878211 | svn-role | 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines + +Merge https://svn.apache.org/r1877072;>r1877072 from trunk: + + * https://svn.apache.org/r1877072;>r1877072 + svnmucc: Change an error message to state another possible cause of the + error. + Justification: + Error messages should be accurate. User reported (issue #4854). + Votes: + +1: danielsh, stsp, jcorvel + + +https://svn.apache.org/r1878213;>r1878213 | svn-role | 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines + +Merge https://svn.apache.org/r1877259;>r1877259 from trunk: + +* https://svn.apache.org/r1877259;>r1877259 +Move variable declarations to the start of block the to fix +syntax errors with VC9 (Visual Studio 2008). + Justification: +Our code should be C90. + Votes: ++1: brane, stsp, jcorvel ++0: danielsh (from dev@) + + +https://svn.apache.org/r1878415;>r1878415 | svn-role | 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines + +Merge the https://svn.apache.org/r1876707;>r1876707 group from trunk: + + * https://svn.apache.org/r1876707;>r1876707, https://svn.apache.org/r1876734;>r1876734, https://svn.apache.org/r1877318;>r1877318, https://svn.apache.org/r1877712;>r1877712, https://svn.apache.org/r1878141;>r1878141, https://svn.apache.org/r1878142;>r1878142, https://svn.apache.org/r1878143;>r1878143, + https://svn.apache.org/r1878144;>r1878144 + Various fixes for making the test suite run correctly with Python 3 on + Windows. + Justification: + Our test suite should test Subversion correctly also on Windows with + Python 3 + Votes: + +1: futatuki, jcorvel, stsp + +-------- +https://svn.apache.org/r1879245;>r1879245 | svn-role | 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines + +Merge https://svn.apache.org/r1876662;>r1876662 from trunk: + + * https://svn.apache.org/r1876662;>r1876662 + Avoid check for SWIG version for Python bindings when --without-swig is + passed. + Justification: + SWIG python bindings should be able to be built without SWIG when we use + the release tarball + Votes: + +1: futatuki, stsp, rhuijben + +---- +https://svn.apache.org/r1879246;>r1879246 | svn-role | 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines + +Merge https://svn.apache.org/r1876906;>r1876906 from trunk: + + * https://svn.apache.org/r1876906;>r1876906 + Make gen-make.py --debug work with Python 3 + Justification: + We should also be able to build in Debug configuration with Python 3 + on Windows. + Votes: + +1: jcorvel, stsp, rhuijben + +-------- +https://svn.apache.org/r1879797;>r1879797 | svn-role | 2020-07-12 04:00:12 + (Sun, 12 Jul 2020) | 10 lines + +Merge https://svn.apache.org/r1876410;>r1876410 from trunk: + + * https://svn.apache.org/r1876410;>r1876410 + Fix the .editorconfig stanza for Makefiles. + Justification: + Make $EDITOR do the right thing on any backport branches we may create + off this stabilization branch. + Votes: + +1: danielsh, stsp, jamessan + +-------- +https://svn.apache.org/r1879798;>r1879798 | svn-role | 2020-07-12 04:00:17 + (Sun, 12 Jul 2020) | 9 lines + +Merge https://svn.apache.org/r1878413;>r1878413 from trunk: + + * https://svn.apache.org/r1878413;>r1878413 + autogen.sh: Remove per SWIG bindings checked files on release
svn commit: r1899341 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_subr/io.c
Author: svn-role
Date: Tue Mar 29 04:01:20 2022
New Revision: 1899341
URL: http://svn.apache.org/viewvc?rev=1899341=rev
Log:
Merge r1883355 from trunk:
* r1883355
Use the APR-1.4+ API for flushing file contents to disk.
Justification:
Reduce code duplication between APR and SVN.
Votes:
+1: brane, jun66j5, markphip
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/io.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1883355
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899341=1899340=1899341=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Mar 29 04:01:20 2022
@@ -79,13 +79,6 @@ Approved changes:
Votes:
+1: jamessan, stsp
- * r1883355
- Use the APR-1.4+ API for flushing file contents to disk.
- Justification:
- Reduce code duplication between APR and SVN.
- Votes:
- +1: brane, jun66j5, markphip
-
* r1881534
Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_subr/io.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/io.c?rev=1899341=1899340=1899341=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/io.c Tue Mar 29 04:01:20
2022
@@ -2703,7 +2703,6 @@ svn_io__file_lock_autocreate(const char
svn_error_t *svn_io_file_flush_to_disk(apr_file_t *file,
apr_pool_t *pool)
{
- apr_os_file_t filehand;
const char *fname;
apr_status_t apr_err;
@@ -2713,49 +2712,21 @@ svn_error_t *svn_io_file_flush_to_disk(a
if (apr_err)
return svn_error_wrap_apr(apr_err, _("Can't get file name"));
- /* ### In apr 1.4+ we could delegate most of this function to
- apr_file_sync(). The only major difference is that this doesn't
- contain the retry loop for EINTR on linux. */
-
- /* First make sure that any user-space buffered data is flushed. */
- SVN_ERR(svn_io_file_flush(file, pool));
-
- apr_os_file_get(, file);
-
- /* Call the operating system specific function to actually force the
- data to disk. */
- {
-#ifdef WIN32
-
-if (! FlushFileBuffers(filehand))
-return svn_error_wrap_apr(apr_get_os_error(),
- _("Can't flush file '%s' to disk"),
- try_utf8_from_internal_style(fname, pool));
-
-#else
- int rv;
-
- do {
-#ifdef F_FULLFSYNC
-rv = fcntl(filehand, F_FULLFSYNC, 0);
-#else
-rv = fsync(filehand);
-#endif
- } while (rv == -1 && APR_STATUS_IS_EINTR(apr_get_os_error()));
-
- /* If the file is in a memory filesystem, fsync() may return
- EINVAL. Presumably the user knows the risks, and we can just
- ignore the error. */
- if (rv == -1 && APR_STATUS_IS_EINVAL(apr_get_os_error()))
-return SVN_NO_ERROR;
-
- if (rv == -1)
-return svn_error_wrap_apr(apr_get_os_error(),
- _("Can't flush file '%s' to disk"),
- try_utf8_from_internal_style(fname, pool));
+ do {
+apr_err = apr_file_datasync(file);
+ } while(APR_STATUS_IS_EINTR(apr_err));
+
+ /* If the file is in a memory filesystem, fsync() may return
+ EINVAL. Presumably the user knows the risks, and we can just
+ ignore the error. */
+ if (APR_STATUS_IS_EINVAL(apr_err))
+return SVN_NO_ERROR;
+
+ if (apr_err)
+return svn_error_wrap_apr(apr_err,
+ _("Can't flush file '%s' to disk"),
+ try_utf8_from_internal_style(fname, pool));
-#endif
- }
return SVN_NO_ERROR;
}
svn commit: r1899340 - in /subversion/branches/1.14.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh
Author: svn-role
Date: Tue Mar 29 04:01:19 2022
New Revision: 1899340
URL: http://svn.apache.org/viewvc?rev=1899340=rev
Log:
Merge r1892121 from trunk:
* r1892121
Fix an error message when running make davautocheck.
Justification:
davautocheck should work
Votes:
+1: dsahlberg, markphip, stsp
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1892121
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899340=1899339=1899340=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Mar 29 04:01:19 2022
@@ -79,13 +79,6 @@ Approved changes:
Votes:
+1: jamessan, stsp
- * r1892121
- Fix an error message when running make davautocheck.
- Justification:
- davautocheck should work
- Votes:
- +1: dsahlberg, markphip, stsp
-
* r1883355
Use the APR-1.4+ API for flushing file contents to disk.
Justification:
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh?rev=1899340=1899339=1899340=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh Tue Mar
29 04:01:19 2022
@@ -547,10 +547,9 @@ Alias /fsdavroot $ABS_BUILDDIR/subversio
__EOF__
-location_common() {
+location_common_without_authz() {
cat >> "$HTTPD_CFG" <<__EOF__
DAV svn
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
AuthType Basic
AuthName "Subversion Repository"
AuthUserFile $HTTPD_USERS
@@ -560,6 +559,12 @@ cat >> "$HTTPD_CFG" <<__EOF__
SVNBlockRead ${BLOCK_READ_SETTING}
__EOF__
}
+location_common() {
+location_common_without_authz
+cat >> "$HTTPD_CFG" <<__EOF__
+ AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
+__EOF__
+}
location_common
cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
@@ -612,7 +617,7 @@ cat >> "$HTTPD_CFG" <<__EOF__
__EOF__
-location_common
+location_common_without_authz
cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
Require valid-user
svn commit: r1899339 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_repos/authz.c
Author: svn-role
Date: Tue Mar 29 04:01:18 2022
New Revision: 1899339
URL: http://svn.apache.org/viewvc?rev=1899339=rev
Log:
Merge r1894734 from trunk:
* r1894734
Fix issue #4880, "Use-after-free of object-pools when running in httpd"
Justification:
Subversion should not crash. User complained.
Votes:
+1: stsp, hartmannathan, rhuijben
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_repos/authz.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1894734
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899339=1899338=1899339=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Mar 29 04:01:18 2022
@@ -63,13 +63,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1894734
- Fix issue #4880, "Use-after-free of object-pools when running in httpd"
- Justification:
- Subversion should not crash. User complained.
- Votes:
- +1: stsp, hartmannathan, rhuijben
-
* r1899227
Don't show unreadable copyfrom paths in 'svn log -v'
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_repos/authz.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_repos/authz.c?rev=1899339=1899338=1899339=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_repos/authz.c Tue Mar 29
04:01:18 2022
@@ -130,6 +130,30 @@ static svn_object_pool__t *authz_pool =
static svn_object_pool__t *filtered_pool = NULL;
static svn_atomic_t authz_pool_initialized = FALSE;
+/*
+ * Ensure that we will initialize authz again if the pool which
+ * our authz caches depend on is cleared.
+ *
+ * HTTPD may run pre/post config hooks multiple times and clear
+ * its global configuration pool which our authz pools depend on.
+ * This happens in a non-threaded context during HTTPD's intialization
+ * and HTTPD's main loop, so it is safe to reset static variables here.
+ * (And any applications which cleared this pool while SVN threads
+ * were running would crash no matter what.)
+ *
+ * See issue #4880, "Use-after-free of object-pools in
+ * subversion/libsvn_repos/authz.c when used as httpd module"
+ */
+static apr_status_t
+deinit_authz(void *data)
+{
+ /* The two object pools run their own cleanup handlers. */
+ authz_pool = NULL;
+ filtered_pool = NULL;
+ authz_pool_initialized = FALSE;
+ return APR_SUCCESS;
+}
+
/* Implements svn_atomic__err_init_func_t. */
static svn_error_t *
synchronized_authz_initialize(void *baton, apr_pool_t *pool)
@@ -143,6 +167,7 @@ synchronized_authz_initialize(void *bato
SVN_ERR(svn_object_pool__create(_pool, multi_threaded, pool));
SVN_ERR(svn_object_pool__create(_pool, multi_threaded, pool));
+ apr_pool_cleanup_register(pool, NULL, deinit_authz, apr_pool_cleanup_null);
return SVN_NO_ERROR;
}
svn commit: r1899338 - in /subversion/branches/1.10.x: ./ STATUS build/ac-macros/swig.m4
Author: svn-role Date: Tue Mar 29 04:01:16 2022 New Revision: 1899338 URL: http://svn.apache.org/viewvc?rev=1899338=rev Log: Merge r1875602 from trunk: * r1875602 Remove incorrect include paths from svn_cv_ruby_includes. Justification: Fixes building with latest Ruby Votes: +1: jamessan, stsp, markphip Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/build/ac-macros/swig.m4 Propchange: subversion/branches/1.10.x/ -- Merged /subversion/trunk:r1875602 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899338=1899337=1899338=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:01:16 2022 @@ -30,10 +30,3 @@ Veto-blocked changes: Approved changes: = - - * r1875602 - Remove incorrect include paths from svn_cv_ruby_includes. - Justification: - Fixes building with latest Ruby - Votes: - +1: jamessan, stsp, markphip Modified: subversion/branches/1.10.x/build/ac-macros/swig.m4 URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/ac-macros/swig.m4?rev=1899338=1899337=1899338=diff == --- subversion/branches/1.10.x/build/ac-macros/swig.m4 (original) +++ subversion/branches/1.10.x/build/ac-macros/swig.m4 Tue Mar 29 04:01:16 2022 @@ -162,7 +162,7 @@ AC_DEFUN(SVN_FIND_SWIG, AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[ if test -d "$rbconfig_rubyhdrdir"; then dnl Ruby >=1.9 - svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward" + svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir" if test -d "$rbconfig_rubyarchhdrdir"; then dnl Ruby >=2.0 svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
svn commit: r1899337 - /subversion/branches/1.10.x-issue4762/
Author: svn-role Date: Tue Mar 29 04:01:15 2022 New Revision: 1899337 URL: http://svn.apache.org/viewvc?rev=1899337=rev Log: Remove the '1.10.x-issue4762' branch, merged in r1899336. Removed: subversion/branches/1.10.x-issue4762/
svn commit: r1899336 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_repos/authz.c subversion/tests/libsvn_repos/authz-test.c
Author: svn-role
Date: Tue Mar 29 04:00:59 2022
New Revision: 1899336
URL: http://svn.apache.org/viewvc?rev=1899336=rev
Log:
Merge the 1.10.x-issue4762 branch:
* r1835049, r1882326
Fix issue #4762 "authz doesn't combine global and repository rules"
Justification:
Restore behaviour of SVN 1.9: It is now again possible to override
per-path access rules for specific users (and groups) at the global
level. Such global rules are overridden by repository-specific rules
only if both the user and the path match the repository-specific rule.
Branch: ^/subversion/branches/1.10.x-issue4762
Votes:
+1: stsp, jcorvel, markphip
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_repos/authz.c
subversion/branches/1.10.x/subversion/tests/libsvn_repos/authz-test.c
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1835049,1882326
Merged /subversion/branches/1.10.x-issue4762:r1885788-1899335
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899336=1899335=1899336=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:59 2022
@@ -31,17 +31,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1835049, r1882326
- Fix issue #4762 "authz doesn't combine global and repository rules"
- Justification:
- Restore behaviour of SVN 1.9: It is now again possible to override
- per-path access rules for specific users (and groups) at the global
- level. Such global rules are overridden by repository-specific rules
- only if both the user and the path match the repository-specific rule.
- Branch: ^/subversion/branches/1.10.x-issue4762
- Votes:
- +1: stsp, jcorvel, markphip
-
* r1875602
Remove incorrect include paths from svn_cv_ruby_includes.
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_repos/authz.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_repos/authz.c?rev=1899336=1899335=1899336=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_repos/authz.c Tue Mar 29
04:00:59 2022
@@ -914,9 +914,7 @@ create_user_authz(authz_full_t *authz,
/* Use a separate sub-pool to keep memory usage tight. */
apr_pool_t *subpool = svn_pool_create(scratch_pool);
- /* Find all ACLs for REPOSITORY.
- * Note that repo-specific rules replace global rules,
- * even if they don't apply to the current user. */
+ /* Find all ACLs for REPOSITORY. */
apr_array_header_t *acls = apr_array_make(subpool, authz->acls->nelts,
sizeof(authz_acl_t *));
for (i = 0; i < authz->acls->nelts; ++i)
@@ -933,15 +931,36 @@ create_user_authz(authz_full_t *authz,
= APR_ARRAY_IDX(acls, acls->nelts - 1, const authz_acl_t *);
if (svn_authz__compare_paths(_acl->rule, >rule) == 0)
{
+ svn_boolean_t global_acl_applies;
+ svn_boolean_t repos_acl_applies;
+
+ /* Previous ACL is a global rule. */
SVN_ERR_ASSERT_NO_RETURN(!strcmp(prev_acl->rule.repos,
AUTHZ_ANY_REPOSITORY));
+ /* Current ACL is a per-repository rule. */
SVN_ERR_ASSERT_NO_RETURN(strcmp(acl->rule.repos,
AUTHZ_ANY_REPOSITORY));
- apr_array_pop(acls);
+
+ global_acl_applies =
+svn_authz__get_acl_access(NULL, prev_acl, user,
repository);
+ repos_acl_applies =
+svn_authz__get_acl_access(NULL, acl, user, repository);
+
+ /* Prefer rules which apply to both this user and this path
+ * over rules which apply only to the path. In cases where
+ * both rules apply to user and path, always prefer the
+ * repository-specific rule. */
+ if (!global_acl_applies || repos_acl_applies)
+{
+ apr_array_pop(acls);
+ APR_ARRAY_PUSH(acls, const authz_acl_t *) = acl;
+}
}
+ else
+APR_ARRAY_PUSH(acls, const authz_acl_t *) = acl;
}
-
- APR_ARRAY_PUSH(acls, const authz_acl_t *) = acl;
+ else
+APR_ARRAY_PUSH(acls, const authz_acl_t *) = acl;
svn commit: r1899335 - /subversion/branches/1.10.x-r1887704/
Author: svn-role Date: Tue Mar 29 04:00:56 2022 New Revision: 1899335 URL: http://svn.apache.org/viewvc?rev=1899335=rev Log: Remove the '1.10.x-r1887704' branch, merged in r1899334. Removed: subversion/branches/1.10.x-r1887704/
svn commit: r1899334 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_fs_fs/verify.c subversion/po/sv.po
Author: svn-role
Date: Tue Mar 29 04:00:41 2022
New Revision: 1899334
URL: http://svn.apache.org/viewvc?rev=1899334=rev
Log:
Merge the 1.10.x-r1887704 branch:
* r1887704
Follow up to r1866587, r1866588: Unbreak a msgid.
Justification:
subversion.pot should be built correctly.
Branch: ^/subversion/branches/1.10.x-r1887704
Votes:
+1: futatuki, stsp, markphip
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c
subversion/branches/1.10.x/subversion/po/sv.po
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/branches/1.10.x-r1887704:r1887719-1899333
Merged /subversion/trunk:r1887704
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899334=1899333=1899334=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:41 2022
@@ -31,14 +31,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1887704
- Follow up to r1866587, r1866588: Unbreak a msgid.
- Justification:
- subversion.pot should be built correctly.
- Branch: ^/subversion/branches/1.10.x-r1887704
- Votes:
- +1: futatuki, stsp, markphip
-
* r1835049, r1882326
Fix issue #4762 "authz doesn't combine global and repository rules"
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c?rev=1899334=1899333=1899334=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c Tue Mar 29
04:00:41 2022
@@ -691,17 +691,20 @@ compare_p2l_to_rev(svn_fs_t *fs,
* during later stages of the verification process. */
if ( (entry->type == SVN_FS_FS__ITEM_TYPE_CHANGES)
!= (entry->item.number == SVN_FS_FS__ITEM_INDEX_CHANGES))
-return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
- NULL,
- _("p2l index entry for changes in"
- " revision r%ld is item"
- " %"APR_UINT64_T_FMT
- " of type %u at offset %s"),
- entry->item.revision,
- entry->item.number,
- (unsigned int)entry->type,
- apr_off_t_toa(pool, offset));
-
+{
+ const char *num_str = apr_psprintf(pool,
+ "%" APR_UINT64_T_FMT,
+ entry->item.number);
+ return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
+ NULL,
+ _("p2l index entry for changes in"
+ " revision r%ld is item %s"
+ " of type %u at offset %s"),
+ entry->item.revision,
+ num_str,
+ (unsigned int)entry->type,
+ apr_off_t_toa(pool, offset));
+}
/* Check contents. */
if (entry->type == SVN_FS_FS__ITEM_TYPE_UNUSED)
{
Modified: subversion/branches/1.10.x/subversion/po/sv.po
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/po/sv.po?rev=1899334=1899333=1899334=diff
==
--- subversion/branches/1.10.x/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/1.10.x/subversion/po/sv.po [UTF-8] Tue Mar 29 04:00:41
2022
@@ -6794,8 +6794,8 @@ msgstr "p2l-indexpost för revision r%ld
#: ../libsvn_fs_fs/verify.c:696
#, c-format
-msgid "p2l index entry for changes in revision r%ld is item %ld of type %d at
offset %s"
-msgstr "p2l-indexpost för ändringar i revision r%ld är objekt %ld av typ %d på
position %s"
+msgid "p2l index entry for changes in revision r%ld is item %s of type %u at
offset %s"
+msgstr "p2l-indexpost för ändringar i revision r%ld är objekt %s av typ %u på
position %s"
#: ../libsvn_fs_util/fs-util.c:164
msgid "Filesystem object has not been opened yet"
svn commit: r1899333 - in /subversion/branches/1.10.x: ./ Makefile.in STATUS
Author: svn-role Date: Tue Mar 29 04:00:39 2022 New Revision: 1899333 URL: http://svn.apache.org/viewvc?rev=1899333=rev Log: Merge r1891908 from trunk: * r1891908 Fix a bug where «make davautocheck» immediately after configure failed hard because of an unbuilt dependency. Justification: Small fix. Prevents spurious hard fails of 'make davautocheck'. Votes: +1: danielsh, dsahlberg, markphip Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/Makefile.in subversion/branches/1.10.x/STATUS Propchange: subversion/branches/1.10.x/ -- Merged /subversion/trunk:r1891908 Modified: subversion/branches/1.10.x/Makefile.in URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/Makefile.in?rev=1899333=1899332=1899333=diff == --- subversion/branches/1.10.x/Makefile.in (original) +++ subversion/branches/1.10.x/Makefile.in Tue Mar 29 04:00:39 2022 @@ -617,12 +617,12 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $ # First, set up Apache as documented in # subversion/tests/cmdline/README. -davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod +davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat @$(MAKE) check BASE_URL=http://localhost # Automatically configure and run Apache httpd on a random port, and then # run make check. -davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod +davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat @# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment. @APXS=$(APXS) MAKE=$(MAKE) $(SHELL) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899333=1899332=1899333=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:39 2022 @@ -31,14 +31,6 @@ Veto-blocked changes: Approved changes: = - * r1891908 - Fix a bug where «make davautocheck» immediately after configure failed - hard because of an unbuilt dependency. - Justification: - Small fix. Prevents spurious hard fails of 'make davautocheck'. - Votes: - +1: danielsh, dsahlberg, markphip - * r1887704 Follow up to r1866587, r1866588: Unbreak a msgid. Justification:
svn commit: r1899332 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_repos/authz.c
Author: svn-role
Date: Tue Mar 29 04:00:38 2022
New Revision: 1899332
URL: http://svn.apache.org/viewvc?rev=1899332=rev
Log:
Merge r1894734 from trunk:
* r1894734
Fix issue #4880, "Use-after-free of object-pools when running in httpd"
Justification:
Subversion should not crash. User complained.
Votes:
+1: stsp, hartmannathan, markphip
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_repos/authz.c
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1894734
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899332=1899331=1899332=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:38 2022
@@ -31,13 +31,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1894734
- Fix issue #4880, "Use-after-free of object-pools when running in httpd"
- Justification:
- Subversion should not crash. User complained.
- Votes:
- +1: stsp, hartmannathan, markphip
-
* r1891908
Fix a bug where «make davautocheck» immediately after configure failed
hard because of an unbuilt dependency.
Modified: subversion/branches/1.10.x/subversion/libsvn_repos/authz.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_repos/authz.c?rev=1899332=1899331=1899332=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_repos/authz.c Tue Mar 29
04:00:38 2022
@@ -130,6 +130,30 @@ static svn_object_pool__t *authz_pool =
static svn_object_pool__t *filtered_pool = NULL;
static svn_atomic_t authz_pool_initialized = FALSE;
+/*
+ * Ensure that we will initialize authz again if the pool which
+ * our authz caches depend on is cleared.
+ *
+ * HTTPD may run pre/post config hooks multiple times and clear
+ * its global configuration pool which our authz pools depend on.
+ * This happens in a non-threaded context during HTTPD's intialization
+ * and HTTPD's main loop, so it is safe to reset static variables here.
+ * (And any applications which cleared this pool while SVN threads
+ * were running would crash no matter what.)
+ *
+ * See issue #4880, "Use-after-free of object-pools in
+ * subversion/libsvn_repos/authz.c when used as httpd module"
+ */
+static apr_status_t
+deinit_authz(void *data)
+{
+ /* The two object pools run their own cleanup handlers. */
+ authz_pool = NULL;
+ filtered_pool = NULL;
+ authz_pool_initialized = FALSE;
+ return APR_SUCCESS;
+}
+
/* Implements svn_atomic__err_init_func_t. */
static svn_error_t *
synchronized_authz_initialize(void *baton, apr_pool_t *pool)
@@ -143,6 +167,7 @@ synchronized_authz_initialize(void *bato
SVN_ERR(svn_object_pool__create(_pool, multi_threaded, pool));
SVN_ERR(svn_object_pool__create(_pool, multi_threaded, pool));
+ apr_pool_cleanup_register(pool, NULL, deinit_authz, apr_pool_cleanup_null);
return SVN_NO_ERROR;
}
svn commit: r1899331 - in /subversion/branches/1.10.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh subversion/tests/cmdline/mod_authz_svn_tests.py
Author: svn-role
Date: Tue Mar 29 04:00:37 2022
New Revision: 1899331
URL: http://svn.apache.org/viewvc?rev=1899331=rev
Log:
Merge the r1883838 group from trunk:
* r1883838, r1883989, r1886460, r1886582, r1892121
Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
Votes:
+1: stsp, markphip, dsahlberg
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1883838,1883989,1886460,1886582,1892121
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899331=1899330=1899331=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:37 2022
@@ -31,11 +31,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1883838, r1883989, r1886460, r1886582, r1892121
- Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
- Votes:
- +1: stsp, markphip, dsahlberg
-
* r1894734
Fix issue #4880, "Use-after-free of object-pools when running in httpd"
Justification:
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh?rev=1899331=1899330=1899331=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh Tue Mar
29 04:00:37 2022
@@ -527,10 +527,9 @@ CustomLog "$HTTPD_ROOT/ops" "%
__EOF__
-location_common() {
+location_common_without_authz() {
cat >> "$HTTPD_CFG" <<__EOF__
DAV svn
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
AuthType Basic
AuthName "Subversion Repository"
AuthUserFile $HTTPD_USERS
@@ -540,6 +539,12 @@ cat >> "$HTTPD_CFG" <<__EOF__
SVNBlockRead ${BLOCK_READ_SETTING}
__EOF__
}
+location_common() {
+location_common_without_authz
+cat >> "$HTTPD_CFG" <<__EOF__
+ AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
+__EOF__
+}
location_common
cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
@@ -582,6 +587,15 @@ cat >> "$HTTPD_CFG" <<__EOF__
${SVN_PATH_AUTHZ_LINE}
+
+__EOF__
+location_common_without_authz
+cat >> "$HTTPD_CFG" <<__EOF__
+ SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
+ Require valid-user
+ Satisfy Any
+ AuthzSVNReposRelativeAccessFile "^/authz"
+
__EOF__
location_common
Modified:
subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py?rev=1899331=1899330=1899331=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py
Tue Mar 29 04:00:37 2022
@@ -25,7 +25,7 @@
##
# General modules
-import os, re, logging
+import os, re, logging, shutil
logger = logging.getLogger()
@@ -1043,6 +1043,73 @@ def authn_sallrall(sbox):
verify_gets(test_area_url, sallrall_tests)
+@SkipUnless(svntest.main.is_ra_type_dav)
+def repos_relative_access_file(sbox):
+ "repos-relative access file"
+
+ sbox.build()
+
+ test_area_url = sbox.repo_url.replace('/svn-test-work/repositories/',
+'/authz-test-work/in-repos-authz/')
+
+ svntest.main.write_authz_file(sbox, {"/": "", "/A": "%s = rw" % user1})
+ shutil.move(sbox.authz_file, os.path.join(sbox.wc_dir, 'authz'))
+ sbox.simple_add('authz')
+ svntest.actions.run_and_verify_svn(None, [], 'relocate',
+ sbox.file_protocol_repo_url(), sbox.wc_dir)
+ sbox.simple_commit(message="adding in-repository authz rules file")
+
+ in_repos_authz_tests = (
+ { 'path': '', 'status': 401, },
+ { 'path': '/authz', 'status': 401, },
+
svn commit: r1899330 - /subversion/branches/1.10.x-r1899227/
Author: svn-role Date: Tue Mar 29 04:00:35 2022 New Revision: 1899330 URL: http://svn.apache.org/viewvc?rev=1899330=rev Log: Remove the '1.10.x-r1899227' branch, merged in r1899329. Removed: subversion/branches/1.10.x-r1899227/
svn commit: r1899329 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_repos/log.c subversion/tests/cmdline/authz_tests.py
Author: svn-role
Date: Tue Mar 29 04:00:19 2022
New Revision: 1899329
URL: http://svn.apache.org/viewvc?rev=1899329=rev
Log:
Merge the 1.10.x-r1899227 branch:
* r1899227
Don't show unreadable copyfrom paths in 'svn log -v'
Justification:
Makes 'svn log -v' consistent with spec.
Branch:
1.10.x-r1899227
Votes:
+1: hartmannathan, dsahlberg, stsp
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_repos/log.c
subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/branches/1.10.x-r1899227:r1899231-1899328
Merged /subversion/trunk:r1899227
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899329=1899328=1899329=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:19 2022
@@ -31,15 +31,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1899227
- Don't show unreadable copyfrom paths in 'svn log -v'
- Justification:
- Makes 'svn log -v' consistent with spec.
- Branch:
- 1.10.x-r1899227
- Votes:
- +1: hartmannathan, dsahlberg, stsp
-
* r1883838, r1883989, r1886460, r1886582, r1892121
Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
Votes:
Modified: subversion/branches/1.10.x/subversion/libsvn_repos/log.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_repos/log.c?rev=1899329=1899328=1899329=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_repos/log.c Tue Mar 29
04:00:19 2022
@@ -337,42 +337,36 @@ detect_changed(svn_repos_revision_access
if ( (change->change_kind == svn_fs_path_change_add)
|| (change->change_kind == svn_fs_path_change_replace))
{
- const char *copyfrom_path = change->copyfrom_path;
- svn_revnum_t copyfrom_rev = change->copyfrom_rev;
-
/* the following is a potentially expensive operation since on FSFS
we will follow the DAG from ROOT to PATH and that requires
actually reading the directories along the way. */
if (!change->copyfrom_known)
{
- SVN_ERR(svn_fs_copied_from(_rev, _path,
+ SVN_ERR(svn_fs_copied_from(>copyfrom_rev,
>copyfrom_path,
root, path, iterpool));
change->copyfrom_known = TRUE;
}
- if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_rev))
+ if (change->copyfrom_path &&
SVN_IS_VALID_REVNUM(change->copyfrom_rev))
{
- svn_boolean_t readable = TRUE;
-
if (callbacks->authz_read_func)
{
svn_fs_root_t *copyfrom_root;
+ svn_boolean_t readable;
SVN_ERR(svn_fs_revision_root(_root, fs,
- copyfrom_rev, iterpool));
+ change->copyfrom_rev,
iterpool));
SVN_ERR(callbacks->authz_read_func(,
copyfrom_root,
- copyfrom_path,
+ change->copyfrom_path,
callbacks->authz_read_baton,
iterpool));
if (! readable)
-found_unreadable = TRUE;
-}
-
- if (readable)
-{
- change->copyfrom_path = copyfrom_path;
- change->copyfrom_rev = copyfrom_rev;
+{
+ found_unreadable = TRUE;
+ change->copyfrom_path = NULL;
+ change->copyfrom_rev = SVN_INVALID_REVNUM;
+}
}
}
}
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py?rev=1899329=1899328=1899329=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py Tue Mar
2
svn commit: r1899324 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Mon Mar 28 19:56:19 2022 New Revision: 1899324 URL: http://svn.apache.org/viewvc?rev=1899324=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899324=1899323=1899324=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Mon Mar 28 19:56:19 2022 @@ -2,470 +2,6 @@ Changes in ^/subversion/branches/1.14.x: -https://svn.apache.org/r1877978;>r1877978 | svn-role | 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines - -Merge https://svn.apache.org/r1877788;>r1877788 from trunk: - - * https://svn.apache.org/r1877788;>r1877788 - Fix a broken link in a docstring. - Votes: - +1: danielsh, stsp - - -https://svn.apache.org/r1878211;>r1878211 | svn-role | 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines - -Merge https://svn.apache.org/r1877072;>r1877072 from trunk: - - * https://svn.apache.org/r1877072;>r1877072 - svnmucc: Change an error message to state another possible cause of the - error. - Justification: - Error messages should be accurate. User reported (issue #4854). - Votes: - +1: danielsh, stsp, jcorvel - - -https://svn.apache.org/r1878213;>r1878213 | svn-role | 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines - -Merge https://svn.apache.org/r1877259;>r1877259 from trunk: - -* https://svn.apache.org/r1877259;>r1877259 -Move variable declarations to the start of block the to fix -syntax errors with VC9 (Visual Studio 2008). - Justification: -Our code should be C90. - Votes: -+1: brane, stsp, jcorvel -+0: danielsh (from dev@) - - -https://svn.apache.org/r1878415;>r1878415 | svn-role | 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines - -Merge the https://svn.apache.org/r1876707;>r1876707 group from trunk: - - * https://svn.apache.org/r1876707;>r1876707, https://svn.apache.org/r1876734;>r1876734, https://svn.apache.org/r1877318;>r1877318, https://svn.apache.org/r1877712;>r1877712, https://svn.apache.org/r1878141;>r1878141, https://svn.apache.org/r1878142;>r1878142, https://svn.apache.org/r1878143;>r1878143, - https://svn.apache.org/r1878144;>r1878144 - Various fixes for making the test suite run correctly with Python 3 on - Windows. - Justification: - Our test suite should test Subversion correctly also on Windows with - Python 3 - Votes: - +1: futatuki, jcorvel, stsp - --------- -https://svn.apache.org/r1879245;>r1879245 | svn-role | 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines - -Merge https://svn.apache.org/r1876662;>r1876662 from trunk: - - * https://svn.apache.org/r1876662;>r1876662 - Avoid check for SWIG version for Python bindings when --without-swig is - passed. - Justification: - SWIG python bindings should be able to be built without SWIG when we use - the release tarball - Votes: - +1: futatuki, stsp, rhuijben - ----- -https://svn.apache.org/r1879246;>r1879246 | svn-role | 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines - -Merge https://svn.apache.org/r1876906;>r1876906 from trunk: - - * https://svn.apache.org/r1876906;>r1876906 - Make gen-make.py --debug work with Python 3 - Justification: - We should also be able to build in Debug configuration with Python 3 - on Windows. - Votes: - +1: jcorvel, stsp, rhuijben - ----- -https://svn.apache.org/r1879797;>r1879797 | svn-role | 2020-07-12 04:00:12 + (Sun, 12 Jul 2020) | 10 lines - -Merge https://svn.apache.org/r1876410;>r1876410 from trunk: - - * https://svn.apache.org/r1876410;>r1876410 - Fix the .editorconfig stanza for Makefiles. - Justification: - Make $EDITOR do the right thing on any backport branches we may create - off this stabilization branch. - Votes: - +1: danielsh, stsp, jamessan - --------- -https://svn.apache.org/r1879798;>r1879798 | svn-role | 2020-07-12 04:00:17 + (Sun, 12 Jul 2020) | 9 lines - -Merge https://svn.apache.org/r1878413;>r1878413 from trunk: - - * https://svn.apache.org/r1878413;>r1878413 - autogen.sh: Remove per SWIG bindings checked files on release
svn commit: r1899276 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Mon Mar 28 04:15:01 2022 New Revision: 1899276 URL: http://svn.apache.org/viewvc?rev=1899276=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899276=1899275=1899276=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Mon Mar 28 04:15:01 2022 @@ -2,6 +2,470 @@ Changes in ^/subversion/branches/1.14.x: +https://svn.apache.org/r1877978;>r1877978 | svn-role | 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines + +Merge https://svn.apache.org/r1877788;>r1877788 from trunk: + + * https://svn.apache.org/r1877788;>r1877788 + Fix a broken link in a docstring. + Votes: + +1: danielsh, stsp + + +https://svn.apache.org/r1878211;>r1878211 | svn-role | 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines + +Merge https://svn.apache.org/r1877072;>r1877072 from trunk: + + * https://svn.apache.org/r1877072;>r1877072 + svnmucc: Change an error message to state another possible cause of the + error. + Justification: + Error messages should be accurate. User reported (issue #4854). + Votes: + +1: danielsh, stsp, jcorvel + + +https://svn.apache.org/r1878213;>r1878213 | svn-role | 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines + +Merge https://svn.apache.org/r1877259;>r1877259 from trunk: + +* https://svn.apache.org/r1877259;>r1877259 +Move variable declarations to the start of block the to fix +syntax errors with VC9 (Visual Studio 2008). + Justification: +Our code should be C90. + Votes: ++1: brane, stsp, jcorvel ++0: danielsh (from dev@) + + +https://svn.apache.org/r1878415;>r1878415 | svn-role | 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines + +Merge the https://svn.apache.org/r1876707;>r1876707 group from trunk: + + * https://svn.apache.org/r1876707;>r1876707, https://svn.apache.org/r1876734;>r1876734, https://svn.apache.org/r1877318;>r1877318, https://svn.apache.org/r1877712;>r1877712, https://svn.apache.org/r1878141;>r1878141, https://svn.apache.org/r1878142;>r1878142, https://svn.apache.org/r1878143;>r1878143, + https://svn.apache.org/r1878144;>r1878144 + Various fixes for making the test suite run correctly with Python 3 on + Windows. + Justification: + Our test suite should test Subversion correctly also on Windows with + Python 3 + Votes: + +1: futatuki, jcorvel, stsp + +-------- +https://svn.apache.org/r1879245;>r1879245 | svn-role | 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines + +Merge https://svn.apache.org/r1876662;>r1876662 from trunk: + + * https://svn.apache.org/r1876662;>r1876662 + Avoid check for SWIG version for Python bindings when --without-swig is + passed. + Justification: + SWIG python bindings should be able to be built without SWIG when we use + the release tarball + Votes: + +1: futatuki, stsp, rhuijben + +---- +https://svn.apache.org/r1879246;>r1879246 | svn-role | 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines + +Merge https://svn.apache.org/r1876906;>r1876906 from trunk: + + * https://svn.apache.org/r1876906;>r1876906 + Make gen-make.py --debug work with Python 3 + Justification: + We should also be able to build in Debug configuration with Python 3 + on Windows. + Votes: + +1: jcorvel, stsp, rhuijben + +-------- +https://svn.apache.org/r1879797;>r1879797 | svn-role | 2020-07-12 04:00:12 + (Sun, 12 Jul 2020) | 10 lines + +Merge https://svn.apache.org/r1876410;>r1876410 from trunk: + + * https://svn.apache.org/r1876410;>r1876410 + Fix the .editorconfig stanza for Makefiles. + Justification: + Make $EDITOR do the right thing on any backport branches we may create + off this stabilization branch. + Votes: + +1: danielsh, stsp, jamessan + +-------- +https://svn.apache.org/r1879798;>r1879798 | svn-role | 2020-07-12 04:00:17 + (Sun, 12 Jul 2020) | 9 lines + +Merge https://svn.apache.org/r1878413;>r1878413 from trunk: + + * https://svn.apache.org/r1878413;>r1878413 + autogen.sh: Remove per SWIG bindings checked files on release
svn commit: r1899275 - /subversion/site/publish/.message-ids.tsv
Author: svn-role Date: Mon Mar 28 04:00:20 2022 New Revision: 1899275 URL: http://svn.apache.org/viewvc?rev=1899275=rev Log: * publish/.message-ids.tsv: Automatically regenerated. Modified: subversion/site/publish/.message-ids.tsv Modified: subversion/site/publish/.message-ids.tsv URL: http://svn.apache.org/viewvc/subversion/site/publish/.message-ids.tsv?rev=1899275=1899274=1899275=diff == --- subversion/site/publish/.message-ids.tsv (original) +++ subversion/site/publish/.message-ids.tsv Mon Mar 28 04:00:20 2022 @@ -1,5 +1,6 @@ # Message-ids of archived emails that are referenced by a svn.haxx.se URL. -# Generated by tools/haxx-url-to-message-id.sh on 2021-07-04 +# Generated by tools/haxx-url-to-message-id.sh on 2022-03-28 +http://svn.haxx.se/dev/archive-2010-08/0362.shtml 4c65756c.8070...@collab.net https://svn.haxx.se/dev/archive-2003-01/1125.shtml 20030116213052.314004c1.tt...@idsoftware.com https://svn.haxx.se/dev/archive-2003-02/0068.shtml 87wuki4fpy@codematters.co.uk https://svn.haxx.se/dev/archive-2003-10/0136.shtml 200310031235.h93czgiv064...@bigtex.jrv.org @@ -55,4 +56,3 @@ https://svn.haxx.se/users/archive-2012-0 https://svn.haxx.se/users/archive-2012-09/0236.shtml 20120921085850.gg24...@ted.stsp.name https://svn.haxx.se/users/archive-2019-04/0041.shtml 9739e241-f88c-8a79-11f5-783a7f119...@neuf.fr https://svn.haxx.se/users/archive-2020-04/0040.shtml 20200422065424.gl81...@ted.stsp.name -http://svn.haxx.se/dev/archive-2010-08/0362.shtml 4c65756c.8070...@collab.net
svn commit: r1899259 - in /subversion/branches/1.14.x: ./ STATUS build/run_tests.py
Author: svn-role
Date: Sun Mar 27 18:03:48 2022
New Revision: 1899259
URL: http://svn.apache.org/viewvc?rev=1899259=rev
Log:
Merge r1897449 from trunk:
* r1897449
tests: Include additional information in an error message.
Justification:
Trivial test harness change that may help investigate unreproducible
errors.
Votes:
+1: danielsh, markphip, hartmannathan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/build/run_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1897449
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899259=1899258=1899259=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 18:03:48 2022
@@ -115,11 +115,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1897449
- tests: Include additional information in an error message.
- Justification:
- Trivial test harness change that may help investigate unreproducible
- errors.
- Votes:
- +1: danielsh, markphip, hartmannathan
Modified: subversion/branches/1.14.x/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/run_tests.py?rev=1899259=1899258=1899259=diff
==
--- subversion/branches/1.14.x/build/run_tests.py (original)
+++ subversion/branches/1.14.x/build/run_tests.py Sun Mar 27 18:03:48 2022
@@ -776,10 +776,12 @@ class TestHarness:
# ### Even if failure==1 it could be that the test didn't run at all.
if test_failed and test_failed != 1:
if self.log:
-log.write('FAIL: %s: Unknown test failure; see tests.log.\n' %
progbase)
+log.write('FAIL: %s: Unknown test failure (%s); see tests.log.\n'
+ % (progbase, test_failed))
log.flush()
else:
-log.write('FAIL: %s: Unknown test failure.\n' % progbase)
+log.write('FAIL: %s: Unknown test failure (%s).\n'
+ % (progbase, test_failed))
def _run_c_test(self, progabs, progdir, progbase, test_nums, dot_count):
'Run a c test, escaping parameters as required.'
svn commit: r1899255 - in /subversion/branches/1.14.x: ./ Makefile.in STATUS
Author: svn-role Date: Sun Mar 27 18:03:44 2022 New Revision: 1899255 URL: http://svn.apache.org/viewvc?rev=1899255=rev Log: Merge r1886708 from trunk: * r1886708 swig-py: Fix dependency of make copy-swig-py target. Justification: Fix a regression introduced between 1.13.0 and 1.14.0. Votes: +1: futatuki, jun66j5 Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/Makefile.in subversion/branches/1.14.x/STATUS Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1886708 Modified: subversion/branches/1.14.x/Makefile.in URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/Makefile.in?rev=1899255=1899254=1899255=diff == --- subversion/branches/1.14.x/Makefile.in (original) +++ subversion/branches/1.14.x/Makefile.in Sun Mar 27 18:03:44 2022 @@ -928,19 +928,19 @@ clean-swig-pl: extraclean-swig-pl: clean-swig-pl $(EXTRACLEAN_SWIG_PL) +swig-py: autogen-swig-py + $(SWIG_PY_DIR)/libsvn: mkdir $(SWIG_PY_DIR)/libsvn -copy-swig-py: autogen-swig-py $(SWIG_PY_DIR)/libsvn +copy-swig-py: autogen-swig-py swig-py $(SWIG_PY_DIR)/libsvn @for f in $(SWIG_PY_SRC_DIR)/*.py $(SWIG_PY_DIR)/*.py; do \ ! [ -f "$$f" ] || cp -pf $$f $(SWIG_PY_DIR)/libsvn; \ done @cd $(SWIG_PY_DIR)/libsvn;ln -sf ../.libs/*.so . @touch $(SWIG_PY_DIR)/libsvn/__init__.py -swig-py: autogen-swig-py copy-swig-py - -check-swig-py: swig-py +check-swig-py: swig-py copy-swig-py $(TEST_SHLIB_VAR_SWIG_PY) \ cd $(SWIG_PY_DIR); \ $(PYTHON) $(SWIG_PY_SRC_DIR)/tests/run_all.py Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899255=1899254=1899255=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Sun Mar 27 18:03:44 2022 @@ -116,13 +116,6 @@ Veto-blocked changes: Approved changes: = - * r1886708 - swig-py: Fix dependency of make copy-swig-py target. - Justification: - Fix a regression introduced between 1.13.0 and 1.14.0. - Votes: - +1: futatuki, jun66j5 - * r1883838, r1883989, r1886460, r1886582 Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref) Votes:
svn commit: r1899258 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_subr/config_file.c
Author: svn-role Date: Sun Mar 27 18:03:47 2022 New Revision: 1899258 URL: http://svn.apache.org/viewvc?rev=1899258=rev Log: Merge r1889629 from trunk: * r1889629 Document how the port number is passed to custom tunnels. Justification: Documentation should be complete. Votes: +1: danielsh, markphip, hartmannathan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1889629 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899258=1899257=1899258=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Sun Mar 27 18:03:47 2022 @@ -116,13 +116,6 @@ Veto-blocked changes: Approved changes: = - * r1889629 - Document how the port number is passed to custom tunnels. - Justification: - Documentation should be complete. - Votes: - +1: danielsh, markphip, hartmannathan - * r1897449 tests: Include additional information in an error message. Justification: Modified: subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c?rev=1899258=1899257=1899258=diff == --- subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c (original) +++ subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c Sun Mar 27 18:03:47 2022 @@ -1442,11 +1442,12 @@ svn_config_ensure(const char *config_dir "### is defined. The command (or environment variable) may contain" NL "### arguments, using standard shell quoting for arguments with" NL "### spaces. The command will be invoked as:" NL -"### svnserve -t" NL -"### (If the URL includes a username, then the hostname will be" NL -"### passed to the tunnel agent as @.) If the" NL -"### built-in ssh scheme were not predefined, it could be defined" NL -"### as:"NL +"### svnserve -t" NL +"### where is the hostname part of the URL. If the URL" NL +"### specified a username and/or a port, those are included in the" NL +"### argument in the usual way: @:."NL +"### If the built-in ssh scheme were not predefined, it could be"NL +"### defined as:"NL "# ssh = $SVN_SSH ssh -q --" NL "### If you wanted to define a new 'rsh' scheme, to be used with"NL "### 'svn+rsh:' URLs, you could do so as follows:" NL
svn commit: r1899257 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_subr/cmdline.c
Author: svn-role
Date: Sun Mar 27 18:03:46 2022
New Revision: 1899257
URL: http://svn.apache.org/viewvc?rev=1899257=rev
Log:
Merge the r1887641 group from trunk:
* r1887641, r1890013
Fix encoding of error message on failure of system() call.
Justification:
Error messages should be displayed correctly even if non UTF-8 locale.
Votes:
+1: futatuki, markphip, hartmannathan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1887641,1890013
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899257=1899256=1899257=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 18:03:46 2022
@@ -116,13 +116,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1887641, r1890013
- Fix encoding of error message on failure of system() call.
- Justification:
- Error messages should be displayed correctly even if non UTF-8 locale.
- Votes:
- +1: futatuki, markphip, hartmannathan
-
* r1889629
Document how the port number is passed to custom tunnels.
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c?rev=1899257=1899256=1899257=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c Sun Mar 27
18:03:46 2022
@@ -1499,10 +1499,16 @@ svn_cmdline__edit_file_externally(const
stderr, TRUE /* fatal */, "svn: ");
if (sys_err)
-/* Extracting any meaning from sys_err is platform specific, so just
- use the raw value. */
-return svn_error_createf(SVN_ERR_EXTERNAL_PROGRAM, NULL,
- _("system('%s') returned %d"), cmd, sys_err);
+{
+ const char *cmd_utf8;
+
+ /* Extracting any meaning from sys_err is platform specific, so just
+ use the raw value. */
+ SVN_ERR(svn_path_cstring_to_utf8(_utf8, cmd, pool));
+ return svn_error_createf(SVN_ERR_EXTERNAL_PROGRAM, NULL,
+ _("system('%s') returned %d"),
+ cmd_utf8, sys_err);
+}
return SVN_NO_ERROR;
}
@@ -1648,8 +1654,8 @@ svn_cmdline__edit_string_externally(svn_
goto cleanup;
/* Prepare the editor command line. */
- err = svn_utf_cstring_from_utf8(_native,
- escape_path(pool, tmpfile_name), pool);
+ err = svn_path_cstring_from_utf8(_native,
+ escape_path(pool, tmpfile_name), pool);
if (err)
goto cleanup;
@@ -1678,10 +1684,14 @@ svn_cmdline__edit_string_externally(svn_
#endif
if (sys_err != 0)
{
+ const char *cmd_utf8;
+
/* Extracting any meaning from sys_err is platform specific, so just
use the raw value. */
+ SVN_ERR(svn_path_cstring_to_utf8(_utf8, cmd, pool));
err = svn_error_createf(SVN_ERR_EXTERNAL_PROGRAM, NULL,
- _("system('%s') returned %d"), cmd, sys_err);
+ _("system('%s') returned %d"),
+ cmd_utf8, sys_err);
goto cleanup;
}
svn commit: r1899256 - in /subversion/branches/1.14.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh subversion/tests/cmdline/mod_authz_svn_tests.py
Author: svn-role
Date: Sun Mar 27 18:03:45 2022
New Revision: 1899256
URL: http://svn.apache.org/viewvc?rev=1899256=rev
Log:
Merge the r1883838 group from trunk:
* r1883838, r1883989, r1886460, r1886582
Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
Votes:
+1: stsp, markphip, hartmannathan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
subversion/branches/1.14.x/subversion/tests/cmdline/mod_authz_svn_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1883838,1883989,1886460,1886582
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899256=1899255=1899256=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 18:03:45 2022
@@ -116,11 +116,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1883838, r1883989, r1886460, r1886582
-Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
-Votes:
- +1: stsp, markphip, hartmannathan
-
* r1887641, r1890013
Fix encoding of error message on failure of system() call.
Justification:
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh?rev=1899256=1899255=1899256=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh Sun Mar
27 18:03:45 2022
@@ -610,6 +610,15 @@ cat >> "$HTTPD_CFG" <<__EOF__
${SVN_PATH_AUTHZ_LINE}
+
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
+ SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
+ Require valid-user
+ Satisfy Any
+ AuthzSVNReposRelativeAccessFile "^/authz"
+
__EOF__
location_common
Modified:
subversion/branches/1.14.x/subversion/tests/cmdline/mod_authz_svn_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/mod_authz_svn_tests.py?rev=1899256=1899255=1899256=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/mod_authz_svn_tests.py
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/mod_authz_svn_tests.py
Sun Mar 27 18:03:45 2022
@@ -25,7 +25,7 @@
##
# General modules
-import os, re, logging
+import os, re, logging, shutil
logger = logging.getLogger()
@@ -1043,6 +1043,73 @@ def authn_sallrall(sbox):
verify_gets(test_area_url, sallrall_tests)
+@SkipUnless(svntest.main.is_ra_type_dav)
+def repos_relative_access_file(sbox):
+ "repos-relative access file"
+
+ sbox.build()
+
+ test_area_url = sbox.repo_url.replace('/svn-test-work/repositories/',
+'/authz-test-work/in-repos-authz/')
+
+ svntest.main.write_authz_file(sbox, {"/": "", "/A": "%s = rw" % user1})
+ shutil.move(sbox.authz_file, os.path.join(sbox.wc_dir, 'authz'))
+ sbox.simple_add('authz')
+ svntest.actions.run_and_verify_svn(None, [], 'relocate',
+ sbox.file_protocol_repo_url(), sbox.wc_dir)
+ sbox.simple_commit(message="adding in-repository authz rules file")
+
+ in_repos_authz_tests = (
+ { 'path': '', 'status': 401, },
+ { 'path': '/authz', 'status': 401, },
+ { 'path': '/authz', 'user' : user1, 'pw' : user1_pass,
+ 'status': 403, },
+ { 'path': '/A', 'user' : user1, 'pw' : user1_pass,
+ 'status': 301, },
+ { 'path': '/A/', 'user' : user1, 'pw' : user1_pass,
+ 'status': 200, },
+ )
+
+ verify_gets(test_area_url, in_repos_authz_tests)
+
+# test for the bug also known as CVE-2020-17525
+@SkipUnless(svntest.main.is_ra_type_dav)
+def nonexistent_repos_relative_access_file(sbox):
+ "repos-relative access file with bad repository URL"
+
+ sbox.build()
+
+ test_area_url = sbox.repo_url.replace('/svn-test-work/repositories/',
+'/authz-test-work/in-repos-authz/')
+
+ # Construct a bad test-area URL to see what happens if we attempt to access
+ # a repository in a subdirectory which does not exist in SVNParentPath.
+ # This used to crash the server with a NULL-pointer dereference upon
+ # unauthe
svn commit: r1899244 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sun Mar 27 15:03:26 2022 New Revision: 1899244 URL: http://svn.apache.org/viewvc?rev=1899244=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899244=1899243=1899244=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sun Mar 27 15:03:26 2022 @@ -2,492 +2,66 @@ Changes in ^/subversion/branches/1.14.x: -https://svn.apache.org/r1877978;>r1877978 | svn-role | 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines - -Merge https://svn.apache.org/r1877788;>r1877788 from trunk: - - * https://svn.apache.org/r1877788;>r1877788 - Fix a broken link in a docstring. - Votes: - +1: danielsh, stsp - - -https://svn.apache.org/r1878211;>r1878211 | svn-role | 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines - -Merge https://svn.apache.org/r1877072;>r1877072 from trunk: - - * https://svn.apache.org/r1877072;>r1877072 - svnmucc: Change an error message to state another possible cause of the - error. - Justification: - Error messages should be accurate. User reported (issue #4854). - Votes: - +1: danielsh, stsp, jcorvel - - -https://svn.apache.org/r1878213;>r1878213 | svn-role | 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines - -Merge https://svn.apache.org/r1877259;>r1877259 from trunk: - -* https://svn.apache.org/r1877259;>r1877259 -Move variable declarations to the start of block the to fix -syntax errors with VC9 (Visual Studio 2008). - Justification: -Our code should be C90. - Votes: -+1: brane, stsp, jcorvel -+0: danielsh (from dev@) - - -https://svn.apache.org/r1878415;>r1878415 | svn-role | 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines - -Merge the https://svn.apache.org/r1876707;>r1876707 group from trunk: - - * https://svn.apache.org/r1876707;>r1876707, https://svn.apache.org/r1876734;>r1876734, https://svn.apache.org/r1877318;>r1877318, https://svn.apache.org/r1877712;>r1877712, https://svn.apache.org/r1878141;>r1878141, https://svn.apache.org/r1878142;>r1878142, https://svn.apache.org/r1878143;>r1878143, - https://svn.apache.org/r1878144;>r1878144 - Various fixes for making the test suite run correctly with Python 3 on - Windows. - Justification: - Our test suite should test Subversion correctly also on Windows with - Python 3 - Votes: - +1: futatuki, jcorvel, stsp - --------- -https://svn.apache.org/r1879245;>r1879245 | svn-role | 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines - -Merge https://svn.apache.org/r1876662;>r1876662 from trunk: - - * https://svn.apache.org/r1876662;>r1876662 - Avoid check for SWIG version for Python bindings when --without-swig is - passed. - Justification: - SWIG python bindings should be able to be built without SWIG when we use - the release tarball - Votes: - +1: futatuki, stsp, rhuijben - ----- -https://svn.apache.org/r1879246;>r1879246 | svn-role | 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines - -Merge https://svn.apache.org/r1876906;>r1876906 from trunk: - - * https://svn.apache.org/r1876906;>r1876906 - Make gen-make.py --debug work with Python 3 - Justification: - We should also be able to build in Debug configuration with Python 3 - on Windows. - Votes: - +1: jcorvel, stsp, rhuijben - ----- -https://svn.apache.org/r1879797;>r1879797 | svn-role | 2020-07-12 04:00:12 + (Sun, 12 Jul 2020) | 10 lines - -Merge https://svn.apache.org/r1876410;>r1876410 from trunk: - - * https://svn.apache.org/r1876410;>r1876410 - Fix the .editorconfig stanza for Makefiles. - Justification: - Make $EDITOR do the right thing on any backport branches we may create - off this stabilization branch. - Votes: - +1: danielsh, stsp, jamessan - --------- -https://svn.apache.org/r1879798;>r1879798 | svn-role | 2020-07-12 04:00:17 + (Sun, 12 Jul 2020) | 9 lines - -Merge https://svn.apache.org/r1878413;>r1878413 from trunk: - - * https://svn.apache.org/r1878413;>r1878413 - autogen.sh: Remove per SWIG bindings checked files on r
svn commit: r1899243 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/swig/python/tests/client.py subversion/bindings/swig/python/tests/core.py subversion/bindings/swig/python/tests/typ
Author: svn-role
Date: Sun Mar 27 14:53:32 2022
New Revision: 1899243
URL: http://svn.apache.org/viewvc?rev=1899243=rev
Log:
Merge r1885199 from trunk:
* r1885199
swig-py: Skip some tests on Python 2 if default encoding is 'utf-8'.
Justification:
Fix check-swig-py not working at all since r1889654 merged from r1889487
(r1889487 depends on r1885199).
Votes:
+1: jun66j5, futatuki
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/client.py
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/core.py
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/typemap.py
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/utils.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1885199
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899243=1899242=1899243=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 14:53:32 2022
@@ -108,14 +108,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1885199
- swig-py: Skip some tests on Python 2 if default encoding is 'utf-8'.
- Justification:
- Fix check-swig-py not working at all since r1889654 merged from r1889487
- (r1889487 depends on r1885199).
- Votes:
- +1: jun66j5, futatuki
-
* r1897441
swig-py: Fix cleanup failing in unit tests with Python 3 on Windows.
Justification:
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/client.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/tests/client.py?rev=1899243=1899242=1899243=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/python/tests/client.py
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/python/tests/client.py
Sun Mar 27 14:53:32 2022
@@ -233,9 +233,17 @@ class SubversionClientTestCase(unittest.
u" message")
self.client_ctx.log_msg_baton3 = bogus_log_message_func
-with self.assertRaises(UnicodeEncodeError):
- commit_info = client.mkdir3((directory,), 1, {b'customprop':b'value'},
- self.client_ctx)
+if not utils.IS_PY3 and utils.is_defaultencoding_utf8():
+ # 'utf-8' codecs on Python 2 does not raise UnicodeEncodeError
+ # on surrogate code point U+dc00 - U+dcff, however it causes
+ # Subversion error on property validation of svn:log
+ with self.assertRaises(core.SubversionException):
+commit_info = client.mkdir3((directory,), 1, {b'customprop':b'value'},
+self.client_ctx)
+else:
+ with self.assertRaises(UnicodeEncodeError):
+commit_info = client.mkdir3((directory,), 1, {b'customprop':b'value'},
+self.client_ctx)
def test_log3_url(self):
"""Test svn_client_log3 on a file:// URL"""
@@ -302,10 +310,14 @@ class SubversionClientTestCase(unittest.
self.assertEqual(revprops[b'svn:author'], b"john")
with self.assertRaises(KeyError):
commit_date = revprops['svn:date']
-with self.assertRaises(UnicodeEncodeError):
- client.log5((directory,), start, (rev_range,), 1, True, False, False,
- (u'svn:\udc61uthor', b'svn:log'),
- log_entry_receiver_whole, self.client_ctx)
+if utils.IS_PY3 or not utils.is_defaultencoding_utf8():
+ # 'utf-8' codecs on Python 2 does not raise UnicodeEncodeError
+ # on surrogate code point U+dc00 - U+dcff. So we need to skip
+ # below in such a case.
+ with self.assertRaises(UnicodeEncodeError):
+client.log5((directory,), start, (rev_range,), 1, True, False, False,
+(u'svn:\udc61uthor', b'svn:log'),
+log_entry_receiver_whole, self.client_ctx)
def test_uuid_from_url(self):
"""Test svn_client_uuid_from_url on a file:// URL"""
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/core.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/tests/core.py?rev=1899243=1899242=1899243=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/python/tests/core.py
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/python/tests/core.py
Sun Mar 27 14:53:32 2022
@@ -23,8 +23,6 @@ import os
imp
svn commit: r1899242 - in /subversion/branches/1.14.x: ./ Makefile.in STATUS
Author: svn-role Date: Sun Mar 27 14:53:30 2022 New Revision: 1899242 URL: http://svn.apache.org/viewvc?rev=1899242=rev Log: Merge r1891908 from trunk: * r1891908 Fix a bug where «make davautocheck» immediately after configure failed hard because of an unbuilt dependency. Justification: Small fix. Prevents spurious hard fails of 'make davautocheck'. Votes: +1: danielsh, dsahlberg, markphip Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/Makefile.in subversion/branches/1.14.x/STATUS Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1891908 Modified: subversion/branches/1.14.x/Makefile.in URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/Makefile.in?rev=1899242=1899241=1899242=diff == --- subversion/branches/1.14.x/Makefile.in (original) +++ subversion/branches/1.14.x/Makefile.in Sun Mar 27 14:53:30 2022 @@ -633,12 +633,12 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $ # First, set up Apache as documented in # subversion/tests/cmdline/README. -davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod +davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat @$(MAKE) check BASE_URL=http://localhost # Automatically configure and run Apache httpd on a random port, and then # run make check. -davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod +davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat @# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment. @APXS=$(APXS) MAKE=$(MAKE) $(SHELL) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899242=1899241=1899242=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Sun Mar 27 14:53:30 2022 @@ -108,14 +108,6 @@ Veto-blocked changes: Approved changes: = - * r1891908 - Fix a bug where «make davautocheck» immediately after configure failed - hard because of an unbuilt dependency. - Justification: - Small fix. Prevents spurious hard fails of 'make davautocheck'. - Votes: - +1: danielsh, dsahlberg, markphip - * r1885199 swig-py: Skip some tests on Python 2 if default encoding is 'utf-8'. Justification:
svn commit: r1899241 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_fs_fs/ subversion/libsvn_fs_fs/verify.c subversion/po/de.po subversion/po/sv.po
Author: svn-role
Date: Sun Mar 27 14:53:27 2022
New Revision: 1899241
URL: http://svn.apache.org/viewvc?rev=1899241=rev
Log:
Merge r1887704 from trunk:
* r1887704
Follow up to r1865987, r1866588: Unbreak a msgid.
Justification:
subversion.pot should be built correctly.
Votes:
+1: futatuki, jun66j5, markphip
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_fs_fs/ (props changed)
subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c
subversion/branches/1.14.x/subversion/po/de.po
subversion/branches/1.14.x/subversion/po/sv.po
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1887704
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899241=1899240=1899241=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 14:53:27 2022
@@ -108,13 +108,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1887704
- Follow up to r1865987, r1866588: Unbreak a msgid.
- Justification:
- subversion.pot should be built correctly.
- Votes:
- +1: futatuki, jun66j5, markphip
-
* r1891908
Fix a bug where «make davautocheck» immediately after configure failed
hard because of an unbuilt dependency.
Propchange: subversion/branches/1.14.x/subversion/libsvn_fs_fs/
--
Merged /subversion/trunk/subversion/libsvn_fs_fs:r1887704
Modified: subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c?rev=1899241=1899240=1899241=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_fs_fs/verify.c Sun Mar 27
14:53:27 2022
@@ -691,17 +691,20 @@ compare_p2l_to_rev(svn_fs_t *fs,
* during later stages of the verification process. */
if ( (entry->type == SVN_FS_FS__ITEM_TYPE_CHANGES)
!= (entry->item.number == SVN_FS_FS__ITEM_INDEX_CHANGES))
-return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
- NULL,
- _("p2l index entry for changes in"
- " revision r%ld is item"
- " %"APR_UINT64_T_FMT
- " of type %u at offset %s"),
- entry->item.revision,
- entry->item.number,
- (unsigned int)entry->type,
- apr_off_t_toa(pool, offset));
-
+{
+ const char *num_str = apr_psprintf(pool,
+ "%" APR_UINT64_T_FMT,
+ entry->item.number);
+ return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
+ NULL,
+ _("p2l index entry for changes in"
+ " revision r%ld is item %s"
+ " of type %u at offset %s"),
+ entry->item.revision,
+ num_str,
+ (unsigned int)entry->type,
+ apr_off_t_toa(pool, offset));
+}
/* Check contents. */
if (entry->type == SVN_FS_FS__ITEM_TYPE_UNUSED)
{
Modified: subversion/branches/1.14.x/subversion/po/de.po
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/po/de.po?rev=1899241=1899240=1899241=diff
==
--- subversion/branches/1.14.x/subversion/po/de.po [UTF-8] (original)
+++ subversion/branches/1.14.x/subversion/po/de.po [UTF-8] Sun Mar 27 14:53:27
2022
@@ -6562,7 +6562,7 @@ msgstr "P2L-Indexeintrag für Revision r
#: ../libsvn_fs_fs/verify.c:696
#, fuzzy, c-format
-msgid "p2l index entry for changes in revision r%ld is item %ld of type %d at
offset %s"
+msgid "p2l index entry for changes in revision r%ld is item %s of type %u at
offset %s"
msgstr "P2L-Indexeintrag für Revision r%ld ist nicht zusammenhängend zwischen
Offsets %s und %s"
#: ../libsvn_fs_util/fs-ut
svn commit: r1896937 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Jan 12 04:15:06 2022 New Revision: 1896937 URL: http://svn.apache.org/viewvc?rev=1896937=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1896937=1896936=1896937=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Jan 12 04:15:06 2022 @@ -476,6 +476,18 @@ Merge https://svn.apache.org/r1 +1: jun66j5, futatuki +https://svn.apache.org/r1896935;>r1896935 | svn-role | 2022-01-12 04:00:13 + (Wed, 12 Jan 2022) | 9 lines + +Merge https://svn.apache.org/r1896877;>r1896877 from trunk: + + * https://svn.apache.org/r1896877;>r1896877 +Fix misleading -r option documentation for some svnadmin subcommands. +Justification: + Documentation should be correct. +Votes: + +1: stsp, dsahlberg, hartmannathan + + Further changes currently under consideration are listed in each release line's
svn commit: r1896935 - in /subversion/branches/1.14.x: ./ STATUS subversion/svnadmin/svnadmin.c
Author: svn-role
Date: Wed Jan 12 04:00:13 2022
New Revision: 1896935
URL: http://svn.apache.org/viewvc?rev=1896935=rev
Log:
Merge r1896877 from trunk:
* r1896877
Fix misleading -r option documentation for some svnadmin subcommands.
Justification:
Documentation should be correct.
Votes:
+1: stsp, dsahlberg, hartmannathan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1896877
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1896935=1896934=1896935=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Jan 12 04:00:13 2022
@@ -131,10 +131,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1896877
-Fix misleading -r option documentation for some svnadmin subcommands.
-Justification:
- Documentation should be correct.
-Votes:
- +1: stsp, dsahlberg, hartmannathan
Modified: subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c?rev=1896935=1896934=1896935=diff
==
--- subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c Wed Jan 12
04:00:13 2022
@@ -352,7 +352,8 @@ static const svn_opt_subcommand_desc3_t
"2. Delete the property NAME on transaction TXN.\n"
)},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
-svnadmin__use_post_revprop_change_hook} },
+svnadmin__use_post_revprop_change_hook},
+ { {'r', "specify revision number ARG"} } },
{"deltify", subcommand_deltify, {0}, {N_(
"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
@@ -541,7 +542,8 @@ static const svn_opt_subcommand_desc3_t
"The size includes revision properties and excludes FSFS indexes.\n"
)},
{'r', 'q', 'M'},
- { {'q', "print only the size and a newline"} } },
+ { {'r', "specify revision number ARG"},
+ {'q', "print only the size and a newline"} }, },
{"rmlocks", subcommand_rmlocks, {0}, {N_(
"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
@@ -570,7 +572,8 @@ static const svn_opt_subcommand_desc3_t
"NOTE: Revision properties are not versioned, so this command will\n"
"overwrite the previous log message.\n"
)},
- {'r', svnadmin__bypass_hooks} },
+ {'r', svnadmin__bypass_hooks},
+ { {'r', "specify revision number ARG"} }, },
{"setrevprop", subcommand_setrevprop, {0}, {N_(
"usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
@@ -588,7 +591,8 @@ static const svn_opt_subcommand_desc3_t
"2. Set the property NAME on transaction TXN to the contents of FILE.\n"
)},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
-svnadmin__use_post_revprop_change_hook} },
+svnadmin__use_post_revprop_change_hook},
+ { {'r', "specify revision number ARG"} }, },
{"setuuid", subcommand_setuuid, {0}, {N_(
"usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n"
svn commit: r1891240 - /subversion/site/publish/.message-ids.tsv
Author: svn-role Date: Sun Jul 4 04:00:19 2021 New Revision: 1891240 URL: http://svn.apache.org/viewvc?rev=1891240=rev Log: * publish/.message-ids.tsv: Automatically regenerated. Modified: subversion/site/publish/.message-ids.tsv Modified: subversion/site/publish/.message-ids.tsv URL: http://svn.apache.org/viewvc/subversion/site/publish/.message-ids.tsv?rev=1891240=1891239=1891240=diff == --- subversion/site/publish/.message-ids.tsv (original) +++ subversion/site/publish/.message-ids.tsv Sun Jul 4 04:00:19 2021 @@ -1,10 +1,12 @@ # Message-ids of archived emails that are referenced by a svn.haxx.se URL. -# Generated by tools/haxx-url-to-message-id.sh on 2020-07-09 +# Generated by tools/haxx-url-to-message-id.sh on 2021-07-04 https://svn.haxx.se/dev/archive-2003-01/1125.shtml 20030116213052.314004c1.tt...@idsoftware.com https://svn.haxx.se/dev/archive-2003-02/0068.shtml 87wuki4fpy@codematters.co.uk https://svn.haxx.se/dev/archive-2003-10/0136.shtml 200310031235.h93czgiv064...@bigtex.jrv.org https://svn.haxx.se/dev/archive-2004-01/0922.shtml 7be62866-4f6f-11d8-8d58-003065f9d...@castle.fastmail.fm https://svn.haxx.se/dev/archive-2005-04/0319.shtml 1112654035.22512.0.camel@localhost.localdomain +https://svn.haxx.se/dev/archive-2005-07/0195.shtml 20050705230608.ga26...@synapse.brain.org +https://svn.haxx.se/dev/archive-2005-08/1153.shtml 20050825202901.gd3...@synapse.brain.org https://svn.haxx.se/dev/archive-2005-12/0487.shtml aea328ab0512111313r42d6ec51p1fead4c190eca...@mail.gmail.com https://svn.haxx.se/dev/archive-2005-12/0633.shtml aea328ab0512151210s73154222g36ab671280bd5...@mail.gmail.com https://svn.haxx.se/dev/archive-2006-02/1156.shtml 20060219230459.GA30803@sete.vztech
svn commit: r1889655 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sat May 8 04:15:08 2021 New Revision: 1889655 URL: http://svn.apache.org/viewvc?rev=1889655=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1889655=1889654=1889655=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sat May 8 04:15:08 2021 @@ -466,6 +466,16 @@ Merge https://svn.apache.org/r1 +1: jcorvel, amiloslavskiy +https://svn.apache.org/r1889654;>r1889654 | svn-role | 2021-05-08 04:00:13 + (Sat, 08 May 2021) | 7 lines + +Merge https://svn.apache.org/r1889487;>r1889487 from trunk: + + * https://svn.apache.org/r1889487;>r1889487 + swig-py: Fix doubly destroying memory pool with cyclic garbage collector. + Votes: + +1: jun66j5, futatuki + + Further changes currently under consideration are listed in each release line's
svn commit: r1889654 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/swig/include/proxy_apr.swg subversion/bindings/swig/python/tests/pool.py
Author: svn-role
Date: Sat May 8 04:00:13 2021
New Revision: 1889654
URL: http://svn.apache.org/viewvc?rev=1889654=rev
Log:
Merge r1889487 from trunk:
* r1889487
swig-py: Fix doubly destroying memory pool with cyclic garbage collector.
Votes:
+1: jun66j5, futatuki
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/include/proxy_apr.swg
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/pool.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1889487
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1889654=1889653=1889654=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat May 8 04:00:13 2021
@@ -99,8 +99,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1889487
- swig-py: Fix doubly destroying memory pool with cyclic garbage collector.
- Votes:
- +1: jun66j5, futatuki
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/include/proxy_apr.swg
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/include/proxy_apr.swg?rev=1889654=1889653=1889654=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/include/proxy_apr.swg
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/include/proxy_apr.swg
Sat May 8 04:00:13 2021
@@ -142,9 +142,15 @@ struct apr_pool_t {
are still valid"""
try:
self._is_valid
- return True
except AttributeError:
return False
+# We must check whether the parent pool is valid even if
+# the pool is valid because weakref's callback is not
+# invoked when it is finalized by cyclic garbage collector
+if self._parent_pool:
+ return self._parent_pool.valid()
+else:
+ return True
def assert_valid(self):
"""Assert that this memory_pool is still valid."""
Modified:
subversion/branches/1.14.x/subversion/bindings/swig/python/tests/pool.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/tests/pool.py?rev=1889654=1889653=1889654=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/python/tests/pool.py
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/python/tests/pool.py
Sat May 8 04:00:13 2021
@@ -19,10 +19,11 @@
#
#
import unittest, weakref, setup_path
-import os, tempfile
+import os, tempfile, gc
import svn.core, svn.client, libsvn.core
from svn.core import *
from libsvn.core import application_pool, GenericSWIGWrapper
+import utils
# Test case for the new automatic pool management infrastructure
@@ -208,6 +209,51 @@ class PoolTestCase(unittest.TestCase):
# We can still destroy and create pools at will
svn_pool_destroy(svn_pool_create())
+ def _test_pools_in_circular_reference(self, finalizer=False):
+
+class Circular(object):
+
+ def __init__(self, pool):
+self.pool = pool
+self.loop = None
+
+ if finalizer:
+def __del__(self):
+ self.pool = self.loop = None
+
+def create_circularl():
+ pool = Pool(libsvn.core.application_pool)
+ subpool1 = Pool(pool)
+ subpool2 = Pool(pool)
+ circularly1 = Circular(pool)
+ circularly2 = Circular(subpool2)
+ circularly3 = Circular(subpool1)
+ circularly1.loop = circularly3
+ circularly2.loop = circularly1
+ circularly3.loop = circularly2
+ refs = weakref.WeakValueDictionary()
+ refs['pool'] = pool
+ refs['subpool1'] = subpool1
+ refs['subpool2'] = subpool2
+ return refs
+
+refs = create_circularl()
+self.assertEqual({'pool', 'subpool1', 'subpool2'},
+ set(name for name, pool in refs.items()
+ if pool is not None))
+gc.collect()
+self.assertEqual(set(), set(name for name, pool in refs.items()
+ if pool is not None))
+
+ def test_pools_in_circular_reference_without_finalizer(self):
+self._test_pools_in_circular_reference(finalizer=False)
+
+ @unittest.skipIf(not utils.IS_PY3,
+ "Python 2 cannot collect garbage which involves circular "
+ "references with finalizer")
+ def test_pools_in_circular_reference_with_finalizer(self):
+self._test_pools_in_circular_reference(finalizer=True)
+
def suite():
return unittest.defaultTestLoader.loadTestsFromTestCase(PoolTestCase)
svn commit: r1886046 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Sat Jan 30 04:15:05 2021 New Revision: 1886046 URL: http://svn.apache.org/viewvc?rev=1886046=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1886046=1886045=1886046=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Sat Jan 30 04:15:05 2021 @@ -403,6 +403,69 @@ Merge https://svn.apache.org/r1 +1: brane, jamessan +https://svn.apache.org/r1886041;>r1886041 | svn-role | 2021-01-30 04:00:44 + (Sat, 30 Jan 2021) | 9 lines + +Merge https://svn.apache.org/r1882234;>r1882234 from trunk: + + * https://svn.apache.org/r1882234;>r1882234 + Fix file name to edit from utf8 to local style. + Justification: + Editor invocation should work correctly in any valid locale. + Votes: + +1: futatuki, jcorvel, stsp + + +https://svn.apache.org/r1886042;>r1886042 | svn-role | 2021-01-30 04:00:48 + (Sat, 30 Jan 2021) | 12 lines + +Merge https://svn.apache.org/r1885953;>r1885953 from trunk: + + * https://svn.apache.org/r1885953;>r1885953 + Fix file name encoding and quoting when invoking editor on Windows. + Justification: + Invoking editor with special character or spaces in path is broken + on Windows. + Depends: + https://svn.apache.org/r1882234;>r1882234 + Votes: + +1: jcorvel, futatuki, stsp + + +https://svn.apache.org/r1886043;>r1886043 | svn-role | 2021-01-30 04:00:53 + (Sat, 30 Jan 2021) | 9 lines + +Merge https://svn.apache.org/r1886019;>r1886019 from trunk: + + * https://svn.apache.org/r1886019;>r1886019 + Fix a potential NULL dereference in the config file parser. + Justification: + Missing return value check. C is hard. + Votes: + +1: stsp, hartmannathan, jcorvel + + +https://svn.apache.org/r1886044;>r1886044 | svn-role | 2021-01-30 04:00:58 + (Sat, 30 Jan 2021) | 9 lines + +Merge https://svn.apache.org/r1885983;>r1885983 from trunk: + + * https://svn.apache.org/r1885983;>r1885983 + Fix issue #4869: svn info --xml gives wrong source-right of conflict + Justification: + Bugfix; svn info --xml should give correct results; user complained. + Votes: + +1: hartmannathan, stsp, jcorvel + + +https://svn.apache.org/r1886045;>r1886045 | svn-role | 2021-01-30 04:01:04 + (Sat, 30 Jan 2021) | 9 lines + +Merge https://svn.apache.org/r1886029;>r1886029 from trunk: + + * https://svn.apache.org/r1886029;>r1886029 + Fix several crashes and JNI warnings in javahl TunnelAgent. + Justification: + JavaHL shouldnt crash. + Votes: + +1: jcorvel, amiloslavskiy + + Further changes currently under consideration are listed in each release line's
svn commit: r1886045 - in /subversion/branches/1.14.x: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ subversion/bindings/javahl/tests/org/apac
Author: svn-role
Date: Sat Jan 30 04:01:04 2021
New Revision: 1886045
URL: http://svn.apache.org/viewvc?rev=1886045=rev
Log:
Merge r1886029 from trunk:
* r1886029
Fix several crashes and JNI warnings in javahl TunnelAgent.
Justification:
JavaHL shouldn't crash.
Votes:
+1: jcorvel, amiloslavskiy
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/1.14.x/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/1.14.x/subversion/bindings/javahl/native/OperationContext.cpp
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java
subversion/branches/1.14.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/branches/javahl-1.14-fixes:r1882126-1886028
Merged /subversion/trunk:r1886029
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886045=1886044=1886045=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 30 04:01:04 2021
@@ -66,10 +66,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1886029
- Fix several crashes and JNI warnings in javahl TunnelAgent.
- Justification:
- JavaHL shouldn't crash.
- Votes:
- +1: jcorvel, amiloslavskiy
Modified:
subversion/branches/1.14.x/subversion/bindings/javahl/native/JNIUtil.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1886045=1886044=1886045=diff
==
--- subversion/branches/1.14.x/subversion/bindings/javahl/native/JNIUtil.cpp
(original)
+++ subversion/branches/1.14.x/subversion/bindings/javahl/native/JNIUtil.cpp
Sat Jan 30 04:01:04 2021
@@ -551,6 +551,11 @@ std::string JNIUtil::makeSVNErrorMessage
jstring *jerror_message,
jobject *jmessage_stack)
{
+ // This function may be called with a pending Java exception.
+ // It is incorrect to call Java methods (see code below) with a pending
+ // exception. Stash it away until this function exits.
+ StashException stash(getEnv());
+
if (jerror_message)
*jerror_message = NULL;
if (jmessage_stack)
@@ -761,16 +766,27 @@ namespace {
const char* known_exception_to_cstring(apr_pool_t* pool)
{
JNIEnv *env = JNIUtil::getEnv();
+
+ // This function may be called with a pending Java exception.
+ // It is incorrect to call Java methods (see code below) with a pending
+ // exception. Stash it away until this function exits.
jthrowable t = env->ExceptionOccurred();
+ StashException stashed(env);
+
jclass cls = env->GetObjectClass(t);
jstring jclass_name;
{
jmethodID mid = env->GetMethodID(cls, "getClass", "()Ljava/lang/Class;");
jobject clsobj = env->CallObjectMethod(t, mid);
+if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
+
jclass basecls = env->GetObjectClass(clsobj);
mid = env->GetMethodID(basecls, "getName", "()Ljava/lang/String;");
jclass_name = (jstring) env->CallObjectMethod(clsobj, mid);
+if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
}
jstring jmessage;
@@ -778,6 +794,8 @@ const char* known_exception_to_cstring(a
jmethodID mid = env->GetMethodID(cls, "getMessage",
"()Ljava/lang/String;");
jmessage = (jstring) env->CallObjectMethod(t, mid);
+if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
}
JNIStringHolder class_name(jclass_name);
@@ -1169,3 +1187,28 @@ jthrowable JNIUtil::unwrapJavaException(
return
WrappedException::get_exception(err->pool);
}
+
+StashException::StashException(JNIEnv* env)
+{
+ m_env = env;
+ m_stashed = NULL;
+ stashException();
+}
+
+StashException::~StashException()
+{
+ if (m_stashed)
+m_env->Throw(m_stashed);
+}
+
+void StashException::stashException()
+{
+ jthrowable jexc = m_env->ExceptionOccurred();
+ if (!jexc)
+return;
+
+ if (!m_stashed)
+m_stashed = jexc;
+
+ m_env->ExceptionClear();
+}
Modified: subversion/branches/1.14.x/subversion/bindings/javahl/native/JNIUtil.h
URL:
http://svn.apache.org/viewvc/subv
svn commit: r1886041 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_subr/cmdline.c
Author: svn-role
Date: Sat Jan 30 04:00:44 2021
New Revision: 1886041
URL: http://svn.apache.org/viewvc?rev=1886041=rev
Log:
Merge r1882234 from trunk:
* r1882234
Fix file name to edit from utf8 to local style.
Justification:
Editor invocation should work correctly in any valid locale.
Votes:
+1: futatuki, jcorvel, stsp
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1882234
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886041=1886040=1886041=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 30 04:00:44 2021
@@ -67,13 +67,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1882234
- Fix file name to edit from utf8 to local style.
- Justification:
- Editor invocation should work correctly in any valid locale.
- Votes:
- +1: futatuki, jcorvel, stsp
-
* r1885953
Fix file name encoding and quoting when invoking editor on Windows.
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c?rev=1886041=1886040=1886041=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c Sat Jan 30
04:00:44 2021
@@ -1405,6 +1405,7 @@ svn_cmdline__edit_file_externally(const
apr_pool_t *pool)
{
const char *editor, *cmd, *base_dir, *file_name, *base_dir_apr;
+ const char *file_name_local;
char *old_cwd;
int sys_err;
apr_status_t apr_err;
@@ -1428,9 +1429,11 @@ svn_cmdline__edit_file_externally(const
return svn_error_wrap_apr
(apr_err, _("Can't change working directory to '%s'"), base_dir);
+ SVN_ERR(svn_path_cstring_from_utf8(_name_local,
+ escape_path(pool, file_name), pool));
/* editor is explicitly documented as being interpreted by the user's shell,
and as such should already be quoted/escaped as needed. */
- cmd = apr_psprintf(pool, "%s %s", editor, escape_path(pool, file_name));
+ cmd = apr_psprintf(pool, "%s %s", editor, file_name_local);
sys_err = system(cmd);
apr_err = apr_filepath_set(old_cwd, pool);
@@ -1586,13 +1589,14 @@ svn_cmdline__edit_string_externally(svn_
goto cleanup;
/* Prepare the editor command line. */
- err = svn_utf_cstring_from_utf8(_native, tmpfile_name, pool);
+ err = svn_utf_cstring_from_utf8(_native,
+ escape_path(pool, tmpfile_name), pool);
if (err)
goto cleanup;
/* editor is explicitly documented as being interpreted by the user's shell,
and as such should already be quoted/escaped as needed. */
- cmd = apr_psprintf(pool, "%s %s", editor, escape_path(pool, tmpfile_native));
+ cmd = apr_psprintf(pool, "%s %s", editor, tmpfile_native);
/* If the caller wants us to leave the file around, return the path
of the file we'll use, and make a note not to destroy it. */
svn commit: r1886044 - in /subversion/branches/1.14.x: ./ STATUS subversion/svn/cl-conflicts.c subversion/tests/cmdline/info_tests.py
Author: svn-role
Date: Sat Jan 30 04:00:58 2021
New Revision: 1886044
URL: http://svn.apache.org/viewvc?rev=1886044=rev
Log:
Merge r1885983 from trunk:
* r1885983
Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
Justification:
Bugfix; 'svn info --xml' should give correct results; user complained.
Votes:
+1: hartmannathan, stsp, jcorvel
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/svn/cl-conflicts.c
subversion/branches/1.14.x/subversion/tests/cmdline/info_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1885983
Merged /subversion/branches/issue-4869:r1885862-1885981
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886044=1886043=1886044=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 30 04:00:58 2021
@@ -67,13 +67,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1885983
- Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
- Justification:
- Bugfix; 'svn info --xml' should give correct results; user complained.
- Votes:
- +1: hartmannathan, stsp, jcorvel
-
* r1886029
Fix several crashes and JNI warnings in javahl TunnelAgent.
Justification:
Modified: subversion/branches/1.14.x/subversion/svn/cl-conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/svn/cl-conflicts.c?rev=1886044=1886043=1886044=diff
==
--- subversion/branches/1.14.x/subversion/svn/cl-conflicts.c (original)
+++ subversion/branches/1.14.x/subversion/svn/cl-conflicts.c Sat Jan 30
04:00:58 2021
@@ -452,7 +452,7 @@ append_tree_conflict_info_xml(svn_string
repos_root_url, repos_relpath, peg_rev,
node_kind, pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(_relpath,
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(_relpath,
_rev,
_kind,
conflict,
@@ -529,7 +529,7 @@ svn_cl__append_conflict_info_xml(svn_str
repos_root_url, repos_relpath,
peg_rev,
node_kind, scratch_pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(
_relpath, _rev, _kind, conflict,
scratch_pool, scratch_pool));
if (repos_root_url && repos_relpath)
@@ -576,7 +576,7 @@ svn_cl__append_conflict_info_xml(svn_str
repos_root_url, repos_relpath,
peg_rev,
node_kind, scratch_pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(
_relpath, _rev, _kind, conflict,
scratch_pool, scratch_pool));
if (repos_root_url && repos_relpath)
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/info_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/info_tests.py?rev=1886044=1886043=1886044=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/info_tests.py Sat Jan
30 04:00:58 2021
@@ -843,6 +843,127 @@ def info_file_in_file_replaced_dir(sbox)
svntest.actions.run_and_verify_info([expected],
sbox.repo_url + '/dir/file@1')
+@Issue(4869)
+def info_tree_conflict_source(sbox):
+ "info --xml: verify source-left, source-right"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ B_path = os.path.join(wc_dir, 'A', 'B')
+ lambda_path = os.path.join(B_path, 'lambda')
+ alpha_path = os.path.join(B_path, 'E', 'alpha')
+ F_path = os.path.join(B_path, 'F')
+
+ B2_url = sbox.repo_url + '/A/B2'
+ B2_path = os.path.join(wc_dir, 'A', 'B2')
+ lambda2_path = os.path.join(B2_path, 'lambda')
+
+ # Rev 2 copy B to B2
+ sbox.simple_repo_copy('A/B', 'A/B2')
+ sbox.simple_update()
+
+ # Rev 3:
+ # edit A/B/lambda to test text conflict case
+ # add property to A/B/E/alpha to test property conflict case
+ # rename A/B/F to A/B/Z to test tree conflict case
+
+ svntest.main.file_write(l
svn commit: r1886043 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_repos/config_file.c
Author: svn-role
Date: Sat Jan 30 04:00:53 2021
New Revision: 1886043
URL: http://svn.apache.org/viewvc?rev=1886043=rev
Log:
Merge r1886019 from trunk:
* r1886019
Fix a potential NULL dereference in the config file parser.
Justification:
Missing return value check. C is hard.
Votes:
+1: stsp, hartmannathan, jcorvel
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_repos/config_file.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1886019
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886043=1886042=1886043=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 30 04:00:53 2021
@@ -67,13 +67,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1886019
- Fix a potential NULL dereference in the config file parser.
- Justification:
- Missing return value check. C is hard.
- Votes:
- +1: stsp, hartmannathan, jcorvel
-
* r1885983
Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_repos/config_file.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_repos/config_file.c?rev=1886043=1886042=1886043=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_repos/config_file.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_repos/config_file.c Sat Jan 30
04:00:53 2021
@@ -237,6 +237,10 @@ get_repos_config(svn_stream_t **stream,
{
/* Search for a repository in the full path. */
repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool);
+ if (repos_root_dirent == NULL)
+return svn_error_trace(handle_missing_file(stream, checksum, access,
+ url, must_exist,
+ svn_node_none));
/* Attempt to open a repository at repos_root_dirent. */
SVN_ERR(svn_repos_open3(>repos, repos_root_dirent, NULL,
svn commit: r1886042 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_subr/cmdline.c
Author: svn-role
Date: Sat Jan 30 04:00:48 2021
New Revision: 1886042
URL: http://svn.apache.org/viewvc?rev=1886042=rev
Log:
Merge r1885953 from trunk:
* r1885953
Fix file name encoding and quoting when invoking editor on Windows.
Justification:
Invoking editor with special character or spaces in path is broken
on Windows.
Depends:
r1882234
Votes:
+1: jcorvel, futatuki, stsp
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1885953
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886042=1886041=1886042=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 30 04:00:48 2021
@@ -67,16 +67,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1885953
- Fix file name encoding and quoting when invoking editor on Windows.
- Justification:
- Invoking editor with special character or spaces in path is broken
- on Windows.
- Depends:
- r1882234
- Votes:
- +1: jcorvel, futatuki, stsp
-
* r1886019
Fix a potential NULL dereference in the config file parser.
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c?rev=1886042=1886041=1886042=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/cmdline.c Sat Jan 30
04:00:48 2021
@@ -47,6 +47,7 @@
#endif
#include /* for apr_initialize/apr_terminate */
#include /* for apr_snprintf */
+#include /* for apr_env_get */
#include
#include
@@ -1240,38 +1241,84 @@ svn_cmdline__be_interactive(svn_boolean_
/* Helper for the edit_externally functions. Set *EDITOR to some path to an
- editor binary. Sources to search include: the EDITOR_CMD argument
- (if not NULL), $SVN_EDITOR, the runtime CONFIG variable (if CONFIG
+ editor binary, in native C string on Unix/Linux platforms and in UTF-8
+ string on Windows platform. Sources to search include: the EDITOR_CMD
+ argument (if not NULL), $SVN_EDITOR, the runtime CONFIG variable (if CONFIG
is not NULL), $VISUAL, $EDITOR. Return
SVN_ERR_CL_NO_EXTERNAL_EDITOR if no binary can be found. */
static svn_error_t *
find_editor_binary(const char **editor,
const char *editor_cmd,
- apr_hash_t *config)
+ apr_hash_t *config,
+ apr_pool_t *pool)
{
const char *e;
+ const char *e_cfg;
struct svn_config_t *cfg;
+ apr_status_t status;
/* Use the editor specified on the command line via --editor-cmd, if any. */
+#ifdef WIN32
+ /* On Windows, editor_cmd is transcoded to the system active code page
+ because we use main() as a entry point without APR's (or our own) wrapper
+ in command line tools. */
+ if (editor_cmd)
+{
+ SVN_ERR(svn_utf_cstring_to_utf8(, editor_cmd, pool));
+}
+ else
+{
+ e = NULL;
+}
+#else
e = editor_cmd;
+#endif
/* Otherwise look for the Subversion-specific environment variable. */
if (! e)
-e = getenv("SVN_EDITOR");
+{
+ status = apr_env_get((char **), "SVN_EDITOR", pool);
+ if (status || ! *e)
+{
+ e = NULL;
+}
+}
/* If not found then fall back on the config file. */
if (! e)
{
cfg = config ? svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG) : NULL;
- svn_config_get(cfg, , SVN_CONFIG_SECTION_HELPERS,
+ svn_config_get(cfg, _cfg, SVN_CONFIG_SECTION_HELPERS,
SVN_CONFIG_OPTION_EDITOR_CMD, NULL);
+#ifdef WIN32
+ if (e_cfg)
+{
+ /* On Windows, we assume that config values are set in system active
+ code page, so we need transcode it here. */
+ SVN_ERR(svn_utf_cstring_to_utf8(, e_cfg, pool));
+}
+#else
+ e = e_cfg;
+#endif
}
/* If not found yet then try general purpose environment variables. */
if (! e)
-e = getenv("VISUAL");
+{
+ status = apr_env_get((char**), "VISUAL", pool);
+ if (status || ! *e)
+{
+ e = NULL;
+}
+}
if (! e)
-e = getenv("EDITOR");
+{
+ status = apr_env_get((char**), "EDITOR", pool);
+ if (status || ! *e)
+{
+ e = NULL;
+}
+}
#ifdef SVN_CLIENT_EDITOR
/* If still not found then
svn commit: r1886040 - /subversion/branches/1.10.x-r1885983/
Author: svn-role Date: Sat Jan 30 04:00:34 2021 New Revision: 1886040 URL: http://svn.apache.org/viewvc?rev=1886040=rev Log: Remove the '1.10.x-r1885983' branch, merged in r1886039. Removed: subversion/branches/1.10.x-r1885983/
svn commit: r1886039 - in /subversion/branches/1.10.x: ./ STATUS subversion/svn/cl-conflicts.c subversion/tests/cmdline/info_tests.py
Author: svn-role
Date: Sat Jan 30 04:00:18 2021
New Revision: 1886039
URL: http://svn.apache.org/viewvc?rev=1886039=rev
Log:
Merge the 1.10.x-r1885983 branch:
* r1885983
Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
Justification:
Bugfix; 'svn info --xml' should give correct results; user complained.
Branch:
1.10.x-r1885983
Votes:
+1: hartmannathan, stsp, jcorvel
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/svn/cl-conflicts.c
subversion/branches/1.10.x/subversion/tests/cmdline/info_tests.py
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1885983
Merged /subversion/branches/issue-4869:r1885862-1885981
Merged /subversion/branches/1.10.x-r1885983:r1885986-1886038
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886039=1886038=1886039=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sat Jan 30 04:00:18 2021
@@ -48,12 +48,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1885983
- Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
- Justification:
- Bugfix; 'svn info --xml' should give correct results; user complained.
- Branch:
- 1.10.x-r1885983
- Votes:
- +1: hartmannathan, stsp, jcorvel
Modified: subversion/branches/1.10.x/subversion/svn/cl-conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/cl-conflicts.c?rev=1886039=1886038=1886039=diff
==
--- subversion/branches/1.10.x/subversion/svn/cl-conflicts.c (original)
+++ subversion/branches/1.10.x/subversion/svn/cl-conflicts.c Sat Jan 30
04:00:18 2021
@@ -452,7 +452,7 @@ append_tree_conflict_info_xml(svn_string
repos_root_url, repos_relpath, peg_rev,
node_kind, pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(_relpath,
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(_relpath,
_rev,
_kind,
conflict,
@@ -529,7 +529,7 @@ svn_cl__append_conflict_info_xml(svn_str
repos_root_url, repos_relpath,
peg_rev,
node_kind, scratch_pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(
_relpath, _rev, _kind, conflict,
scratch_pool, scratch_pool));
if (repos_root_url && repos_relpath)
@@ -576,7 +576,7 @@ svn_cl__append_conflict_info_xml(svn_str
repos_root_url, repos_relpath,
peg_rev,
node_kind, scratch_pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(
+ SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(
_relpath, _rev, _kind, conflict,
scratch_pool, scratch_pool));
if (repos_root_url && repos_relpath)
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/info_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/info_tests.py?rev=1886039=1886038=1886039=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/info_tests.py Sat Jan
30 04:00:18 2021
@@ -747,6 +747,128 @@ def info_item_failures(sbox):
sbox.ospath('A'), sbox.ospath('iota'))
+@Issue(4869)
+def info_tree_conflict_source(sbox):
+ "info --xml: verify source-left, source-right"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ B_path = os.path.join(wc_dir, 'A', 'B')
+ lambda_path = os.path.join(B_path, 'lambda')
+ alpha_path = os.path.join(B_path, 'E', 'alpha')
+ F_path = os.path.join(B_path, 'F')
+
+ B2_url = sbox.repo_url + '/A/B2'
+ B2_path = os.path.join(wc_dir, 'A', 'B2')
+ lambda2_path = os.path.join(B2_path, 'lambda')
+
+ # Rev 2 copy B to B2
+ sbox.simple_repo_copy('A/B', 'A/B2')
+ sbox.simple_update()
+
+ # Rev 3:
+ # edit A/B/lambda to test text conflict case
+ # add property to A/B/E/alpha to test property conflict case
+ # rename A/B/F to A/B/Z to test tree conflict case
+
+ svntest.main.file_write(lambda_path, 'B/lambda side of conflict')
+ sbox.si
svn commit: r1886038 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_repos/config_file.c
Author: svn-role
Date: Sat Jan 30 04:00:08 2021
New Revision: 1886038
URL: http://svn.apache.org/viewvc?rev=1886038=rev
Log:
Merge r1886019 from trunk:
* r1886019
Fix a potential NULL dereference in the config file parser.
Justification:
Missing return value check. C is hard.
Votes:
+1: stsp, hartmannathan, jcorvel
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1886019
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886038=1886037=1886038=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sat Jan 30 04:00:08 2021
@@ -49,13 +49,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1886019
- Fix a potential NULL dereference in the config file parser.
- Justification:
- Missing return value check. C is hard.
- Votes:
- +1: stsp, hartmannathan, jcorvel
-
* r1885983
Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c?rev=1886038=1886037=1886038=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c Sat Jan 30
04:00:08 2021
@@ -237,6 +237,10 @@ get_repos_config(svn_stream_t **stream,
{
/* Search for a repository in the full path. */
repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool);
+ if (repos_root_dirent == NULL)
+return svn_error_trace(handle_missing_file(stream, checksum, access,
+ url, must_exist,
+ svn_node_none));
/* Attempt to open a repository at repos_root_dirent. */
SVN_ERR(svn_repos_open3(>repos, repos_root_dirent, NULL,
svn commit: r1885965 - in /subversion/branches/1.10.x: ./ STATUS subversion/tests/cmdline/merge_tests.py
Author: svn-role
Date: Thu Jan 28 04:00:24 2021
New Revision: 1885965
URL: http://svn.apache.org/viewvc?rev=1885965=rev
Log:
Merge the r1881985 group from trunk:
* r1881985, r1882105
Follow up to r1880192: Fix an EOL issue in test on Windows.
Justification:
We should test correctly on Windows environment, too.
Depends:
r1880192
Votes:
+1: jcorvel, stsp, hartmannathan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1881985,1882105
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1885965=1885964=1885965=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jan 28 04:00:24 2021
@@ -48,12 +48,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1881985, r1882105
- Follow up to r1880192: Fix an EOL issue in test on Windows.
- Justification:
- We should test correctly on Windows environment, too.
- Depends:
- r1880192
- Votes:
- +1: jcorvel, stsp, hartmannathan
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py?rev=1885965=1885964=1885965=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py Thu Jan
28 04:00:24 2021
@@ -18669,11 +18669,18 @@ def merge_deleted_folder_with_mergeinfo_
)
# verify that mergeinfo is set/changed on A/D, A/D/G, A/D/G2.
+
+ # NOTE: When writing out multi-line prop values in svn:* props, the
+ # client converts to local encoding and local eol style.
+ # Therefore, the expected output must contain the right kind of eoln
+ # strings. That's why we use os.linesep in the tests below, not just
+ # plain '\n'.
+
expected_mergeinfo = [
('A', ['/branch_A:3-7']),
-('A/D', ['/branch_A/D:5-7\n', '/branch_B/C:1*']),
-('A/D/G', ['/branch_A/D/G:5-7\n', '/branch_B/C/G:1*']),
-('A/D/G2', ['/branch_A/D/G2:5-7\n', '/branch_B/C/G2:1*']),
+('A/D', ['/branch_A/D:5-7'+os.linesep, '/branch_B/C:1*']),
+('A/D/G', ['/branch_A/D/G:5-7'+os.linesep, '/branch_B/C/G:1*']),
+('A/D/G2', ['/branch_A/D/G2:5-7'+os.linesep, '/branch_B/C/G2:1*']),
]
for path, mergeinfo in expected_mergeinfo:
svntest.actions.check_prop('svn:mergeinfo', sbox.ospath(path),
svn commit: r1885964 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_client/merge.c subversion/tests/cmdline/merge_tests.py
Author: svn-role
Date: Thu Jan 28 04:00:18 2021
New Revision: 1885964
URL: http://svn.apache.org/viewvc?rev=1885964=rev
Log:
Merge r1880192 from trunk:
* r1880192
Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic".
Justification:
Non-deterministic merge result is bad.
Depends:
r1878997, r1879192, r1879474, r1879959 (Fix issue #4859)
Votes:
+1: julianfoad, stsp, jcorvel
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_client/merge.c
subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1880192
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1885964=1885963=1885964=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jan 28 04:00:18 2021
@@ -49,15 +49,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1880192
- Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic".
- Justification:
- Non-deterministic merge result is bad.
- Depends:
- r1878997, r1879192, r1879474, r1879959 (Fix issue #4859)
- Votes:
- +1: julianfoad, stsp, jcorvel
-
* r1881985, r1882105
Follow up to r1880192: Fix an EOL issue in test on Windows.
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_client/merge.c?rev=1885964=1885963=1885964=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_client/merge.c Thu Jan 28
04:00:18 2021
@@ -7875,18 +7875,23 @@ process_children_with_new_mergeinfo(merg
apr_pool_t *pool)
{
apr_pool_t *iterpool;
- apr_hash_index_t *hi;
+ apr_array_header_t *a;
+ int i;
if (!merge_b->paths_with_new_mergeinfo || merge_b->dry_run)
return SVN_NO_ERROR;
/* Iterate over each path with explicit mergeinfo added by the merge. */
+ /* Iterate over the paths in a parent-to-child order so that inherited
+ * mergeinfo is propagated consistently from each parent path to its
+ * children. (Issue #4862) */
+ a = svn_sort__hash(merge_b->paths_with_new_mergeinfo,
+ svn_sort_compare_items_as_paths, pool);
iterpool = svn_pool_create(pool);
- for (hi = apr_hash_first(pool, merge_b->paths_with_new_mergeinfo);
- hi;
- hi = apr_hash_next(hi))
+ for (i = 0; i < a->nelts; i++)
{
- const char *abspath_with_new_mergeinfo = apr_hash_this_key(hi);
+ svn_sort__item_t *item = _ARRAY_IDX(a, i, svn_sort__item_t);
+ const char *abspath_with_new_mergeinfo = item->key;
svn_mergeinfo_t path_inherited_mergeinfo;
svn_mergeinfo_t path_explicit_mergeinfo;
svn_client__merge_path_t *new_child;
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py?rev=1885964=1885963=1885964=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/merge_tests.py Thu Jan
28 04:00:18 2021
@@ -18639,12 +18639,12 @@ def merge_deleted_folder_with_mergeinfo_
'A/D/G2' : Item(status='A '),
})
# verify that mergeinfo is set/changed on A/D, A/D/G, A/D/G2.
- #expected_mergeinfo_output = wc.State(sbox.ospath(''), {
- # 'A' : Item(status=' U'),
- # 'A/D': Item(status=' G'),
- # 'A/D/G' : Item(status=' G'), # varies, G or U: see issue #4862
- # 'A/D/G2' : Item(status=' G'), # varies, G or U: see issue #4862
- # })
+ expected_mergeinfo_output = wc.State(sbox.ospath(''), {
+'A' : Item(status=' U'),
+'A/D': Item(status=' G'),
+'A/D/G' : Item(status=' G'),
+'A/D/G2' : Item(status=' G'),
+})
expected_status = svntest.actions.get_virginal_state(sbox.ospath('A'),
7).subtree('A')
expected_status.tweak_some(
lambda path, item: [True] if path.split('/')[0] == 'D' else [],
@@ -18658,7 +18658,7 @@ def merge_deleted_folder_with_mergeinfo_
svntest.actions.run_and_verify_merge(sbox.ospath('A'), None, None,
'^/branch_A', None,
expected_output,
- None, #expected_mergeinfo_output
+
svn commit: r1885963 - in /subversion/branches/1.10.x: ./ STATUS autogen.sh
Author: svn-role Date: Thu Jan 28 04:00:12 2021 New Revision: 1885963 URL: http://svn.apache.org/viewvc?rev=1885963=rev Log: Merge r1875726 from trunk: * r1875726 Error out if generating SWIG-related files fails in autogen.sh --release Justification: release.py didn't catch this error when 1.14.0-rc1 release was created Votes: +1: stsp, jamessan, hartmannathan Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/autogen.sh Propchange: subversion/branches/1.10.x/ -- Merged /subversion/trunk:r1875726 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1885963=1885962=1885963=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jan 28 04:00:12 2021 @@ -49,13 +49,6 @@ Veto-blocked changes: Approved changes: = - * r1875726 - Error out if generating SWIG-related files fails in autogen.sh --release - Justification: - release.py didn't catch this error when 1.14.0-rc1 release was created - Votes: - +1: stsp, jamessan, hartmannathan - * r1880192 Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic". Justification: Modified: subversion/branches/1.10.x/autogen.sh URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/autogen.sh?rev=1885963=1885962=1885963=diff == --- subversion/branches/1.10.x/autogen.sh (original) +++ subversion/branches/1.10.x/autogen.sh Thu Jan 28 04:00:12 2021 @@ -176,7 +176,7 @@ if test -n "$RELEASE_MODE"; then "$PYTHON" ./gen-make.py build.conf || gen_failed=1 # Build the SWIG-related files - make -f autogen-standalone.mk autogen-swig + make -f autogen-standalone.mk autogen-swig || gen_failed=1 # Remove the .swig_checked file rm -f .swig_checked
svn commit: r1885962 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_auth_kwallet/kwallet.cpp
Author: svn-role
Date: Thu Jan 28 04:00:07 2021
New Revision: 1885962
URL: http://svn.apache.org/viewvc?rev=1885962=rev
Log:
Merge r1875680 from trunk:
* r1875680
Construct KAboutData using QString rather than QStringLiteral
Justification:
Fixes a crash seen when using git-svn with kwallet
Votes:
+1: jamessan, stsp, hartmannathan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1875680
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1885962=1885961=1885962=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jan 28 04:00:07 2021
@@ -49,13 +49,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1875680
- Construct KAboutData using QString rather than QStringLiteral
- Justification:
- Fixes a crash seen when using git-svn with kwallet
- Votes:
- +1: jamessan, stsp, hartmannathan
-
* r1875726
Error out if generating SWIG-related files fails in autogen.sh --release
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1885962=1885961=1885962=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp
(original)
+++ subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp Thu
Jan 28 04:00:07 2021
@@ -227,10 +227,10 @@ kwallet_password_get(svn_boolean_t *done
KLocalizedString::setApplicationDomain("subversion"); /* translation domain
*/
/* componentName appears in KDE GUI prompts */
- KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
+ KAboutData aboutData(QString("subversion"),/* componentName */
i18n(get_application_name(parameters,
pool)), /* displayName */
- QStringLiteral(SVN_VER_NUMBER));
+ QString(SVN_VER_NUMBER));
KAboutData::setApplicationData(aboutData);
#else
KCmdLineArgs::init(q_argc, q_argv,
@@ -309,10 +309,10 @@ kwallet_password_set(svn_boolean_t *done
KLocalizedString::setApplicationDomain("subversion"); /* translation domain
*/
/* componentName appears in KDE GUI prompts */
- KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
+ KAboutData aboutData(QString("subversion"),/* componentName */
i18n(get_application_name(parameters,
pool)), /* displayName */
- QStringLiteral(SVN_VER_NUMBER));
+ QString(SVN_VER_NUMBER));
KAboutData::setApplicationData(aboutData);
#else
KCmdLineArgs::init(q_argc, q_argv,
svn commit: r1885934 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Jan 27 04:15:05 2021 New Revision: 1885934 URL: http://svn.apache.org/viewvc?rev=1885934=rev Log: * upcoming.part.html: Automatically regenerated Modified: subversion/site/publish/upcoming.part.html Modified: subversion/site/publish/upcoming.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1885934=1885933=1885934=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Jan 27 04:15:05 2021 @@ -390,6 +390,19 @@ Merge the https://svn.apache.or +1: stsp, futatuki +https://svn.apache.org/r1885931;>r1885931 | svn-role | 2021-01-27 04:00:18 + (Wed, 27 Jan 2021) | 10 lines + +Merge https://svn.apache.org/r1877794;>r1877794 from trunk: + + * https://svn.apache.org/r1877794;>r1877794 + Use Doxygen comment leader for comments with doxygen syntax. + Justification: + Improve $EDITORs syntax highlighting. + Votes: + +0: danielsh + +1: brane, jamessan + + Further changes currently under consideration are listed in each release line's
svn commit: r1885931 - in /subversion/branches/1.14.x: ./ STATUS subversion/include/private/svn_sorts_private.h
Author: svn-role Date: Wed Jan 27 04:00:18 2021 New Revision: 1885931 URL: http://svn.apache.org/viewvc?rev=1885931=rev Log: Merge r1877794 from trunk: * r1877794 Use Doxygen comment leader for comments with doxygen syntax. Justification: Improve $EDITOR's syntax highlighting. Votes: +0: danielsh +1: brane, jamessan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/include/private/svn_sorts_private.h Propchange: subversion/branches/1.14.x/ -- Merged /subversion/trunk:r1877794 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1885931=1885930=1885931=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Jan 27 04:00:18 2021 @@ -52,12 +52,3 @@ Veto-blocked changes: Approved changes: = - - * r1877794 - Use Doxygen comment leader for comments with doxygen syntax. - Justification: - Improve $EDITOR's syntax highlighting. - Votes: - +0: danielsh - +1: brane, jamessan - Modified: subversion/branches/1.14.x/subversion/include/private/svn_sorts_private.h URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/include/private/svn_sorts_private.h?rev=1885931=1885930=1885931=diff == --- subversion/branches/1.14.x/subversion/include/private/svn_sorts_private.h (original) +++ subversion/branches/1.14.x/subversion/include/private/svn_sorts_private.h Wed Jan 27 04:00:18 2021 @@ -80,7 +80,7 @@ svn_sort__array(apr_array_header_t *arra int (*comparison_func)(const void *, const void *)); -/* Return the lowest index at which the element @a *key should be inserted into +/** Return the lowest index at which the element @a *key should be inserted into * the array @a array, according to the ordering defined by @a compare_func. * The array must already be sorted in the ordering defined by @a compare_func. * @a compare_func is defined as for the C stdlib function bsearch(); the @@ -93,7 +93,7 @@ svn_sort__bsearch_lower_bound(const apr_ const void *key, int (*compare_func)(const void *, const void *)); -/* Find the lowest index at which the element @a *key should be inserted into +/** Find the lowest index at which the element @a *key should be inserted into * the array @a array, according to the ordering defined by @a compare_func. * The array must already be sorted in the ordering defined by @a compare_func. * @a compare_func is defined as for the C stdlib function bsearch(); the @@ -116,7 +116,7 @@ svn_sort__array_lookup(const apr_array_h int (*compare_func)(const void *, const void *)); -/* Insert a shallow copy of @a *new_element into the array @a array at the index +/** Insert a shallow copy of @a *new_element into the array @a array at the index * @a insert_index, growing the array and shuffling existing elements along to * make room. * @@ -131,7 +131,7 @@ svn_sort__array_insert2(apr_array_header int insert_index); -/* Remove @a elements_to_delete elements starting at @a delete_index from the +/** Remove @a elements_to_delete elements starting at @a delete_index from the * array @a arr. * * Raise an error if the indexes to delete extends outside the array bounds @@ -144,7 +144,7 @@ svn_sort__array_delete2(apr_array_header int delete_index, int elements_to_delete); -/* Reverse the order of elements in @a array, in place. +/** Reverse the order of elements in @a array, in place. * * @note Private. For use by Subversion's own code only. */
svn commit: r1885930 - in /subversion/branches/1.10.x: ./ NOTICE STATUS subversion/libsvn_subr/version.c
Author: svn-role
Date: Wed Jan 27 04:00:09 2021
New Revision: 1885930
URL: http://svn.apache.org/viewvc?rev=1885930=rev
Log:
Merge the r1874850 group from trunk:
* r1874850, r1885795
Update copyright year to 2020 and then to 2021.
Justification:
The future is here!
Votes:
+1: stsp, jcorvel, jamessan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/NOTICE (contents, props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_subr/version.c (contents,
props changed)
Propchange: subversion/branches/1.10.x/
--
Merged /subversion/trunk:r1874850,1885795
Modified: subversion/branches/1.10.x/NOTICE
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/NOTICE?rev=1885930=1885929=1885930=diff
==
--- subversion/branches/1.10.x/NOTICE (original)
+++ subversion/branches/1.10.x/NOTICE Wed Jan 27 04:00:09 2021
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2019 The Apache Software Foundation
+Copyright 2021 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Propchange: subversion/branches/1.10.x/NOTICE
--
Merged /subversion/trunk/NOTICE:r1874850,1885795
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1885930=1885929=1885930=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Jan 27 04:00:09 2021
@@ -82,11 +82,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1874850, r1885795
- Update copyright year to 2020 and then to 2021.
- Justification:
- The future is here!
- Votes:
- +1: stsp, jcorvel, jamessan
-
Modified: subversion/branches/1.10.x/subversion/libsvn_subr/version.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/version.c?rev=1885930=1885929=1885930=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_subr/version.c Wed Jan 27
04:00:09 2021
@@ -143,7 +143,7 @@ svn_version_extended(svn_boolean_t verbo
info->build_time = __TIME__;
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
-(pool, _("Copyright (C) 2019 The Apache Software Foundation.\n"
+(pool, _("Copyright (C) 2021 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see "
Propchange: subversion/branches/1.10.x/subversion/libsvn_subr/version.c
--
Merged /subversion/trunk/subversion/libsvn_subr/version.c:r1874850,1885795
