Skip to content

Commit 3ab628a

Browse files
fix: honor upstream-equivalent cleanup signals
1 parent a9bbea2 commit 3ab628a

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

inc/Workspace/WorkspaceActiveNoSignalCleanup.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,6 +1690,14 @@ private function is_generated_or_artifact_path( string $path ): bool {
16901690
* @return string
16911691
*/
16921692
private function suggest_active_no_signal_action( array $row ): string {
1693+
$effective_status = (string) ( $row['upstream_equivalence']['effective_status'] ?? '' );
1694+
if ( 'equivalent_clean' === $effective_status ) {
1695+
return 'patch_equivalent_default';
1696+
}
1697+
if ( 'contained_non_default_remote' === $effective_status ) {
1698+
return 'contained_non_default_remote';
1699+
}
1700+
16931701
if ( (int) ( $row['dirty'] ?? 0 ) > 0 || (int) ( $row['unpushed'] ?? 0 ) > 0 ) {
16941702
return 'unsafe_dirty_or_unpushed';
16951703
}
@@ -1706,14 +1714,6 @@ private function suggest_active_no_signal_action( array $row ): string {
17061714
return 'merged_to_default';
17071715
}
17081716

1709-
$effective_status = (string) ( $row['upstream_equivalence']['effective_status'] ?? '' );
1710-
if ( 'equivalent_clean' === $effective_status ) {
1711-
return 'patch_equivalent_default';
1712-
}
1713-
if ( 'contained_non_default_remote' === $effective_status ) {
1714-
return 'contained_non_default_remote';
1715-
}
1716-
17171717
if ( true === ( $row['remote_tracking'] ?? null ) ) {
17181718
return 'remote_tracking_clean';
17191719
}

0 commit comments

Comments
 (0)