Package org.eclipse.jgit.patch
Class CombinedFileHeader
- java.lang.Object
-
- org.eclipse.jgit.diff.DiffEntry
-
- org.eclipse.jgit.patch.FileHeader
-
- org.eclipse.jgit.patch.CombinedFileHeader
-
public class CombinedFileHeader extends FileHeader
A file in the Git "diff --cc" or "diff --combined" format.A combined diff shows an n-way comparison between two or more ancestors and the final revision. Its primary function is to perform code reviews on a merge which introduces changes not in any ancestor.
-
-
Nested Class Summary
-
Nested classes/interfaces inherited from class org.eclipse.jgit.patch.FileHeader
FileHeader.PatchType
-
Nested classes/interfaces inherited from class org.eclipse.jgit.diff.DiffEntry
DiffEntry.ChangeType, DiffEntry.Side
-
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description List<? extends CombinedHunkHeader>
getHunks()
Get hunks altering this file; in order of appearance in patchAbbreviatedObjectId
getOldId()
Get the old object id from theindex
.AbbreviatedObjectId
getOldId(int nthParent)
Get the ObjectId of the nth ancestorFileMode
getOldMode()
Get the old file modeFileMode
getOldMode(int nthParent)
Get the file mode of the nth ancestorint
getParentCount()
String
getScriptText(Charset[] charsetGuess)
String
getScriptText(Charset ocs, Charset ncs)
Convert the patch script for this file into a string.protected void
parseIndexLine(int ptr, int eol)
protected void
parseNewFileMode(int ptr, int eol)
-
Methods inherited from class org.eclipse.jgit.patch.FileHeader
getBuffer, getEndOffset, getForwardBinaryHunk, getPatchType, getReverseBinaryHunk, getScriptText, getStartOffset, hasMetaDataChanges, toEditList
-
Methods inherited from class org.eclipse.jgit.diff.DiffEntry
getChangeType, getDiffAttribute, getId, getMode, getNewId, getNewMode, getNewPath, getOldPath, getPath, getScore, getTreeFilterMarks, isMarked, scan, scan, scan, toString
-
-
-
-
Method Detail
-
getHunks
public List<? extends CombinedHunkHeader> getHunks()
Get hunks altering this file; in order of appearance in patch- Overrides:
getHunks
in classFileHeader
- Returns:
- hunks altering this file; in order of appearance in patch.
-
getParentCount
public int getParentCount()
- Returns:
- number of ancestor revisions mentioned in this diff.
-
getOldMode
public FileMode getOldMode()
Get the old file mode- Overrides:
getOldMode
in classDiffEntry
- Returns:
- get the file mode of the first parent.
-
getOldMode
public FileMode getOldMode(int nthParent)
Get the file mode of the nth ancestor- Parameters:
nthParent
- the ancestor to get the mode of- Returns:
- the mode of the requested ancestor.
-
getOldId
public AbbreviatedObjectId getOldId()
Get the old object id from theindex
.
-
getOldId
public AbbreviatedObjectId getOldId(int nthParent)
Get the ObjectId of the nth ancestor- Parameters:
nthParent
- the ancestor to get the object id of- Returns:
- the id of the requested ancestor.
-
getScriptText
public String getScriptText(Charset ocs, Charset ncs)
Convert the patch script for this file into a string.- Overrides:
getScriptText
in classFileHeader
- Parameters:
ocs
- hint character set to decode the old lines with.ncs
- hint character set to decode the new lines with.- Returns:
- the patch script, as a Unicode string.
-
getScriptText
public String getScriptText(Charset[] charsetGuess)
Convert the patch script for this file into a string.
-
parseIndexLine
protected void parseIndexLine(int ptr, int eol)
-
parseNewFileMode
protected void parseNewFileMode(int ptr, int eol)
-
-