From commits-return-49109-archive-asf-public=cust-asf.ponee.io@subversion.apache.org  Fri Jul 20 16:36:37 2018
Return-Path: <commits-return-49109-archive-asf-public=cust-asf.ponee.io@subversion.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 43C1F180663
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 20 Jul 2018 16:36:37 +0200 (CEST)
Received: (qmail 5823 invoked by uid 500); 20 Jul 2018 14:36:36 -0000
Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@subversion.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@subversion.apache.org>
List-Post: <mailto:commits@subversion.apache.org>
List-Id: <commits.subversion.apache.org>
Reply-To: dev@subversion.apache.org
Delivered-To: mailing list commits@subversion.apache.org
Received: (qmail 5812 invoked by uid 99); 20 Jul 2018 14:36:36 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jul 2018 14:36:36 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id B869C3A0041
	for <commits@subversion.apache.org>; Fri, 20 Jul 2018 14:36:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1836350 - /subversion/trunk/tools/dist/release.py
Date: Fri, 20 Jul 2018 14:36:35 -0000
To: commits@subversion.apache.org
From: julianfoad@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20180720143635.B869C3A0041@svn01-us-west.apache.org>

Author: julianfoad
Date: Fri Jul 20 14:36:35 2018
New Revision: 1836350

URL: http://svn.apache.org/viewvc?rev=1836350&view=rev
Log:
Teach 'release.py write-news' to insert the output into a file.

With the new option '--edit-html-file=FILE', it inserts the news item
before the first existing news item in FILE instead of printing it.

(It does not take care of remove old news items from 'index.html'.)

* /home/julianfoad/src/subversion-g/tools/dist/release.py
  (write_news): Insert the news before a '<div class="h3" id="news-' line.
  (main): Accept '--edit-html-file=' option.

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=1836350&r1=1836349&r2=1836350&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Fri Jul 20 14:36:35 2018
@@ -51,6 +51,7 @@ import operator
 import itertools
 import subprocess
 import argparse       # standard in Python 2.7
+import io
 
 # Find ezt, using Subversion's copy, if there isn't one on the system.
 try:
@@ -977,7 +978,22 @@ def write_news(args):
 
     template = ezt.Template()
     template.parse(get_tmplfile(template_filename).read())
-    template.generate(sys.stdout, data)
+
+    # Insert the output into an existing file if requested, else print it
+    if args.edit_html_file:
+        tmp_name = args.edit_html_file + '.tmp'
+        with open(args.edit_html_file, 'r') as f, open(tmp_name, 'w') as g:
+            inserted = False
+            for line in f:
+                if not inserted and line.startswith('<div class="h3" id="news-'):
+                    template.generate(g, data)
+                    g.write('\n')
+                    inserted = True
+                g.write(line)
+        os.remove(args.edit_html_file)
+        os.rename(tmp_name, args.edit_html_file)
+    else:
+        template.generate(sys.stdout, data)
 
 
 def get_sha1info(args):
@@ -1510,6 +1526,9 @@ def main():
     subparser.set_defaults(func=write_news)
     subparser.add_argument('--announcement-url',
                     help='''The URL to the archived announcement email.''')
+    subparser.add_argument('--edit-html-file',
+                    help='''Insert the text into this file
+                            news.html, index.html).''')
     subparser.add_argument('version', type=Version,
                     help='''The release label, such as '1.7.0-alpha1'.''')