rust/rhg/src/commands/status.rs
changeset 48343 eb428010aad2
parent 48342 10c32e1b892a
child 48344 b6d8eea9872c
--- a/rust/rhg/src/commands/status.rs	Tue Nov 23 18:27:42 2021 +0100
+++ b/rust/rhg/src/commands/status.rs	Tue Nov 23 19:39:51 2021 +0100
@@ -309,13 +309,14 @@
     manifest: &Manifest,
     hg_path: &HgPath,
 ) -> Result<bool, HgError> {
-    let file_node = manifest
+    let entry = manifest
         .find_file(hg_path)?
         .expect("ambgious file not in p1");
     let filelog = repo.filelog(hg_path)?;
-    let filelog_entry = filelog.data_for_node(file_node).map_err(|_| {
-        HgError::corrupted("filelog missing node from manifest")
-    })?;
+    let filelog_entry =
+        filelog.data_for_node(entry.node_id()?).map_err(|_| {
+            HgError::corrupted("filelog missing node from manifest")
+        })?;
     let contents_in_p1 = filelog_entry.data()?;
 
     let fs_path = hg_path_to_os_string(hg_path).expect("HgPath conversion");