On delayed tag: release branch wrongly calculated from dev.version.minor(-1) #54

Author: host6

docs/minor-release-status.md

@@ -44,9 +44,6 @@ Status denotes next action which should be undertaken to finish patch build: {AC
 - RB does not exist or RB.patch < 1 => ERROR, show error on status command
 - mdeps are not locked => ERROR
 - `subComponents` are calculated using mdeps from particular RB
-- Any component is in ERROR status => ERROR
-- Last tag != RB.patch(-1) or Last delayed tag != RB.patch => ERROR
-  - Wrong version could be used by root component
 - Any component is not in DONE status => BUILD_MDEPS
 - Any component has patch which is greater than one mentioned in `mdeps` => ACTUALIZE_PATCHES
 - No valuable commits after last tag => DONE

src/main/java/org/scm4j/releaser/ActionTreeBuilder.java

@@ -1,21 +1,17 @@
 package org.scm4j.releaser;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.scm4j.commons.Version;
 import org.scm4j.releaser.actions.ActionSet;
 import org.scm4j.releaser.actions.IAction;
-import org.scm4j.releaser.branch.DevelopBranch;
-import org.scm4j.releaser.conf.Component;
-import org.scm4j.releaser.conf.VCSRepository;
-import org.scm4j.releaser.conf.VCSRepositoryFactory;
+import org.scm4j.releaser.conf.*;
 import org.scm4j.releaser.exceptions.EBuildOnNotForkedRelease;
-import org.scm4j.releaser.exceptions.EInconsistentCompState;
+import org.scm4j.releaser.exceptions.ENoDelayedTags;
 import org.scm4j.releaser.scmactions.SCMActionRelease;
 import org.scm4j.releaser.scmactions.SCMActionTag;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 public class ActionTreeBuilder {
 
 	private final VCSRepositoryFactory repoFactory;
@@ -46,10 +42,6 @@ private IAction getActionTree(ExtendedStatus node, CachedStatuses cache, ActionS
 			childActions.add(getActionTree(nodeEntry.getValue(), cache, actionSet, false));
 		}
 
-		if (node.getStatus() == BuildStatus.ERROR) {
-			throw new EInconsistentCompState(node.getComp(), node.getErrorDesc());
-		}
-
 		if (node.getStatus() == BuildStatus.FORK && actionSet == ActionSet.FULL) {
 			throw new EBuildOnNotForkedRelease(node.getComp());
 		}
@@ -60,14 +52,11 @@ private IAction getActionTree(ExtendedStatus node, CachedStatuses cache, ActionS
 
 	public IAction getTagAction(Component comp) {
 		VCSRepository repo = repoFactory.getVCSRepository(comp);
-//		DelayedTagsFile dtf = new DelayedTagsFile();
-//		String revisionToTag = dtf.getRevisitonByUrl(repo.getUrl());
-//		if (revisionToTag == null) {
-//			throw new ENoRevisionsToTag();
-//		}
-		// FIXME: fix
-		Version lastReleaseVersion = new DevelopBranch(comp, repo).getVersion().toPreviousMinor();
-				//new Version(repo.getVCS().getFileContent(null, Utils.VER_FILE_NAME, dtf.getRevisitonByUrl(repo.getUrl())));
-		return new SCMActionTag(comp, Utils.getReleaseBranchName(repo, lastReleaseVersion), repo);
+		DelayedTagsFile dtf = new DelayedTagsFile();
+		DelayedTag delayedTag = dtf.getDelayedTagByUrl(repo.getUrl());
+		if (delayedTag == null) {
+			throw new ENoDelayedTags(repo.getUrl());
+		}
+		return new SCMActionTag(comp, repo);
 	}
 }

src/main/java/org/scm4j/releaser/BuildStatus.java

@@ -1,5 +1,5 @@
 package org.scm4j.releaser;
 
 public enum BuildStatus {
-	FORK, LOCK, BUILD_MDEPS, ACTUALIZE_PATCHES, BUILD, DONE, ERROR
+	FORK, LOCK, BUILD_MDEPS, ACTUALIZE_PATCHES, BUILD, DONE
 }

src/main/java/org/scm4j/releaser/ExtendedStatus.java

@@ -15,21 +15,14 @@ public class ExtendedStatus {
 	private final BuildStatus status;
 	private final LinkedHashMap<Component, ExtendedStatus> subComponents;
 	private final VCSRepository repo;
-	private final String errorDesc;
-	
-	public ExtendedStatus(Version nextVersion, BuildStatus status,
-			  LinkedHashMap<Component, ExtendedStatus> subComponents, Component comp, VCSRepository repo) {
-		this(nextVersion, status, subComponents, comp, repo, null);
-	}
 
 	public ExtendedStatus(Version nextVersion, BuildStatus status,
-						  LinkedHashMap<Component, ExtendedStatus> subComponents, Component comp, VCSRepository repo, String errorDesc) {
+						  LinkedHashMap<Component, ExtendedStatus> subComponents, Component comp, VCSRepository repo) {
 		this.nextVersion = nextVersion;
 		this.status = status;
 		this.subComponents = subComponents;
 		this.comp = comp;
 		this.repo = repo;
-		this.errorDesc = errorDesc;
 	}
 
 	public Version getNextVersion() {
@@ -48,18 +41,11 @@ public Component getComp() {
 		return comp;
 	}
 
-	public String getErrorDesc() {
-		return errorDesc;
-	}
-	
 	@Override
 	public String toString() {
 		if (this == DUMMY) {
 			return "<DUMMY>";
 		}
-		if (status == BuildStatus.ERROR) {
- 			return String.format("%s %s: %s", status, comp.getCoords(), getErrorDesc());
- 		}
  		String targetBranch = Utils.getReleaseBranchName(repo, nextVersion);
  		return String.format("%s %s, target version: %s, target branch: %s", status, comp.getCoords(), nextVersion, targetBranch);
 	}

src/main/java/org/scm4j/releaser/ExtendedStatusBuilder.java

@@ -7,10 +7,7 @@
 import org.scm4j.releaser.branch.ReleaseBranchCurrent;
 import org.scm4j.releaser.branch.ReleaseBranchFactory;
 import org.scm4j.releaser.branch.ReleaseBranchPatch;
-import org.scm4j.releaser.conf.Component;
-import org.scm4j.releaser.conf.DelayedTagsFile;
-import org.scm4j.releaser.conf.VCSRepository;
-import org.scm4j.releaser.conf.VCSRepositoryFactory;
+import org.scm4j.releaser.conf.*;
 import org.scm4j.releaser.exceptions.ENoReleaseBranchForPatch;
 import org.scm4j.releaser.exceptions.ENoReleases;
 import org.scm4j.releaser.exceptions.EReleaseMDepsNotLocked;
@@ -74,7 +71,7 @@ public ExtendedStatus getAndCacheStatus(Component comp, CachedStatuses cache, IP
 		}
 
 		DelayedTagsFile dtf = new DelayedTagsFile();
-		Boolean hasDelayedTag = dtf.getRevisitonByUrl(repo.getUrl()) != null; 
+		Boolean hasDelayedTag = dtf.getDelayedTagByUrl(repo.getUrl()) != null;
 
 		ExtendedStatus res = patch ? 
 			getPatchStatus(comp, cache, progress, repo, hasDelayedTag) :
@@ -151,44 +148,22 @@ private ExtendedStatus getPatchStatus(Component comp, CachedStatuses cache, IPro
 			subComponents.put(mdep, subComponentsLocal.get(mdep));
 		}
 
-		String errorDesc = null;
-		if (hasMDepsInERRORStatus(rb.getMDeps(), cache)) {
-			buildStatus = BuildStatus.ERROR;
-			errorDesc = "has components in ERROR status";
+		if (hasMDepsNotInDONEStatus(rb.getMDeps(), cache)) {
+			buildStatus = BuildStatus.BUILD_MDEPS;
+		} else if (!areMDepsPatchesActual(rb.getMDeps(), cache)) {
+			buildStatus = BuildStatus.ACTUALIZE_PATCHES;
+		} else if (reportDuration(() -> noValueableCommitsAfterLastTag(repo, rb), "is release branch modified check", comp, progress)) {
+			buildStatus = BuildStatus.DONE;
 		} else {
-			Version lastTagVersion = reportDuration(() -> getLastTagVersion(repo, rb), "last tag determination", comp, progress);
-			Version expectedHeadVer = lastTagVersion != null ? hasDelayedTag ? lastTagVersion : lastTagVersion.toNextPatch() : null;
-			Version actualVersion = rb.getVersion();
-			if (lastTagVersion != null && !actualVersion.equals(expectedHeadVer)) {
-				buildStatus = BuildStatus.ERROR; 
-				errorDesc = String.format("last tag %s does not correspond to %s head version. Expected version: %s, actual: %s", lastTagVersion + (hasDelayedTag ? " (delayed)" : ""), rb.getName(), 
-						expectedHeadVer + (hasDelayedTag ? " (considering delayed tag)" : ""), actualVersion);
-			} else if (hasMDepsNotInDONEStatus(rb.getMDeps(), cache)) {
-				buildStatus = BuildStatus.BUILD_MDEPS;
-			} else if (!areMDepsPatchesActual(rb.getMDeps(), cache)) {
-				buildStatus = BuildStatus.ACTUALIZE_PATCHES;
-			} else if (reportDuration(() -> noValueableCommitsAfterLastTag(repo, rb), "is release branch modified check", comp, progress)) { 
-				buildStatus = BuildStatus.DONE;
-			} else {
-				buildStatus = BuildStatus.BUILD;
-			}
+			buildStatus = BuildStatus.BUILD;
 		}
-		
+
 		Version nextVersion = rb.getVersion();
 		if (hasDelayedTag) {
 			nextVersion = nextVersion.toNextPatch();
 		}
 
-		return new ExtendedStatus(nextVersion, buildStatus, subComponents, comp, repo, errorDesc);
-	}
-	
-	private boolean hasMDepsInERRORStatus(List<Component> mDeps, CachedStatuses cache) {
-		for (Component mDep : mDeps) {
-			if (cache.get(repoFactory.getUrl(mDep)).getStatus() == BuildStatus.ERROR) {
-				return true;
-			}
-		}
-		return false;
+		return new ExtendedStatus(nextVersion, buildStatus, subComponents, comp, repo);
 	}
 
 	private boolean hasMDepsNotInDONEStatus(List<Component> mDeps, CachedStatuses cache) {
@@ -200,32 +175,12 @@ private boolean hasMDepsNotInDONEStatus(List<Component> mDeps, CachedStatuses ca
 		return false;
 	}
 
-	private Version getLastTagVersion(VCSRepository repo, ReleaseBranchPatch rb) {
-		IVCS vcs = repo.getVCS();
-		DelayedTagsFile dtf = new DelayedTagsFile();
-		String delayedTagRevision = dtf.getRevisitonByUrl(repo.getUrl());
-		Version res = walkOnCommitTags(repo, rb, (commit) -> {
-			if (commit.getRevision().equals(delayedTagRevision)) {
-				return new Version(vcs.getFileContent(rb.getName(), Utils.VER_FILE_NAME, delayedTagRevision));
-			}
-			List<VCSTag> tags = vcs.getTagsOnRevision(commit.getRevision());
-			for (VCSTag tag : tags) {
-				Version ver = new Version(tag.getTagName());
-				if (ver.isSemantic()) {
-					return ver;
-				}
-			}
-			return null;
-		});
-		return res;
-	}
-	
 	private boolean noValueableCommitsAfterLastTag(VCSRepository repo, ReleaseBranchPatch rb) {
 		IVCS vcs = repo.getVCS();
 		DelayedTagsFile dtf = new DelayedTagsFile();
-		String delayedTagRevision = dtf.getRevisitonByUrl(repo.getUrl());
-		Boolean res = walkOnCommitTags(repo, rb, (commit) -> {
-			if (commit.getRevision().equals(delayedTagRevision)) {
+		DelayedTag delayedTag = dtf.getDelayedTagByUrl(repo.getUrl());
+		Boolean res = walkOnCommits(repo, rb, (commit) -> {
+			if (delayedTag != null && commit.getRevision().equals(delayedTag.getRevision())) {
 				return true;
 			}
 			List<VCSTag> tags = vcs.getTagsOnRevision(commit.getRevision());
@@ -240,7 +195,7 @@ private boolean noValueableCommitsAfterLastTag(VCSRepository repo, ReleaseBranch
 		return res == null ? true : res;
 	}
 
-	private <T> T walkOnCommitTags(VCSRepository repo, ReleaseBranchPatch rb, Function<VCSCommit, T> func) {
+	private <T> T walkOnCommits(VCSRepository repo, ReleaseBranchPatch rb, Function<VCSCommit, T> func) {
 		IVCS vcs = repo.getVCS();
 		String startingFromRevision = null;
 
@@ -265,7 +220,7 @@ private boolean areMDepsPatchesActual(List<Component> mDeps, CachedStatuses cach
 			Version nextMDepVersion = cache.get(url).getNextVersion();
 			if (!nextMDepVersion.equals(mDep.getVersion().toNextPatch())) {
 				DelayedTagsFile mdf = new DelayedTagsFile();
-				if (!(nextMDepVersion.getPatch().equals(ZERO_PATCH) && mdf.getRevisitonByUrl(url) != null)) {
+				if (!(nextMDepVersion.getPatch().equals(ZERO_PATCH) && mdf.getDelayedTagByUrl(url) != null)) {
 					return false;
 				}
 			}

src/main/java/org/scm4j/releaser/Utils.java

@@ -28,7 +28,6 @@ public final class Utils {
 	public static final String ZERO_PATCH = "0";
 	public static final String VER_FILE_NAME = "version";
 	public static final String MDEPS_FILE_NAME = "mdeps";
-	public static final String DELAYED_TAGS_FILE_NAME = "delayed-tags.yml";
 	public static final File BASE_WORKING_DIR = new File(System.getProperty("user.home"), ".scm4j");
 
 	public static <T> T reportDuration(Supplier<T> sup, String message, Component comp, IProgress progress) {

src/main/java/org/scm4j/releaser/cli/CLI.java

@@ -174,7 +174,7 @@ private void executeCmd(CommandLine cmd) throws Exception {
 
 	private boolean hasDelayedTags(String rootUrl) {
 		DelayedTagsFile dtf = new DelayedTagsFile();
-		return dtf.getRevisitonByUrl(rootUrl) != null;
+		return dtf.getDelayedTagByUrl(rootUrl) != null;
 	}
 
 	void initWorkingDir() throws Exception {

src/main/java/org/scm4j/releaser/conf/DelayedTag.java

@@ -0,0 +1,40 @@
+package org.scm4j.releaser.conf;
+
+import org.scm4j.commons.Version;
+
+public class DelayedTag {
+	private final Version version;
+	private final String revision;
+
+	public DelayedTag(Version version, String revision) {
+		this.version = version;
+		this.revision = revision;
+	}
+
+	public Version getVersion() {
+		return version;
+	}
+
+	public String getRevision() {
+		return revision;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		DelayedTag that = (DelayedTag) o;
+
+		if (version != null ? !version.equals(that.version) : that.version != null) return false;
+		return !(revision != null ? !revision.equals(that.revision) : that.revision != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = version != null ? version.hashCode() : 0;
+		result = 31 * result + (revision != null ? revision.hashCode() : 0);
+		return result;
+	}
+}