Author: svn-role
Date: Tue Apr 16 04:00:49 2013
New Revision: 1468301
URL: http://svn.apache.org/r1468301
Log:
Merge the r1467440 group from trunk:
* r1467440, r1467450, r1467481
Unclutter maintainer-mode stack traces.
Justification:
Code was in flux when the branch was cut. Maintainer sanity.
Votes:
+1: danielsh, stsp, brane
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/error.c
subversion/branches/1.8.x/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/1.8.x/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/1.8.x/subversion/tests/cmdline/merge_tests.py
subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1467440,1467450,1467481
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1468301&r1=1468300&r2=1468301&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Apr 16 04:00:49 2013
@@ -30,13 +30,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1467440, r1467450, r1467481
- Unclutter maintainer-mode stack traces.
- Justification:
- Code was in flux when the branch was cut. Maintainer sanity.
- Votes:
- +1: danielsh, stsp, brane
-
* r1467597
Better error message if authentication fails and -F - was used.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/error.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/error.c?rev=1468301&r1=1468300&r2=1468301&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/error.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/error.c Tue Apr 16
04:00:49 2013
@@ -454,6 +454,8 @@ svn_error_purge_tracing(svn_error_t *err
#endif /* SVN_ERR__TRACING */
}
+/* ### The logic around omitting (sic) apr_err= in maintainer mode is tightly
+ ### coupled to the current sole caller.*/
static void
print_error(svn_error_t *err, FILE *stream, const char *prefix)
{
@@ -482,8 +484,11 @@ print_error(svn_error_t *err, FILE *stre
}
{
- const char *symbolic_name = svn_error_symbolic_name(err->apr_err);
- if (symbolic_name)
+ const char *symbolic_name;
+ if (svn_error__is_tracing_link(err))
+ /* Skip it; the error code will be printed by the real link. */
+ svn_error_clear(svn_cmdline_fprintf(stream, err->pool, ",\n"));
+ else if ((symbolic_name = svn_error_symbolic_name(err->apr_err)))
svn_error_clear(svn_cmdline_fprintf(stream, err->pool,
": (apr_err=%s)\n", symbolic_name));
else
Modified:
subversion/branches/1.8.x/subversion/tests/cmdline/merge_automatic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/merge_automatic_tests.py?rev=1468301&r1=1468300&r2=1468301&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/merge_automatic_tests.py
(original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/merge_automatic_tests.py
Tue Apr 16 04:00:49 2013
@@ -837,7 +837,7 @@ def subtree_to_and_fro(sbox):
"|( A_COPY\n)"
"|( Missing ranges: /A:5\n)"
"|(\n)"
- "|(.*apr_err.*)", # In case of debug build
+ "|" + svntest.main.stack_trace_regexp,
None,
True) # Match *all* lines of stdout
Modified:
subversion/branches/1.8.x/subversion/tests/cmdline/merge_reintegrate_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1468301&r1=1468300&r2=1468301&view=diff
==============================================================================
---
subversion/branches/1.8.x/subversion/tests/cmdline/merge_reintegrate_tests.py
(original)
+++
subversion/branches/1.8.x/subversion/tests/cmdline/merge_reintegrate_tests.py
Tue Apr 16 04:00:49 2013
@@ -63,7 +63,7 @@ def run_reintegrate_expect_error(src_url
unless stdout and stderr both match and the exit code is non-zero.
Every line of stderr must match the regex EXPECTED_STDERR.
"""
- expected_stderr += "|(.*apr_err.*)" # In case of debug build
+ expected_stderr += "|" + svntest.main.stack_trace_regexp
# The actions.run_and_verify_* methods are happy if one line of the error
# matches the regex, but we want to check that every line matches.
Modified: subversion/branches/1.8.x/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/merge_tests.py?rev=1468301&r1=1468300&r2=1468301&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/merge_tests.py Tue Apr
16 04:00:49 2013
@@ -16268,7 +16268,7 @@ def merge_with_os_deleted_subtrees(sbox)
err_re = "svn: E195016: Merge tracking not allowed with missing subtrees; "
+ \
"try restoring these items first:" + \
"|(\n)" + \
- "|(.*apr_err.*\n)" # In case of debug build
+ "|" + svntest.main.stack_trace_regexp
# Case 1: Infinite depth merge into infinite depth WC target.
# Every missing subtree under the target should be reported as missing.
Modified: subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py?rev=1468301&r1=1468300&r2=1468301&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py
(original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/svntest/main.py Tue Apr
16 04:00:49 2013
@@ -135,6 +135,8 @@ wc_passwd = 'rayjandom'
# scenarios
wc_author2 = 'jconstant' # use the same password as wc_author
+stack_trace_regexp = r'(?:.*subversion[\\//].*\.c:[0-9]*,$|.*apr_err=.*)'
+
# Set C locale for command line programs
os.environ['LC_ALL'] = 'C'
