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

fix git diff format

Browse Source
This commit is contained in:
Mohamed Karray
2018-10-25 13:36:40 +02:00
parent 7dfcc60530
commit c214c9e1e4
1 changed files with 8 additions and 4 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

@@ -587,8 +587,9 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
private String getHeaderString(SvnTarget target, String displayPath, boolean deleted, boolean added, SvnDiffCallback.OperationKind operation, String copyFromPath) throws SVNException {
final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
try {
boolean stopDisplaying = displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
if (useGitFormat) {
if (!useGitFormat) {
displayHeader(byteArrayOutputStream, displayPath, deleted, added, operation);
} else {
displayGitDiffHeader(byteArrayOutputStream, operation,
getRelativeToRootPath(target, originalTarget1),
getRelativeToRootPath(target, originalTarget2),
@@ -887,7 +888,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
displayString(outputStream, " ");
displaySecondGitPath(outputStream, path2);
displayEOL(outputStream);
displayString(outputStream, "new file mode 10644");
displayString(outputStream, "new file mode 100644");
displayEOL(outputStream);
} catch (IOException e) {
wrapException(e);
@@ -901,7 +902,7 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
displayString(outputStream, " ");
displaySecondGitPath(outputStream, path2);
displayEOL(outputStream);
displayString(outputStream, "deleted file mode 10644");
displayString(outputStream, "deleted file mode 100644");
displayEOL(outputStream);
} catch (IOException e) {
wrapException(e);
@@ -1011,6 +1012,9 @@ public class SCMSvnDiffGenerator implements ISvnDiffGenerator {
}
protected String getLabel(String path, String revToken) {
if (useGitFormat){
return path;
}
revToken = revToken == null ? WC_REVISION_LABEL : revToken;
return path + "\t" + revToken;
}