if (SVNRevision.isValidRevisionNumber(node.myCopyFromRevision) && node.myCopyFromPath != null) { basePath = node.myCopyFromPath; generator.displayHeader(ISVNGNUDiffGenerator.COPIED, path, basePath, node.myCopyFromRevision, os); baseRoot = myFSFS.createRevisionRoot(node.myCopyFromRevision); isCopy = true; originalFile = prepareTmpFile(baseRoot, basePath, generator); newFile = prepareTmpFile(root, path, generator); } else if (generator.isDiffCopied() && node.myAction == SVNChangeEntry.TYPE_ADDED && isCopy) { if (node.myHasTextModifications) { doDiff = true; } else if (generator.isDiffAdded() && node.myAction == SVNChangeEntry.TYPE_ADDED) { doDiff = true; isOriginalEmpty = true; originalFile = prepareTmpFile(null, basePath, generator); newFile = prepareTmpFile(root, path, generator); } else if (generator.isDiffDeleted() && node.myAction == SVNChangeEntry.TYPE_DELETED) { doDiff = true; originalFile = prepareTmpFile(null, basePath, generator); generator.displayHeader(ISVNGNUDiffGenerator.ADDED, path, null, -1, os); } else if (node.myAction == SVNChangeEntry.TYPE_DELETED) { generator.displayHeader(ISVNGNUDiffGenerator.DELETED, path, null, -1, os); } else if (node.myAction == TYPE_REPLACED) { generator.displayHeader(ISVNGNUDiffGenerator.MODIFIED, path, null, -1, os); generator.displayFileDiff(path, originalFile.myTmpFile, newFile.myTmpFile, rev1, rev2, originalFile.myMimeType, newFile.myMimeType, os); boolean hasDiff = defaultGenerator != null ? defaultGenerator.isDiffWritten() : true;
generator.setDiffAdded(diffAdded); generator.setDiffCopied(diffCopyFrom); generator.setDiffDeleted(diffDeleted); editor.diff(root, baseRevision, generator, os); } finally {
if (SVNRevision.isValidRevisionNumber(node.myCopyFromRevision) && node.myCopyFromPath != null) { basePath = node.myCopyFromPath; generator.displayHeader(ISVNGNUDiffGenerator.COPIED, path, basePath, node.myCopyFromRevision, os); baseRoot = myFSFS.createRevisionRoot(node.myCopyFromRevision); isCopy = true; originalFile = prepareTmpFile(baseRoot, basePath, generator); newFile = prepareTmpFile(root, path, generator); } else if (generator.isDiffCopied() && node.myAction == SVNChangeEntry.TYPE_ADDED && isCopy) { if (node.myHasTextModifications) { doDiff = true; } else if (generator.isDiffAdded() && node.myAction == SVNChangeEntry.TYPE_ADDED) { doDiff = true; isOriginalEmpty = true; originalFile = prepareTmpFile(null, basePath, generator); newFile = prepareTmpFile(root, path, generator); } else if (generator.isDiffDeleted() && node.myAction == SVNChangeEntry.TYPE_DELETED) { doDiff = true; originalFile = prepareTmpFile(null, basePath, generator); generator.displayHeader(ISVNGNUDiffGenerator.ADDED, path, null, -1, os); } else if (node.myAction == SVNChangeEntry.TYPE_DELETED) { generator.displayHeader(ISVNGNUDiffGenerator.DELETED, path, null, -1, os); } else if (node.myAction == TYPE_REPLACED) { generator.displayHeader(ISVNGNUDiffGenerator.MODIFIED, path, null, -1, os); generator.displayFileDiff(path, originalFile.myTmpFile, newFile.myTmpFile, rev1, rev2, originalFile.myMimeType, newFile.myMimeType, os); boolean hasDiff = defaultGenerator != null ? defaultGenerator.isDiffWritten() : true;
generator.setDiffAdded(diffAdded); generator.setDiffCopied(diffCopyFrom); generator.setDiffDeleted(diffDeleted); editor.diff(root, baseRevision, generator, os); } finally {
if (SVNRevision.isValidRevisionNumber(node.myCopyFromRevision) && node.myCopyFromPath != null) { basePath = node.myCopyFromPath; generator.displayHeader(ISVNGNUDiffGenerator.COPIED, path, basePath, node.myCopyFromRevision, os); baseRoot = myFSFS.createRevisionRoot(node.myCopyFromRevision); isCopy = true; originalFile = prepareTmpFile(baseRoot, basePath, generator); newFile = prepareTmpFile(root, path, generator); } else if (generator.isDiffCopied() && node.myAction == SVNChangeEntry.TYPE_ADDED && isCopy) { if (node.myHasTextModifications) { doDiff = true; } else if (generator.isDiffAdded() && node.myAction == SVNChangeEntry.TYPE_ADDED) { doDiff = true; isOriginalEmpty = true; originalFile = prepareTmpFile(null, basePath, generator); newFile = prepareTmpFile(root, path, generator); } else if (generator.isDiffDeleted() && node.myAction == SVNChangeEntry.TYPE_DELETED) { doDiff = true; originalFile = prepareTmpFile(null, basePath, generator); generator.displayHeader(ISVNGNUDiffGenerator.ADDED, path, null, -1, os); } else if (node.myAction == SVNChangeEntry.TYPE_DELETED) { generator.displayHeader(ISVNGNUDiffGenerator.DELETED, path, null, -1, os); } else if (node.myAction == TYPE_REPLACED) { generator.displayHeader(ISVNGNUDiffGenerator.MODIFIED, path, null, -1, os); generator.displayFileDiff(path, originalFile.myTmpFile, newFile.myTmpFile, rev1, rev2, originalFile.myMimeType, newFile.myMimeType, os); boolean hasDiff = defaultGenerator != null ? defaultGenerator.isDiffWritten() : true;
generator.setDiffAdded(diffAdded); generator.setDiffCopied(diffCopyFrom); generator.setDiffDeleted(diffDeleted); editor.diff(root, baseRevision, generator, os); } finally {
generator.setDiffAdded(diffAdded); generator.setDiffCopied(diffCopyFrom); generator.setDiffDeleted(diffDeleted); editor.diff(root, baseRevision, generator, os); } finally {
generator.setDiffAdded(diffAdded); generator.setDiffCopied(diffCopyFrom); generator.setDiffDeleted(diffDeleted); editor.diff(root, baseRevision, generator, os); } finally {
generator.setDiffAdded(diffAdded); generator.setDiffCopied(diffCopyFrom); generator.setDiffDeleted(diffDeleted); editor.diff(root, baseRevision, generator, os); } finally {