Method buildFromDiff3

src/MergeEditLine.cpp:197–245

Build a new MergeBlockList from scratch using a Diff3LineList. */

    Build a new MergeBlockList from scratch using a Diff3LineList.
*/
void MergeBlockList::buildFromDiff3(const Diff3LineList &diff3List, bool isThreeway)
{
    LineType lineIdx = 0;
    for(auto it = diff3List.cbegin(); it != diff3List.cend(); ++it)
    {
        const Diff3Line &d = *it;
        MergeBlock mb;
        bool bLineRemoved;

        mb.mergeOneLine(d, bLineRemoved, !isThreeway);
        mb.dectectWhiteSpaceConflict(d, isThreeway);

        mb.d3lLineIdx = lineIdx;
        mb.bDelta = mb.srcSelect != e_SrcSelector::A;
        mb.mId3l = it;
        mb.srcRangeLength = 1;

        MergeBlock *lBack = empty() ? nullptr : &back();

        bool bSame = lBack != nullptr && mb.isSameKind(*lBack);
        if(bSame)
        {
            ++lBack->srcRangeLength;
            if(lBack->isWhiteSpaceConflict() && !mb.isWhiteSpaceConflict())
                lBack->bWhiteSpaceConflict = false;
        }
        else
        {
            push_back(mb);
        }

        if(!mb.isConflict())
        {
            MergeBlock &tmpBack = back();
            MergeEditLine mel(mb.id3l());
            mel.setSource(mb.srcSelect, bLineRemoved);
            tmpBack.list().push_back(mel);
        }
        else if(lBack == nullptr || !lBack->isConflict() || !bSame)
        {
            MergeBlock &tmpBack = back();
            MergeEditLine mel(mb.id3l());
            mel.setConflict();
            tmpBack.list().push_back(mel);
        }

        ++lineIdx;
    }
}
/*
    Changes default merge settings currently used when not in auto mode or if white space is being auto solved.
*/