Check if version is bumped already on tag command #44

scm4j · Jan 18, 2018 · c81dada · c81dada
1 parent 39eba65
commit c81dada
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/src/main/java/org/scm4j/releaser/scmactions/SCMActionTag.java b/src/main/java/org/scm4j/releaser/scmactions/SCMActionTag.java
@@ -6,6 +6,7 @@
 import org.scm4j.releaser.Utils;
 import org.scm4j.releaser.actions.ActionAbstract;
 import org.scm4j.releaser.actions.IAction;
+import org.scm4j.releaser.branch.ReleaseBranchFactory;
 import org.scm4j.releaser.conf.*;
 import org.scm4j.vcs.api.IVCS;
 import org.scm4j.vcs.api.exceptions.EVCSTagExists;
@@ -42,11 +43,13 @@ protected void executeAction(IProgress progress) {
 		}
 
 		Version nextPatchVersion = delayedTagVersion.toNextPatch();
+		Version crbVersion = ReleaseBranchFactory.getCRB(repo).getVersion();
+		if (!crbVersion.isGreaterThan(nextPatchVersion) && !crbVersion.equals(nextPatchVersion)) {
+			Utils.reportDuration(() -> vcs.setFileContent(releaseBranchName, Utils.VER_FILE_NAME, nextPatchVersion.toString(),
+					LogTag.SCM_VER + " " + nextPatchVersion),
+					"bump patch version in release branch: " + nextPatchVersion, null, progress);
+		}
 
-		Utils.reportDuration(() -> vcs.setFileContent(releaseBranchName, Utils.VER_FILE_NAME, nextPatchVersion.toString(),
-				LogTag.SCM_VER + " " + nextPatchVersion),
-				"bump patch version in release branch: " + nextPatchVersion, null, progress);
-
 		cf.removeRevisionByUrl(repo.getUrl());
 	}
 

diff --git a/src/test/java/org/scm4j/releaser/WorkflowDelayedTagTest.java b/src/test/java/org/scm4j/releaser/WorkflowDelayedTagTest.java
@@ -13,6 +13,7 @@
 import org.scm4j.releaser.conf.DelayedTagsFile;
 import org.scm4j.releaser.conf.TagDesc;
 import org.scm4j.releaser.conf.VCSRepository;
+import org.scm4j.vcs.api.VCSCommit;
 import org.scm4j.vcs.api.VCSTag;
 import org.scm4j.vcs.api.WalkDirection;
 
@@ -210,7 +211,41 @@ public void testMDepTagDelayed() {
 		action = execAndGetActionFork(compUnTill);
 		assertActionDoesNothing(action, compUnTill, compUnTillDb, compUBL);
 	}
-
+
+	@Test
+	public void testVersionIsBumpedAlreadyOnTag() {
+		fork(compUnTillDb);
+		IAction action = execAndGetActionBuildDelayedTag(compUnTillDb);
+		assertActionDoesBuildDelayedTag(action, compUnTillDb);
+
+		ReleaseBranchCurrent crb = ReleaseBranchFactory.getCRB(repoUnTillDb);
+		VCSCommit headCommit = env.getUnTillDbVCS().setFileContent(crb.getName(), Utils.VER_FILE_NAME,
+				crb.getVersion().toNextPatch().toString(), "version bumped");
+
+		// set tag on unTillDb. Version file should not be changed
+		action = execAndGetActionTag(compUnTillDb, null);
+		assertActionDoesTag(action, compUnTillDb);
+
+		assertEquals(headCommit, env.getUnTillDbVCS().getHeadCommit(crb.getName()));
+	}
+
+	@Test
+	public void testVersionIsBumpedFewTimesAlreadyOnTag() {
+		fork(compUnTillDb);
+		IAction action = execAndGetActionBuildDelayedTag(compUnTillDb);
+		assertActionDoesBuildDelayedTag(action, compUnTillDb);
+
+		ReleaseBranchCurrent crb = ReleaseBranchFactory.getCRB(repoUnTillDb);
+		VCSCommit headCommit = env.getUnTillDbVCS().setFileContent(crb.getName(), Utils.VER_FILE_NAME,
+				crb.getVersion().toNextPatch().toNextPatch().toString(), "version bumped");
+
+		// set tag on unTillDb. Version file should not be changed
+		action = execAndGetActionTag(compUnTillDb, null);
+		assertActionDoesTag(action, compUnTillDb);
+
+		assertEquals(headCommit, env.getUnTillDbVCS().getHeadCommit(crb.getName()));
+	}
+
 	private boolean isPreHeadCommitTaggedWithVersion(Component comp) {
 		VCSRepository repo = repoFactory.getVCSRepository(comp);
 		ReleaseBranchCurrent rb = ReleaseBranchFactory.getCRB(repo);