Skip to content

gitBranchExpression should override local git branch if provided #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

gitBranchExpression should override local git branch if provided #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions src/main/java/com/e_gineering/maven/gitflowhelper/ScmUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,41 @@ public static String resolveUrlOrExpression(final MavenProject project) {
/**
* Attempts to resolve the current branch of the build.
*/
public GitBranchInfo resolveBranchInfo(final String gitBranchExpression)
{
public GitBranchInfo resolveBranchInfo(final String gitBranchExpression) {
// Start off with the name or expression provided from the config parameter.
// Remember, the config parameter may be `null` (it is by default).
String branchNameOrExpression = gitBranchExpression;

// Make sure we have a non-null value. (may have been passed in from the @Parameter)
if (branchNameOrExpression == null) {
log.debug("Git branch expression was null, defaulting to: " + DEFAULT_BRANCH_EXPRESSION);
branchNameOrExpression = DEFAULT_BRANCH_EXPRESSION;
}

// Now force it to resolve any properties.
String resolvedBranchName = PropertyResolver.resolveValue(branchNameOrExpression, project.getProperties(), systemEnvVars);

// It's possible that we were unable to expand all the properties.
// In this case we'll try reading the git branch name by invoking the git command.
ExpansionBuffer eb = new ExpansionBuffer(resolvedBranchName);
if (eb.hasMoreLegalPlaceholders()) {
resolvedBranchName = getBranchNameFromGit();
log.debug("Git branch expression couldn't be resolved, using branch name from git metadata: " + resolvedBranchName);
}

if (!branchNameOrExpression.equals(resolvedBranchName) || log.isDebugEnabled()) { // Resolves Issue #9
if (log.isDebugEnabled()) {
log.debug("Resolved gitBranchExpression: '" + gitBranchExpression + "' to '" + resolvedBranchName + "'");
}
}

return resolveBranchType(resolvedBranchName);
}

private String getBranchNameFromGit() {
String connectionUrl = resolveUrlOrExpression(project);

String result = null;
try {
ScmRepository repository = scmManager.makeScmRepository(connectionUrl);
if (!GitScmProviderRepository.PROTOCOL_GIT.equals(scmManager.getProviderByRepository(repository).getScmType())) {
Expand All @@ -109,7 +135,7 @@ public GitBranchInfo resolveBranchInfo(final String gitBranchExpression)
ScmLogDispatcher scmLogger = new ScmLogDispatcher();

try {
branchNameOrExpression = GitBranchCommand.getCurrentBranch(scmLogger, gitScmProviderRepository, fileSet);
result = GitBranchCommand.getCurrentBranch(scmLogger, gitScmProviderRepository, fileSet);
} catch (ScmException scme) {
log.debug("Exception attempting to resolve a local branch. Attempting detached HEAD resolution");

Expand Down Expand Up @@ -153,35 +179,15 @@ public GitBranchInfo resolveBranchInfo(final String gitBranchExpression)
// Detached head resolution was successful.
// Either we iterated once, or all of the subsequent types were resolved to the same type as the
// first branch, and there was only one of those branches which may have been a uniquely versioned branch.
branchNameOrExpression = name;
result = name;
}
} catch (ScmException scme) {
// Only do the following if the SCM resolution fails miserably.
log.warn("Unable to resolve a branch from SCM. Falling back to property replacement.", scme);
} catch (IllegalArgumentException iae) {
log.debug("IllegalArgumentException likely the result of the <scm> block missing from the pom.xml", iae);
}

// Make sure we have a non-null value. (may have been passed in from the @Parameter)
if (branchNameOrExpression == null) {
branchNameOrExpression = DEFAULT_BRANCH_EXPRESSION;
}

// Now force it to resolve any properties.
String resolvedBranchName = PropertyResolver.resolveValue(branchNameOrExpression, project.getProperties(), systemEnvVars);

if (!branchNameOrExpression.equals(resolvedBranchName) || log.isDebugEnabled()) { // Resolves Issue #9
if (log.isDebugEnabled()) {
log.debug("Resolved gitBranchExpression: '" + gitBranchExpression + " to '" + resolvedBranchName + "'");
}
}
// It's possible that we were unable to expand all the properties.
ExpansionBuffer eb = new ExpansionBuffer(resolvedBranchName);
if (eb.hasMoreLegalPlaceholders()) {
resolvedBranchName = null; // Force it to resolve as UNDEFINED.
}

return resolveBranchType(resolvedBranchName);
return result;
}

private GitBranchInfo resolveBranchType(String branchName) {
Expand Down