diff --git a/rust/hg-core/src/dirstate_tree/dirstate_map.rs b/rust/hg-core/src/dirstate_tree/dirstate_map.rs --- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs +++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs @@ -3,8 +3,8 @@ use std::time::Duration; use super::path_with_basename::WithBasename; +use crate::dirstate::parsers::{parse_dirstate, parse_dirstate_parents}; -use crate::dirstate::parsers::parse_dirstate; use crate::matchers::Matcher; use crate::revlog::node::NULL_NODE; use crate::utils::hg_path::{HgPath, HgPathBuf}; @@ -175,9 +175,20 @@ fn parents( &mut self, - _file_contents: &[u8], + file_contents: &[u8], ) -> Result<&DirstateParents, DirstateError> { - todo!() + if self.parents.is_none() { + let parents = if !file_contents.is_empty() { + parse_dirstate_parents(file_contents)?.clone() + } else { + DirstateParents { + p1: NULL_NODE, + p2: NULL_NODE, + } + }; + self.parents = Some(parents); + } + Ok(self.parents.as_ref().unwrap()) } fn set_parents(&mut self, parents: &DirstateParents) {