easy: modern sync: cleanups

Summary: Tiny stupid things that annoy me

Differential Revision:
D68020138

Privacy Context Container: L1201105

fbshipit-source-id: f1bdb3c1f26c1d223b8bbf2c7e4e5092fad7ef52

Author: lmvasquezg

eden/mononoke/modern_sync/src/sync.rs

@@ -290,18 +290,18 @@ pub async fn process_one_changeset(
     sender: Arc<dyn ModernSyncSender + Send + Sync>,
     log_to_ods: bool,
 ) -> Result<()> {
-    info!(logger, "Processing commit {:?}", cs_id);
+    info!(logger, "Processing changeset {:?}", cs_id);
 
     let cs_info = repo
         .repo_derived_data()
         .derive::<ChangesetInfo>(ctx, cs_id.clone())
         .await?;
     let bs = cs_id.load(ctx, repo.repo_blobstore()).await?;
-    let thing: Vec<_> = bs.file_changes().collect();
+    let bs_fc: Vec<_> = bs.file_changes().collect();
 
     let mut contents = Vec::new();
 
-    for (_path, file_change) in thing {
+    for (_path, file_change) in bs_fc {
         let cid = match file_change {
             FileChange::Change(change) => Some(change.content_id()),
             FileChange::UntrackedChange(change) => Some(change.content_id()),
@@ -332,6 +332,7 @@ pub async fn process_one_changeset(
     let (mut mf_ids, file_ids) =
         sort_manifest_changes(ctx, repo.repo_blobstore(), hg_mf_id, mf_ids_p).await?;
     mf_ids.push(hg_mf_id);
+
     sender.upload_trees(mf_ids).await?;
     sender.upload_filenodes(file_ids).await?;
     sender.upload_identical_changeset(vec![(hg_cs, bs)]).await?;

eden/mononoke/tests/integration/modern_sync/test-modern-sync.t

@@ -60,32 +60,32 @@ Sync all bookmarks moves
   Running sync-once loop
   Connecting to https://localhost:$LOCAL_PORT/edenapi/
   Health check outcome: Ok(ResponseMeta { version: HTTP/2.0, status: 200, server: Some("edenapi_server"), request_id: Some("*"), tw_task_handle: None, tw_task_version: None, tw_canary_id: None, server_load: Some(1), content_length: Some(10), content_encoding: None, mononoke_host: Some("*") }) (glob)
-  Processing commit ChangesetId(Blake2(53b034a90fe3002a707a7da9cdf6eac3dea460ad72f7c6969dfb88fd0e69f856))
+  Processing changeset ChangesetId(Blake2(53b034a90fe3002a707a7da9cdf6eac3dea460ad72f7c6969dfb88fd0e69f856))
   Uploading contents: [ContentId(ContentId("eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9")), ContentId(ContentId("be87911855af0fc33a75f2c1cba2269dd90faa7f5c5358eb640d9d65f55fced3"))]
   Uploaded 2 contents successfully
   Uploaded 3 trees successfully
   Uploaded 2 filenodes successfully
   Upload hg changeset response: [UploadTokensResponse { token: UploadToken { data: UploadTokenData { id: HgChangesetId(HgId("e20237022b1290d98c3f14049931a8f498c18c53")), bubble_id: None, metadata: None }, signature: UploadTokenSignature { signature: [102, 97, 107, 101, 116, 111, 107, 101, 110, 115, 105, 103, 110, 97, 116, 117, 114, 101] } } }]
   Move bookmark response SetBookmarkResponse { data: Ok(()) }
-  Processing commit ChangesetId(Blake2(8a9d572a899acdef764b88671c24b94a8b0780c1591a5a9bca97184c2ef0f304))
+  Processing changeset ChangesetId(Blake2(8a9d572a899acdef764b88671c24b94a8b0780c1591a5a9bca97184c2ef0f304))
   Uploading contents: [ContentId(ContentId("55662471e2a28db8257939b2f9a2d24e65b46a758bac12914a58f17dcde6905f")), ContentId(ContentId("fbc4b9b407225e86008840c4095edb4f66a62bad80529b6e120bfa7d605f9423"))]
   Uploaded 2 contents successfully
   Uploaded 3 trees successfully
   Uploaded 2 filenodes successfully
   Upload hg changeset response: [UploadTokensResponse { token: UploadToken { data: UploadTokenData { id: HgChangesetId(HgId("5a95ef0f59a992dcb5385649217862599de05565")), bubble_id: None, metadata: None }, signature: UploadTokenSignature { signature: [102, 97, 107, 101, 116, 111, 107, 101, 110, 115, 105, 103, 110, 97, 116, 117, 114, 101] } } }]
-  Processing commit ChangesetId(Blake2(41deea4804cd27d1f4efbec135d839338804a5dfcaf364863bd0289067644db5))
+  Processing changeset ChangesetId(Blake2(41deea4804cd27d1f4efbec135d839338804a5dfcaf364863bd0289067644db5))
   Uploading contents: [ContentId(ContentId("896ad5879a5df0403bfc93fc96507ad9c93b31b11f3d0fa05445da7918241e5d")), ContentId(ContentId("c86e7a7ee4c102efc1e5166dd95c1c73fcbff59dc3b04dc79fbbf3d1d10350ed"))]
   Uploaded 2 contents successfully
   Uploaded 3 trees successfully
   Uploaded 2 filenodes successfully
   Upload hg changeset response: [UploadTokensResponse { token: UploadToken { data: UploadTokenData { id: HgChangesetId(HgId("fc03e5f3125836eb107f2fa5b070f841d0b62b85")), bubble_id: None, metadata: None }, signature: UploadTokenSignature { signature: [102, 97, 107, 101, 116, 111, 107, 101, 110, 115, 105, 103, 110, 97, 116, 117, 114, 101] } } }]
-  Processing commit ChangesetId(Blake2(ba1a2b3ca64cead35117cb2b707da1211cf43639ade917aee655f3875f4922c3))
+  Processing changeset ChangesetId(Blake2(ba1a2b3ca64cead35117cb2b707da1211cf43639ade917aee655f3875f4922c3))
   Uploading contents: [ContentId(ContentId("90c8e211c758a9bbcd33e463c174f1693692677cb76c7aaf4ce41aa0a29334c0")), ContentId(ContentId("5d3bfab620332130430c7f540f9fe0b3b0079d0b9b632e0dae96a1424a7a4242"))]
   Uploaded 2 contents successfully
   Uploaded 3 trees successfully
   Uploaded 2 filenodes successfully
   Upload hg changeset response: [UploadTokensResponse { token: UploadToken { data: UploadTokenData { id: HgChangesetId(HgId("2571175c538cc794dc974c705fcb12bc848efab4")), bubble_id: None, metadata: None }, signature: UploadTokenSignature { signature: [102, 97, 107, 101, 116, 111, 107, 101, 110, 115, 105, 103, 110, 97, 116, 117, 114, 101] } } }]
-  Processing commit ChangesetId(Blake2(5b1c7130dde8e54b4285b9153d8e56d69fbf4ae685eaf9e9766cc409861995f8))
+  Processing changeset ChangesetId(Blake2(5b1c7130dde8e54b4285b9153d8e56d69fbf4ae685eaf9e9766cc409861995f8))
   Uploading contents: [ContentId(ContentId("1b1e26f01a806e123b37492672d2756e1c25bb31f1e15cfda410c149c317e130")), ContentId(ContentId("96475ef07b63bf02679e9964ff65f0f96883f53d0718671bd44cce830bbf2ebd"))]
   Uploaded 2 contents successfully
   Uploaded 3 trees successfully

eden/mononoke/tests/integration/modern_sync/test-sync-one.t

@@ -57,7 +57,7 @@
   $ with_stripped_logs mononoke_modern_sync sync-one orig dest --cs-id 53b034a90fe3002a707a7da9cdf6eac3dea460ad72f7c6969dfb88fd0e69f856
   Connecting to https://localhost:$LOCAL_PORT/edenapi/
   Health check outcome: Ok(ResponseMeta { version: HTTP/2.0, status: 200, server: Some("edenapi_server"), request_id: Some("*"), tw_task_handle: None, tw_task_version: None, tw_canary_id: None, server_load: Some(1), content_length: Some(10), content_encoding: None, mononoke_host: Some("*") }) (glob)
-  Processing commit ChangesetId(Blake2(53b034a90fe3002a707a7da9cdf6eac3dea460ad72f7c6969dfb88fd0e69f856))
+  Processing changeset ChangesetId(Blake2(53b034a90fe3002a707a7da9cdf6eac3dea460ad72f7c6969dfb88fd0e69f856))
   Uploading contents: [ContentId(ContentId("eb56488e97bb4cf5eb17f05357b80108a4a71f6c3bab52dfcaec07161d105ec9")), ContentId(ContentId("be87911855af0fc33a75f2c1cba2269dd90faa7f5c5358eb640d9d65f55fced3"))]
   Uploaded 2 contents successfully
   Uploaded 3 trees successfully