15 Commits

Author	SHA1	Message	Date
Gilles Peskine	8f46bbf46f	Sort changelog entries by their merge date ... Changelog entry files were listed in reverse alphabetical order of the file name, by happenstance. Now, changelog entry files are listed in the order in which the changes were merged. More precisely: look for the git commit where the entry file was created, and look where this commit was merged into the current branch. List older merges first. List never-merged commits in date order after all the merged ones. List never-committed files in file timestamp order after all the committed ones. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>	2020-03-26 11:58:00 +01:00
Gilles Peskine	27a1facd48	Factor out list_files_to_merge ... No behavior changes. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>	2020-03-26 11:57:54 +01:00
Gilles Peskine	afc9db8bb7	Fix version number recognition heuristics ... The regexp was wrong, for example it matched "2.20x" but failed to match "3.1". Some test cases: >>> def f(title): ... version_number = re.search(_version_number_re, title) ... if version_number: ... return not re.search(_incomplete_version_number_re, ... version_number.group(0)) ... else: ... return False ... >>> [(s, f(s.encode('ascii'))) for s in ['foo', 'foo 3', 'foo 3.', 'foo 3.1', 'foo 3.14', 'foo 3.2.1', 'foo 3.2.1alpha', 'foo 3.1.a', 'foo 3.a', 'foo 3.x.1']] [('foo', False), ('foo 3', False), ('foo 3.', False), ('foo 3.1', True), ('foo 3.14', True), ('foo 3.2.1', True), ('foo 3.2.1alpha', True), ('foo 3.1.a', False), ('foo 3.a', False), ('foo 3.x.1', False)]	2020-01-30 11:38:01 +01:00
Gilles Peskine	a26079613a	Create a new level-2 section if needed ... Automatically create a level-2 section for unreleased changes if needed.	2020-01-28 19:58:17 +01:00
Gilles Peskine	da14e8225e	Remove useless blank line removal in ChangeLog.write ... The parsing functions eliminate blank lines, so there shouldn't be any at this stage.	2020-01-28 19:27:54 +01:00
Gilles Peskine	37d670a1e1	Document read_main_file and simplify the logic a little	2020-01-28 19:27:54 +01:00
Gilles Peskine	974349d40e	Style: follow PEP8	2020-01-28 19:00:59 +01:00
Gilles Peskine	d8b6c77388	Use OrderedDict instead of reinventing it	2020-01-28 18:57:47 +01:00
Gilles Peskine	2b242495e1	Add a sanity check on the output ... Check that no line from any of the input files was lost. This is not perfect for several reasons. It doesn't check that the content goes to the desired location. It doesn't check that sections are created as necessary. It doesn't support whitespace normalization that the parsing code does. But it's a good start.	2020-01-22 15:59:12 +01:00
Gilles Peskine	6e91009cfe	Split strings on some very long lines	2020-01-22 15:59:12 +01:00
Gilles Peskine	566407d6f6	Simpler definition of a custom exception class	2020-01-22 15:59:12 +01:00
Gilles Peskine	8c4a84c5de	Split read_main_file out of the ChangeLog constructor ... Keep the constructor code simple. No behavior change.	2020-01-22 15:48:58 +01:00
Gilles Peskine	5e39c9e94f	Actually remove files ... Minor rework of how files are removed. Actually do remove the files (earlier I accidentally committed a debug version with removal commented out).	2020-01-22 15:48:45 +01:00
Gilles Peskine	974232f045	Minor documentation improvements	2020-01-22 12:43:29 +01:00
Gilles Peskine	40b3f411ec	Changelog merging script ... assemble_changelog.py reads changelog entries from ChangeLog.d/*.md and merges them into ChangeLog.md. The changelog entries are merged into the first version in ChangeLog.md. The script does not yet support creating a new version in ChangeLog.md. The changelog entries are merged in alphabetical order of the file names. Future versions of this script are likely to adopt a different order that reflects the git history of the entries.	2019-10-13 21:44:25 +02:00