BlameRegionMerger: report invalid regions with checked exception.

ifradeo · ifradeo · commit 5db57fe2a932 · 2025-02-27T18:11:05.000Z
If the cached regions are invalid the merger throws an
IllegalStateException. This is too strict. The caller can just
continue working as if there was no cache.

Report the error as IOException, that the caller can catch and handle.

Change-Id: I19a1061225533b46d3a17936912a11000430f2ce
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java
@@ -174,7 +174,7 @@ public void blame_exactOverlap() throws IOException {
 	public void blame_corruptedIndex() {
 		Region outOfRange = new Region(0, 43, 4);
 		// This region is out of the blamed area
-		assertThrows(IllegalStateException.class,
+		assertThrows(IOException.class,
 				() -> blamer.mergeOneRegion(outOfRange));
 	}
 
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java
@@ -72,7 +72,7 @@ Candidate mergeCandidate(Candidate candidate) {
 	List<Candidate> mergeOneRegion(Region region) throws IOException {
 		List<CacheRegion> overlaps = findOverlaps(region);
 		if (overlaps.isEmpty()) {
-			throw new IllegalStateException(
+			throw new IOException(
 					"Cached blame should cover all lines");
 		}
 		/*

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public void blame_exactOverlap() throws IOException {`
`174`	`174`	`public void blame_corruptedIndex() {`
`175`	`175`	`Region outOfRange = new Region(0, 43, 4);`
`176`	`176`	`// This region is out of the blamed area`
`177`		`- assertThrows(IllegalStateException.class,`
	`177`	`+ assertThrows(IOException.class,`
`178`	`178`	`() -> blamer.mergeOneRegion(outOfRange));`
`179`	`179`	`}`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ Candidate mergeCandidate(Candidate candidate) {`
`72`	`72`	`List<Candidate> mergeOneRegion(Region region) throws IOException {`
`73`	`73`	`List<CacheRegion> overlaps = findOverlaps(region);`
`74`	`74`	`if (overlaps.isEmpty()) {`
`75`		`- throw new IllegalStateException(`
	`75`	`+ throw new IOException(`
`76`	`76`	`"Cached blame should cover all lines");`
`77`	`77`	`}`
`78`	`78`	`/*`