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.
|
Modifier and Type | Method and Description |
---|---|
SVNDiffOptions |
SVNCommandEnvironment.getDiffOptions() |
Modifier and Type | Method and Description |
---|---|
SVNDiffOptions |
SVNLookCommandEnvironment.getDiffOptions() |
Modifier and Type | Field and Description |
---|---|
private SVNDiffOptions |
SVNAnnotationGenerator.myDiffOptions |
Constructor and 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.
|
Modifier and Type | Field and Description |
---|---|
private SVNDiffOptions |
AbstractSVNMerger.myDiffOptions |
protected SVNDiffOptions |
SVNMergeCallback.myDiffOptions |
Modifier and Type | Method and Description |
---|---|
protected SVNDiffOptions |
AbstractSVNMerger.getDiffOptions() |
abstract SVNDiffOptions |
SVNMergeDriver.getMergeOptions() |
Modifier and Type | Method and 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) |
protected SVNStatusType |
DefaultSVNMerger.mergeText(java.io.File baseFile,
java.io.File localFile,
java.io.File latestFile,
SVNDiffOptions options,
java.io.File resultFile) |
SVNMergeResult |
AbstractSVNMerger.mergeText(SVNMergeFileSet files,
boolean dryRun,
SVNDiffOptions options) |
Constructor and 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) |
Modifier and Type | Method and 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) |
Modifier and Type | Field and Description |
---|---|
private SVNDiffOptions |
SVNLogClient16.myDiffOptions |
private SVNDiffOptions |
SVNDiffClient16.myDiffOptions |
Modifier and Type | Method and 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.
|
Modifier and Type | Method and 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.
|
Modifier and Type | Field and Description |
---|---|
private SVNDiffOptions |
SVNLogClient17.myDiffOptions |
Modifier and Type | Method and Description |
---|---|
SVNDiffOptions |
SVNLogClient17.getDiffOptions()
Gets the diff options that are used in annotate operations by this
client.
|
Modifier and Type | Method and 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) |
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) |
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) |
SVNMergeResult |
DefaultSvnMerger.mergeText(SVNMergeFileSet files,
boolean dryRun,
SVNDiffOptions options) |
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.
|
Modifier and Type | Field and Description |
---|---|
private SVNDiffOptions |
SvnDiffGenerator.diffOptions |
(package private) SVNDiffOptions |
SvnNgMergeDriver.diffOptions |
Modifier and Type | Method and Description |
---|---|
SVNDiffOptions |
SvnDiffGenerator.getDiffOptions() |
private SVNDiffOptions |
SvnNgMergeCallback.getDiffOptions() |
Modifier and Type | Method and 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) |
Constructor and Description |
---|
SvnNgMergeDriver(SVNWCContext context,
SvnMerge operation,
SvnNgRepositoryAccess repositoryAccess,
SVNDiffOptions diffOptions) |
Modifier and Type | Method and Description |
---|---|
private SVNDiffOptions |
SVNClientImpl.getDiffOptions(DiffOptions diffOptions) |
Modifier and Type | Field and Description |
---|---|
private SVNDiffOptions |
SVNDiffClient.diffOptions |
private SVNDiffOptions |
SVNLogClient.diffOptions |
private SVNDiffOptions |
DefaultSVNDiffGenerator.myDiffOptions |
Modifier and Type | Method and 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.
|
Modifier and Type | Method and 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.
|
Modifier and Type | Field and Description |
---|---|
private SVNDiffOptions |
SvnDiff.diffOptions |
private SVNDiffOptions |
SvnAnnotate.diffOptions |
private SVNDiffOptions |
SvnMerge.mergeOptions |
Modifier and Type | Method and Description |
---|---|
SVNDiffOptions |
SvnDiff.getDiffOptions()
Returns the operation's diff options controlling white-spaces and eol-styles.
|
SVNDiffOptions |
SvnAnnotate.getDiffOptions()
Gets diff options for the operation.
|
SVNDiffOptions |
SvnMerge.getMergeOptions()
Returns the operation's merge options controlling white-spaces and eol-styles.
|
Modifier and Type | Method and 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 |
SvnDiff.setDiffOptions(SVNDiffOptions diffOptions)
Sets the operation's diff options controlling white-spaces and eol-styles.
|
void |
SvnAnnotate.setDiffOptions(SVNDiffOptions diffOptions)
Sets diff options for the operation.
|
void |
SvnMerge.setMergeOptions(SVNDiffOptions mergeOptions)
Sets the operation's merge options controlling white-spaces and eol-styles.
|