public static Map readTreeConflicts(File dirPath, byte[] conflictData) throws SVNException { Map conflicts = new SVNHashMap(); if (conflictData == null) { return conflicts; } SVNSkel skel = SVNSkel.parse(conflictData); if (skel == null || skel.isAtom()) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_CORRUPT, "Error parsing tree conflict skel"); SVNErrorManager.error(error, SVNLogType.WC); } for (Iterator iterator = skel.getList().iterator(); iterator.hasNext();) { SVNSkel conflictSkel = (SVNSkel) iterator.next(); SVNTreeConflictDescription conflict = readSingleTreeConflict(conflictSkel, dirPath); if (conflict != null) { conflicts.put(conflict.getPath(), conflict); } } return conflicts; }
public static Map readTreeConflicts(File dirPath, byte[] conflictData) throws SVNException { Map conflicts = new SVNHashMap(); if (conflictData == null) { return conflicts; } SVNSkel skel = SVNSkel.parse(conflictData); if (skel == null || skel.isAtom()) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_CORRUPT, "Error parsing tree conflict skel"); SVNErrorManager.error(error, SVNLogType.WC); } for (Iterator iterator = skel.getList().iterator(); iterator.hasNext();) { SVNSkel conflictSkel = (SVNSkel) iterator.next(); SVNTreeConflictDescription conflict = readSingleTreeConflict(conflictSkel, dirPath); if (conflict != null) { conflicts.put(conflict.getPath(), conflict); } } return conflicts; }
public static Map readTreeConflicts(File dirPath, byte[] conflictData) throws SVNException { Map conflicts = new SVNHashMap(); if (conflictData == null) { return conflicts; } SVNSkel skel = SVNSkel.parse(conflictData); if (skel == null || skel.isAtom()) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_CORRUPT, "Error parsing tree conflict skel"); SVNErrorManager.error(error, SVNLogType.WC); } for (Iterator iterator = skel.getList().iterator(); iterator.hasNext();) { SVNSkel conflictSkel = (SVNSkel) iterator.next(); SVNTreeConflictDescription conflict = readSingleTreeConflict(conflictSkel, dirPath); if (conflict != null) { conflicts.put(conflict.getPath(), conflict); } } return conflicts; }
private Map<String, SVNTreeConflictDescription> readAllTreeConflicts17(SVNWCDbDir pdh, File localRelpath) throws SVNException { Map<String, SVNTreeConflictDescription> treeConflicts = new HashMap<String, SVNTreeConflictDescription>(); SVNSqlJetStatement stmt = pdh.getWCRoot().getSDb().getStatement(SVNWCDbStatements.SELECT_ACTUAL_CHILDREN_CONFLICT_17); try { stmt.bindf("is", pdh.getWCRoot().getWcId(), localRelpath); boolean haveRow = stmt.next(); while (haveRow) { final File childRelpath = SVNFileUtil.createFilePath(stmt.getColumnString(SVNWCDbSchema.ACTUAL_NODE__Fields.local_relpath)); final String childBaseName = SVNFileUtil.getFileName(childRelpath); final byte[] conflictData = stmt.getColumnBlob(ACTUAL_NODE__Fields.tree_conflict_data); final SVNSkel skel = SVNSkel.parse(conflictData); SVNTreeConflictDescription treeConflictDescription = SVNTreeConflictUtil.readSingleTreeConflict(skel, SVNFileUtil.createFilePath(pdh.getWCRoot().getAbsPath(), localRelpath)); treeConflicts.put(childBaseName, treeConflictDescription); haveRow = stmt.next(); } } finally { stmt.reset(); } return treeConflicts; }
final SVNTreeConflictDescription tcDesc = SVNTreeConflictUtil.readSingleTreeConflict(tcSkel, localAbsPath);
final SVNTreeConflictDescription tcDesc = SVNTreeConflictUtil.readSingleTreeConflict(tcSkel, localAbsPath);
public static SVNSkel convertToConflictSkel(String conflictOld, String conflictWorking, String conflictNew, String propReject, byte[] treeConflictData) throws SVNException { SVNSkel conflictData = null; if (conflictOld != null || conflictNew != null || conflictWorking != null) { conflictData = createConflictSkel(); addTextConflict(conflictData, conflictWorking, conflictOld, conflictNew); } if (propReject != null) { if (conflictData == null) { conflictData = createConflictSkel(); } addPropConflict(conflictData, propReject); } if (treeConflictData != null) { if (conflictData == null) { conflictData = createConflictSkel(); } final SVNSkel tcSkel = SVNSkel.parse(treeConflictData); final File fakePath = SVNFileUtil.createFilePath(""); final SVNTreeConflictDescription tcDesc = SVNTreeConflictUtil.readSingleTreeConflict(tcSkel, fakePath); addTreeConflict(conflictData, tcDesc.getConflictReason(), tcDesc.getConflictAction()); if (tcDesc.getOperation() != null && tcDesc.getOperation() != SVNOperation.NONE) { setConflictOperation(conflictData, tcDesc.getOperation(), tcDesc.getSourceLeftVersion(), tcDesc.getSourceRightVersion()); } } else if (conflictData != null) { setConflictOperation(conflictData, SVNOperation.UPDATE, null, null); } return conflictData; }
SVNTreeConflictDescription treeConflictDescription = SVNTreeConflictUtil.readSingleTreeConflict(oldTreeConflictData, SVNFileUtil.getFileDir(localAbsPath)); addTreeConflict(conflictData, db, wriAbsPath, treeConflictDescription.getConflictReason(), treeConflictDescription.getConflictAction(), null);