Skip to content

Remove backported revcheck compatibility #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Nov 14, 2024
Merged

Remove backported revcheck compatibility #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f9921a1
DTO for revcheck data.
Oct 25, 2024
d72bb52
Preparation for revcheck data exporting.
Oct 26, 2024
72453ce
Backport loose and fixed [skip-revcheck] modes
Oct 26, 2024
600714c
Additional revcheck data.
Nov 1, 2024
221e0dc
Revcheck deduplication: clean up, header.
Nov 1, 2024
83fb651
Revcheck deduplication: translators, file summary.
Nov 1, 2024
3b62b38
Revcheck deduplication: old/wip files.
Nov 5, 2024
156b0b5
Move backport code and docs to a separate file.
Nov 5, 2024
4405435
Revcheck deduplication: backport couting behaviour.
Nov 5, 2024
31cf0db
Revcheck deduplication: more backport couting woes.
Nov 5, 2024
324f48c
Revcheck deduplication: notinen, revtag, unstranslated.
Nov 5, 2024
60b5f1e
Revcheck deduplication: ignore, regex, xml.
Nov 6, 2024
a0ddca6
Revcheck deduplication: adds/dels, clean up.
Nov 6, 2024
55bae33
Revcheck deduplicatoin: genrevdb.php.
Nov 7, 2024
1ab908c
Revcheck deduplicatoin: genrevdb.php.
Nov 7, 2024
a08561f
More backport and small fixes.
Nov 7, 2024
d254ced
Review changes/fixes.
Nov 7, 2024
117a61d
Better log messages.
Nov 7, 2024
3eb4ef5
Remove unrelated filter.
Nov 8, 2024
bf4f663
Merge branch 'php:master' into master
alfsb Nov 11, 2024
31fc969
Tracks chmonly/ as translatable.
Nov 11, 2024
6d864a1
Tracks translatable extensions.xml files.
Nov 11, 2024
ddbfd62
Counts ok/old exclusively.
Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/revcheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ function print_html_header( RevcheckData $data )
<body>

<div id="header" style="background-color: #9999CC;">
<h1 style="margin: 0; padding: 0.5em;">Status of the translated PHP Manual</h1>
<p style="font-size: small; margin: 0; padding: 1em;">Generated: $date / Language: $lang</p>
<h1 style="margin: 0; padding: 0.5em;">Status of the PHP Manual $lang translation</h1>
<p style="margin: 0; padding: 0 1em 1em 1em;">Generated: $date</p>
</div>
HTML;
}
Expand Down Expand Up @@ -133,9 +133,9 @@ function print_html_translators( RevcheckData $data )
<th colspan=4>Files maintained</th>
</tr>
<tr>
<th>upto-<br/>date</th> <!-- STATUS_COUNT_MISMATCH <th>ok</th> -->
<th>ok</th>
<th>old</th>
<th>wip</th> <!-- STATUS_COUNT_MISMATCH <th>misc</th> -->
<th>misc</th>
<th>sum</th>
</tr>
HTML;
Expand Down
7 changes: 0 additions & 7 deletions scripts/translation/lib/RevcheckIgnore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@ public static function ignore( $filename ) : bool
if ( $filename == "reference/datetime/timezones.xml" )
return true;

if ( IGNORE_EXTENSIONS_XML )
if ( str_ends_with( $filename , '/extensions.xml') ) // track/count backport
return true;
if ( IGNORE_CHMONLY_DIR )
if ( str_starts_with( $filename , 'chmonly/') ) // track/count backport
return true;

// Only in translations

if ( $filename == "translation.xml" )
Expand Down
20 changes: 4 additions & 16 deletions scripts/translation/lib/RevcheckRun.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,29 +182,17 @@ private function addData( RevcheckFileInfo $info , RevtagInfo|null $revtag = nul

$translator = $this->revData->getTranslator( $revtag->maintainer );

switch( $info->status ) // counts
switch( $info->status )
{
case RevcheckStatus::TranslatedOk: // ready and synced
case RevcheckStatus::TranslatedOk:
$translator->countOk++;
break;
case RevcheckStatus::TranslatedOld: // ready and outdated
case RevcheckStatus::TranslatedOld:
$translator->countOld++;
break;
// STATUS_COUNT_MISMATCH count correct
// default: // all other cases
// $translator->countOther++;

// STATUS_COUNT_MISMATCH backported behaviour
case RevcheckStatus::RevTagProblem: // STATUS_COUNT_MISMATCH backported behaviour
$translator->countOld++; // RevTagProblem into Old (generated diff link fails)
break;
case RevcheckStatus::NotInEnTree: // STATUS_COUNT_MISMATCH backported behaviour
break; // Not counted, but files are listed anyways...
default:
if ( $revtag->status != "ready" ); // STATUS_COUNT_MISMATCH backported behaviour
$translator->countOther++; // The exception of all cases, and also not ready.
$translator->countOther++;
break;
// STATUS_COUNT_MISMATCH backported behaviour
}

switch( $info->status ) // adds,dels
Expand Down
43 changes: 0 additions & 43 deletions scripts/translation/lib/backport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,11 @@

// Constants

const IGNORE_CHMONLY_DIR = true;
const IGNORE_EXTENSIONS_XML = true;
const STATUS_COUNT_MISMATCH = true;
const LOOSE_SKIP_REVCHECK = true;
const FIXED_SKIP_REVCHECK = true;

// Documentation

/* # IGNORE_CHMONLY_DIR

The chmonly/ dir contains files that appears to be
translatable. See recent efforts to re-enabling
CHM build: https://github.com/php/doc-base/pull/163
*/

/* # IGNORE_EXTENSIONS_XML

The actual revcheck ignores any files called extensions.xml,
but are at least two of files with this name.

- appendices/migration56/extensions.xml (translatable)
- install/windows/legacy/extensions.xml (deleted on en/, exists untracked on translations)
*/

/* # STATUS_COUNT_MISMATCH

The actual revcheck counts "outdated" files in two different ways;

- Only TranslatedOld:
https://github.com/php/doc-base/blob/747c53bf8ec72f27ac1a83ba91bcc390eea2e46a/scripts/revcheck.php#L603
- TranslatedOld + RevTagProblem:
https://github.com/php/doc-base/blob/747c53bf8ec72f27ac1a83ba91bcc390eea2e46a/scripts/revcheck.php#L134

This causes a mismatchs between translators totals and file summary.

To make the mismatch smaller, the "wip" column in Translators was
changed to "misc", and so any status other than "ok" and "old"
was added here.

Also, NotInEnTree is missing on first case, and files
in this situation goes uncounted.

Also, RevTagProblem is counted towards as Old, but files
are show in revtag missing/problem list, and is
impossible to generate diffs with invalid hashes... */

assert( STATUS_COUNT_MISMATCH || ! STATUS_COUNT_MISMATCH );

/* # LOOSE_SKIP_REVCHECK

Consider the output of: git show f80105b4fc1196bd8d5fecb98d686b580b1ff65d
Expand Down
Loading