slapi: add exact behavior field to committranslateID

Summary: To fix the issue exposed in D73958187

Reviewed By: muirdm

Differential Revision: D74024720

fbshipit-source-id: 79d2e174d885669291a9b702258ce16f709117ba

Author: Revathy Kasipandian

eden/mononoke/edenapi_service/src/handlers/commit.rs

@@ -1086,6 +1086,17 @@ impl SaplingRemoteApiHandler for CommitTranslateId {
         let mut git_ids = Vec::new();
         let mut globalrevs = Vec::new();
 
+        let lookup_behavior = match request.lookup_behavior.as_deref() {
+            Some("exact") => XRepoLookupExactBehaviour::OnlyExactMapping,
+            None | Some("equivalent") => XRepoLookupExactBehaviour::WorkingCopyEquivalence,
+            Some(behavior) => {
+                return Err(HttpError::e400(MononokeError::InvalidRequest(format!(
+                    "invalid lookup behavior '{behavior}'"
+                )))
+                .into());
+            }
+        };
+
         for commit in &request.commits {
             match commit {
                 CommitId::Hg(hg_id) => hg_ids.push(HgChangesetId::from(*hg_id)),
@@ -1126,7 +1137,7 @@ impl SaplingRemoteApiHandler for CommitTranslateId {
                                     bs.clone(),
                                     None,
                                     XRepoLookupSyncBehaviour::SyncIfAbsent,
-                                    XRepoLookupExactBehaviour::WorkingCopyEquivalence,
+                                    lookup_behavior,
                                 )
                                 .await,
                         )

eden/mononoke/tests/integration/cross_repo/test-cross-repo-commit-translate-look-behavior.t

@@ -0,0 +1,110 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License found in the LICENSE file in the root
+# directory of this source tree.
+
+The test is to  demonstrates the importance of exact mapping in cross-repo commit 
+translation . The test demonstrates how two different commits in fbsoure/www and fbsource/fbcode respectively 
+can translate to a same www commit without exact mapping enabled
+
+This is a fork of test-cross-repo-commit-sync-live.t that brings the via-extra mode
+to be fully able to deal with mapping changes regardless of sync direction. I will
+replace that file once fully fixed.
+  $ export LARGE_REPO_ID=0
+  $ export SMALL_REPO_ID=1
+  $ . "${TEST_FIXTURES}/library.sh"
+  $ . "${TEST_FIXTURES}/library-push-redirector.sh"
+
+  $ merge_just_knobs <<EOF
+  > {
+  >   "bools": {
+  >     "scm/mononoke:cross_repo_skip_backsyncing_ordinary_empty_commits": true
+  >   }
+  > }
+  > EOF
+
+-- Init Mononoke thingies
+  $ create_large_small_repo
+  Adding synced mapping entry
+  $ setup_configerator_configs
+  $ enable_pushredirect 1 false false
+  $ XREPOSYNC=1 start_large_small_repo
+  Starting Mononoke server
+  $ init_local_large_small_clones
+
+-- Start up the sync job in the background
+  $ mononoke_x_repo_sync_forever $REPOIDSMALL $REPOIDLARGE
+
+Before the change
+-- push to a small repo
+  $ cd "$TESTTMP/small-hg-client"
+  $ hg up -q master_bookmark
+  $ mkdir -p non_path_shifting
+  $ echo a > foo
+  $ echo b > non_path_shifting/bar
+  $ hg ci -Aqm "small repo commit"
+  $ hg push -r . --to master_bookmark -q
+  $ log
+  @  small repo commit [public;rev=2;fe2cc102ee42] remote/master_bookmark
+  │
+  o  first post-move commit [public;rev=1;11f848659bfc]
+  │
+  o  pre-move commit [public;rev=0;fc7ae591de0e]
+  $
+
+-- wait a little to give sync job some time to catch up
+  $ wait_for_xrepo_sync 2
+  $ flush_mononoke_bookmarks
+
+-- check the same commit in the large repo
+  $ cd "$TESTTMP/large-hg-client"
+  $ hg pull -q
+  $ hg up -q master_bookmark
+  $ log -r master_bookmark
+  @  small repo commit [public;rev=3;733eb6ff5cba] remote/master_bookmark
+  │
+  ~
+  $ LARGE_REPO_MAPPED_COMMIT=$(hg whereami)
+
+
+# Make an large-repo-only commit
+  $ echo "large-repo only change" > fbcodefile2
+  $ hg add fbcodefile2
+  $ hg commit -m "large repo only commit"
+  $ hg push -r . --to master_bookmark -q
+  $ LARGE_REPO_ONLY_COMMIT=$(hg log -r . -T '{node}')
+
+# Show the initial small commit mapped to large repo and the second commit made in large repo 
+# point to the same small repo commit
+  $ x_repo_lookup large-mon small-mon $LARGE_REPO_ONLY_COMMIT
+  fe2cc102ee42147f9f2f2095f649efe7aa559f0d
+  $ x_repo_lookup large-mon small-mon $LARGE_REPO_MAPPED_COMMIT
+  fe2cc102ee42147f9f2f2095f649efe7aa559f0d
+# No lookup behavior specified; defaults to None
+  $ hg debugapi -e committranslateids -i "[{'Hg': '$LARGE_REPO_ONLY_COMMIT'}]" -i "'Hg'" -i "'large-mon'" -i "'small-mon'"
+  [{"commit": {"Hg": bin("54ab50dcc6a97355f6ccbe8bdcd64c2ebb7d82d0")},
+    "translated": {"Hg": bin("fe2cc102ee42147f9f2f2095f649efe7aa559f0d")}}]
+# "equivalent" lookup behavior: maps to a commit in the large repository
+  $ hg debugapi -e committranslateids -i "[{'Hg': '$LARGE_REPO_ONLY_COMMIT'}]" -i "'Hg'" -i "'large-mon'" -i "'small-mon'" -i "'equivalent'"
+  [{"commit": {"Hg": bin("54ab50dcc6a97355f6ccbe8bdcd64c2ebb7d82d0")},
+    "translated": {"Hg": bin("fe2cc102ee42147f9f2f2095f649efe7aa559f0d")}}]
+# Explicitly passing None for lookup behavior; maps to a commit in the large repository
+  $ hg debugapi -e committranslateids -i "[{'Hg': '$LARGE_REPO_ONLY_COMMIT'}]" -i "'Hg'" -i "'large-mon'" -i "'small-mon'" -i None
+  [{"commit": {"Hg": bin("54ab50dcc6a97355f6ccbe8bdcd64c2ebb7d82d0")},
+    "translated": {"Hg": bin("fe2cc102ee42147f9f2f2095f649efe7aa559f0d")}}]
+# "exact" lookup behavior: returns only the exact matching commit, otherwise an empty list
+  $ hg debugapi -e committranslateids -i "[{'Hg': '$LARGE_REPO_ONLY_COMMIT'}]" -i "'Hg'" -i "'large-mon'" -i "'small-mon'" -i "'exact'"
+  []
+# Invalid lookup behavior: 'random' string passed as argument 
+  $ hg debugapi -e committranslateids -i "[{'Hg': '$LARGE_REPO_ONLY_COMMIT'}]" -i "'Hg'" -i "'large-mon'" -i "'small-mon'" -i "'random'"
+  abort: server responded 400 Bad Request for https://localhost:*/edenapi/large-mon/commit/translate_id: {"message":"invalid request: invalid lookup behavior * (glob)
+      "x-request-id": "*", (glob)
+      "content-type": "application/json",
+      "x-load": "1",
+      "server": "edenapi_server",
+      "x-mononoke-host": * (glob)
+      "date": * (glob)
+      "content-length": "*", (glob)
+  }
+  [255]

eden/mononoke/tests/integration/edenapi/test-edenapi-translate-id.t

@@ -96,13 +96,12 @@ Setup config repo:
   e6c6c1f94d10495f8c94d81ae5f125bd89f82b8a
   $ LARGE_REPO_ONLY_COMMIT=$(hg log -r . -T '{node}')
 
-# FIXME: SaplingRemoteAPI returns the same small repo commit hash for  both LARGE_REPO_MAPPED_COMMIT and LARGE_REPO_ONLY_COMMIT.
+# Returns an empty array [] for exact lookup behavior, otherwise returns the small repository commit hash.
   $ hg debugapi -e committranslateids -i "[{'Hg': '$LARGE_REPO_MAPPED_COMMIT'}]" -i "'Hg'" -i None -i "'small-mon'"
   [{"commit": {"Hg": bin("a38079aa278633d9e69eb2d90d393b7fec83b09a")},
     "translated": {"Hg": bin("a61c0a2e580a4d7c742858d8ebf1a469a7de0839")}}]
-  $ hg debugapi -e committranslateids -i "[{'Hg': '$LARGE_REPO_ONLY_COMMIT'}]" -i "'Hg'" -i None -i "'small-mon'"
-  [{"commit": {"Hg": bin("e6c6c1f94d10495f8c94d81ae5f125bd89f82b8a")},
-    "translated": {"Hg": bin("a61c0a2e580a4d7c742858d8ebf1a469a7de0839")}}]
+  $ hg debugapi -e committranslateids -i "[{'Hg': '$LARGE_REPO_ONLY_COMMIT'}]" -i "'Hg'" -i None -i "'small-mon'" -i "'exact'"
+  []
 
 # Translate both the LARGE_REPO_-MAPPED-COMMIT and LARGE-REPO-ONLY-COMMIT from the small repository
 # FIXME: Both LARGE_REPO_ONLY_COMMIT and LARGE_REPO-MAPPED-COMMIT incorrectly mapped the same small commit 

eden/mononoke/tests/integration/library.sh

@@ -1738,7 +1738,7 @@ function x_repo_lookup() {
   SOURCE_REPO="$1"
   TARGET_REPO="$2"
   HASH="$3"
-  TRANSLATED=$(hg debugapi -e committranslateids -i "[{'Hg': '$HASH'}]" -i "'Hg'" -i "'$SOURCE_REPO'" -i "'$TARGET_REPO'")
+  TRANSLATED=$(hg debugapi -e committranslateids -i "[{'Hg': '$HASH'}]" -i "'Hg'" -i "'$SOURCE_REPO'" -i "'$TARGET_REPO'" -i "'equivalent'")
   hg debugshell <<EOF
 print(hex(${TRANSLATED}[0]["translated"]["Hg"]))
 EOF

eden/scm/lib/eagerepo/src/api.rs

@@ -1071,6 +1071,7 @@ impl SaplingRemoteApi for EagerRepo {
         scheme: CommitIdScheme,
         from_repo: Option<String>,
         to_repo: Option<String>,
+        lookup_behavior: Option<String>,
     ) -> Result<Response<CommitTranslateIdResponse>, SaplingRemoteApiError> {
         debug!("files {commits:?} -> {scheme:?}");
 

eden/scm/lib/edenapi/src/client.rs

@@ -1018,6 +1018,7 @@ impl Client {
         scheme: CommitIdScheme,
         from_repo: Option<String>,
         to_repo: Option<String>,
+        lookup_behavior: Option<String>,
     ) -> Result<Response<CommitTranslateIdResponse>, SaplingRemoteApiError> {
         tracing::info!(
             "Requesting commit id translation for {} commits into {:?}",
@@ -1036,6 +1037,7 @@ impl Client {
                     scheme,
                     from_repo: from_repo.clone(),
                     to_repo: to_repo.clone(),
+                    lookup_behavior: lookup_behavior.clone(),
                 };
                 self.log_request(&req, "commit_translate_id");
                 req
@@ -1953,13 +1955,15 @@ impl SaplingRemoteApi for Client {
         scheme: CommitIdScheme,
         from_repo: Option<String>,
         to_repo: Option<String>,
+        lookup_behavior: Option<String>,
     ) -> Result<Response<CommitTranslateIdResponse>, SaplingRemoteApiError> {
         self.with_retry(|this| {
             this.commit_translate_id_attempt(
                 commits.clone(),
                 scheme.clone(),
                 from_repo.clone(),
                 to_repo.clone(),
+                lookup_behavior.clone(),
             )
             .boxed()
         })

eden/scm/lib/edenapi/trait/src/api.rs

@@ -402,8 +402,9 @@ pub trait SaplingRemoteApi: Send + Sync + 'static {
         scheme: CommitIdScheme,
         from_repo: Option<String>,
         to_repo: Option<String>,
+        lookup_behavior: Option<String>,
     ) -> Result<Response<CommitTranslateIdResponse>, SaplingRemoteApiError> {
-        let _ = (commits, scheme, from_repo, to_repo);
+        let _ = (commits, scheme, from_repo, to_repo, lookup_behavior);
         Err(SaplingRemoteApiError::NotSupported)
     }
 

eden/scm/lib/edenapi/types/src/commit.rs

@@ -501,6 +501,8 @@ pub struct CommitTranslateIdRequest {
     pub from_repo: Option<String>,
     #[id(4)]
     pub to_repo: Option<String>,
+    #[id(5)]
+    pub lookup_behavior: Option<String>,
 }
 
 #[auto_wire]

eden/scm/saplingnative/bindings/modules/pyedenapi/src/client.rs

@@ -568,9 +568,10 @@ py_class!(pub class client |py| {
         scheme: Serde<CommitIdScheme>,
         fromrepo: Option<String> = None,
         torepo: Option<String> = None,
+        lookup_behavior: Option<String> = None,
     ) -> PyResult<TStream<anyhow::Result<Serde<CommitTranslateIdResponse>>>> {
         let api = self.inner(py).as_ref();
-        let responses = py.allow_threads(|| block_unless_interrupted(api.commit_translate_id(commits.0, scheme.0, fromrepo, torepo)))
+        let responses = py.allow_threads(|| block_unless_interrupted(api.commit_translate_id(commits.0, scheme.0, fromrepo, torepo, lookup_behavior)))
             .map_pyerr(py)?
             .map_pyerr(py)?;
         Ok(responses.entries.map_ok(Serde).map_err(Into::into).into())