Bug 39325

Summary: Run codespell successfully on the whole codebase
Product: Koha Reporter: Jonathan Druart <jonathan.druart>
Component: Test SuiteAssignee: Jonathan Druart <jonathan.druart>
Status: Pushed to main --- QA Contact: Nick Clemens (kidclamp) <nick>
Severity: enhancement    
Priority: P5 - low CC: dcook, phil
Version: Main   
Hardware: All   
OS: All   
GIT URL: Change sponsored?: ---
Patch complexity: Large patch Documentation contact:
Documentation submission: Text to go in the release notes:
Version(s) released in:
25.05.00
Circulation function:
Bug Depends on: 39319, 39365, 39367    
Bug Blocks: 39324, 39874    
Attachments: Bug 39325: Automatic fix
Bug 39325: [DO NOT PUSH] script
Bug 39325: .codespell-ignore
Bug 39325: Add test
Bug 39325: [DO NOT PUSH] script
Bug 39325: .codespell-ignore
Bug 39325: Add test
Bug 39325: Automatic fix
Bug 39325: Manual fixes
Bug 39325: manual - reserv => reserve
Bug 39325: manual - hilighted => highlighted
Bug 39325: manual - suggestion - no one => no_one
Bug 39325: Adjust DB
Bug 39325: Revert dbic schema files
Bug 39325: Tidy
Bug 39325: Exclude atomic update - TODO RM
Bug 39325: [DO NOT PUSH] script
Bug 39325: .codespell-ignore
Bug 39325: Add test
Bug 39325: Automatic fix
Bug 39325: Manual fixes
Bug 39325: manual - reserv => reserve
Bug 39325: manual - hilighted => highlighted
Bug 39325: manual - suggestion - no one => no_one
Bug 39325: Adjust DB
Bug 39325: Revert dbic schema files
Bug 39325: Tidy
Bug 39325: Exclude atomic update - TODO RM
Bug 39325: (follow-up) A few minor corrections
Bug 39325: [DO NOT PUSH] script
Bug 39325: .codespell-ignore
Bug 39325: Add test
Bug 39325: Automatic fix
Bug 39325: Manual fixes
Bug 39325: manual - reserv => reserve
Bug 39325: manual - hilighted => highlighted
Bug 39325: manual - suggestion - no one => no_one
Bug 39325: Adjust DB
Bug 39325: Revert dbic schema files
Bug 39325: Tidy
Bug 39325: Exclude atomic update - TODO RM
Bug 39325: (follow-up) A few minor corrections
Bug 39325: (QA follow-up) Adjust some issues
Bug 39325: [DO NOT PUSH] script
Bug 39325: .codespell-ignore
Bug 39325: Add test
Bug 39325: Automatic fix
Bug 39325: Manual fixes
Bug 39325: manual - reserv => reserve
Bug 39325: manual - hilighted => highlighted
Bug 39325: manual - suggestion - no one => no_one
Bug 39325: Adjust DB
Bug 39325: Revert dbic schema files
Bug 39325: Tidy
Bug 39325: Exclude atomic update - TODO RM
Bug 39325: (follow-up) A few minor corrections
Bug 39325: (QA follow-up) Adjust some issues
Bug 39325: Automatic fix
Bug 39325: Manual fixes
Bug 39325: manual - reserv => reserve
Bug 39325: manual - hilighted => highlighted
Bug 39325: manual - suggestion - no one => no_one
Bug 39325: Adjust DB
Bug 39325: Revert dbic schema files
Bug 39325: Tidy
Bug 39325: Exclude atomic update - TODO RM
Bug 39325: (follow-up) A few minor corrections
Bug 39325: (QA follow-up) Adjust some issues
Bug 39325: (follow-up) Adjust DB
Bug 39325: Fix t/Makefile.t
Bug 39325: Skip codespell check for bullseye

Description Jonathan Druart 2025-03-13 14:44:31 UTC
Codespell is run by the QA script, but we have a lot of typos.
Comment 1 Jonathan Druart 2025-03-13 14:49:57 UTC
Created attachment 179269 [details] [review]
Bug 39325: Automatic fix
Comment 2 Jonathan Druart 2025-03-13 14:49:59 UTC
Created attachment 179270 [details] [review]
Bug 39325: [DO NOT PUSH] script

Script used to generate the "Automatic fix" patch.
I don't think we need this script pushed.
Comment 3 Jonathan Druart 2025-03-13 14:50:02 UTC
Created attachment 179271 [details] [review]
Bug 39325: .codespell-ignore

List of words to ignore
Comment 4 Jonathan Druart 2025-03-13 14:50:04 UTC
Created attachment 179272 [details] [review]
Bug 39325: Add test

We certainly want to improve this test and run it in parallel.
Comment 5 Jonathan Druart 2025-03-13 14:53:38 UTC
Anybody willing to help here?

We need to review the "Automatic fix" commit and:
1. Make sure the changes are correct
2. Adjust the "FIXME CODESPELL" occurrences
3. Add words to .codespell-ignore when needed

Unfortunately we cannot use the "inline ignore" (yet) that is in 2.3.0 that will be available in trixie (we have 2.2.2 in bookworm).

https://github.com/codespell-project/codespell/pull/2400
Comment 6 Jonathan Druart 2025-03-20 10:53:11 UTC
Created attachment 179501 [details] [review]
Bug 39325: [DO NOT PUSH] script

Script used to generate the "Automatic fix" patch.
I don't think we need this script pushed.
Comment 7 Jonathan Druart 2025-03-20 10:53:13 UTC
Created attachment 179502 [details] [review]
Bug 39325: .codespell-ignore

List of words to ignore
Comment 8 Jonathan Druart 2025-03-20 10:53:16 UTC
Created attachment 179503 [details] [review]
Bug 39325: Add test

We certainly want to improve this test and run it in parallel.
Comment 9 Jonathan Druart 2025-03-20 10:53:20 UTC
Created attachment 179504 [details] [review]
Bug 39325: Automatic fix
Comment 10 Jonathan Druart 2025-03-20 10:53:23 UTC
Created attachment 179505 [details] [review]
Bug 39325: Manual fixes
Comment 11 Jonathan Druart 2025-03-20 10:53:26 UTC
Created attachment 179506 [details] [review]
Bug 39325: manual - reserv => reserve

because of automatic changes in circ/transferstoreceive.tt
Comment 12 Jonathan Druart 2025-03-20 10:53:29 UTC
Created attachment 179507 [details] [review]
Bug 39325: manual - hilighted => highlighted

All the other occurrences have been updated.
Comment 13 Jonathan Druart 2025-03-20 10:53:32 UTC
Created attachment 179508 [details] [review]
Bug 39325: manual - suggestion - no one => no_one

It has been changed (automatically) from "noone" to "no one", which was
wrong.
Comment 14 Jonathan Druart 2025-03-20 10:53:35 UTC
Created attachment 179509 [details] [review]
Bug 39325: Adjust DB

We need to adjust kohastructure.sql, sysprefs.sql and the DB itself.
Comment 15 Jonathan Druart 2025-03-20 10:53:37 UTC
Created attachment 179510 [details] [review]
Bug 39325: Revert dbic schema files

We need the md5sum to be adjusted. This should be done by the RM.
Comment 16 Jonathan Druart 2025-03-20 10:53:40 UTC
Created attachment 179511 [details] [review]
Bug 39325: Tidy

Some files need to be tidy after the automatic commit
Comment 17 Jonathan Druart 2025-03-20 10:53:43 UTC
Created attachment 179512 [details] [review]
Bug 39325: Exclude atomic update - TODO RM

TODO: We will need to adjust this path with the db_rev one
Comment 18 Jonathan Druart 2025-03-20 10:53:56 UTC Comment hidden (obsolete)
Comment 19 Jonathan Druart 2025-03-20 10:54:33 UTC
Several "words" have been added to .codespell-ignore to make the codespell tests pass. In the next step, we will use inline ignores. See the previous comment:

"""
Unfortunately, we cannot use the "inline ignore" feature (yet), which was introduced in version 2.3.0 and will be available in Trixie (we currently have 2.2.2 in Bookworm).
https://github.com/codespell-project/codespell/pull/2400
""""

Some manual changes are a bit messy (e.g., installer/data/mysql/db_revs/220600059.pl) as a workaround for codespell, but overall, the automatic changes are correct and easy to handle.

Test Plan:

1. Apply the entire patch set, along with its dependencies (if they haven't been pushed yet). A remote branch with everything applied is available in my GitLab repo:
    https://gitlab.com/joubu/Koha/-/commits/bug_39325
2. Squash the "Automatic fix" and manual patches for easier review.
3. Review the generated commit and verify all changes.
4.Run prove xt/author_codespell.t. The only expected failures should be in Koha/Schema/Result files.
5.Run the updatedatabase script and confirm that the typos have been fixed in the database (mostly in the COMMENT fields).

Bonus:
6. Test the new version of the QA script

Inside ktd, navigate to /kohadevbox/qa-test-tools and check out the dedicated branch:

# As root:
% git remote add joubu https://gitlab.com/joubu/qa-test-tools.git
% git checkout joubu/issue_93

# As the koha user, navigate to /kohadevbox/koha and run the QA script:
% qa

RM Note:
You will need to adjust the patch "Bug 39325: Exclude atomic update - TODO RM". The atomicupdate path must match the corresponding db_rev, so the tests correctly ignore the file (as it contains intentional typos).
Also, don’t forget to regenerate the DBIC schema files.
Comment 20 Owen Leonard 2025-03-20 13:13:27 UTC
Created attachment 179517 [details] [review]
Bug 39325: [DO NOT PUSH] script

Script used to generate the "Automatic fix" patch.
I don't think we need this script pushed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 21 Owen Leonard 2025-03-20 13:13:30 UTC
Created attachment 179518 [details] [review]
Bug 39325: .codespell-ignore

List of words to ignore

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 22 Owen Leonard 2025-03-20 13:13:33 UTC
Created attachment 179519 [details] [review]
Bug 39325: Add test

We certainly want to improve this test and run it in parallel.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 23 Owen Leonard 2025-03-20 13:13:37 UTC
Created attachment 179522 [details] [review]
Bug 39325: Automatic fix

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 24 Owen Leonard 2025-03-20 13:13:40 UTC
Created attachment 179525 [details] [review]
Bug 39325: Manual fixes

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 25 Owen Leonard 2025-03-20 13:13:43 UTC
Created attachment 179527 [details] [review]
Bug 39325: manual - reserv => reserve

because of automatic changes in circ/transferstoreceive.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 26 Owen Leonard 2025-03-20 13:13:46 UTC
Created attachment 179528 [details] [review]
Bug 39325: manual - hilighted => highlighted

All the other occurrences have been updated.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 27 Owen Leonard 2025-03-20 13:13:49 UTC
Created attachment 179529 [details] [review]
Bug 39325: manual - suggestion - no one => no_one

It has been changed (automatically) from "noone" to "no one", which was
wrong.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 28 Owen Leonard 2025-03-20 13:13:52 UTC
Created attachment 179530 [details] [review]
Bug 39325: Adjust DB

We need to adjust kohastructure.sql, sysprefs.sql and the DB itself.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 29 Owen Leonard 2025-03-20 13:13:55 UTC
Created attachment 179531 [details] [review]
Bug 39325: Revert dbic schema files

We need the md5sum to be adjusted. This should be done by the RM.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 30 Owen Leonard 2025-03-20 13:13:57 UTC
Created attachment 179532 [details] [review]
Bug 39325: Tidy

Some files need to be tidy after the automatic commit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 31 Owen Leonard 2025-03-20 13:14:01 UTC
Created attachment 179533 [details] [review]
Bug 39325: Exclude atomic update - TODO RM

TODO: We will need to adjust this path with the db_rev one
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Comment 32 Owen Leonard 2025-03-20 13:14:04 UTC
Created attachment 179534 [details] [review]
Bug 39325: (follow-up) A few minor corrections
Comment 33 Jonathan Druart 2025-03-26 04:46:39 UTC
*** Bug 39458 has been marked as a duplicate of this bug. ***
Comment 34 Nick Clemens (kidclamp) 2025-04-01 12:09:02 UTC
Created attachment 180137 [details] [review]
Bug 39325: [DO NOT PUSH] script

Script used to generate the "Automatic fix" patch.
I don't think we need this script pushed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 35 Nick Clemens (kidclamp) 2025-04-01 12:09:05 UTC
Created attachment 180138 [details] [review]
Bug 39325: .codespell-ignore

List of words to ignore

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 36 Nick Clemens (kidclamp) 2025-04-01 12:09:07 UTC
Created attachment 180139 [details] [review]
Bug 39325: Add test

We certainly want to improve this test and run it in parallel.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 37 Nick Clemens (kidclamp) 2025-04-01 12:09:10 UTC
Created attachment 180140 [details] [review]
Bug 39325: Automatic fix

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 38 Nick Clemens (kidclamp) 2025-04-01 12:09:13 UTC
Created attachment 180141 [details] [review]
Bug 39325: Manual fixes

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 39 Nick Clemens (kidclamp) 2025-04-01 12:09:15 UTC
Created attachment 180142 [details] [review]
Bug 39325: manual - reserv => reserve

because of automatic changes in circ/transferstoreceive.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 40 Nick Clemens (kidclamp) 2025-04-01 12:09:18 UTC
Created attachment 180143 [details] [review]
Bug 39325: manual - hilighted => highlighted

All the other occurrences have been updated.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 41 Nick Clemens (kidclamp) 2025-04-01 12:09:20 UTC
Created attachment 180144 [details] [review]
Bug 39325: manual - suggestion - no one => no_one

It has been changed (automatically) from "noone" to "no one", which was
wrong.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 42 Nick Clemens (kidclamp) 2025-04-01 12:09:24 UTC
Created attachment 180145 [details] [review]
Bug 39325: Adjust DB

We need to adjust kohastructure.sql, sysprefs.sql and the DB itself.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 43 Nick Clemens (kidclamp) 2025-04-01 12:09:27 UTC
Created attachment 180146 [details] [review]
Bug 39325: Revert dbic schema files

We need the md5sum to be adjusted. This should be done by the RM.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 44 Nick Clemens (kidclamp) 2025-04-01 12:09:29 UTC
Created attachment 180147 [details] [review]
Bug 39325: Tidy

Some files need to be tidy after the automatic commit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 45 Nick Clemens (kidclamp) 2025-04-01 12:09:32 UTC
Created attachment 180148 [details] [review]
Bug 39325: Exclude atomic update - TODO RM

TODO: We will need to adjust this path with the db_rev one
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 46 Nick Clemens (kidclamp) 2025-04-01 12:09:34 UTC
Created attachment 180149 [details] [review]
Bug 39325: (follow-up) A few minor corrections

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 47 Nick Clemens (kidclamp) 2025-04-01 12:09:37 UTC
Created attachment 180150 [details] [review]
Bug 39325: (QA follow-up) Adjust some issues

connexion is a product, added to ignore file

tablee -> tables

a few other small corrections

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 48 Katrin Fischer 2025-04-24 17:56:50 UTC
Can you please rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 39325: [DO NOT PUSH] script
Applying: Bug 39325: .codespell-ignore
Applying: Bug 39325: Add test
Applying: Bug 39325: Automatic fix
.git/rebase-apply/patch:585: trailing whitespace.
C<$needsconfirmation> a reference to a hash. It contains reasons why the loan 
.git/rebase-apply/patch:882: trailing whitespace.
selects which template to use, either the opac or the intranet 
.git/rebase-apply/patch:2515: trailing whitespace.
=cut 
.git/rebase-apply/patch:3756: trailing whitespace.
=item cloud-kw.pl [--verbose|--help] --conf=F<cloud.conf> 
error: sha1 information is lacking or useless (C4/Languages.pm).
error: could not build fake ancestor
Patch failed at 0001 Bug 39325: Automatic fix
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-39325-Automatic-fix-_xnhnnpe.patch
Comment 49 Owen Leonard 2025-04-25 12:38:33 UTC
Created attachment 181510 [details] [review]
Bug 39325: [DO NOT PUSH] script

Script used to generate the "Automatic fix" patch.
I don't think we need this script pushed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 50 Owen Leonard 2025-04-25 12:38:36 UTC
Created attachment 181511 [details] [review]
Bug 39325: .codespell-ignore

List of words to ignore

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 51 Owen Leonard 2025-04-25 12:38:39 UTC
Created attachment 181512 [details] [review]
Bug 39325: Add test

We certainly want to improve this test and run it in parallel.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 52 Owen Leonard 2025-04-25 12:38:43 UTC
Created attachment 181513 [details] [review]
Bug 39325: Automatic fix

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 53 Owen Leonard 2025-04-25 12:38:46 UTC
Created attachment 181514 [details] [review]
Bug 39325: Manual fixes

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 54 Owen Leonard 2025-04-25 12:38:48 UTC
Created attachment 181515 [details] [review]
Bug 39325: manual - reserv => reserve

because of automatic changes in circ/transferstoreceive.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 55 Owen Leonard 2025-04-25 12:38:51 UTC
Created attachment 181516 [details] [review]
Bug 39325: manual - hilighted => highlighted

All the other occurrences have been updated.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 56 Owen Leonard 2025-04-25 12:38:54 UTC
Created attachment 181517 [details] [review]
Bug 39325: manual - suggestion - no one => no_one

It has been changed (automatically) from "noone" to "no one", which was
wrong.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 57 Owen Leonard 2025-04-25 12:38:57 UTC
Created attachment 181518 [details] [review]
Bug 39325: Adjust DB

We need to adjust kohastructure.sql, sysprefs.sql and the DB itself.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 58 Owen Leonard 2025-04-25 12:38:59 UTC
Created attachment 181519 [details] [review]
Bug 39325: Revert dbic schema files

We need the md5sum to be adjusted. This should be done by the RM.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 59 Owen Leonard 2025-04-25 12:39:03 UTC
Created attachment 181520 [details] [review]
Bug 39325: Tidy

Some files need to be tidy after the automatic commit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 60 Owen Leonard 2025-04-25 12:39:07 UTC
Created attachment 181521 [details] [review]
Bug 39325: Exclude atomic update - TODO RM

TODO: We will need to adjust this path with the db_rev one
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 61 Owen Leonard 2025-04-25 12:39:10 UTC
Created attachment 181522 [details] [review]
Bug 39325: (follow-up) A few minor corrections

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 62 Owen Leonard 2025-04-25 12:39:13 UTC
Created attachment 181523 [details] [review]
Bug 39325: (QA follow-up) Adjust some issues

connexion is a product, added to ignore file

tablee -> tables

a few other small corrections

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 63 Katrin Fischer 2025-04-25 16:46:42 UTC
I am sorry, I already got a conflict again :(

Can you please also check: I tried to leave off the first DO NOT PUSH patch (git bz apply -i), but then I also get a conflict, so I think some later patch also touches it...

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 39325: [DO NOT PUSH] script
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
Applying: Bug 39325: .codespell-ignore
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
Applying: Bug 39325: Add test
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
Applying: Bug 39325: Automatic fix
.git/rebase-apply/patch:585: trailing whitespace.
C<$needsconfirmation> a reference to a hash. It contains reasons why the loan 
.git/rebase-apply/patch:882: trailing whitespace.
selects which template to use, either the opac or the intranet 
.git/rebase-apply/patch:2515: trailing whitespace.
=cut 
.git/rebase-apply/patch:3763: trailing whitespace.
=item cloud-kw.pl [--verbose|--help] --conf=F<cloud.conf> 
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	Makefile.PL
M	koha-tmpl/opac-tmpl/bootstrap/js/datatables.js
.git/rebase-apply/patch:585: trailing whitespace.
C<$needsconfirmation> a reference to a hash. It contains reasons why the loan 
.git/rebase-apply/patch:882: trailing whitespace.
selects which template to use, either the opac or the intranet 
.git/rebase-apply/patch:2515: trailing whitespace.
=cut 
.git/rebase-apply/patch:3763: trailing whitespace.
=item cloud-kw.pl [--verbose|--help] --conf=F<cloud.conf> 
warning: 4 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/js/datatables.js
CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/js/datatables.js
Auto-merging Makefile.PL
error: Failed to merge in the changes.
Patch failed at 0001 Bug 39325: Automatic fix
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-39325-Automatic-fix-c49605tp.patch
Comment 64 Jonathan Druart 2025-04-28 15:00:47 UTC
Created attachment 181611 [details] [review]
Bug 39325: Automatic fix

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 65 Jonathan Druart 2025-04-28 15:00:51 UTC
Created attachment 181612 [details] [review]
Bug 39325: Manual fixes

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 66 Jonathan Druart 2025-04-28 15:00:54 UTC
Created attachment 181613 [details] [review]
Bug 39325: manual - reserv => reserve

because of automatic changes in circ/transferstoreceive.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 67 Jonathan Druart 2025-04-28 15:00:57 UTC
Created attachment 181614 [details] [review]
Bug 39325: manual - hilighted => highlighted

All the other occurrences have been updated.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 68 Jonathan Druart 2025-04-28 15:01:00 UTC
Created attachment 181615 [details] [review]
Bug 39325: manual - suggestion - no one => no_one

It has been changed (automatically) from "noone" to "no one", which was
wrong.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 69 Jonathan Druart 2025-04-28 15:01:03 UTC
Created attachment 181616 [details] [review]
Bug 39325: Adjust DB

We need to adjust kohastructure.sql, sysprefs.sql and the DB itself.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 70 Jonathan Druart 2025-04-28 15:01:06 UTC
Created attachment 181617 [details] [review]
Bug 39325: Revert dbic schema files

We need the md5sum to be adjusted. This should be done by the RM.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 71 Jonathan Druart 2025-04-28 15:01:09 UTC
Created attachment 181618 [details] [review]
Bug 39325: Tidy

Some files need to be tidy after the automatic commit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 72 Jonathan Druart 2025-04-28 15:01:12 UTC
Created attachment 181619 [details] [review]
Bug 39325: Exclude atomic update - TODO RM

TODO: We will need to adjust this path with the db_rev one
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 73 Jonathan Druart 2025-04-28 15:01:15 UTC
Created attachment 181620 [details] [review]
Bug 39325: (follow-up) A few minor corrections

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 74 Jonathan Druart 2025-04-28 15:01:18 UTC
Created attachment 181621 [details] [review]
Bug 39325: (QA follow-up) Adjust some issues

connexion is a product, added to ignore file

tablee -> tables

a few other small corrections

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Comment 75 Katrin Fischer 2025-04-28 16:42:56 UTC
* Fixed file permission (+x) on codespell.t
* Added a success message to the db update
* Tidied  fix-perl-path.PL  
* Moved database update
* Adjusted path in Bug 39325: Exclude atomic update - TODO RM
* Ran dbic after updatedatabase and comitted
Comment 76 Katrin Fischer 2025-04-28 16:54:52 UTC
Pushed for 25.05!

Well done everyone, thank you!
Comment 77 Jonathan Druart 2025-04-29 07:27:46 UTC
Created attachment 181637 [details] [review]
Bug 39325: (follow-up) Adjust DB
Comment 78 Jonathan Druart 2025-04-29 07:54:59 UTC
(In reply to Jonathan Druart from comment #77)
> Created attachment 181637 [details] [review] [review]
> Bug 39325: (follow-up) Adjust DB

Patch pushed.
Comment 79 Jonathan Druart 2025-04-29 12:57:44 UTC
Created attachment 181651 [details] [review]
Bug 39325: Fix t/Makefile.t
Comment 80 Katrin Fischer 2025-04-29 15:25:25 UTC
Follow-up pushed to main!
Comment 81 Jonathan Druart 2025-05-06 14:43:01 UTC
Created attachment 181983 [details] [review]
Bug 39325: Skip codespell check for bullseye

bullseye has 2.0.0-1
bookworm has 2.2.2-1

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Comment 82 Katrin Fischer 2025-05-06 15:50:38 UTC
Follow-up "Skip codespell..." pushed to main (soon)