mercurial: comparison rust/hg-core/src/revlog/index.rs

equal deleted inserted replaced

-:a7bba7df9189
+:9f876765cbe2
 uses_generaldelta: bool,
 is_inline: bool,
 /// Cache of the head revisions in this index, kept in sync. Should
 /// be accessed via the [`Self::head_revs`] method.
 head_revs: Vec<Revision>,
+/// Cache of the last filtered revisions in this index, used to make sure
+/// we haven't changed filters when returning the cached `head_revs`.
+filtered_revs: HashSet<Revision>,
 }
 impl Debug for Index {
 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 f.debug_struct("Index")
 bytes: IndexData::new(bytes),
 offsets: RwLock::new(Some(offsets)),
 uses_generaldelta,
 is_inline: true,
 head_revs: vec![],
+filtered_revs: HashSet::new(),
 })
 } else {
 Err(HgError::corrupted("unexpected inline revlog length"))
 }
 } else {
 bytes: IndexData::new(bytes),
 offsets: RwLock::new(None),
 uses_generaldelta,
 is_inline: false,
 head_revs: vec![],
+filtered_revs: HashSet::new(),
 })
 }
 }
 pub fn uses_generaldelta(&self) -> bool {
 }
 }
 /// Return the head revisions of this index
 pub fn head_revs(&mut self) -> Result<Vec<Revision>, GraphError> {
-if !self.head_revs.is_empty() {
+self.head_revs_filtered(&HashSet::new())
+}
+/// Return the head revisions of this index
+pub fn head_revs_filtered(
+&mut self,
+filtered_revs: &HashSet<Revision>,
+) -> Result<Vec<Revision>, GraphError> {
+if !self.head_revs.is_empty() && filtered_revs == &self.filtered_revs {
 return Ok(self.head_revs.to_owned());
 }
-let mut revs: HashSet<Revision, RandomState> = (0..self.len())
+let mut revs: HashSet<Revision, RandomState> =
-.into_iter()
+if filtered_revs.is_empty() {
-.map(|i| Revision(i as BaseRevision))
+(0..self.len())
-.collect();
+.into_iter()
+.map(|i| Revision(i as BaseRevision))
+.collect()
+} else {
+(0..self.len())
+.into_iter()
+.filter_map(|i| {
+let r = Revision(i as BaseRevision);
+if filtered_revs.contains(&r) {
+None
+} else {
+Some(r)
+}
+})
+.collect()
+};
 dagops::retain_heads(self, &mut revs)?;
 if self.is_empty() {
 revs.insert(NULL_REVISION);
 }
 let mut as_vec: Vec<Revision> =
 revs.into_iter().map(Into::into).collect();
 as_vec.sort_unstable();
 self.head_revs = as_vec.to_owned();
+self.filtered_revs = filtered_revs.to_owned();
 Ok(as_vec)
 }
 /// Obtain the delta chain for a revision.
 ///

changeset 51216	9f876765cbe2
parent 51215	a7bba7df9189
child 51218	0112803e6c01