Uses of Class
org.tmatesoft.svn.core.wc.SVNDiffOptions
-
Packages that use SVNDiffOptions Package Description org.tmatesoft.svn.cli.svn org.tmatesoft.svn.cli.svnlook org.tmatesoft.svn.core This package mostly contains common classes as well as interfaces used throughout all the library.org.tmatesoft.svn.core.internal.wc org.tmatesoft.svn.core.internal.wc.admin org.tmatesoft.svn.core.internal.wc16 org.tmatesoft.svn.core.internal.wc17 org.tmatesoft.svn.core.internal.wc2.ng org.tmatesoft.svn.core.javahl17 org.tmatesoft.svn.core.wc This package provides a high-level API for managing Working Copies in a way compatible with the native SVN command line client.org.tmatesoft.svn.core.wc2 NEW: this package contains command-style API to perform most of Subversion operations on the level of abstraction similar to that of the command line client. -
-
Uses of SVNDiffOptions in org.tmatesoft.svn.cli.svn
Methods in org.tmatesoft.svn.cli.svn that return SVNDiffOptions Modifier and Type Method Description SVNDiffOptions
SVNCommandEnvironment. getDiffOptions()
-
Uses of SVNDiffOptions in org.tmatesoft.svn.cli.svnlook
Methods in org.tmatesoft.svn.cli.svnlook that return SVNDiffOptions Modifier and Type Method Description SVNDiffOptions
SVNLookCommandEnvironment. getDiffOptions()
-
Uses of SVNDiffOptions in org.tmatesoft.svn.core
Fields in org.tmatesoft.svn.core declared as SVNDiffOptions Modifier and Type Field Description private SVNDiffOptions
SVNAnnotationGenerator. myDiffOptions
Constructors in org.tmatesoft.svn.core with parameters of type SVNDiffOptions Constructor Description SVNAnnotationGenerator(java.lang.String path, java.io.File tmpDirectory, long startRevision, boolean force, boolean includeMergedRevisions, SVNDiffOptions diffOptions, java.lang.String encoding, ISVNAnnotateHandler handler, ISVNEventHandler cancelBaton)
Constructs an annotation generator object.SVNAnnotationGenerator(java.lang.String path, java.io.File tmpDirectory, long startRevision, boolean force, SVNDiffOptions diffOptions, ISVNEventHandler cancelBaton)
Constructs an annotation generator object. -
Uses of SVNDiffOptions in org.tmatesoft.svn.core.internal.wc
Fields in org.tmatesoft.svn.core.internal.wc declared as SVNDiffOptions Modifier and Type Field Description private SVNDiffOptions
AbstractSVNMerger. myDiffOptions
protected SVNDiffOptions
SVNMergeCallback. myDiffOptions
Methods in org.tmatesoft.svn.core.internal.wc that return SVNDiffOptions Modifier and Type Method Description protected SVNDiffOptions
AbstractSVNMerger. getDiffOptions()
abstract SVNDiffOptions
SVNMergeDriver. getMergeOptions()
Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNDiffOptions Modifier and Type Method Description private de.regnis.q.sequence.line.simplifier.QSequenceLineTeeSimplifier
FSMergerBySequence. createSimplifier(SVNDiffOptions options)
int
FSMergerBySequence. merge(de.regnis.q.sequence.line.QSequenceLineRAData baseData, de.regnis.q.sequence.line.QSequenceLineRAData localData, de.regnis.q.sequence.line.QSequenceLineRAData latestData, SVNDiffOptions options, java.io.OutputStream result, SVNDiffConflictChoiceStyle style)
protected abstract SVNStatusType
AbstractSVNMerger. mergeBinary(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile)
protected SVNStatusType
DefaultSVNMerger. mergeBinary(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile)
protected abstract SVNStatusType
AbstractSVNMerger. mergeText(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile)
SVNMergeResult
AbstractSVNMerger. mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)
protected SVNStatusType
DefaultSVNMerger. mergeText(java.io.File baseFile, java.io.File localFile, java.io.File latestFile, SVNDiffOptions options, java.io.File resultFile)
Constructors in org.tmatesoft.svn.core.internal.wc with parameters of type SVNDiffOptions Constructor Description SVNMergeCallback(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver)
SVNMergeCallback15(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver)
-
Uses of SVNDiffOptions in org.tmatesoft.svn.core.internal.wc.admin
Methods in org.tmatesoft.svn.core.internal.wc.admin with parameters of type SVNDiffOptions Modifier and Type Method Description SVNMergeCallback
SVNWCAccess. createMergeCallback(SVNMergeDriver mergeDriver, SVNAdminArea adminArea, SVNURL url, SVNDiffOptions mergeOptions, java.util.Map conflictedPaths, boolean force, boolean dryRun)
SVNStatusType
SVNAdminArea. mergeText(java.lang.String localPath, java.io.File base, java.io.File latest, java.io.File copyFromText, java.lang.String localLabel, java.lang.String baseLabel, java.lang.String latestLabel, SVNProperties propChanges, boolean dryRun, SVNDiffOptions options, SVNLog log)
-
Uses of SVNDiffOptions in org.tmatesoft.svn.core.internal.wc16
Fields in org.tmatesoft.svn.core.internal.wc16 declared as SVNDiffOptions Modifier and Type Field Description private SVNDiffOptions
SVNDiffClient16. myDiffOptions
private SVNDiffOptions
SVNLogClient16. myDiffOptions
Methods in org.tmatesoft.svn.core.internal.wc16 that return SVNDiffOptions Modifier and Type Method Description SVNDiffOptions
SVNLogClient16. getDiffOptions()
Gets the diff options that are used in annotate operations by this client.SVNDiffOptions
SVNDiffClient16. getMergeOptions()
Gets the diff options that are used in merge operations by this client.Methods in org.tmatesoft.svn.core.internal.wc16 with parameters of type SVNDiffOptions Modifier and Type Method Description void
SVNLogClient16. setDiffOptions(SVNDiffOptions diffOptions)
Sets diff options for this client to use in annotate operations.void
SVNDiffClient16. setMergeOptions(SVNDiffOptions diffOptions)
Sets diff options for this client to use in merge operations. -
Uses of SVNDiffOptions in org.tmatesoft.svn.core.internal.wc17
Fields in org.tmatesoft.svn.core.internal.wc17 declared as SVNDiffOptions Modifier and Type Field Description private SVNDiffOptions
SVNLogClient17. myDiffOptions
Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNDiffOptions Modifier and Type Method Description SVNDiffOptions
SVNLogClient17. getDiffOptions()
Gets the diff options that are used in annotate operations by this client.Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNDiffOptions Modifier and Type Method Description private boolean
SVNWCContext. doTextMerge(ISvnMerger customMerger, java.io.File resultFile, java.io.File targetAbsPath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style)
private SVNWCContext.MergeInfo
SVNWCContext. evalConflictResolverResult(SVNConflictChoice choice, java.io.File wriAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File copyfromText, java.io.File mergedFile, java.io.File detranslatedTarget, SVNDiffOptions options)
private SVNWCContext.MergeInfo
SVNWCContext. maybeResolveConflicts(java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File copyfromText, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, java.io.File resultTarget, java.io.File detranslatedTarget, SVNPropertyValue mimeprop, SVNDiffOptions options, ISVNConflictHandler conflictResolver)
SVNWCContext.MergeInfo
SVNWCContext. merge(SVNSkel workItems, SVNSkel conflictSkel, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File wriAbspath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNProperties oldActualProps, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff)
SVNMergeResult
DefaultSvnMerger. mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)
SvnMergeResult
DefaultSvnMerger. mergeText(ISvnMerger baseMerger, java.io.File resultFile, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style)
SVNWCContext.MergeInfo
SVNWCContext. mergeText(java.io.File left, java.io.File right, java.io.File target, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff)
private SVNWCContext.MergeInfo
SVNWCContext. mergeTextFile(SVNWCContext.MergeInfo info, ISvnMerger customMerger, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File wriAbspath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, boolean dryRun, SVNDiffOptions options, java.io.File copyfromText, java.io.File detranslatedTargetAbspath, SVNPropertyValue mimeprop)
void
SVNLogClient17. setDiffOptions(SVNDiffOptions diffOptions)
Sets diff options for this client to use in annotate operations. -
Uses of SVNDiffOptions in org.tmatesoft.svn.core.internal.wc2.ng
Fields in org.tmatesoft.svn.core.internal.wc2.ng declared as SVNDiffOptions Modifier and Type Field Description private SVNDiffOptions
SvnDiffGenerator. diffOptions
(package private) SVNDiffOptions
SvnNgMergeDriver. diffOptions
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SVNDiffOptions Modifier and Type Method Description SVNDiffOptions
SvnDiffGenerator. getDiffOptions()
private SVNDiffOptions
SvnNgMergeCallback. getDiffOptions()
Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SVNDiffOptions Modifier and Type Method Description protected SvnNgMergeDriver.MergeData
SvnNgMergeDriver. doMerge(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog, java.util.List<SvnNgMergeDriver.MergeSource> mergeSources, java.io.File targetAbsPath, SVNRepository sourceRepository, boolean sourcesRelated, boolean sameRepository, boolean ignoreMergeInfo, boolean diffIgnoreAncestry, boolean forceDelete, boolean dryRun, boolean recordOnly, java.util.Collection<java.io.File> recordOnlyPaths, boolean reintegrateMerge, boolean squelcheMergeInfoNotifications, SVNDepth depth, SVNDiffOptions diffOptions)
private SvnNgMergeCallback2.MergeOutcome
SvnNgMergeCallback2. merge(java.io.File leftAbsPath, java.io.File rightAbsPath, java.io.File targetAbsPath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, java.lang.String diff3Cmd, SVNDiffOptions mergeOptions, SVNProperties originalProps, SVNProperties propChanges, boolean mergeContentNeeded, boolean mergePropsNeeded, ISVNConflictHandler conflictResolver)
void
SvnDiffGenerator. setDiffOptions(SVNDiffOptions diffOptions)
Constructors in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SVNDiffOptions Constructor Description SvnNgMergeDriver(SVNWCContext context, SvnMerge operation, SvnNgRepositoryAccess repositoryAccess, SVNDiffOptions diffOptions)
-
Uses of SVNDiffOptions in org.tmatesoft.svn.core.javahl17
Methods in org.tmatesoft.svn.core.javahl17 that return SVNDiffOptions Modifier and Type Method Description private SVNDiffOptions
SVNClientImpl. getDiffOptions(DiffOptions diffOptions)
-
Uses of SVNDiffOptions in org.tmatesoft.svn.core.wc
Fields in org.tmatesoft.svn.core.wc declared as SVNDiffOptions Modifier and Type Field Description private SVNDiffOptions
SVNDiffClient. diffOptions
private SVNDiffOptions
SVNLogClient. diffOptions
private SVNDiffOptions
DefaultSVNDiffGenerator. myDiffOptions
Methods in org.tmatesoft.svn.core.wc that return SVNDiffOptions Modifier and Type Method Description SVNDiffOptions
DefaultSVNDiffGenerator. getDiffOptions()
Gets the diff options that are used by this generator.SVNDiffOptions
SVNLogClient. getDiffOptions()
Gets the diff options that are used in annotate operations by this client.SVNDiffOptions
SVNDiffClient. getMergeOptions()
Gets the diff options that are used in merge operations by this client.Methods in org.tmatesoft.svn.core.wc with parameters of type SVNDiffOptions Modifier and Type Method Description SVNMergeResult
ISVNMerger. mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)
Performs a text merge.void
DefaultSVNDiffGenerator. setDiffOptions(SVNDiffOptions options)
Sets diff options containing diff rules.void
SVNLogClient. setDiffOptions(SVNDiffOptions diffOptions)
Sets diff options for this client to use in annotate operations.void
SVNDiffClient. setMergeOptions(SVNDiffOptions diffOptions)
Sets diff options for this client to use in merge operations. -
Uses of SVNDiffOptions in org.tmatesoft.svn.core.wc2
Fields in org.tmatesoft.svn.core.wc2 declared as SVNDiffOptions Modifier and Type Field Description private SVNDiffOptions
SvnAnnotate. diffOptions
private SVNDiffOptions
SvnDiff. diffOptions
private SVNDiffOptions
SvnMerge. mergeOptions
Methods in org.tmatesoft.svn.core.wc2 that return SVNDiffOptions Modifier and Type Method Description SVNDiffOptions
SvnAnnotate. getDiffOptions()
Gets diff options for the operation.SVNDiffOptions
SvnDiff. getDiffOptions()
Returns the operation's diff options controlling white-spaces and eol-styles.SVNDiffOptions
SvnMerge. getMergeOptions()
Returns the operation's merge options controlling white-spaces and eol-styles.Methods in org.tmatesoft.svn.core.wc2 with parameters of type SVNDiffOptions Modifier and Type Method Description SvnMergeResult
ISvnMerger. mergeText(ISvnMerger baseMerger, java.io.File resultFile, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style)
Performs a text merge.void
SvnAnnotate. setDiffOptions(SVNDiffOptions diffOptions)
Sets diff options for the operation.void
SvnDiff. setDiffOptions(SVNDiffOptions diffOptions)
Sets the operation's diff options controlling white-spaces and eol-styles.void
SvnMerge. setMergeOptions(SVNDiffOptions mergeOptions)
Sets the operation's merge options controlling white-spaces and eol-styles.
-