Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Lay2011-05-09 15:22:50 +0000
committerCode Review2011-05-09 15:22:50 +0000
commit3a2f940eb7b70930b449a78a1585be42f0766657 (patch)
tree4edc2d504225da1c4e4bb8938a3eb02698341e2b
parent6581605e4deeacff47cbf685aa4abdaae3e7148d (diff)
parent17cc1ec58b6c5fa514b5fbf9d912a9b30cff6558 (diff)
downloadegit-3a2f940eb7b70930b449a78a1585be42f0766657.tar.gz
egit-3a2f940eb7b70930b449a78a1585be42f0766657.tar.xz
egit-3a2f940eb7b70930b449a78a1585be42f0766657.zip
Merge "Use workspace file encoding in commit dialog diff"
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
index e236aff181..fea25a5669 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
@@ -226,8 +226,15 @@ public class CommitDialog extends Dialog {
IFileRevision baseFile = fileHistory.getFileRevisions()[0];
IFileRevision nextFile = fileHistoryProvider.getWorkspaceFileRevision(commitItem.file);
- ITypedElement base = new FileRevisionTypedElement(baseFile);
- ITypedElement next = new FileRevisionTypedElement(nextFile);
+ String encoding;
+ try {
+ encoding = commitItem.file.getCharset();
+ } catch (CoreException e1) {
+ encoding = null;
+ }
+
+ ITypedElement base = new FileRevisionTypedElement(baseFile, encoding);
+ ITypedElement next = new FileRevisionTypedElement(nextFile, encoding);
GitCompareFileRevisionEditorInput input = new GitCompareFileRevisionEditorInput(next, base, null);
CompareUI.openCompareDialog(input);

Back to the top