public void setTreeConflicts(Map treeConflicts) throws SVNException { String conflictData = SVNTreeConflictUtil.getTreeConflictData(treeConflicts); setTreeConflictData(conflictData); }
public void setTreeConflicts(Map treeConflicts) throws SVNException { String conflictData = SVNTreeConflictUtil.getTreeConflictData(treeConflicts); setTreeConflictData(conflictData); }
public void setTreeConflicts(Map treeConflicts) throws SVNException { String conflictData = SVNTreeConflictUtil.getTreeConflictData(treeConflicts); setTreeConflictData(conflictData); }
public SVNTreeConflictDescription deleteTreeConflict(String victimName) throws SVNException { SVNEntry dirEntry = getEntry(getThisDirName(), false); Map conflicts = dirEntry.getTreeConflicts(); File victimPath = getFile(victimName); if (conflicts.containsKey(victimPath)) { SVNTreeConflictDescription conflict = (SVNTreeConflictDescription) conflicts.remove(victimPath); String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); Map attributes = new SVNHashMap(); attributes.put(SVNProperty.TREE_CONFLICT_DATA, conflictData); modifyEntry(getThisDirName(), attributes, true, false); return conflict; } return null; }
public SVNTreeConflictDescription deleteTreeConflict(String victimName) throws SVNException { SVNEntry dirEntry = getEntry(getThisDirName(), false); Map conflicts = dirEntry.getTreeConflicts(); File victimPath = getFile(victimName); if (conflicts.containsKey(victimPath)) { SVNTreeConflictDescription conflict = (SVNTreeConflictDescription) conflicts.remove(victimPath); String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); Map attributes = new SVNHashMap(); attributes.put(SVNProperty.TREE_CONFLICT_DATA, conflictData); modifyEntry(getThisDirName(), attributes, true, false); return conflict; } return null; }
public SVNTreeConflictDescription deleteTreeConflict(String victimName) throws SVNException { SVNEntry dirEntry = getEntry(getThisDirName(), false); Map conflicts = dirEntry.getTreeConflicts(); File victimPath = getFile(victimName); if (conflicts.containsKey(victimPath)) { SVNTreeConflictDescription conflict = (SVNTreeConflictDescription) conflicts.remove(victimPath); String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); Map attributes = new SVNHashMap(); attributes.put(SVNProperty.TREE_CONFLICT_DATA, conflictData); modifyEntry(getThisDirName(), attributes, true, false); return conflict; } return null; }
private SVNProperties getTreeConflictCreationAttributes(SVNAdminArea adminArea, SVNTreeConflictDescription treeConflict) throws SVNException { Map conflicts = new SVNHashMap(); conflicts.put(treeConflict.getPath(), treeConflict); String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); SVNProperties command = new SVNProperties(); command.put(SVNLog.NAME_ATTR, adminArea.getThisDirName()); command.put(SVNLog.DATA_ATTR, conflictData); return command; }
private void saveTreeConflicts(SVNAdminArea adminArea) throws SVNException { Map attributes = new SVNHashMap(); String conflictData = SVNTreeConflictUtil.getTreeConflictData(getTreeConflicts()); attributes.put(SVNProperty.TREE_CONFLICT_DATA, conflictData); try { adminArea.modifyEntry(adminArea.getThisDirName(), attributes, false, false); } catch (SVNException e) { SVNErrorCode errorCode = myLogCount <= 1 ? SVNErrorCode.WC_BAD_ADM_LOG_START : SVNErrorCode.WC_BAD_ADM_LOG; SVNErrorMessage error = SVNErrorMessage.create(errorCode, "Error recording tree conflicts in ''{0}''", adminArea.getRoot()); SVNErrorManager.error(error, e, SVNLogType.WC); } myIsEntriesChanged = true; }
private void saveTreeConflicts(SVNAdminArea adminArea) throws SVNException { Map attributes = new SVNHashMap(); String conflictData = SVNTreeConflictUtil.getTreeConflictData(getTreeConflicts()); attributes.put(SVNProperty.TREE_CONFLICT_DATA, conflictData); try { adminArea.modifyEntry(adminArea.getThisDirName(), attributes, false, false); } catch (SVNException e) { SVNErrorCode errorCode = myLogCount <= 1 ? SVNErrorCode.WC_BAD_ADM_LOG_START : SVNErrorCode.WC_BAD_ADM_LOG; SVNErrorMessage error = SVNErrorMessage.create(errorCode, "Error recording tree conflicts in ''{0}''", adminArea.getRoot()); SVNErrorManager.error(error, e, SVNLogType.WC); } myIsEntriesChanged = true; }
private void saveTreeConflicts(SVNAdminArea adminArea) throws SVNException { Map attributes = new SVNHashMap(); String conflictData = SVNTreeConflictUtil.getTreeConflictData(getTreeConflicts()); attributes.put(SVNProperty.TREE_CONFLICT_DATA, conflictData); try { adminArea.modifyEntry(adminArea.getThisDirName(), attributes, false, false); } catch (SVNException e) { SVNErrorCode errorCode = myLogCount <= 1 ? SVNErrorCode.WC_BAD_ADM_LOG_START : SVNErrorCode.WC_BAD_ADM_LOG; SVNErrorMessage error = SVNErrorMessage.create(errorCode, "Error recording tree conflicts in ''{0}''", adminArea.getRoot()); SVNErrorManager.error(error, e, SVNLogType.WC); } myIsEntriesChanged = true; }
public void addTreeConflict(SVNTreeConflictDescription conflict) throws SVNException { SVNTreeConflictDescription existingDescription = getTreeConflict(conflict.getPath().getName()); if (existingDescription != null) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_CORRUPT, "Attempt to add tree conflict that already exists at ''{0}''", conflict.getPath()); SVNErrorManager.error(error, SVNLogType.WC); } Map conflicts = new SVNHashMap(); conflicts.put(conflict.getPath(), conflict); String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); SVNProperties command = new SVNProperties(); command.put(SVNLog.NAME_ATTR, getThisDirName()); command.put(SVNLog.DATA_ATTR, conflictData); SVNLog log = getLog(); log.addCommand(SVNLog.ADD_TREE_CONFLICT, command, false); log.save(); runLogs(); }
public void addTreeConflict(SVNTreeConflictDescription conflict) throws SVNException { SVNTreeConflictDescription existingDescription = getTreeConflict(conflict.getPath().getName()); if (existingDescription != null) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_CORRUPT, "Attempt to add tree conflict that already exists at ''{0}''", conflict.getPath()); SVNErrorManager.error(error, SVNLogType.WC); } Map conflicts = new SVNHashMap(); conflicts.put(conflict.getPath(), conflict); String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); SVNProperties command = new SVNProperties(); command.put(SVNLog.NAME_ATTR, getThisDirName()); command.put(SVNLog.DATA_ATTR, conflictData); SVNLog log = getLog(); log.addCommand(SVNLog.ADD_TREE_CONFLICT, command, false); log.save(); runLogs(); }
public void addTreeConflict(SVNTreeConflictDescription conflict) throws SVNException { SVNTreeConflictDescription existingDescription = getTreeConflict(conflict.getPath().getName()); if (existingDescription != null) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_CORRUPT, "Attempt to add tree conflict that already exists at ''{0}''", conflict.getPath()); SVNErrorManager.error(error, SVNLogType.WC); } Map conflicts = new SVNHashMap(); conflicts.put(conflict.getPath(), conflict); String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); SVNProperties command = new SVNProperties(); command.put(SVNLog.NAME_ATTR, getThisDirName()); command.put(SVNLog.DATA_ATTR, conflictData); SVNLog log = getLog(); log.addCommand(SVNLog.ADD_TREE_CONFLICT, command, false); log.save(); runLogs(); }
String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); SVNProperties command = new SVNProperties(); command.put(SVNLog.NAME_ATTR, parentArea.getThisDirName());
String conflictData = SVNTreeConflictUtil.getTreeConflictData(conflicts); SVNProperties command = new SVNProperties(); command.put(SVNLog.NAME_ATTR, parentArea.getThisDirName());