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&view=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&r1=1886045&r2=1886046&view=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 shouldn't 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&view=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&r1=1886044&r2=1886045&view=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&r1=1886044&r2=1886045&view=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/subversion/branches/1.14.x/subversion/bindings/javahl/native/JNIUtil.h?rev=18860
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&view=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&r1=1886040&r2=1886041&view=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&r1=1886040&r2=1886041&view=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(&file_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(&tmpfile_native, tmpfile_name, pool); + err = svn_utf_cstring_from_utf8(&tmpfile_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&view=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&r1=1886043&r2=1886044&view=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&r1=1886043&r2=1886044&view=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(&repos_relpath, + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(&repos_relpath, &peg_rev, &node_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( &repos_relpath, &peg_rev, &node_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( &repos_relpath, &peg_rev, &node_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&r1=1886043&r2=1886044&view=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
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&view=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&r1=1886042&r2=1886043&view=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&r1=1886042&r2=1886043&view=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(&access->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&view=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&r1=1886041&r2=1886042&view=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&r1=1886041&r2=1886042&view=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(&e, 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 **)&e, "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, &e, SVN_CONFIG_SECTION_HELPERS, + svn_config_get(cfg, &e_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, 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**)&e, "VISUAL", pool); + if (status || ! *e) +{ + e = NULL; +} +} if (! e) -e = getenv("EDITOR"); +{ + status = apr_env_get((char**)&e, "EDITOR", pool); + if (status || ! *e) +{ + e = NULL; +} +} #ifdef SVN_CLIENT_EDITOR /* If still not found then fall back on the hard-code
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&view=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&view=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&r1=1886038&r2=1886039&view=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&r1=1886038&r2=1886039&view=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(&repos_relpath, + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(&repos_relpath, &peg_rev, &node_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( &repos_relpath, &peg_rev, &node_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( &repos_relpath, &peg_rev, &node_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&r1=1886038&r2=1886039&view=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
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&view=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&r1=1886037&r2=1886038&view=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&r1=1886037&r2=1886038&view=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(&access->repos, repos_root_dirent, NULL,
svn commit: r1886035 - /subversion/branches/1.14.x/STATUS
Author: amiloslavskiy Date: Fri Jan 29 20:27:55 2021 New Revision: 1886035 URL: http://svn.apache.org/viewvc?rev=1886035&view=rev Log: * 1.14.x/STATUS: Vote for r1886029, approving. Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886035&r1=1886034&r2=1886035&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 20:27:55 2021 @@ -50,13 +50,6 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * r1886029 - Fix several crashes and JNI warnings in javahl TunnelAgent. - Justification: - JavaHL shouldn't crash. - Votes: - +1: jcorvel - Veto-blocked changes: = @@ -104,3 +97,10 @@ Approved changes: 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: + JavaHL shouldn't crash. + Votes: + +1: jcorvel, amiloslavskiy
svn commit: r1886034 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Fri Jan 29 20:12:33 2021 New Revision: 1886034 URL: http://svn.apache.org/viewvc?rev=1886034&view=rev Log: * 1.10.x/STATUS: Vote for r1885983, approving. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886034&r1=1886033&r2=1886034&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 29 20:12:33 2021 @@ -43,15 +43,6 @@ Candidate changes: Votes: +1: stsp, jcorvel - * 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 - Veto-blocked changes: = @@ -64,3 +55,12 @@ Approved changes: 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: + Bugfix; 'svn info --xml' should give correct results; user complained. + Branch: + 1.10.x-r1885983 + Votes: + +1: hartmannathan, stsp, jcorvel
svn commit: r1886033 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Fri Jan 29 20:02:50 2021 New Revision: 1886033 URL: http://svn.apache.org/viewvc?rev=1886033&view=rev Log: * 1.14.x/STATUS: Vote for r1885983, approving. Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886033&r1=1886032&r2=1886033&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 20:02:50 2021 @@ -50,13 +50,6 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * 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 - * r1886029 Fix several crashes and JNI warnings in javahl TunnelAgent. Justification: @@ -104,3 +97,10 @@ Approved changes: 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: + Bugfix; 'svn info --xml' should give correct results; user complained. + Votes: + +1: hartmannathan, stsp, jcorvel
svn commit: r1886031 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Fri Jan 29 19:41:32 2021 New Revision: 1886031 URL: http://svn.apache.org/viewvc?rev=1886031&view=rev Log: * 1.14.x/STATUS: Nominate r1886029 (JavaHL fixes). Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886031&r1=1886030&r2=1886031&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 19:41:32 2021 @@ -57,6 +57,13 @@ Candidate changes: Votes: +1: hartmannathan, stsp + * r1886029 + Fix several crashes and JNI warnings in javahl TunnelAgent. + Justification: + JavaHL shouldn't crash. + Votes: + +1: jcorvel + Veto-blocked changes: =
svn commit: r1886030 - /subversion/branches/javahl-1.14-fixes/
Author: jcorvel Date: Fri Jan 29 19:27:01 2021 New Revision: 1886030 URL: http://svn.apache.org/viewvc?rev=1886030&view=rev Log: Remove javahl-1.14-fixes branch (merged to trunk in r1886029). Removed: subversion/branches/javahl-1.14-fixes/
svn commit: r1886029 - in /subversion/trunk: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ subversion/bindings/javahl/tests/org/apache/subvers
Author: jcorvel Date: Fri Jan 29 19:24:36 2021 New Revision: 1886029 URL: http://svn.apache.org/viewvc?rev=1886029&view=rev Log: Merge the javahl-1.14-fixes branch to trunk. Fixes several crashes in javahl TunnelAgent. Modified: subversion/trunk/ (props changed) subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Propchange: subversion/trunk/ -- Merged /subversion/branches/javahl-1.14-fixes:r1882126-1886028 Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1886029&r1=1886028&r2=1886029&view=diff == --- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original) +++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Fri Jan 29 19:24:36 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/trunk/subversion/bindings/javahl/native/JNIUtil.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h?rev=1886029&r1=1886028&r2=1886029&view=diff == --- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h (original) +++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h Fri Jan 29 19:24:36 2021 @@ -330,4 +330,37 @@ class JNIUtil } \ } while(0) +/** + * If there's an exception pending, temporarily stash it away, then + * re-throw again in destructor. The goal is to allow some Java calls + * to be made despite a pending exception. For example, doing some + * necessary cleanup. + */ +class StashException +{ + public: + /* + * Works like stashException(). + */ + StashException(JNIEnv* env); + + /** + * If there's an exception stashed, re-throws it. + */ + ~StashException(); + + /** + * Check for a pending exception. + * If present, stash it away until this clas
svn commit: r1886028 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Fri Jan 29 18:51:42 2021 New Revision: 1886028 URL: http://svn.apache.org/viewvc?rev=1886028&view=rev Log: * 1.10.x/STATUS: Vote for r1886019, approving. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886028&r1=1886027&r2=1886028&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 29 18:51:42 2021 @@ -52,15 +52,15 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * r1886019 - Fix a potential NULL dereference in the config file parser. - Justification: - Missing return value check. C is hard. - Votes: - +1: stsp, hartmannathan - 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
svn commit: r1886027 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Fri Jan 29 18:45:38 2021 New Revision: 1886027 URL: http://svn.apache.org/viewvc?rev=1886027&view=rev Log: * 1.14.x/STATUS: Vote for r1886019, approving. Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886027&r1=1886026&r2=1886027&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 18:45:38 2021 @@ -57,13 +57,6 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * r1886019 - Fix a potential NULL dereference in the config file parser. - Justification: - Missing return value check. C is hard. - Votes: - +1: stsp, hartmannathan - Veto-blocked changes: = @@ -97,3 +90,10 @@ Approved changes: r1882234 Votes: +1: jcorvel, futatuki, stsp + + * r1886019 + Fix a potential NULL dereference in the config file parser. + Justification: + Missing return value check. C is hard. + Votes: + +1: stsp, hartmannathan, jcorvel
svn propchange: r1885997 - svn:log
Author: kfogel Revision: 1885997 Modified property: svn:log Modified: svn:log at Fri Jan 29 18:04:40 2021 -- --- svn:log (original) +++ svn:log Fri Jan 29 18:04:40 2021 @@ -1,7 +1,7 @@ Distinguish between regular properties and revprops in tmpfile name. * subversion/svn/propedit-cmd.c - (svn_cl__propedit): In the revprop case, create a tmpfile name that + (svn_cl__propedit): In the revprop case, use a tmpfile name that indicates that a revprop is being edited and on which revision. * subversion/tests/cmdline/prop_tests.py
svn commit: r1886025 - /subversion/branches/1.14.x/STATUS
Author: hartmannathan Date: Fri Jan 29 17:40:23 2021 New Revision: 1886025 URL: http://svn.apache.org/viewvc?rev=1886025&view=rev Log: * 1.14.x/STATUS: Vote for r1886019 Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886025&r1=1886024&r2=1886025&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 17:40:23 2021 @@ -62,7 +62,7 @@ Candidate changes: Justification: Missing return value check. C is hard. Votes: - +1: stsp + +1: stsp, hartmannathan Veto-blocked changes: =
svn commit: r1886024 - /subversion/branches/1.10.x/STATUS
Author: hartmannathan Date: Fri Jan 29 17:37:09 2021 New Revision: 1886024 URL: http://svn.apache.org/viewvc?rev=1886024&view=rev Log: * 1.10.x/STATUS: Vote for r1886019 Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886024&r1=1886023&r2=1886024&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 29 17:37:09 2021 @@ -57,7 +57,7 @@ Candidate changes: Justification: Missing return value check. C is hard. Votes: - +1: stsp + +1: stsp, hartmannathan Veto-blocked changes: =
svn commit: r1886021 - /subversion/branches/1.10.x/STATUS
Author: stsp Date: Fri Jan 29 13:22:08 2021 New Revision: 1886021 URL: http://svn.apache.org/viewvc?rev=1886021&view=rev Log: * STATUS (1.10.x): Nominate r1886019. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886021&r1=1886020&r2=1886021&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 29 13:22:08 2021 @@ -52,6 +52,13 @@ Candidate changes: Votes: +1: hartmannathan, stsp + * r1886019 + Fix a potential NULL dereference in the config file parser. + Justification: + Missing return value check. C is hard. + Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1886020 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Fri Jan 29 13:21:42 2021 New Revision: 1886020 URL: http://svn.apache.org/viewvc?rev=1886020&view=rev Log: * STATUS: Nominate r1886019. Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886020&r1=1886019&r2=1886020&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 13:21:42 2021 @@ -57,6 +57,13 @@ Candidate changes: Votes: +1: hartmannathan, stsp + * r1886019 + Fix a potential NULL dereference in the config file parser. + Justification: + Missing return value check. C is hard. + Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1886019 - /subversion/trunk/subversion/libsvn_repos/config_file.c
Author: stsp Date: Fri Jan 29 13:17:15 2021 New Revision: 1886019 URL: http://svn.apache.org/viewvc?rev=1886019&view=rev Log: Fix a potential NULL dereference in the config file parser. * subversion/libsvn_repos/config_file.c (get_repos_config): svn_repos_find_root_path() may return NULL. Check the return value accordingly. Modified: subversion/trunk/subversion/libsvn_repos/config_file.c Modified: subversion/trunk/subversion/libsvn_repos/config_file.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/config_file.c?rev=1886019&r1=1886018&r2=1886019&view=diff == --- subversion/trunk/subversion/libsvn_repos/config_file.c (original) +++ subversion/trunk/subversion/libsvn_repos/config_file.c Fri Jan 29 13:17:15 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(&access->repos, repos_root_dirent, NULL,
svn commit: r1886018 - /subversion/branches/1.10.x/CHANGES
Author: stsp Date: Fri Jan 29 12:45:09 2021 New Revision: 1886018 URL: http://svn.apache.org/viewvc?rev=1886018&view=rev Log: * CHANGES (1.10.x): Merge outstanding updates from trunk. Modified: subversion/branches/1.10.x/CHANGES (contents, props changed) Modified: subversion/branches/1.10.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/CHANGES?rev=1886018&r1=1886017&r2=1886018&view=diff == --- subversion/branches/1.10.x/CHANGES (original) +++ subversion/branches/1.10.x/CHANGES Fri Jan 29 12:45:09 2021 @@ -5,11 +5,14 @@ # https://subversion.apache.org/issue- Version 1.10.7 -(?? ??? 2021, from /branches/1.10.x) +(10 Feb 2021, from /branches/1.10.x) User-visible changes: - Client-side bugfixes: * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440) * Fix invalid SQL quoting in working copy upgrade system (r1879198) +* Fix non-deterministic generation of mergeinfo (issue #4862) +* Fix a crash seen when using git-svn with kwallet (r1875680) +* Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) @@ -20,6 +23,7 @@ Version 1.10.7 Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) +* Fix an EOL issue in tests on Windows (r1881985 et al) Version 1.10.6 (24 Jul 2019, from /branches/1.10.x) Propchange: subversion/branches/1.10.x/CHANGES -- Merged /subversion/trunk/CHANGES:r1885106-1886016
svn commit: r1886016 - /subversion/branches/1.14.x/CHANGES
Author: stsp Date: Fri Jan 29 12:43:35 2021 New Revision: 1886016 URL: http://svn.apache.org/viewvc?rev=1886016&view=rev Log: * CHANGES: Merge outstanding changes from trunk. Modified: subversion/branches/1.14.x/CHANGES (contents, props changed) Modified: subversion/branches/1.14.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/CHANGES?rev=1886016&r1=1886015&r2=1886016&view=diff == --- subversion/branches/1.14.x/CHANGES (original) +++ subversion/branches/1.14.x/CHANGES Fri Jan 29 12:43:35 2021 @@ -5,7 +5,7 @@ # https://subversion.apache.org/issue- Version 1.14.1 -(?? ??? 2021, from /branches/1.14.x) +(10 Feb 2021, from /branches/1.14.x) User-visible changes: - Client-side improvements and bugfixes: * Fix non-deterministic generation of mergeinfo (issue #4862) @@ -19,6 +19,7 @@ Version 1.14.1 * Fix authz doesn't combine global and repository rules (issue #4762) * Make the hot-backup.py script work with Python 3 (r1878855, r1878859) * Fix an uninitialized read in FSFS (r1880374) +* Make mailer.py work properly with Python 3 (r1884427 et al) Developer-visible changes: - General: @@ -29,6 +30,7 @@ Version 1.14.1 * Make gen-make.py --debug work with Python 3 (r1876906) * Make test suite run correctly with Python 3 on Windows (r1876707 et al) * Fix compilation errors with Visual Studio 2008 (r1877259) +* Use Doxygen comment leader for comments with doxygen syntax (r1877794) - Bindings: * Fix win-tests.py to load Python 3 bindings with debug config (r1884642) * Fix C4204 errors building swig-py with Python 3.9 on Windows (r1883570) @@ -38,6 +40,7 @@ Version 1.14.1 * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) * autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413) * Avoid version check for Python if --without-swig is used (r1876662) +* siwg-py: Fix a syntax error for Python 3.6 and later (r1885112) Version 1.14.0 (27 May 2020, from /branches/1.14.x) @@ -258,11 +261,14 @@ http://svn.apache.org/repos/asf/subversi Version 1.10.7 -(?? ??? 2021, from /branches/1.10.x) +(10 Feb 2021, from /branches/1.10.x) User-visible changes: - Client-side bugfixes: * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440) * Fix invalid SQL quoting in working copy upgrade system (r1879198) +* Fix non-deterministic generation of mergeinfo (issue #4862) +* Fix a crash seen when using git-svn with kwallet (r1875680) +* Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) @@ -273,6 +279,7 @@ Version 1.10.7 Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) +* Fix an EOL issue in tests on Windows (r1881985 et al) Version 1.10.6 (24 Jul 2019, from /branches/1.10.x) Propchange: subversion/branches/1.14.x/CHANGES -- Merged /subversion/trunk/CHANGES:r1885105-1886015
svn commit: r1886014 - /subversion/trunk/CHANGES
Author: stsp Date: Fri Jan 29 12:42:47 2021 New Revision: 1886014 URL: http://svn.apache.org/viewvc?rev=1886014&view=rev Log: * CHANGES: Add changes recently merged to 1.14.x and 1.10.x Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1886014&r1=1886013&r2=1886014&view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Fri Jan 29 12:42:47 2021 @@ -23,6 +23,7 @@ Version 1.14.1 * Fix authz doesn't combine global and repository rules (issue #4762) * Make the hot-backup.py script work with Python 3 (r1878855, r1878859) * Fix an uninitialized read in FSFS (r1880374) +* Make mailer.py work properly with Python 3 (r1884427 et al) Developer-visible changes: - General: @@ -33,6 +34,7 @@ Version 1.14.1 * Make gen-make.py --debug work with Python 3 (r1876906) * Make test suite run correctly with Python 3 on Windows (r1876707 et al) * Fix compilation errors with Visual Studio 2008 (r1877259) +* Use Doxygen comment leader for comments with doxygen syntax (r1877794) - Bindings: * Fix win-tests.py to load Python 3 bindings with debug config (r1884642) * Fix C4204 errors building swig-py with Python 3.9 on Windows (r1883570) @@ -42,6 +44,7 @@ Version 1.14.1 * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) * autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413) * Avoid version check for Python if --without-swig is used (r1876662) +* siwg-py: Fix a syntax error for Python 3.6 and later (r1885112) Version 1.14.0 (27 May 2020, from /branches/1.14.x) @@ -267,6 +270,9 @@ Version 1.10.7 - Client-side bugfixes: * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440) * Fix invalid SQL quoting in working copy upgrade system (r1879198) +* Fix non-deterministic generation of mergeinfo (issue #4862) +* Fix a crash seen when using git-svn with kwallet (r1875680) +* Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) @@ -277,6 +283,7 @@ Version 1.10.7 Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) +* Fix an EOL issue in tests on Windows (r1881985 et al) Version 1.10.6 (24 Jul 2019, from /branches/1.10.x)
svn commit: r1886013 - /subversion/trunk/CHANGES
Author: stsp Date: Fri Jan 29 12:35:25 2021 New Revision: 1886013 URL: http://svn.apache.org/viewvc?rev=1886013&view=rev Log: * CHANGES: Update projected release date for 1.14.1 and 1.10.17. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1886013&r1=1886012&r2=1886013&view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Fri Jan 29 12:35:25 2021 @@ -9,7 +9,7 @@ Version 1.15.0 https://svn.apache.org/repos/asf/subversion/tags/1.15.0 Version 1.14.1 -(?? ??? 2021, from /branches/1.14.x) +(10 Feb 2021, from /branches/1.14.x) User-visible changes: - Client-side improvements and bugfixes: * Fix non-deterministic generation of mergeinfo (issue #4862) @@ -262,7 +262,7 @@ http://svn.apache.org/repos/asf/subversi Version 1.10.7 -(?? ??? 2021, from /branches/1.10.x) +(10 Feb 2021, from /branches/1.10.x) User-visible changes: - Client-side bugfixes: * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440)
svn commit: r1886012 - /subversion/branches/1.10.x/STATUS
Author: stsp Date: Fri Jan 29 12:17:22 2021 New Revision: 1886012 URL: http://svn.apache.org/viewvc?rev=1886012&view=rev Log: * STATUS (1.10.x): Vote for r1885983. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886012&r1=1886011&r2=1886012&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 29 12:17:22 2021 @@ -50,7 +50,7 @@ Candidate changes: Branch: 1.10.x-r1885983 Votes: - +1: hartmannathan + +1: hartmannathan, stsp Veto-blocked changes: =
svn commit: r1886011 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Fri Jan 29 11:37:05 2021 New Revision: 1886011 URL: http://svn.apache.org/viewvc?rev=1886011&view=rev Log: * STATUS: Vote for r1882234 and r1885953, approving. Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886011&r1=1886010&r2=1886011&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 11:37:05 2021 @@ -50,16 +50,6 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * 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 - * r1885983 Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict Justification: @@ -67,13 +57,6 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * 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 - Veto-blocked changes: = @@ -90,3 +73,20 @@ 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: + Invoking editor with special character or spaces in path is broken + on Windows. + Depends: + r1882234 + Votes: + +1: jcorvel, futatuki, stsp
svn commit: r1886010 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Fri Jan 29 11:22:16 2021 New Revision: 1886010 URL: http://svn.apache.org/viewvc?rev=1886010&view=rev Log: * STATUS: Vote for r1881534 and r1885983. Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886010&r1=1886009&r2=1886010&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 11:22:16 2021 @@ -48,7 +48,7 @@ Candidate changes: Branch: 1.14.x-r1881534-no-crlf Votes: - +1: hartmannathan + +1: hartmannathan, stsp * r1885953 Fix file name encoding and quoting when invoking editor on Windows. @@ -65,7 +65,7 @@ Candidate changes: Justification: Bugfix; 'svn info --xml' should give correct results; user complained. Votes: - +1: hartmannathan + +1: hartmannathan, stsp * r1882234 Fix file name to edit from utf8 to local style.