|
@@ -196,7 +196,7 @@ class Changelog:
|
|
|
for commit_infos in cleanup_misc_items.values():
|
|
|
sorted_items.append(CommitInfo(
|
|
|
'cleanup', ('Miscellaneous',), ', '.join(
|
|
|
- self._format_message_link(None, info.commit.hash)
|
|
|
+ self._format_message_link(None, info.commit.hash).strip()
|
|
|
for info in sorted(commit_infos, key=lambda item: item.commit.hash or '')),
|
|
|
[], Commit(None, '', commit_infos[0].commit.authors), []))
|
|
|
|
|
@@ -205,10 +205,10 @@ class Changelog:
|
|
|
def format_single_change(self, info):
|
|
|
message = self._format_message_link(info.message, info.commit.hash)
|
|
|
if info.issues:
|
|
|
- message = f'{message} ({self._format_issues(info.issues)})'
|
|
|
+ message = message.replace('\n', f' ({self._format_issues(info.issues)})\n', 1)
|
|
|
|
|
|
if info.commit.authors:
|
|
|
- message = f'{message} by {self._format_authors(info.commit.authors)}'
|
|
|
+ message = message.replace('\n', f' by {self._format_authors(info.commit.authors)}\n', 1)
|
|
|
|
|
|
if info.fixes:
|
|
|
fix_message = ', '.join(f'{self._format_message_link(None, fix.hash)}' for fix in info.fixes)
|
|
@@ -217,14 +217,16 @@ class Changelog:
|
|
|
if authors != info.commit.authors:
|
|
|
fix_message = f'{fix_message} by {self._format_authors(authors)}'
|
|
|
|
|
|
- message = f'{message} (With fixes in {fix_message})'
|
|
|
+ message = message.replace('\n', f' (With fixes in {fix_message})\n', 1)
|
|
|
|
|
|
- return message
|
|
|
+ return message[:-1]
|
|
|
|
|
|
def _format_message_link(self, message, hash):
|
|
|
assert message or hash, 'Improperly defined commit message or override'
|
|
|
message = message if message else hash[:HASH_LENGTH]
|
|
|
- return f'[{message}]({self.repo_url}/commit/{hash})' if hash else message
|
|
|
+ if not hash:
|
|
|
+ return f'{message}\n'
|
|
|
+ return f'[{message}\n'.replace('\n', f']({self.repo_url}/commit/{hash})\n', 1)
|
|
|
|
|
|
def _format_issues(self, issues):
|
|
|
return ', '.join(f'[#{issue}]({self.repo_url}/issues/{issue})' for issue in issues)
|