Show More
@@ -858,7 +858,9 b' impl OwningDirstateMap {' | |||||
858 | return Ok(None); |
|
858 | return Ok(None); | |
859 | } |
|
859 | } | |
860 | } else { |
|
860 | } else { | |
861 |
let |
|
861 | let entry = node.data.as_entry(); | |
|
862 | let was_tracked = entry.map_or(false, |entry| entry.tracked()); | |||
|
863 | let had_entry = entry.is_some(); | |||
862 | if had_entry { |
|
864 | if had_entry { | |
863 | node.data = NodeData::None |
|
865 | node.data = NodeData::None | |
864 | } |
|
866 | } | |
@@ -867,10 +869,7 b' impl OwningDirstateMap {' | |||||
867 | node.copy_source = None |
|
869 | node.copy_source = None | |
868 | } |
|
870 | } | |
869 | dropped = Dropped { |
|
871 | dropped = Dropped { | |
870 |
was_tracked |
|
872 | was_tracked, | |
871 | .data |
|
|||
872 | .as_entry() |
|
|||
873 | .map_or(false, |entry| entry.state().is_tracked()), |
|
|||
874 | had_entry, |
|
873 | had_entry, | |
875 | had_copy_source: node.copy_source.take().is_some(), |
|
874 | had_copy_source: node.copy_source.take().is_some(), | |
876 | }; |
|
875 | }; |
General Comments 0
You need to be logged in to leave comments.
Login now