WIP Improve branch detection for merge message without "into"

[mstv]

Fixes #6236

Proposed changes

• try to get more info if merge commit lacks "into"
• use Environment.NewLine instead of `\n'

Screenshots

Before

After

Test methodology

• TODO: NUnit test cases

Test environment(s)

• Git Extensions 3.1.0
• Build 5c41338 (Dirty)
• Git 2.20.1.windows.1
• Microsoft Windows NT 6.1.7601 Service Pack 1
• .NET Framework 4.7.2117.0
• DPI 96dpi (no scaling)

---

✒️ I contribute this code under The Developer Certificate of Origin.

[mstv]

The sort order of child nodes does not match the requirements for this feature. I would expect the master branch to be the first child, i.e. node.Children.Last() (.Last() because the collection is a stack: ImmutableStack<RevisionGraphRevision>).

Can I rely on the sorting of Parents only, @spdr870? I.e. the first parent is the branch merged into.

Here, it works as expected:

[codecov]

Codecov Report

Merging #6237 into master will increase coverage by 0.35%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #6237      +/-   ##
==========================================
+ Coverage   45.44%   45.79%   +0.35%     
==========================================
  Files         669      669              
  Lines       50383    50396      +13     
  Branches     6650     6645       -5     
==========================================
+ Hits        22897    23080     +183     
+ Misses      26275    26040     -235     
- Partials     1211     1276      +65

Flag	Coverage Δ
#production	35.32% <0%> (+0.44%)	⬆️
#tests	97.6% <ø> (-0.01%)	⬇️

[mstv]

This works much more like expected - though still not completely:

Do you have objections against this approach, @spdr870, @RussKie, others?

@spdr870: How can I get a really sorted list of segments?

public RevisionGraphRevision GetLeftmostChild(RevisionGraphRevision node)
{
    int rowIndex = _revisionGraphRowProvider.GetRowForNode(node);
    var segments = _revisionGraphRowProvider.GetSegmentsForRow(rowIndex);
    return segments?.Segments?.FirstOrDefault(segment => segment.Parent == node)?.Child;
}

[GintasS]

This is an old PR and should be closed or set to a draft. @gerhardol

[mstv]

I must follow up here. The detection does not work well - especially with squash-merges.

@GintasS, "WIP" is the former marker for "draft".