This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1097

releasenotes: don't abort is there is a bad formatted entry for releasenotes
ClosedPublic

Authored by pulkit on Oct 15 2017, 11:15 AM.

Download Raw Diff

Details

Reviewers

yuja

Group Reviewers

hg-reviewers

Commits

rHGa542ad320adb: releasenotes: don't abort is there is a bad formatted entry for releasenotes

Summary

While producing releasenotes for (4.3::), releasenotes aborts with error because
of some bad formatting of releasenotes in some commits. Instead of aborting,
this adds warning message which will help us in skipping them and telling user
about it.

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

pulkit created this revision.Oct 15 2017, 11:15 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 15 2017, 11:15 AM

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

pulkit added a child revision: D1098: releasenotes: add pager support when printing to the ui.Oct 15 2017, 11:15 AM

yuja requested changes to this revision.Oct 16 2017, 9:07 AM

yuja added a subscriber: yuja.

yuja added inline comments.

hgext/releasenotes.py
329–330	warn() seems better.

This revision now requires changes to proceed.Oct 16 2017, 9:07 AM

pulkit edited the summary of this revision. (Show Details)Oct 16 2017, 2:29 PM

pulkit updated this revision to Diff 2833.

pulkit marked an inline comment as done.Oct 16 2017, 2:30 PM

yuja accepted this revision.Oct 17 2017, 9:44 AM

This revision is now accepted and ready to land.Oct 17 2017, 9:44 AM

Closed by commit rHGa542ad320adb: releasenotes: don't abort is there is a bad formatted entry for releasenotes (authored by pulkit). · Explain WhyOct 17 2017, 10:16 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2787		Oct 15 2017, 11:14 AM	★	★
Diff 2	2833		Oct 16 2017, 2:29 PM	★	★
Diff 3	2913	rHGa542ad320adb4627d4ec4751e9a23aa993b5ac09	Oct 15 2017, 11:01 AM	★	★

Status	Author	Revision
Closed	pulkit	D1121 releasenotes: show a warning if fuzzywuzzy is not present
Closed	pulkit	D1120 releasenotes: move import of fuzzywuzzy to import level
Closed	pulkit	D1098 releasenotes: add pager support when printing to the ui
Closed	pulkit	D1097 releasenotes: don't abort is there is a bad formatted entry for releasenotes
Closed	pulkit	D1096 releasenotes: make the import of fuzzywuzzy optional

Diff 2913

hgext/releasenotes.py

	import sys			import sys
	import textwrap			import textwrap

	from mercurial.i18n import _			from mercurial.i18n import _
	from mercurial import (			from mercurial import (
	config,			config,
	error,			error,
	minirst,			minirst,
				node,
	registrar,			registrar,
	scmutil,			scmutil,
	util,			util,
	)			)

	cmdtable = {}			cmdtable = {}
	command = registrar.command(cmdtable)			command = registrar.command(cmdtable)


	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:
	raise error.Abort(_('could not find content for release note '			repo.ui.warn(_("error parsing releasenotes for revision: "
	'%s') % directive)			"'%s'\n") % node.hex(ctx.node()))
				yujaUnsubmitted Done warn() seems better. yuja: warn() seems better.

	if title:			if title:
	notes.addtitleditem(directive, title, paragraphs)			notes.addtitleditem(directive, title, paragraphs)
	else:			else:
	notes.addnontitleditem(directive, paragraphs)			notes.addnontitleditem(directive, paragraphs)

	return notes			return notes

	def parsereleasenotesfile(sections, text):			def parsereleasenotesfile(sections, text):