Author: danielsh
Date: Fri Aug 2 19:29:51 2019
New Revision: 1864281
URL: http://svn.apache.org/viewvc?rev=1864281&view=rev
Log:
site: Auto-update the link the the current release's STATUS file to always
point to the current stable branch.
* publish/docs/release-notes/index.html
(#upcoming-patch-release): Move a sentence from here..
* publish/upcoming.part.html: .. to here, which is automatically generated ..
* tools/generate-upcoming-changes-log.sh: .. here.
* tools/upcoming.py
(Version.__str__): New.
(get_reference_version): Add comment.
Modified:
subversion/site/publish/docs/release-notes/index.html
subversion/site/publish/upcoming.part.html
subversion/site/tools/generate-upcoming-changes-log.sh
subversion/site/tools/upcoming.py
Modified: subversion/site/publish/docs/release-notes/index.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/index.html?rev=1864281&r1=1864280&r2=1864281&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/index.html (original)
+++ subversion/site/publish/docs/release-notes/index.html Fri Aug 2 19:29:51
2019
@@ -82,8 +82,6 @@ official support status for the various
<!--#include virtual="/upcoming.part.html" -->
-<p>Further changes currently under consideration are listed in each release
line's <a
href="http://svn.apache.org/repos/asf/subversion/branches/1.12.x/STATUS";>STATUS</a>
file.</p>
-
<p>See also <a
href="http://svn.apache.org/repos/asf/subversion/trunk/CHANGES";>trunk/CHANGES</a>,
where all significant-enough changes will summarized for each version by the
time it is released.</p>
<p>The list above is generated daily by <a
href="http://svn.apache.org/repos/asf/subversion/site/tools/upcoming.py";>^/subversion/site/tools/upcoming.py</a>.
You could find the changes queued for another release line by running that
script in a working copy of, for example, the 1.10.x branch.</p>
Modified: subversion/site/publish/upcoming.part.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1864281&r1=1864280&r2=1864281&view=diff
==============================================================================
--- subversion/site/publish/upcoming.part.html (original)
+++ subversion/site/publish/upcoming.part.html Fri Aug 2 19:29:51 2019
@@ -110,3 +110,6 @@ Merge the <a href="https://svn.apache.or
------------------------------------------------------------------------
</pre>
+
+<p>Further changes currently under consideration are listed in each release
line's
+<a
href="https://svn.apache.org/repos/asf/subversion/branches/1.12.x/STATUS";>STATUS</a>
file.</p>
Modified: subversion/site/tools/generate-upcoming-changes-log.sh
URL:
http://svn.apache.org/viewvc/subversion/site/tools/generate-upcoming-changes-log.sh?rev=1864281&r1=1864280&r2=1864281&view=diff
==============================================================================
--- subversion/site/tools/generate-upcoming-changes-log.sh (original)
+++ subversion/site/tools/generate-upcoming-changes-log.sh Fri Aug 2 19:29:51
2019
@@ -6,12 +6,18 @@ set -e
: ${SVN:=svn}
+# TODO: This is a bit wasteful: get_reference_version() will be called once by
+# this script and once by upcoming.py.
+reference_version=`cd ~/src/svn/site/tools && python3 -c 'import upcoming;
print(upcoming.get_reference_version())'`
~/src/svn/site/tools/upcoming.py |
{
echo "<!-- Automatically generated by
^/subversion/site/tools/generate-upcoming-changes-log.sh -->"
echo '<pre style="border-style: none">'
~/src/svn/site/tools/escape.py
echo "</pre>"
+ echo ""
+ echo "<p>Further changes currently under consideration are listed in each
release line's "
+ echo "<a
href=\"https://svn.apache.org/repos/asf/subversion/branches/${reference_version%.*}.x/STATUS\";>STATUS</a>
file.</p>"
} > ~/src/svn/site/publish/upcoming.part.html
${SVN} commit ~/src/svn/site/publish/upcoming.part.html -m "*
upcoming.part.html: Automatically regenerated"
Modified: subversion/site/tools/upcoming.py
URL:
http://svn.apache.org/viewvc/subversion/site/tools/upcoming.py?rev=1864281&r1=1864280&r2=1864281&view=diff
==============================================================================
--- subversion/site/tools/upcoming.py (original)
+++ subversion/site/tools/upcoming.py Fri Aug 2 19:29:51 2019
@@ -25,6 +25,7 @@ DIST_RELEASE_URL = 'https://dist.apache.
REPOS_ROOT_URL = 'https://svn.apache.org/repos/asf'
Version = collections.namedtuple('Version', 'major minor patch')
+Version.__str__ = lambda self:
'{major}.{minor}.{patch}'.format(**self._asdict())
def versions_on_dist_release():
"""Return a set of Version objects representing the versions that are
@@ -65,6 +66,7 @@ def get_reference_version__latest_stable
oldest_patch_version_within_newest_minor_line = min(v for v in versions if
v[:2] == max(versions)[:2])
return oldest_patch_version_within_newest_minor_line
+# Note: This function is also called by ./generate-upcoming-changes-log.sh.
def get_reference_version():
"Return the version to use as the oldest end of the 'svn log' output to
generate."
def _is_working_copy():
