Showing the changes to git-commitgraph/src/graph (1 of 51 files). Show all
Unified · Split
| @@ -18,8 +18,8 @@ pub enum Error<E: std::error::Error + 'static> { · 17 unmodified lines | |||
| 18 | BaseGraphCount { actual: u8, expected: u8, path: PathBuf }, | 18 | BaseGraphCount { actual: u8, expected: u8, path: PathBuf }, |
| 19 | #[error("'{}' base graph at index {index} should have ID {expected} but is {actual}", .path.display())] | 19 | #[error("'{}' base graph at index {index} should have ID {expected} but is {actual}", .path.display())] |
| 20 | BaseGraphId { | 20 | BaseGraphId { |
| 21 | actual: git_hash::Id, | 21 | actual: git_hash::ObjectId, |
| 22 | expected: git_hash::Id, | 22 | expected: git_hash::ObjectId, |
| 23 | index: u8, | 23 | index: u8, |
| 24 | path: PathBuf, | 24 | path: PathBuf, |
| 25 | }, | 25 | }, |
| @@ -38,13 +38,13 @@ pub enum Error<E: std::error::Error + 'static> { · 12 unmodified lines | |||
| 38 | Generation { | 38 | Generation { |
| 39 | actual: u32, | 39 | actual: u32, |
| 40 | expected: u32, | 40 | expected: u32, |
| 41 | id: git_hash::Id, | 41 | id: git_hash::ObjectId, |
| 42 | }, | 42 | }, |
| 43 | #[error( | 43 | #[error( |
| 44 | "Commit {id} has parent position {parent_pos} that is out of range (should be in range 0-{max_valid_pos})" | 44 | "Commit {id} has parent position {parent_pos} that is out of range (should be in range 0-{max_valid_pos})" |
| 45 | )] | 45 | )] |
| 46 | ParentOutOfRange { | 46 | ParentOutOfRange { |
| 47 | id: git_hash::Id, | 47 | id: git_hash::ObjectId, |
| 48 | max_valid_pos: graph::Position, | 48 | max_valid_pos: graph::Position, |
| 49 | parent_pos: graph::Position, | 49 | parent_pos: graph::Position, |
| 50 | }, | 50 | }, |