facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

commit_rewriting: switch to BonsaiDerived::derive03

Browse Source 
Reviewed By: krallin

Differential Revision: D24900118

fbshipit-source-id: 68ad4edd051cec76794bbd880fc5f9e0c3716fcd
This commit is contained in:
Mark Juggurnauth-Thomas 2020-11-13 01:43:31 -08:00 committed by Facebook GitHub Bot
parent df13fce307
commit 13f119ca89
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eden/mononoke/commit_rewriting/megarepo/src/pre_merge_delete.rs
View File

@ -73,10 +73,10 @@ async fn get_changed_working_copy_paths(
bcs_id: ChangesetId,
base_cs_id: ChangesetId,
) -> Result<Vec<MPath>, 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()

24
eden/mononoke/commit_rewriting/megarepo/tool/catchup.rs
View File

@ -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()