Manually sync from internal repo

build/deps/github_hashes/facebook/fbthrift-rev.txt

@@ -1 +1 @@
-Subproject commit 2f42bd0f67f5026eb0d39e0b6373ca5f94e1f28b
+Subproject commit cb9cdc2428aeb1d767f97fd5addff7268e4db1e0

build/deps/github_hashes/facebook/folly-rev.txt

@@ -1 +1 @@
-Subproject commit 16a708482bbb4e1b87fa0f1ba75b2697c1a6e38d
+Subproject commit 91a2c0c0d11d94a606d9a6af5e1fe084dd9c4fc4

build/deps/github_hashes/facebook/wangle-rev.txt

@@ -1 +1 @@
-Subproject commit 1a5201135de481639570eb7fa561d6d2948989b0
+Subproject commit 182b824ec414b41f87041c690e7a82b4991488d2

build/deps/github_hashes/facebookexperimental/rust-shed-rev.txt

@@ -1 +1 @@
-Subproject commit cbf9d75393c95bb689ee19f3eb734232d9008495
+Subproject commit 76ceb4b8873d3e492c2aa34efda9a5069bc2f12e

build/deps/github_hashes/facebookincubator/fizz-rev.txt

@@ -1 +1 @@
-Subproject commit 74db41416859c316156fb7897b1a97d79a87cb29
+Subproject commit 344311bc7bee6e4ea4ebd7c2ad119245c081fcf0

build/deps/github_hashes/rsocket/rsocket-cpp-rev.txt

@@ -1 +1 @@
-Subproject commit ab1d231926bdc8f28ddb18e3d163db73a42041a4
+Subproject commit 6505c0d8607e2ad6a32008d7a545ad24123d31dd

build/fbcode_builder/manifests/libsai

@@ -2,12 +2,12 @@
 name = libsai
 
 [download]
-url = https://github.com/opencomputeproject/SAI/archive/v1.5.2.tar.gz
-sha256 = c93bcab3555c9b537752e218c754a951e95b37a438a34112dd0c86e9f6bbd34a
+url = https://github.com/opencomputeproject/SAI/archive/v1.6.3.tar.gz
+sha256 = ff09308fea187885b8f4d86446c5e0c097e801e8fe98de1b5e25cdc80d52e3cb
 
 [build]
 builder = nop
-subdir = SAI-1.5.2
+subdir = SAI-1.6.3
 
 [install.files]
 inc = include

eden/fs/service/EdenServiceHandler.cpp

@@ -1057,10 +1057,8 @@ void EdenServiceHandler::async_tm_getScmStatusV2(
             }));
   })
       .thenTry([cb = std::move(callback)](
-                   folly::Try<std::unique_ptr<GetScmStatusResult>>&&
-                       result) mutable {
-        apache::thrift::HandlerCallback<std::unique_ptr<GetScmStatusResult>>::
-            completeInThread(std::move(cb), std::move(result));
+                   folly::Try<std::unique_ptr<GetScmStatusResult>>&& result) {
+        cb->complete(std::move(result));
       });
 }
 
@@ -1091,9 +1089,8 @@ void EdenServiceHandler::async_tm_getScmStatus(
             hash, listIgnored, /*enforceCurrentParent=*/false, request));
   })
       .thenTry([cb = std::move(callback)](
-                   folly::Try<std::unique_ptr<ScmStatus>>&& result) mutable {
-        apache::thrift::HandlerCallback<std::unique_ptr<ScmStatus>>::
-            completeInThread(std::move(cb), std::move(result));
+                   folly::Try<std::unique_ptr<ScmStatus>>&& result) {
+        cb->complete(std::move(result));
       });
 }
 

eden/mononoke/metaconfig/parser/src/config.rs

@@ -213,6 +213,7 @@ fn parse_repo_config(
         repo_client_use_warm_bookmarks_cache,
         warm_bookmark_cache_check_blobimport,
         repo_client_knobs,
+        phabricator_callsign,
         ..
     } = repo_config;
 
@@ -375,6 +376,7 @@ fn parse_repo_config(
         segmented_changelog_config,
         warm_bookmark_cache_check_blobimport,
         repo_client_knobs,
+        phabricator_callsign,
     })
 }
 
@@ -882,6 +884,7 @@ mod test {
             hipster_acl="foo/test"
             repo_client_use_warm_bookmarks_cache=true
             warm_bookmark_cache_check_blobimport=true
+            phabricator_callsign="FBS"
 
             [wireproto_logging]
             scribe_category="category"
@@ -977,6 +980,7 @@ mod test {
             storage_config="files"
             hgsql_name = "www-foobar"
             hgsql_globalrevs_name = "www-barfoo"
+            phabricator_callsign="WWW"
 
             [storage.files.metadata.local]
             local_db_path = "/tmp/www"
@@ -1188,6 +1192,7 @@ mod test {
                 repo_client_knobs: RepoClientKnobs {
                     allow_short_getpack_history: true,
                 },
+                phabricator_callsign: Some("FBS".to_string()),
             },
         );
 
@@ -1240,6 +1245,7 @@ mod test {
                 segmented_changelog_config: SegmentedChangelogConfig { enabled: false },
                 warm_bookmark_cache_check_blobimport: false,
                 repo_client_knobs: RepoClientKnobs::default(),
+                phabricator_callsign: Some("WWW".to_string()),
             },
         );
         assert_eq!(

eden/mononoke/metaconfig/types/src/lib.rs

@@ -188,6 +188,8 @@ pub struct RepoConfig {
     pub warm_bookmark_cache_check_blobimport: bool,
     /// Configuration for repo_client module
     pub repo_client_knobs: RepoClientKnobs,
+    /// Callsign to check phabricator commits
+    pub phabricator_callsign: Option<String>,
 }
 
 /// Configuration for repo_client module

eden/mononoke/mononoke_api/Cargo.toml

@@ -58,6 +58,7 @@ futures = { version = "0.3.5", features = ["async-await", "compat"] }
 futures-old = { package = "futures", version = "0.1" }
 itertools = "0.8"
 maplit = "1.0"
+regex = "1.3.7"
 slog = { version = "2.5", features = ["max_level_debug"] }
 thiserror = "1.0"
 

eden/mononoke/mononoke_api/src/changeset_path.rs

@@ -27,7 +27,6 @@ use futures::compat::Future01CompatExt;
 use futures::future::{try_join_all, FutureExt, Shared, TryFutureExt};
 use futures::stream::{Stream, TryStreamExt};
 use futures::try_join;
-use futures_old::Future as FutureLegacy;
 use manifest::{Entry, ManifestOps};
 use mononoke_types::{
     Blame, ChangesetId, ContentId, FileType, FileUnodeId, FsnodeId, Generation, ManifestUnodeId,
@@ -267,14 +266,14 @@ impl ChangesetPathContext {
         })?;
 
         fetch_blame(ctx, repo, csid, mpath.clone())
+            .compat()
             .map_err(|error| match error {
                 BlameError::NoSuchPath(_)
                 | BlameError::IsDirectory(_)
                 | BlameError::Rejected(_) => MononokeError::InvalidRequest(error.to_string()),
                 BlameError::DeriveError(e) => MononokeError::from(e),
                 _ => MononokeError::from(Error::from(error)),
             })
-            .compat()
             .await
     }
 

eden/mononoke/mononoke_api/src/repo.rs

@@ -29,23 +29,24 @@ use fbinit::FacebookInit;
 use filestore::{Alias, FetchKey};
 use futures::compat::{Future01CompatExt, Stream01CompatExt};
 use futures::future::try_join_all;
-use futures::stream::{StreamExt, TryStreamExt};
+use futures::stream::{Stream, StreamExt, TryStreamExt};
 use futures::try_join;
-use futures_old::stream::Stream;
 use itertools::Itertools;
 #[cfg(test)]
 use live_commit_sync_config::TestLiveCommitSyncConfig;
 use live_commit_sync_config::{CfgrLiveCommitSyncConfig, LiveCommitSyncConfig};
 use mercurial_types::Globalrev;
-#[cfg(test)]
-use metaconfig_types::SourceControlServiceParams;
 use metaconfig_types::{CommonConfig, RepoConfig};
+#[cfg(test)]
+use metaconfig_types::{InfinitepushNamespace, InfinitepushParams, SourceControlServiceParams};
 use mononoke_types::{
     hash::{GitSha1, Sha1, Sha256},
     Generation, RepositoryId,
 };
 use mutable_counters::SqlMutableCounters;
 use permission_checker::{ArcPermissionChecker, MononokeIdentitySet, PermissionCheckerBuilder};
+#[cfg(test)]
+use regex::Regex;
 use revset::AncestorsNodeStream;
 use scuba_ext::ScubaSampleBuilderExt;
 use segmented_changelog::SegmentedChangelog;
@@ -283,6 +284,12 @@ impl Repo {
 
         let config = RepoConfig {
             commit_sync_config: init_commit_sync_config,
+            infinitepush: InfinitepushParams {
+                namespace: Some(InfinitepushNamespace::new(
+                    Regex::new("scratch/.+").unwrap(),
+                )),
+                ..Default::default()
+            },
             source_control_service: SourceControlServiceParams {
                 permit_writes: true,
                 ..Default::default()
@@ -701,16 +708,21 @@ impl RepoContext {
     ) -> Result<Option<ChangesetContext>, MononokeError> {
         let bookmark = BookmarkName::new(bookmark.as_ref())?;
 
-        let cs_id = match freshness {
+        let mut cs_id = match freshness {
             BookmarkFreshness::MaybeStale => self.warm_bookmarks_cache().get(&bookmark),
-            BookmarkFreshness::MostRecent => {
-                self.blob_repo()
-                    .get_bonsai_bookmark(self.ctx.clone(), &bookmark)
-                    .compat()
-                    .await?
-            }
+            BookmarkFreshness::MostRecent => None,
         };
 
+        // If the bookmark wasn't found in the warm bookmarks cache, it might
+        // be a scratch bookmark, so always do the look-up.
+        if cs_id.is_none() {
+            cs_id = self
+                .blob_repo()
+                .get_bonsai_bookmark(self.ctx.clone(), &bookmark)
+                .compat()
+                .await?
+        }
+
         Ok(cs_id.map(|cs_id| ChangesetContext::new(self.clone(), cs_id)))
     }
 
@@ -836,7 +848,7 @@ impl RepoContext {
         prefix: Option<&str>,
         after: Option<&str>,
         limit: Option<u64>,
-    ) -> Result<impl Stream<Item = (String, ChangesetId), Error = MononokeError>, MononokeError>
+    ) -> Result<impl Stream<Item = Result<(String, ChangesetId), MononokeError>>, MononokeError>
     {
         let kinds = if include_scratch {
             if prefix.is_none() {
@@ -891,8 +903,7 @@ impl RepoContext {
             )
             .map_ok(|(bookmark, cs_id)| (bookmark.into_name().into_string(), cs_id))
             .map_err(MononokeError::from)
-            .boxed()
-            .compat();
+            .boxed();
         Ok(bookmarks)
     }
 

eden/mononoke/mononoke_api/src/test/mod.rs

@@ -7,5 +7,6 @@
 
 mod test_history;
 mod test_repo;
+mod test_repo_bookmarks;
 mod test_repo_create_changeset;
 mod test_repo_move_bookmark;

eden/mononoke/mononoke_api/src/test/test_repo_bookmarks.rs

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This software may be used and distributed according to the terms of the
+ * GNU General Public License version 2.
+ */
+
+use std::collections::BTreeMap;
+use std::sync::Arc;
+
+use anyhow::Result;
+use bookmarks::{BookmarkName, BookmarkUpdateReason};
+use context::CoreContext;
+use fbinit::FacebookInit;
+use futures::stream::TryStreamExt;
+use mononoke_types::ChangesetId;
+use tests_utils::drawdag::create_from_dag;
+
+use crate::repo::{BookmarkFreshness, Repo, RepoContext};
+
+async fn init_repo(ctx: &CoreContext) -> Result<(RepoContext, BTreeMap<String, ChangesetId>)> {
+    let blob_repo = blobrepo_factory::new_memblob_empty(None)?;
+    let changesets = create_from_dag(
+        ctx,
+        &blob_repo,
+        r##"
+            A-B-C-D-E
+               \
+                F-G
+        "##,
+    )
+    .await?;
+    let mut txn = blob_repo.update_bookmark_transaction(ctx.clone());
+    txn.force_set(
+        &BookmarkName::new("trunk")?,
+        changesets["E"],
+        BookmarkUpdateReason::TestMove,
+        None,
+    )?;
+    txn.create_scratch(&BookmarkName::new("scratch/branch")?, changesets["G"])?;
+    txn.create_scratch(&BookmarkName::new("scratch/branchpoint")?, changesets["B"])?;
+    txn.commit().await?;
+
+    let repo = Repo::new_test(ctx.clone(), blob_repo).await?;
+    let repo_ctx = RepoContext::new(ctx.clone(), Arc::new(repo)).await?;
+    Ok((repo_ctx, changesets))
+}
+
+#[fbinit::compat_test]
+async fn resolve_bookmark(fb: FacebookInit) -> Result<()> {
+    let ctx = CoreContext::test_mock(fb);
+    let (repo, changesets) = init_repo(&ctx).await?;
+    let repo = repo.write().await?;
+
+    // Test that normal bookmarks are visible both in and through the cache.
+    assert_eq!(
+        repo.resolve_bookmark("trunk", BookmarkFreshness::MostRecent)
+            .await?
+            .unwrap()
+            .id(),
+        changesets["E"],
+    );
+
+    assert_eq!(
+        repo.resolve_bookmark("trunk", BookmarkFreshness::MaybeStale)
+            .await?
+            .unwrap()
+            .id(),
+        changesets["E"],
+    );
+
+    // Test that scratch bookmarks are visible through the cache.
+    assert_eq!(
+        repo.resolve_bookmark("scratch/branch", BookmarkFreshness::MaybeStale)
+            .await?
+            .unwrap()
+            .id(),
+        changesets["G"],
+    );
+
+    assert_eq!(
+        repo.resolve_bookmark("scratch/branchpoint", BookmarkFreshness::MaybeStale)
+            .await?
+            .unwrap()
+            .id(),
+        changesets["B"],
+    );
+
+    // Test that non-existent bookmarks don't exist either way.
+    assert!(repo
+        .resolve_bookmark("scratch/nonexistent", BookmarkFreshness::MaybeStale)
+        .await?
+        .is_none());
+
+    assert!(repo
+        .resolve_bookmark("nonexistent", BookmarkFreshness::MostRecent)
+        .await?
+        .is_none());
+
+    Ok(())
+}
+
+#[fbinit::compat_test]
+async fn list_bookmarks(fb: FacebookInit) -> Result<()> {
+    let ctx = CoreContext::test_mock(fb);
+    let (repo, changesets) = init_repo(&ctx).await?;
+    let repo = repo.write().await?;
+
+    assert_eq!(
+        repo.list_bookmarks(false, None, None, None)?
+            .try_collect::<Vec<_>>()
+            .await?,
+        vec![(String::from("trunk"), changesets["E"])]
+    );
+
+    assert_eq!(
+        repo.list_bookmarks(true, Some("scratch/"), None, Some(3))?
+            .try_collect::<Vec<_>>()
+            .await?,
+        vec![
+            (String::from("scratch/branch"), changesets["G"]),
+            (String::from("scratch/branchpoint"), changesets["B"])
+        ]
+    );
+
+    assert_eq!(
+        repo.list_bookmarks(true, Some("scratch/"), Some("scratch/branch"), Some(3))?
+            .try_collect::<Vec<_>>()
+            .await?,
+        vec![(String::from("scratch/branchpoint"), changesets["B"])]
+    );
+    Ok(())
+}