Package org.tmatesoft.svn.core.internal.wc2.ng

Class SvnDiffGenerator

java.lang.Object

org.tmatesoft.svn.core.internal.wc2.ng.SvnDiffGenerator

All Implemented Interfaces:

ISvnDiffGenerator

public class SvnDiffGenerator
extends Object
implements ISvnDiffGenerator

Nested Class Summary

Nested Classes

Modifier and Type	Class	Description
private class	SvnDiffGenerator.EmptyDetectionOutputStream

Field Summary

Fields

Modifier and Type	Field	Description
private SvnTarget	baseTarget
private boolean	diffAdded
private boolean	diffDeleted
private SVNDiffOptions	diffOptions
private String	encoding
private byte[]	eol
private String	externalDiffCommand
private boolean	fallbackToAbsolutePath
private boolean	forcedBinaryDiff
private boolean	forceEmpty
protected static final String	HEADER_ENCODING
protected static final String	HEADER_SEPARATOR
private boolean	ignoreProperties
private ISVNOptions	options
private SvnTarget	originalTarget1
private SvnTarget	originalTarget2
protected static final String	PROPERTIES_SEPARATOR
private boolean	propertiesOnly
private List<String>	rawDiffOptions
private SvnTarget	relativeToTarget
private SvnTarget	repositoryRoot
private boolean	useGitFormat
private Set<String>	visitedPaths
protected static final String	WC_REVISION_LABEL

Constructor Summary

Constructors

Constructor	Description
SvnDiffGenerator()

Method Summary

Modifier and Type	Method	Description
private String	adjustRelativeToReposRoot(String targetString)
private String	computeLabel(String targetString, String originalTargetString)
void	displayAddedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream)
private void	displayBinary(String mimeType1, String mimeType2, OutputStream outputStream, boolean leftIsBinary, boolean rightIsBinary)
private void	displayCannotDisplayFileMarkedBinary(OutputStream outputStream)
void	displayContentChanged(SvnTarget target, File leftFile, File rightFile, String revision1, String revision2, String mimeType1, String mimeType2, SvnDiffCallback.OperationKind operation, File copyFromPath, SVNProperties originalProperties, SVNProperties propChanges, OutputStream outputStream)
void	displayDeletedDirectory(SvnTarget target, String revision1, String revision2, OutputStream outputStream)
private void	displayEOL(OutputStream os)
private void	displayFirstGitLabelPath(OutputStream outputStream, String path1, String revision1, SvnDiffCallback.OperationKind operation)
private void	displayFirstGitPath(OutputStream outputStream, String path1)
private void	displayGitDiffHeader(OutputStream outputStream, SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath)
private void	displayGitDiffHeaderAdded(OutputStream outputStream, String path1, String path2, String copyFromPath)
private void	displayGitDiffHeaderCopied(OutputStream outputStream, String path1, String path2, String copyFromPath)
private void	displayGitDiffHeaderDeleted(OutputStream outputStream, String path1, String path2, String copyFromPath)
private void	displayGitDiffHeaderModified(OutputStream outputStream, String path1, String path2, String copyFromPath)
private void	displayGitDiffHeaderRenamed(OutputStream outputStream, String path1, String path2, String copyFromPath)
private void	displayGitHeaderFields(OutputStream outputStream, SvnTarget target, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath)
private void	displayGitPath(OutputStream outputStream, String path1, String pathPrefix, boolean label)
protected boolean	displayHeader(OutputStream os, String path, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation)
protected void	displayHeaderFields(OutputStream os, String label1, String label2)
private void	displayMergeInfoDiff(OutputStream outputStream, String oldValue, String newValue)
private void	displayMimeType(OutputStream outputStream, String mimeType)
private void	displayMimeTypes(OutputStream outputStream, String mimeType1, String mimeType2)
private void	displayPropDiffValues(OutputStream outputStream, SVNProperties diff, SVNProperties baseProps)
private void	displayPropertyChangesOn(String path, OutputStream outputStream)
void	displayPropsChanged(SvnTarget target, String revision1, String revision2, boolean dirWasAdded, SVNProperties originalProps, SVNProperties propChanges, OutputStream outputStream)
private void	displaySecondGitLabelPath(OutputStream outputStream, String path2, String revision2, SvnDiffCallback.OperationKind operation)
private void	displaySecondGitPath(OutputStream outputStream, String path2)
private void	displayString(OutputStream outputStream, String s)
private void	ensureEncodingAndEOLSet()
private String	getAdjustedPath(String displayPath, String path1, String commonAncestor)
private String	getAdjustedPathWithLabel(String displayPath, String path, String revision, String commonAncestor)
private String	getChildPath(String path, String relativeToPath)
SVNDiffOptions	getDiffOptions()
private String	getDisplayPath(SvnTarget target)
String	getEncoding()
byte[]	getEOL()
private String	getExternalDiffCommand()
private String	getGitDiffLabel1(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision)
private String	getGitDiffLabel2(SvnDiffCallback.OperationKind operationKind, String path1, String path2, String copyFromPath, String revision)
String	getGlobalEncoding()
private String	getHeaderFieldsString(SvnTarget target, String displayPath, String label1, String label2, String revision1, String revision2, SvnDiffCallback.OperationKind operation, String copyFromPath)
private String	getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath)
protected String	getLabel(String path, String revToken)
ISVNOptions	getOptions()
private byte[]	getPropertyAsBytes(SVNPropertyValue value, String encoding)
private String	getRelativePath(String targetString, String baseTargetString)
private String	getRelativeToRootPath(SvnTarget target, SvnTarget originalTarget)
private void	internalDiff(SvnTarget target, OutputStream outputStream, String displayPath, File file1, File file2, String label1, String label2, SvnDiffCallback.OperationKind operation, String copyFromPath, String revision1, String revision2)
boolean	isDiffAdded()
boolean	isDiffDeleted()
boolean	isForcedBinaryDiff()
boolean	isIgnoreProperties()
boolean	isPropertiesOnly()
private byte[]	maybeAppendEOL(byte[] buffer)
private void	runExternalDiffCommand(OutputStream outputStream, String diffCommand, File file1, File file2, String label1, String label2)
void	setAnchors(SvnTarget originalTarget1, SvnTarget originalTarget2)
void	setBasePath(File absoluteFile)
void	setBaseTarget(SvnTarget baseTarget)
void	setDiffAdded(boolean diffAdded)
void	setDiffDeleted(boolean diffDeleted)
void	setDiffOptions(SVNDiffOptions diffOptions)
void	setEncoding(String encoding)
void	setEOL(byte[] eol)
void	setExternalDiffCommand(String externalDiffCommand)
void	setFallbackToAbsolutePath(boolean fallbackToAbsolutePath)
void	setForcedBinaryDiff(boolean forcedBinaryDiff)
void	setForceEmpty(boolean forceEmpty)
void	setIgnoreProperties(boolean ignoreProperties)
void	setOptions(ISVNOptions options)
void	setOriginalTargets(SvnTarget originalTarget1, SvnTarget originalTarget2)
void	setPropertiesOnly(boolean propertiesOnly)
void	setRawDiffOptions(List<String> rawDiffOptions)
void	setRelativeToTarget(SvnTarget relativeToTarget)
void	setRepositoryRoot(SvnTarget repositoryRoot)
void	setUseGitFormat(boolean useGitFormat)
private void	throwBadRelativePathException(String displayPath, String relativeToPath)
private boolean	useLocalFileSeparatorChar()
private void	wrapException(IOException e)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Details

WC_REVISION_LABEL

protected static final String WC_REVISION_LABEL

See Also:

• Constant Field Values

PROPERTIES_SEPARATOR

protected static final String PROPERTIES_SEPARATOR

See Also:

• Constant Field Values

HEADER_SEPARATOR

protected static final String HEADER_SEPARATOR

See Also:

• Constant Field Values

HEADER_ENCODING

protected static final String HEADER_ENCODING

See Also:

• Constant Field Values

originalTarget1

private SvnTarget originalTarget1

originalTarget2

private SvnTarget originalTarget2

baseTarget

private SvnTarget baseTarget

relativeToTarget

private SvnTarget relativeToTarget

repositoryRoot

private SvnTarget repositoryRoot

encoding

private String encoding

eol

private byte[] eol

useGitFormat

private boolean useGitFormat

forcedBinaryDiff

private boolean forcedBinaryDiff

diffDeleted

private boolean diffDeleted

diffAdded

private boolean diffAdded

rawDiffOptions

private List<String> rawDiffOptions

forceEmpty

private boolean forceEmpty

visitedPaths

private Set<String> visitedPaths

externalDiffCommand

private String externalDiffCommand

diffOptions

private SVNDiffOptions diffOptions

fallbackToAbsolutePath

private boolean fallbackToAbsolutePath

options

private ISVNOptions options

propertiesOnly

private boolean propertiesOnly

ignoreProperties

private boolean ignoreProperties

Constructor Details

SvnDiffGenerator

public SvnDiffGenerator()

Method Details

getDisplayPath

private String getDisplayPath(SvnTarget target)

getRelativeToRootPath

private String getRelativeToRootPath(SvnTarget target,
 SvnTarget originalTarget)

getRelativePath

private String getRelativePath(String targetString,
 String baseTargetString)

getChildPath

private String getChildPath(String path,
 String relativeToPath)

setBaseTarget

public void setBaseTarget(SvnTarget baseTarget)

Specified by:

setBaseTarget in interface ISvnDiffGenerator

setUseGitFormat

public void setUseGitFormat(boolean useGitFormat)

Specified by:

setUseGitFormat in interface ISvnDiffGenerator

setOriginalTargets

public void setOriginalTargets(SvnTarget originalTarget1,
 SvnTarget originalTarget2)

Specified by:

setOriginalTargets in interface ISvnDiffGenerator

setRelativeToTarget

public void setRelativeToTarget(SvnTarget relativeToTarget)

setAnchors

public void setAnchors(SvnTarget originalTarget1,
 SvnTarget originalTarget2)

Specified by:

setAnchors in interface ISvnDiffGenerator

setRepositoryRoot

public void setRepositoryRoot(SvnTarget repositoryRoot)

Specified by:

setRepositoryRoot in interface ISvnDiffGenerator

setForceEmpty

public void setForceEmpty(boolean forceEmpty)

Specified by:

setForceEmpty in interface ISvnDiffGenerator

setEncoding

public void setEncoding(String encoding)

Specified by:

setEncoding in interface ISvnDiffGenerator

getEncoding

public String getEncoding()

Specified by:

getEncoding in interface ISvnDiffGenerator

getGlobalEncoding

public String getGlobalEncoding()

Specified by:

getGlobalEncoding in interface ISvnDiffGenerator

setEOL

public void setEOL(byte[] eol)

Specified by:

setEOL in interface ISvnDiffGenerator

getEOL

public byte[] getEOL()

Specified by:

getEOL in interface ISvnDiffGenerator

isForcedBinaryDiff

public boolean isForcedBinaryDiff()

Specified by:

isForcedBinaryDiff in interface ISvnDiffGenerator

setForcedBinaryDiff

public void setForcedBinaryDiff(boolean forcedBinaryDiff)

Specified by:

setForcedBinaryDiff in interface ISvnDiffGenerator

isPropertiesOnly

public boolean isPropertiesOnly()

setPropertiesOnly

public void setPropertiesOnly(boolean propertiesOnly)

isIgnoreProperties

public boolean isIgnoreProperties()

setIgnoreProperties

public void setIgnoreProperties(boolean ignoreProperties)

displayDeletedDirectory

public void displayDeletedDirectory(SvnTarget target,
 String revision1,
 String revision2,
 OutputStream outputStream)
                             throws SVNException

Specified by:

displayDeletedDirectory in interface ISvnDiffGenerator

Throws:

SVNException

displayAddedDirectory

public void displayAddedDirectory(SvnTarget target,
 String revision1,
 String revision2,
 OutputStream outputStream)
                           throws SVNException

Specified by:

displayAddedDirectory in interface ISvnDiffGenerator

Throws:

SVNException

displayPropsChanged

public void displayPropsChanged(SvnTarget target,
 String revision1,
 String revision2,
 boolean dirWasAdded,
 SVNProperties originalProps,
 SVNProperties propChanges,
 OutputStream outputStream)
                         throws SVNException

Specified by:

displayPropsChanged in interface ISvnDiffGenerator

Throws:

SVNException

throwBadRelativePathException

private void throwBadRelativePathException(String displayPath,
 String relativeToPath)
                                    throws SVNException

Throws:

SVNException

displayGitHeaderFields

private void displayGitHeaderFields(OutputStream outputStream,
 SvnTarget target,
 String revision1,
 String revision2,
 SvnDiffCallback.OperationKind operation,
 String copyFromPath)
                             throws SVNException

Throws:

SVNException

adjustRelativeToReposRoot

private String adjustRelativeToReposRoot(String targetString)

computeLabel

private String computeLabel(String targetString,
 String originalTargetString)

displayContentChanged

public void displayContentChanged(SvnTarget target,
 File leftFile,
 File rightFile,
 String revision1,
 String revision2,
 String mimeType1,
 String mimeType2,
 SvnDiffCallback.OperationKind operation,
 File copyFromPath,
 SVNProperties originalProperties,
 SVNProperties propChanges,
 OutputStream outputStream)
                           throws SVNException

Specified by:

displayContentChanged in interface ISvnDiffGenerator

Throws:

SVNException

displayBinary

private void displayBinary(String mimeType1,
 String mimeType2,
 OutputStream outputStream,
 boolean leftIsBinary,
 boolean rightIsBinary)
                    throws SVNException

Throws:

SVNException

internalDiff

private void internalDiff(SvnTarget target,
 OutputStream outputStream,
 String displayPath,
 File file1,
 File file2,
 String label1,
 String label2,
 SvnDiffCallback.OperationKind operation,
 String copyFromPath,
 String revision1,
 String revision2)
                   throws SVNException

Throws:

SVNException

getHeaderFieldsString

private String getHeaderFieldsString(SvnTarget target,
 String displayPath,
 String label1,
 String label2,
 String revision1,
 String revision2,
 SvnDiffCallback.OperationKind operation,
 String copyFromPath)
                              throws SVNException

Throws:

SVNException

getHeaderString

private String getHeaderString(SvnTarget target,
 String displayPath,
 boolean deleted,
 boolean added,
 SvnDiffCallback.OperationKind operation,
 String copyFromPath)
                        throws SVNException

Throws:

SVNException

runExternalDiffCommand

private void runExternalDiffCommand(OutputStream outputStream,
 String diffCommand,
 File file1,
 File file2,
 String label1,
 String label2)
                             throws SVNException

Throws:

SVNException

getExternalDiffCommand

private String getExternalDiffCommand()

displayMimeType

private void displayMimeType(OutputStream outputStream,
 String mimeType)
                      throws SVNException

Throws:

SVNException

displayMimeTypes

private void displayMimeTypes(OutputStream outputStream,
 String mimeType1,
 String mimeType2)
                       throws SVNException

Throws:

SVNException

displayCannotDisplayFileMarkedBinary

private void displayCannotDisplayFileMarkedBinary(OutputStream outputStream)
                                           throws SVNException

Throws:

SVNException

ensureEncodingAndEOLSet

private void ensureEncodingAndEOLSet()

displayPropDiffValues

private void displayPropDiffValues(OutputStream outputStream,
 SVNProperties diff,
 SVNProperties baseProps)
                            throws SVNException

Throws:

SVNException

maybeAppendEOL

private byte[] maybeAppendEOL(byte[] buffer)

getGitDiffLabel1

private String getGitDiffLabel1(SvnDiffCallback.OperationKind operationKind,
 String path1,
 String path2,
 String copyFromPath,
 String revision)

getGitDiffLabel2

private String getGitDiffLabel2(SvnDiffCallback.OperationKind operationKind,
 String path1,
 String path2,
 String copyFromPath,
 String revision)

displayGitDiffHeader

private void displayGitDiffHeader(OutputStream outputStream,
 SvnDiffCallback.OperationKind operationKind,
 String path1,
 String path2,
 String copyFromPath)
                           throws SVNException

Throws:

SVNException

displayGitDiffHeaderAdded

private void displayGitDiffHeaderAdded(OutputStream outputStream,
 String path1,
 String path2,
 String copyFromPath)
                                throws SVNException

Throws:

SVNException

displayGitDiffHeaderDeleted

private void displayGitDiffHeaderDeleted(OutputStream outputStream,
 String path1,
 String path2,
 String copyFromPath)
                                  throws SVNException

Throws:

SVNException

displayGitDiffHeaderCopied

private void displayGitDiffHeaderCopied(OutputStream outputStream,
 String path1,
 String path2,
 String copyFromPath)
                                 throws SVNException

Throws:

SVNException

displayGitDiffHeaderRenamed

private void displayGitDiffHeaderRenamed(OutputStream outputStream,
 String path1,
 String path2,
 String copyFromPath)
                                  throws SVNException

Throws:

SVNException

displayGitDiffHeaderModified

private void displayGitDiffHeaderModified(OutputStream outputStream,
 String path1,
 String path2,
 String copyFromPath)
                                   throws SVNException

Throws:

SVNException

displayFirstGitPath

private void displayFirstGitPath(OutputStream outputStream,
 String path1)
                          throws IOException

Throws:

IOException

displaySecondGitPath

private void displaySecondGitPath(OutputStream outputStream,
 String path2)
                           throws IOException

Throws:

IOException

displayFirstGitLabelPath

private void displayFirstGitLabelPath(OutputStream outputStream,
 String path1,
 String revision1,
 SvnDiffCallback.OperationKind operation)
                               throws IOException

Throws:

IOException

displaySecondGitLabelPath

private void displaySecondGitLabelPath(OutputStream outputStream,
 String path2,
 String revision2,
 SvnDiffCallback.OperationKind operation)
                                throws IOException

Throws:

IOException

displayGitPath

private void displayGitPath(OutputStream outputStream,
 String path1,
 String pathPrefix,
 boolean label)
                     throws IOException

Throws:

IOException

getAdjustedPathWithLabel

private String getAdjustedPathWithLabel(String displayPath,
 String path,
 String revision,
 String commonAncestor)

getAdjustedPath

private String getAdjustedPath(String displayPath,
 String path1,
 String commonAncestor)

getLabel

protected String getLabel(String path,
 String revToken)

displayHeader

protected boolean displayHeader(OutputStream os,
 String path,
 boolean deleted,
 boolean added,
 SvnDiffCallback.OperationKind operation)
                         throws SVNException

Throws:

SVNException

displayHeaderFields

protected void displayHeaderFields(OutputStream os,
 String label1,
 String label2)
                            throws SVNException

Throws:

SVNException

displayPropertyChangesOn

private void displayPropertyChangesOn(String path,
 OutputStream outputStream)
                               throws SVNException

Throws:

SVNException

getPropertyAsBytes

private byte[] getPropertyAsBytes(SVNPropertyValue value,
 String encoding)

displayMergeInfoDiff

private void displayMergeInfoDiff(OutputStream outputStream,
 String oldValue,
 String newValue)
                           throws SVNException,
IOException

Throws:

SVNException

IOException

useLocalFileSeparatorChar

private boolean useLocalFileSeparatorChar()

isDiffDeleted

public boolean isDiffDeleted()

isDiffAdded

public boolean isDiffAdded()

wrapException

private void wrapException(IOException e)
                    throws SVNException

Throws:

SVNException

displayString

private void displayString(OutputStream outputStream,
 String s)
                    throws IOException

Throws:

IOException

displayEOL

private void displayEOL(OutputStream os)
                 throws IOException

Throws:

IOException

getDiffOptions

public SVNDiffOptions getDiffOptions()

setExternalDiffCommand

public void setExternalDiffCommand(String externalDiffCommand)

setRawDiffOptions

public void setRawDiffOptions(List<String> rawDiffOptions)

setDiffOptions

public void setDiffOptions(SVNDiffOptions diffOptions)

setDiffDeleted

public void setDiffDeleted(boolean diffDeleted)

setDiffAdded

public void setDiffAdded(boolean diffAdded)

setBasePath

public void setBasePath(File absoluteFile)

setFallbackToAbsolutePath

public void setFallbackToAbsolutePath(boolean fallbackToAbsolutePath)

setOptions

public void setOptions(ISVNOptions options)

getOptions

public ISVNOptions getOptions()