Version: toReleaseZeroPatch() added

ProgressConsole: indents added for each subline if line contains line breaks

Author: host6

src/main/java/org/scm4j/commons/Version.java

@@ -162,7 +162,7 @@ public Version toRelease() {
 	public String toReleaseString() {
 		return toRelease().toString();
 	}
-
+	
 	public Boolean isGreaterThan(Version other) {
 		if (other.isEmpty()) {
 			return !isEmpty();
@@ -216,4 +216,8 @@ public Version setPatch(String patch) {
 		}
 		return new Version(prefix + minor + (patch.isEmpty() ? "" : "." + patch) + snapshot);
 	}
+
+	public Version toReleaseZeroPatch() {
+		return toRelease().setPatch("0");
+	}
 }

src/main/java/org/scm4j/commons/progress/ProgressConsole.java

@@ -71,7 +71,7 @@ public IProgress createNestedProgress(String name) {
 	@Override
 	public void reportStatus(String status) {
 		indent(level + 1);
-		print(status);
+		print(status.replace("\r\n", "\r\n" + Strings.repeat("\t", level + 2)));
 	}
 
 	@Override

src/test/java/org/scm4j/commons/VersionTest.java

@@ -6,7 +6,7 @@
 import static org.junit.Assert.*;
 
 public class VersionTest {
-	
+
 	@Test
 	public void testMinor() {
 		assertEquals(new Version("11.21.31.41").getMinor(), "31");
@@ -17,7 +17,7 @@ public void testMinor() {
 		assertEquals(new Version("").getMinor(), "");
 		assertEquals(new Version("-SNAPSHOT").getMinor(), "");
 	}
-	
+
 	@Test
 	public void testToString() {
 		assertEquals(new Version("11.21.31.41").toString(), "11.21.31.41");
@@ -28,7 +28,7 @@ public void testToString() {
 		assertEquals(new Version("").toString(), "");
 		assertEquals(new Version("1..1").toString(), "1..1");
 	}
-	
+
 	@Test
 	public void testToReleaseString() {
 		assertEquals(new Version("11.21.31.41-SNAPSHOT").toReleaseString(), "11.21.31.41");
@@ -37,17 +37,17 @@ public void testToReleaseString() {
 		assertEquals(new Version("11.21").toReleaseString(), "11.21");
 		assertEquals(new Version("11-SNAPSHOT").toReleaseString(), "11");
 		assertEquals(new Version("-SNAPSHOT").toReleaseString(), "-SNAPSHOT");
-		
+
 	}
-	
+
 	@Test
 	public void testSnapshot() {
 		assertEquals(new Version("11.21.31.41").getSnapshot(), "");
 		assertEquals(new Version("11.21.31.41-SNAPSHOT").getSnapshot(), "-SNAPSHOT");
 		assertEquals(new Version("11.21.31.41-jkhkjhk").getSnapshot(), "");
 		assertEquals(new Version("-SNAPSHOT").getSnapshot(), "-SNAPSHOT");
 	}
-	
+
 	@Test
 	public void testMinorBumping() {
 		assertEquals(new Version("11.21.31.41").toPreviousMinor().toReleaseString(), "11.21.30.41");
@@ -73,22 +73,18 @@ public void testMinorBumping() {
 		} catch (IllegalArgumentException e) {
 		}
 	}
-	
+
 	@Test
 	public void testEmpty() {
 		assertTrue(new Version("").isEmpty());
 		assertFalse(new Version("11.21.31.41").isEmpty());
 	}
-	
+
 	@Test
 	public void testEqualsAndHashcode() {
-		EqualsVerifier
-				.forClass(Version.class)
-				.withOnlyTheseFields("verStr")
-				.usingGetClass()
-				.verify();
+		EqualsVerifier.forClass(Version.class).withOnlyTheseFields("verStr").usingGetClass().verify();
 	}
-	
+
 	@Test
 	public void testIsSnapshot() {
 		assertTrue(new Version("11.12.13-SNAPSHOT").isSnapshot());
@@ -111,7 +107,7 @@ public void testToNextPatch() {
 		assertEquals("11.12.14fgdfg-SNAPSHOT", new Version("11.12.14fgdfg-SNAPSHOT").toNextPatch().toString());
 		assertEquals("13.1", new Version("13").toNextPatch().toString());
 	}
-	
+
 	@Test
 	public void testToPreviousPatch() {
 		assertEquals("11.12.12-SNAPSHOT", new Version("11.12.13-SNAPSHOT").toPreviousPatch().toString());
@@ -130,35 +126,35 @@ public void testIsGreaterThan() {
 		assertTrue(new Version("11.12.14-SNAPSHOT").isGreaterThan(new Version("11.12.13-SNAPSHOT")));
 		assertTrue(new Version("11.12-SNAPSHOT").isGreaterThan(new Version("11.11-SNAPSHOT")));
 		assertTrue(new Version("11-SNAPSHOT").isGreaterThan(new Version("10-SNAPSHOT")));
-		
+
 		assertFalse(new Version("").isGreaterThan(new Version("")));
 		assertFalse(new Version("").isGreaterThan(new Version("11.12.13")));
 		assertTrue(new Version("11.12.13").isGreaterThan(new Version("")));
 		assertTrue(new Version("11.12.13").isGreaterThan(new Version("not semantic")));
-		
+
 		assertFalse(new Version("11.12.13-SNAPSHOT").isGreaterThan(new Version("11.12.14-SNAPSHOT")));
 		assertFalse(new Version("11.12-SNAPSHOT").isGreaterThan(new Version("11.13-SNAPSHOT")));
 		assertFalse(new Version("11-SNAPSHOT").isGreaterThan(new Version("12-SNAPSHOT")));
 	}
-	
+
 	@Test
 	public void testGetReleaseNoPatchString() {
 		assertEquals("11.12.13", new Version("11.12.13.14-SNAPSHOT").getReleaseNoPatchString());
 		assertEquals("11.12", new Version("11.12.13-SNAPSHOT").getReleaseNoPatchString());
 		assertEquals("11", new Version("11.12-SNAPSHOT").getReleaseNoPatchString());
 		assertEquals("11", new Version("11-SNAPSHOT").getReleaseNoPatchString());
 	}
-	
+
 	@Test
 	public void testToRelease() {
 		assertEquals(new Version("11.21.31.41"), new Version("11.21.31.41-SNAPSHOT").toRelease());
 		assertEquals(new Version("11.21.31.41"), new Version("11.21.31.41").toRelease());
-		assertEquals(new Version("11.21.31"),  new Version("11.21.31").toRelease());
+		assertEquals(new Version("11.21.31"), new Version("11.21.31").toRelease());
 		assertEquals(new Version("11.21"), new Version("11.21").toRelease());
 		assertEquals(new Version("11"), new Version("11-SNAPSHOT").toRelease());
 		assertEquals(new Version("-SNAPSHOT"), new Version("-SNAPSHOT").toRelease());
 	}
-	
+
 	@Test
 	public void toSnapshotString() {
 		assertEquals("11.21.31.41-SNAPSHOT", new Version("11.21.31.41").toSnapshotString());
@@ -176,7 +172,7 @@ public void toSnapshot() {
 		assertEquals(new Version("11-SNAPSHOT"), new Version("11").toSnapshot());
 		assertEquals(new Version("asd-SNAPSHOT"), new Version("asd").toSnapshot());
 	}
-	
+
 	@Test
 	public void testIsExact() {
 		assertFalse(new Version("11.23.31.41-SNAPSHOT").isExact());
@@ -185,7 +181,7 @@ public void testIsExact() {
 		assertFalse(new Version("").isExact());
 		assertFalse(new Version("dfgdfg-SNAPSHOT").isExact());
 	}
-	
+
 	@Test
 	public void testSetMinor() {
 		assertEquals(new Version("12.13.14.15-SNAPSHOT"), new Version("12.13.13.15-SNAPSHOT").setMinor("14"));
@@ -195,13 +191,13 @@ public void testSetMinor() {
 			new Version("-SNAPSHOT").setMinor("14");
 			fail();
 		} catch (IllegalStateException e) {
-			
+
 		}
 		try {
 			new Version("").setMinor("14");
 			fail();
 		} catch (IllegalStateException e) {
-			
+
 		}
 		assertEquals(new Version("14-SNAPSHOT"), new Version("12-SNAPSHOT").setMinor("14"));
 	}
@@ -223,7 +219,20 @@ public void testSetPatch() {
 			fail();
 		} catch (IllegalStateException e) {
 		}
+	}
 
+	@Test
+	public void testToReleaseZeroPatch() {
+		assertEquals(new Version("11.21.31.0"), new Version("11.21.31.41-SNAPSHOT").toReleaseZeroPatch());
+		assertEquals(new Version("11.21.31.0"), new Version("11.21.31.41").toReleaseZeroPatch());
+		assertEquals(new Version("11.21.0"), new Version("11.21.31").toReleaseZeroPatch());
+		assertEquals(new Version("11.0"), new Version("11.21").toReleaseZeroPatch());
+		assertEquals(new Version("11.0"), new Version("11-SNAPSHOT").toReleaseZeroPatch());
+		try {
+			assertEquals(new Version("-SNAPSHOT"), new Version("-SNAPSHOT").toReleaseZeroPatch());
+			fail();
+		} catch (IllegalStateException e) {
 
+		}
 	}
 }