svn commit: r1864040 - in /subversion/site: publish/docs/release-notes/index.html tools/upcoming.py

[ju...@apache.org]

Author: julianfoad
Date: Wed Jul 31 09:30:58 2019
New Revision: 1864040

URL: http://svn.apache.org/viewvc?rev=1864040&view=rev
Log:
Make the 'upcoming changes' script tell which branch it's reporting, and remove that info from the prose.

Modified:
    subversion/site/publish/docs/release-notes/index.html
    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=1864040&r1=1864039&r2=1864040&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/index.html (original)
+++ subversion/site/publish/docs/release-notes/index.html Wed Jul 31 09:30:58 2019
@@ -78,11 +78,11 @@ official support status for the various
     title="Link to this section">&para;</a>
 </h3>
 
-<p>The following changes have been merged to the 1.11.x branch since the last 1.11.x patch release and will almost certainly be included in the next 1.11.x patch release:</p>
+<p>The following changes have been merged since the last patch release and will almost certainly be included in the next patch release:</p>
 
 <!--#include virtual="/upcoming.part.html" -->
 
-<p>Further changes currently under consideration are listed in <a href="http://svn.apache.org/repos/asf/subversion/branches/1.11.x/STATUS">1.11.x/STATUS</a>.</p>
+<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>
 

Modified: subversion/site/tools/upcoming.py
URL: http://svn.apache.org/viewvc/subversion/site/tools/upcoming.py?rev=1864040&r1=1864039&r2=1864040&view=diff
==============================================================================
--- subversion/site/tools/upcoming.py (original)
+++ subversion/site/tools/upcoming.py Wed Jul 31 09:30:58 2019
@@ -41,6 +41,12 @@ def copyfrom_revision_of_previous_tag_of
         ).decode()
     return int(re.compile(r'[(]from \S*:(\d+)[)]').search(log_output).group(1))
 
+def relative_url():
+    """Return the repository-relative URL (with '^/' prefix) of the current
+       working directory, which is expected to be the root of a branch.
+    """
+    return subprocess.check_output([SVN, 'info', '--show-item', 'relative-url']).decode().rstrip('\n')
+
 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."""
@@ -52,14 +58,14 @@ def get_merges_for_range(start, 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'))
+        is_merge = relative_url()[1:] in (path.text for path in logentry.findall('.//path'))
         if is_merge:
             yield logentry
 
 def main():
+    print("Changes in " + relative_url() + ":")
+
     start_revision = copyfrom_revision_of_previous_tag_of_this_stable_branch() + 1
     for logentry in get_merges_for_range(start_revision, "HEAD"):
         f = lambda s: logentry.findall('./' + s)[0].text