Author: rinrab
Date: Mon Nov 25 12:32:08 2024
New Revision: 1922076
URL: http://svn.apache.org/viewvc?rev=1922076&view=rev
Log:
On the 'apply-processor' branch: Catchup from trunk@1922075.
Added:
subversion/branches/apply-processor/.clang-format
- copied unchanged from r1922075, subversion/trunk/.clang-format
Modified:
subversion/branches/apply-processor/ (props changed)
subversion/branches/apply-processor/subversion/tests/cmdline/svntest/verify.py
subversion/branches/apply-processor/tools/dist/backport_tests.py
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_accept.dump
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branch_with_original_revision.dump
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branches.dump
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_indented_entry.dump
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_logsummary_colon.dump
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_multirevisions.dump
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_two_approveds.dump
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_unicode_entry.dump
Propchange: subversion/branches/apply-processor/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1922051-1922075
Modified:
subversion/branches/apply-processor/subversion/tests/cmdline/svntest/verify.py
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/tests/cmdline/svntest/verify.py?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/subversion/tests/cmdline/svntest/verify.py
(original)
+++
subversion/branches/apply-processor/subversion/tests/cmdline/svntest/verify.py
Mon Nov 25 12:32:08 2024
@@ -852,7 +852,8 @@ def compare_dump_files(label_expected, l
print('DIFF of raw dumpfiles (including expected differences)')
print('--- ' + (label_expected or 'expected'))
print('+++ ' + (label_actual or 'actual'))
- print(''.join(ndiff([line.decode('utf-8') for line in expected],
[line.decode('utf-8') for line in actual])))
+ print(''.join(ndiff([repr(line) for line in expected],
+ [repr(line) for line in actual])))
raise svntest.Failure('DIFF of parsed dumpfiles (ignoring expected
differences)\n'
+ '\n'.join(ndiff(
pprint.pformat(parsed_expected).splitlines(),
Modified: subversion/branches/apply-processor/tools/dist/backport_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests.py?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
--- subversion/branches/apply-processor/tools/dist/backport_tests.py (original)
+++ subversion/branches/apply-processor/tools/dist/backport_tests.py Mon Nov 25
12:32:08 2024
@@ -223,14 +223,23 @@ def verify_backport(sbox, expected_dump_
# There is no expected dump file.
return
- # Remove some SVNSync-specific housekeeping properties from the
- # mirror repository in preparation for the comparison dump.
+ # Prepare for dump comparison
+ # We will run this over file://, let's set a known author: by default it
+ # would be the developer's OS username, since svn(1) as executed by this
+ # script doesn't use the _with_auth() codepath.
+ # We also need to ignore the date, since it will be based on the date the
+ # test is executed.
svntest.actions.enable_revprop_changes(sbox.repo_dir)
for revnum in range(0, 1+int(sbox.youngest())):
svntest.actions.run_and_verify_svnadmin([], [],
"delrevprop", "-r", revnum, sbox.repo_dir, "svn:date")
+ # Assume r1:HEAD have svn:author set, and r0 hasn't
+ if revnum > 0:
+ svntest.actions.run_and_verify_svn([], [],
+ "propset", "--revprop", "-r", revnum, "-q", "svn:author", "jrandom",
+ sbox.wc_dir)
- # Create a dump file from the mirror repository.
+ # Create a dump file from the repository.
dest_dump = open(expected_dump_file, 'rb').readlines()
svntest.actions.run_and_verify_svnadmin(None, [],
'setuuid', '--', sbox.repo_dir, uuid)
Modified:
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_accept.dump
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_accept.dump?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_accept.dump
(original)
+++
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_accept.dump
Mon Nov 25 12:32:08 2024
@@ -480,13 +480,13 @@ Approved changes:
Revision-number: 8
-Prop-content-length: 206
-Content-length: 206
+Prop-content-length: 207
+Content-length: 207
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 150
Modified:
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branch_with_original_revision.dump
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branch_with_original_revision.dump?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branch_with_original_revision.dump
(original)
+++
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branch_with_original_revision.dump
Mon Nov 25 12:32:08 2024
@@ -570,13 +570,13 @@ Approved changes:
Revision-number: 11
-Prop-content-length: 150
-Content-length: 150
+Prop-content-length: 151
+Content-length: 151
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 95
@@ -653,13 +653,13 @@ resolved
Revision-number: 12
-Prop-content-length: 93
-Content-length: 93
+Prop-content-length: 94
+Content-length: 94
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 38
Modified:
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branches.dump
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branches.dump?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branches.dump
(original)
+++
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_branches.dump
Mon Nov 25 12:32:08 2024
@@ -547,13 +547,13 @@ Approved changes:
Revision-number: 10
-Prop-content-length: 146
-Content-length: 146
+Prop-content-length: 147
+Content-length: 147
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 91
@@ -623,13 +623,13 @@ resolved
Revision-number: 11
-Prop-content-length: 93
-Content-length: 93
+Prop-content-length: 94
+Content-length: 94
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 38
Modified:
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_indented_entry.dump
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_indented_entry.dump?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_indented_entry.dump
(original)
+++
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_indented_entry.dump
Mon Nov 25 12:32:08 2024
@@ -453,13 +453,13 @@ Approved changes:
Revision-number: 7
-Prop-content-length: 128
-Content-length: 128
+Prop-content-length: 129
+Content-length: 129
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 73
Modified:
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_logsummary_colon.dump
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_logsummary_colon.dump?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_logsummary_colon.dump
(original)
+++
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_logsummary_colon.dump
Mon Nov 25 12:32:08 2024
@@ -453,13 +453,13 @@ Approved changes:
Revision-number: 7
-Prop-content-length: 135
-Content-length: 135
+Prop-content-length: 136
+Content-length: 136
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 80
Modified:
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_multirevisions.dump
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_multirevisions.dump?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_multirevisions.dump
(original)
+++
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_multirevisions.dump
Mon Nov 25 12:32:08 2024
@@ -453,13 +453,13 @@ Approved changes:
Revision-number: 7
-Prop-content-length: 146
-Content-length: 146
+Prop-content-length: 147
+Content-length: 147
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 91
Modified:
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_two_approveds.dump
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_two_approveds.dump?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_two_approveds.dump
(original)
+++
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_two_approveds.dump
Mon Nov 25 12:32:08 2024
@@ -458,13 +458,13 @@ Approved changes:
Revision-number: 7
-Prop-content-length: 132
-Content-length: 132
+Prop-content-length: 133
+Content-length: 133
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 77
@@ -531,13 +531,13 @@ First change
Revision-number: 8
-Prop-content-length: 132
-Content-length: 132
+Prop-content-length: 133
+Content-length: 133
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 77
@@ -749,13 +749,13 @@ Approved changes:
Revision-number: 12
-Prop-content-length: 132
-Content-length: 132
+Prop-content-length: 133
+Content-length: 133
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 77
@@ -827,13 +827,13 @@ First change
Revision-number: 13
-Prop-content-length: 132
-Content-length: 132
+Prop-content-length: 133
+Content-length: 133
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 77
@@ -900,13 +900,13 @@ Approved changes:
Revision-number: 14
-Prop-content-length: 134
-Content-length: 134
+Prop-content-length: 135
+Content-length: 135
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 79
Modified:
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_unicode_entry.dump
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_unicode_entry.dump?rev=1922076&r1=1922075&r2=1922076&view=diff
==============================================================================
---
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_unicode_entry.dump
(original)
+++
subversion/branches/apply-processor/tools/dist/backport_tests_data/backport_unicode_entry.dump
Mon Nov 25 12:32:08 2024
@@ -454,13 +454,13 @@ Approved changes:
Revision-number: 7
-Prop-content-length: 153
-Content-length: 153
+Prop-content-length: 154
+Content-length: 154
K 10
svn:author
-V 6
-daniel
+V 7
+jrandom
K 7
svn:log
V 98
