[PATCH v3] releasenotes: add custom admonitions support for release notes

Rishabh Madan rishabhmadan96 at gmail.com
Sun Jul 9 17:04:33 UTC 2017


# HG changeset patch
# User Rishabh Madan <rishabhmadan96 at gmail.com>
# Date 1499619850 -7200
#      Sun Jul 09 19:04:10 2017 +0200
# Node ID 5f22d3d43d36d46cea98c86b2a49eee2d323fd9e
# Parent  4672db164c986da4442bd864cd044512d975c3f2
releasenotes: add custom admonitions support for release notes

By default, the extension has default sections like fix, feature, perf etc.. This
patch allow user to add support for custom admonition. In order to add a custom
admonition, one needs to have a .hgreleasenotes file inside the repository. All the
custom directive with name specified under the tag [sections] will be
usable by the extension. One important thing to keep in mind is if there exists any
custom admonitions with same key as default then they will override the default ones.

diff -r 4672db164c98 -r 5f22d3d43d36 hgext/releasenotes.py
--- a/hgext/releasenotes.py	Sat Jun 24 15:29:42 2017 -0700
+++ b/hgext/releasenotes.py	Sun Jul 09 19:04:10 2017 +0200
@@ -20,6 +20,7 @@
 
 from mercurial.i18n import _
 from mercurial import (
+    config,
     error,
     minirst,
     registrar,
@@ -111,9 +112,25 @@
                 self.addnontitleditem(section, paragraphs)
 
 class releasenotessections(object):
-    def __init__(self, ui):
-        # TODO support defining custom sections from config.
-        self._sections = list(DEFAULT_SECTIONS)
+    def __init__(self, ui, repo=None):
+        if repo:
+            custom_sections = getcustomadmonitions(repo)
+            if custom_sections:
+                self._sections = custom_sections
+                for default_name, default_value in DEFAULT_SECTIONS:
+                    duplicate_key = False
+                    for name, value in custom_sections:
+                        if name == default_name:
+                            duplicate_key = True
+                            break
+                    if duplicate_key:
+                        continue
+                    else:
+                        self._sections.append((default_name, default_value))
+            else:
+                self._sections = list(DEFAULT_SECTIONS)
+        else:
+            self._sections = list(DEFAULT_SECTIONS)
 
     def __iter__(self):
         return iter(self._sections)
@@ -128,6 +145,29 @@
 
         return None
 
+def getcustomadmonitions(repo):
+    custom_sections = list()
+    ctx = repo['.']
+    p = config.config()
+    repo = ctx.repo()
+
+    def read(f, sections=None, remap=None):
+        if f in ctx:
+            data = ctx[f].data()
+            p.parse(f, data, sections, remap, read)
+            sectiondict = p['sections']
+            sectionlist = list()
+            for key, value in sectiondict.iteritems():
+                temp = (key, value)
+                sectionlist.append(temp)
+            return sectionlist
+        else:
+            return
+
+    if '.hgreleasenotes' in ctx:
+        custom_sections = read('.hgreleasenotes')
+    return custom_sections
+
 def parsenotesfromrevisions(repo, directives, revs):
     notes = parsedreleasenotes()
 
@@ -311,7 +351,6 @@
                 lines.extend(wrapper.wrap(' '.join(para)))
 
             lines.append('')
-
     if lines[-1]:
         lines.append('')
 
@@ -396,7 +435,7 @@
     that file. A particular use case for this is to tweak the wording of a
     release note after it has been added to the release notes file.
     """
-    sections = releasenotessections(ui)
+    sections = releasenotessections(ui, repo)
 
     revs = scmutil.revrange(repo, [rev or 'not public()'])
     incoming = parsenotesfromrevisions(repo, sections.names(), revs)
@@ -411,12 +450,11 @@
         notes = parsedreleasenotes()
 
     notes.merge(ui, incoming)
-
     with open(file_, 'wb') as fh:
         fh.write(serializenotes(sections, notes))
 
 @command('debugparsereleasenotes', norepo=True)
-def debugparsereleasenotes(ui, path):
+def debugparsereleasenotes(ui, path, repo=None):
     """parse release notes and print resulting data structure"""
     if path == '-':
         text = sys.stdin.read()
@@ -424,7 +462,7 @@
         with open(path, 'rb') as fh:
             text = fh.read()
 
-    sections = releasenotessections(ui)
+    sections = releasenotessections(ui, repo)
 
     notes = parsereleasenotesfile(sections, text)
 
diff -r 4672db164c98 -r 5f22d3d43d36 tests/test-releasenotes-formatting.t
--- a/tests/test-releasenotes-formatting.t	Sat Jun 24 15:29:42 2017 -0700
+++ b/tests/test-releasenotes-formatting.t	Sun Jul 09 19:04:10 2017 +0200
@@ -255,6 +255,8 @@
   
   * Short summary of fix 3
 
+  $ cd ..
+
 Multiple 'Other Changes' sub-sections for every section
 
   $ hg init multiple-otherchanges
@@ -324,3 +326,52 @@
   
   * Short summary of fix 2
 
+  $ cd ..
+
+Using custom sections in notes
+
+  $ hg init custom-section
+  $ cd custom-section
+  $ cat >> .hgreleasenotes << EOF
+  > [sections]
+  > testsection=Name of Section
+  > EOF
+
+  $ touch a
+  $ hg -q commit -A -l - << EOF
+  > commit 1
+  > 
+  > .. testsection::
+  > 
+  >    First paragraph under this admonition.
+  > EOF
+
+  $ hg releasenotes -r . $TESTTMP/relnotes-custom-section
+  $ cat $TESTTMP/relnotes-custom-section
+  Name of Section
+  ===============
+  
+  * First paragraph under this admonition.
+
+Overriding default sections (For eg. by default feature = New Features)
+
+  $ cat >> .hgreleasenotes << EOF
+  > [sections]
+  > feature=Feature Additions
+  > EOF
+
+  $ touch b
+  $ hg -q commit -A -l - << EOF
+  > commit 2
+  > 
+  > .. feature::
+  > 
+  >    Adds a new feature.
+  > EOF
+
+  $ hg releasenotes -r . $TESTTMP/relnotes-override-section
+  $ cat $TESTTMP/relnotes-override-section
+  Feature Additions
+  =================
+  
+  * Adds a new feature.


More information about the Mercurial-devel mailing list