From 4a23e50307fdb52675990aa997756b44081900d4 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Mon, 13 Oct 2008 00:50:58 +0200 Subject: [PATCH] jgit programs: Use i18n.logOutputEncoding or user's locale for output We should present the data in the user's locale to make it readable. This prevents garbage from being displayed for user's whose locale is not UTF-8, when non-ascii appears in most cases. If the characters cannot be converted garbage will appear in any case. When jgit gains the capability to present blob data this code must be replaced to handle data and metadata differently. Signed-off-by: Robin Rosenberg Signed-off-by: Shawn O. Pearce --- org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java index a68d87c0..1f3a136b 100644 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java @@ -86,8 +86,14 @@ public abstract class TextBuiltin { void init(final Repository repo) { try { - out = new PrintWriter(new BufferedWriter(new OutputStreamWriter( - System.out, "UTF-8"))); + String outputEncoding = repo.getConfig().getString("i18n", null, + "logOutputEncoding"); + if (outputEncoding != null) + out = new PrintWriter(new BufferedWriter( + new OutputStreamWriter(System.out, outputEncoding))); + else + out = new PrintWriter(new BufferedWriter( + new OutputStreamWriter(System.out))); } catch (IOException e) { throw die("cannot create output stream"); } -- 2.11.4.GIT