public class MergeFormatter extends Object
Constructor and Description |
---|
MergeFormatter() |
Modifier and Type | Method and Description |
---|---|
void |
formatMerge(OutputStream out,
MergeResult<RawText> res,
List<String> seqName,
Charset charset)
Formats the results of a merge of
RawText
objects in a Git conformant way. |
void |
formatMerge(OutputStream out,
MergeResult<RawText> res,
List<String> seqName,
String charsetName)
Deprecated.
|
void |
formatMerge(OutputStream out,
MergeResult res,
String baseName,
String oursName,
String theirsName,
Charset charset)
Formats the results of a merge of exactly two
RawText objects in a Git conformant way. |
void |
formatMerge(OutputStream out,
MergeResult res,
String baseName,
String oursName,
String theirsName,
String charsetName)
Deprecated.
|
@Deprecated public void formatMerge(OutputStream out, MergeResult<RawText> res, List<String> seqName, String charsetName) throws IOException
formatMerge(OutputStream, MergeResult, List, Charset)
instead.RawText
objects in a Git conformant way. This method also assumes that the
RawText
objects being merged are line
oriented files which use LF as delimiter. This method will also use LF to
separate chunks and conflict metadata, therefore it fits only to texts
that are LF-separated lines.out
- the output stream where 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 listcharsetName
- the name of the character set used when writing conflict
metadataIOException
public void formatMerge(OutputStream out, MergeResult<RawText> res, List<String> seqName, Charset charset) throws IOException
RawText
objects in a Git conformant way. This method also assumes that the
RawText
objects being merged are line
oriented files which use LF as delimiter. This method will also use LF to
separate chunks and conflict metadata, therefore it fits only to texts
that are LF-separated lines.out
- the output stream where 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 metadataIOException
@Deprecated public void formatMerge(OutputStream out, MergeResult res, String baseName, String oursName, String theirsName, String charsetName) throws IOException
formatMerge(OutputStream, MergeResult, String, String, String, Charset)
instead.RawText
objects in a Git conformant way.
This convenience method accepts the names for the three sequences (base
and the two merged sequences) as explicit parameters and doesn't require
the caller to specify a Listout
- the OutputStream
where to write the textual
presentationres
- the merge result which should be presentedbaseName
- the name ranges from the base should getoursName
- the name ranges from ours should gettheirsName
- the name ranges from theirs should getcharsetName
- the name of the character set used when writing conflict
metadataIOException
public void formatMerge(OutputStream out, MergeResult res, String baseName, String oursName, String theirsName, Charset charset) throws IOException
RawText
objects in a Git conformant way.
This convenience method accepts the names for the three sequences (base
and the two merged sequences) as explicit parameters and doesn't require
the caller to specify a Listout
- the OutputStream
where to write the textual
presentationres
- the merge result which should be presentedbaseName
- the name ranges from the base should getoursName
- the name ranges from ours should gettheirsName
- the name ranges from theirs should getcharset
- the character set used when writing conflict metadataIOException
Copyright © 2019 Eclipse JGit Project. All rights reserved.