Skip to content

Refactor git cherry count parsing #596

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
chubes4 merged 1 commit into from
Jun 7, 2026
Merged

Refactor git cherry count parsing #596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 32 additions & 22 deletions inc/Workspace/Workspace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2899,18 +2899,8 @@ private function build_clean_upstream_equivalence_evidence( string $primary_path

$cherry = $this->run_git($wt_path, sprintf('cherry %s HEAD', escapeshellarg($default_ref)), self::CLEANUP_GIT_PROBE_TIMEOUT);
if ( ! is_wp_error($cherry) ) {
$lines = array_values(array_filter(array_map('trim', explode("\n", (string) ( $cherry['output'] ?? '' )))));
foreach ( $lines as $line ) {
if ( str_starts_with($line, '-') ) {
++$evidence['git_cherry']['equivalent'];
} elseif ( str_starts_with($line, '+') ) {
++$evidence['git_cherry']['unmatched'];
} else {
++$evidence['git_cherry']['unknown'];
}
}
$evidence['git_cherry']['total'] = count($lines);
if ( 0 < count($lines) && 0 === (int) $evidence['git_cherry']['unmatched'] && 0 === (int) $evidence['git_cherry']['unknown'] ) {
$evidence['git_cherry'] = $this->parse_git_cherry_counts( (string) ( $cherry['output'] ?? '' ) );
if ( 0 < (int) $evidence['git_cherry']['total'] && 0 === (int) $evidence['git_cherry']['unmatched'] && 0 === (int) $evidence['git_cherry']['unknown'] ) {
$evidence['effective_status'] = 'equivalent_clean';
return $evidence;
}
Expand Down Expand Up @@ -3006,16 +2996,7 @@ private function build_dirty_unpushed_upstream_equivalence_evidence( string $pri

$cherry = $this->time_worktree_probe($evidence['probe_timings_ms'], 'git_cherry', fn() => $this->run_git($wt_path, sprintf('cherry %s HEAD', escapeshellarg($default_ref)), self::CLEANUP_GIT_PROBE_TIMEOUT));
if ( ! is_wp_error($cherry) ) {
$lines = array_values(array_filter(array_map('trim', explode("\n", (string) ( $cherry['output'] ?? '' )))));
foreach ( $lines as $line ) {
if ( str_starts_with($line, '-') ) {
++$evidence['unpushed_cherry']['equivalent'];
} elseif ( str_starts_with($line, '+') ) {
++$evidence['unpushed_cherry']['unmatched'];
} else {
++$evidence['unpushed_cherry']['unknown'];
}
}
$evidence['unpushed_cherry'] = $this->parse_git_cherry_counts( (string) ( $cherry['output'] ?? '' ) );
$evidence['unpushed_patch_equivalent'] = 0 === (int) $evidence['unpushed_cherry']['unmatched'] && 0 === (int) $evidence['unpushed_cherry']['unknown'];
}

Expand Down Expand Up @@ -3066,6 +3047,35 @@ private function build_dirty_unpushed_upstream_equivalence_evidence( string $pri
return $evidence;
}

/**
* Parse `git cherry` output into equivalent/unmatched/unknown counters.
*
* @param string $output Raw `git cherry` output.
* @return array<string,int>
*/
private function parse_git_cherry_counts( string $output ): array {
$counts = array(
'equivalent' => 0,
'unmatched' => 0,
'unknown' => 0,
'total' => 0,
);

$lines = array_values(array_filter(array_map('trim', explode("\n", $output))));
foreach ( $lines as $line ) {
if ( str_starts_with($line, '-') ) {
++$counts['equivalent'];
} elseif ( str_starts_with($line, '+') ) {
++$counts['unmatched'];
} else {
++$counts['unknown'];
}
}
$counts['total'] = count($lines);

return $counts;
}

/**
* Classify dirty paths against the remote default branch with batched git probes.
*
Expand Down
Loading