Top Fields Constructors Methods
org.eclipse.jgit.merge

pack-priv Class MergeFormatterPass

extends Object
Class Inheritance
Imports
java.io.IOException, .OutputStream, java.nio.charset.Charset, java.util.List, org.eclipse.jgit.diff.RawText, org.eclipse.jgit.merge.MergeChunk.ConflictState

Field Summary

Modifier and TypeField and Description
private final Charset
charset

private String
lastConflictingName

private final EolAwareOutputStream
out

private final MergeResult<RawText>
res

private final List<String>
seqName

private final boolean
threeWayMerge

private final boolean
writeBase

Constructor Summary

AccessConstructor and Description
pack-priv
MergeFormatterPass(OutputStream
the java.io.OutputStream where to write the textual presentation
out, MergeResult<RawText>
the merge result which should be presented
res, List<String>
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 list
seqName, Charset
the character set used when writing conflict metadata
charset)

pack-priv
MergeFormatterPass(OutputStream
the java.io.OutputStream where to write the textual presentation
out, MergeResult<RawText>
the merge result which should be presented
res, List<String>
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 list
seqName, Charset
the character set used when writing conflict metadata
charset, boolean
base's contribution should be written in conflicts
writeBase)

Method Summary

Modifier and TypeMethod and Description
pack-priv void
formatMerge()

private boolean
isBase(MergeChunk chunk)

private boolean
isOurs(MergeChunk chunk)

private boolean
isTheirs(MergeChunk chunk)

private void
writeConflictBase(MergeChunk chunk)

private void
writeConflictChange(MergeChunk chunk)

private void
writeConflictEnd()

private void
writeConflictMetadata(MergeChunk chunk)

private void
writeConflictStart(MergeChunk chunk)

private void
writeLine(RawText seq, int i)

private void
writeln(String s)

Inherited from java.lang.Object:
cloneequalsfinalizegetClasshashCodenotifynotifyAlltoStringwaitwaitwait

Field Detail

charsetback to summary
private final Charset charset
lastConflictingNameback to summary
private String lastConflictingName
outback to summary
private final EolAwareOutputStream out
resback to summary
private final MergeResult<RawText> res
seqNameback to summary
private final List<String> seqName
threeWayMergeback to summary
private final boolean threeWayMerge
writeBaseback to summary
private final boolean writeBase

Constructor Detail

MergeFormatterPassback to summary
pack-priv MergeFormatterPass(OutputStream out, MergeResult<RawText> res, List<String> seqName, Charset charset)
Parameters
out:OutputStream

the java.io.OutputStream where to write the textual presentation

res:MergeResult<RawText>

the merge result which should be presented

seqName:List<String>

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 list

charset:Charset

the character set used when writing conflict metadata

MergeFormatterPassback to summary
pack-priv MergeFormatterPass(OutputStream out, MergeResult<RawText> res, List<String> seqName, Charset charset, boolean writeBase)
Parameters
out:OutputStream

the java.io.OutputStream where to write the textual presentation

res:MergeResult<RawText>

the merge result which should be presented

seqName:List<String>

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 list

charset:Charset

the character set used when writing conflict metadata

writeBase:boolean

base's contribution should be written in conflicts

Method Detail

formatMergeback to summary
pack-priv void formatMerge() throws IOException
isBaseback to summary
private boolean isBase(MergeChunk chunk)
isOursback to summary
private boolean isOurs(MergeChunk chunk)
isTheirsback to summary
private boolean isTheirs(MergeChunk chunk)
writeConflictBaseback to summary
private void writeConflictBase(MergeChunk chunk) throws IOException
writeConflictChangeback to summary
private void writeConflictChange(MergeChunk chunk) throws IOException
writeConflictEndback to summary
private void writeConflictEnd() throws IOException
writeConflictMetadataback to summary
private void writeConflictMetadata(MergeChunk chunk) throws IOException
writeConflictStartback to summary
private void writeConflictStart(MergeChunk chunk) throws IOException
writeLineback to summary
private void writeLine(RawText seq, int i) throws IOException
writelnback to summary
private void writeln(String s) throws IOException