svn commit: r1850267 - /subversion/site/staging/docs/release-notes/index.html
Author: danielsh Date: Thu Jan 3 20:33:09 2019 New Revision: 1850267 URL: http://svn.apache.org/viewvc?rev=1850267&view=rev Log: [in staging] * docs/release-notes/index.html (#upcoming-patch-release): Add the merges since 1.11.0 (currently, a rough sketch). Modified: subversion/site/staging/docs/release-notes/index.html Modified: subversion/site/staging/docs/release-notes/index.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/index.html?rev=1850267&r1=1850266&r2=1850267&view=diff == --- subversion/site/staging/docs/release-notes/index.html (original) +++ subversion/site/staging/docs/release-notes/index.html Thu Jan 3 20:33:09 2019 @@ -71,6 +71,22 @@ official support status for the various For a detailed history of every release, please see release history. + +Coming up in the next patch release + ¶ + + +Write something explaining these may be reverted (but probably won't be), that the list may different between 1.11.next and 1.10.next, and that more changes besides these may be added + +Link to STATUS + +The generating script hardcodes 1.11.0; make it find the last patch release by itself. + + + + +
svn commit: r1850264 - /subversion/site/tools/escape.py
Author: danielsh
Date: Thu Jan 3 20:13:15 2019
New Revision: 1850264
URL: http://svn.apache.org/viewvc?rev=1850264&view=rev
Log:
* tools/escape.py: Annotate the generated output as such.
Modified:
subversion/site/tools/escape.py
Modified: subversion/site/tools/escape.py
URL:
http://svn.apache.org/viewvc/subversion/site/tools/escape.py?rev=1850264&r1=1850263&r2=1850264&view=diff
==
--- subversion/site/tools/escape.py (original)
+++ subversion/site/tools/escape.py Thu Jan 3 20:13:15 2019
@@ -9,6 +9,7 @@ import re
revision_numbers = re.compile(r'r(\d+)')
issue_references = re.compile(r'((?:SVN-|issue [#]?)(\d+))')
+print("")
for line in fileinput.input():
line = html.escape(line)
line = revision_numbers.sub(r'https://svn.apache.org/r\1";>r\1', line)
svn commit: r1850261 - in /subversion/site/tools: escape.py upcoming.py
Author: danielsh
Date: Thu Jan 3 20:03:24 2019
New Revision: 1850261
URL: http://svn.apache.org/viewvc?rev=1850261&view=rev
Log:
* tools/escape.py,
* tools/upcoming.py: New scripts, to be used in generating 'svn log' filtered
to show merges only. See dev@ thread:
.
https://svn.haxx.se/dev/archive-2019-01/0010.shtml
Subject: Display outstanding backported fixes for each release?
Added:
subversion/site/tools/escape.py (with props)
subversion/site/tools/upcoming.py (with props)
Added: subversion/site/tools/escape.py
URL:
http://svn.apache.org/viewvc/subversion/site/tools/escape.py?rev=1850261&view=auto
==
--- subversion/site/tools/escape.py (added)
+++ subversion/site/tools/escape.py Thu Jan 3 20:03:24 2019
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+"""HTML-escape and linkify"""
+
+import fileinput
+import html
+import re
+
+revision_numbers = re.compile(r'r(\d+)')
+issue_references = re.compile(r'((?:SVN-|issue [#]?)(\d+))')
+
+for line in fileinput.input():
+line = html.escape(line)
+line = revision_numbers.sub(r'https://svn.apache.org/r\1";>r\1', line)
+line = issue_references.sub(r'\1', line)
+print(line, end='')
Propchange: subversion/site/tools/escape.py
--
svn:executable = *
Added: subversion/site/tools/upcoming.py
URL:
http://svn.apache.org/viewvc/subversion/site/tools/upcoming.py?rev=1850261&view=auto
==
--- subversion/site/tools/upcoming.py (added)
+++ subversion/site/tools/upcoming.py Thu Jan 3 20:03:24 2019
@@ -0,0 +1,64 @@
+#! /usr/bin/env python3
+
+"""
+WIP - INCOMPLETE
+
+Generate 'svn log' output since the last tag to HEAD of the release branch,
+filtering all but merge commits.
+"""
+
+import datetime
+import os
+import re
+import subprocess
+import sys
+import tempfile
+
+import xml.etree.ElementTree as ET
+
+SINCE = '1.11.0'
+SVN = os.getenv('SVN', 'svn')
+LOG_SEPARATOR_LINE = ('-' * 72) + '\n'
+
+def get_copyfrom_revision_of_tag(version_number):
+"""Given a version number, return the copyfrom revision of that release's
tag."""
+assert version_number == SINCE
+# TODO: parse and return `svn log -r0:HEAD --limit=1 --stop-on-copy
^/subversion/tags/1.11.0 -vq`
+return 1845131
+
+def get_merges_for_range(start, end):
+"""Return an array of revision numbers in the range -r START:END that are
+merges. START must be an integer; END need not be."""
+
+cache = []
+revisions = \
+subprocess.check_output(
+[SVN, 'log', '--xml', '-v', '-r', str(start) + ":" + str(end)],
+).decode()
+log_xml = ET.fromstring(revisions)
+
+relative_url = subprocess.check_output([SVN, 'info', '--show-item',
'relative-url']).decode().rstrip('\n')
+
+for logentry in log_xml.findall('./logentry'):
+is_merge = relative_url[1:] in (path.text for path in
logentry.findall('.//path'))
+if is_merge:
+yield logentry
+
+def main():
+for logentry in get_merges_for_range(get_copyfrom_revision_of_tag(SINCE) +
1, "HEAD") :
+f = lambda s: logentry.findall('./' + s)[0].text
+f.__doc__ = """Get the contents of the first child tag whose name is
given as an argument."""
+print(LOG_SEPARATOR_LINE, end='')
+print("r%(revision)s | %(author)s | %(date)s | %(linecount)s lines" %
dict(
+revision = logentry.attrib['revision'],
+author= f('author'),
+date = datetime.datetime.strptime(f('date'),
'%Y-%m-%dT%H:%M:%S.%fZ').strftime('%Y-%m-%d %H:%M:%S + (%a, %d %b %Y)'),
+linecount = 1+len(f('msg').splitlines()), # increment because of
the empty line printed next
+))
+print()
+print(f('msg'))
+
+print(LOG_SEPARATOR_LINE)
+
+if __name__ == '__main__':
+main()
Propchange: subversion/site/tools/upcoming.py
--
svn:executable = *
svn commit: r1850260 - in /subversion/site/staging: ./ docs/ docs/community-guide/ docs/release-notes/
Author: danielsh Date: Thu Jan 3 19:44:26 2019 New Revision: 1850260 URL: http://svn.apache.org/viewvc?rev=1850260&view=rev Log: Sync-merge publish into staging Added: subversion/site/staging/docs/release-notes/1.12.html - copied unchanged from r1850259, subversion/site/publish/docs/release-notes/1.12.html Modified: subversion/site/staging/ (props changed) subversion/site/staging/.message-ids.tsv subversion/site/staging/docs/community-guide/releasing.part.html subversion/site/staging/docs/index.html subversion/site/staging/docs/release-notes/1.10.html subversion/site/staging/docs/release-notes/1.11.html subversion/site/staging/docs/release-notes/index.html subversion/site/staging/index.html (props changed) subversion/site/staging/news.html (props changed) subversion/site/staging/roadmap.html (contents, props changed) Propchange: subversion/site/staging/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 3 19:44:26 2019 @@ -1 +1 @@ -/subversion/site/publish:1812681-1845279 +/subversion/site/publish:1812681-1850259 Modified: subversion/site/staging/.message-ids.tsv URL: http://svn.apache.org/viewvc/subversion/site/staging/.message-ids.tsv?rev=1850260&r1=1850259&r2=1850260&view=diff == --- subversion/site/staging/.message-ids.tsv (original) +++ subversion/site/staging/.message-ids.tsv Thu Jan 3 19:44:26 2019 @@ -1,3 +1,5 @@ +# Message-ids of archived emails that are referenced by a svn.haxx.se URL. +# Generated by tools/haxx-url-to-message-id.sh on 2018-12-11 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 @@ -7,6 +9,7 @@ https://svn.haxx.se/dev/archive-2005-12/ 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 https://svn.haxx.se/dev/archive-2006-02/1214.shtml 87hd6sg6k8@debian2.lan +https://svn.haxx.se/dev/archive-2006-09/0316.shtml 877j08i5d7@morpheus.hq.vtech https://svn.haxx.se/dev/archive-2008-10/0213.shtml 48e68259.1060...@orcaware.com https://svn.haxx.se/dev/archive-2010-01/0545.shtml b51ffb6f1001211456g60112fcfn5595fde3bedd...@mail.gmail.com https://svn.haxx.se/dev/archive-2010-02/0418.shtml 6cca3db31002171316n427d8c43ydf977baae4615...@mail.gmail.com @@ -40,5 +43,7 @@ https://svn.haxx.se/dev/archive-2015-08/ https://svn.haxx.se/dev/archive-2017-07/0054.shtml 2017070725.gc53...@jessup.stsp.name https://svn.haxx.se/users/archive-2004-03/0488.shtml 1078601435.31293.104.ca...@madison.badger.com https://svn.haxx.se/users/archive-2004-07/1662.shtml 003c01c4763b$180511f0$80c0@blazepoint.local +https://svn.haxx.se/users/archive-2010-01/0001.shtml 69b68910-b4d0-428e-a4bb-fb7d6e87b...@barrys-emacs.org https://svn.haxx.se/users/archive-2012-03/0147.shtml 20120308190221.ga4...@jack.stsp.name https://svn.haxx.se/users/archive-2012-09/0236.shtml 20120921085850.gg24...@ted.stsp.name +http://svn.haxx.se/dev/archive-2010-08/0362.shtml 4c65756c.8070...@collab.net Modified: subversion/site/staging/docs/community-guide/releasing.part.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/releasing.part.html?rev=1850260&r1=1850259&r2=1850260&view=diff == --- subversion/site/staging/docs/community-guide/releasing.part.html (original) +++ subversion/site/staging/docs/community-guide/releasing.part.html Thu Jan 3 19:44:26 2019 @@ -1215,6 +1215,23 @@ update links to the release announcement ensure that the "latest" symlinks which are siblings of those directories always point to the directories of the latest release series. + +Example: + +VER=1.12 +DOCS_WC=~/src/svn/site/staging/docs +BRANCH_BUILD_DIR=~/src/svn/branches/$VER.x/obj-dir +cd $BRANCH_BUILD_DIR +make doc +cp -a doc/doxygen/html $DOCS_WC/api/$VER +cp -a doc/javadoc $DOCS_WC/javahl/$VER +for D in $DOCS_WC/api $DOCS_WC/javahl; do + svn add $D/$VER + rm $D/latest && ln -s $VER $D/latest +done +svn ci -m "In 'staging': Add $VER API docs." $DOCS_WC/api $DOCS_WC/javahl + +Update the links to the API docs on the index page docs/index.html#api. @@ -1411,6 +1428,10 @@ release stabilization section. release, it must be brought up to date to list all changes since the last release. +Below, we describe the manual process. For partial automation, see +tools/dist/
svn commit: r1850257 - /subversion/trunk/configure.ac
Author: danielsh Date: Thu Jan 3 18:20:00 2019 New Revision: 1850257 URL: http://svn.apache.org/viewvc?rev=1850257&view=rev Log: * configure.ac: Use the POSIX string equality operator. On my system, that's required: . % sh -c 'test x == y; echo $?' sh: 1: test: x: unexpected operator 2 % % sh -c 'test x = y; echo $?' 1 % Modified: subversion/trunk/configure.ac Modified: subversion/trunk/configure.ac URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1850257&r1=1850256&r2=1850257&view=diff == --- subversion/trunk/configure.ac (original) +++ subversion/trunk/configure.ac Thu Jan 3 18:20:00 2019 @@ -1489,7 +1489,7 @@ else SVN_BUILD_SVNXX_TESTS=false fi -if test "$do_svnxx_build" == "yes"; then +if test "$do_svnxx_build" = "yes"; then SVN_BUILD_SVNXX=true else SVN_BUILD_SVNXX=false
svn commit: r1849913 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Sat Dec 29 12:44:20 2018 New Revision: 1849913 URL: http://svn.apache.org/viewvc?rev=1849913&view=rev Log: * docs/release-notes/1.11.html (#github-issue): Update to say the issue has been resolved. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1849913&r1=1849912&r2=1849913&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Sat Dec 29 12:44:20 2018 @@ -585,13 +585,12 @@ patch into their swig-3.0.8 packages.)https://issues.apache.org/jira/browse/SVN-4789";>Issue #4789 -As of November 2018, Subversion 1.11 clients are unable to +During November 2018 Subversion 1.11 clients were unable to check out repositories from Github. Stricter DAV RFC conformance checks -were added to SVN 1.11 clients, and Github's custom SVN server implementation -happens to not conform to the newly expected behaviour. We are waiting for -Github to resolve the issue at their end. In the meantime, Subversion 1.10, and -perhaps even the https://git-scm.com";>Git version control system, -can be used as a workaround. +had been added to SVN 1.11 clients, and Github's custom SVN server implementation +did not conform to the newly expected behaviour. Github has since fixed the +issues on their end, so all Subversion clients should be able to use Github's +SVN bridge again.
svn commit: r1849189 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Tue Dec 18 16:11:58 2018
New Revision: 1849189
URL: http://svn.apache.org/viewvc?rev=1849189&view=rev
Log:
backport.pl interactive mode: Colorize section headers and entry headers.
The whole script is deprecated and should be rewritten in Python, and this
functionality is only used interactively and only by us, so don't bother going
through termcap/terminfo; just stowaway the xterm escape codes right in there.
* tools/dist/backport.pl
(handle_entry, backport_main): Use bold yellow and bold green for headers.
Modified:
subversion/trunk/tools/dist/backport.pl
Modified: subversion/trunk/tools/dist/backport.pl
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1849189&r1=1849188&r2=1849189&view=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Tue Dec 18 16:11:58 2018
@@ -1027,7 +1027,7 @@ sub handle_entry {
# the "next PROMPT;" is; there's a "last;" at the end of the loop body.
PROMPT: while (1) {
say "";
-say "\n>>> $entry{header_start}:";
+say "\n\e\x5b32m>>> $entry{header_start}:\e\x5b0m";
say join ", ", map { "r$_" } @{$entry{revisions}} if @{$entry{revisions}};
say "$BRANCHES/$entry{branch}" if $entry{branch};
say "--accept=$entry{accept}" if $entry{accept};
@@ -1196,7 +1196,7 @@ sub backport_main {
given ($lines[0]) {
# Section header
when (/^[A-Z].*:$/i) {
-say "\n\n=== $lines[0]" unless $YES;
+say "\n\n\e\x5b33m\e\x5b1m=== $lines[0]\e\x5b0m" unless $YES;
$in_approved = $lines[0] =~ /^Approved changes/;
}
# Comment
svn commit: r1848665 - /subversion/site/tools/haxx-url-to-message-id.sh
Author: danielsh
Date: Tue Dec 11 10:45:35 2018
New Revision: 1848665
URL: http://svn.apache.org/viewvc?rev=1848665&view=rev
Log:
[in site]
* tools/haxx-url-to-message-id.sh: Make sure the pipe exits non-zero if the
transformation failed.
Modified:
subversion/site/tools/haxx-url-to-message-id.sh
Modified: subversion/site/tools/haxx-url-to-message-id.sh
URL:
http://svn.apache.org/viewvc/subversion/site/tools/haxx-url-to-message-id.sh?rev=1848665&r1=1848664&r2=1848665&view=diff
==
--- subversion/site/tools/haxx-url-to-message-id.sh (original)
+++ subversion/site/tools/haxx-url-to-message-id.sh Tue Dec 11 10:45:35 2018
@@ -16,5 +16,5 @@ set -e
echo "# Message-ids of archived emails that are referenced by a svn.haxx.se
URL."
echo "# Generated by $0 on `date +%Y-%m-%d`"
grep -hERo 'https?://svn.haxx.se/[a-z0-9-]*/archive-[0-9-]*/[0-9]*\.shtml'
"$@" | sort | uniq | while read -r u; do
- printf '%s\t' "$u"; curl -sSf -L -- "$u" | perl -lne 's//\1/ and print s/_at_/@/gr'
+ printf '%s\t' "$u"; curl -sSf -L -- "$u" | perl -lne 's//\1/ and print s/_at_/@/gr and ++$printed; END { exit +($printed ? 0 : 1) }'
done
svn commit: r1848407 - /subversion/site/tools/haxx-url-to-message-id.sh
Author: danielsh Date: Fri Dec 7 14:51:48 2018 New Revision: 1848407 URL: http://svn.apache.org/viewvc?rev=1848407&view=rev Log: * tools/haxx-url-to-message-id.sh: Pass failure mode options to curl. Modified: subversion/site/tools/haxx-url-to-message-id.sh Modified: subversion/site/tools/haxx-url-to-message-id.sh URL: http://svn.apache.org/viewvc/subversion/site/tools/haxx-url-to-message-id.sh?rev=1848407&r1=1848406&r2=1848407&view=diff == --- subversion/site/tools/haxx-url-to-message-id.sh (original) +++ subversion/site/tools/haxx-url-to-message-id.sh Fri Dec 7 14:51:48 2018 @@ -15,5 +15,5 @@ echo "# Message-ids of archived emails that are referenced by a svn.haxx.se URL." echo "# Generated by $0 on `date +%Y-%m-%d`" grep -hERo 'https?://svn.haxx.se/[a-z0-9-]*/archive-[0-9-]*/[0-9]*\.shtml' "$@" | sort | uniq | while read -r u; do - printf '%s\t' "$u"; curl -sL -- "$u" | perl -lne 's//\1/ and print s/_at_/@/gr' + printf '%s\t' "$u"; curl -sSf -L -- "$u" | perl -lne 's//\1/ and print s/_at_/@/gr' done
svn commit: r1848406 - /subversion/site/tools/haxx-url-to-message-id.sh
Author: danielsh Date: Fri Dec 7 14:49:51 2018 New Revision: 1848406 URL: http://svn.apache.org/viewvc?rev=1848406&view=rev Log: * tools/haxx-url-to-message-id.sh: Wrap long line. Modified: subversion/site/tools/haxx-url-to-message-id.sh Modified: subversion/site/tools/haxx-url-to-message-id.sh URL: http://svn.apache.org/viewvc/subversion/site/tools/haxx-url-to-message-id.sh?rev=1848406&r1=1848405&r2=1848406&view=diff == --- subversion/site/tools/haxx-url-to-message-id.sh (original) +++ subversion/site/tools/haxx-url-to-message-id.sh Fri Dec 7 14:49:51 2018 @@ -14,4 +14,6 @@ # echo "# Message-ids of archived emails that are referenced by a svn.haxx.se URL." echo "# Generated by $0 on `date +%Y-%m-%d`" -grep -hERo 'https?://svn.haxx.se/[a-z0-9-]*/archive-[0-9-]*/[0-9]*\.shtml' "$@" | sort | uniq | while read -r u; do printf '%s\t' "$u"; curl -sL -- "$u" | perl -lne 's//\1/ and print s/_at_/@/gr'; done +grep -hERo 'https?://svn.haxx.se/[a-z0-9-]*/archive-[0-9-]*/[0-9]*\.shtml' "$@" | sort | uniq | while read -r u; do + printf '%s\t' "$u"; curl -sL -- "$u" | perl -lne 's//\1/ and print s/_at_/@/gr' +done
svn commit: r1848405 - /subversion/site/tools/haxx-url-to-message-id.sh
Author: danielsh Date: Fri Dec 7 14:47:55 2018 New Revision: 1848405 URL: http://svn.apache.org/viewvc?rev=1848405&view=rev Log: * tools/haxx-url-to-message-id.sh: Avoid Linuxisms: - Backslash in double quotes - The 'T' sed command - Flags to date(1) Modified: subversion/site/tools/haxx-url-to-message-id.sh Modified: subversion/site/tools/haxx-url-to-message-id.sh URL: http://svn.apache.org/viewvc/subversion/site/tools/haxx-url-to-message-id.sh?rev=1848405&r1=1848404&r2=1848405&view=diff == --- subversion/site/tools/haxx-url-to-message-id.sh (original) +++ subversion/site/tools/haxx-url-to-message-id.sh Fri Dec 7 14:47:55 2018 @@ -13,5 +13,5 @@ # Note that '@' was transformed to '_at_', so we reverse that. # echo "# Message-ids of archived emails that are referenced by a svn.haxx.se URL." -echo "# Generated by $0 on `date --iso-8601=date`" -grep -hERo "https?://svn.haxx.se/[a-z0-9-]*/archive-[0-9-]*/[0-9]*\.shtml" "$@" | sort | uniq | while read -r u; do printf "%s\t" "$u"; curl -sL -- "$u" | sed -n 's//\1/;T;s/_at_/@/g;p'; done +echo "# Generated by $0 on `date +%Y-%m-%d`" +grep -hERo 'https?://svn.haxx.se/[a-z0-9-]*/archive-[0-9-]*/[0-9]*\.shtml' "$@" | sort | uniq | while read -r u; do printf '%s\t' "$u"; curl -sL -- "$u" | perl -lne 's//\1/ and print s/_at_/@/gr'; done
svn commit: r1846827 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Sun Nov 18 11:22:29 2018 New Revision: 1846827 URL: http://svn.apache.org/viewvc?rev=1846827&view=rev Log: * STATUS: Vote +1 on r1846704. 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=1846827&r1=1846826&r2=1846827&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Sun Nov 18 11:22:29 2018 @@ -27,7 +27,7 @@ Candidate changes: Justification: Misleading output from conflict resolver. Votes: - +1: stsp + +1: stsp, danielsh * r1846299 Add resolver support for unversioned directories during update/switch.
svn commit: r1846826 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Sun Nov 18 11:09:55 2018 New Revision: 1846826 URL: http://svn.apache.org/viewvc?rev=1846826&view=rev Log: * STATUS: Vote +1 on r1846704. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1846826&r1=1846825&r2=1846826&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Sun Nov 18 11:09:55 2018 @@ -27,7 +27,7 @@ Candidate changes: Justification: Misleading output from conflict resolver. Votes: - +1: stsp + +1: stsp, danielsh * r1846299 Add resolver support for unversioned directories during update/switch.
svn propchange: r1846391 - svn:log
Author: danielsh Revision: 1846391 Modified property: svn:log Modified: svn:log at Thu Nov 15 10:39:00 2018 -- --- svn:log (original) +++ svn:log Thu Nov 15 10:39:00 2018 @@ -1,3 +1,5 @@ Create the dav-path-escape branch. See BRANCH-README for details. +Issue SVN-4788. + Patch by: philip
svn commit: r1845672 - /subversion/branches/1.9.x/STATUS
Author: danielsh Date: Sat Nov 3 17:00:26 2018 New Revision: 1845672 URL: http://svn.apache.org/viewvc?rev=1845672&view=rev Log: * STATUS: Vote +1 on the r1663609 group. Modified: subversion/branches/1.9.x/STATUS Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1845672&r1=1845671&r2=1845672&view=diff == --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Sat Nov 3 17:00:26 2018 @@ -114,8 +114,7 @@ Candidate changes: - r1663609 fixes an old-style function definition. - r1666067 removes an unused variable. Votes: - +1: brane - + +1: brane, danielsh Veto-blocked changes: =
svn commit: r1845386 - /subversion/trunk/tools/dist/release.py
Author: danielsh
Date: Wed Oct 31 20:21:49 2018
New Revision: 1845386
URL: http://svn.apache.org/viewvc?rev=1845386&view=rev
Log:
release.py: Avoid undefined behaviour.
In Python, «'\x'», where \x isn't a defined escape sequence, is an expression
whose meaning may change in the future as new sequences are added.
* tools/dist/release.py
(write_changelog): Use «r''» string literals to avoid undefined escape
sequences
in «''» string literals.
[c:skip]
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1845386&r1=1845385&r2=1845386&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Wed Oct 31 20:21:49 2018
@@ -1327,8 +1327,8 @@ def write_changelog(args):
separator_pattern = re.compile('^-{72}$')
revline_pattern = re.compile('^r(\d+) \| [^\|]+ \| [^\|]+ \| \d+ lines?$')
-changes_prefix_pattern = re.compile('^\[(U|D)?:?([^\]]+)?\](.+)$')
-changes_suffix_pattern = re.compile('^(.+)\[(U|D)?:?([^\]]+)?\]$')
+changes_prefix_pattern = re.compile(r'^\[(U|D)?:?([^\]]+)?\](.+)$')
+changes_suffix_pattern = re.compile(r'^(.+)\[(U|D)?:?([^\]]+)?\]$')
# TODO: push this into backport.status as a library function
auto_merge_pattern = \
re.compile(r'^Merge (r\d+,? |the r\d+ group |the \S+ branch:)')
@@ -1391,13 +1391,13 @@ def write_changelog(args):
if not got_firstline:
got_firstline = True
-if (not re.search('status|changes|post-release
housekeeping|follow-up|^\*',
+if (not re.search(r'status|changes|post-release
housekeeping|follow-up|^\*',
line, re.IGNORECASE)
and not changes_prefix_pattern.match(line)
and not changes_suffix_pattern.match(line)):
unlabeled_summary = line
-if re.search('\[(c:)?(skip|ignore)\]', line, re.IGNORECASE):
+if re.search(r'\[(c:)?(skip|ignore)\]', line, re.IGNORECASE):
changes_ignore = True
prefix_match = changes_prefix_pattern.match(line)
svn propchange: r1845312 - svn:log
Author: danielsh Revision: 1845312 Modified property: svn:log Modified: svn:log at Wed Oct 31 06:57:17 2018 -- --- svn:log (original) +++ svn:log Wed Oct 31 06:57:17 2018 @@ -1,7 +1,7 @@ Adjust grep syntax to be able to run it with Perl 5.16.3. +[c:skip] + * tools/dist/backport.pl (vote) Adjust grep syntax to be able to run it with Perl 5.16.3. -[D:other] backport.pl: Make it run with Perl 5.16.3. -
svn commit: r1845289 - /subversion/branches/1.9.x/STATUS
Author: danielsh Date: Tue Oct 30 22:03:05 2018 New Revision: 1845289 URL: http://svn.apache.org/viewvc?rev=1845289&view=rev Log: * STATUS: Vote +1 on r1845204. Modified: subversion/branches/1.9.x/STATUS Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1845289&r1=1845288&r2=1845289&view=diff == --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Tue Oct 30 22:03:05 2018 @@ -159,7 +159,7 @@ Candidate changes: Justification: Prevents a crash in mod_http2. Votes: - +1: rpluem + +1: rpluem, danielsh Veto-blocked changes: =
svn commit: r1845288 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Tue Oct 30 22:03:04 2018 New Revision: 1845288 URL: http://svn.apache.org/viewvc?rev=1845288&view=rev Log: * STATUS: Vote +1 on r1845204. 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=1845288&r1=1845287&r2=1845288&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Oct 30 22:03:04 2018 @@ -56,7 +56,7 @@ Candidate changes: Justification: Prevents a crash in mod_http2. Votes: - +1: rpluem + +1: rpluem, danielsh Veto-blocked changes: =
svn commit: r1845287 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Tue Oct 30 22:02:39 2018 New Revision: 1845287 URL: http://svn.apache.org/viewvc?rev=1845287&view=rev Log: * STATUS: Vote +1 on r1845204. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1845287&r1=1845286&r2=1845287&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Tue Oct 30 22:02:39 2018 @@ -68,7 +68,7 @@ Candidate changes: Justification: Prevents a crash in mod_http2. Votes: - +1: rpluem + +1: rpluem, danielsh Veto-blocked changes: =
svn commit: r1845265 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Tue Oct 30 18:32:39 2018 New Revision: 1845265 URL: http://svn.apache.org/viewvc?rev=1845265&view=rev Log: * STATUS: Nominate r1845261. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1845265&r1=1845264&r2=1845265&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Tue Oct 30 18:32:39 2018 @@ -55,6 +55,13 @@ Candidate changes: Votes: +1: brane + * r1845261 + svndumpfilter: Include node path in error messages. + Justification: + User requested error message clarification. + Votes: + +1: danielsh + Veto-blocked changes: =
svn commit: r1845264 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Tue Oct 30 18:32:13 2018 New Revision: 1845264 URL: http://svn.apache.org/viewvc?rev=1845264&view=rev Log: * 1.10.x/STATUS: Fix entry. 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=1845264&r1=1845263&r2=1845264&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Oct 30 18:32:13 2018 @@ -44,7 +44,7 @@ Candidate changes: +1: brane * r1845261 - * subversion/svndumpfilter/svndumpfilter.c + svndumpfilter: Include node path in error messages. Justification: User requested error message clarification. Votes:
svn commit: r1845262 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Tue Oct 30 18:31:03 2018 New Revision: 1845262 URL: http://svn.apache.org/viewvc?rev=1845262&view=rev Log: * STATUS: Nominate r1845261. 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=1845262&r1=1845261&r2=1845262&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Oct 30 18:31:03 2018 @@ -43,6 +43,13 @@ Candidate changes: Votes: +1: brane + * r1845261 + * subversion/svndumpfilter/svndumpfilter.c + Justification: + User requested error message clarification. + Votes: + +1: danielsh + Veto-blocked changes: =
svn commit: r1845261 - /subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
Author: danielsh
Date: Tue Oct 30 18:29:38 2018
New Revision: 1845261
URL: http://svn.apache.org/viewvc?rev=1845261&view=rev
Log:
* subversion/svndumpfilter/svndumpfilter.c
(new_node_record):
Include the target node's path in two error message, to make it
easier to identify.
Modified:
subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1845261&r1=1845260&r2=1845261&view=diff
==
--- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Tue Oct 30
18:29:38 2018
@@ -528,7 +528,8 @@ new_node_record(void **node_baton,
{
return svn_error_createf
(SVN_ERR_INCOMPLETE_DATA, 0,
- _("Invalid copy source path '%s'"), copyfrom_path);
+ _("Invalid copy source path '%s' for '%s'"),
+ copyfrom_path, node_path);
}
}
@@ -609,7 +610,8 @@ new_node_record(void **node_baton,
if (! (cf_renum_val && SVN_IS_VALID_REVNUM(cf_renum_val->rev)))
return svn_error_createf
(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
- _("No valid copyfrom revision in filtered stream"));
+ _("No valid copyfrom revision in filtered stream for '%s'"),
+ node_path);
svn_repos__dumpfile_header_pushf(
nb->headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV,
"%ld", cf_renum_val->rev);
svn commit: r30502 - in /dev/subversion: subversion-1.11.0.tar.bz2.asc subversion-1.11.0.tar.gz.asc
Author: danielsh Date: Mon Oct 29 20:36:24 2018 New Revision: 30502 Log: Sign 1.11.0 based on diffing to 1.11.0-rc2. Modified: dev/subversion/subversion-1.11.0.tar.bz2.asc dev/subversion/subversion-1.11.0.tar.gz.asc Modified: dev/subversion/subversion-1.11.0.tar.bz2.asc == --- dev/subversion/subversion-1.11.0.tar.bz2.asc (original) +++ dev/subversion/subversion-1.11.0.tar.bz2.asc Mon Oct 29 20:36:24 2018 @@ -25,3 +25,19 @@ m+ng6W0KUDMxjcRjQVwP/mXfwVaJr0pFGglhc63r +5J3A3DmXUQgqSaODvRNaFsF51mhG4g+r2feQGJz4bpyv8Xeaf2Fd1gHdaECp0Q= =7Uwa -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIrBAABCAAdFiEEbrYLY3zlrL8kSaLa2yfpl0Ka8gwFAlvXboMACgkQ2yfpl0Ka +8gxLWA++J1rMQl4A4TXzJIA3YdqVruqA1tWFloDG4vu6uDW9Y1xnvihBpLkr9LWf +zpZX+55GhMIJTPRmcy4IH0suAltWUegaSzNtJxo8Cxmyt+uhKxLEoebps4Ne2pOV +4Y55vmt7cXUhKnejL7mHVWbV9jOlaTQwXLEfJs/MXwGMckJMxixiTWNmH6JReHbE +204nMy+wTHDXorf6k4TlSKh43ZvUINwSQpjb4whZ6BsP3Vu+NBRtvGZRuRPB4hfG +HQpNIFF+483POPivFOFOrbHYsaSBbx3BEULr4YrpzzVra1znkB1KuDKody0bHNNK +957ydhNCawPbXPNpIP/H7zJFACIhj2QfaMNS+MqzwH7kQgM0ORkR7Q79NxTezkG1 +SHnak++dk58OBU+NOP1Uzv5bTVBxE4d/lC1ubvtEUVwa2/8kj20FMrDreMhQnr5N +ViwqZ6xa0gikN4T96jFZGNDUCqdX/fDdv0/ikrVpF3vLeYepwql1nWs9V4jD3aqb +VVHG1KTNjiBbCAhRkbtwdStH6qLl5jXU29B6Lp5bufuHypN9mUlssNDcpAt+tXwU +1f5SwbGBdhY3aq5ka3nOn145YOqdpgiuXl9sFYOO8Qt/686R/jCJON9G3R5+k9vz +T231vnhvNHru8XEZw4xaXciuOJ/2JV30u+c5MZ7L +=oyRs +-END PGP SIGNATURE- Modified: dev/subversion/subversion-1.11.0.tar.gz.asc == --- dev/subversion/subversion-1.11.0.tar.gz.asc (original) +++ dev/subversion/subversion-1.11.0.tar.gz.asc Mon Oct 29 20:36:24 2018 @@ -25,3 +25,19 @@ HVEwIQCHpoJMtHhraHv8HUIikgERhIpPZqI0Afty vKWtokErNdugtimTTT/LvraO4kEZWRS4etKH6VnkefQrRF8jbrXRF95907YnUKc= =DTCJ -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIrBAABCAAdFiEEbrYLY3zlrL8kSaLa2yfpl0Ka8gwFAlvXboIACgkQ2yfpl0Ka +8gzvug+/emw2Cr23tNs77v7XpMudDWMhTee2HGSpsr93SMCmLojGcAKowsSRtNNq +rDSk/BfSOEj3Mu6NVVhP5DjRQ39JQMHpSvFL0Q+KpCMbX+yw+dXCFddje79QQRdD +bRs8YiR/GWWHcPy1sLvVKh7t7jbOEFPKJY9BK6Y1d21p6iT4MO4FwGW86eoB5J0N +Xin+fenrdqXeiJU6I7VDg7mnemmTY/tb2D4bfIV+DYf9q5yIDIzrQFBFrDce8X7F +BF/WbXbGDWrfG5Kc3Z0lJZA8z/1RJ6X9//p60AHqsdCW+Y6yPveMPc12GLLukSXM +uHw/LUdNmSlWrPMvCIbviD5Tzq2L4ohWvqFpFP2QlnqTdoAhQtYSHq3u3wxEPsJf +DeS1enJDWrog+Sqx/+NSc1y2ZNi/mLDKIn7Abpx+7Wb8nRo+HO5EdYmX+9Wr6ob9 +ye1cO6NqseGyNNKf2K6fs53MQ7oqWOhWEfTFspbkx3s1DeIGRUewVUKgZBTTiebZ +muhwiBAjGWpg+Thug8voydfw7t9+ZUAIsMHCTNs4yM+zS3mrCVSG7BmzYgWFLxOj +IWrM1myD37nVzG4FklK/J84CvjL+R8YCfcpVli701YFGY43DafyLWH9/UD10CSyp +To6xDXUWwz818mdJ8H/R1PKmM1FSPsTiiELFI3fl +=f+5R +-END PGP SIGNATURE-
svn commit: r1843479 - /subversion/trunk/tools/dist/release.py
Author: danielsh
Date: Wed Oct 10 17:29:42 2018
New Revision: 1843479
URL: http://svn.apache.org/viewvc?rev=1843479&view=rev
Log:
* tools/dist/release.py
(write_announcement): Error out when no signatures are found.
See
https://mail-archives.apache.org/mod_mbox/subversion-dev/201810.mbox/%3C1539190868.3741277.1537474360.1A2F7F8A%40webmail.messagingengine.com%3E
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1843479&r1=1843478&r2=1843479&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Wed Oct 10 17:29:42 2018
@@ -1036,10 +1036,12 @@ def get_fileinfo(args):
def write_announcement(args):
'Write the release announcement.'
-siginfo = "\n".join(get_siginfo(args, True)) + "\n"
+siginfo = get_siginfo(args, True)
+if not siginfo:
+ raise RuntimeError("No signatures found for %s at %s" % (args.version,
args.target))
data = { 'version' : str(args.version),
- 'siginfo' : siginfo,
+ 'siginfo' : "\n".join(siginfo) + "\n",
'major-minor' : args.version.branch,
'major-minor-patch': args.version.base,
'anchor' : args.version.get_download_anchor(),
svn commit: r1842932 - /subversion/trunk/tools/dist/release.py
Author: danielsh
Date: Fri Oct 5 15:29:48 2018
New Revision: 1842932
URL: http://svn.apache.org/viewvc?rev=1842932&view=rev
Log:
Follow-up to r1842930:
* tools/dist/release.py
(write_changelog): Don't truncate the logsummary.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1842932&r1=1842931&r2=1842932&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Fri Oct 5 15:29:48 2018
@@ -1362,10 +1362,10 @@ def write_changelog(args):
# ### paragraph-oriented but we're in a per-line loop.
this_log_message = log_messages_dict[revision]
status_paragraph = this_log_message.split('\n\n')[2]
-logsummarysummary = \
-
backport.status.StatusEntry(status_paragraph).logsummarysummary()
+logsummary = \
+
backport.status.StatusEntry(status_paragraph).logsummary
add_to_changes_dict(changes_dict, None, None,
-logsummarysummary, revision)
+' '.join(logsummary), revision)
else:
add_to_changes_dict(changes_dict, None, None,
unlabeled_summary, revision)
svn commit: r1842934 - /subversion/trunk/tools/dist/release.py
Author: danielsh Date: Fri Oct 5 15:37:04 2018 New Revision: 1842934 URL: http://svn.apache.org/viewvc?rev=1842934&view=rev Log: * tools/dist/release.py (write_changelog): Fix typo in comment. Modified: subversion/trunk/tools/dist/release.py Modified: subversion/trunk/tools/dist/release.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1842934&r1=1842933&r2=1842934&view=diff == --- subversion/trunk/tools/dist/release.py (original) +++ subversion/trunk/tools/dist/release.py Fri Oct 5 15:37:04 2018 @@ -1318,7 +1318,7 @@ def write_changelog(args): # comprehension extracts the revision number, as integer, from the # 'svn log' output. int(log_message.splitlines()[0].split()[0][1:]): log_message -# The [1:] ignores the empty first and last element of the split(). +# The [1:-1] ignores the empty first and last element of the split(). for log_message in mergeinfo.split(separator_line)[1:-1] } mergeinfo = mergeinfo.splitlines()
svn commit: r1842933 - /subversion/trunk/tools/dist/release.py
Author: danielsh
Date: Fri Oct 5 15:32:09 2018
New Revision: 1842933
URL: http://svn.apache.org/viewvc?rev=1842933&view=rev
Log:
* tools/dist/release.py
(write_changelog): Delete an out-of-date comment. It was up-to-date only
while r1842930 was being written, but was out-of-date in the committed
form of r1842930.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1842933&r1=1842932&r2=1842933&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Fri Oct 5 15:32:09 2018
@@ -1358,8 +1358,6 @@ def write_changelog(args):
# message.
# 2. Parse the STATUS entry
-# ### This is a little roundabout since backport.status is
-# ### paragraph-oriented but we're in a per-line loop.
this_log_message = log_messages_dict[revision]
status_paragraph = this_log_message.split('\n\n')[2]
logsummary = \
svn commit: r1842930 - /subversion/trunk/tools/dist/release.py
Author: danielsh
Date: Fri Oct 5 15:26:11 2018
New Revision: 1842930
URL: http://svn.apache.org/viewvc?rev=1842930&view=rev
Log:
'release.py write-changelog': For merge commits such as svn-role's, use the
summary of the nomination, rather than the first line of the log message.
* tools/dist/release.py
(backport.status): Import
(write_changelog): Use release.py if the log message is unlabeled and looks
like an auto-merge.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1842930&r1=1842929&r2=1842930&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Fri Oct 5 15:26:11 2018
@@ -53,6 +53,8 @@ import subprocess
import argparse # standard in Python 2.7
import io
+import backport.status
+
# Find ezt, using Subversion's copy, if there isn't one on the system.
try:
import ezt
@@ -1306,15 +1308,29 @@ def write_changelog(args):
branch = secure_repos + '/' + args.branch
previous = secure_repos + '/' + args.previous
include_unlabeled = args.include_unlabeled
+separator_line = ('-' * 72) + '\n'
mergeinfo = subprocess.check_output(['svn', 'mergeinfo', '--show-revs',
-'eligible', '--log', branch, previous]).splitlines()
+'eligible', '--log', branch, previous])
+log_messages_dict = {
+# This is a dictionary mapping revision numbers to their respective
+# log messages. The expression in the "key:" part of the dict
+# comprehension extracts the revision number, as integer, from the
+# 'svn log' output.
+int(log_message.splitlines()[0].split()[0][1:]): log_message
+# The [1:] ignores the empty first and last element of the split().
+for log_message in mergeinfo.split(separator_line)[1:-1]
+}
+mergeinfo = mergeinfo.splitlines()
separator_pattern = re.compile('^-{72}$')
revline_pattern = re.compile('^r(\d+) \| [^\|]+ \| [^\|]+ \| \d+ lines?$')
changes_prefix_pattern = re.compile('^\[(U|D)?:?([^\]]+)?\](.+)$')
changes_suffix_pattern = re.compile('^(.+)\[(U|D)?:?([^\]]+)?\]$')
-
+# TODO: push this into backport.status as a library function
+auto_merge_pattern = \
+re.compile(r'^Merge (r\d+,? |the r\d+ group |the \S+ branch:)')
+
changes_dict = dict() # audience -> (section -> (change -> set(revision)))
revision = -1
got_firstline = False
@@ -1330,8 +1346,29 @@ def write_changelog(args):
# If there's an unlabeled summary from a previous section, and
# include_unlabeled is True, put it into uncategorized_changes.
if include_unlabeled and unlabeled_summary and not changes_ignore:
-add_to_changes_dict(changes_dict, None, None,
-unlabeled_summary, revision)
+if auto_merge_pattern.match(unlabeled_summary):
+# 1. Parse revision numbers from the first line
+merged_revisions = [
+int(x) for x in
+re.compile(r'(?<=\br)\d+\b').findall(unlabeled_summary)
+]
+# TODO pass each revnum in MERGED_REVISIONS through this
+# logic, in order to extract CHANGES_PREFIX_PATTERN
+# and CHANGES_SUFFIX_PATTERN lines from the trunk log
+# message.
+
+# 2. Parse the STATUS entry
+# ### This is a little roundabout since backport.status is
+# ### paragraph-oriented but we're in a per-line loop.
+this_log_message = log_messages_dict[revision]
+status_paragraph = this_log_message.split('\n\n')[2]
+logsummarysummary = \
+
backport.status.StatusEntry(status_paragraph).logsummarysummary()
+add_to_changes_dict(changes_dict, None, None,
+logsummarysummary, revision)
+else:
+add_to_changes_dict(changes_dict, None, None,
+unlabeled_summary, revision)
revision = -1
got_firstline = False
unlabeled_summary = None
svn commit: r1842813 - /subversion/trunk/subversion/include/svn_client.h
Author: danielsh Date: Thu Oct 4 13:55:31 2018 New Revision: 1842813 URL: http://svn.apache.org/viewvc?rev=1842813&view=rev Log: * subversion/include/svn_client.h (svn_client_list): Fix error in docstring. Suggested by: Yasuhito FUTATSUKI Modified: subversion/trunk/subversion/include/svn_client.h Modified: subversion/trunk/subversion/include/svn_client.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1842813&r1=1842812&r2=1842813&view=diff == --- subversion/trunk/subversion/include/svn_client.h (original) +++ subversion/trunk/subversion/include/svn_client.h Thu Oct 4 13:55:31 2018 @@ -6761,7 +6761,7 @@ svn_client_list2(const char *path_or_url /** * Similar to svn_client_list2(), but with @a recurse instead of @a depth. - * If @a recurse is TRUE, pass #svn_depth_files for @a depth; else + * If @a recurse is FALSE, pass #svn_depth_immediates for @a depth; else * pass #svn_depth_infinity. * * @since New in 1.4.
svn commit: r1842628 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py
Author: danielsh
Date: Tue Oct 2 14:52:39 2018
New Revision: 1842628
URL: http://svn.apache.org/viewvc?rev=1842628&view=rev
Log:
* subversion/tests/cmdline/svntest/main.py
(_create_parser): Add a breadcrumb for future archaeologists. (The docstring
doesn't actually explain what the switch _does_.)
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1842628&r1=1842627&r2=1842628&view=diff
==
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Oct 2
14:52:39 2018
@@ -2108,7 +2108,7 @@ def _create_parser(usage=None):
help='Run the given number of tests in parallel')
parser.add_option('-c', action='store_true', dest='is_child_process',
help='Flag if we are running this python test as a ' +
- 'child process')
+'child process; used by build/run_tests.py:334')
parser.add_option('--mode-filter', action='store', dest='mode_filter',
default='ALL',
help='Limit tests to those with type specified (e.g.
XFAIL)')
svn commit: r1842627 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Tue Oct 2 14:44:32 2018 New Revision: 1842627 URL: http://svn.apache.org/viewvc?rev=1842627&view=rev Log: * STATUS: Vote +0 on r1839739. 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=1842627&r1=1842626&r2=1842627&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Oct 2 14:44:32 2018 @@ -24,6 +24,7 @@ Candidate changes: This was a separate followup on changes that were already backported. Votes: +1: rhuijben + +0: danielsh Veto-blocked changes: =
svn commit: r1842626 - in /subversion/branches/1.10.x: ./ STATUS build/run_tests.py
Author: danielsh Date: Tue Oct 2 14:42:00 2018 New Revision: 1842626 URL: http://svn.apache.org/viewvc?rev=1842626&view=rev Log: Merge r1842260 from trunk: * r1842260 Use the current python executable for launching tests from run_tests.py. Justification: Attempt to fix 1.10.x tests on the macOS build slave. Votes: +1: brane, rhuijben, danielsh Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/build/run_tests.py Propchange: subversion/branches/1.10.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 2 14:42:00 2018 @@ -102,4 +102,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1840991,1842262,1842264 +/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1840991,1842260,1842262,1842264 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1842626&r1=1842625&r2=1842626&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Oct 2 14:42:00 2018 @@ -30,11 +30,3 @@ Veto-blocked changes: Approved changes: = - - * r1842260 - Use the current python executable for launching tests from run_tests.py. - Justification: - Attempt to fix 1.10.x tests on the macOS build slave. - Votes: - +1: brane, rhuijben, danielsh - Modified: subversion/branches/1.10.x/build/run_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/run_tests.py?rev=1842626&r1=1842625&r2=1842626&view=diff == --- subversion/branches/1.10.x/build/run_tests.py (original) +++ subversion/branches/1.10.x/build/run_tests.py Tue Oct 2 14:42:00 2018 @@ -327,7 +327,7 @@ class TestHarness: def _command_line(self, harness): if self.is_python: cmdline = list(harness.py_test_cmdline) -cmdline.insert(0, 'python') +cmdline.insert(0, sys.executable) cmdline.insert(1, self.progabs) # Run the test apps in "child process" mode, # i.e. w/o cleaning up global directories etc. @@ -375,7 +375,7 @@ class TestHarness: def _count_py_tests(self, progabs, progdir, progbase): 'Run a c test, escaping parameters as required.' - cmdline = [ 'python', progabs, '--list' ] + cmdline = [ sys.executable, progabs, '--list' ] prog = subprocess.Popen(cmdline, stdout=subprocess.PIPE, cwd=progdir) lines = prog.stdout.readlines() @@ -448,6 +448,7 @@ class TestHarness: job_queue = queue.Queue() total_count = 0 scrambled = list(jobs) +# TODO: What's this line doing, and what's the magic number? scrambled.sort(key=lambda x: (&q
svn commit: r1842625 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Tue Oct 2 14:41:33 2018 New Revision: 1842625 URL: http://svn.apache.org/viewvc?rev=1842625&view=rev Log: * STATUS: Vote +1 on r1842260, 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=1842625&r1=1842624&r2=1842625&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Oct 2 14:41:33 2018 @@ -15,13 +15,6 @@ Status of 1.10.3: Candidate changes: == - * r1842260 - Use the current python executable for launching tests from run_tests.py. - Justification: - Attempt to fix 1.10.x tests on the macOS build slave. - Votes: - +1: brane, rhuijben - * r1839739 Fix failing recently added tests when running with an older python Justification: @@ -37,3 +30,11 @@ Veto-blocked changes: Approved changes: = + + * r1842260 + Use the current python executable for launching tests from run_tests.py. + Justification: + Attempt to fix 1.10.x tests on the macOS build slave. + Votes: + +1: brane, rhuijben, danielsh +
svn commit: r1842507 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Mon Oct 1 14:21:23 2018 New Revision: 1842507 URL: http://svn.apache.org/viewvc?rev=1842507&view=rev Log: * docs/release-notes/1.11.html (#ruby-swig-issue-602): Add notice that this section isn't relevant to some users. Suggested by: brane Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842507&r1=1842506&r2=1842507&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Mon Oct 1 14:21:23 2018 @@ -535,6 +535,10 @@ may be fixed in later 1.11.x releases.¶ +This section only affects those who build Subversion from a working + copy. If you build Subversion from a tarball or zip file, you may skip + this section. + The Ruby bindings are known not to build with swig version 3.0.8 (and only that version) due to https://github.com/swig/swig/issues/602";>swig issue #602. We recommend to use swig 3.0.9 or newer.
svn propchange: r1842503 - svn:log
Author: danielsh Revision: 1842503 Modified property: svn:log Modified: svn:log at Mon Oct 1 14:17:36 2018 -- --- svn:log (original) +++ svn:log Mon Oct 1 14:17:36 2018 @@ -1,5 +1,7 @@ Give a background to experimental features. +[Reverted in r1842505.] + * docs/release-notes/1.11.html (#checkpointing, #shelving, #viewspec-output): Add .experimental-feature class.
svn commit: r1842505 - in /subversion/site/staging: docs/release-notes/1.11.html style/site.css
Author: danielsh
Date: Mon Oct 1 14:17:03 2018
New Revision: 1842505
URL: http://svn.apache.org/viewvc?rev=1842505&view=rev
Log:
Revert r1842503.
It was mostly redundant with respect to r1842502; the non-redundant part was
ported to publish/ in r1842504.
Modified:
subversion/site/staging/docs/release-notes/1.11.html
subversion/site/staging/style/site.css
Modified: subversion/site/staging/docs/release-notes/1.11.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.11.html?rev=1842505&r1=1842504&r2=1842505&view=diff
==
--- subversion/site/staging/docs/release-notes/1.11.html (original)
+++ subversion/site/staging/docs/release-notes/1.11.html Mon Oct 1 14:17:03
2018
@@ -251,7 +251,7 @@ PGP digital signatures and SHA-512 check
title="Link to this section">¶
-
+
Commit checkpointing (experimental)
¶
@@ -333,7 +333,7 @@ commands, as also listed in
title="Link to this section">¶
-
+
Improved Shelving (experimental)
¶
@@ -413,7 +413,7 @@ moved on source branch" and
-
+
Viewspec output command (experimental)
(https://issues.apache.org/jira/browse/SVN-4753";>issue #4753)
http://svn.apache.org/viewvc/subversion/site/staging/style/site.css?rev=1842505&r1=1842504&r2=1842505&view=diff
==
--- subversion/site/staging/style/site.css (original)
+++ subversion/site/staging/style/site.css Mon Oct 1 14:17:03 2018
@@ -176,9 +176,6 @@ h4 {
#site-content :target {
background-color: #e8e8e8;
}
-div.experimental-feature {
- background-color: lightpink;
-}
.centered {
margin-left: auto;
margin-right: auto;
svn commit: r1842504 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Mon Oct 1 14:15:51 2018 New Revision: 1842504 URL: http://svn.apache.org/viewvc?rev=1842504&view=rev Log: * docs/release-notes/1.11.html (#viewspec-output): Tag as '.experimental-feature'. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842504&r1=1842503&r2=1842504&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Mon Oct 1 14:15:51 2018 @@ -413,7 +413,7 @@ moved on source branch" and - + Viewspec output command (experimental) (https://issues.apache.org/jira/browse/SVN-4753";>issue #4753)
svn commit: r1842503 - in /subversion/site/staging: docs/release-notes/1.11.html style/site.css
Author: danielsh
Date: Mon Oct 1 14:04:30 2018
New Revision: 1842503
URL: http://svn.apache.org/viewvc?rev=1842503&view=rev
Log:
Give a background to experimental features.
* docs/release-notes/1.11.html
(#checkpointing, #shelving, #viewspec-output): Add .experimental-feature
class.
* style/site.css
(div.experimental-feature): New.
Suggested by: brane
(color value)
Modified:
subversion/site/staging/docs/release-notes/1.11.html
subversion/site/staging/style/site.css
Modified: subversion/site/staging/docs/release-notes/1.11.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.11.html?rev=1842503&r1=1842502&r2=1842503&view=diff
==
--- subversion/site/staging/docs/release-notes/1.11.html (original)
+++ subversion/site/staging/docs/release-notes/1.11.html Mon Oct 1 14:04:30
2018
@@ -251,7 +251,7 @@ PGP digital signatures and SHA-512 check
title="Link to this section">¶
-
+
Commit checkpointing (experimental)
¶
@@ -333,7 +333,7 @@ commands, as also listed in
title="Link to this section">¶
-
+
Improved Shelving (experimental)
¶
@@ -413,7 +413,7 @@ moved on source branch" and
-
+
Viewspec output command (experimental)
(https://issues.apache.org/jira/browse/SVN-4753";>issue #4753)
http://svn.apache.org/viewvc/subversion/site/staging/style/site.css?rev=1842503&r1=1842502&r2=1842503&view=diff
==
--- subversion/site/staging/style/site.css (original)
+++ subversion/site/staging/style/site.css Mon Oct 1 14:04:30 2018
@@ -176,6 +176,9 @@ h4 {
#site-content :target {
background-color: #e8e8e8;
}
+div.experimental-feature {
+ background-color: lightpink;
+}
.centered {
margin-left: auto;
margin-right: auto;
svn commit: r1842501 - in /subversion/site/staging: ./ docs/release-notes/1.11.html docs/release-notes/index.html download.html index.html news.html roadmap.html
Author: danielsh Date: Mon Oct 1 13:51:29 2018 New Revision: 1842501 URL: http://svn.apache.org/viewvc?rev=1842501&view=rev Log: Sync-merge from publish into staging. Modified: subversion/site/staging/ (props changed) subversion/site/staging/docs/release-notes/1.11.html subversion/site/staging/docs/release-notes/index.html subversion/site/staging/download.html subversion/site/staging/index.html (props changed) subversion/site/staging/news.html (props changed) subversion/site/staging/roadmap.html (contents, props changed) Propchange: subversion/site/staging/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 1 13:51:29 2018 @@ -1 +1 @@ -/subversion/site/publish:1812681-1841746 +/subversion/site/publish:1812681-1842500 Modified: subversion/site/staging/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.11.html?rev=1842501&r1=1842500&r2=1842501&view=diff == --- subversion/site/staging/docs/release-notes/1.11.html (original) +++ subversion/site/staging/docs/release-notes/1.11.html Mon Oct 1 13:51:29 2018 @@ -24,10 +24,19 @@ Apache Subversion 1.11 Release Notes -This is work in progress. +This is work in progress. Subversion 1.11 has not been released yet. + +New 6-month regular and 2-year LTS release schedule. +Subversion 1.11 is the first of the new 6-month regular releases with an +emphasis on introducing new features more quickly and a shorter support +period. See +Subversion 1.11 is a Regular Release +below. + + What's New in Apache Subversion 1.11 Improved Shelving (experimental) Checkpointing (experimental) + >Commit checkpointing (experimental) Improvements to the Conflict Resolver 1.11 any any -Shelving in 1.11 is incompatible with shelves created by 1.10. +shelves created by 1.10 are not compatible—see +the transition notes - Checkpointing (experimental) + Commit checkpointing (experimental) 1.11 any @@ -160,6 +170,50 @@ to the upgrade. + +Shelving: transtion from 1.10 + ¶ + + +The presence in the working copy of any shelves that were created by +Subversion 1.10 has no effect on a Subversion 1.11 client. Subversion 1.11 +will ignore them; it cannot interoperate with them nor even list their +presence. + +The svn upgrade command has no effect, as the working copy +format is formally unchanged. + +Shelves are currently stored under +<WC>/.svn/experimental/shelves/. In Subversion 1.10, +shelves were stored under <WC>/.svn/shelves/ as patch +files. + +To recover a shelf created by 1.10, either +use a 1.10 client to find and unshelve it, or +find the patch file by hand and use any 1.10 or later +svn patch to apply it. + + +Differences in the main shelving commands: + + +Subversion 1.10 command +Subversion 1.11 equivalent +svn [x-]shelve [--keep-local] SHELF [PATH...] +works similarly; saves a new version each time it is used +svn [x-]unshelve [SHELF] +svn x-unshelve --drop [SHELF] +svn [x-]unshelve --keep-shelved [SHELF] +svn x-unshelve [SHELF] +svn [x-]shelve --delete SHELF +svn x-shelf-drop SHELF +svn [x-]shelves or svn [x-]shelve --list +svn x-shelves or svn x-shelf-list + + + + Miscellaneous Compatibility Notes - + @@ -198,16 +252,15 @@ PGP digital signatures and SHA-512 check -Checkpointing (experimental) +Commit checkpointing (experimental) ¶ -Checkpointing (https://issues.apache.org/jira/browse/SVN-3626";>issue #3626) -is the ability to save a snapshot of an uncommitted change in the WC from -time to time, and later restore the working copy to one of those previous -snapshots. +Subversion 1.11 provides an experimental first cut at solving some of the +use cases envisioned in https://issues.apache.org/jira/browse/SVN-3626";>issue #3626 named +"Commit checkpointing". WARNING: The checkpointing feature @@ -217,33 +270,46 @@ snapshots. while it remains experimental. -The implementation is based on letting a shelf contain multiple -versions. Therefore, see also Shelving. - -The main checkpointing operations are, as listed in https://cwiki.apache.org/confluence/x/70cYBQ";>the Wiki page: +It provides the ability to save a snapshot of an uncommitted change from +time to time, and later restore one of those previous versions of your +change back into the working copy. + +It does not provide the kind of exact WC state roll back that is also +discussed in that issue, that could make it possible after a messy update to +roll back to the exact WC state that existed just before. This remains a +future possibility. + +The ability to checkpoint and roll back an uncommitted change is provided +wit
svn commit: r1842491 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Mon Oct 1 12:48:35 2018 New Revision: 1842491 URL: http://svn.apache.org/viewvc?rev=1842491&view=rev Log: * STATUS: Approve the r1838813 group. r1839703,r1839734 require only two votes each, being under subversion/tests/cmdline/. 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=1842491&r1=1842490&r2=1842491&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Mon Oct 1 12:48:35 2018 @@ -26,14 +26,6 @@ Candidate changes: Votes: +1: stsp, rhuijben - * r1838813, r1839703, r1839734, r1842262, r1842264 - Let 'svnadmin recover' prune the rep-cache even if it is disabled. - Justification: - Can potentially lead to data loss. - Votes: - +1: julianfoad, rhuijben - +1: danielsh (would prefer read_rep_cache() to check format numbers; see the "r1838813" thread on dev@) (without r1839703, r1839734) - * r1839662 For 'local missing' conflicts, scan for moves only if a YCA is known. Justification: @@ -98,3 +90,12 @@ Approved changes: The whole point of --keep-going is to get a summary of errors. Votes: +1: stsp, brane, julianfoad + + * r1838813, r1839703, r1839734, r1842262, r1842264 + Let 'svnadmin recover' prune the rep-cache even if it is disabled. + Justification: + Can potentially lead to data loss. + Votes: + +1: julianfoad, rhuijben + +1: danielsh (would prefer read_rep_cache() to check format numbers; see the "r1838813" thread on dev@) (without r1839703, r1839734) +
svn commit: r1842473 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Mon Oct 1 11:42:22 2018 New Revision: 1842473 URL: http://svn.apache.org/viewvc?rev=1842473&view=rev Log: * docs/release-notes/1.11.html: Fix comment syntax. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842473&r1=1842472&r2=1842473&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Mon Oct 1 11:42:22 2018 @@ -241,7 +241,7 @@ PGP digital signatures and SHA-512 check - + @@ -566,7 +566,7 @@ if they occur. There are no known issues specific to this release at the moment. - < !-- troubleshooting -- > + < ! - - troubleshooting - - > -->
svn commit: r1842470 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Mon Oct 1 11:00:59 2018 New Revision: 1842470 URL: http://svn.apache.org/viewvc?rev=1842470&view=rev Log: * STATUS: Edit the r1838813 entry. 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=1842470&r1=1842469&r2=1842470&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Mon Oct 1 11:00:59 2018 @@ -40,7 +40,7 @@ Candidate changes: Can potentially lead to data loss. Votes: +1: julianfoad (without r1842264) - +0.9: danielsh (+1 if read_rep_cache() checks format numbers; see the "r1838813" thread on dev@) + +1: danielsh (would prefer read_rep_cache() to check format numbers; see the "r1838813" thread on dev@) +0: rhuijben (please add the fix to allow the regression tests to run on old python versions. +1 on the fix) (without r1842264)
svn commit: r1842267 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Fri Sep 28 16:20:17 2018 New Revision: 1842267 URL: http://svn.apache.org/viewvc?rev=1842267&view=rev Log: * STATUS: Nominate r1842262 as an obvious fix and r1842264. 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=1842267&r1=1842266&r2=1842267&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Sep 28 16:20:17 2018 @@ -68,15 +68,15 @@ Candidate changes: Votes: +1: stsp - * r1838813 + * r1838813, r1842262, r1842264 Let 'svnadmin recover' prune the rep-cache even if it is disabled. Justification: Can potentially lead to data loss. Votes: - +1: julianfoad - +0: danielsh (haven't reviewed the regression test) + +1: julianfoad (without r1842264) + +0.9: danielsh (+1 if read_rep_cache() checks format numbers; see the "r1838813" thread on dev@) +0: rhuijben (please add the fix to allow the regression tests to - run on old python versions. +1 on the fix) + run on old python versions. +1 on the fix) (without r1842264) * r1839662 For 'local missing' conflicts, scan for moves only if a YCA is known.
svn commit: r1842264 - /subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Author: danielsh
Date: Fri Sep 28 16:14:15 2018
New Revision: 1842264
URL: http://svn.apache.org/viewvc?rev=1842264&view=rev
Log:
Follow-up to r1838813.
* subversion/tests/cmdline/svnadmin_tests.py
(check_recover_prunes_rep_cache):
Don't use AssertionError to signal test failure.
Set fsfs.conf enable-rep-sharing in all cases.
Guard against fsfs.conf not having a final newline.
Verify the result of 'recover', which the remainder of the test depends on.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1842264&r1=1842263&r2=1842264&view=diff
==
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Sep 28
16:14:15 2018
@@ -3873,14 +3873,17 @@ def check_recover_prunes_rep_cache(sbox,
sbox.simple_append('iota', 'New line.\n')
sbox.simple_commit()
rep_cache_r2 = read_rep_cache(sbox.repo_dir)
- assert len(rep_cache_r2) == len(rep_cache_r1) + 1
+ if not (len(rep_cache_r2) == len(rep_cache_r1) + 1):
+raise svntest.Failure
- # To test 'recover' while rep-sharing is disabled, disable it now.
- if not enable_rep_sharing:
-fsfs_conf = svntest.main.get_fsfs_conf_file_path(sbox.repo_dir)
-svntest.main.file_append(fsfs_conf,
- "[rep-sharing]\n"
- "enable-rep-sharing = false\n")
+ fsfs_conf = svntest.main.get_fsfs_conf_file_path(sbox.repo_dir)
+ svntest.main.file_append(fsfs_conf,
+ # Add a newline in case the existing file doesn't
+ # end with one.
+ "\n"
+ "[rep-sharing]\n"
+ "enable-rep-sharing = %s\n"
+ % (('true' if enable_rep_sharing else 'false'),))
# Break r2 in such a way that 'recover' will discard it
head_rev_path = fsfs_file(sbox.repo_dir, 'revs', '2')
@@ -3891,10 +3894,13 @@ def check_recover_prunes_rep_cache(sbox,
# Recover back to r1.
svntest.actions.run_and_verify_svnadmin(None, [],
"recover", sbox.repo_dir)
+ svntest.actions.run_and_verify_svnlook(['1\n'], [], 'youngest',
+ sbox.repo_dir)
# Check the rep-cache is pruned.
rep_cache_recovered = read_rep_cache(sbox.repo_dir)
- assert rep_cache_recovered == rep_cache_r1
+ if not (rep_cache_recovered == rep_cache_r1):
+raise svntest.Failure
@Issue(4077)
@SkipUnless(svntest.main.is_fs_type_fsfs)
svn commit: r1842262 - /subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Author: danielsh
Date: Fri Sep 28 15:56:47 2018
New Revision: 1842262
URL: http://svn.apache.org/viewvc?rev=1842262&view=rev
Log:
* subversion/tests/cmdline/svnadmin_tests.py
(read_rep_cache): Explain the magic numbers '3.8.2' and '2'.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1842262&r1=1842261&r2=1842262&view=diff
==
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Sep 28
15:56:47 2018
@@ -59,7 +59,8 @@ def read_rep_cache(repo_dir):
db_path = os.path.join(repo_dir, 'db', 'rep-cache.db')
db1 = svntest.sqlite3.connect(db_path)
schema1 = db1.execute("pragma user_version").fetchone()[0]
- # Can't test newer rep-cache schemas with an old built-in SQLite.
+ # Can't test newer rep-cache schemas with an old built-in SQLite; see the
+ # documentation of STMT_CREATE_SCHEMA_V2 in
../../libsvn_fs_fs/rep-cache-db.sql
if schema1 >= 2 and svntest.sqlite3.sqlite_version_info < (3, 8, 2):
raise svntest.Failure("Can't read rep-cache schema %d using old "
"Python-SQLite version %s < (3,8,2)" %
svn commit: r1842260 - /subversion/trunk/build/run_tests.py
Author: danielsh
Date: Fri Sep 28 15:41:56 2018
New Revision: 1842260
URL: http://svn.apache.org/viewvc?rev=1842260&view=rev
Log:
Fix a bug in 'make check GLOBAL_SCHEDULER=1'.
* build/run_tests.py
(TestHarness.Job._command_line, TestHarness.CollectingThread._count_py_tests):
Use sys.executable.
(TestHarness._run_global_scheduler): Ask a question.
Modified:
subversion/trunk/build/run_tests.py
Modified: subversion/trunk/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1842260&r1=1842259&r2=1842260&view=diff
==
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Fri Sep 28 15:41:56 2018
@@ -327,7 +327,7 @@ class TestHarness:
def _command_line(self, harness):
if self.is_python:
cmdline = list(harness.py_test_cmdline)
-cmdline.insert(0, 'python')
+cmdline.insert(0, sys.executable)
cmdline.insert(1, self.progabs)
# Run the test apps in "child process" mode,
# i.e. w/o cleaning up global directories etc.
@@ -375,7 +375,7 @@ class TestHarness:
def _count_py_tests(self, progabs, progdir, progbase):
'Run a c test, escaping parameters as required.'
- cmdline = [ 'python', progabs, '--list' ]
+ cmdline = [ sys.executable, progabs, '--list' ]
prog = subprocess.Popen(cmdline, stdout=subprocess.PIPE, cwd=progdir)
lines = prog.stdout.readlines()
@@ -448,6 +448,7 @@ class TestHarness:
job_queue = queue.Queue()
total_count = 0
scrambled = list(jobs)
+# TODO: What's this line doing, and what's the magic number?
scrambled.sort(key=lambda x: ("1" if x.test_count() < 30 else "0") +
str(x.number))
for job in scrambled:
total_count += job.test_count()
svn commit: r1842114 - /subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb
Author: danielsh
Date: Thu Sep 27 16:40:53 2018
New Revision: 1842114
URL: http://svn.apache.org/viewvc?rev=1842114&view=rev
Log:
* subversion/bindings/swig/ruby/test/test_util.rb: Move a test to the correct
function.
Found by: julianfoad
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb?rev=1842114&r1=1842113&r2=1842114&view=diff
==
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb Thu Sep 27
16:40:53 2018
@@ -27,12 +27,12 @@ class SvnUtilTest < Test::Unit::TestCase
def test_to_ruby_const_name
assert_equal("ABC", Svn::Util.to_ruby_const_name("abc"))
assert_equal("ABC_DEF", Svn::Util.to_ruby_const_name("abc_def"))
-assert_equal("XFoo", Svn::Util.to_ruby_class_name("_foo"))
end
def test_to_ruby_class_name
assert_equal("Abc", Svn::Util.to_ruby_class_name("abc"))
assert_equal("AbcDef", Svn::Util.to_ruby_class_name("abc_def"))
assert_equal("AbcDef", Svn::Util.to_ruby_class_name("ABC_DEF"))
+assert_equal("XFoo", Svn::Util.to_ruby_class_name("_foo"))
end
end
svn commit: r1842113 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Thu Sep 27 16:26:10 2018 New Revision: 1842113 URL: http://svn.apache.org/viewvc?rev=1842113&view=rev Log: * STATUS: Add regression test to a nomination. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1842113&r1=1842112&r2=1842113&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Thu Sep 27 16:26:10 2018 @@ -15,13 +15,13 @@ Status of 1.11.0: Candidate changes: == - * r1842107 + * r1842107, r1842112 Teach the Ruby bindings to handle experimental class names like svn_client__shelf_t. Justification: Unbreak the Ruby bindings following the __ patch. Votes: - +1: julianfoad + +1: julianfoad (without r1842112) Veto-blocked changes: =
svn commit: r1842112 - /subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb
Author: danielsh
Date: Thu Sep 27 16:24:52 2018
New Revision: 1842112
URL: http://svn.apache.org/viewvc?rev=1842112&view=rev
Log:
* subversion/bindings/swig/ruby/test/test_util.rb
(SvnUtilTest.test_to_ruby_const_name): Add a regression test for r1842107.
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb?rev=1842112&r1=1842111&r2=1842112&view=diff
==
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_util.rb Thu Sep 27
16:24:52 2018
@@ -27,6 +27,7 @@ class SvnUtilTest < Test::Unit::TestCase
def test_to_ruby_const_name
assert_equal("ABC", Svn::Util.to_ruby_const_name("abc"))
assert_equal("ABC_DEF", Svn::Util.to_ruby_const_name("abc_def"))
+assert_equal("XFoo", Svn::Util.to_ruby_class_name("_foo"))
end
def test_to_ruby_class_name
svn commit: r1842091 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Thu Sep 27 12:40:49 2018 New Revision: 1842091 URL: http://svn.apache.org/viewvc?rev=1842091&view=rev Log: * STATUS: Nominate r1842090 with Julian's vote. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1842091&r1=1842090&r2=1842091&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Thu Sep 27 12:40:49 2018 @@ -15,6 +15,13 @@ Status of 1.11.0: Candidate changes: == + * r1842090 + Warn on the combination of swig-3.0.8 --with-ruby due to a known issue. + Justification: + Help users identify a known-broken configuration. + Votes: + +1: danielsh, julianfoad + Veto-blocked changes: =
svn commit: r1842090 - /subversion/trunk/build/ac-macros/swig.m4
Author: danielsh Date: Thu Sep 27 12:38:18 2018 New Revision: 1842090 URL: http://svn.apache.org/viewvc?rev=1842090&view=rev Log: * build/ac-macros/swig.m4 (SVN_FIND_SWIG): Warn on the combination of swig-3.0.8 --with-ruby due to a known issue. Modified: subversion/trunk/build/ac-macros/swig.m4 Modified: subversion/trunk/build/ac-macros/swig.m4 URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/swig.m4?rev=1842090&r1=1842089&r2=1842090&view=diff == --- subversion/trunk/build/ac-macros/swig.m4 (original) +++ subversion/trunk/build/ac-macros/swig.m4 Thu Sep 27 12:38:18 2018 @@ -183,6 +183,11 @@ AC_DEFUN(SVN_FIND_SWIG, SWIG_RB_COMPILE="none" SWIG_RB_LINK="none" if test "$RUBY" != "none"; then +if test x"$SWIG_VERSION" = x"3""00""008"; then + # Use a local variable to escape the '#' sign. + ruby_swig_issue_602='https://subversion.apache.org/docs/release-notes/1.11#ruby-swig-issue-602' + AC_MSG_WARN([Ruby bindings are known not to support swig 3.0.8; see $ruby_swig_issue_602]) +fi rbconfig="$RUBY -rrbconfig -e " for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
svn commit: r1842085 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Thu Sep 27 11:29:05 2018 New Revision: 1842085 URL: http://svn.apache.org/viewvc?rev=1842085&view=rev Log: * docs/release-notes/1.11.html (#ruby-swig-issue-602): Fix instruction that would lead to false negatives. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842085&r1=1842084&r2=1842085&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Thu Sep 27 11:29:05 2018 @@ -512,7 +512,7 @@ issue #602. We recommend to use swi The failure is detected by the test suite. To test whether your version of swig is affected, run -make check-swig-py. (Some distros might have backported the swig +make check-swig-rb. (Some distros might have backported the swig patch into their swig-3.0.8 packages.) The Perl and Python bindings are not affected.
svn commit: r1842084 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Thu Sep 27 11:21:15 2018 New Revision: 1842084 URL: http://svn.apache.org/viewvc?rev=1842084&view=rev Log: * docs/release-notes/1.11.html (#ruby-swig-issue-602): Document how to test whether one's swig is affected. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842084&r1=1842083&r2=1842084&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Thu Sep 27 11:21:15 2018 @@ -510,6 +510,11 @@ may be fixed in later 1.11.x releases.https://github.com/swig/swig/issues/602";>swig issue #602. We recommend to use swig 3.0.9 or newer. +The failure is detected by the test suite. +To test whether your version of swig is affected, run +make check-swig-py. (Some distros might have backported the swig +patch into their swig-3.0.8 packages.) + The Perl and Python bindings are not affected.
svn commit: r1842083 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Thu Sep 27 11:16:27 2018 New Revision: 1842083 URL: http://svn.apache.org/viewvc?rev=1842083&view=rev Log: * docs/release-notes/1.11.html: Fix typo in comment syntax. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842083&r1=1842082&r2=1842083&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Thu Sep 27 11:16:27 2018 @@ -512,7 +512,7 @@ issue #602. We recommend to use swi The Perl and Python bindings are not affected. - < !-- ruby-swig-issue-602 -- > +
svn commit: r1842082 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Thu Sep 27 11:10:20 2018 New Revision: 1842082 URL: http://svn.apache.org/viewvc?rev=1842082&view=rev Log: * docs/release-notes/1.11.html (#ruby-swig-issue-602): New section. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842082&r1=1842081&r2=1842082&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Thu Sep 27 11:10:20 2018 @@ -493,12 +493,26 @@ commands. title="Link to this section">¶ + - + + +Ruby bindings require swig 3.0.9 + ¶ + + +The Ruby bindings are known not to build with swig version 3.0.8 (and only +that version) due to https://github.com/swig/swig/issues/602";>swig +issue #602. We recommend to use swig 3.0.9 or newer. + +The Perl and Python bindings are not affected. + + < !-- ruby-swig-issue-602 -- >
svn commit: r1841877 - /subversion/trunk/tools/dist/release.py
Author: danielsh
Date: Mon Sep 24 17:16:31 2018
New Revision: 1841877
URL: http://svn.apache.org/viewvc?rev=1841877&view=rev
Log:
* tools/dist/release.py: Document r1841085.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1841877&r1=1841876&r2=1841877&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Sep 24 17:16:31 2018
@@ -904,7 +904,8 @@ def create_tag_and_bump_versions(args):
# Clean dist
def clean_dist(args):
-'Clean the distribution directory of all but the most recent artifacts.'
+'''Clean the distribution directory of release artifacts of
+no-longer-supported minor lines.'''
stdout = subprocess.check_output(['svn', 'list', dist_release_url])
@@ -1511,8 +1512,7 @@ def main():
# The clean-dist subcommand
subparser = subparsers.add_parser('clean-dist',
-help='''Clean the distribution directory (and mirrors) of
-all but the most recent MAJOR.MINOR release.''')
+help=clean_dist.__doc__.split('\n\n')[0])
subparser.set_defaults(func=clean_dist)
subparser.add_argument('--dist-dir',
help='''The directory to clean.''')
svn commit: r1841855 - /subversion/trunk/tools/dist/security/parser.py
Author: danielsh Date: Mon Sep 24 14:22:53 2018 New Revision: 1841855 URL: http://svn.apache.org/viewvc?rev=1841855&view=rev Log: * tools/dist/security/parser.py (Notification.Metadata.__CULPRITS): Allow 'server' and 'client' to be specified in a tuple, to avoid a mixed-type API (compare str.__mod__()). Modified: subversion/trunk/tools/dist/security/parser.py Modified: subversion/trunk/tools/dist/security/parser.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/security/parser.py?rev=1841855&r1=1841854&r2=1841855&view=diff == --- subversion/trunk/tools/dist/security/parser.py (original) +++ subversion/trunk/tools/dist/security/parser.py Mon Sep 24 14:22:53 2018 @@ -50,9 +50,16 @@ class Notification(object): CULPRIT_SERVER = 'server' CULPRIT_CLIENT = 'client' -__CULPRITS = ((CULPRIT_SERVER, CULPRIT_CLIENT, - (CULPRIT_SERVER, CULPRIT_CLIENT), - (CULPRIT_CLIENT, CULPRIT_SERVER))) +# For compatibility, 'client' and 'server' may be specified either with +# or without a tuple. +__CULPRITS = ( +CULPRIT_SERVER, +CULPRIT_CLIENT, +(CULPRIT_SERVER,) +(CULPRIT_CLIENT,) +(CULPRIT_SERVER, CULPRIT_CLIENT), +(CULPRIT_CLIENT, CULPRIT_SERVER), +) def __init__(self, basedir, tracking_id, title, culprit, advisory, patches):
svn commit: r1841773 - /subversion/trunk/subversion/libsvn_wc/README
Author: danielsh Date: Sun Sep 23 18:40:57 2018 New Revision: 1841773 URL: http://svn.apache.org/viewvc?rev=1841773&view=rev Log: * subversion/libsvn_wc/README: Document 1.10's .svn/shelves/ directory. Modified: subversion/trunk/subversion/libsvn_wc/README Modified: subversion/trunk/subversion/libsvn_wc/README URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/README?rev=1841773&r1=1841772&r2=1841773&view=diff == --- subversion/trunk/subversion/libsvn_wc/README (original) +++ subversion/trunk/subversion/libsvn_wc/README Sun Sep 23 18:40:57 2018 @@ -95,6 +95,7 @@ copies. pristine//* Sharded directory containing base files. */ tmp/ /* Local tmp area. */ experimental//* Data for experimental features. */ + shelves/ /* Used by 1.10.x shelves implementation */ entries /* Stub file. */ format /* Stub file. */ @@ -115,6 +116,10 @@ copies. `experimental': Experimental (unstable) features store their data here. +`shelves': + Subversion 1.10's "svn shelve" command stores shelved changes here. + This directory is not used by any other minor release line. + `entries', `format': These stub files exist only to enable a pre-1.7 client to yield a clearer error message.
svn commit: r1841635 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Fri Sep 21 20:26:27 2018 New Revision: 1841635 URL: http://svn.apache.org/viewvc?rev=1841635&view=rev Log: * STATUS: Approve the r1841180 group. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841635&r1=1841634&r2=1841635&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Fri Sep 21 20:26:27 2018 @@ -41,14 +41,6 @@ Candidate changes: Votes: +1: julianfoad, brane - * r1841180, r1841524, r1841525 - Merge the 'java10-compat' branch to trunk - Justification: - Enables building against Java 10 which is becoming the default JDK in - many distributions - Votes: - +1: jcorvel, jamessan - Veto-blocked changes: = @@ -67,3 +59,14 @@ Approved changes: +1: julianfoad, jamessan +1: steveking + * r1841180, r1841524, r1841525 + Merge the 'java10-compat' branch to trunk + Justification: + Enables building against Java 10 which is becoming the default JDK in + many distributions + Votes: + +1: jcorvel, jamessan + +1: danielsh (confirmed the buildsystem parts won't affect anything other + than the java bindings; this counts as three +1s for the + build system changes) +
svn commit: r1841595 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Fri Sep 21 14:36:59 2018 New Revision: 1841595 URL: http://svn.apache.org/viewvc?rev=1841595&view=rev Log: * STATUS: Vote +1 on the r1841091 group, approving. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841595&r1=1841594&r2=1841595&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Fri Sep 21 14:36:59 2018 @@ -40,13 +40,6 @@ Candidate changes: Votes: +1: julianfoad, jamessan - * r1841091, r1841136 - Fix SVN-4776: Shelving: remove non-x-prefixed command aliases. - Justification: - Leaves the command-line UI clear for a future stable version. - Votes: - +1: julianfoad, jamessan - * r1841180, r1841524, r1841525 Merge the 'java10-compat' branch to trunk Justification: @@ -72,3 +65,11 @@ Veto-blocked changes: Approved changes: = + + * r1841091, r1841136 + Fix SVN-4776: Shelving: remove non-x-prefixed command aliases. + Justification: + Leaves the command-line UI clear for a future stable version. + Votes: + +1: julianfoad, jamessan, danielsh +
svn commit: r1841276 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Tue Sep 18 23:54:44 2018 New Revision: 1841276 URL: http://svn.apache.org/viewvc?rev=1841276&view=rev Log: * STATUS: Add dependency annotation. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841276&r1=1841275&r2=1841276&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Tue Sep 18 23:54:44 2018 @@ -56,6 +56,7 @@ Candidate changes: Justification: Expose both output forms while the API is experimental to get better feedback. (Or possibly just fall prey to the sunk cost fallacy.) + Depends: r1841098 Votes: +1: danielsh
svn commit: r1841273 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Tue Sep 18 22:51:33 2018 New Revision: 1841273 URL: http://svn.apache.org/viewvc?rev=1841273&view=rev Log: * STATUS: Nominate r1841272. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841273&r1=1841272&r2=1841273&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Tue Sep 18 22:51:33 2018 @@ -51,6 +51,14 @@ Candidate changes: Votes: +1: danielsh + * r1841272 + 'svn info --x-viewspec': Expose both output backends. + Justification: + Expose both output forms while the API is experimental to get better + feedback. (Or possibly just fall prey to the sunk cost fallacy.) + Votes: + +1: danielsh + Veto-blocked changes: =
svn commit: r1841272 - in /subversion/trunk/subversion/svn: cl.h info-cmd.c svn.c
Author: danielsh
Date: Tue Sep 18 22:49:10 2018
New Revision: 1841272
URL: http://svn.apache.org/viewvc?rev=1841272&view=rev
Log:
'svn info --x-viewspec': Expose both output backends.
* subversion/svn/cl.h
(svn_cl__opt_state_t::viewspec): Change from boolean to three-valued enum.
* subversion/svn/svn.c
(svn_cl__options."x-viewspec": Update arity and docstring.
(viewspec_from_word): New.
(sub_main): Parse new argument.
* subversion/svn/info-cmd.c
(cl_layout_list): Update signature. Add docstring.
(svn_cl__info): Percolate new argument.
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/info-cmd.c
subversion/trunk/subversion/svn/svn.c
Modified: subversion/trunk/subversion/svn/cl.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1841272&r1=1841271&r2=1841272&view=diff
==
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Tue Sep 18 22:49:10 2018
@@ -257,7 +257,11 @@ typedef struct svn_cl__opt_state_t
svn_boolean_t adds_as_modification; /* update 'add vs add' no tree conflict
*/
svn_boolean_t vacuum_pristines; /* remove unreferenced pristines */
svn_boolean_t drop; /* drop shelf after successful unshelve */
- svn_boolean_t viewspec;
+ enum svn_cl__viewspec_t {
+ svn_cl__viewspec_unspecified = 0 /* default */,
+ svn_cl__viewspec_classic,
+ svn_cl__viewspec_svn11
+ } viewspec; /* value of --x-viewspec */
} svn_cl__opt_state_t;
/* Conflict stats for operations such as update and merge. */
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1841272&r1=1841271&r2=1841272&view=diff
==
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Tue Sep 18 22:49:10 2018
@@ -242,8 +242,13 @@ output_svn_viewspec_py(void *layout_bato
return SVN_NO_ERROR;
}
+/*
+ * Call svn_client_layout_list(), using a receiver function decided
+ * by VIEWSPEC.
+ */
static svn_error_t *
cl_layout_list(apr_array_header_t *targets,
+ enum svn_cl__viewspec_t viewspec,
void *baton,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
@@ -269,22 +274,26 @@ cl_layout_list(apr_array_header_t *targe
llb.target_abspath = list_abspath;
llb.with_revs = TRUE;
- if (TRUE)
+ switch (viewspec)
{
+case svn_cl__viewspec_classic:
/* svn-viewspec.py format */
llb.vs_py_format = 2;
SVN_ERR(svn_client_layout_list(list_abspath,
output_svn_viewspec_py, &llb,
ctx, scratch_pool));
-}
- else
-{
+ break;
+case svn_cl__viewspec_svn11:
/* svn command-line format */
SVN_ERR(svn_client_layout_list(list_abspath,
output_svn_command_line, &llb,
ctx, scratch_pool));
+ break;
+default:
+ SVN_ERR_MALFUNCTION();
}
+
return SVN_NO_ERROR;
}
@@ -1181,7 +1190,7 @@ svn_cl__info(apr_getopt_t *os,
if (opt_state->viewspec)
{
- SVN_ERR(cl_layout_list(targets, baton, ctx, pool));
+ SVN_ERR(cl_layout_list(targets, opt_state->viewspec, baton, ctx, pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1841272&r1=1841271&r2=1841272&view=diff
==
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Tue Sep 18 22:49:10 2018
@@ -480,8 +480,10 @@ const apr_getopt_option_t svn_cl__option
{"drop", opt_drop, 0,
N_("drop shelf after successful unshelve")},
- {"x-viewspec", opt_viewspec, 0,
- N_("print the working copy layout")},
+ {"x-viewspec", opt_viewspec, 1,
+ N_("print the working copy layout, formatted
according\n"
+ " "
+ "to ARG: 'classic' or 'svn11'")},
/* Long-opt Aliases
*
@@ -2160,6 +2162,22 @@ add_search_pattern_to_latest_group(svn_c
APR_ARRAY_PUSH(group, const char *) = pattern;
}
+/* Parse the argument to the --x-viewspec option. */
+static svn_error_t *
+viewspec_from_word(enum svn_cl__viewspec_t *viewspec,
+ const char *utf8_opt_arg)
+{
+ if (!strcmp(utf8_opt_arg, "classic"))
svn commit: r1841099 - /subversion/branches/1.11.x/STATUS
Author: danielsh Date: Mon Sep 17 17:25:46 2018 New Revision: 1841099 URL: http://svn.apache.org/viewvc?rev=1841099&view=rev Log: * STATUS: Nominate r1841098. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841099&r1=1841098&r2=1841099&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Mon Sep 17 17:25:46 2018 @@ -44,6 +44,13 @@ Candidate changes: Votes: +1: julianfoad + * r1841098 + Rename --viewspec to --x-viewspec. See SVN-4776. + Justification: + Move experimental interfaces to a separate namespace. + Votes: + +1: danielsh + Veto-blocked changes: =
svn commit: r1841098 - /subversion/trunk/subversion/svn/svn.c
Author: danielsh
Date: Mon Sep 17 17:24:51 2018
New Revision: 1841098
URL: http://svn.apache.org/viewvc?rev=1841098&view=rev
Log:
* subversion/svn/svn.c: Rename --viewspec to --x-viewspec. See SVN-4776.
Modified:
subversion/trunk/subversion/svn/svn.c
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1841098&r1=1841097&r2=1841098&view=diff
==
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Mon Sep 17 17:24:51 2018
@@ -480,7 +480,7 @@ const apr_getopt_option_t svn_cl__option
{"drop", opt_drop, 0,
N_("drop shelf after successful unshelve")},
- {"viewspec", opt_viewspec, 0,
+ {"x-viewspec", opt_viewspec, 0,
N_("print the working copy layout")},
/* Long-opt Aliases
@@ -823,7 +823,7 @@ const svn_opt_subcommand_desc3_t svn_cl_
" about TARGET.\n"
"\n"), N_(
" EXPERIMENTAL:\n"
- " With --viewspec, print the working copy layout.\n"
+ " With --x-viewspec, print the working copy layout.\n"
)},
{'r', 'R', opt_depth, opt_targets, opt_incremental, opt_xml,
opt_changelist, opt_include_externals, opt_show_item, opt_no_newline,
svn commit: r1841089 - /subversion/site/publish/docs/community-guide/releasing.part.html
Author: danielsh Date: Mon Sep 17 16:32:36 2018 New Revision: 1841089 URL: http://svn.apache.org/viewvc?rev=1841089&view=rev Log: * docs/community-guide/releasing.part.html: Clarify a reference. Modified: subversion/site/publish/docs/community-guide/releasing.part.html Modified: subversion/site/publish/docs/community-guide/releasing.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1841089&r1=1841088&r2=1841089&view=diff == --- subversion/site/publish/docs/community-guide/releasing.part.html (original) +++ subversion/site/publish/docs/community-guide/releasing.part.html Mon Sep 17 16:32:36 2018 @@ -1199,7 +1199,8 @@ update links to the release announcement In addition, if this is a new minor release X.Y.0: - Update the community release support levels on + Update the community release support levels on the "Supported Versions" +section of ^/subversion/site/publish/docs/release-notes/index.html
svn commit: r1841088 - /subversion/site/publish/docs/community-guide/releasing.part.html
Author: danielsh Date: Mon Sep 17 16:31:07 2018 New Revision: 1841088 URL: http://svn.apache.org/viewvc?rev=1841088&view=rev Log: * docs/community-guide/releasing.part.html: Document r1841085. Modified: subversion/site/publish/docs/community-guide/releasing.part.html Modified: subversion/site/publish/docs/community-guide/releasing.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1841088&r1=1841087&r2=1841088&view=diff == --- subversion/site/publish/docs/community-guide/releasing.part.html (original) +++ subversion/site/publish/docs/community-guide/releasing.part.html Mon Sep 17 16:31:07 2018 @@ -1203,6 +1203,8 @@ update links to the release announcement ^/subversion/site/publish/docs/release-notes/index.html + Update supported_release_lines in release.py, removing old +lines as necessary. Remove the "draft" warning from ^/subversion/site/publish/docs/release-notes/X.Y.html
svn commit: r1841085 - /subversion/trunk/tools/dist/release.py
Author: danielsh
Date: Mon Sep 17 16:15:53 2018
New Revision: 1841085
URL: http://svn.apache.org/viewvc?rev=1841085&view=rev
Log:
release.py: Teach 'clean-dist' about LTS releases.
* tools/dist/release.py
(supported_release_lines): New.
(clean_dist): Update the logic for deciding which artifacts to remove to
reflect LTS releases.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1841085&r1=1841084&r2=1841085&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Sep 17 16:15:53 2018
@@ -112,6 +112,8 @@ tool_versions = {
# The version that is our current recommended release
# ### TODO: derive this from svn_version.h; see ../../build/getversion.py
recommended_release = '1.11'
+# For clean-dist, a whitelist of artifacts to keep, by version.
+supported_release_lines = frozenset({"1.9", "1.10", "1.11", "1.12"})
# Some constants
repos = 'https://svn.apache.org/repos/asf/subversion'
@@ -914,15 +916,15 @@ def clean_dist(args):
filenames = stdout.split('\n')
filenames = filter(lambda x: x.startswith('subversion-'), filenames)
versions = set(map(Version, filenames))
-minor_lines = set(map(minor, versions))
to_keep = set()
-# Keep 3 minor lines: 1.10.0-alpha3, 1.9.7, 1.8.19.
# TODO: When we release 1.A.0 GA we'll have to manually remove 1.(A-2).*
artifacts.
-for recent_line in sorted(minor_lines, reverse=True)[:3]:
-to_keep.add(max(
+for line_to_keep in [minor(Version(x + ".0")) for x in
supported_release_lines]:
+candidates = list(
x for x in versions
-if minor(x) == recent_line
-))
+if minor(x) == line_to_keep
+)
+if candidates:
+to_keep.add(max(candidates))
for i in sorted(to_keep):
logging.info("Saving release '%s'", i)
svn commit: r1840718 - /subversion/trunk/CHANGES
Author: danielsh Date: Wed Sep 12 16:07:18 2018 New Revision: 1840718 URL: http://svn.apache.org/viewvc?rev=1840718&view=rev Log: * CHANGES (1.11.0): Two minor tweaks. There was room before the 80 columns mark. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1840718&r1=1840717&r2=1840718&view=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Wed Sep 12 16:07:18 2018 @@ -4,7 +4,7 @@ http://svn.apache.org/repos/asf/subversi User-visible changes: - Major new features: -* Shelving no longer based on patch files (experimental) (issue #3625) +* Shelving is no longer based on patch files (experimental) (issue #3625) * Checkpointing (experimental) (issue #3626) * Viewspec output command (experimental) (r1826864) @@ -27,7 +27,7 @@ http://svn.apache.org/repos/asf/subversi - Client-side and server-side bugfixes: * Fix pattern-matching of top level path in listing with search (r1830599) -* Allow cmds like 'svn ci --file X' to work when X is a FIFO (r1836306) +* Allow commands like 'svn ci --file X' to work when X is a FIFO (r1836306) - Other tool improvements and bugfixes: * tools/client-side/bash_completion: Add '--password-from-stdin' (r1820045)
svn commit: r1839564 - /subversion/site/publish/packages.html
Author: danielsh Date: Wed Aug 29 11:00:05 2018 New Revision: 1839564 URL: http://svn.apache.org/viewvc?rev=1839564&view=rev Log: * packages.html: Remove packages that don't ship CVE-2018-9800 (and, in one case, don't ship 1.7.0 or newer). Modified: subversion/site/publish/packages.html Modified: subversion/site/publish/packages.html URL: http://svn.apache.org/viewvc/subversion/site/publish/packages.html?rev=1839564&r1=1839563&r2=1839564&view=diff == --- subversion/site/publish/packages.html (original) +++ subversion/site/publish/packages.html Wed Aug 29 11:00:05 2018 @@ -25,8 +25,7 @@ Find packages for your operating system: -AIX | - Centos Linux | +Centos Linux | Debian Linux | Fedora Linux | FreeBSD | @@ -71,25 +70,6 @@ facilitate that for you. - -AIX - ¶ - - - - -http://www.perzl.org/aix/index.php?n=Main.Subversion"; - >AIX Open Source Packages (maintained by - mailto:mich...@perzl.org"; - >Michael Perzl) - - - - - - - Centos Linux https://www.wandisco.com/subversion/"; >WANdisco; requires registration) -http://pkgs.repoforge.org/subversion/";> -Repoforge (client and server; -maintained by the http://www.repoforge.org/"; ->Repoforge project; -see the http://repoforge.org/use/";>repoforge user guide -for details) - @@ -334,22 +307,11 @@ $ yum install mod_dav_svn https://www.collab.net/subversion"; >CollabNet; requires registration) -https://the.earth.li/pub/subversion/summersoft.fay.ar.us/pub/subversion/latest/"; - >SummerSoft (Red Hat 8,9+; maintained by - mailto:da...@summersoft.fay.ar.us";>David Summers) - https://www.wandisco.com/subversion/download#redhat";> WANdisco (supported and certified by https://www.wandisco.com/subversion/"; >WANdisco; requires registration) -http://pkgs.repoforge.org/subversion/";> -Repoforge (client and server; -maintained by the http://www.repoforge.org/"; ->Repoforge project; -see the http://repoforge.org/use/";>repoforge user guide -for details) - @@ -369,11 +331,6 @@ $ yum install mod_dav_svn https://www.collab.net/subversion"; >CollabNet; requires registration) -https://www.opencsw.org/packages/subversion/"; - >OpenCSW (SPARC/i386; - https://www.opencsw.org/maintainers/rupert/"; - >Rupert Thurner) - https://www.wandisco.com/subversion/download#solaris";> WANdisco (supported and certified by https://www.wandisco.com/subversion/";
svn commit: r1839563 - /subversion/site/publish/packages.html
Author: danielsh Date: Wed Aug 29 10:52:05 2018 New Revision: 1839563 URL: http://svn.apache.org/viewvc?rev=1839563&view=rev Log: * packages.html (#windows): Remove packages vulnerable to CVE-2018-9800. Modified: subversion/site/publish/packages.html Modified: subversion/site/publish/packages.html URL: http://svn.apache.org/viewvc/subversion/site/publish/packages.html?rev=1839563&r1=1839562&r2=1839563&view=diff == --- subversion/site/publish/packages.html (original) +++ subversion/site/publish/packages.html Wed Aug 29 10:52:05 2018 @@ -488,10 +488,12 @@ $ apt-get install libapache2-svn https://www.wandisco.com/subversion/"; >WANdisco; requires registration) +
svn propchange: r1837938 - svn:log
Author: danielsh Revision: 1837938 Modified property: svn:log Modified: svn:log at Wed Aug 29 07:51:20 2018 -- --- svn:log (original) +++ svn:log Wed Aug 29 07:51:20 2018 @@ -1,6 +1,6 @@ Remove SHA1 checksums from 'downloads' page. -Per ASF policy: https://www.apache.org/dev/release-distributiontools/dist/release.pysigs-and-sums +Per ASF policy: https://www.apache.org/dev/release-distribution#sigs-and-sums -* /home/julianfoad/src/svn/site/publish/download.html +* download.html (source-releases): Remove SHA1 columns.
svn commit: r1839066 - /subversion/site/staging/download.html
Author: danielsh Date: Sat Aug 25 14:41:58 2018 New Revision: 1839066 URL: http://svn.apache.org/viewvc?rev=1839066&view=rev Log: * download.html: Mention that signatures are better than checksums. While here, add some details about sha512sum(1). Modified: subversion/site/staging/download.html Modified: subversion/site/staging/download.html URL: http://svn.apache.org/viewvc/subversion/site/staging/download.html?rev=1839066&r1=1839065&r2=1839066&view=diff == --- subversion/site/staging/download.html (original) +++ subversion/site/staging/download.html Sat Aug 25 14:41:58 2018 @@ -256,9 +256,11 @@ Other mirrors: % gpg --verify subversion-[version].tar.gz.asc subversion-[version].tar.gz -Alternatively, you can verify the checksums on the - files. A unix program called sha512sum - is included in many unix distributions. +If you're unable to verify the PGP signatures, you can instead verify the checksums on the files. + However, PGP signatures are superior to checksums, and we recommend to verify using PGP whenever possible. + +A unix program called sha512sum is included in many unix distributions. + Run sha512sum subversion-[version].tar.gz to display the hash of the downloaded file. On Windows you can use the following command in a command line window, for instance: certutil -hashfile <filename> SHA512.
svn commit: r1838820 - /subversion/branches/1.9.x/STATUS
Author: danielsh Date: Fri Aug 24 11:15:10 2018 New Revision: 1838820 URL: http://svn.apache.org/viewvc?rev=1838820&view=rev Log: * STATUS: Edit the r1838813 entry. Modified: subversion/branches/1.9.x/STATUS Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1838820&r1=1838819&r2=1838820&view=diff == --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Fri Aug 24 11:15:10 2018 @@ -123,6 +123,7 @@ Candidate changes: Can potentially lead to data loss. Votes: +1: julianfoad + +0: danielsh (haven't reviewed the regression test) Veto-blocked changes: =
svn commit: r1838821 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Fri Aug 24 11:15:12 2018 New Revision: 1838821 URL: http://svn.apache.org/viewvc?rev=1838821&view=rev Log: * STATUS: Edit the r1838813 entry. 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=1838821&r1=1838820&r2=1838821&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Aug 24 11:15:12 2018 @@ -105,6 +105,7 @@ Candidate changes: Can potentially lead to data loss. Votes: +1: julianfoad + +0: danielsh (haven't reviewed the regression test) Veto-blocked changes: =
svn commit: r1838750 - /subversion/site/publish/faq.html
Author: danielsh Date: Thu Aug 23 19:21:39 2018 New Revision: 1838750 URL: http://svn.apache.org/viewvc?rev=1838750&view=rev Log: * faq.html (#logo): Define acronyms on first use. Modified: subversion/site/publish/faq.html Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1838750&r1=1838749&r2=1838750&view=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Thu Aug 23 19:21:39 2018 @@ -675,10 +675,11 @@ For more information, see The following versions of the Subversion logo are available: -An https://svn.apache.org/repos/asf/subversion/trunk/notes/logo/subversion_logo.svg";>SVG version +An https://svn.apache.org/repos/asf/subversion/trunk/notes/logo/subversion_logo.svg"; +>SVG version An https://svn.apache.org/repos/asf/subversion/site/publish/logo/subversion_logo.eps";>EPS -version +href="https://svn.apache.org/repos/asf/subversion/site/publish/logo/subversion_logo.eps"; +>EPS version An https://svn.apache.org/repos/asf/subversion/site/publish/logo/subversion_logo.ai";>Adobe Illustrator document
svn commit: r1838749 - /subversion/site/publish/faq.html
Author: danielsh Date: Thu Aug 23 19:19:27 2018 New Revision: 1838749 URL: http://svn.apache.org/viewvc?rev=1838749&view=rev Log: * faq.html (#logo): Add link to the SVG version of the logo. Reorganize as a bulleted list. Modified: subversion/site/publish/faq.html Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1838749&r1=1838748&r2=1838749&view=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Thu Aug 23 19:19:27 2018 @@ -672,16 +672,22 @@ For more information, see title="Link to this section">¶ -Vectorized versions of the Subversion logo are available in the https://svn.apache.org/repos/asf/subversion/site/publish";>logo directory of the www -tree of the https://svn.apache.org/repos/asf/subversion/trunk";>Subversion -repository. +The following versions of the Subversion logo are available: -Specifically, an +An https://svn.apache.org/repos/asf/subversion/trunk/notes/logo/subversion_logo.svg";>SVG version +An https://svn.apache.org/repos/asf/subversion/site/publish/logo/subversion_logo.eps";>EPS -version, as well as an +An https://svn.apache.org/repos/asf/subversion/site/publish/logo/subversion_logo.ai";>Adobe -Illustrator document are available. +Illustrator document + + +Some additional artwork is available in Subversion's source tree under +https://svn.apache.org/repos/asf/subversion/trunk/notes/logo/";>notes/logo +and in +this Web site.
svn propchange: r1838539 - svn:log
Author: danielsh Revision: 1838539 Modified property: svn:log Modified: svn:log at Tue Aug 21 11:57:43 2018 -- --- svn:log (original) +++ svn:log Tue Aug 21 11:57:43 2018 @@ -3,3 +3,4 @@ sign. Patch by: jon +(tweaked by me)
svn commit: r1838541 - /subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
Author: danielsh Date: Tue Aug 21 11:57:27 2018 New Revision: 1838541 URL: http://svn.apache.org/viewvc?rev=1838541&view=rev Log: * contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in: Unbreak, after r1838539. (The breakage was my fault, not jon's.) Modified: subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Modified: subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in?rev=1838541&r1=1838540&r2=1838541&view=diff == --- subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in (original) +++ subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Tue Aug 21 11:57:27 2018 @@ -1205,10 +1205,10 @@ while (defined (my $load_dir = &get_next read_from_process($svn, 'propset', - $property_name, '--file', $tmpfile, '--', + $property_name, $add_file . "@"); } }
svn commit: r1838539 - /subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
Author: danielsh Date: Tue Aug 21 10:41:54 2018 New Revision: 1838539 URL: http://svn.apache.org/viewvc?rev=1838539&view=rev Log: * contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in: Add missing peg revision escaping, in case the filename contains an "@" sign. Patch by: jon Modified: subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Modified: subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in?rev=1838539&r1=1838538&r2=1838539&view=diff == --- subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in (original) +++ subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Tue Aug 21 10:41:54 2018 @@ -1208,7 +1208,8 @@ while (defined (my $load_dir = &get_next $property_name, '--file', $tmpfile, - $add_file); + '--', + $add_file . "@"); } } }
svn commit: r1837957 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Mon Aug 13 14:12:02 2018 New Revision: 1837957 URL: http://svn.apache.org/viewvc?rev=1837957&view=rev Log: Document r1837939. * docs/release-notes/1.11.html (#compat-misc): Uncomment, adjusting the closing tag's comment as required. (#no-sha1-in-dist): New section. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1837957&r1=1837956&r2=1837957&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Mon Aug 13 14:12:02 2018 @@ -138,7 +138,6 @@ to the upgrade. - ---> + + SHA-1 checksums will no longer be published for released artifacts (subversion-1.11.x.tar.* and subversion-1.11.x.zip) + ¶ + + +The release artifactsâsubversion-1.11.x.tar.bz2, + subversion-1.11.x.tar.gz, and + subversion-1.11.x.zipâare no longer +accompanied by *.sha1 files containing SHA-1 checksums, nor will SHA-1 +checksums be advertised on the download page or in release announcements. +PGP digital signatures and SHA-512 checksums will continue to be provided. + +We consider the SHA-1 cryptographic hash function too weak for our needs. + + + +
svn commit: r1837213 - /subversion/site/publish/docs/release-notes/1.11.html
Author: danielsh Date: Wed Aug 1 07:03:32 2018 New Revision: 1837213 URL: http://svn.apache.org/viewvc?rev=1837213&view=rev Log: * docs/release-notes/1.11.html: Add the work-in-progress notice. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified: subversion/site/publish/docs/release-notes/1.11.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1837213&r1=1837212&r2=1837213&view=diff == --- subversion/site/publish/docs/release-notes/1.11.html (original) +++ subversion/site/publish/docs/release-notes/1.11.html Wed Aug 1 07:03:32 2018 @@ -23,6 +23,11 @@ Apache Subversion 1.11 Release Notes + +This is work in progress. + Subversion 1.11 has not been released yet. + + What's New in Apache Subversion 1.11
svn propchange: r1836817 - svn:log
Author: danielsh Revision: 1836817 Modified property: svn:log Modified: svn:log at Fri Jul 27 15:55:49 2018 -- --- svn:log (original) +++ svn:log Fri Jul 27 15:55:49 2018 @@ -4,5 +4,5 @@ Fix a potential crash in JavaHL. (JNIUtil::wrappedCreateClientException): Don't store an invalid pointer to out-of-scope std::streambuf contents. -Found by David Binderman +Found by: David Binderman Fixes #4764
svn commit: r1835822 - /subversion/site/publish/docs/release-notes/1.10.html
Author: danielsh Date: Fri Jul 13 11:57:18 2018 New Revision: 1835822 URL: http://svn.apache.org/viewvc?rev=1835822&view=rev Log: Follow-up to r1835812: * publish/docs/release-notes/1.10.html (#news): Comment out table of contents entry of a section that is now itself commented out. Modified: subversion/site/publish/docs/release-notes/1.10.html Modified: subversion/site/publish/docs/release-notes/1.10.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.10.html?rev=1835822&r1=1835821&r2=1835822&view=diff == --- subversion/site/publish/docs/release-notes/1.10.html (original) +++ subversion/site/publish/docs/release-notes/1.10.html Fri Jul 13 11:57:18 2018 @@ -42,8 +42,10 @@ >Many enhancements and bug fixes Known issues in the release + Apache Subversion 1.10 is a superset of all previous Subversion
svn propchange: r1835760 - svn:log
Author: danielsh Revision: 1835760 Modified property: svn:log Modified: svn:log at Thu Jul 12 18:58:28 2018 -- --- svn:log (original) +++ svn:log Thu Jul 12 18:58:28 2018 @@ -1,8 +1,12 @@ +Fix segfault when subversion is built with gnome keyring support and keyring +password lookup fails. + * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (password_get_gnome_keyring, password_set_gnome_keyring): [in the SVN_HAVE_LIBSECRET version of these two functions] -Always initialize the output parameter. +Always initialize the output parameter, as required by the +svn_auth__password_get_t contract. Found by: Jan Palus -Tested by: Jan Palus -(just the getter) +Patch by: Jan Palus + me
svn commit: r1835764 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Thu Jul 12 18:53:04 2018 New Revision: 1835764 URL: http://svn.apache.org/viewvc?rev=1835764&view=rev Log: * STATUS: Fix the auto-generated nomination text. 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=1835764&r1=1835763&r2=1835764&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jul 12 18:53:04 2018 @@ -66,10 +66,7 @@ Candidate changes: +1: julianfoad * r1835760 - * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c - (password_get_gnome_keyring, password_set_gnome_keyring):[in the - SVN_HAVE_LIBSECRET version of these two functions]Always initialize - the output parameter. + Fix segfault in the gnome keyring password provider (libsecret version). Justification: Private API violation; fixes user-reported segfault due to uninitialized stack variable.
svn commit: r1835763 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Thu Jul 12 18:51:53 2018 New Revision: 1835763 URL: http://svn.apache.org/viewvc?rev=1835763&view=rev Log: * STATUS: Nominate r1835760. 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=1835763&r1=1835762&r2=1835763&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jul 12 18:51:53 2018 @@ -65,6 +65,17 @@ Candidate changes: Votes: +1: julianfoad + * r1835760 + * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c + (password_get_gnome_keyring, password_set_gnome_keyring):[in the + SVN_HAVE_LIBSECRET version of these two functions]Always initialize + the output parameter. + Justification: + Private API violation; fixes user-reported segfault due to uninitialized + stack variable. + Votes: + +1: danielsh + Veto-blocked changes: =
svn commit: r1835760 - /subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Author: danielsh
Date: Thu Jul 12 18:49:43 2018
New Revision: 1835760
URL: http://svn.apache.org/viewvc?rev=1835760&view=rev
Log:
* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
(password_get_gnome_keyring, password_set_gnome_keyring):
[in the SVN_HAVE_LIBSECRET version of these two functions]
Always initialize the output parameter.
Found by: Jan Palus
Tested by: Jan Palus
(just the getter)
Modified:
subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Modified: subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1835760&r1=1835759&r2=1835760&view=diff
==
--- subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
(original)
+++ subversion/trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Thu
Jul 12 18:49:43 2018
@@ -118,6 +118,8 @@ password_get_gnome_keyring(svn_boolean_t
{
GError *gerror = NULL;
gchar *gpassword;
+
+ *done = FALSE;
if (!available_collection(non_interactive, pool))
return SVN_NO_ERROR;
@@ -129,6 +131,7 @@ password_get_gnome_keyring(svn_boolean_t
NULL);
if (gerror)
{
+ /* ### TODO: return or log the error? */
g_error_free(gerror);
}
else if (gpassword)
@@ -156,6 +159,8 @@ password_set_gnome_keyring(svn_boolean_t
GError *gerror = NULL;
gboolean gstatus;
+ *done = FALSE;
+
if (!available_collection(non_interactive, pool))
return SVN_NO_ERROR;
@@ -170,6 +175,7 @@ password_set_gnome_keyring(svn_boolean_t
NULL);
if (gerror)
{
+ /* ### TODO: return or log the error? */
g_error_free(gerror);
}
else if (gstatus)
svn propchange: r1835049 - svn:log
Author: danielsh Revision: 1835049 Modified property: svn:log Modified: svn:log at Wed Jul 4 14:37:36 2018 -- --- svn:log (original) +++ svn:log Wed Jul 4 14:37:36 2018 @@ -2,8 +2,8 @@ (reposful_reposless_stanzas_inherit): New regression test. I've manually verified that `svnauthz accessof --repository project1 --path -/foo --username user1 --recursive ./foo` outputs 'rw' in 1.9 and 'no' in trunk, -where 'foo' contains the value of the newly-added variable 'rules'. +/foo --username user1 --recursive ./bar` outputs 'rw' in 1.9 and 'no' in trunk, +where 'bar' contains the value of the newly-added variable 'rules'. Reported by: Michael Ruder Thread: https://mail-archives.apache.org/mod_mbox/subversion-users/201807.mbox/%3Calpine.WNT.2.20.1807041318540.19228%40MICHAEL-NB.tau-tec.tu%3E
svn propchange: r1835049 - svn:log
Author: danielsh Revision: 1835049 Modified property: svn:log Modified: svn:log at Wed Jul 4 14:37:01 2018 -- --- svn:log (original) +++ svn:log Wed Jul 4 14:37:01 2018 @@ -2,7 +2,8 @@ (reposful_reposless_stanzas_inherit): New regression test. I've manually verified that `svnauthz accessof --repository project1 --path -/foo --username user1 --recursive authz` outputs 'rw' in 1.9 and 'no' in trunk. +/foo --username user1 --recursive ./foo` outputs 'rw' in 1.9 and 'no' in trunk, +where 'foo' contains the value of the newly-added variable 'rules'. Reported by: Michael Ruder Thread: https://mail-archives.apache.org/mod_mbox/subversion-users/201807.mbox/%3Calpine.WNT.2.20.1807041318540.19228%40MICHAEL-NB.tau-tec.tu%3E
svn commit: r1835049 - /subversion/trunk/subversion/tests/libsvn_repos/authz-test.c
Author: danielsh
Date: Wed Jul 4 11:57:53 2018
New Revision: 1835049
URL: http://svn.apache.org/viewvc?rev=1835049&view=rev
Log:
* subversion/tests/libsvn_repos/authz-test.c
(reposful_reposless_stanzas_inherit): New regression test.
I've manually verified that `svnauthz accessof --repository project1 --path
/foo --username user1 --recursive authz` outputs 'rw' in 1.9 and 'no' in trunk.
Reported by: Michael Ruder
Thread:
https://mail-archives.apache.org/mod_mbox/subversion-users/201807.mbox/%3Calpine.WNT.2.20.1807041318540.19228%40MICHAEL-NB.tau-tec.tu%3E
Modified:
subversion/trunk/subversion/tests/libsvn_repos/authz-test.c
Modified: subversion/trunk/subversion/tests/libsvn_repos/authz-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/authz-test.c?rev=1835049&r1=1835048&r2=1835049&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_repos/authz-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/authz-test.c Wed Jul 4
11:57:53 2018
@@ -478,6 +478,39 @@ issue_4741_groups(apr_pool_t *pool)
return SVN_NO_ERROR;
}
+static svn_error_t *
+reposful_reposless_stanzas_inherit(apr_pool_t *pool)
+{
+ const char rules[] =
+"[groups]" NL
+"company = user1, user2, user3" NL
+"customer = customer1, customer2"NL
+"" NL
+"# company can read-write on everything" NL
+"[/]"NL
+"@company = rw" NL
+"" NL
+"[project1:/]" NL
+"@customer = r" NL
+"" NL
+"[project2:/]" NL;
+
+ svn_stringbuf_t *buf = svn_stringbuf_create(rules, pool);
+ svn_stream_t *stream = svn_stream_from_stringbuf(buf, pool);
+ svn_authz_t *authz;
+ svn_boolean_t access_granted;
+
+ SVN_ERR(svn_repos_authz_parse(&authz, stream, NULL, pool));
+
+ SVN_ERR(svn_repos_authz_check_access(authz, "project1", "/foo", "user1",
+svn_authz_write | svn_authz_recursive,
+&access_granted,
+pool));
+ SVN_TEST_ASSERT(access_granted == TRUE);
+
+ return SVN_NO_ERROR;
+}
+
static int max_threads = 4;
static struct svn_test_descriptor_t test_funcs[] =
@@ -489,6 +522,8 @@ static struct svn_test_descriptor_t test
"test svn_authz__get_global_rights"),
SVN_TEST_PASS2(issue_4741_groups,
"issue 4741 groups"),
+SVN_TEST_XFAIL2(reposful_reposless_stanzas_inherit,
+"[foo:/] inherits [/]"),
SVN_TEST_NULL
};
svn commit: r1834878 - /subversion/trunk/tools/dist/backport_tests.py
Author: danielsh Date: Mon Jul 2 19:56:09 2018 New Revision: 1834878 URL: http://svn.apache.org/viewvc?rev=1834878&view=rev Log: * tools/dist/backport_tests.py (chdir): Add a docstring emphasising that this isn't fchdir(). Not driven so much by needs of this file as by the likelihood that someone (possibly future me) will crib this function for use elsewhere. Modified: subversion/trunk/tools/dist/backport_tests.py Modified: subversion/trunk/tools/dist/backport_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport_tests.py?rev=1834878&r1=1834877&r2=1834878&view=diff == --- subversion/trunk/tools/dist/backport_tests.py (original) +++ subversion/trunk/tools/dist/backport_tests.py Mon Jul 2 19:56:09 2018 @@ -53,6 +53,12 @@ import sys @contextlib.contextmanager def chdir(dir): + """This is a context manager that saves the current working directory's + pathname. Upon entry it chdir's to the argument DIR; upon exit it chdir's + back to the saved pathname. + + The current working directory is restored using os.chdir(), not os.fchdir(). + """ try: saved_dir = os.getcwd() os.chdir(dir)
svn commit: r1834834 - /subversion/trunk/subversion/tests/cmdline/shelf_tests.py
Author: danielsh Date: Mon Jul 2 10:19:30 2018 New Revision: 1834834 URL: http://svn.apache.org/viewvc?rev=1834834&view=rev Log: Follow-up to r1834810: * subversion/tests/cmdline/shelf_tests.py: Avoid using undefined string escapes, which are deprecated. Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/shelf_tests.py?rev=1834834&r1=1834833&r2=1834834&view=diff == --- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Mon Jul 2 10:19:30 2018 @@ -117,8 +117,8 @@ def shelve_unshelve_verify(sbox, modifie # List; ensure the shelf is listed expected_output = svntest.verify.RegexListOutput( -['foo\s*version \d+.*', - ' ' +[r'foo\s*version \d+.*', + r' ', ]) svntest.actions.run_and_verify_svn(expected_output, [], 'shelves')
svn commit: r1832240 - /subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py
Author: danielsh
Date: Fri May 25 13:32:41 2018
New Revision: 1832240
URL: http://svn.apache.org/viewvc?rev=1832240&view=rev
Log:
* tools/server-side/svnpubsub/svnwcsub.py: Clarify comment by expanding
an acronym.
Modified:
subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py
Modified: subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py?rev=1832240&r1=1832239&r2=1832240&view=diff
==
--- subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py Fri May 25
13:32:41 2018
@@ -32,7 +32,7 @@
# TODO:
# - bulk update at startup time to avoid backlog warnings
-# - fold BDEC into Daemon
+# - fold BigDoEverythingClasss ("BDEC") into Daemon
# - fold WorkingCopy._get_match() into __init__
# - remove wc_ready(). assume all WorkingCopy instances are usable.
# place the instances into .watch at creation. the .update_applies()
svn commit: r1829155 - /subversion/trunk/tools/dist/release.py
Author: danielsh
Date: Sat Apr 14 17:26:01 2018
New Revision: 1829155
URL: http://svn.apache.org/viewvc?rev=1829155&view=rev
Log:
release.py create-tag: Fix an out-of-date error when the branch has changed
after the magic revision.
* tools/dist/release.py
(create_tag): Use HEAD rather than the magic revision as the base revision
for the "Post-release housekeeping" commit.
Review by: julianfoad
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1829155&r1=1829154&r2=1829155&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Sat Apr 14 17:26:01 2018
@@ -832,11 +832,14 @@ def create_tag(args):
(args.version.major, args.version.minor,
args.version.patch + 1))
+HEAD = subprocess.check_output(['svn', 'info', '--show-item=revision',
+'--', url]).strip()
+HEAD = int(HEAD)
def file_object_for(relpath):
fd = tempfile.NamedTemporaryFile()
url = branch + '/' + relpath
fd.url = url
-subprocess.check_call(['svn', 'cat', '%s@%d' % (url, args.revnum)],
+subprocess.check_call(['svn', 'cat', '%s@%d' % (url, HEAD)],
stdout=fd)
return fd
@@ -850,7 +853,7 @@ def create_tag(args):
svn_version_h.seek(0, os.SEEK_SET)
STATUS.seek(0, os.SEEK_SET)
-subprocess.check_call(['svnmucc', '-r', str(args.revnum),
+subprocess.check_call(['svnmucc', '-r', str(HEAD),
'-m', 'Post-release housekeeping: '
'bump the %s branch to %s.'
% (branch.split('/')[-1], str(new_version)),
svn commit: r1827675 - /subversion/branches/1.10.x/STATUS
Author: danielsh Date: Sat Mar 24 20:25:27 2018 New Revision: 1827675 URL: http://svn.apache.org/viewvc?rev=1827675&view=rev Log: * STATUS: Edit the 1.10.x-x-shelve entry. Edit the r1825979 entry. 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=1827675&r1=1827674&r2=1827675&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Sat Mar 24 20:25:27 2018 @@ -49,16 +49,19 @@ Candidate changes: 1.10.x-x-shelve Votes: +1: julianfoad + +1: danielsh (Q: should shelf_write_patch()'s output line be updated too?) Veto-blocked changes: = - * r1825979 + * r1825979, r1827670 Minor clarification to docstring. Justification: Trivial documentation fix. Votes: - +1: danielsh, jamessan + +1: danielsh + Votes (without r1827670): + +1: jamessan -1: brane (the docstring "clarification" is wrong, since we do not propagate the compression level to LZ4)
svn commit: r1827670 - /subversion/trunk/subversion/include/svn_ra_svn.h
Author: danielsh Date: Sat Mar 24 20:07:03 2018 New Revision: 1827670 URL: http://svn.apache.org/viewvc?rev=1827670&view=rev Log: * subversion/include/svn_ra_svn.h (svn_ra_svn_create_conn5): Further clarify docstring, after r1825979. Patch by: brane Modified: subversion/trunk/subversion/include/svn_ra_svn.h Modified: subversion/trunk/subversion/include/svn_ra_svn.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra_svn.h?rev=1827670&r1=1827669&r2=1827670&view=diff == --- subversion/trunk/subversion/include/svn_ra_svn.h (original) +++ subversion/trunk/subversion/include/svn_ra_svn.h Sat Mar 24 20:07:03 2018 @@ -179,7 +179,9 @@ typedef svn_error_t *(*svn_ra_svn_edit_c * * Either @a sock or @a in_stream/@a out_stream must be set, not both. * @a compression_level specifies the desired network data compression - * level (zlib/lz4) from 0 (no compression) to 9 (best but slowest). + * level from 0 (no compression) to 9 (best but slowest). The effect + * of the parameter depends on the compression algorithm; for example, + * it is used verbatim by zlib/deflate but ignored by LZ4. * * If @a zero_copy_limit is not 0, cached file contents smaller than the * given limit may be sent directly to the network socket. Otherwise,
svn commit: r1827665 - /subversion/branches/swig-py3/BRANCH-README
Author: danielsh Date: Sat Mar 24 19:23:28 2018 New Revision: 1827665 URL: http://svn.apache.org/viewvc?rev=1827665&view=rev Log: On the swig-py3 branch: * BRANCH-README: Record that svn_stream_read() should be taught to return bytes. Modified: subversion/branches/swig-py3/BRANCH-README Modified: subversion/branches/swig-py3/BRANCH-README URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/BRANCH-README?rev=1827665&r1=1827664&r2=1827665&view=diff == --- subversion/branches/swig-py3/BRANCH-README (original) +++ subversion/branches/swig-py3/BRANCH-README Sat Mar 24 19:23:28 2018 @@ -19,6 +19,8 @@ TODO * Make the error more meaningful if the user attempts to build python swig bindings, even if py3c was disabled or not found. Currently the error on makefile builds is "none: command not found", which isn't very descriptive. +* Make svn_stream_read() [and possibly other functions?] return bytes rather + than str: https://mail-archives.apache.org/mod_mbox/subversion-dev/201803.mbox/%3C20180323081026.cqgbhdzfxv2lwm24%40tarpaulin.shahaf.local2%3E References:
