Fix #12: octo-merge

Author: peso

README.md

@@ -101,7 +101,6 @@ git-graph --model my-model
 
 * Summaries of merge commits (i.e. 1st line of message) should not be modified! git-graph needs them to categorize merged branches.
 * Supports only the primary remote repository `origin`.
-* Does currently not support "octopus merges" (i.e. no more than 2 parents)
 * On Windows PowerShell, piping to file output does not work properly (changes encoding), so you may want to use the default Windows console instead
 
 ## Contributing

src/graph.rs

@@ -238,7 +238,7 @@ impl HeadInfo {
 pub struct CommitInfo {
     pub oid: Oid,
     pub is_merge: bool,
-    pub parents: [Option<Oid>; 2],
+    pub parents: Vec<Oid>,
     pub children: Vec<Oid>,
     pub branches: Vec<usize>,
     pub tags: Vec<usize>,
@@ -247,10 +247,11 @@ pub struct CommitInfo {
 
 impl CommitInfo {
     fn new(commit: &Commit) -> Self {
+        let parents = commit.parent_ids().collect();
         CommitInfo {
             oid: commit.id(),
             is_merge: commit.parent_count() > 1,
-            parents: [commit.parent_id(0).ok(), commit.parent_id(1).ok()],
+            parents,
             children: Vec::new(),
             branches: Vec::new(),
             tags: Vec::new(),
@@ -336,10 +337,10 @@ fn assign_children(commits: &mut [CommitInfo], indices: &HashMap<Oid, usize>) {
     for idx in 0..commits.len() {
         let (oid, parents) = {
             let info = &commits[idx];
-            (info.oid, info.parents)
+            (info.oid, info.parents.clone())
         };
-        for par_oid in &parents {
-            if let Some(par_idx) = par_oid.and_then(|oid| indices.get(&oid)) {
+        for par_oid in parents {
+            if let Some(par_idx) = indices.get(&par_oid) {
                 commits[*par_idx].children.push(oid);
             }
         }
@@ -503,9 +504,7 @@ fn assign_sources_targets(
         let mut max_par_order = None;
         let mut source_branch_id = None;
         for par_oid in info.parents.iter() {
-            let par_info = par_oid
-                .and_then(|oid| indices.get(&oid))
-                .and_then(|idx| commits.get(*idx));
+            let par_info = indices.get(par_oid).and_then(|idx| commits.get(*idx));
             if let Some(par_info) = par_info {
                 if par_info.branch_trace != info.branch_trace {
                     if let Some(trace) = par_info.branch_trace {
@@ -966,6 +965,9 @@ fn branch_color<T: Clone>(
 
 /// Tries to extract the name of a merged-in branch from the merge commit summary.
 pub fn parse_merge_summary(summary: &str, patterns: &MergePatterns) -> Option<String> {
+    // TODO: Match octo-merge
+    // Example with 3 parents, f1 is primary:
+    //   Merge branches 'f1', 'f2' and 'f3'
     for regex in &patterns.patterns {
         if let Some(captures) = regex.captures(summary) {
             if captures.len() == 2 && captures.get(1).is_some() {

src/print/svg.rs

@@ -36,10 +36,7 @@ pub fn print_svg(graph: &GitGraph, settings: &Settings) -> Result<String, String
                 max_column = branch.visual.column.unwrap();
             }
 
-            for parent in info.parents.iter() {
-                let Some(par_oid) = parent else {
-                    continue;
-                };
+            for par_oid in info.parents.iter() {
                 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

src/print/unicode.rs

@@ -153,10 +153,7 @@ pub fn print_unicode(graph: &GitGraph, settings: &Settings) -> Result<UnicodeGra
             branch_color,
             branch.persistence,
         );
-        for (p, parent) in info.parents.iter().enumerate() {
-            let Some(par_oid) = parent else {
-                continue;
-            };
+        for (p, par_oid) in info.parents.iter().enumerate() {
             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
@@ -490,10 +487,7 @@ fn get_inserts(graph: &GitGraph, compact: bool) -> HashMap<usize, Vec<Vec<Occ>>>
             let column = branch.visual.column.unwrap();
 
             // Iterate through the two possible parents of the current commit.
-            for (p, parent) in info.parents.iter().enumerate() {
-                let Some(par_oid) = parent else {
-                    continue;
-                };
+            for (p, par_oid) in info.parents.iter().enumerate() {
                 // Try to find the index of the parent commit in the `graph.commits` vector.
                 if let Some(par_idx) = graph.indices.get(par_oid) {
                     let par_info = &graph.commits[*par_idx];