equal
deleted
inserted
replaced
292 /// will need to keep the same format. |
292 /// will need to keep the same format. |
293 pub fn v1_data(&self) -> (u8, i32, i32, i32) { |
293 pub fn v1_data(&self) -> (u8, i32, i32, i32) { |
294 (self.state().into(), self.mode(), self.size(), self.mtime()) |
294 (self.state().into(), self.mode(), self.size(), self.mtime()) |
295 } |
295 } |
296 |
296 |
297 pub fn is_non_normal(&self) -> bool { |
297 pub(crate) fn is_from_other_parent(&self) -> bool { |
298 self.state() != EntryState::Normal || self.mtime() == MTIME_UNSET |
|
299 } |
|
300 |
|
301 pub fn is_from_other_parent(&self) -> bool { |
|
302 self.state() == EntryState::Normal |
298 self.state() == EntryState::Normal |
303 && self.size() == SIZE_FROM_OTHER_PARENT |
299 && self.size() == SIZE_FROM_OTHER_PARENT |
304 } |
300 } |
305 |
301 |
306 // TODO: other platforms |
302 // TODO: other platforms |