Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 44 additions & 31 deletions src/print/svg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,50 @@ pub fn print_svg(graph: &GitGraph, settings: &Settings) -> Result<String, String
}

for p in 0..2 {
if let Some(par_oid) = info.parents[p] {
if let Some(par_idx) = graph.indices.get(&par_oid) {
let par_info = &graph.commits[*par_idx];
let par_branch = &graph.all_branches[par_info.branch_trace.unwrap()];

let color = if info.is_merge {
&par_branch.visual.svg_color
} else {
branch_color
};

if branch.visual.column == par_branch.visual.column {
document = document.add(line(
idx,
branch.visual.column.unwrap(),
*par_idx,
par_branch.visual.column.unwrap(),
color,
));
} else {
let split_index = super::get_deviate_index(graph, idx, *par_idx);
document = document.add(path(
idx,
branch.visual.column.unwrap(),
*par_idx,
par_branch.visual.column.unwrap(),
split_index,
color,
));
}
}
let parent = info.parents[p];
let Some(par_oid) = parent else {
continue;
};
let Some(par_idx) = graph.indices.get(&par_oid) else {
// Parent is outside scope of graph.indices
// so draw a vertical line to the bottom
let idx_bottom = max_idx;
document = document.add(line(
idx,
branch.visual.column.unwrap(),
idx_bottom,
branch.visual.column.unwrap(),
branch_color,
));
continue;
};
let par_info = &graph.commits[*par_idx];
let par_branch = &graph.all_branches[par_info.branch_trace.unwrap()];

let color = if info.is_merge {
&par_branch.visual.svg_color
} else {
branch_color
};

if branch.visual.column == par_branch.visual.column {
document = document.add(line(
idx,
branch.visual.column.unwrap(),
*par_idx,
par_branch.visual.column.unwrap(),
color,
));
} else {
let split_index = super::get_deviate_index(graph, idx, *par_idx);
document = document.add(path(
idx,
branch.visual.column.unwrap(),
*par_idx,
par_branch.visual.column.unwrap(),
split_index,
color,
));
}
}

Expand Down
Loading
Loading