|
Description
Jonathan Druart
2021-05-19 10:51:07 UTC
Created attachment 121153 [details] [review] Bug 28386: Adjust .mailmap Again, we need to adjust our .mailmap This time the goal is the use it in place of the dev_map.yaml we have in the release tools. This will be generated for the release notes, history.txt and contributors.yaml file This can be tested using: git check-mailmap "author <email>" For instance: git check-mailmap "Wrong name <jonathan.druart@bugs.koha-community.org>" Created attachment 121154 [details] [review] Bug 28386: Some manual removals from contributors.yaml Those are not real authors and should be removed from the contributors.yaml file Created attachment 121155 [details] [review] Bug 28386: Remove unknown authors Those 3 authors are not in the git history, we should remove them from the author list. However we could re-add them to the contributor list with a note saying for instance they were part of the Catalyst Academy (need to double check that first) Created attachment 121156 [details] [review] Bug 28386: Update Nicole Need to match .mailmap Created attachment 121157 [details] [review] Bug 28386: Update Kyle Need to match .mailmap Created attachment 121158 [details] [review] Bug 28386: Meenakshi.R vs Meenakshi R Needs to match .mailmap Created attachment 121159 [details] [review] Bug 28386: Update Hector Created attachment 121160 [details] [review] Bug 28386: Add history_notes The "developer" lines of history.txt will be regenerated using the git history so we need to add this as a separate info. See the release_tools changes for more info Created attachment 121161 [details] [review] Bug 28386: [DO NOT PUSH] Update contributors using script This is an example of what will be regenerated. It will need to be regenerated once it will be pushed Created attachment 121162 [details] [review] Bug 28386: [DO NOT PUSH] Update history using script This is an example of what will be regenerated. This must be tested with the merge requests linked with https://gitlab.com/koha-community/release-tools/-/issues/23 Created attachment 121177 [details] [review] Bug 28386: Disambiguate Séverine (to squash) Created attachment 121180 [details] [review] Bug 28386: Add sponsors to .mailmap They were in dev_map.yaml, we are cheating with the <sponsor> email but it seems to work fine in my tests Created attachment 121245 [details] [review] Bug 28386: Adjust .mailmap Again, we need to adjust our .mailmap This time the goal is the use it in place of the dev_map.yaml we have in the release tools. This will be generated for the release notes, history.txt and contributors.yaml file This can be tested using: git check-mailmap "author <email>" For instance: git check-mailmap "Wrong name <jonathan.druart@bugs.koha-community.org>" Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121246 [details] [review] Bug 28386: Some manual removals from contributors.yaml Those are not real authors and should be removed from the contributors.yaml file Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121247 [details] [review] Bug 28386: Remove unknown authors Those 3 authors are not in the git history, we should remove them from the author list. However we could re-add them to the contributor list with a note saying for instance they were part of the Catalyst Academy (need to double check that first) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121248 [details] [review] Bug 28386: Update Nicole Need to match .mailmap Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121249 [details] [review] Bug 28386: Update Kyle Need to match .mailmap Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121250 [details] [review] Bug 28386: Meenakshi.R vs Meenakshi R Needs to match .mailmap Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121251 [details] [review] Bug 28386: Update Hector Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121252 [details] [review] Bug 28386: Add history_notes The "developer" lines of history.txt will be regenerated using the git history so we need to add this as a separate info. See the release_tools changes for more info Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121253 [details] [review] Bug 28386: [DO NOT PUSH] Update contributors using script This is an example of what will be regenerated. It will need to be regenerated once it will be pushed Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121254 [details] [review] Bug 28386: [DO NOT PUSH] Update history using script This is an example of what will be regenerated. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121255 [details] [review] Bug 28386: Disambiguate Séverine (to squash) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 121256 [details] [review] Bug 28386: Add sponsors to .mailmap They were in dev_map.yaml, we are cheating with the <sponsor> email but it seems to work fine in my tests Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Great work Jonathan, this is a massive improvement. Signing off. Answered. It work! Thanks for finding the issue. Created attachment 121329 [details] [review] Bug 28386: fisheye is certainly Olwen After a chat with Chris it seems that fisheye was Olwen. Created attachment 121330 [details] [review] Bug 28386: Fix Pawel history notes Created attachment 121331 [details] [review] Bug 28386: Update contributors using script This is an example of what will be regenerated. It will need to be regenerated once it will be pushed Created attachment 121332 [details] [review] Bug 28386: Update history using script This is an example of what will be regenerated. Created attachment 121354 [details] [review] Bug 28386: Add the 3 unknown authors back into the contributors list with a note Created attachment 121355 [details] [review] Bug 28386: Add the 3 unknown authors back into the contributors list with a note Pushed to master for 21.05, thanks to everybody involved! Created attachment 121378 [details] [review] Bug 28386: Add more disambiguations to .mailmap Created attachment 121384 [details] [review] Bug 28386: Add more disambiguations to .mailmap Last patch pushed to master. Some tiny changes expected on gitstats Before (yesterday): https://web.archive.org/web/20210525073657/https://git.koha-community.org/stats/koha-master/authors.html After (today): https://web.archive.org/web/20210526080539/https://git.koha-community.org/stats/koha-master/authors.html Created attachment 121420 [details] [review] Bug 28386: Disambiguate Tomas and Blou Last patch pushed to master. Created attachment 121447 [details] [review] Bug 28386: Remove _others_ from the contributor list We arbitrarily use "_others_" for unknown contributors (biblibre, bywater, ptfs-e teams, etc) Created attachment 121448 [details] [review] Bug 28386: Sort authors by lastname || firstname If several authors have the same lastname, they are swapped in the list between the different runs. This is reusing the code from the release_tools, see issue #24 Last 2 patches pushed to master. Pushed to 20.11.x for 20.11.07 Backported: Pushed to 20.05.x branch for 20.05.13 After around 130 conflicts! (How did Frido, Kyle and Nick dealt with this?) Hint in case Wainui gets the same thing: Solve the individual conflicts as usual. When getting a 60 conflicts pack, just rapidly skim through then without solving to confirm that it will be safe to do `git checkout --theirs MY_FILE` It was safe in my case (noticed after manually solving the 60 ones...) There is another 60 conflicts pack, do the same as above. The timeline in the about page isn't broken, so that seems to work ^^ and Jonathan told me that we should keep the commit numbers from upstream, not the one from our branch. And it's not used anyway. Should this be backported to 19.11.x? For 19.11.20 (next release in July)? Yes, in bug 28442 it's mentioned that it will have to be backported to all stables. And this one it a dependency. Backported to 19.11.x for 19.11.20 |