motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Externalize parsing exception message for RebaseCommand#Action"

This commit is contained in:
Matthias Sohn 2012-04-02 16:02:39 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 2ba67bedae 622232b936
commit 1b73db77ef
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
View File

@ -476,6 +476,7 @@ unexpectedOddResult=odd: {0} + {1} - {2}
unexpectedRefReport={0}: unexpected ref report: {1}
unexpectedReportLine=unexpected report line: {0}
unexpectedReportLine2={0} unexpected report line: {1}
unknownOrUnsupportedCommand=Unknown or unsupported command "{0}", only "{1}" is allowed.
unknownDIRCVersion=Unknown DIRC version {0}
unknownHost=unknown host
unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0}

8
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
View File

@ -955,11 +955,9 @@ public String toToken() {
static Action parse(String token) {
if (token.equals("pick") || token.equals("p"))
return PICK;
throw new JGitInternalException(
MessageFormat
.format(
"Unknown or unsupported command \"{0}\", only \"pick\" is allowed",
token));
throw new JGitInternalException(MessageFormat.format(
JGitText.get().unknownOrUnsupportedCommand, token,
PICK.toToken()));
}
}

1
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
View File

@ -536,6 +536,7 @@ public static JGitText get() {
/***/ public String unexpectedRefReport;
/***/ public String unexpectedReportLine;
/***/ public String unexpectedReportLine2;
/***/ public String unknownOrUnsupportedCommand;
/***/ public String unknownDIRCVersion;
/***/ public String unknownHost;
/***/ public String unknownIndexVersionOrCorruptIndex;