Migrate megarepo tool gradual-delete command to newadmin

Summary:
## This stack
Migrate all commands from megarepo tool CLI to mononoke admin `megarepo` subcommand, so they use mononoke_app + clap 4, instad of old cmdlib + clap-2.

I'll try to do one diff per command.

## This diff

Migrate the `gradual-delete` command.

Differential Revision: D73503913

fbshipit-source-id: 0d3f9decb0cf0e073d56c809885b5bb173f093f8

Author: gustavoavena

eden/mononoke/commit_rewriting/megarepo/tool/cli.rs

@@ -39,7 +39,6 @@ pub const DRY_RUN: &str = "dry-run";
 pub const EVEN_CHUNK_SIZE: &str = "even-chunk-size";
 pub const GRADUAL_MERGE_PROGRESS: &str = "gradual-merge-progress";
 pub const GRADUAL_MERGE: &str = "gradual-merge";
-pub const GRADUAL_DELETE: &str = "gradual-delete";
 pub const HEAD_BOOKMARK: &str = "head-bookmark";
 pub const HISTORY_FIXUP_DELETE: &str = "history-fixup-deletes";
 pub const INPUT_FILE: &str = "input-file";
@@ -52,7 +51,6 @@ pub const MARK_PUBLIC: &str = "mark-public";
 pub const OVERWRITE: &str = "overwrite";
 pub const PARENTS: &str = "parents";
 pub const PATH_REGEX: &str = "path-regex";
-pub const PATH: &str = "path";
 pub const PATH_PREFIX: &str = "path-prefix";
 pub const PATHS_FILE: &str = "paths-file";
 pub const PRE_DELETION_COMMIT: &str = "pre-deletion-commit";
@@ -210,33 +208,6 @@ pub fn setup_app<'a, 'b>() -> MononokeClapApp<'a, 'b> {
                     .multiple(true),
             );
 
-    // PLease don't move `add_light_resulting_commit_args` to be applied
-    // after `PATH` arg is added, as in that case `PATH` won't be the last
-    // positional argument
-    let gradual_delete_subcommand =
-        add_light_resulting_commit_args(SubCommand::with_name(GRADUAL_DELETE))
-            .about("create a set of delete commits for given paths")
-            .arg(
-                Arg::with_name(COMMIT_HASH)
-                    .help("commit from which to start deletion")
-                    .takes_value(true)
-                    .required(true),
-            )
-            .arg(
-                Arg::with_name(EVEN_CHUNK_SIZE)
-                    .help("chunk size for even chunking")
-                    .long(EVEN_CHUNK_SIZE)
-                    .takes_value(true)
-                    .required(true),
-            )
-            .arg(
-                Arg::with_name(PATH)
-                    .help("paths to delete")
-                    .takes_value(true)
-                    .required(true)
-                    .multiple(true),
-            );
-
     let gradual_merge_subcommand = SubCommand::with_name(GRADUAL_MERGE)
         .about("Gradually merge a list of deletion commits")
         .arg(
@@ -529,7 +500,6 @@ pub fn setup_app<'a, 'b>() -> MononokeClapApp<'a, 'b> {
         .subcommand(history_fixup_delete_subcommand)
         .subcommand(add_light_resulting_commit_args(gradual_merge_subcommand))
         .subcommand(gradual_merge_progress_subcommand)
-        .subcommand(gradual_delete_subcommand)
         .subcommand(manual_commit_sync_subcommand)
         .subcommand(add_light_resulting_commit_args(
             catchup_delete_head_subcommand,

eden/mononoke/commit_rewriting/megarepo/tool/main.rs

@@ -52,14 +52,11 @@ use live_commit_sync_config::LiveCommitSyncConfig;
 use manifest::Entry;
 use manifest::ManifestOps;
 use manifest::PathOrPrefix;
-use megarepolib::chunking::Chunker;
 use megarepolib::chunking::even_chunker_with_max_size;
 use megarepolib::commit_sync_config_utils::diff_small_repo_commit_sync_configs;
 use megarepolib::common::create_and_save_bonsai;
-use megarepolib::common::delete_files_in_chunks;
 use megarepolib::history_fixup_delete::HistoryFixupDeletes;
 use megarepolib::history_fixup_delete::create_history_fixup_deletes;
-use megarepolib::working_copy::get_working_copy_paths_by_prefixes;
 use metaconfig_types::CommitSyncConfigVersion;
 use metaconfig_types::MetadataDatabaseConfig;
 use metaconfig_types::RepoConfig;
@@ -112,7 +109,6 @@ use crate::cli::DELETION_CHUNK_SIZE;
 use crate::cli::DIFF_MAPPING_VERSIONS;
 use crate::cli::DRY_RUN;
 use crate::cli::EVEN_CHUNK_SIZE;
-use crate::cli::GRADUAL_DELETE;
 use crate::cli::GRADUAL_MERGE;
 use crate::cli::GRADUAL_MERGE_PROGRESS;
 use crate::cli::HEAD_BOOKMARK;
@@ -125,7 +121,6 @@ use crate::cli::MAPPING_VERSION_NAME;
 use crate::cli::MARK_NOT_SYNCED_COMMAND;
 use crate::cli::OVERWRITE;
 use crate::cli::PARENTS;
-use crate::cli::PATH;
 use crate::cli::PATH_PREFIX;
 use crate::cli::PATH_REGEX;
 use crate::cli::PATHS_FILE;
@@ -247,66 +242,6 @@ async fn run_history_fixup_delete<'a>(
     Ok(())
 }
 
-async fn run_gradual_delete<'a>(
-    ctx: &CoreContext,
-    matches: &MononokeMatches<'a>,
-    sub_m: &ArgMatches<'a>,
-) -> Result<(), Error> {
-    let repo: Repo =
-        args::not_shardmanager_compatible::open_repo(ctx.fb, &ctx.logger().clone(), matches)
-            .await?;
-
-    let delete_cs_args_factory = get_delete_commits_cs_args_factory(sub_m)?;
-
-    let chunker: Chunker<NonRootMPath> = {
-        let even_chunk_size: usize = sub_m
-            .value_of(EVEN_CHUNK_SIZE)
-            .ok_or_else(|| format_err!("{} is required", EVEN_CHUNK_SIZE))?
-            .parse::<usize>()?;
-        even_chunker_with_max_size(even_chunk_size)?
-    };
-
-    let parent_bcs_id = {
-        let hash = sub_m.value_of(COMMIT_HASH).unwrap().to_owned();
-        helpers::csid_resolve(ctx, &repo, hash).await?
-    };
-
-    let path_prefixes: Vec<_> = sub_m
-        .values_of(PATH)
-        .unwrap()
-        .map(NonRootMPath::new)
-        .collect::<Result<Vec<_>, Error>>()?;
-    info!(
-        ctx.logger(),
-        "Gathering working copy files under {:?}", path_prefixes
-    );
-    let paths =
-        get_working_copy_paths_by_prefixes(ctx, &repo, parent_bcs_id, path_prefixes).await?;
-    info!(ctx.logger(), "{} paths to be deleted", paths.len());
-
-    info!(ctx.logger(), "Starting deletion");
-    let delete_commits = delete_files_in_chunks(
-        ctx,
-        &repo,
-        parent_bcs_id,
-        paths,
-        &chunker,
-        &delete_cs_args_factory,
-        false, /* skip_last_chunk */
-    )
-    .await?;
-    info!(ctx.logger(), "Deletion finished");
-    info!(
-        ctx.logger(),
-        "Listing commits in an ancestor-descendant order"
-    );
-    for delete_commit in delete_commits {
-        println!("{}", delete_commit);
-    }
-
-    Ok(())
-}
-
 async fn run_gradual_merge<'a>(
     ctx: &CoreContext,
     matches: &MononokeMatches<'a>,
@@ -1046,7 +981,6 @@ fn main(fb: FacebookInit) -> Result<()> {
             (CATCHUP_VALIDATE_COMMAND, Some(sub_m)) => {
                 run_catchup_validate(ctx, &matches, sub_m).await
             }
-            (GRADUAL_DELETE, Some(sub_m)) => run_gradual_delete(ctx, &matches, sub_m).await,
             (GRADUAL_MERGE, Some(sub_m)) => run_gradual_merge(ctx, &matches, sub_m).await,
             (GRADUAL_MERGE_PROGRESS, Some(sub_m)) => {
                 run_gradual_merge_progress(ctx, &matches, sub_m).await

eden/mononoke/tests/integration/cross_repo/library-git-submodules-repos-setup.sh

@@ -151,10 +151,10 @@ function merge_repo_a_to_large_repo {
   COMMIT_DATE="1985-09-04T00:00:00.00Z"
 
   print_section "Creating deletion commits"
-  REPOID="$LARGE_REPO_ID" with_stripped_logs megarepo_tool gradual-delete test_user \
-         "deletion commits for merge into large repo" \
-          "$IMPORTED_HEAD" "$SMALL_REPO_FOLDER" --even-chunk-size 2 \
-          --commit-date-rfc3339 "$COMMIT_DATE" 2>&1 | tee "$TESTTMP/gradual_delete.out"
+  with_stripped_logs mononoke_admin megarepo gradual-delete \
+    --repo-id "$LARGE_REPO_ID" -a test_user -m "deletion commits for merge into large repo" \
+    -i "$IMPORTED_HEAD" --even-chunk-size 2 --commit-date-rfc3339 "$COMMIT_DATE" \
+    "$SMALL_REPO_FOLDER" 2>&1 | tee "$TESTTMP/gradual_delete.out"
 
   LAST_DELETION_COMMIT=$(tail -n1 "$TESTTMP/gradual_delete.out")
   printf "\nLAST_DELETION_COMMIT: %s\n\n" "$LAST_DELETION_COMMIT"

eden/mononoke/tests/integration/megarepo/test-megarepo-tool.t

@@ -170,6 +170,41 @@ test pre-merge deletes functionality
   8807f350542a43aa815abc0c250c4a79ba35fd5bb68594e3ce6555e6630d81c2
   090a140adb3da3f4a629014cd9625055d8bd992a967ad7fc7e4e4d74892c4b71
 
+test gradual-delete functionality
+  $ LAST_DELETION_BONSAI=$(mononoke_admin megarepo gradual-delete --repo-id 0 \
+  > --bookmark master_bookmark \
+  > -a author -m "gradual deletion" \
+  > --even-chunk-size 1 \
+  > --commit-date-rfc3339 "$COMMIT_DATE" \
+  > arvr fbcode 2>/dev/null | tail -1)
+  $ echo $LAST_DELETION_BONSAI
+  87e09c9ddd7190bf5b19f4003e7356779b8df5487ab5f7ecf794100301b9e64b
+  $ LAST_DELETION_COMMIT=$(mononoke_admin convert -R repo -f bonsai -t hg --derive $LAST_DELETION_BONSAI)
+  $ echo $LAST_DELETION_COMMIT
+  e7ee4708d8e0cd96c843ef598c7ad94882e42096
+
+  $ cd $TESTTMP/repo-pull
+  $ sl pull -q -r $LAST_DELETION_COMMIT
+  $ sl log --stat -r "reverse($LAST_DELETION_COMMIT % master_bookmark)"
+  commit:      e7ee4708d8e0
+  user:        author
+  date:        Wed Sep 04 00:00:00 1985 +0000
+  summary:     [MEGAREPO DELETE] gradual deletion (1)
+  
+   fbcode/fbcodfile_fbsource |  1 -
+   1 files changed, 0 insertions(+), 1 deletions(-)
+  
+  commit:      cd9e15c2d8e0
+  user:        author
+  date:        Wed Sep 04 00:00:00 1985 +0000
+  summary:     [MEGAREPO DELETE] gradual deletion (0)
+  
+   arvr/arvrfile_ovrsource |  1 -
+   1 files changed, 0 insertions(+), 1 deletions(-)
+  
+  $ sl files -r "$LAST_DELETION_COMMIT" arvr fbcode || echo "Directories have been deleted"
+  Directories have been deleted
+
 run mover
   $ mononoke_admin megarepo run-mover \
   > --source-repo-id 0 --target-repo-id 1 \

eden/mononoke/tools/admin/src/commands/megarepo.rs

@@ -8,6 +8,7 @@
 mod bonsai_merge;
 pub mod check_prereqs;
 pub(crate) mod common;
+mod gradual_delete;
 mod merge;
 mod move_commit;
 mod pre_merge_delete;
@@ -22,6 +23,7 @@ use mononoke_app::MononokeApp;
 
 use self::bonsai_merge::BonsaiMergeArgs;
 use self::check_prereqs::CheckPrereqsArgs;
+use self::gradual_delete::GradualDeleteArgs;
 use self::merge::MergeArgs;
 use self::move_commit::MoveArgs;
 use self::pre_merge_delete::PreMergeDeleteArgs;
@@ -44,6 +46,7 @@ enum MegarepoSubcommand {
     MoveCommit(MoveArgs),
     RunMover(RunMoverArgs),
     SyncDiamondMerge(SyncDiamondMergeArgs),
+    GradualDelete(GradualDeleteArgs),
     PreMergeDelete(PreMergeDeleteArgs),
     BonsaiMerge(BonsaiMergeArgs),
     CheckPrereqs(CheckPrereqsArgs),
@@ -63,6 +66,7 @@ pub async fn run(app: MononokeApp, args: CommandArgs) -> Result<()> {
         MegarepoSubcommand::PreMergeDelete(args) => pre_merge_delete::run(&ctx, app, args).await?,
         MegarepoSubcommand::BonsaiMerge(args) => bonsai_merge::run(&ctx, app, args).await?,
         MegarepoSubcommand::CheckPrereqs(args) => check_prereqs::run(&ctx, app, args).await?,
+        MegarepoSubcommand::GradualDelete(args) => gradual_delete::run(&ctx, app, args).await?,
     }
 
     Ok(())

eden/mononoke/tools/admin/src/commands/megarepo/gradual_delete.rs

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This software may be used and distributed according to the terms of the
+ * GNU General Public License version 2.
+ */
+
+use anyhow::Result;
+use context::CoreContext;
+use megarepolib::chunking::even_chunker_with_max_size;
+use megarepolib::common::delete_files_in_chunks;
+use megarepolib::working_copy::get_working_copy_paths_by_prefixes;
+use mononoke_api::Repo;
+use mononoke_app::MononokeApp;
+use mononoke_app::args::ChangesetArgs;
+use mononoke_app::args::RepoArgs;
+use mononoke_types::NonRootMPath;
+use slog::info;
+
+use super::common::LightResultingChangesetArgs;
+use crate::commands::megarepo::common::get_delete_commits_cs_args_factory;
+
+#[derive(Debug, clap::Args)]
+pub struct GradualDeleteArgs {
+    #[clap(flatten)]
+    pub repo_args: RepoArgs,
+
+    /// Commit from which to start deletion
+    #[clap(flatten)]
+    pub commit: ChangesetArgs,
+
+    #[clap(flatten)]
+    pub res_cs_args: LightResultingChangesetArgs,
+
+    /// Chunk size for even chunking
+    #[clap(long)]
+    pub even_chunk_size: usize,
+
+    /// Paths to delete
+    #[clap(required = true)]
+    pub paths: Vec<String>,
+}
+
+pub async fn run(ctx: &CoreContext, app: MononokeApp, args: GradualDeleteArgs) -> Result<()> {
+    let repo: Repo = app.open_repo(&args.repo_args).await?;
+
+    let delete_cs_args_factory = get_delete_commits_cs_args_factory(args.res_cs_args)?;
+    let chunker = even_chunker_with_max_size(args.even_chunk_size)?;
+
+    let parent_bcs_id = args.commit.resolve_changeset(ctx, &repo).await?;
+
+    let path_prefixes = args
+        .paths
+        .into_iter()
+        .map(NonRootMPath::new)
+        .collect::<Result<Vec<_>>>()?;
+
+    info!(
+        ctx.logger(),
+        "Gathering working copy files under {:?}", path_prefixes
+    );
+    let paths =
+        get_working_copy_paths_by_prefixes(ctx, &repo, parent_bcs_id, path_prefixes).await?;
+    info!(ctx.logger(), "{} paths to be deleted", paths.len());
+
+    info!(ctx.logger(), "Starting deletion");
+    let delete_commits = delete_files_in_chunks(
+        ctx,
+        &repo,
+        parent_bcs_id,
+        paths,
+        &chunker,
+        &delete_cs_args_factory,
+        false, /* skip_last_chunk */
+    )
+    .await?;
+
+    info!(ctx.logger(), "Deletion finished");
+    info!(
+        ctx.logger(),
+        "Listing commits in an ancestor-descendant order"
+    );
+    for delete_commit in delete_commits {
+        println!("{}", delete_commit);
+    }
+
+    Ok(())
+}