Add back a trace message

Summary: While here, clean up lint warnings in a file I touched in the previous commit.

Reviewed By: zzl0

Differential Revision: D54849430

fbshipit-source-id: e19cdbabb428483ab205084832d146ec593b5296

eden/integration/hg/update_test.py

@@ -884,7 +884,7 @@ def test_resume_interrupted_update(self) -> None:
                 flags=DIS_ENABLE_FLAGS,
                 sync=SyncBehavior(),
             )
-            inodes = dict((i.path.decode("utf8"), i) for i in inode_status)
+            inodes = {i.path.decode("utf8"): i for i in inode_status}
             self.assertNotIn("dir1", inodes)
             # dir2 will either be not loaded or not materialized.
             dir2 = next(inode for inode in inodes[""].entries if inode.name == b"dir2")
@@ -1085,7 +1085,7 @@ def test_update_change_stat(self) -> None:
         poststats = os.stat(filepath)
         self.assertEqual(poststats.st_size, 7)
 
-    if sys.platform == "win32":
+    if sys.platform == "win32":  # noqa: C901
 
         def _retry_update_after_failed_entry_cache_invalidation(
             self,

eden/scm/lib/workingcopy/src/workingcopy.rs

@@ -426,6 +426,7 @@ impl WorkingCopy {
                             self.treestate
                                 .lock()
                                 .set_parents(&mut std::iter::once(&parent))?;
+                            tracing::warn!("repaired eden dirstate: set parent to {}", parent);
                         }
 
                         None => {