Add new graph-highlight option "Selected Commits (only first-parent)"

Author: goran-w

src/Models/CommitGraph.cs

@@ -13,6 +13,7 @@ public enum CommitGraphHighlighting
         All = 0,
         CurrentBranchOnly,
         SelectedCommitsOnly,
+        SelectedCommitsOnlyFirstParent,
         CurrentBranchAndSelectedCommits,
     }
 
@@ -156,6 +157,7 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
 
                     if (!isHighlighted &&
                         (highlighting == CommitGraphHighlighting.SelectedCommitsOnly ||
+                         highlighting == CommitGraphHighlighting.SelectedCommitsOnlyFirstParent ||
                          highlighting == CommitGraphHighlighting.CurrentBranchAndSelectedCommits))
                     {
                         isHighlighted = highlightExtraCommits.Remove(commit.SHA);
@@ -200,6 +202,9 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
                 // Deal with other parents (the first parent has been processed)
                 if (!firstParentOnlyEnabled)
                 {
+                    if (highlighting == CommitGraphHighlighting.SelectedCommitsOnlyFirstParent)
+                        isHighlighted = false;
+
                     for (int j = 1; j < commit.Parents.Count; j++)
                     {
                         var parentHash = commit.Parents[j];

src/Resources/Locales/en_US.axaml

@@ -518,6 +518,7 @@
   <x:String x:Key="Text.Histories.HighlightsInGraph.CurrentBranchOnly" xml:space="preserve">Current Branch Only</x:String>
   <x:String x:Key="Text.Histories.HighlightsInGraph.CurrentBranchAndSelectedCommits" xml:space="preserve">Current Branch &amp; Selected Commits</x:String>
   <x:String x:Key="Text.Histories.HighlightsInGraph.SelectedCommitsOnly" xml:space="preserve">Selected Commits Only</x:String>
+  <x:String x:Key="Text.Histories.HighlightsInGraph.SelectedCommitsOnlyFirstParent" xml:space="preserve">Selected Commits (only first-parent)</x:String>
   <x:String x:Key="Text.Histories.Selected" xml:space="preserve">SELECTED {0} COMMITS</x:String>
   <x:String x:Key="Text.Histories.ShowColumns" xml:space="preserve">SHOW COLUMNS</x:String>
   <x:String x:Key="Text.Histories.Tips" xml:space="preserve">Hold 'Ctrl' or 'Shift' to select multiple commits.</x:String>

src/Views/Repository.axaml.cs

@@ -487,6 +487,16 @@ private void OnOpenAdvancedHistoriesOption(object sender, RoutedEventArgs e)
                     ev.Handled = true;
                 };
 
+                var selectedCommitsOnlyFirstParent = new MenuItem();
+                selectedCommitsOnlyFirstParent.Header = App.Text("Histories.HighlightsInGraph.SelectedCommitsOnlyFirstParent");
+                if (histories.GraphHighlighting == Models.CommitGraphHighlighting.SelectedCommitsOnlyFirstParent)
+                    selectedCommitsOnlyFirstParent.Icon = this.CreateMenuIcon("Icons.Check");
+                selectedCommitsOnlyFirstParent.Click += (_, ev) =>
+                {
+                    histories.GraphHighlighting = Models.CommitGraphHighlighting.SelectedCommitsOnlyFirstParent;
+                    ev.Handled = true;
+                };
+
                 var currentBranchAndSelectedCommits = new MenuItem();
                 currentBranchAndSelectedCommits.Header = App.Text("Histories.HighlightsInGraph.CurrentBranchAndSelectedCommits");
                 if (histories.GraphHighlighting == Models.CommitGraphHighlighting.CurrentBranchAndSelectedCommits)
@@ -516,6 +526,7 @@ private void OnOpenAdvancedHistoriesOption(object sender, RoutedEventArgs e)
                 menu.Items.Add(all);
                 menu.Items.Add(currentBranchOnly);
                 menu.Items.Add(selectedCommitsOnly);
+                menu.Items.Add(selectedCommitsOnlyFirstParent);
                 menu.Items.Add(currentBranchAndSelectedCommits);
                 menu.Open(button);
             }