From 13f119ca89fe88da1a0d3289c58a3f4e089cb262 Mon Sep 17 00:00:00 2001 From: Mark Juggurnauth-Thomas Date: Fri, 13 Nov 2020 01:43:31 -0800 Subject: [PATCH] commit_rewriting: switch to BonsaiDerived::derive03 Reviewed By: krallin Differential Revision: D24900118 fbshipit-source-id: 68ad4edd051cec76794bbd880fc5f9e0c3716fcd --- .../megarepo/src/pre_merge_delete.rs | 6 ++--- .../commit_rewriting/megarepo/tool/catchup.rs | 24 +++++++------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/eden/mononoke/commit_rewriting/megarepo/src/pre_merge_delete.rs b/eden/mononoke/commit_rewriting/megarepo/src/pre_merge_delete.rs index 85fdd2ee1e..8547da52bc 100644 --- a/eden/mononoke/commit_rewriting/megarepo/src/pre_merge_delete.rs +++ b/eden/mononoke/commit_rewriting/megarepo/src/pre_merge_delete.rs @@ -73,10 +73,10 @@ async fn get_changed_working_copy_paths( bcs_id: ChangesetId, base_cs_id: ChangesetId, ) -> Result, Error> { - let unode_id = RootUnodeManifestId::derive(ctx.clone(), repo.clone(), bcs_id); - let base_unode_id = RootUnodeManifestId::derive(ctx.clone(), repo.clone(), base_cs_id); + let unode_id = RootUnodeManifestId::derive03(ctx, repo, bcs_id); + let base_unode_id = RootUnodeManifestId::derive03(ctx, repo, base_cs_id); - let (unode_id, base_unode_id) = try_join(unode_id.compat(), base_unode_id.compat()).await?; + let (unode_id, base_unode_id) = try_join(unode_id, base_unode_id).await?; let mut paths = base_unode_id .manifest_unode_id() diff --git a/eden/mononoke/commit_rewriting/megarepo/tool/catchup.rs b/eden/mononoke/commit_rewriting/megarepo/tool/catchup.rs index c9989c3ce2..e3fc8b8863 100644 --- a/eden/mononoke/commit_rewriting/megarepo/tool/catchup.rs +++ b/eden/mononoke/commit_rewriting/megarepo/tool/catchup.rs @@ -107,15 +107,11 @@ pub async fn validate( to_merge_commit: ChangesetId, path_regex: Regex, ) -> Result<(), Error> { - let head_root_unode = RootUnodeManifestId::derive(ctx.clone(), repo.clone(), head_commit); - let to_merge_commit_root_unode = - RootUnodeManifestId::derive(ctx.clone(), repo.clone(), to_merge_commit); + let head_root_unode = RootUnodeManifestId::derive03(ctx, repo, head_commit); + let to_merge_commit_root_unode = RootUnodeManifestId::derive03(ctx, repo, to_merge_commit); - let (head_root_unode, to_merge_commit_root_unode) = try_join( - head_root_unode.compat(), - to_merge_commit_root_unode.compat(), - ) - .await?; + let (head_root_unode, to_merge_commit_root_unode) = + try_join(head_root_unode, to_merge_commit_root_unode).await?; let head_leaves = head_root_unode .manifest_unode_id() @@ -185,15 +181,11 @@ async fn find_files_that_need_to_be_deleted( let head_bookmark_val = maybe_head_bookmark_val.ok_or(anyhow!("{} not found", head_bookmark))?; - let head_root_unode = RootUnodeManifestId::derive(ctx.clone(), repo.clone(), head_bookmark_val); - let commit_to_merge_root_unode = - RootUnodeManifestId::derive(ctx.clone(), repo.clone(), commit_to_merge); + let head_root_unode = RootUnodeManifestId::derive03(ctx, repo, head_bookmark_val); + let commit_to_merge_root_unode = RootUnodeManifestId::derive03(ctx, repo, commit_to_merge); - let (head_root_unode, commit_to_merge_root_unode) = try_join( - head_root_unode.compat(), - commit_to_merge_root_unode.compat(), - ) - .await?; + let (head_root_unode, commit_to_merge_root_unode) = + try_join(head_root_unode, commit_to_merge_root_unode).await?; let mut paths = head_root_unode .manifest_unode_id()