Repository navigation
Conversation
This was referenced Oct 31, 2026
github-actions
Bot
added
fix error
12 tasks done
|
Some comparisons could not be completed because a pull request conflicts with the base branch. Review these shared files manually before concluding that there is no overlap.
|
This was referenced Nov 1, 2026
Merged
12 tasks done
This was referenced Nov 1, 2026
12 tasks done
12 tasks done
12 tasks done
Open
12 tasks done
12 tasks done
12 tasks done
12 tasks done
12 tasks done
This was referenced Nov 1, 2026
This was referenced Nov 5, 2026
12 tasks done
12 tasks done
12 tasks done
12 tasks done
Open
12 tasks done
12 tasks done
12 tasks done
12 tasks done
12 tasks done
This was referenced Nov 5, 2026
12 tasks done
12 tasks done
12 tasks done
12 tasks done
12 tasks done
This was referenced Nov 6, 2026
12 tasks done
12 tasks done
12 tasks done
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Options 2 and 3 of #12521, as agreed there: a blank line between the entries of every technical debt file, no export or declaration totals in entries, and a script that applies the reformat so open pull requests can rerun it when they rebase. One file per entry and
merge=unionare left out.Three commits:
tools/debt_format.py, the check and the rule.python3 tools/debt_format.pyadds a blank line before each top-level entry (-at the start of a line) ofdocs/dev/TechnicalDebt.mdanddocs/dev/debt/*.mdthat follows a non-blank line, and lists the files it changed. Nothing else changes: nested items, tables and continuation lines stay as they are.--checkchanges nothing, lists the files and exits with 1.python3 tools/debt_format.py resolve, during a stopped rebase or merge: for each conflicted debt file it separates the entries of the base, ours and theirs versions, merges them again withgit merge-file, stages the files that merge cleanly and formats the other debt files. Two rules settle the hunks the count removal leaves. When one side only renumbered lines in which the other side dropped numbers, the other side's lines are taken. When every word one side changed in a hunk was a number it replaced, the hunk is merged word by word under the same rule. The remaining hunks keep conflict markers, with the base section undermerge.conflictStyle=diff3, and the command exits with 1.debt-spacing: an entry the pull request adds or edits directly after a non-blank line.debt_split.pyandstubgen.pywrite separated entries.debt_format.py resolveon a conflict.python3 tools/debt_format.py: 3371 blank lines in 168 files, and no other line.Like #12862, commits 2 and 3 should be regenerated on the
mainthey land on, so this stays a draft until a merge batch gives a window. Today 1011 of the 1703 open pull requests change a debt file.After this lands, every open pull request that adds or edits a debt entry fails
debt-spacinguntil it rebases or runspython3 tools/debt_format.py, and most of them conflict in the debt files until it rebases and runsresolve, as with the AGC split.Overlaps:
RULEStable intools/check_conventions.py, directly afterenv-reference. Agreed with MarcZX10 here: whichever is ready first lands, and the other rebases and keeps both sets of rows.write_debtintools/debt_split.py. Proposed that fix(tools): keep a debt file's note and sub-headings when debt_split rewrites it #13957 goes first and this rebases onto it withwrite_lf(path, space_debt(render(f"# {name} technical debt", sections, order, preamble))); not agreed yet.Tested
Arch Linux, Python 3.14, git 2.56.0, on
main3818919.git diff --ignore-blank-linesis empty). The whole branch againstmainis the count edits of commit 2 plus empty lines.python3 tools/check_conventions.py --base 381891927c: no errors. 5debt-lengthwarnings forlibSceHmd2.mdentries that were over 1000 characters before commit 2 edited them.tools/tests/test_debt_format.py(12 tests),test_debt_split.py,test_check_conventions_debt_length.py,test_check_conventions_comments.py,test_check_conventions_blob_reads.py,test_check_conventions_doc_links.py,test_stubgen.pyandtest_stubgen_stdout_newlines.pypass. Of the 83tools/tests/test_*.py, 81 pass;test_patch_lib_atrac9.pyandtest_run_report_schema.py(nojsonschemahere) fail onmaintoo.python3 tools/check_test_registration.py --scripts: 234 test scripts, each run.git merge-file(base: the merge base, ours:mainor this branch, theirs: the head):maintodayresolveresolveAfter
resolve, 40 pull requests that conflict today merge cleanly and 27 that merge cleanly today conflict. Those 27 edit an entry whose total commit 2 removed, or the lines around it. No merged fileresolveleaves clean has an entry without its blank line. The last row is also the steady state of the layout: with all three versions formatted, today's pull requests conflict in 183 cases instead of 201. The word-by-word rule settles 47 cases where a pull request changed a total and other words of the same entry (for example a pending-export total and the list of exceptions inlibSceLibreSsl3.md); only the total is replaced bymain's wording and the rest of the change is kept.Not built: no source file changes.
Checklist
main; no other open PR implements the same functionsNotImplemented_nid_no_patch); silent stubs are listed under Silent stubs in their library's technical debt file.mdfiles or images added to the repository (attach them to this PR)