Class FSMergerBySequence
java.lang.Object
org.tmatesoft.svn.core.internal.wc.FSMergerBySequence
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionstatic final int
static final String
static final int
private final byte[]
private final byte[]
private final byte[]
private final byte[]
static final int
-
Constructor Summary
ConstructorsConstructorDescriptionFSMergerBySequence
(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd) FSMergerBySequence
(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd, byte[] originalMarker) -
Method Summary
Modifier and TypeMethodDescriptionprivate int
appendLines
(OutputStream result, de.regnis.q.sequence.QSequenceDifferenceBlock block, de.regnis.q.sequence.line.QSequenceLineCache changedLines, int baseLineIndex, List transformedLocalLines) private void
appendTransformedLocalLines
(int baseLineIndex, int to, List transformedLocalLines, OutputStream result) private boolean
checkConflict
(FSMergerBySequenceList localChanges, FSMergerBySequenceList latestChanges, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines, int baseLineCount) private int
createConflict
(OutputStream result, de.regnis.q.sequence.QSequenceDifferenceBlock localStart, de.regnis.q.sequence.QSequenceDifferenceBlock localEnd, de.regnis.q.sequence.QSequenceDifferenceBlock latestStart, de.regnis.q.sequence.QSequenceDifferenceBlock latestEnd, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines, int baseLineIndex, List transformedLocalLines, SVNDiffConflictChoiceStyle style) private int
createOnlyConflictWithContext
(OutputStream result, de.regnis.q.sequence.QSequenceDifferenceBlock localStart, de.regnis.q.sequence.QSequenceDifferenceBlock localEnd, de.regnis.q.sequence.QSequenceDifferenceBlock latestStart, de.regnis.q.sequence.QSequenceDifferenceBlock latestEnd, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines, de.regnis.q.sequence.line.QSequenceLineCache baseLines) private de.regnis.q.sequence.line.simplifier.QSequenceLineTeeSimplifier
createSimplifier
(SVNDiffOptions options) private boolean
intersect
(de.regnis.q.sequence.QSequenceDifferenceBlock block1, de.regnis.q.sequence.QSequenceDifferenceBlock block2, int baseLineCount) private boolean
isBefore
(de.regnis.q.sequence.QSequenceDifferenceBlock block1, de.regnis.q.sequence.QSequenceDifferenceBlock block2) private boolean
isEqualChange
(de.regnis.q.sequence.QSequenceDifferenceBlock localBlock, de.regnis.q.sequence.QSequenceDifferenceBlock latestBlock, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines) int
merge
(de.regnis.q.sequence.line.QSequenceLineRAData baseData, de.regnis.q.sequence.line.QSequenceLineRAData localData, de.regnis.q.sequence.line.QSequenceLineRAData latestData, SVNDiffOptions options, OutputStream result, SVNDiffConflictChoiceStyle style) private List
transformLocalLines
(List blocks, de.regnis.q.sequence.line.QSequenceLineCache localLines) private void
writeBytes
(OutputStream os, byte[] bytes) private void
writeBytesAndEol
(OutputStream os, byte[] bytes) private void
writeLine
(OutputStream os, de.regnis.q.sequence.line.QSequenceLine line)
-
Field Details
-
DEFAULT_EOL
-
NOT_MODIFIED
public static final int NOT_MODIFIED- See Also:
-
MERGED
public static final int MERGED- See Also:
-
CONFLICTED
public static final int CONFLICTED- See Also:
-
myConflictStart
private final byte[] myConflictStart -
myConflictSeparator
private final byte[] myConflictSeparator -
myConflictEnd
private final byte[] myConflictEnd -
myOriginalMarker
private final byte[] myOriginalMarker
-
-
Constructor Details
-
FSMergerBySequence
public FSMergerBySequence(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd) -
FSMergerBySequence
public FSMergerBySequence(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd, byte[] originalMarker)
-
-
Method Details
-
merge
public int merge(de.regnis.q.sequence.line.QSequenceLineRAData baseData, de.regnis.q.sequence.line.QSequenceLineRAData localData, de.regnis.q.sequence.line.QSequenceLineRAData latestData, SVNDiffOptions options, OutputStream result, SVNDiffConflictChoiceStyle style) throws IOException - Throws:
IOException
-
transformLocalLines
private List transformLocalLines(List blocks, de.regnis.q.sequence.line.QSequenceLineCache localLines) throws IOException - Throws:
IOException
-
isBefore
private boolean isBefore(de.regnis.q.sequence.QSequenceDifferenceBlock block1, de.regnis.q.sequence.QSequenceDifferenceBlock block2) -
intersect
private boolean intersect(de.regnis.q.sequence.QSequenceDifferenceBlock block1, de.regnis.q.sequence.QSequenceDifferenceBlock block2, int baseLineCount) -
appendLines
private int appendLines(OutputStream result, de.regnis.q.sequence.QSequenceDifferenceBlock block, de.regnis.q.sequence.line.QSequenceLineCache changedLines, int baseLineIndex, List transformedLocalLines) throws IOException - Throws:
IOException
-
isEqualChange
private boolean isEqualChange(de.regnis.q.sequence.QSequenceDifferenceBlock localBlock, de.regnis.q.sequence.QSequenceDifferenceBlock latestBlock, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines) throws IOException - Throws:
IOException
-
checkConflict
private boolean checkConflict(FSMergerBySequenceList localChanges, FSMergerBySequenceList latestChanges, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines, int baseLineCount) throws IOException - Throws:
IOException
-
createConflict
private int createConflict(OutputStream result, de.regnis.q.sequence.QSequenceDifferenceBlock localStart, de.regnis.q.sequence.QSequenceDifferenceBlock localEnd, de.regnis.q.sequence.QSequenceDifferenceBlock latestStart, de.regnis.q.sequence.QSequenceDifferenceBlock latestEnd, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines, int baseLineIndex, List transformedLocalLines, SVNDiffConflictChoiceStyle style) throws IOException - Throws:
IOException
-
createOnlyConflictWithContext
private int createOnlyConflictWithContext(OutputStream result, de.regnis.q.sequence.QSequenceDifferenceBlock localStart, de.regnis.q.sequence.QSequenceDifferenceBlock localEnd, de.regnis.q.sequence.QSequenceDifferenceBlock latestStart, de.regnis.q.sequence.QSequenceDifferenceBlock latestEnd, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines, de.regnis.q.sequence.line.QSequenceLineCache baseLines) throws IOException - Throws:
IOException
-
appendTransformedLocalLines
private void appendTransformedLocalLines(int baseLineIndex, int to, List transformedLocalLines, OutputStream result) throws IOException - Throws:
IOException
-
writeLine
private void writeLine(OutputStream os, de.regnis.q.sequence.line.QSequenceLine line) throws IOException - Throws:
IOException
-
writeBytesAndEol
- Throws:
IOException
-
writeBytes
- Throws:
IOException
-
createSimplifier
private de.regnis.q.sequence.line.simplifier.QSequenceLineTeeSimplifier createSimplifier(SVNDiffOptions options)
-