From 1709800f277460a75d69c453e127c2d8ad40c945 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 30 Aug 2010 10:58:19 -0700 Subject: [PATCH] Undo translation of protocol string 'unpack error' This string is part of the network protocol, and isn't meant to be translated into another language. Clients actually scan for the string "unpack error " off the wire and react magically to this information. If it were translated, they would instead have a protocol exception, which isn't very useful when there is already an error occurring. Change-Id: Ia5dc8d36ba65ad2552f683bb637e80b77a7d92f0 Signed-off-by: Shawn O. Pearce --- org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 1 - org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java | 1 - .../src/org/eclipse/jgit/transport/ReceivePack.java | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index 0b97d68f0..0c3d0e5d8 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -379,7 +379,6 @@ unknownRepositoryFormat2=Unknown repository format "{0}"; expected "0". unknownRepositoryFormat=Unknown repository format unknownZlibError=Unknown zlib error. unmergedPath=Unmerged path: {0} -unpackError=unpack error {0} unreadablePackIndex=Unreadable pack index: {0} unrecognizedRef=Unrecognized ref: {0} unsupportedCommand0=unsupported command 0 diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java index d6b496783..fc12e5713 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java @@ -438,7 +438,6 @@ public static JGitText get() { /***/ public String unknownRepositoryFormat; /***/ public String unknownZlibError; /***/ public String unmergedPath; - /***/ public String unpackError; /***/ public String unreadablePackIndex; /***/ public String unrecognizedRef; /***/ public String unsupportedCommand0; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index 6b0a9b6cf..f77e8e6ee 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -1048,7 +1048,7 @@ private List filterCommands(final Result want) { private void sendStatusReport(final boolean forClient, final Reporter out) throws IOException { if (unpackError != null) { - out.sendString(MessageFormat.format(JGitText.get().unpackError, unpackError.getMessage())); + out.sendString("unpack error " + unpackError.getMessage()); if (forClient) { for (final ReceiveCommand cmd : commands) { out.sendString("ng " + cmd.getRefName()