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 <spearce@spearce.org>

diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
index 0b97d68f0913075111bd4eb04a6958a8e1b0b5b9..0c3d0e5d87fada369c9e22b7da5352919b435be0 100644 (file)
--- 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 d6b496783be8949bd6360ef6c841600b2a5c349c..fc12e571350646a947ba309ebf66b9b834ad0c55 100644 (file)
--- 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 class JGitText extends TranslationBundle {
        /***/ 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 6b0a9b6cff4098c1a5a8865404eda2c6a2b33675..f77e8e6ee4ca2f8b31645a42d60ec56286edd7cf 100644 (file)
--- 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 @@ public class ReceivePack {
        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()