Class SvnWcDbConflicts
- java.lang.Object
-
- org.tmatesoft.svn.core.internal.wc17.db.SvnWcDbShared
-
- org.tmatesoft.svn.core.internal.wc17.db.SvnWcDbConflicts
-
public class SvnWcDbConflicts extends SvnWcDbShared
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description static class
SvnWcDbConflicts.ConflictInfo
static class
SvnWcDbConflicts.ConflictKind
static class
SvnWcDbConflicts.ConflictStatus
static class
SvnWcDbConflicts.PropertyConflictInfo
static class
SvnWcDbConflicts.TextConflictInfo
static class
SvnWcDbConflicts.TreeConflictInfo
-
Nested classes/interfaces inherited from class org.tmatesoft.svn.core.internal.wc17.db.SvnWcDbShared
SvnWcDbShared.Target
-
-
Field Summary
Fields Modifier and Type Field Description private static java.lang.String
CONFLICT_OP_MERGE
private static java.lang.String
CONFLICT_OP_SWITCH
private static java.lang.String
CONFLICT_OP_UPDATE
-
Fields inherited from class org.tmatesoft.svn.core.internal.wc17.db.SvnWcDbShared
EMPTY_PROPS_BLOB
-
-
Constructor Summary
Constructors Constructor Description SvnWcDbConflicts()
-
Method Summary
All Methods Static Methods Concrete Methods Modifier and Type Method Description private static void
addPropConflict(SVNSkel skel, java.lang.String propReject)
static void
addPropConflict(SVNSkel skel, java.lang.String propName, SVNPropertyValue originalVal, SVNPropertyValue mineVal, SVNPropertyValue incomingVal, SVNPropertyValue incomingBaseVal)
static void
addPropConflict(SVNSkel skel, ISVNWCDb db, java.io.File wriAbsPath, java.io.File markerAbsPath, SVNProperties mineProps, SVNProperties theirOldProps, SVNProperties theirProps, java.util.Collection<java.lang.String> conflictedPropNames)
private static void
addTextConflict(SVNSkel skel, java.lang.String mineRelPath, java.lang.String theirOldRelPath, java.lang.String theirRelPath)
static void
addTextConflict(SVNSkel skel, ISVNWCDb db, java.io.File wriAbsPath, java.io.File mineAbsPath, java.io.File theirOldAbsPath, java.io.File theirAbsPath)
static void
addTreeConflict(SVNSkel skel, ISVNWCDb db, java.io.File wriAbsPath, SVNConflictReason localChange, SVNConflictAction incomingChange, java.io.File moveSrcOpRootAbsPath)
private static void
addTreeConflict(SVNSkel skel, SVNConflictReason localChange, SVNConflictAction incomingChange)
static void
conflictSkelOpMerge(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target)
static void
conflictSkelOpSwitch(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target)
static void
conflictSkelOpUpdate(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target)
static boolean
conflictSkelResolve(SVNSkel conflictSkel, ISVNWCDb db, java.io.File wriAbsPAth, boolean resolveText, java.lang.String resolveProp, boolean resolveTree)
static java.util.List<SVNWCConflictDescription17>
convertFromSkel(SVNWCDb db, java.io.File localAbsPath, boolean createTempFiles, SVNSkel conflictSkel)
static SVNSkel
convertToConflictSkel(java.io.File wcRootAbsPath, SVNWCDb db, java.lang.String localRelpath, java.lang.String conflictOld, java.lang.String conflictWorking, java.lang.String conflictNew, java.lang.String propReject, byte[] treeConflictData)
static SVNSkel
convertToConflictSkel(java.lang.String conflictOld, java.lang.String conflictWorking, java.lang.String conflictNew, java.lang.String propReject, byte[] treeConflictData)
static SVNSkel
createConflictMarkers(ISVNWCDb db, java.io.File localAbsPath, SVNSkel conflictSkel)
static SVNSkel
createConflictSkel()
static SVNSkel
getConflict(SVNSkel conflictSkel, SvnWcDbConflicts.ConflictKind kind)
private static Structure<SvnWcDbConflicts.ConflictStatus>
getConflictStatus(SVNWCDb db, java.io.File localAbsPath)
static Structure<SvnWcDbConflicts.ConflictStatus>
getConflictStatusForUpdate(SVNWCDb db, java.io.File localAbsPath, boolean treeConflictOnly)
private static SVNSkel
getOperation(SVNSkel conflictSkel)
private static boolean
hasConflictKind(SVNSkel conflictSkel, SvnWcDbConflicts.ConflictKind kind)
static boolean
isConflictSkelComplete(SVNSkel skel)
static void
prependLocation(SVNSkel skel, SVNConflictVersion location)
static void
prependPropValue(SVNPropertyValue fromVal, SVNSkel skel)
static SVNSkel
readConflict(SVNWCDb db, java.io.File localAbspath)
static Structure<SvnWcDbConflicts.ConflictInfo>
readConflictInfo(SVNSkel conflictSkel)
static SVNSkel
readConflictInternal(SVNWCDbRoot wcRoot, java.io.File localRelPath)
private static SVNConflictVersion
readConflictLocation(SVNSkel locationSkel)
static java.util.List<java.io.File>
readConflictMarkers(SVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel)
private static SVNSkel
readConflictOperation(SVNSkel conflictSkel)
static Structure<SvnWcDbConflicts.PropertyConflictInfo>
readPropertyConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel)
static void
readPropertyConflicts(java.util.List<SVNWCConflictDescription17> target, SVNWCDb db, java.io.File localAbsPath, SVNSkel conflictSkel, boolean createTempFiles, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion)
static Structure<SvnWcDbConflicts.TextConflictInfo>
readTextConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel)
static Structure<SvnWcDbConflicts.TreeConflictInfo>
readTreeConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel)
static void
setConflictOperation(SVNSkel skel, SVNOperation operation, SVNConflictVersion original, SVNConflictVersion target)
static SVNSkel
treeConflictDescriptionToSkel(ISVNWCDb db, java.io.File wriAbsPath, SVNTreeConflictDescription conflictDescription)
static SVNSkel
upgradeConflictSkelFromRaw(ISVNWCDb db, java.io.File wriAbsPath, java.io.File localRelPath, java.lang.String conflictOld, java.lang.String conflictWork, java.lang.String conflictNew, java.io.File prejFile, SVNSkel oldTreeConflictData)
-
Methods inherited from class org.tmatesoft.svn.core.internal.wc17.db.SvnWcDbShared
begingReadTransaction, begingWriteTransaction, canonicalizeURLs, collectTargets, commitTransaction, doesNodeExists, getBaseInfo, getBaseInfo, getDepthInfo, getMovedFromInfo, nodeIsNotInstallable, nodeNotFound, nodeNotFound, readInfo, readInfo, rollbackTransaction, scanAddition, scanAddition, scanDeletion, scanDeletion, scanMoved, sqliteError
-
-
-
-
Field Detail
-
CONFLICT_OP_UPDATE
private static final java.lang.String CONFLICT_OP_UPDATE
- See Also:
- Constant Field Values
-
CONFLICT_OP_SWITCH
private static final java.lang.String CONFLICT_OP_SWITCH
- See Also:
- Constant Field Values
-
CONFLICT_OP_MERGE
private static final java.lang.String CONFLICT_OP_MERGE
- See Also:
- Constant Field Values
-
-
Method Detail
-
convertToConflictSkel
public static SVNSkel convertToConflictSkel(java.lang.String conflictOld, java.lang.String conflictWorking, java.lang.String conflictNew, java.lang.String propReject, byte[] treeConflictData) throws SVNException
- Throws:
SVNException
-
convertToConflictSkel
public static SVNSkel convertToConflictSkel(java.io.File wcRootAbsPath, SVNWCDb db, java.lang.String localRelpath, java.lang.String conflictOld, java.lang.String conflictWorking, java.lang.String conflictNew, java.lang.String propReject, byte[] treeConflictData) throws SVNException
- Throws:
SVNException
-
convertFromSkel
public static java.util.List<SVNWCConflictDescription17> convertFromSkel(SVNWCDb db, java.io.File localAbsPath, boolean createTempFiles, SVNSkel conflictSkel) throws SVNException
- Throws:
SVNException
-
createConflictSkel
public static SVNSkel createConflictSkel() throws SVNException
- Throws:
SVNException
-
isConflictSkelComplete
public static boolean isConflictSkelComplete(SVNSkel skel) throws SVNException
- Throws:
SVNException
-
prependLocation
public static void prependLocation(SVNSkel skel, SVNConflictVersion location) throws SVNException
- Throws:
SVNException
-
setConflictOperation
public static void setConflictOperation(SVNSkel skel, SVNOperation operation, SVNConflictVersion original, SVNConflictVersion target) throws SVNException
- Throws:
SVNException
-
addTextConflict
public static void addTextConflict(SVNSkel skel, ISVNWCDb db, java.io.File wriAbsPath, java.io.File mineAbsPath, java.io.File theirOldAbsPath, java.io.File theirAbsPath) throws SVNException
- Throws:
SVNException
-
addPropConflict
public static void addPropConflict(SVNSkel skel, ISVNWCDb db, java.io.File wriAbsPath, java.io.File markerAbsPath, SVNProperties mineProps, SVNProperties theirOldProps, SVNProperties theirProps, java.util.Collection<java.lang.String> conflictedPropNames) throws SVNException
- Throws:
SVNException
-
addTreeConflict
public static void addTreeConflict(SVNSkel skel, ISVNWCDb db, java.io.File wriAbsPath, SVNConflictReason localChange, SVNConflictAction incomingChange, java.io.File moveSrcOpRootAbsPath) throws SVNException
- Throws:
SVNException
-
readConflict
public static SVNSkel readConflict(SVNWCDb db, java.io.File localAbspath) throws SVNException
- Throws:
SVNException
-
readConflictInternal
public static SVNSkel readConflictInternal(SVNWCDbRoot wcRoot, java.io.File localRelPath) throws SVNException
- Throws:
SVNException
-
readConflictInfo
public static Structure<SvnWcDbConflicts.ConflictInfo> readConflictInfo(SVNSkel conflictSkel) throws SVNException
- Throws:
SVNException
-
readPropertyConflicts
public static void readPropertyConflicts(java.util.List<SVNWCConflictDescription17> target, SVNWCDb db, java.io.File localAbsPath, SVNSkel conflictSkel, boolean createTempFiles, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion) throws SVNException
- Throws:
SVNException
-
readPropertyConflict
public static Structure<SvnWcDbConflicts.PropertyConflictInfo> readPropertyConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel) throws SVNException
- Throws:
SVNException
-
readTextConflict
public static Structure<SvnWcDbConflicts.TextConflictInfo> readTextConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel) throws SVNException
- Throws:
SVNException
-
readTreeConflict
public static Structure<SvnWcDbConflicts.TreeConflictInfo> readTreeConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel) throws SVNException
- Throws:
SVNException
-
getConflictStatusForUpdate
public static Structure<SvnWcDbConflicts.ConflictStatus> getConflictStatusForUpdate(SVNWCDb db, java.io.File localAbsPath, boolean treeConflictOnly) throws SVNException
- Throws:
SVNException
-
getConflictStatus
private static Structure<SvnWcDbConflicts.ConflictStatus> getConflictStatus(SVNWCDb db, java.io.File localAbsPath) throws SVNException
- Throws:
SVNException
-
hasConflictKind
private static boolean hasConflictKind(SVNSkel conflictSkel, SvnWcDbConflicts.ConflictKind kind)
-
getConflict
public static SVNSkel getConflict(SVNSkel conflictSkel, SvnWcDbConflicts.ConflictKind kind)
-
readConflictLocation
private static SVNConflictVersion readConflictLocation(SVNSkel locationSkel) throws SVNException
- Throws:
SVNException
-
conflictSkelOpUpdate
public static void conflictSkelOpUpdate(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target) throws SVNException
- Throws:
SVNException
-
conflictSkelOpSwitch
public static void conflictSkelOpSwitch(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target) throws SVNException
- Throws:
SVNException
-
conflictSkelOpMerge
public static void conflictSkelOpMerge(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target) throws SVNException
- Throws:
SVNException
-
createConflictMarkers
public static SVNSkel createConflictMarkers(ISVNWCDb db, java.io.File localAbsPath, SVNSkel conflictSkel) throws SVNException
- Throws:
SVNException
-
getOperation
private static SVNSkel getOperation(SVNSkel conflictSkel) throws SVNException
- Throws:
SVNException
-
addPropConflict
public static void addPropConflict(SVNSkel skel, java.lang.String propName, SVNPropertyValue originalVal, SVNPropertyValue mineVal, SVNPropertyValue incomingVal, SVNPropertyValue incomingBaseVal) throws SVNException
- Throws:
SVNException
-
prependPropValue
public static void prependPropValue(SVNPropertyValue fromVal, SVNSkel skel) throws SVNException
- Throws:
SVNException
-
treeConflictDescriptionToSkel
public static SVNSkel treeConflictDescriptionToSkel(ISVNWCDb db, java.io.File wriAbsPath, SVNTreeConflictDescription conflictDescription) throws SVNException
- Throws:
SVNException
-
conflictSkelResolve
public static boolean conflictSkelResolve(SVNSkel conflictSkel, ISVNWCDb db, java.io.File wriAbsPAth, boolean resolveText, java.lang.String resolveProp, boolean resolveTree) throws SVNException
- Throws:
SVNException
-
readConflictMarkers
public static java.util.List<java.io.File> readConflictMarkers(SVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel) throws SVNException
- Throws:
SVNException
-
upgradeConflictSkelFromRaw
public static SVNSkel upgradeConflictSkelFromRaw(ISVNWCDb db, java.io.File wriAbsPath, java.io.File localRelPath, java.lang.String conflictOld, java.lang.String conflictWork, java.lang.String conflictNew, java.io.File prejFile, SVNSkel oldTreeConflictData) throws SVNException
- Throws:
SVNException
-
addTextConflict
private static void addTextConflict(SVNSkel skel, java.lang.String mineRelPath, java.lang.String theirOldRelPath, java.lang.String theirRelPath) throws SVNException
- Throws:
SVNException
-
addPropConflict
private static void addPropConflict(SVNSkel skel, java.lang.String propReject) throws SVNException
- Throws:
SVNException
-
addTreeConflict
private static void addTreeConflict(SVNSkel skel, SVNConflictReason localChange, SVNConflictAction incomingChange) throws SVNException
- Throws:
SVNException
-
-