| hg-reviewers |
The big annoyance here was having to feed textwrap unicodes instead of
bytes, but it all seems to work.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/releasenotes.py (28 lines) |
| ('api', _('API Changes')), | ('api', _('API Changes')), | ||||
| ] | ] | ||||
| RE_DIRECTIVE = re.compile('^\.\. ([a-zA-Z0-9_]+)::\s*([^$]+)?$') | RE_DIRECTIVE = re.compile('^\.\. ([a-zA-Z0-9_]+)::\s*([^$]+)?$') | ||||
| RE_ISSUE = r'\bissue ?[0-9]{4,6}(?![0-9])\b' | RE_ISSUE = r'\bissue ?[0-9]{4,6}(?![0-9])\b' | ||||
| BULLET_SECTION = _('Other Changes') | BULLET_SECTION = _('Other Changes') | ||||
| if pycompat.ispy3: | |||||
| class byteswrapper(object): | |||||
| def __init__(self, **kwargs): | |||||
| for k in kwargs: | |||||
| v = kwargs[k] | |||||
| if not isinstance(v, str) and isinstance(v, bytes): | |||||
| kwargs[k] = v.decode('utf8') | |||||
| self._tw = textwrap.TextWrapper(**kwargs) | |||||
| def wrap(self, data): | |||||
| return [ | |||||
| l.encode('utf8') for l in self._tw.wrap(data.decode('utf8'))] | |||||
| else: | |||||
| byteswrapper = textwrap.TextWrapper | |||||
| class parsedreleasenotes(object): | class parsedreleasenotes(object): | ||||
| def __init__(self): | def __init__(self): | ||||
| self.sections = {} | self.sections = {} | ||||
| def __contains__(self, section): | def __contains__(self, section): | ||||
| return section in self.sections | return section in self.sections | ||||
| def __iter__(self): | def __iter__(self): | ||||
| lines.append('') | lines.append('') | ||||
| # First pass to emit sub-sections. | # First pass to emit sub-sections. | ||||
| for title, paragraphs in notes.titledforsection(sectionname): | for title, paragraphs in notes.titledforsection(sectionname): | ||||
| lines.append(title) | lines.append(title) | ||||
| lines.append('-' * len(title)) | lines.append('-' * len(title)) | ||||
| lines.append('') | lines.append('') | ||||
| wrapper = textwrap.TextWrapper(width=78) | wrapper = byteswrapper(width=78) | ||||
| for i, para in enumerate(paragraphs): | for i, para in enumerate(paragraphs): | ||||
| if i: | if i: | ||||
| lines.append('') | lines.append('') | ||||
| lines.extend(wrapper.wrap(' '.join(para))) | lines.extend(wrapper.wrap(' '.join(para))) | ||||
| lines.append('') | lines.append('') | ||||
| # Second pass to emit bullet list items. | # Second pass to emit bullet list items. | ||||
| # If the section has titled and non-titled items, we can't | # If the section has titled and non-titled items, we can't | ||||
| # simply emit the bullet list because it would appear to come | # simply emit the bullet list because it would appear to come | ||||
| # from the last title/section. So, we emit a new sub-section | # from the last title/section. So, we emit a new sub-section | ||||
| # for the non-titled items. | # for the non-titled items. | ||||
| nontitled = notes.nontitledforsection(sectionname) | nontitled = notes.nontitledforsection(sectionname) | ||||
| if notes.titledforsection(sectionname) and nontitled: | if notes.titledforsection(sectionname) and nontitled: | ||||
| # TODO make configurable. | # TODO make configurable. | ||||
| lines.append(BULLET_SECTION) | lines.append(BULLET_SECTION) | ||||
| lines.append('-' * len(BULLET_SECTION)) | lines.append('-' * len(BULLET_SECTION)) | ||||
| lines.append('') | lines.append('') | ||||
| for paragraphs in nontitled: | for paragraphs in nontitled: | ||||
| wrapper = textwrap.TextWrapper(initial_indent='* ', | wrapper = byteswrapper(initial_indent='* ', | ||||
| subsequent_indent=' ', | subsequent_indent=' ', | ||||
| width=78) | width=78) | ||||
| lines.extend(wrapper.wrap(' '.join(paragraphs[0]))) | lines.extend(wrapper.wrap(' '.join(paragraphs[0]))) | ||||
| wrapper = textwrap.TextWrapper(initial_indent=' ', | wrapper = byteswrapper(initial_indent=' ', | ||||
| subsequent_indent=' ', | subsequent_indent=' ', | ||||
| width=78) | width=78) | ||||
| for para in paragraphs[1:]: | for para in paragraphs[1:]: | ||||
| lines.append('') | lines.append('') | ||||
| lines.extend(wrapper.wrap(' '.join(para))) | lines.extend(wrapper.wrap(' '.join(para))) | ||||
| lines.append('') | lines.append('') | ||||
| if lines and lines[-1]: | if lines and lines[-1]: | ||||
| lines.append('') | lines.append('') | ||||