getDiffCallback().fileAdded(commitPath, null, reposFile, 0, myTargetRevision, null, reposMimeType, null, myCurrentFile.myPropertyDiff); } else { getDiffCallback().fileDeleted(commitPath, reposFile, null, reposMimeType, null, reposProperties);
public void deleteEntry(String path, long revision) throws SVNException { File fullPath = new File(myAdminInfo.getAnchor().getRoot(), path); SVNAdminArea dir = myWCAccess.probeRetrieve(fullPath); SVNEntry entry = myWCAccess.getEntry(fullPath, false); if (entry == null) { return; } String name = SVNPathUtil.tail(path); myCurrentDirectory.myComparedEntries.add(name); if (!myIsCompareToBase && entry.isScheduledForDeletion()) { return; } if (entry.isFile()) { if (myIsReverseDiff) { File baseFile = dir.getBaseFile(name, false); SVNProperties baseProps = dir.getBaseProperties(name).asMap(); getDiffCallback().fileDeleted(path, baseFile, null, null, null, baseProps, null); } else { reportAddedFile(myCurrentDirectory, path, entry); } } else if (entry.isDirectory()) { SVNDirectoryInfo info = createDirInfo(myCurrentDirectory, path, false, SVNDepth.INFINITY); reportAddedDir(info); } }
public void deleteEntry(String path, long revision) throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; SVNNodeKind nodeKind = myRepos.checkPath(path, myRevision1); SVNAdminArea dir = retrieve(myCurrentDirectory.myWCFile, true); if (myAdminInfo == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { SVNFileInfo file = new SVNFileInfo(path, false); file.loadFromRepository(); String baseType = (String) file.myBaseProperties.get(SVNProperty.MIME_TYPE); type = getDiffCallback().fileDeleted(path, file.myBaseFile, null, baseType, null, file.myBaseProperties); } else if (nodeKind == SVNNodeKind.DIR) { type = getDiffCallback().directoryDeleted(path); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(path); } } } if (myEventHandler != null) { SVNEvent event = SVNEventFactory.createMergeEvent(myAdminInfo, path, action, expectedAction, type, type, nodeKind); myEventHandler.handleEvent(event, ISVNEventHandler.UNKNOWN); } }
public void deleteEntry(String path, long revision) throws SVNException { File fullPath = new File(myAdminInfo.getAnchor().getRoot(), path); SVNAdminArea dir = myWCAccess.probeRetrieve(fullPath); SVNEntry entry = myWCAccess.getEntry(fullPath, false); if (entry == null) { return; } String name = SVNPathUtil.tail(path); myCurrentDirectory.myComparedEntries.add(name); if (!myIsCompareToBase && entry.isScheduledForDeletion()) { return; } if (entry.isFile()) { if (myIsReverseDiff) { File baseFile = dir.getBaseFile(name, false); SVNProperties baseProps = dir.getBaseProperties(name).asMap(); getDiffCallback().fileDeleted(path, baseFile, null, null, null, baseProps, null); } else { reportAddedFile(myCurrentDirectory, path, entry); } } else if (entry.isDirectory()) { SVNDirectoryInfo info = createDirInfo(myCurrentDirectory, path, false, SVNDepth.INFINITY); reportAddedDir(info); } }
public void deleteEntry(String path, long revision) throws SVNException { File fullPath = new File(myAdminInfo.getAnchor().getRoot(), path); SVNAdminArea dir = myWCAccess.probeRetrieve(fullPath); SVNEntry entry = myWCAccess.getEntry(fullPath, false); if (entry == null) { return; } String name = SVNPathUtil.tail(path); myCurrentDirectory.myComparedEntries.add(name); if (!myIsCompareToBase && entry.isScheduledForDeletion()) { return; } if (entry.isFile()) { if (myIsReverseDiff) { File baseFile = dir.getBaseFile(name, false); Map baseProps = dir.getBaseProperties(name).asMap(); getDiffCallback().fileDeleted(path, baseFile, null, null, null, baseProps); } else { reportAddedFile(myCurrentDirectory, path, entry); } } else if (entry.isDirectory()) { SVNDirectoryInfo info = createDirInfo(myCurrentDirectory, path, false); reportAddedDir(info); } }
public void deleteEntry(String path, long revision) throws SVNException { File fullPath = new File(myAdminInfo.getAnchor().getRoot(), path); SVNAdminArea dir = myWCAccess.probeRetrieve(fullPath); SVNEntry entry = myWCAccess.getEntry(fullPath, false); if (entry == null) { return; } String name = SVNPathUtil.tail(path); myCurrentDirectory.myComparedEntries.add(name); if (!myIsCompareToBase && entry.isScheduledForDeletion()) { return; } if (entry.isFile()) { if (myIsReverseDiff) { File baseFile = dir.getBaseFile(name, false); SVNProperties baseProps = dir.getBaseProperties(name).asMap(); getDiffCallback().fileDeleted(path, baseFile, null, null, null, baseProps, null); } else { reportAddedFile(myCurrentDirectory, path, entry); } } else if (entry.isDirectory()) { SVNDirectoryInfo info = createDirInfo(myCurrentDirectory, path, false, SVNDepth.INFINITY); reportAddedDir(info); } }
protected void deleteEntry(String path, SVNNodeKind nodeKind, SVNAdminArea dir) throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; boolean[] isTreeConflicted = { false }; if (myAdminArea == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { SVNFileInfo file = new SVNFileInfo(path, false); file.loadFromRepository(myRevision1); String baseType = file.myBaseProperties.getStringValue(SVNProperty.MIME_TYPE); type = getDiffCallback().fileDeleted(path, file.myBaseFile, null, baseType, null, file.myBaseProperties, isTreeConflicted); } else if (nodeKind == SVNNodeKind.DIR) { type = getDiffCallback().directoryDeleted(path, isTreeConflicted); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED && !isTreeConflicted[0]) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(path); } } } action = isTreeConflicted[0] ? SVNEventAction.TREE_CONFLICT : action; addDeletedPath(path, nodeKind, type, action, expectedAction, isTreeConflicted[0]); }
protected void deleteEntry(String path, SVNNodeKind nodeKind, SVNAdminArea dir) throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; boolean[] isTreeConflicted = { false }; if (myAdminArea == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { SVNFileInfo file = new SVNFileInfo(path, false); file.loadFromRepository(myRevision1); String baseType = file.myBaseProperties.getStringValue(SVNProperty.MIME_TYPE); type = getDiffCallback().fileDeleted(path, file.myBaseFile, null, baseType, null, file.myBaseProperties, isTreeConflicted); } else if (nodeKind == SVNNodeKind.DIR) { type = getDiffCallback().directoryDeleted(path, isTreeConflicted); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED && !isTreeConflicted[0]) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(path); } } } action = isTreeConflicted[0] ? SVNEventAction.TREE_CONFLICT : action; addDeletedPath(path, nodeKind, type, action, expectedAction, isTreeConflicted[0]); }
protected void deleteEntry(String path, SVNNodeKind nodeKind, SVNAdminArea dir) throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; boolean[] isTreeConflicted = { false }; if (myAdminArea == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { SVNFileInfo file = new SVNFileInfo(path, false); file.loadFromRepository(myRevision1); String baseType = file.myBaseProperties.getStringValue(SVNProperty.MIME_TYPE); type = getDiffCallback().fileDeleted(path, file.myBaseFile, null, baseType, null, file.myBaseProperties, isTreeConflicted); } else if (nodeKind == SVNNodeKind.DIR) { type = getDiffCallback().directoryDeleted(path, isTreeConflicted); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED && !isTreeConflicted[0]) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(path); } } } action = isTreeConflicted[0] ? SVNEventAction.TREE_CONFLICT : action; addDeletedPath(path, nodeKind, type, action, expectedAction, isTreeConflicted[0]); }
File baseFile = dir.getBaseFile(file.getName(), false); SVNDebugLog.getDefaultLog().logFine(SVNLogType.WC, "merge ext: del " + path); type = getDiffCallback().fileDeleted(path, baseFile, null, baseType, null, baseProperties.asMap(), null); } else if (nodeKind == SVNNodeKind.DIR) { SVNDebugLog.getDefaultLog().logFine(SVNLogType.WC, "merge ext: attempt to delete directory " + path + " skipped");
protected void delete() throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; SVNFileInfoExt fileInfo = (SVNFileInfoExt) myCurrentFile; final SVNNodeKind nodeKind = fileInfo.getNodeKind(); SVNAdminArea dir = retrieveParent(myWCFile, true); if (myAdminArea == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { fileInfo.loadFromRepository(myRevision1); String baseType = fileInfo.myBaseProperties.getStringValue(SVNProperty.MIME_TYPE); SVNDebugLog.getDefaultLog().logFine(SVNLogType.WC, "merge ext: del " + myPath); type = getDiffCallback().fileDeleted(myPath, fileInfo.myBaseFile, null, baseType, null, fileInfo.myBaseProperties, null); } else if (nodeKind == SVNNodeKind.DIR) { SVNDebugLog.getDefaultLog().logFine(SVNLogType.WC, "merge ext: attempt to delete directory skipped"); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(myPath); } } } addDeletedPath(myPath, nodeKind, type, action, expectedAction); }
SVNStatusType cstatus = callback.fileDeleted(targetName, f1, f2, mimeType1, mimeType2, props1, isTreeConflict); headerSent = notifySingleFileMerge(targetWCPath, isTreeConflict[0] ? SVNEventAction.TREE_CONFLICT :
if (schedule != null && (entry.isScheduledForDeletion() || entry.isScheduledForReplacement())) { String mimeType = dir.getBaseProperties(fileName).getPropertyValue(SVNProperty.MIME_TYPE); getDiffCallback().fileDeleted(filePath, baseFile, null, mimeType, null, dir.getBaseProperties(fileName).asMap()); isAdded = entry.isScheduledForReplacement();
SVNStatusType cstatus = callback.fileDeleted(targetName, f1, f2, mimeType1, mimeType2, props1, isTreeConflict); headerSent = notifySingleFileMerge(targetWCPath, isTreeConflict[0] ? SVNEventAction.TREE_CONFLICT :
myCurrentFile.myPropertyDiff, null); } else { getDiffCallback().fileDeleted(commitPath, reposFile, null, reposMimeType, null, reposProperties, null);
myCurrentFile.myPropertyDiff, null); } else { getDiffCallback().fileDeleted(commitPath, reposFile, null, reposMimeType, null, reposProperties, null);
myCurrentFile.myPropertyDiff, null); } else { getDiffCallback().fileDeleted(commitPath, reposFile, null, reposMimeType, null, reposProperties, null);
if (schedule != null && (entry.isScheduledForDeletion() || entry.isScheduledForReplacement())) { String mimeType = dir.getBaseProperties(fileName).getStringPropertyValue(SVNProperty.MIME_TYPE); getDiffCallback().fileDeleted(filePath, baseFile, null, mimeType, null, dir.getBaseProperties(fileName).asMap(), null); isAdded = entry.isScheduledForReplacement();
if (schedule != null && (entry.isScheduledForDeletion() || entry.isScheduledForReplacement())) { String mimeType = dir.getBaseProperties(fileName).getStringPropertyValue(SVNProperty.MIME_TYPE); getDiffCallback().fileDeleted(filePath, baseFile, null, mimeType, null, dir.getBaseProperties(fileName).asMap(), null); isAdded = entry.isScheduledForReplacement();
if (schedule != null && (entry.isScheduledForDeletion() || entry.isScheduledForReplacement())) { String mimeType = dir.getBaseProperties(fileName).getStringPropertyValue(SVNProperty.MIME_TYPE); getDiffCallback().fileDeleted(filePath, baseFile, null, mimeType, null, dir.getBaseProperties(fileName).asMap(), null); isAdded = entry.isScheduledForReplacement();