Przeglądaj źródła

Merge "Externalize parsing exception message for RebaseCommand#Action"

tags/v2.0.0.201206130900-r
Matthias Sohn 12 lat temu
rodzic
commit
1b73db77ef

+ 1
- 0
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties Wyświetl plik

unexpectedRefReport={0}: unexpected ref report: {1} unexpectedRefReport={0}: unexpected ref report: {1}
unexpectedReportLine=unexpected report line: {0} unexpectedReportLine=unexpected report line: {0}
unexpectedReportLine2={0} unexpected report line: {1} unexpectedReportLine2={0} unexpected report line: {1}
unknownOrUnsupportedCommand=Unknown or unsupported command "{0}", only "{1}" is allowed.
unknownDIRCVersion=Unknown DIRC version {0} unknownDIRCVersion=Unknown DIRC version {0}
unknownHost=unknown host unknownHost=unknown host
unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0} unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0}

+ 3
- 5
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java Wyświetl plik

static Action parse(String token) { static Action parse(String token) {
if (token.equals("pick") || token.equals("p")) if (token.equals("pick") || token.equals("p"))
return PICK; 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
- 0
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java Wyświetl plik

/***/ public String unexpectedRefReport; /***/ public String unexpectedRefReport;
/***/ public String unexpectedReportLine; /***/ public String unexpectedReportLine;
/***/ public String unexpectedReportLine2; /***/ public String unexpectedReportLine2;
/***/ public String unknownOrUnsupportedCommand;
/***/ public String unknownDIRCVersion; /***/ public String unknownDIRCVersion;
/***/ public String unknownHost; /***/ public String unknownHost;
/***/ public String unknownIndexVersionOrCorruptIndex; /***/ public String unknownIndexVersionOrCorruptIndex;

Ładowanie…
Anuluj
Zapisz