Skip to content

Fix/filter keep #33

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
trepmal merged 2 commits into from
Jun 10, 2025
Merged

Fix/filter keep #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95d8164
check for --filter-keep earlier, account for -1 value
trepmal Jun 9, 2025
465194d
stop the insanity when using --filter-keep. props @nlemoine
trepmal Jun 9, 2025
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
36 changes: 19 additions & 17 deletions inc/class-revisions-cli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,17 +292,23 @@ function ( $i ) {

$this->start_bulk_operation();

$inc = 0;
foreach ( $posts as $post_id ) {
if ( $filter_keep ) {
$keep = wp_revisions_to_keep( get_post( $post_id ) );
++$inc;
if ( 0 === $inc % 10 ) {
$this->stop_the_insanity();
}
if ( -1 === intval( $keep ) ) {
$notify->tick();
continue;
}
}

// phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.get_posts_get_children
$revisions = get_children(
$revisions = wp_get_post_revisions(
$post_id,
array(
'order' => 'DESC',
'orderby' => 'date ID',
'post_parent' => $post_id,
'post_type' => 'revision',
'post_status' => 'inherit',
// trust me on these.
'update_post_meta_cache' => false,
'update_post_term_cache' => false,
'fields' => 'ids',
Expand All @@ -314,10 +320,6 @@ function ( $i ) {
continue;
}

if ( $filter_keep ) {
$keep = wp_revisions_to_keep( get_post( $post_id ) );
}

$count = count( $revisions );

if ( $count > $keep ) {
Expand Down Expand Up @@ -429,11 +431,6 @@ public function generate( $args = array(), $assoc_args = array() ) {
$notify = \WP_CLI\Utils\make_progress_bar( sprintf( 'Generating revisions for %d post(s)', $total ), $total );

$this->start_bulk_operation();
if ( ! defined( 'WP_INSTALLING' ) ) {
// Prevent unneeded cache-adds in some object cache implementations
// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedConstantFound
define( 'WP_INSTALLING', true );
}

remove_all_filters( 'wp_revisions_to_keep' );
remove_all_filters( 'wp_insert_post_data' );
Expand Down Expand Up @@ -520,6 +517,11 @@ protected function stop_the_insanity() {
protected function start_bulk_operation() {
// Disable term count updates for speed
wp_defer_term_counting( true );
if ( ! defined( 'WP_INSTALLING' ) ) {
Copy link
Copy Markdown

@nlemoine nlemoine Jun 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@trepmal Maybe the https://developer.wordpress.org/reference/functions/wp_suspend_cache_addition/ function would be less "hacky" ?

// Prevent unneeded cache-adds in some object cache implementations
// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedConstantFound
define( 'WP_INSTALLING', true );
}
}

/**
Expand Down