This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2253

releasenotes: mention changeset with warning and abort
ClosedPublic

Authored by rishabhmadan96 on Feb 14 2018, 2:30 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG3fff6f30bd7f: releasenotes: mention changeset with warning and abort
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

rishabhmadan96 created this revision.Feb 14 2018, 2:30 AM
pulkit added a subscriber: pulkit.Feb 14 2018, 4:57 AM

I think ordering on the patches here is wrong. D2255 seems to be parent of this one. Also can you add related tests?

hgext/releasenotes.py
315

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

329

Same as above.

av6 added a subscriber: av6.Feb 14 2018, 5:01 AM
av6 added inline comments.
hgext/releasenotes.py
315

or ctx.hex()

pulkit added inline comments.Feb 14 2018, 5:04 AM
hgext/releasenotes.py
315

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

durin42 accepted this revision.Mar 7 2018, 11:00 AM
This revision is now accepted and ready to land.Mar 7 2018, 11:00 AM
Closed by commit rHG3fff6f30bd7f: releasenotes: mention changeset with warning and abort (authored by rishabhmadan96). · Explain WhyMar 7 2018, 11:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6693

hgext/releasenotes.py

for i, block in enumerate(blocks): for i, block in enumerate(blocks):
if block['type'] != 'admonition': if block['type'] != 'admonition':
continue continue
directive = block['admonitiontitle'] directive = block['admonitiontitle']
title = block['lines'][0].strip() if block['lines'] else None title = block['lines'][0].strip() if block['lines'] else None
if i + 1 == len(blocks): if i + 1 == len(blocks):
raise error.Abort(_('release notes directive %s lacks content') raise error.Abort(_('changeset %s: release notes directive %s '
% directive) 'lacks content') % (ctx, directive))
pulkitUnsubmitted
Not Done

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

pulkit: No need for `node.hex(ctx.node())`, just use ctx.
av6Unsubmitted
Not Done

or ctx.hex()

av6: or `ctx.hex()`
pulkitUnsubmitted
Not Done

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

pulkit: That's also okay. `str(ctx) = ctx.hex()[:12]`
# Now search ahead and find all paragraphs attached to this # Now search ahead and find all paragraphs attached to this
# admonition. # admonition.
paragraphs = [] paragraphs = []
for j in range(i + 1, len(blocks)): for j in range(i + 1, len(blocks)):
pblock = blocks[j] pblock = blocks[j]
# Margin blocks may appear between paragraphs. Ignore them. # Margin blocks may appear between paragraphs. Ignore them.
if pblock['type'] == 'margin': if pblock['type'] == 'margin':
continue continue
if pblock['type'] != 'paragraph': if pblock['type'] != 'paragraph':
repo.ui.warn(_('unexpected block in release notes ' repo.ui.warn(_('changeset %s: unexpected block in release '
'directive %s\n') % directive) 'notes directive %s\n') % (ctx, directive))
pulkitUnsubmitted
Not Done

Same as above.

pulkit: Same as above.
if pblock['indent'] > 0: if pblock['indent'] > 0:
paragraphs.append(pblock['lines']) paragraphs.append(pblock['lines'])
else: else:
break break
# TODO consider using title as paragraph for more concise notes. # TODO consider using title as paragraph for more concise notes.
if not paragraphs: if not paragraphs:

tests/test-releasenotes-parsing.t

> >
> .. feature:: > .. feature::
> >
> new feature added. > new feature added.
> some words about the feature. > some words about the feature.
> EOF > EOF
$ hg releasenote -r . $ hg releasenote -r .
unexpected block in release notes directive feature changeset a4251905c440: unexpected block in release notes directive feature
New Features New Features
============ ============
* new feature added. some words about the feature. * new feature added. some words about the feature.
$ cd .. $ cd ..