equal
deleted
inserted
replaced
428 |
428 |
429 pub fn has_p1(&self) -> bool { |
429 pub fn has_p1(&self) -> bool { |
430 self.p1 != NULL_REVISION |
430 self.p1 != NULL_REVISION |
431 } |
431 } |
432 |
432 |
433 pub fn p1_entry(&self) -> Result<Option<RevlogEntry>, RevlogError> { |
433 pub fn p1_entry( |
|
434 &self, |
|
435 ) -> Result<Option<RevlogEntry<'revlog>>, RevlogError> { |
434 if self.p1 == NULL_REVISION { |
436 if self.p1 == NULL_REVISION { |
435 Ok(None) |
437 Ok(None) |
436 } else { |
438 } else { |
437 Ok(Some(self.revlog.get_entry(self.p1)?)) |
439 Ok(Some(self.revlog.get_entry(self.p1)?)) |
438 } |
440 } |
439 } |
441 } |
440 |
442 |
441 pub fn p2_entry(&self) -> Result<Option<RevlogEntry>, RevlogError> { |
443 pub fn p2_entry( |
|
444 &self, |
|
445 ) -> Result<Option<RevlogEntry<'revlog>>, RevlogError> { |
442 if self.p2 == NULL_REVISION { |
446 if self.p2 == NULL_REVISION { |
443 Ok(None) |
447 Ok(None) |
444 } else { |
448 } else { |
445 Ok(Some(self.revlog.get_entry(self.p2)?)) |
449 Ok(Some(self.revlog.get_entry(self.p2)?)) |
446 } |
450 } |