Patchwork D2253: releasenotes: mention changeset with warning and abort

login
register
mail settings
Submitter phabricator
Date Feb. 14, 2018, 7:31 a.m.
Message ID <differential-rev-PHID-DREV-ev6satahvhvd62pnlmgv-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27887/
State Superseded
Headers show

Comments

phabricator - Feb. 14, 2018, 7:31 a.m.
rishabhmadan96 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Output the changeset hash with the warning/abort message just to know where things messed up.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/releasenotes.py

CHANGE DETAILS




To: rishabhmadan96, #hg-reviewers
Cc: mercurial-devel
phabricator - Feb. 14, 2018, 9:58 a.m.
pulkit added a comment.


  I think ordering on the patches here is wrong. https://phab.mercurial-scm.org/D2255 seems to be parent of this one. Also can you add related tests?

INLINE COMMENTS

> releasenotes.py:315
> +                raise error.Abort(_('changeset %s: release notes directive %s '
> +                        'lacks content') % (node.hex(ctx.node()), directive))
>  

No need for `node.hex(ctx.node())`, just use ctx.

> releasenotes.py:329
> +                    repo.ui.warn(_('changeset %s: unexpected block in release '
> +                    'notes directive %s\n') % (node.hex(ctx.node()), directive))
>  

Same as above.

REPOSITORY
  rHG Mercurial

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

To: rishabhmadan96, #hg-reviewers
Cc: pulkit, mercurial-devel
phabricator - Feb. 14, 2018, 10:01 a.m.
av6 added inline comments.

INLINE COMMENTS

> pulkit wrote in releasenotes.py:315
> No need for `node.hex(ctx.node())`, just use ctx.

or `ctx.hex()`

REPOSITORY
  rHG Mercurial

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

To: rishabhmadan96, #hg-reviewers
Cc: av6, pulkit, mercurial-devel
phabricator - Feb. 14, 2018, 10:04 a.m.
pulkit added inline comments.

INLINE COMMENTS

> av6 wrote in releasenotes.py:315
> or `ctx.hex()`

That's also okay. `str(ctx) = ctx.hex()[:12]`

REPOSITORY
  rHG Mercurial

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

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

Patch

diff --git a/hgext/releasenotes.py b/hgext/releasenotes.py
--- a/hgext/releasenotes.py
+++ b/hgext/releasenotes.py
@@ -311,8 +311,8 @@ 
             title = block['lines'][0].strip() if block['lines'] else None
 
             if i + 1 == len(blocks):
-                raise error.Abort(_('release notes directive %s lacks content')
-                                  % directive)
+                raise error.Abort(_('changeset %s: release notes directive %s '
+                        'lacks content') % (node.hex(ctx.node()), directive))
 
             # Now search ahead and find all paragraphs attached to this
             # admonition.
@@ -325,8 +325,8 @@ 
                     continue
 
                 if pblock['type'] != 'paragraph':
-                    repo.ui.warn(_('unexpected block in release notes '
-                                        'directive %s\n') % directive)
+                    repo.ui.warn(_('changeset %s: unexpected block in release '
+                    'notes directive %s\n') % (node.hex(ctx.node()), directive))
 
                 if pblock['indent'] > 0:
                     paragraphs.append(pblock['lines'])