Browse Source

clone: Correct formatting of init message

We used the wrong format method, which lead to this confusing output:

  $ ./jgit clone git://...
  Initialized empty Git repository in {0}
  remote: Counting objects: 201783
  ...
  remote: {0}

We need to use MessageFormat.format() as the message translations
use {0} syntax and not %s syntax for placeholders.

Change-Id: I8bf0fd3f7dbecf9edf47419c46aed0493d405f9e
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
stable-0.9
Shawn O. Pearce 14 years ago
parent
commit
a424b7aefe
  1. 10
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java
  2. 4
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java

10
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java

@ -49,6 +49,7 @@ package org.eclipse.jgit.pgm;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.text.MessageFormat;
import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
@ -104,16 +105,19 @@ abstract class AbstractFetchCommand extends TextBuiltin {
else if (0 <= cr) else if (0 <= cr)
s = cr; s = cr;
else { else {
writer.format(CLIText.get().remoteMessage, pkt); writer.print(MessageFormat.format(CLIText.get().remoteMessage,
pkt));
writer.println(); writer.println();
break; break;
} }
if (pkt.charAt(s) == '\r') { if (pkt.charAt(s) == '\r') {
writer.format(CLIText.get().remoteMessage, pkt.substring(0, s)); writer.print(MessageFormat.format(CLIText.get().remoteMessage,
pkt.substring(0, s)));
writer.print('\r'); writer.print('\r');
} else { } else {
writer.format(CLIText.get().remoteMessage, pkt.substring(0, s)); writer.print(MessageFormat.format(CLIText.get().remoteMessage,
pkt.substring(0, s)));
writer.println(); writer.println();
} }

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java

@ -114,7 +114,9 @@ class Clone extends AbstractFetchCommand {
dst.getConfig().save(); dst.getConfig().save();
db = dst; db = dst;
out.format(CLIText.get().initializedEmptyGitRepositoryIn, gitdir.getAbsolutePath()); out.print(MessageFormat.format(
CLIText.get().initializedEmptyGitRepositoryIn, gitdir
.getAbsolutePath()));
out.println(); out.println();
out.flush(); out.flush();

Loading…
Cancel
Save