Show More
@@ -20,7 +20,7 b' use std::time::Duration;' | |||||
20 |
|
20 | |||
21 | pub type FileFoldMap = HashMap<Vec<u8>, Vec<u8>>; |
|
21 | pub type FileFoldMap = HashMap<Vec<u8>, Vec<u8>>; | |
22 |
|
22 | |||
23 |
const NULL_ |
|
23 | const NULL_ID: [u8; 20] = [0; 20]; | |
24 | const MTIME_UNSET: i32 = -1; |
|
24 | const MTIME_UNSET: i32 = -1; | |
25 | const SIZE_DIRTY: i32 = -2; |
|
25 | const SIZE_DIRTY: i32 = -2; | |
26 |
|
26 | |||
@@ -69,8 +69,8 b' impl DirstateMap {' | |||||
69 | self.non_normal_set.clear(); |
|
69 | self.non_normal_set.clear(); | |
70 | self.other_parent_set.clear(); |
|
70 | self.other_parent_set.clear(); | |
71 | self.set_parents(DirstateParents { |
|
71 | self.set_parents(DirstateParents { | |
72 |
p1: NULL_ |
|
72 | p1: NULL_ID, | |
73 |
p2: NULL_ |
|
73 | p2: NULL_ID, | |
74 | }) |
|
74 | }) | |
75 | } |
|
75 | } | |
76 |
|
76 | |||
@@ -267,8 +267,8 b' impl DirstateMap {' | |||||
267 | }; |
|
267 | }; | |
268 | } else if file_contents.is_empty() { |
|
268 | } else if file_contents.is_empty() { | |
269 | parents = DirstateParents { |
|
269 | parents = DirstateParents { | |
270 |
p1: NULL_ |
|
270 | p1: NULL_ID, | |
271 |
p2: NULL_ |
|
271 | p2: NULL_ID, | |
272 | }; |
|
272 | }; | |
273 | } else { |
|
273 | } else { | |
274 | return Err(DirstateError::Parse(DirstateParseError::Damaged)); |
|
274 | return Err(DirstateError::Parse(DirstateParseError::Damaged)); |
General Comments 0
You need to be logged in to leave comments.
Login now