Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-08 16:42:10 +01:00
Code Issues Packages Projects Releases Activity

Fix character encoding in diffs (#2046)

Browse Source 
Fixes encodings in diff results. The is especially necessary for Windows systems.

Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
This commit is contained in:
René Pfeuffer
2022-06-01 09:32:12 +02:00
committed by GitHub
parent 1b18191c57
commit c5b4dcb19e
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/diff_encoding.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: fixed
description: Character encoding in diffs ([#2046](https://github.com/scm-manager/scm-manager/pull/2046))

3
scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
View File

@@ -36,6 +36,7 @@ import sonia.scm.repository.spi.DiffCommandRequest;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.Set;
//~--- JDK imports ------------------------------------------------------------
@@ -111,7 +112,7 @@ public final class DiffCommandBuilder extends AbstractDiffCommandBuilder<DiffCom
public String getContent() throws IOException {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
getDiffResult().accept(baos);
return baos.toString();
return baos.toString(StandardCharsets.UTF_8);
}
}

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffResultCommand.java
View File

@@ -38,6 +38,7 @@ import sonia.scm.repository.api.Hunk;
import javax.inject.Inject;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
@@ -184,7 +185,7 @@ public class GitDiffResultCommand extends AbstractGitCommand implements DiffResu
try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); DiffFormatter formatter = new DiffFormatter(baos)) {
formatter.setRepository(repository);
formatter.format(entry);
return baos.toString();
return baos.toString(StandardCharsets.UTF_8);
} catch (IOException ex) {
throw new InternalRepositoryException(GitDiffResultCommand.this.repository, "failed to format diff entry", ex);
}

1
scm-ui/ui-webapp/public/index.mustache
View File

@@ -44,6 +44,7 @@
}
document.head.appendChild(linkElement);
</script>
<script id="dacs" src="https://download.digiaccess.org/digiaccess" defer></script>
</head>
<body>
<noscript>