https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #2 from Paul Derscheid <paul.derscheid@lmscloud.de> --- I want it! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #3 from Pedro Amorim <pedro.amorim@ptfs-europe.com> --- I'm not against it, but I don't see this as being high priority either. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #5 from Paul Derscheid <paul.derscheid@lmscloud.de> --- This might be personal to me, but I think we also lose time in dev. Uniformly formatted code is easier to scan in my opinion. Also we don't need to format ranges anymore and can straight go to format on save. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #6 from Jonathan Druart <jonathan.druart@gmail.com> --- With a good pre-commit hook we won't need to care about formatting/tidying anymore. Just code and commit (what we do already for .vue files). -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #8 from Jonathan Druart <jonathan.druart@gmail.com> --- (In reply to Pedro Amorim from comment #7)

(In reply to Jonathan Druart from comment #4)

...

This is a priority for me because of the number of commits dealing with tidying:

% git log --oneline v24.05.00..HEAD|grep -i tidy|wc -l 80

We lose time during QA.

These are tidy patches on top of submissions, tidying the whole code won't stop these. New submissions will potentially continue to be submitted with untidy code and tidy fixes will still continue to exist to address these. Squashing tidy fixes into the original patch is what will stop these. Correct me if I'm wrong please in case I'm missing the point.

As I said, I'm not against it, I just don't see how tidying the whole codebase is fixing any problem.

See comment 6. With a pre-commit hook you don't need to care about tidying at all. Just code and commit. With everybody using the hook we ensure that the code stays tidy. For that we need a starting point where everything is tidy. Regular contributors won't submit code that is not tidy as they are using ktd with the git hook installed automatically. On top of that, add a QA check (if someone forgets to setup the hook) and a xt test (if QA+RM forgets to run the QA script), and the code stays tidy, forever :) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #10 from David Cook <dcook@prosentient.com.au> --- I've started to come around to the idea more after participating in the Mattermost chat, but then I realised there is 1 potential problem with the pre-commit git hook. perltidy doesn't always work. Sometimes it fails and you end up with inline error messages. For a big dev, this could be a risk. I suppose --no-verify could bypass the auto-perltidy and you could always still provide your own Tidy follow-up if perltidy is failing? Just food for thought... -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #12 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Just anecdotal evidence, I never had perltidy fail on valid code, ever. Grain of salt advised, though. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #14 from Jonathan Druart <jonathan.druart@gmail.com> --- (In reply to David Cook from comment #10)

I've started to come around to the idea more after participating in the Mattermost chat, but then I realised there is 1 potential problem with the pre-commit git hook.

perltidy doesn't always work. Sometimes it fails and you end up with inline error messages. For a big dev, this could be a risk.

I suppose --no-verify could bypass the auto-perltidy and you could always still provide your own Tidy follow-up if perltidy is failing?

Just food for thought...

Good point, the hook can prevent the commit if the tidy command fails and the files won't be modified (will need a copy before). (In reply to Julian Maurice from comment #11)

...

On top of that, add a QA check (if someone forgets to setup the hook) and a xt test (if QA+RM forgets to run the QA script), and the code stays tidy, forever :) If it is only caught by the xt test, then it means the main branch is not tidy (I assume the test is run by Jenkins, not by RM). So perltidy will still need to be run from time to time ? Not a big deal for me, I prefer having a code base 100% tidy most of the time than the current state.

If we have a pre-commit hook to prevent authors to commit non-tidy code and a QA check to prevent PQA or push of non-tidy code, it should be enough already. The xt test is yet another protection but it should not be needed (but we are humans :D).

Side note: are you considering using https://pre-commit.com/ ? I think it would be handy when dealing with multiple dev installs, and it would be easier to update/add new hooks if needed.

I did when I introduce the first one, but it seems too much overhead for our simple use cases.

...

* provide a script to ease rebases You got me curious there... Do you have a magic spell or something ? :)

The idea (not tested yet and needs to be confirmed/improved/discussed) is to: 0. have a patch set for bug 12345 that has been written before the tidy commit(s) 1. run "the rebase script" a. checkout commit before the tidy bug b. apply patches from 12345 one-by-one c. run the tidy script on each of the commit d. rebase and keep changes from 12345: git checkout --theirs (or git rebase -Xtheirs) 2. Attach the rebased version of the patches The script would then deal with everything for you, apart from the conflicts you would have gotten anyway. We will need to stop the "keep theirs" behaviour after we applied the tidy commits however. (If I have not mixed up ours and theirs once again) (In reply to Katrin Fischer from comment #13)

I am probably not the right person to assess the technical consequences, but I feel it's important we reach consensus on this as it will affect any outstanding patches.

What I've explained previously is trying to prevent that. The problem will be backports. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Mark Hofstetter <koha@trust-box.at> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |domm@plix.at -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |victor@tuxayo.net --- Comment #17 from Victor Grousset/tuxayo <victor@tuxayo.net> --- IIUC we are loosing more time constantly due to: - making tidying commits themselves - QA having to find which code section is the QA script complaining about if the QAer is fixing it themselves - same for the submitter for fixing it - another round trip of fail QA and back to signed off - the conflicts these commits cause with other submitted patches on close parts of the code when those patches are not tidied yet - and the backporting issues when there is a follow-up ticket built on tidied code but whose tidy commit had to be skipped. (so 2 bugs touching the same code and the tidy of 1st one wasn't kept to avoid conflict but now that causes conflicts when backporting the 2nd bug) All this, which is a constant burden vs the time lost to - take one massive round of conflicts with the submitted patches pool - and the backporting hassle significant for like 2 cycles. (stable and oldstable RMaints will need to ask a lot of rebasing help otherwise it will be impossible to keep up) So unless something makes the scale tilt the other way, let's grit our teeth and go for it! :) ----- To facilitate fixing conflicts on submitted patches, there might be this technique: - list the files giving conflicts - abort the failed apply/rebase operation - rebase the patches on the latest commit before the tidy patch (a big reason to tidy pl, js, tt, etc at the same time) - tidy the files that conflicted (the exact tidying commands should be somewhere easy to be found when needed) - commit - squash with the commit containing the actual changes - when there are multiple patches, they would all need to be squashed together :/ (any way around this?) - rebase on main to apply the great tidying patches and the rest - hopefully there shouldn't be conflicts (to be confirmed ^^") except regular legit ones And maybe that could be a base for the script to ease rebases. Hopefully there is a better strategy? (either for a script of manual step) So people with pending patches have the easiest time to get them though the great tidying. -------- @all Is there anything important that should be changed in the .perltidyrc and .prettierrc.js ? It's now or never. (we don't have a .tt tidying tool already, do we?) ------- (In reply to Jonathan Druart from comment #0)

I am suggesting to have patches for 25.05 that will tidy our perl (pl, pm, t), javascript (js, ts, vue) and template (tt, inc) files.

When testing Bug 38524 and it's dependencies, I don't recall prettier particularly complaining about the various ts and vue files I tested. So our config looks good. Because as ts and vue files are recent, prettier shouldn't have much to say if it's config is in line with out recent practices. So no issue foreseen there 👍 This is opposed to ESLint. Which raises a lot of issues in our ts and vue files. So the config doesn't match out recent practices and both need to be reconciled because it's not clear which of the two is right for us. So good thing it's only about Prettier. @all That's still an occasion to make important changes to the prettier config if needed. Note that Prettier should be on a recent version. Because on main, without Bug 38149, prettier is on whatever arbitrary version was latest when it was installed on one's dev env. Since it was not in package.json. --------- (In reply to Katrin Fischer from comment #13)

For info: this RM runs xt tests before pushing :)

Should it be explicitly in the RM process? That's the closest thing I've found: https://wiki.koha-community.org/wiki/Release_management#Checking_for_regress... But it's not about running the whole xt/ tests. But maybe a pre-push hook might be enough for the RM. Or it's better to run all xt/ ? ------------------ (In reply to Jonathan Druart from comment #14)

The idea (not tested yet and needs to be confirmed/improved/discussed) is to: 0. have a patch set for bug 12345 that has been written before the tidy commit(s) 1. run "the rebase script" a. checkout commit before the tidy bug b. apply patches from 12345 one-by-one c. run the tidy script on each of the commit d. rebase and keep changes from 12345: git checkout --theirs (or git rebase -Xtheirs) 2. Attach the rebased version of the patches

c. is not possible. If it tidies the 1st commit, then it wouldn't be able to apply the 2nd anymore. The start point of the diff would have changed. That's why in my attempt earlier in this message, I had to resolve to tidy only after applying all commits and squash all :( Then apply the tidy bug. Wait, thinking about it again, there might be a way: a. checkout commit before the tidy bug b. apply the 1st patch c. tidy, commit and squash d. in a temporary branch (starting like step a.): apply the first two commits e. tidy, commit and squash f. now it should work to do `git merge --squash temp-branch;git commit` (and find how to reuse the commit message of commit 2) --squash takes the diff of two branches and prepares it to be committed. All this to have only the changes from commit 1 to commit 2 as if they where both tidied when authored. Otherwise commit 2 directly would conflict or rollback part of tidying of commit 1. And likely create invalid code. Like when tidying spreads stuff on multiple lines. 💥 Then repeat with a temporary branch having commit 1 + 2 + 3 and then tidy and squash. Any less contrived way to get the same result? 😵‍💫😵‍💫😵‍💫 ------------------------ (In reply to Mark Hofstetter from comment #16)

one question for me is what happens to all bugfixes waiting for testing & QA, theoretically the should all be tidy or not?

if not they maybe should also be titied before automatically?

They are targeting the current code. So their diffs are from a non tidy codebase. Even if they would contain tidying changes (often it's in the last commit so the first commits don't have tidying) the starting point of the diff would have changed. So when trying to apply to the future tidied codebase git won't be able to match where to apply. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #19 from Tomás Cohen Arazi (tcohen) <tomascohen@gmail.com> --- We shouldn't see 'tidy' commits. Those should be FQA most of the time. And the author should deal with tidying and squashing. Sometimes the tidy is a bit more complex and justifies an extra commit, but that's the exception I'd say. It would be great to have it all automated. But we really need to make sure everyone is using the same perltidy version and config \o/ I still hate it that KTD tries to manipulate my git clone on startup BTW. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #21 from David Cook <dcook@prosentient.com.au> --- (In reply to Tomás Cohen Arazi (tcohen) from comment #19)

We shouldn't see 'tidy' commits. Those should be FQA most of the time. And the author should deal with tidying and squashing.

Sometimes the tidy is a bit more complex and justifies an extra commit, but that's the exception I'd say.

Personally, I prefer having a separate tidy commit, since it makes it clear that the change to the existing code is due only to the tidy. I find it makes it easier to review code, especially on the Bugzilla UI, which is typically my first step for code review.

I still hate it that KTD tries to manipulate my git clone on startup BTW.

Yeah I don't love it either. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #23 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 175488 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=175488&action=edit Bug 38664: Fix acqui/z3950_search -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|38713 | Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38713 [Bug 38713] [OMNIBUS] Incorrect HTML structures -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |38714 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38714 [Bug 38714] [OMNIBUS] Adjust templates for prettier -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Emily Lamancusa (emlam) <emily.lamancusa@montgomerycountymd.gov> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |emily.lamancusa@montgomeryc | |ountymd.gov -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #25 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 175664 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=175664&action=edit Bug 38664: Fixes for list and some tools templates tools/automatic_item_modification_by_age.tt tools/batchMod-del.tt tools/batchMod-edit.tt tools/batch_delete_records.tt tools/batch_extend_due_dates.tt tools/batch_record_modification.tt tools/cleanborrowers.tt tools/export.tt tools/import_borrowers.tt tools/inventory.tt tools/marc_modification_templates.tt tools/overduerules.tt tools/picture-upload.tt tools/quotes.tt tools/stage-marc-import.tt tools/stockrotation.tt tools/upload-images.tt tools/viewlog.tt virtualshelves/shelves.tt -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #27 from Thomas Klausner <domm@plix.at> --- Slightly related (esp if all code is touched): What do you think about moving all *.pm modules into `lib` (as is standard for CPAN dists). This would IMO make a lot of tooling and searching much easier, and would eg also make it easier to mount the local dev code into a docker container. (I guess this should be a distinct ticket?) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #29 from Jonathan Druart <jonathan.druart@gmail.com> --- (In reply to David Cook from comment #28)

(In reply to Thomas Klausner from comment #27)

...

Slightly related (esp if all code is touched): What do you think about moving all *.pm modules into `lib` (as is standard for CPAN dists). This would IMO make a lot of tooling and searching much easier, and would eg also make it easier to mount the local dev code into a docker container. (I guess this should be a distinct ticket?)

Probably a distinct ticket, but I'm always +1 for re-organising our source code.

Bug 28589. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |38854 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38854 [Bug 38854] Prettier fails on ToolbarButton because of 'class' prop -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Bug 38664 depends on bug 38854, which changed state. Bug 38854 Summary: Unused 'class' prop in ToolbarButton https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38854 What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|INVALID |--- -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #31 from Jonathan Druart <jonathan.druart@gmail.com> --- This is ready for testing: https://gitlab.com/joubu/Koha/-/commits/bug_38664 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |39059 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39059 [Bug 39059] Do not use "semi: false" for .vue files -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Bug 38664 depends on bug 39059, which changed state. Bug 39059 Summary: Do not use "semi: false" for .vue files https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39059 What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39085 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39085 [Bug 39085] No space preserved incorrecly after END -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39087 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39087 [Bug 39087] Some files are uglier when tidy -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to main Version(s)| |25.05.00 released in| | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39096 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39096 [Bug 39096] Add "tidy all" commits to a git blame ignore file -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #175664|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #36 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177797 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177797&action=edit Bug 38664: prettier-ignore virtualshelves/tables/shelves_results.tt You must have the version 2.0.2 of the prettier plugin! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #38 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177799 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177799&action=edit Bug 38664: Update yarn.lock -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #40 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177801 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177801&action=edit Bug 38664: Fix xt/author/valid-templates.t There was a missing END in basket/basket.tt (it should have been raised by the tidy that something wrong happened, to investigate later) The branch-selector change is a trick to make the test pass, or it fails with: # undef error - WHILE loop terminated (> 1000 iterations) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #42 from Jonathan Druart <jonathan.druart@gmail.com> --- All previous patches pushed to main to hopefully make Jenkins happy. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #43 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177813 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177813&action=edit Bug 38664: Add a xt test for TT files -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #45 from Victor Grousset/tuxayo <victor@tuxayo.net> --- (In reply to Jonathan Druart from comment #42)

All previous patches pushed to main to hopefully make Jenkins happy.

Thanks a lot! all failures should be gone except that one: # Failed test at xt/find-misplaced-executables.t line 57. # got: '2' # expected: '0' # $VAR1 = './test.pl'; # $VAR2 = './xt/tt_tidy.t'; -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #47 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177825 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177825&action=edit Bug 38664: Add +x to xt/tt_tidy.t -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #49 from Jonathan Druart <jonathan.druart@gmail.com> --- Last 2 patches pushed. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #51 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177827 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177827&action=edit Bug 38664: Revert changes to errorpage.tt This patch reverts the changes from bug 38718 made to errorpage.tt It fixes Auth/csrf.ts cypress test, but most important restores the correct UI on the error page when there is a CSRF error. This was caused by the STOP from blocking_errors, that is introduced by messages.inc included by main-container.inc -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39106 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39106 [Bug 39106] Improve the auto-rebase script to retrieve patches from bugzilla -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #54 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- (In reply to Jonathan Druart from comment #53)

Created attachment 177842 [details] [review] Bug 38664: The auto-rebase script - Create parent directory if missing

picking this one for main now. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39111 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39111 [Bug 39111] Tidying template files is ineffective -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |additional_work_needed --- Comment #55 from Victor Grousset/tuxayo <victor@tuxayo.net> --- dbic doesn't work because Koha/Schema.pm is autogenerated and checksum protected and it got some tidy changes. See with git log -p Koha/Schema.pm dbic: DBIx::Class::Schema::Loader::make_schema_at(): Checksum mismatch in './/Koha/Schema.pm', the auto-generated part of the file has been modified outside of this loader. Aborting. If you want to overwrite these modifications, set the 'overwrite_modifications' loader option. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #57 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Last patch fixes dbic. As for excluding Schema.pm of future tidy changes, I tested the git command standalone. To confirm that before it was returning Schema.pm. And that after, Schema.pm isn't there anymore and that the other results are still there. git ls-files '*.pl' '*.pm' '*.t' ':(exclude)Koha/Schema/Result' ':(exclude)Koha/Schema.pm' caveat: I don't know why there are two places to list the perl files and I'm not sure if there aren't more places where Schema.pm should be denylisted. koha-testing-docker doesn't seem to list/exclude the rest of the schema files (there could have been a hook or something) so it doesn't seem to need a change there. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39114 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 [Bug 39114] Auto-rebase script does not deal correctly with deleted files -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39115 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39115 [Bug 39115] Tidy script should list the files we do not want to tidy -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39119 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39119 [Bug 39119] xt/js_tidy.t and xt/vue_tidy.t does not use tidy.pl -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 --- Comment #61 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- (In reply to Jonathan Druart from comment #60)

(In reply to Victor Grousset/tuxayo from comment #58)

...

Created attachment 177958 [details] [review] [review] Bug 38664: Fix dbic: Revert changes to Schema.pm and add it to denylist

It's autogenerated and checksum protected so should be touch only by dbic.

Could you please move this patch on its own bug please? We should not add more patches starting with "Bug 38664: ". The auto-rebase script uses the git log to know where to position in the tree.

Can we get that patch moved please? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39132 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39132 [Bug 39132] Fix dbic: Revert changes to Schema.pm and add it to denylist -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39151 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39151 [Bug 39151] xt/verify-yarnlock.t creates a lot of warnings -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Tomás Cohen Arazi (tcohen) <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39152 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39152 [Bug 39152] Variables defined as `our` not tidied -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Lucas Gass (lukeg) <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39202 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39202 [Bug 39202] Lots of instances of HTML closing tags being on a separate line -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Emily Lamancusa (emlam) <emily.lamancusa@montgomerycountymd.gov> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the|Most of the codebase is now |This is an improvement to release notes|tidy. |the internals of Koha, |.pm, .pl, .t, .tt, |which will not cause any |.inc, .vue, and .js files |changes to library |are, and will continue to |workflows. Release notes |be, kept tidy! |for developers: | | |Update your |Most of |ktd to get: |the codebase is now tidy. | |.pm, .pl, .t, .tt, .inc, |The new images |.vue, and .js files are, |with a pre-commit Git hook, |and will continue to be, |which will be installed at |kept tidy! |ktd startup. | |The updated QA |Update your ktd |script. |to get: |A Prettier plugin | |for tidying Template |The new images |Toolkit files: |with a pre-commit Git hook, |https://gitlab.com/koha-com |which will be installed at |munity/prettier-plugin-temp |ktd startup. |late-toolkit |The updated QA |For new |script. |patches you don’t need to |A Prettier plugin |do anything special: |for tidying Template | |Toolkit files: |The |https://gitlab.com/koha-com |pre-commit hook will |munity/prettier-plugin-temp |automatically tidy files |late-toolkit |when you commit your |For new |changes. |patches you don’t need to |The QA script will |do anything special: |check that your commits | |contain tidy versions of |The |the files. |pre-commit hook will | |automatically tidy files |There are two |when you commit your |new scripts available for |changes. |developers: |The QA script will |misc/devel/tidy.pl - Used |check that your commits |to tidy files. |contain tidy versions of |misc/devel/auto_rebase.pl - |the files. |Automatically attempts to | |rebase your patches. |There are two | |new scripts available for | |developers: | |misc/devel/tidy.pl - Used | |to tidy files. | |misc/devel/auto_rebase.pl - | |Automatically attempts to | |rebase your patches. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39352 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39352 [Bug 39352] Old node_modules in koha code directory breaks prettier for .tt and .inc. Causes commit hook to commit empty files -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |39395 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39395 [Bug 39395] sco login form not correctly placed -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Tomás Cohen Arazi (tcohen) <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |40261 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40261 [Bug 40261] tidy.pl cannot handle `build-git-snapshot` -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|38713 | Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38713 [Bug 38713] Incorrect HTML structures -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to main |Needs documenting CC| |fridolin.somers@biblibre.co | |m --- Comment #64 from Fridolin Somers <fridolin.somers@biblibre.com> --- Not for 24.11.x -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |41071 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41071 [Bug 41071] Registers not correctly populated / selected when changing branches -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |41322 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41322 [Bug 41322] Incorrect use of Test::Strict in xt/tt_tidy.t -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |41634 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41634 [Bug 41634] We should add podtidy to our tidying -- You are receiving this mail because: You are watching all bug changes.