motiejus
/
jgit
1
Fork 0
Code Releases Activity

Externalize error message in ReftableWriter#throwIllegalEntry 

Also use MessageFormat as done elsewhere.

Change-Id: I36a4df9002310fa28321de9d325ee213f3cbd433
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2019-08-20 00:35:51 +02:00
parent 3e2c88199f
commit 53160ee12b
3 changed files with 6 additions and 2 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

@ -602,6 +602,7 @@ refAlreadyExists=already exists
refAlreadyExists1=Ref {0} already exists
reflogEntryNotFound=Entry {0} not found in reflog for ''{1}''
refNotResolved=Ref {0} cannot be resolved
refTableRecordsMustIncrease=records must be increasing: last {0}, this {1}
refUpdateReturnCodeWas=RefUpdate return code was: {0}
remoteConfigHasNoURIAssociated=Remote config "{0}" has no URIs associated
remoteDoesNotHaveSpec=Remote does not have {0} available for fetch.

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

@ -663,6 +663,7 @@ public static JGitText get() {
/***/ public String refAlreadyExists1;
/***/ public String reflogEntryNotFound;
/***/ public String refNotResolved;
/***/ public String refTableRecordsMustIncrease;
/***/ public String refUpdateReturnCodeWas;
/***/ public String remoteConfigHasNoURIAssociated;
/***/ public String remoteDoesNotHaveSpec;

6
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableWriter.java
View File

@ -60,6 +60,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@ -70,6 +71,7 @@
import java.util.zip.CRC32;
import org.eclipse.jgit.annotations.Nullable;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.internal.storage.reftable.BlockWriter.DeleteLogEntry;
import org.eclipse.jgit.internal.storage.reftable.BlockWriter.Entry;
import org.eclipse.jgit.internal.storage.reftable.BlockWriter.IndexEntry;
@ -285,8 +287,8 @@ public void writeRef(Ref ref, long updateIndex) throws IOException {
}
private void throwIllegalEntry(Entry last, Entry now) {
throw new IllegalArgumentException(
String.format("records must be increasing: last %s, this %s",
throw new IllegalArgumentException(MessageFormat.format(
JGitText.get().refTableRecordsMustIncrease,
new String(last.key, UTF_8), new String(now.key, UTF_8)));
}