public class SvnWcDbConflicts extends SvnWcDbShared
Modifier and Type | Class and 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 |
SvnWcDbShared.Target
EMPTY_PROPS_BLOB
Constructor and Description |
---|
SvnWcDbConflicts() |
Modifier and Type | Method and Description |
---|---|
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) |
static void |
addPropConflict(SVNSkel skel,
java.lang.String propName,
SVNPropertyValue originalVal,
SVNPropertyValue mineVal,
SVNPropertyValue incomingVal,
SVNPropertyValue incomingBaseVal) |
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) |
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) |
static Structure<SvnWcDbConflicts.ConflictStatus> |
getConflictStatusForUpdate(SVNWCDb db,
java.io.File localAbsPath,
boolean treeConflictOnly) |
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) |
static java.util.List<java.io.File> |
readConflictMarkers(SVNWCDb db,
java.io.File wriAbsPath,
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) |
begingReadTransaction, begingWriteTransaction, canonicalizeURLs, collectTargets, commitTransaction, doesNodeExists, getBaseInfo, getBaseInfo, getDepthInfo, getMovedFromInfo, nodeIsNotInstallable, nodeNotFound, nodeNotFound, readInfo, readInfo, rollbackTransaction, scanAddition, scanAddition, scanDeletion, scanDeletion, scanMoved, sqliteError
public static SVNSkel convertToConflictSkel(java.lang.String conflictOld, java.lang.String conflictWorking, java.lang.String conflictNew, java.lang.String propReject, byte[] treeConflictData) throws SVNException
SVNException
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
SVNException
public static java.util.List<SVNWCConflictDescription17> convertFromSkel(SVNWCDb db, java.io.File localAbsPath, boolean createTempFiles, SVNSkel conflictSkel) throws SVNException
SVNException
public static SVNSkel createConflictSkel() throws SVNException
SVNException
public static boolean isConflictSkelComplete(SVNSkel skel) throws SVNException
SVNException
public static void prependLocation(SVNSkel skel, SVNConflictVersion location) throws SVNException
SVNException
public static void setConflictOperation(SVNSkel skel, SVNOperation operation, SVNConflictVersion original, SVNConflictVersion target) throws SVNException
SVNException
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
SVNException
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
SVNException
public static void addTreeConflict(SVNSkel skel, ISVNWCDb db, java.io.File wriAbsPath, SVNConflictReason localChange, SVNConflictAction incomingChange, java.io.File moveSrcOpRootAbsPath) throws SVNException
SVNException
public static SVNSkel readConflict(SVNWCDb db, java.io.File localAbspath) throws SVNException
SVNException
public static SVNSkel readConflictInternal(SVNWCDbRoot wcRoot, java.io.File localRelPath) throws SVNException
SVNException
public static Structure<SvnWcDbConflicts.ConflictInfo> readConflictInfo(SVNSkel conflictSkel) throws SVNException
SVNException
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
SVNException
public static Structure<SvnWcDbConflicts.PropertyConflictInfo> readPropertyConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel) throws SVNException
SVNException
public static Structure<SvnWcDbConflicts.TextConflictInfo> readTextConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel) throws SVNException
SVNException
public static Structure<SvnWcDbConflicts.TreeConflictInfo> readTreeConflict(ISVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel) throws SVNException
SVNException
public static Structure<SvnWcDbConflicts.ConflictStatus> getConflictStatusForUpdate(SVNWCDb db, java.io.File localAbsPath, boolean treeConflictOnly) throws SVNException
SVNException
public static SVNSkel getConflict(SVNSkel conflictSkel, SvnWcDbConflicts.ConflictKind kind)
public static void conflictSkelOpUpdate(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target) throws SVNException
SVNException
public static void conflictSkelOpSwitch(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target) throws SVNException
SVNException
public static void conflictSkelOpMerge(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target) throws SVNException
SVNException
public static SVNSkel createConflictMarkers(ISVNWCDb db, java.io.File localAbsPath, SVNSkel conflictSkel) throws SVNException
SVNException
public static void addPropConflict(SVNSkel skel, java.lang.String propName, SVNPropertyValue originalVal, SVNPropertyValue mineVal, SVNPropertyValue incomingVal, SVNPropertyValue incomingBaseVal) throws SVNException
SVNException
public static void prependPropValue(SVNPropertyValue fromVal, SVNSkel skel) throws SVNException
SVNException
public static SVNSkel treeConflictDescriptionToSkel(ISVNWCDb db, java.io.File wriAbsPath, SVNTreeConflictDescription conflictDescription) throws SVNException
SVNException
public static boolean conflictSkelResolve(SVNSkel conflictSkel, ISVNWCDb db, java.io.File wriAbsPAth, boolean resolveText, java.lang.String resolveProp, boolean resolveTree) throws SVNException
SVNException
public static java.util.List<java.io.File> readConflictMarkers(SVNWCDb db, java.io.File wriAbsPath, SVNSkel conflictSkel) throws SVNException
SVNException
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
SVNException
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.