Class SVNWCContext
java.lang.Object
org.tmatesoft.svn.core.internal.wc17.SVNWCContext
- Version:
- 1.4
-
Nested Class Summary
Nested ClassesModifier and TypeClassDescriptionstatic classstatic classstatic interfacestatic classstatic classstatic classprivate classstatic classstatic interfacestatic classstatic class(package private) static classstatic enumstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic classprivate static classstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic classstatic interfaceclassstatic enumstatic classclassstatic enumprivate static classstatic classprotected static classstatic classstatic enumstatic class -
Field Summary
FieldsModifier and TypeFieldDescriptionprivate List<SVNWCContext.CleanupHandler>private booleanstatic final byte[]static Stringstatic Stringstatic Stringstatic Stringstatic Stringstatic final Stringstatic final Stringstatic Stringstatic Stringstatic Stringstatic Stringstatic final byte[]static final byte[]private ISVNWCDbprivate Stack<ISVNEventHandler>static final longprivate SvnOperation<?>static final Stringprivate static List<SVNStatusType>static final intstatic final Stringstatic final Stringstatic final Stringstatic final Stringstatic final Stringstatic final Stringstatic final intstatic final Stringstatic final intstatic final intprivate static final String -
Constructor Summary
ConstructorsConstructorDescriptionSVNWCContext(ISVNWCDb.SVNWCDbOpenMode mode, ISVNOptions config, boolean autoUpgrade, boolean enforceEmptyWQ, ISVNEventHandler eventHandler) SVNWCContext(ISVNWCDb db, ISVNEventHandler eventHandler) SVNWCContext(ISVNOptions config, ISVNEventHandler eventHandler) -
Method Summary
Modifier and TypeMethodDescriptionacquireWriteLock(File localAbspath, boolean lockAnchor, boolean returnLockRoot) acquireWriteLockForResolve(File localAbsPath) voidaddTreeConflict(SVNWCConflictDescription17 conflict) private voidappendPropConflict(OutputStream stream, SVNSkel propSkel) private SVNWCContext.MergePropStatusInfoapplySingleGenericPropChange(SVNPropertyValue resultVal, boolean didMerge, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue workingVal) private SVNWCContext.MergePropStatusInfoapplySingleGenericPropChange(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) private SVNWCContext.MergePropStatusInfoapplySingleMergeinfoPropChange(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) private SVNWCContext.MergePropStatusInfoapplySingleMergeInfoPropChange(SVNPropertyValue resultVal, boolean didMerge, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue workingVal) (package private) SVNWCContext.MergePropStatusInfoapplySinglePropAdd(SVNPropertyValue resultVal, boolean didMerge, String propName, SVNPropertyValue pristineVal, SVNPropertyValue newVal, SVNPropertyValue workingVal) (package private) SVNWCContext.MergePropStatusInfoapplySinglePropAdd(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue toVal, ISVNConflictHandler conflictResolver, boolean dryRun) (package private) SVNWCContext.MergePropStatusInfoapplySinglePropChange(SVNPropertyValue resultVal, boolean didMerge, String propName, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue workingVal) (package private) SVNWCContext.MergePropStatusInfoapplySinglePropChange(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) (package private) SVNWCContext.MergePropStatusInfoapplySinglePropDelete(SVNPropertyValue resultVal, boolean didMerge, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue workingVal) (package private) SVNWCContext.MergePropStatusInfoapplySinglePropDelete(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, ISVNConflictHandler conflictResolver, boolean dryRun) private static booleanarePropsEqual(SVNPropertyValue propertyValue1, SVNPropertyValue propertyValue2) private booleanarraysEqual(byte[] array1, byte[] array2, int size) private booleanattemptDeletion(File parentDir, File baseName) private SVNWCContext.MergeInfoattemptTrivialMerge(SVNWCContext.MergeInfo info, File leftAbspath, File rightAbspath, File targetAbspath, File detranslatedTargetAbspath, boolean dryRun) voidcanonicalizeURLs(File path, SVNExternalsStore externalsStore, boolean omitDefaultPort) voidcheckForObstructions(File localAbsPath, boolean noWcRootCheck) checkSpecialPath(File localAbspath) intprivate intcheckWCRoot(File localAbspath, boolean fetchSwitched) voidcleanup()voidclose()private SVNPropertyValuecombineForkedMergeInfoProps(SVNPropertyValue fromPropVal, SVNPropertyValue workingPropVal, SVNPropertyValue toPropVal) committableExternalsBelow(List<SVNWCContext.CommittableExternalInfo> externals, File localAbsPath, SVNDepth depth) booleancompareAndVerify(File localAbsPath, File pristineFile, boolean hasProps, boolean propMods, boolean exactComparison) conflictCreateMarker(SVNSkel conflictSkel, File localAbsPath) (package private) voidconflictSkelAddPropConflict(SVNSkel skel, String propName, SVNPropertyValue baseVal, SVNPropertyValue mineVal, SVNPropertyValue toVal, SVNPropertyValue fromVal) private SVNNodeKindconvertDbKindToNodeKind(SVNNodeKind dbKind, ISVNWCDb.SVNWCDbStatus dbStatus, boolean showHidden) private ISvnMergerprivate DefaultSvnMergercreatePrejFile(File localAbspath, SVNSkel conflictSkel) private voidcropChildren(File localAbspath, SVNDepth depth) voidvoiddeleteTreeConflict(File victimAbsPath) private voiddestroyAdm(File dirAbspath) private FiledetranslateWCFile(File targetAbspath, boolean forceCopy, SVNProperties oldActualProps, SVNProperties propDiff, File sourceAbspath) private voiddispatchWorkItem(File wcRootAbspath, SVNSkel workItem) private booleandoTextMerge(ISvnMerger customMerger, File resultFile, File targetAbsPath, File detranslatedTargetAbspath, File leftAbspath, File rightAbspath, String targetLabel, String leftLabel, String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style) voidprivate SVNWCContext.MergeInfoevalConflictResolverResult(SVNConflictChoice choice, File wriAbspath, File leftAbspath, File rightAbspath, File targetAbspath, File copyfromText, File mergedFile, File detranslatedTarget, SVNDiffOptions options) evalTextConflictFuncResult(File localAbsPath, SVNConflictChoice choice, File leftAbsPath, File rightAbsPath, File mergedAbsPath, File detranslatedTarget) voidexpandKeywords(File localAbsPath, File wriAbspath, String keywordsList, boolean forNormalization) private StringgenerateConflictMessage(String propname, SVNPropertyValue original, SVNPropertyValue mine, SVNPropertyValue incoming, SVNPropertyValue incomingBase) private booleangeneratePropConflict(File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, String propName, SVNPropertyValue baseVal, SVNPropertyValue workingVal, SVNPropertyValue incomingOldVal, SVNPropertyValue incomingNewVal, ISVNConflictHandler conflictHandler) private SVNPropertiesgetActualProperties(File localAbsPath) getActualProps(File localAbspath) getActualTarget(File path) voidgetAndRecordFileInfo(File localAbspath, boolean ignoreError) getCharset(File path) getChildrenOfWorkingNode(File dirAbsPath, boolean showHidden) getConflicted(File localAbsPath, boolean isTextNeed, boolean isPropNeed, boolean isTreeNeed) getDb()getEntryLocation(File localAbsPath, SVNRevision pegRevisionKind, boolean fetchRevnum) getEolStyle(File localAbsPath) getKeyWords(File localAbsPath, String forceList) getNodeBase(File localAbsPath, boolean ignoreNonExisting, boolean showHidden) longgetNodeBaseRev(File local_abspath) getNodeChangedInfo(File path) getNodeChildren(File dirAbsPath, boolean showHidden) longgetNodeCommitBaseRev(File local_abspath) getNodeCopyFromInfo(File localAbsPath, SVNWCContext.NodeCopyFromField... fields) getNodeDeletedAncestor(File localAbsPath) getNodeDepth(File localAbsPath) getNodeLock(File localAbsPath) getNodeOrigin(File localAbsPath, boolean scanDeleted, StructureFields.NodeOriginInfo... fields) getNodePresence(File localAbsPath, boolean baseOnly) getNodeReposInfo(File localAbspath) getNodeReposRelPath(File localAbsPath) getNodeScheduleInternal(File localAbsPath, boolean schedule, boolean copied) getNodeUrl(File path) (package private) FilegetPrejfileAbspath(File localAbspath) getPristineContents(File localAbspath, boolean openStream, boolean getPath) getPristineProps(File localAbspath) getPropDiffs(File localAbsPath) private SVNPropertiesgetProperties(File localAbsPath, String name) getProperty(File localAbsPath, String name) getPropertyValue(File localAbsPath, String name) private FilegetRelativePath(File localAbsPath) private static FilegetRelativePath(SVNWCDb db, File localAbspath) longgetRevisionNumber(SVNRevision revision, long[] latestRevisionNumber, SVNRepository repository, File path) getTranslatedFile(File src, File versionedAbspath, boolean toNormalFormat, boolean forceEOLRepair, boolean useGlobalTmp, boolean forceCopy, boolean safelyEncode) When expanding working copy file (which is already expanded, we just have to update EOLs, keywords, etc) One has to pass safelyEncode argument set to true as for this case we have to carefully update necessary parts of the file taking its encoding into account.getTranslatedStream(File localAbspath, File versionedAbspath, boolean translateToNormalForm, boolean repairEOL) getTranslateInfo(File localAbspath, boolean fetchEolStyle, boolean fetchCharset, boolean fetchKeywords, boolean fetchSpecial) getTranslateInfo(File localAbspath, SVNProperties props, boolean forNormalization, boolean fetchEolStyle, boolean fetchCharset, boolean fetchKeywords, boolean fetchSpecial) getTreeConflict(File victimAbspath) getUrlFromPath(File localAbsPath) hasLocalMods(File localAbspath, File anchorAbspath) static booleanhasMagicProperty(SVNProperties properties) (package private) SVNWCContext.ConflictMarkersInfoinitConflictMarkers(String targetLabel, String leftLabel, String rightLabel) voidinitializeWC(File localAbspath, SVNURL url, SVNURL repositoryRoot, String uuid, long revision, SVNDepth depth, int targetWorkingCopyFormat) private voidinitWC(File localAbspath, File reposRelpath, SVNURL repositoryRoot, String uuid, long revNumber, SVNDepth depth, int workingCopyFormat) voidinvokeConflictResolver(File localAbsPath, SVNSkel conflictSkel, ISVNConflictHandler conflictHandler, ISVNCanceller canceller) static booleanisAdminDirectory(String name) booleanisChangelistMatch(File localAbsPath, Collection<String> changelistsSet) private booleanisChildDisjoint(File localAbspath) static booleanprivate booleanbooleanisFileExternal(File path) private booleanprivate booleanisMarkedAsBinary(File localAbsPath) booleanisNodeAdded(File path) booleanisNodeReplaced(File path) Equivalent to the old notion of "entry->schedule == schedule_replace"booleanisNodeStatusDeleted(File localAbsPath) private static booleanbooleanisPropsModified(File localAbspath) private booleanisSameContents(File file1, File file2) private booleanisSameContents(InputStream stream1, InputStream stream2) private static booleanisSingleWorkItem(SVNSkel workItem) booleanbooleanisTextModified(File localAbsPath, boolean exactComparison) private booleanisTranslationRequired(SVNWCContext.SVNEolStyle style, byte[] eol, String charset, Map<String, byte[]> keywords, boolean special, boolean force_eol_check) private static booleanbooleanmatchesChangelist(File localAbspath, Collection<String> changelists) private booleanmaybeGeneratePropConflict(File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, String propname, SVNProperties workingProps, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue baseVal, SVNPropertyValue workingVal, ISVNConflictHandler conflictResolver, boolean dryRun) private SVNPropertyValuemaybePropValue(String propname, SVNSkel child) private SVNWCContext.MergeInfomaybeResolveConflicts(File leftAbspath, File rightAbspath, File targetAbspath, File copyfromText, String leftLabel, String rightLabel, String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, File resultTarget, File detranslatedTarget, SVNPropertyValue mimeprop, SVNDiffOptions options, ISVNConflictHandler conflictResolver) private booleanmaybeSetExecutable(File localAbspath) private booleanmaybeSetReadOnly(File localAbspath) private FilemaybeUpdateTargetEols(File oldTargetAbspath, SVNProperties propDiff) 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) private SVNWCContext.MergeInfomergeBinaryFile(SVNWCContext.MergeInfo info, File leftAbspath, File rightAbspath, File targetAbspath, String leftLabel, String rightLabel, String targetLabel, File detranslatedTargetAbspath, boolean dryRun) mergeProperties(File localAbsPath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties baseProperties, SVNProperties propChanges, boolean dryRun, ISVNConflictHandler conflictResolver) mergeProperties2(SVNWCContext.MergePropertiesInfo mergeInfo, File localAbsPath, ISVNWCDb.SVNWCDbKind kind, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties serverBaseProperties, SVNProperties pristineProperties, SVNProperties actualProperties, SVNProperties propChanges, boolean baseMerge, boolean dryRun, ISVNConflictHandler conflictResolver) mergeProperties3(SVNWCContext.MergePropertiesInfo mergePropertiesInfo, File localAbsPath, SVNProperties serverBaseProps, SVNProperties pristineProps, SVNProperties actualProps, SVNProperties propChanges) mergeText(File left, File right, File target, String leftLabel, String rightLabel, String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff) private SVNWCContext.MergeInfomergeTextFile(SVNWCContext.MergeInfo info, ISvnMerger customMerger, File leftAbspath, File rightAbspath, File targetAbspath, File wriAbspath, String leftLabel, String rightLabel, String targetLabel, boolean dryRun, SVNDiffOptions options, File copyfromText, File detranslatedTargetAbspath, SVNPropertyValue mimeprop) private StringmessageFromSkel(SVNSkel skel) voidnodeWalkChildren(File localAbspath, SVNWCContext.ISVNWCNodeHandler nodeHandler, boolean showHidden, SVNDepth walkDepth, Collection<String> changelists) nodeWasMovedAway(File localAbsPath) nodeWasMovedHere(File localAbsPath) obtainAnchorPath(File localAbspath, boolean lockAnchor, boolean returnLockRoot) static SVNWCContext.UniqueFileInfoopenUniqueFile(File dirPath, boolean openStream) openWritableBase(File localAbspath, boolean md5Checksum, boolean sha1Checksum) voidpreservePreMergeFiles(File leftAbspath, File rightAbspath, File targetAbspath, String leftLabel, String rightLabel, String targetLabel, File detranslatedTargetAbspath) voidpushEventHandler(ISVNEventHandler handler) static InputStreamreadSpecialFile(File localAbsPath) private voidrecursiveResolveConflict(File localAbsPath, SVNDepth depth, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice, ISVNConflictHandler conflictHandler) voidvoidreleaseWriteLock(File localAbspath) private SVNWCContext.RemoveArtifactInforemoveArtifactFileIfExists(File wriAbsPath, File artifactFileAbsPath) voidremoveBaseNode(File localAbspath) voidremoveFromRevisionControl(File localAbspath, boolean destroyWf, boolean instantError) booleanresolveConflictOnNode(File localAbsPath, boolean resolveText, boolean resolveProps, SVNConflictChoice conflictChoice) voidresolvedConflict(File localAbsPath, SVNDepth depth, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice) private voidresolveOneConflict(File localAbsPath, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice) private booleanresolvePropConflictOnNode(File localAbsPath, String conflictedPropName, SVNConflictChoice conflictChoice, File mergedFile) resolveTextConflict(File localAbsPath, SVNOperation operation, File leftAbsPath, File rightAbsPath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, File resultTarget, File detranslatedTarget, ISVNConflictHandler conflictHandler) private booleanresolveTextConflictOnNode(File localAbsPath, SVNConflictChoice conflictChoice, File mergedFile) private booleanresolveTreeConflictOnNode(File localAbsPath, SVNConflictChoice conflictChoice) private SVNSkelsaveMergeResult(File versionedAbspath, File source) private static SVNSkelsaveMergeResult(ISVNWCDb db, File localAbsPath, File sourceAbsPath) voidsetEventHandler(ISVNEventHandler handler) voidsetOperation(SvnOperation<?> operation) (package private) SVNStatusTypesetPropMergeState(SVNStatusType state, SVNStatusType newValue) voidsetSqliteJournalMode(org.tmatesoft.sqljet.core.internal.SqlJetPagerJournalMode sqliteJournalMode) voidsetSqliteTemporaryDbInMemory(boolean temporaryDbInMemory) private SVNConflictDescriptionsetupTextConflictDesc(File leftAbspath, File rightAbspath, File targetAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, File resultTarget, File detranslatedTarget, SVNPropertyValue mimeprop, boolean isBinary) private SVNConflictDescriptionsetupTreeConflictDesc(File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNConflictReason localChange, SVNConflictAction incomingChange) voidsyncFileFlags(File localAbspath) private voidwalkerHelper(File dirAbspath, SVNWCContext.ISVNWCNodeHandler nodeHandler, boolean showHidden, SVNDepth depth, Collection<String> changelists) wqBuildBaseRemove(File localAbspath, boolean keepNotPresent) wqBuildBaseRemove(File localAbspath, long notPresentRevision, ISVNWCDb.SVNWCDbKind notPresentKind) static SVNSkelwqBuildBaseRemove(SVNWCDb db, File localAbspath, long notPresentRevision, ISVNWCDb.SVNWCDbKind notPresentKind) wqBuildDirInstall(File localAbsPath) static SVNSkelwqBuildDirInstall(SVNWCDb db, File localAbsPath) static SVNSkelwqBuildDirRemove(SVNWCDb db, File wriAbspath, File localAbspath, boolean recursive) wqBuildFileCommit(File localAbspath, boolean propsMods) wqBuildFileCopyTranslated(File localAbspath, File srcAbspath, File dstAbspath) static SVNSkelwqBuildFileCopyTranslated(SVNWCDb db, File localAbspath, File srcAbspath, File dstAbspath) wqBuildFileInstall(File localAbspath, File sourceAbspath, boolean useCommitTimes, boolean recordFileinfo) static SVNSkelwqBuildFileInstall(SVNWCDb db, File localAbspath, File sourceAbspath, boolean useCommitTimes, boolean recordFileinfo) wqBuildFileMove(File srcAbspath, File dstAbspath) wqBuildFileMove(File anchorPath, File srcAbspath, File dstAbspath) wqBuildFileRemove(File wriAbsPath, File localAbspath) static SVNSkelwqBuildFileRemove(SVNWCDb db, File wriAbspath, File localAbspath) wqBuildPrejInstall(File localAbspath, SVNSkel conflictSkel) static SVNSkelwqBuildPrejInstall(ISVNWCDb db, File localAbspath, SVNSkel conflictSkel) wqBuildRecordFileinfo(File localAbspath, SVNDate setTime) wqBuildSetPropertyConflictMarkerTemp(File localAbspath, File prejFile) wqBuildSetTextConflictMarkersTmp(File localAbspath, File old, File neo, File wrk) wqBuildSyncFileFlags(File localAbspath) static SVNSkelwqBuildSyncFileFlags(SVNWCDb db, File localAbspath) static SVNSkelvoidvoidwriteCheck(File localAbspath) static voidwriteCheck(ISVNWCDb db, File localAbspath) private FilewriteUnique(File path, byte[] value)
-
Field Details
-
CONFLICT_OP_UPDATE
-
CONFLICT_OP_SWITCH
-
CONFLICT_OP_MERGE
-
CONFLICT_OP_PATCH
-
CONFLICT_KIND_TEXT
-
CONFLICT_KIND_PROP
-
CONFLICT_KIND_TREE
-
CONFLICT_KIND_REJECT
-
CONFLICT_KIND_OBSTRUCTED
-
STATUS_ORDERING
-
INVALID_REVNUM
public static final long INVALID_REVNUM- See Also:
-
STREAM_CHUNK_SIZE
public static final int STREAM_CHUNK_SIZE- See Also:
-
THIS_DIR_PREJ
- See Also:
-
PROP_REJ_EXT
- See Also:
-
CONFLICT_LOCAL_LABEL
- See Also:
-
CONFLICT_LATEST_LABEL
- See Also:
-
CONFLICT_START
public static final byte[] CONFLICT_START -
CONFLICT_END
public static final byte[] CONFLICT_END -
CONFLICT_SEPARATOR
public static final byte[] CONFLICT_SEPARATOR -
WC_NG_VERSION
public static final int WC_NG_VERSION- See Also:
-
WC_WCPROPS_MANY_FILES_VERSION
public static final int WC_WCPROPS_MANY_FILES_VERSION- See Also:
-
WC_WCPROPS_LOST
public static final int WC_WCPROPS_LOST- See Also:
-
WC_ADM_FORMAT
- See Also:
-
WC_ADM_ENTRIES
- See Also:
-
WC_ADM_TMP
- See Also:
-
WC_ADM_PRISTINE
- See Also:
-
WC_ADM_NONEXISTENT_PATH
- See Also:
-
WC_NON_ENTRIES_STRING
- See Also:
-
WC17_SUPPORT_ENABLED_PROPERTY
- See Also:
-
db
-
closeDb
private boolean closeDb -
eventHandler
-
cleanupHandlers
-
operation
-
-
Constructor Details
-
SVNWCContext
-
SVNWCContext
public SVNWCContext(ISVNWCDb.SVNWCDbOpenMode mode, ISVNOptions config, boolean autoUpgrade, boolean enforceEmptyWQ, ISVNEventHandler eventHandler) -
SVNWCContext
-
-
Method Details
-
hasLocalMods
public SVNWCContext.TreeLocalModsInfo hasLocalMods(File localAbspath, File anchorAbspath) throws SVNException - Throws:
SVNException
-
isAdminDirectory
-
isWC17SupportEnabled
private static boolean isWC17SupportEnabled() -
setOperation
-
getEventHandler
-
pushEventHandler
-
popEventHandler
public void popEventHandler() -
setEventHandler
-
close
public void close() -
registerCleanupHandler
-
cleanup
- Throws:
SVNException
-
getDb
-
checkCancelled
- Throws:
SVNCancelException
-
getOptions
-
readKind
- Throws:
SVNException
-
isNodeAdded
- Throws:
SVNException
-
isNodeReplaced
Equivalent to the old notion of "entry->schedule == schedule_replace"- Throws:
SVNException
-
getRevisionNumber
public long getRevisionNumber(SVNRevision revision, long[] latestRevisionNumber, SVNRepository repository, File path) throws SVNException - Throws:
SVNException
-
getNodeChangedInfo
- Throws:
SVNException
-
getNodeCommitBaseRev
- Throws:
SVNException
-
getNodeBaseRev
- Throws:
SVNException
-
getNodeScheduleInternal
public SVNWCContext.ScheduleInternalInfo getNodeScheduleInternal(File localAbsPath, boolean schedule, boolean copied) throws SVNException - Throws:
SVNException
-
isTextModified
- Throws:
SVNException
-
compareAndVerify
public boolean compareAndVerify(File localAbsPath, File pristineFile, boolean hasProps, boolean propMods, boolean exactComparison) throws SVNException - Throws:
SVNException
-
isGlobalCharsetSpecified
private boolean isGlobalCharsetSpecified() -
getPristineContents
public SVNWCContext.PristineContentsInfo getPristineContents(File localAbspath, boolean openStream, boolean getPath) throws SVNException - Throws:
SVNException
-
isSameContents
- Throws:
SVNException
-
isSameContents
- Throws:
SVNException
-
arraysEqual
private boolean arraysEqual(byte[] array1, byte[] array2, int size) -
readSpecialFile
- Throws:
SVNException
-
isTranslationRequired
private boolean isTranslationRequired(SVNWCContext.SVNEolStyle style, byte[] eol, String charset, Map<String, byte[]> keywords, boolean special, boolean force_eol_check) -
getCharset
- Throws:
SVNException
-
isSpecial
- Throws:
SVNException
-
getEolStyle
- Throws:
SVNException
-
getKeyWords
- Throws:
SVNException
-
getTranslateInfo
public SVNWCContext.TranslateInfo getTranslateInfo(File localAbspath, boolean fetchEolStyle, boolean fetchCharset, boolean fetchKeywords, boolean fetchSpecial) throws SVNException - Throws:
SVNException
-
getTranslateInfo
public SVNWCContext.TranslateInfo getTranslateInfo(File localAbspath, SVNProperties props, boolean forNormalization, boolean fetchEolStyle, boolean fetchCharset, boolean fetchKeywords, boolean fetchSpecial) throws SVNException - Throws:
SVNException
-
expandKeywords
private Map<String,byte[]> expandKeywords(File localAbsPath, File wriAbspath, String keywordsList, boolean forNormalization) throws SVNException - Throws:
SVNException
-
isFileExternal
- Throws:
SVNException
-
getNodeUrl
- Throws:
SVNException
-
getConflicted
public SVNWCContext.ConflictInfo getConflicted(File localAbsPath, boolean isTextNeed, boolean isPropNeed, boolean isTreeNeed) throws SVNException - Throws:
SVNException
-
getProperty
- Throws:
SVNException
-
getPropertyValue
- Throws:
SVNException
-
getProperties
- Throws:
SVNException
-
getActualProperties
- Throws:
SVNException
-
getUrlFromPath
- Throws:
SVNException
-
getEntryLocation
public SVNWCContext.EntryLocationInfo getEntryLocation(File localAbsPath, SVNRevision pegRevisionKind, boolean fetchRevnum) throws SVNException - Throws:
SVNException
-
getNodeCopyFromInfo
public SVNWCContext.NodeCopyFromInfo getNodeCopyFromInfo(File localAbsPath, SVNWCContext.NodeCopyFromField... fields) throws SVNException - Throws:
SVNException
-
getNodeOrigin
public Structure<StructureFields.NodeOriginInfo> getNodeOrigin(File localAbsPath, boolean scanDeleted, StructureFields.NodeOriginInfo... fields) throws SVNException - Throws:
SVNException
-
isErrorAccess
-
isPropsModified
- Throws:
SVNException
-
nodeWalkChildren
public void nodeWalkChildren(File localAbspath, SVNWCContext.ISVNWCNodeHandler nodeHandler, boolean showHidden, SVNDepth walkDepth, Collection<String> changelists) throws SVNException - Throws:
SVNException
-
matchesChangelist
-
walkerHelper
private void walkerHelper(File dirAbspath, SVNWCContext.ISVNWCNodeHandler nodeHandler, boolean showHidden, SVNDepth depth, Collection<String> changelists) throws SVNException - Throws:
SVNException
-
acquireWriteLock
public File acquireWriteLock(File localAbspath, boolean lockAnchor, boolean returnLockRoot) throws SVNException - Throws:
SVNException
-
obtainAnchorPath
public File obtainAnchorPath(File localAbspath, boolean lockAnchor, boolean returnLockRoot) throws SVNException - Throws:
SVNException
-
isNotCurrentWc
-
isChildDisjoint
- Throws:
SVNException
-
releaseWriteLock
- Throws:
SVNException
-
checkWCRoot
public SVNWCContext.CheckWCRootInfo checkWCRoot(File localAbspath, boolean fetchSwitched) throws SVNException - Throws:
SVNException
-
exclude
- Throws:
SVNException
-
checkSpecialPath
-
removeFromRevisionControl
public void removeFromRevisionControl(File localAbspath, boolean destroyWf, boolean instantError) throws SVNException - Throws:
SVNException
-
destroyAdm
- Throws:
SVNException
-
cropTree
- Throws:
SVNException
-
cropChildren
- Throws:
SVNException
-
getNodeReposInfo
- Throws:
SVNException
-
getTreeConflict
- Throws:
SVNException
-
writeCheck
- Throws:
SVNException
-
writeCheck
- Throws:
SVNException
-
getPristineProps
- Throws:
SVNException
-
getActualProps
- Throws:
SVNException
-
mergeProperties
public SVNWCContext.MergePropertiesInfo mergeProperties(File localAbsPath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties baseProperties, SVNProperties propChanges, boolean dryRun, ISVNConflictHandler conflictResolver) throws SVNException - Throws:
SVNException
-
mergeProperties2
public SVNWCContext.MergePropertiesInfo mergeProperties2(SVNWCContext.MergePropertiesInfo mergeInfo, File localAbsPath, ISVNWCDb.SVNWCDbKind kind, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties serverBaseProperties, SVNProperties pristineProperties, SVNProperties actualProperties, SVNProperties propChanges, boolean baseMerge, boolean dryRun, ISVNConflictHandler conflictResolver) throws SVNException - Throws:
SVNException
-
mergeProperties3
public SVNWCContext.MergePropertiesInfo mergeProperties3(SVNWCContext.MergePropertiesInfo mergePropertiesInfo, File localAbsPath, SVNProperties serverBaseProps, SVNProperties pristineProps, SVNProperties actualProps, SVNProperties propChanges) throws SVNException - Throws:
SVNException
-
createCustomMerger
-
createDefaultMerger
-
getPrejfileAbspath
- Throws:
SVNException
-
conflictSkelAddPropConflict
void conflictSkelAddPropConflict(SVNSkel skel, String propName, SVNPropertyValue baseVal, SVNPropertyValue mineVal, SVNPropertyValue toVal, SVNPropertyValue fromVal) throws SVNException - Throws:
SVNException
-
setPropMergeState
-
applySinglePropAdd
SVNWCContext.MergePropStatusInfo applySinglePropAdd(SVNPropertyValue resultVal, boolean didMerge, String propName, SVNPropertyValue pristineVal, SVNPropertyValue newVal, SVNPropertyValue workingVal) throws SVNException - Throws:
SVNException
-
applySinglePropAdd
SVNWCContext.MergePropStatusInfo applySinglePropAdd(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue toVal, ISVNConflictHandler conflictResolver, boolean dryRun) throws SVNException - Throws:
SVNException
-
maybeGeneratePropConflict
private boolean maybeGeneratePropConflict(File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, String propname, SVNProperties workingProps, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue baseVal, SVNPropertyValue workingVal, ISVNConflictHandler conflictResolver, boolean dryRun) throws SVNException - Throws:
SVNException
-
writeUnique
- Throws:
SVNException
-
applySinglePropDelete
SVNWCContext.MergePropStatusInfo applySinglePropDelete(SVNPropertyValue resultVal, boolean didMerge, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue workingVal) -
applySinglePropDelete
SVNWCContext.MergePropStatusInfo applySinglePropDelete(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, ISVNConflictHandler conflictResolver, boolean dryRun) throws SVNException - Throws:
SVNException
-
applySinglePropChange
SVNWCContext.MergePropStatusInfo applySinglePropChange(SVNPropertyValue resultVal, boolean didMerge, String propName, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue workingVal) throws SVNException - Throws:
SVNException
-
applySinglePropChange
SVNWCContext.MergePropStatusInfo applySinglePropChange(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) throws SVNException - Throws:
SVNException
-
applySingleGenericPropChange
private SVNWCContext.MergePropStatusInfo applySingleGenericPropChange(SVNPropertyValue resultVal, boolean didMerge, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue workingVal) -
applySingleGenericPropChange
private SVNWCContext.MergePropStatusInfo applySingleGenericPropChange(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) throws SVNException - Throws:
SVNException
-
applySingleMergeInfoPropChange
private SVNWCContext.MergePropStatusInfo applySingleMergeInfoPropChange(SVNPropertyValue resultVal, boolean didMerge, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue workingVal) throws SVNException - Throws:
SVNException
-
combineForkedMergeInfoProps
private SVNPropertyValue combineForkedMergeInfoProps(SVNPropertyValue fromPropVal, SVNPropertyValue workingPropVal, SVNPropertyValue toPropVal) throws SVNException - Throws:
SVNException
-
applySingleMergeinfoPropChange
private SVNWCContext.MergePropStatusInfo applySingleMergeinfoPropChange(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) throws SVNException - Throws:
SVNException
-
openWritableBase
public SVNWCContext.WritableBaseInfo openWritableBase(File localAbspath, boolean md5Checksum, boolean sha1Checksum) throws SVNException - Throws:
SVNException
-
hasMagicProperty
-
getTranslatedStream
public InputStream getTranslatedStream(File localAbspath, File versionedAbspath, boolean translateToNormalForm, boolean repairEOL) throws SVNException - Throws:
SVNException
-
getTranslatedFile
public File getTranslatedFile(File src, File versionedAbspath, boolean toNormalFormat, boolean forceEOLRepair, boolean useGlobalTmp, boolean forceCopy, boolean safelyEncode) throws SVNException When expanding working copy file (which is already expanded, we just have to update EOLs, keywords, etc) One has to pass safelyEncode argument set to true as for this case we have to carefully update necessary parts of the file taking its encoding into account.- Parameters:
src-versionedAbspath-toNormalFormat-forceEOLRepair-useGlobalTmp-forceCopy-safelyEncode-- Returns:
- Throws:
SVNException
-
mergeText
public SVNWCContext.MergeInfo mergeText(File left, File right, File target, String leftLabel, String rightLabel, String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff) throws SVNException - Throws:
SVNException
-
merge
public SVNWCContext.MergeInfo 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) throws SVNException - Throws:
SVNException
-
attemptTrivialMerge
private SVNWCContext.MergeInfo attemptTrivialMerge(SVNWCContext.MergeInfo info, File leftAbspath, File rightAbspath, File targetAbspath, File detranslatedTargetAbspath, boolean dryRun) throws SVNException - Throws:
SVNException
-
isMarkedAsBinary
- Throws:
SVNException
-
detranslateWCFile
private File detranslateWCFile(File targetAbspath, boolean forceCopy, SVNProperties oldActualProps, SVNProperties propDiff, File sourceAbspath) throws SVNException - Throws:
SVNException
-
openUniqueFile
public static SVNWCContext.UniqueFileInfo openUniqueFile(File dirPath, boolean openStream) throws SVNException - Throws:
SVNException
-
maybeUpdateTargetEols
private File maybeUpdateTargetEols(File oldTargetAbspath, SVNProperties propDiff) throws SVNException - Throws:
SVNException
-
mergeTextFile
private SVNWCContext.MergeInfo mergeTextFile(SVNWCContext.MergeInfo info, ISvnMerger customMerger, File leftAbspath, File rightAbspath, File targetAbspath, File wriAbspath, String leftLabel, String rightLabel, String targetLabel, boolean dryRun, SVNDiffOptions options, File copyfromText, File detranslatedTargetAbspath, SVNPropertyValue mimeprop) throws SVNException - Throws:
SVNException
-
doTextMerge
private boolean doTextMerge(ISvnMerger customMerger, File resultFile, File targetAbsPath, File detranslatedTargetAbspath, File leftAbspath, File rightAbspath, String targetLabel, String leftLabel, String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style) throws SVNException - Throws:
SVNException
-
initConflictMarkers
SVNWCContext.ConflictMarkersInfo initConflictMarkers(String targetLabel, String leftLabel, String rightLabel) -
preservePreMergeFiles
private SVNWCContext.PresevePreMergeFileInfo preservePreMergeFiles(File leftAbspath, File rightAbspath, File targetAbspath, String leftLabel, String rightLabel, String targetLabel, File detranslatedTargetAbspath) throws SVNException - Throws:
SVNException
-
maybeResolveConflicts
private SVNWCContext.MergeInfo maybeResolveConflicts(File leftAbspath, File rightAbspath, File targetAbspath, File copyfromText, String leftLabel, String rightLabel, String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, File resultTarget, File detranslatedTarget, SVNPropertyValue mimeprop, SVNDiffOptions options, ISVNConflictHandler conflictResolver) throws SVNException - Throws:
SVNException
-
setupTextConflictDesc
private SVNConflictDescription setupTextConflictDesc(File leftAbspath, File rightAbspath, File targetAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, File resultTarget, File detranslatedTarget, SVNPropertyValue mimeprop, boolean isBinary) -
setupTreeConflictDesc
private SVNConflictDescription setupTreeConflictDesc(File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNConflictReason localChange, SVNConflictAction incomingChange) -
saveMergeResult
- Throws:
SVNException
-
evalConflictResolverResult
private SVNWCContext.MergeInfo evalConflictResolverResult(SVNConflictChoice choice, File wriAbspath, File leftAbspath, File rightAbspath, File targetAbspath, File copyfromText, File mergedFile, File detranslatedTarget, SVNDiffOptions options) throws SVNException - Throws:
SVNException
-
mergeBinaryFile
private SVNWCContext.MergeInfo mergeBinaryFile(SVNWCContext.MergeInfo info, File leftAbspath, File rightAbspath, File targetAbspath, String leftLabel, String rightLabel, String targetLabel, File detranslatedTargetAbspath, boolean dryRun) throws SVNException - Throws:
SVNException
-
wqBuildFileMove
- Throws:
SVNException
-
wqBuildFileMove
public SVNSkel wqBuildFileMove(File anchorPath, File srcAbspath, File dstAbspath) throws SVNException - Throws:
SVNException
-
wqBuildFileCopyTranslated
public SVNSkel wqBuildFileCopyTranslated(File localAbspath, File srcAbspath, File dstAbspath) throws SVNException - Throws:
SVNException
-
wqBuildFileCopyTranslated
public static SVNSkel wqBuildFileCopyTranslated(SVNWCDb db, File localAbspath, File srcAbspath, File dstAbspath) throws SVNException - Throws:
SVNException
-
wqBuildSetTextConflictMarkersTmp
public SVNSkel wqBuildSetTextConflictMarkersTmp(File localAbspath, File old, File neo, File wrk) throws SVNException - Throws:
SVNException
-
wqBuildBaseRemove
- Throws:
SVNException
-
wqBuildBaseRemove
public SVNSkel wqBuildBaseRemove(File localAbspath, long notPresentRevision, ISVNWCDb.SVNWCDbKind notPresentKind) throws SVNException - Throws:
SVNException
-
wqBuildBaseRemove
public static SVNSkel wqBuildBaseRemove(SVNWCDb db, File localAbspath, long notPresentRevision, ISVNWCDb.SVNWCDbKind notPresentKind) throws SVNException - Throws:
SVNException
-
wqBuildRecordFileinfo
- Throws:
SVNException
-
wqBuildFileInstall
public SVNSkel wqBuildFileInstall(File localAbspath, File sourceAbspath, boolean useCommitTimes, boolean recordFileinfo) throws SVNException - Throws:
SVNException
-
wqBuildFileInstall
public static SVNSkel wqBuildFileInstall(SVNWCDb db, File localAbspath, File sourceAbspath, boolean useCommitTimes, boolean recordFileinfo) throws SVNException - Throws:
SVNException
-
wqBuildSyncFileFlags
- Throws:
SVNException
-
wqBuildSyncFileFlags
- Throws:
SVNException
-
wqBuildFileRemove
- Throws:
SVNException
-
wqBuildFileRemove
public static SVNSkel wqBuildFileRemove(SVNWCDb db, File wriAbspath, File localAbspath) throws SVNException - Throws:
SVNException
-
wqBuildDirInstall
- Throws:
SVNException
-
wqBuildDirInstall
- Throws:
SVNException
-
wqBuildDirRemove
public static SVNSkel wqBuildDirRemove(SVNWCDb db, File wriAbspath, File localAbspath, boolean recursive) throws SVNException - Throws:
SVNException
-
wqBuildPrejInstall
- Throws:
SVNException
-
wqBuildPrejInstall
public static SVNSkel wqBuildPrejInstall(ISVNWCDb db, File localAbspath, SVNSkel conflictSkel) throws SVNException - Throws:
SVNException
-
wqBuildSetPropertyConflictMarkerTemp
public SVNSkel wqBuildSetPropertyConflictMarkerTemp(File localAbspath, File prejFile) throws SVNException - Throws:
SVNException
-
wqBuildPostUpgrade
- Throws:
SVNException
-
wqMerge
- Throws:
SVNException
-
isSingleWorkItem
-
wqRun
- Throws:
SVNException
-
dispatchWorkItem
- Throws:
SVNException
-
removeBaseNode
- Throws:
SVNException
-
getAndRecordFileInfo
- Throws:
SVNException
-
syncFileFlags
- Throws:
SVNException
-
maybeSetReadOnly
- Throws:
SVNException
-
maybeSetExecutable
- Throws:
SVNException
-
createPrejFile
- Throws:
SVNException
-
appendPropConflict
- Throws:
SVNException
-
messageFromSkel
- Throws:
SVNException
-
maybePropValue
- Throws:
SVNException
-
generateConflictMessage
private String generateConflictMessage(String propname, SVNPropertyValue original, SVNPropertyValue mine, SVNPropertyValue incoming, SVNPropertyValue incomingBase) -
resolveConflictOnNode
public boolean resolveConflictOnNode(File localAbsPath, boolean resolveText, boolean resolveProps, SVNConflictChoice conflictChoice) throws SVNException - Throws:
SVNException
-
resolveOneConflict
private void resolveOneConflict(File localAbsPath, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice) throws SVNException - Throws:
SVNException
-
recursiveResolveConflict
private void recursiveResolveConflict(File localAbsPath, SVNDepth depth, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice, ISVNConflictHandler conflictHandler) throws SVNException - Throws:
SVNException
-
resolvedConflict
public void resolvedConflict(File localAbsPath, SVNDepth depth, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice) throws SVNException - Throws:
SVNException
-
attemptDeletion
- Throws:
SVNException
-
checkWC
- Throws:
SVNException
-
checkWC
- Throws:
SVNException
-
initializeWC
public void initializeWC(File localAbspath, SVNURL url, SVNURL repositoryRoot, String uuid, long revision, SVNDepth depth, int targetWorkingCopyFormat) throws SVNException - Throws:
SVNException
-
initWC
private void initWC(File localAbspath, File reposRelpath, SVNURL repositoryRoot, String uuid, long revNumber, SVNDepth depth, int workingCopyFormat) throws SVNException - Throws:
SVNException
-
getActualTarget
- Throws:
SVNException
-
getNodeReposRelPath
- Throws:
SVNException
-
isChangelistMatch
-
isNodeStatusDeleted
- Throws:
SVNException
-
getPropDiffs
- Throws:
SVNException
-
getNodeLock
- Throws:
SVNException
-
getNodeChildren
- Throws:
SVNException
-
getChildrenOfWorkingNode
- Throws:
SVNException
-
getNodeDepth
- Throws:
SVNException
-
wqBuildFileCommit
- Throws:
SVNException
-
getRelativePath
- Throws:
SVNException
-
getRelativePath
- Throws:
SVNException
-
ensureNoUnfinishedTransactions
- Throws:
SVNException
-
canonicalizeURLs
public void canonicalizeURLs(File path, SVNExternalsStore externalsStore, boolean omitDefaultPort) throws SVNException - Throws:
SVNException
-
setSqliteJournalMode
public void setSqliteJournalMode(org.tmatesoft.sqljet.core.internal.SqlJetPagerJournalMode sqliteJournalMode) -
setSqliteTemporaryDbInMemory
public void setSqliteTemporaryDbInMemory(boolean temporaryDbInMemory) -
conflictCreateMarker
- Throws:
SVNException
-
invokeConflictResolver
public void invokeConflictResolver(File localAbsPath, SVNSkel conflictSkel, ISVNConflictHandler conflictHandler, ISVNCanceller canceller) throws SVNException - Throws:
SVNException
-
generatePropConflict
private boolean generatePropConflict(File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, String propName, SVNPropertyValue baseVal, SVNPropertyValue workingVal, SVNPropertyValue incomingOldVal, SVNPropertyValue incomingNewVal, ISVNConflictHandler conflictHandler) throws SVNException - Throws:
SVNException
-
resolveTextConflict
public SVNWCContext.TextConflictResolutionInfo resolveTextConflict(File localAbsPath, SVNOperation operation, File leftAbsPath, File rightAbsPath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, File resultTarget, File detranslatedTarget, ISVNConflictHandler conflictHandler) throws SVNException - Throws:
SVNException
-
evalTextConflictFuncResult
private SVNWCContext.TextConflictResolutionInfo evalTextConflictFuncResult(File localAbsPath, SVNConflictChoice choice, File leftAbsPath, File rightAbsPath, File mergedAbsPath, File detranslatedTarget) throws SVNException - Throws:
SVNException
-
arePropsEqual
private static boolean arePropsEqual(SVNPropertyValue propertyValue1, SVNPropertyValue propertyValue2) -
saveMergeResult
private static SVNSkel saveMergeResult(ISVNWCDb db, File localAbsPath, File sourceAbsPath) throws SVNException - Throws:
SVNException
-
resolveTreeConflictOnNode
private boolean resolveTreeConflictOnNode(File localAbsPath, SVNConflictChoice conflictChoice) throws SVNException - Throws:
SVNException
-
resolveTextConflictOnNode
private boolean resolveTextConflictOnNode(File localAbsPath, SVNConflictChoice conflictChoice, File mergedFile) throws SVNException - Throws:
SVNException
-
resolvePropConflictOnNode
private boolean resolvePropConflictOnNode(File localAbsPath, String conflictedPropName, SVNConflictChoice conflictChoice, File mergedFile) throws SVNException - Throws:
SVNException
-
removeArtifactFileIfExists
private SVNWCContext.RemoveArtifactInfo removeArtifactFileIfExists(File wriAbsPath, File artifactFileAbsPath) throws SVNException - Throws:
SVNException
-
getNodeBase
public ISVNWCDb.WCDbBaseInfo getNodeBase(File localAbsPath, boolean ignoreNonExisting, boolean showHidden) throws SVNException - Throws:
SVNException
-
acquireWriteLockForResolve
- Throws:
SVNException
-
getNodePresence
public SVNWCContext.NodePresence getNodePresence(File localAbsPath, boolean baseOnly) throws SVNException - Throws:
SVNException
-
committableExternalsBelow
public List<SVNWCContext.CommittableExternalInfo> committableExternalsBelow(List<SVNWCContext.CommittableExternalInfo> externals, File localAbsPath, SVNDepth depth) throws SVNException - Throws:
SVNException
-
isExternalRolledOut
-
nodeWasMovedHere
- Throws:
SVNException
-
nodeWasMovedAway
- Throws:
SVNException
-
getNodeDeletedAncestor
- Throws:
SVNException
-
checkForObstructions
public SVNWCContext.ObstructionData checkForObstructions(File localAbsPath, boolean noWcRootCheck) throws SVNException - Throws:
SVNException
-
convertDbKindToNodeKind
private SVNNodeKind convertDbKindToNodeKind(SVNNodeKind dbKind, ISVNWCDb.SVNWCDbStatus dbStatus, boolean showHidden) -
deleteTreeConflict
- Throws:
SVNException
-
addTreeConflict
- Throws:
SVNException
-