equal
deleted
inserted
replaced
28 impl DirstateParents { |
28 impl DirstateParents { |
29 pub const NULL: Self = Self { |
29 pub const NULL: Self = Self { |
30 p1: NULL_NODE, |
30 p1: NULL_NODE, |
31 p2: NULL_NODE, |
31 p2: NULL_NODE, |
32 }; |
32 }; |
|
33 |
|
34 pub fn is_merge(&self) -> bool { |
|
35 return !(self.p2 == NULL_NODE); |
|
36 } |
33 } |
37 } |
34 |
38 |
35 pub type StateMapIter<'a> = Box< |
39 pub type StateMapIter<'a> = Box< |
36 dyn Iterator< |
40 dyn Iterator< |
37 Item = Result<(&'a HgPath, DirstateEntry), DirstateV2ParseError>, |
41 Item = Result<(&'a HgPath, DirstateEntry), DirstateV2ParseError>, |