Patchwork D2254: releasenotes: allow notes for multiple directives in a single changeset

login
register
mail settings
Submitter phabricator
Date March 7, 2018, 4:27 p.m.
Message ID <029a13688ac1f1dd76b8b5baad156b00@localhost.localdomain>
Download mbox | patch
Permalink /patch/29094/
State Not Applicable
Headers show

Comments

phabricator - March 7, 2018, 4:27 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa5891e94bfe1: releasenotes: allow notes for multiple directives in a single changeset (authored by rishabhmadan96, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2254?vs=6592&id=6695

REVISION DETAIL
  https://phab.mercurial-scm.org/D2254

AFFECTED FILES
  hgext/releasenotes.py
  tests/test-releasenotes-formatting.t

CHANGE DETAILS




To: rishabhmadan96, #hg-reviewers, durin42
Cc: pulkit, mercurial-devel

Patch

diff --git a/tests/test-releasenotes-formatting.t b/tests/test-releasenotes-formatting.t
--- a/tests/test-releasenotes-formatting.t
+++ b/tests/test-releasenotes-formatting.t
@@ -457,3 +457,35 @@ 
   ------------------
   
   First paragraph of fix 1.
+
+  $ cd ..
+
+Using multiple admonitions in same changeset
+
+  $ hg init relnotes-multiadmon
+  $ cd relnotes-multiadmon
+
+  $ touch file1
+  $ hg -q commit -A -l - << EOF
+  > commit 1
+  > 
+  > .. feature::
+  > 
+  >    Details about new feature.
+  > 
+  > .. perf::
+  > 
+  >    Improves the execution by 2x
+  > EOF
+
+  $ hg releasenotes -r . $TESTTMP/relnotes-multiple-admonitions
+  $ cat $TESTTMP/relnotes-multiple-admonitions
+  New Features
+  ============
+  
+  * Details about new feature.
+  
+  Performance Improvements
+  ========================
+  
+  * Improves the execution by 2x
diff --git a/hgext/releasenotes.py b/hgext/releasenotes.py
--- a/hgext/releasenotes.py
+++ b/hgext/releasenotes.py
@@ -324,6 +324,9 @@ 
                 if pblock['type'] == 'margin':
                     continue
 
+                if pblock['type'] == 'admonition':
+                    break
+
                 if pblock['type'] != 'paragraph':
                     repo.ui.warn(_('changeset %s: unexpected block in release '
                         'notes directive %s\n') % (ctx, directive))