Browse Source

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>
stable-0.9
Shawn O. Pearce 14 years ago
parent
commit
1709800f27
  1. 1
      org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
  2. 1
      org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
  3. 2
      org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java

1
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties

@ -379,7 +379,6 @@ unknownRepositoryFormat2=Unknown repository format "{0}"; expected "0".
unknownRepositoryFormat=Unknown repository format unknownRepositoryFormat=Unknown repository format
unknownZlibError=Unknown zlib error. unknownZlibError=Unknown zlib error.
unmergedPath=Unmerged path: {0} unmergedPath=Unmerged path: {0}
unpackError=unpack error {0}
unreadablePackIndex=Unreadable pack index: {0} unreadablePackIndex=Unreadable pack index: {0}
unrecognizedRef=Unrecognized ref: {0} unrecognizedRef=Unrecognized ref: {0}
unsupportedCommand0=unsupported command 0 unsupportedCommand0=unsupported command 0

1
org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java

@ -438,7 +438,6 @@ public class JGitText extends TranslationBundle {
/***/ public String unknownRepositoryFormat; /***/ public String unknownRepositoryFormat;
/***/ public String unknownZlibError; /***/ public String unknownZlibError;
/***/ public String unmergedPath; /***/ public String unmergedPath;
/***/ public String unpackError;
/***/ public String unreadablePackIndex; /***/ public String unreadablePackIndex;
/***/ public String unrecognizedRef; /***/ public String unrecognizedRef;
/***/ public String unsupportedCommand0; /***/ public String unsupportedCommand0;

2
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) private void sendStatusReport(final boolean forClient, final Reporter out)
throws IOException { throws IOException {
if (unpackError != null) { if (unpackError != null) {
out.sendString(MessageFormat.format(JGitText.get().unpackError, unpackError.getMessage())); out.sendString("unpack error " + unpackError.getMessage());
if (forClient) { if (forClient) {
for (final ReceiveCommand cmd : commands) { for (final ReceiveCommand cmd : commands) {
out.sendString("ng " + cmd.getRefName() out.sendString("ng " + cmd.getRefName()

Loading…
Cancel
Save