diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_syncer.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_syncer.rs index 523abf017758f..a1b5804332bb8 100644 --- a/eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_syncer.rs +++ b/eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_syncer.rs @@ -136,12 +136,12 @@ where // Builds the syncer that can be used for opposite sync direction. // Note: doesn't support large-to-small as input right now - pub fn reverse(&self) -> Result, Error> { - Ok(Self { - repos: self.repos.reverse()?, + pub fn reverse(&self) -> CommitSyncer { + Self { + repos: self.repos.reverse(), live_commit_sync_config: self.live_commit_sync_config.clone(), scuba_sample: self.scuba_sample.clone(), - }) + } } // ------------------------------------------------------------------------ diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_syncers_lib.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_syncers_lib.rs index b10e6b49a503d..c91d6fcafb44c 100644 --- a/eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_syncers_lib.rs +++ b/eden/mononoke/commit_rewriting/cross_repo_sync/src/commit_syncers_lib.rs @@ -567,7 +567,7 @@ where // Let's first validate that the target bookmark is still working-copy equivalent to what the // parent of the commit we'd like to sync - let backsyncer = commit_syncer.reverse()?; + let backsyncer = commit_syncer.reverse(); let mb_small_csid_equivalent_to_target_bookmark = backsyncer .sync_commit( ctx, @@ -767,12 +767,11 @@ impl CommitSyncRepos { // Builds the repos that can be used for opposite sync direction. // Note: doesn't support large-to-small as input right now // TODO(T182311609): stop returning a Result if there's no error. - pub fn reverse(&self) -> Result { - let clone = self.clone(); - Ok(CommitSyncRepos { + pub fn reverse(&self) -> Self { + CommitSyncRepos { sync_direction: self.sync_direction.reverse(), - ..clone - }) + ..self.clone() + } } pub fn get_submodule_deps(&self) -> &SubmoduleDeps { diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs index 6cc3af7f2ba67..322aee3cf7344 100644 --- a/eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs +++ b/eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs @@ -144,7 +144,7 @@ pub async fn verify_working_copy_with_version<'a, R: Repo>( source_repo, target_root_fsnode_id, source_root_fsnode_id, - commit_syncer.reverse()?, + commit_syncer.reverse(), ), }; let submodules_action = get_git_submodule_action_by_version( diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/test/git_submodules/backsync.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/test/git_submodules/backsync.rs index 46d8a6778b4a7..7eb3372ec9ab4 100644 --- a/eden/mononoke/commit_rewriting/cross_repo_sync/test/git_submodules/backsync.rs +++ b/eden/mononoke/commit_rewriting/cross_repo_sync/test/git_submodules/backsync.rs @@ -723,7 +723,7 @@ pub(crate) async fn build_submodule_backsync_test_data( vec![], // Known dangling submodule pointers ) .await?; - let reverse_syncer = test_data.commit_syncer.reverse()?; + let reverse_syncer = test_data.commit_syncer.reverse(); Ok(SubmoduleSyncTestData { commit_syncer: reverse_syncer, diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/test/git_submodules/validation.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/test/git_submodules/validation.rs index 9795bc850b087..63acb2239d9fb 100644 --- a/eden/mononoke/commit_rewriting/cross_repo_sync/test/git_submodules/validation.rs +++ b/eden/mononoke/commit_rewriting/cross_repo_sync/test/git_submodules/validation.rs @@ -51,7 +51,7 @@ async fn test_verify_working_copy_with_submodules(fb: FacebookInit) -> Result<() .await?; verify_working_copy( &ctx, - &commit_syncer.reverse()?, + &commit_syncer.reverse(), large_repo_master, live_commit_sync_config, ) diff --git a/eden/mononoke/commit_rewriting/mononoke_x_repo_sync_job/src/main.rs b/eden/mononoke/commit_rewriting/mononoke_x_repo_sync_job/src/main.rs index a8b54d9d2fed8..48ee2f7a401c6 100644 --- a/eden/mononoke/commit_rewriting/mononoke_x_repo_sync_job/src/main.rs +++ b/eden/mononoke/commit_rewriting/mononoke_x_repo_sync_job/src/main.rs @@ -345,7 +345,7 @@ async fn run_in_tailing_mode( ) })?; commit_syncer - .reverse()? + .reverse() .sync_commit( ctx, target_bookmark_value,