equal
deleted
inserted
replaced
651 /// Does nothing on a "directory" node |
651 /// Does nothing on a "directory" node |
652 fn mark_removed_or_deleted_if_file( |
652 fn mark_removed_or_deleted_if_file( |
653 &self, |
653 &self, |
654 dirstate_node: &NodeRef<'tree, 'on_disk>, |
654 dirstate_node: &NodeRef<'tree, 'on_disk>, |
655 ) -> Result<(), DirstateV2ParseError> { |
655 ) -> Result<(), DirstateV2ParseError> { |
656 if let Some(state) = dirstate_node.state()? { |
656 if let Some(entry) = dirstate_node.entry()? { |
|
657 if !entry.any_tracked() { |
|
658 // Future-compat for when we start storing ignored and unknown |
|
659 // files for caching reasons |
|
660 return Ok(()); |
|
661 } |
657 let path = dirstate_node.full_path(self.dmap.on_disk)?; |
662 let path = dirstate_node.full_path(self.dmap.on_disk)?; |
658 if self.matcher.matches(path) { |
663 if self.matcher.matches(path) { |
659 if let EntryState::Removed = state { |
664 if entry.removed() { |
660 self.push_outcome(Outcome::Removed, dirstate_node)? |
665 self.push_outcome(Outcome::Removed, dirstate_node)? |
661 } else { |
666 } else { |
662 self.push_outcome(Outcome::Deleted, &dirstate_node)? |
667 self.push_outcome(Outcome::Deleted, &dirstate_node)? |
663 } |
668 } |
664 } |
669 } |