Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 11:05:56 +01:00
Code Issues Packages Projects Releases Activity

Fix detection of deleted files

Browse Source 
The path /dev/null must not be prefixed with a or b.
This commit is contained in:
René Pfeuffer
2020-11-17 09:26:03 +01:00
parent a8c30a2422
commit e222363dcd
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SCMSvnDiffGenerator.java
View File

@@ -596,14 +596,22 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
String path1 = operation == SvnDiffCallback.OperationKind.Added ? "/dev/null" : getRelativeToRootPath(target, originalTarget1);
String path2 = operation == SvnDiffCallback.OperationKind.Deleted ? "/dev/null" : getRelativeToRootPath(target, originalTarget2);
try {
displayString(outputStream, String.format("--- a/%s\n", path1));
displayString(outputStream, String.format("+++ b/%s\n", path2));
displayString(outputStream, formatPath(path1, "---", "a"));
displayString(outputStream, formatPath(path2, "+++", "b"));
displayString(outputStream, "Binary files differ");
} catch (IOException e) {
wrapException(e);
}
}
private String formatPath(String path, String start, String aOrB) {
if (path.equals("/dev/null")) {
return String.format("%s %s\n", start, path);
} else {
return String.format("%s %s/%s\n", start, aOrB, path);
}
}
private void displayBinary(String mimeType1, String mimeType2, OutputStream outputStream, boolean leftIsBinary, boolean rightIsBinary) throws SVNException {
displayCannotDisplayFileMarkedBinary(outputStream);