This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2255

releasenotes: replace abort with warning while parsing (issue5775)
ClosedPublic

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

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG658ed9c7442b: releasenotes: replace abort with warning while parsing (issue5775)

Summary

During the 4.5 development cycle, the extension broke on two different changesets.
This fixes the issue by ensuring that it just throws a warning when it encounters
unexpected behaviour, instead of aborting.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

rishabhmadan96 created this revision.Feb 14 2018, 2:31 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 14 2018, 2:31 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit mentioned this in D2253: releasenotes: mention changeset with warning and abort.Feb 14 2018, 4:57 AM

This one is a bugfix, so please add the issue number in the commit message. Also add related tests as that will help make sure we don't encounter such problems again in future.

Yeah, my bad. I'll send an updated version with the suggested changes.

Friendly ping - should I expect an updated version of this series?

I totally forgot about this. I'll send them right away.

rishabhmadan96 edited the summary of this revision. (Show Details)Mar 4 2018, 2:17 PM

rishabhmadan96 retitled this revision from releasenotes: replace abort with warning while parsing to releasenotes: replace abort with warning while parsing (issue5775).

rishabhmadan96 updated this revision to Diff 6590.

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 rHG658ed9c7442b: releasenotes: replace abort with warning while parsing (issue5775) (authored by rishabhmadan96). · Explain WhyMar 7 2018, 11:26 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/releasenotes.py (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5695		Feb 14 2018, 2:31 AM	★	★
Diff 2	6590		Mar 4 2018, 2:17 PM	★	★
Diff 3	6694	rHG658ed9c7442b791b8584e6b0683a4489aef0bec7	Mar 3 2018, 1:17 PM	★	★

Status	Author	Revision
Closed	rishabhmadan96	D2255 releasenotes: replace abort with warning while parsing (issue5775)
Closed	rishabhmadan96	D2254 releasenotes: allow notes for multiple directives in a single changeset
Closed	rishabhmadan96	D2253 releasenotes: mention changeset with warning and abort

Diff 5695

hgext/releasenotes.py

	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':
	raise error.Abort(_('unexpected block in release notes '			repo.ui.warn(_('unexpected block in release notes '
	'directive %s') % directive)			'directive %s\n') % directive)

	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: