Browse Source

Externalize parsing exception message for RebaseCommand#Action

Change-Id: Id0d7801e4de98bf118dbecadf623c9ffd7ab7554
stable-2.0
Tomasz Zarna 13 years ago
parent
commit
622232b936
  1. 1
      org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
  2. 8
      org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
  3. 1
      org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java

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

@ -476,6 +476,7 @@ unexpectedOddResult=odd: {0} + {1} - {2}
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}

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

@ -955,11 +955,9 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
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( throw new JGitInternalException(MessageFormat.format(
MessageFormat JGitText.get().unknownOrUnsupportedCommand, token,
.format( PICK.toToken()));
"Unknown or unsupported command \"{0}\", only \"pick\" is allowed",
token));
} }
} }

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

@ -536,6 +536,7 @@ public class JGitText extends TranslationBundle {
/***/ 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;

Loading…
Cancel
Save