Include subheaders in script output (#10212)

* Include subheaders in script output

When selecting a specific version, we want to include all its
subheaders in the generated output.

* Line too long.

* Fix indentation

Author: rlazo

scripts/make_release_notes.py

@@ -256,22 +256,29 @@ def read_changelog_section(filename, single_version=None):
     # Discard all lines until we see a heading that either has the version the
     # user asked for or any version.
     if single_version:
-      initial_heading = re.compile(r'^#{1,6} .*%s' % re.escape(single_version))
+      initial_heading = re.compile(
+          r'^(#{1,6}) .*%s' % re.escape(single_version))
     else:
-      initial_heading = re.compile(r'^#{1,6} ([^\d]*)\d')
+      initial_heading = re.compile(r'^#({1,6}) ([^\d]*)\d')
 
-    heading = re.compile(r'^#{1,6} ')
+    heading = re.compile(r'^(#{1,6}) ')
 
     initial = True
+    heading_level = 6
     result = []
     for line in fd:
       if initial:
-        if initial_heading.match(line):
+        match = initial_heading.match(line)
+        if match:
           initial = False
+          heading_level = len(match.group(1))
           result.append(line)
 
       else:
-        if heading.match(line):
+        match = heading.match(line)
+        # We only break if we find a new header at the same, or higher,
+        # level.
+        if match and len(match.group(1)) <= heading_level:
           break
 
         result.append(line)