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.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() |
Constructor and Description |
---|
SVNAnnotationGenerator(String path,
File tmpDirectory,
long startRevision,
boolean force,
boolean includeMergedRevisions,
SVNDiffOptions diffOptions,
String encoding,
ISVNAnnotateHandler handler,
ISVNEventHandler cancelBaton)
Constructs an annotation generator object.
|
SVNAnnotationGenerator(String path,
File tmpDirectory,
long startRevision,
boolean force,
SVNDiffOptions diffOptions,
ISVNEventHandler cancelBaton)
Constructs an annotation generator object.
|
Modifier and Type | Field and Description |
---|---|
protected SVNDiffOptions |
SVNMergeCallback.myDiffOptions |
Modifier and Type | Method and Description |
---|---|
protected SVNDiffOptions |
AbstractSVNMerger.getDiffOptions() |
abstract SVNDiffOptions |
SVNMergeDriver.getMergeOptions() |
Modifier and Type | Method and Description |
---|---|
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,
OutputStream result,
SVNDiffConflictChoiceStyle style) |
protected SVNStatusType |
DefaultSVNMerger.mergeBinary(File baseFile,
File localFile,
File repositoryFile,
SVNDiffOptions options,
File resultFile) |
protected abstract SVNStatusType |
AbstractSVNMerger.mergeBinary(File baseFile,
File localFile,
File repositoryFile,
SVNDiffOptions options,
File resultFile) |
protected SVNStatusType |
DefaultSVNMerger.mergeText(File baseFile,
File localFile,
File latestFile,
SVNDiffOptions options,
File resultFile) |
protected abstract SVNStatusType |
AbstractSVNMerger.mergeText(File baseFile,
File localFile,
File repositoryFile,
SVNDiffOptions options,
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,
Map conflictedPathsGetter,
SVNMergeDriver mergeDriver) |
SVNMergeCallback15(SVNAdminArea adminArea,
SVNURL url,
boolean force,
boolean dryRun,
SVNDiffOptions options,
Map conflictedPathsGetter,
SVNMergeDriver mergeDriver) |
Modifier and Type | Method and Description |
---|---|
SVNMergeCallback |
SVNWCAccess.createMergeCallback(SVNMergeDriver mergeDriver,
SVNAdminArea adminArea,
SVNURL url,
SVNDiffOptions mergeOptions,
Map conflictedPaths,
boolean force,
boolean dryRun) |
SVNStatusType |
SVNAdminArea.mergeText(String localPath,
File base,
File latest,
File copyFromText,
String localLabel,
String baseLabel,
String latestLabel,
SVNProperties propChanges,
boolean dryRun,
SVNDiffOptions options,
SVNLog log) |
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 | 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 |
---|---|
SVNWCContext.MergeInfo |
SVNWCContext.merge(SVNSkel workItems,
SVNSkel conflictSkel,
File leftAbspath,
File rightAbspath,
File targetAbspath,
File wriAbspath,
String leftLabel,
String rightLabel,
String targetLabel,
SVNProperties oldActualProps,
boolean dryRun,
SVNDiffOptions options,
SVNProperties propDiff) |
SVNWCContext.MergeInfo |
SVNWCContext.mergeText(File left,
File right,
File target,
String leftLabel,
String rightLabel,
String targetLabel,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean dryRun,
SVNDiffOptions options,
SVNProperties propDiff) |
SvnMergeResult |
DefaultSvnMerger.mergeText(ISvnMerger baseMerger,
File resultFile,
File targetAbspath,
File detranslatedTargetAbspath,
File leftAbspath,
File rightAbspath,
String targetLabel,
String leftLabel,
String rightLabel,
SVNDiffOptions options,
SVNDiffConflictChoiceStyle style) |
SVNMergeResult |
DefaultSvnMerger.mergeText(SVNMergeFileSet files,
boolean dryRun,
SVNDiffOptions options) |
void |
SVNLogClient17.setDiffOptions(SVNDiffOptions diffOptions)
Sets diff options for this client to use in annotate operations.
|
Modifier and Type | Method and Description |
---|---|
SVNDiffOptions |
SvnDiffGenerator.getDiffOptions() |
Modifier and Type | Method and Description |
---|---|
protected SvnNgMergeDriver.MergeData |
SvnNgMergeDriver.doMerge(Map<File,Map<String,SVNMergeRangeList>> resultCatalog,
List<SvnNgMergeDriver.MergeSource> mergeSources,
File targetAbsPath,
SVNRepository sourceRepository,
boolean sourcesRelated,
boolean sameRepository,
boolean ignoreMergeInfo,
boolean diffIgnoreAncestry,
boolean forceDelete,
boolean dryRun,
boolean recordOnly,
Collection<File> recordOnlyPaths,
boolean reintegrateMerge,
boolean squelcheMergeInfoNotifications,
SVNDepth depth,
SVNDiffOptions diffOptions) |
void |
SvnDiffGenerator.setDiffOptions(SVNDiffOptions diffOptions) |
Constructor and Description |
---|
SvnNgMergeDriver(SVNWCContext context,
SvnMerge operation,
SvnNgRepositoryAccess repositoryAccess,
SVNDiffOptions diffOptions) |
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 | Method and 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.
|
Modifier and Type | Method and Description |
---|---|
SvnMergeResult |
ISvnMerger.mergeText(ISvnMerger baseMerger,
File resultFile,
File targetAbspath,
File detranslatedTargetAbspath,
File leftAbspath,
File rightAbspath,
String targetLabel,
String leftLabel,
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.
|
Copyright © 2019. All rights reserved.