Package org.eclipse.jgit.merge
Class MergeFormatterPass
java.lang.Object
org.eclipse.jgit.merge.MergeFormatterPass
-
Field Summary
FieldsModifier and TypeFieldDescriptionprivate final Charsetprivate Stringprivate final EolAwareOutputStreamprivate final MergeResult<RawText>private final boolean -
Constructor Summary
ConstructorsConstructorDescriptionMergeFormatterPass(OutputStream out, MergeResult<RawText> res, List<String> seqName, Charset charset) -
Method Summary
Modifier and TypeMethodDescription(package private) voidprivate voidwriteConflictChange(MergeChunk chunk) private voidprivate voidwriteConflictMetadata(MergeChunk chunk) private voidwriteConflictStart(MergeChunk chunk) private voidprivate void
-
Field Details
-
out
-
res
-
seqName
-
charset
-
threeWayMerge
private final boolean threeWayMerge -
lastConflictingName
-
-
Constructor Details
-
MergeFormatterPass
MergeFormatterPass(OutputStream out, MergeResult<RawText> res, List<String> seqName, Charset charset) - Parameters:
out- theOutputStreamwhere to write the textual presentationres- the merge result which should be presentedseqName- When a conflict is reported each conflicting range will get a name. This name is following the "<<<<<<< " or ">>>>>>> " conflict markers. The names for the sequences are given in this listcharset- the character set used when writing conflict metadata
-
-
Method Details
-
formatMerge
- Throws:
IOException
-
writeConflictMetadata
- Throws:
IOException
-
writeConflictEnd
- Throws:
IOException
-
writeConflictStart
- Throws:
IOException
-
writeConflictChange
- Throws:
IOException
-
writeln
- Throws:
IOException
-
writeLine
- Throws:
IOException
-