Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#42 - Maintenance branch creation does not try to update just created branch.

Browse Source 
Introduced an overload for GitOperations.checkout(…) to allow to define whether a branch about to be created is supposed to be updated right away. The already existing method keeps the old behavior (immediate update) while the maintenance branch creation forces a create only as by definition a branch about to be created is not going to be available in the remote repo.
This commit is contained in:
Oliver Gierke
2017-01-26 16:30:39 +01:00
parent 5daee6e67a
commit 747f1f60ba
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
View File

@@ -67,6 +67,10 @@ import org.springframework.util.Assert;
@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true) @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
public class GitOperations { public class GitOperations {
private enum BranchCheckoutMode {
CREATE_ONLY, CREATE_AND_UPDATE;
}
GitServer server = new GitServer(); GitServer server = new GitServer();
Workspace workspace; Workspace workspace;
Logger logger; Logger logger;
@@ -429,12 +433,26 @@ public class GitOperations {
/** /**
* Checks out the given {@link Branch} of the given {@link Project}. If the given branch doesn't exist yet, a tracking * Checks out the given {@link Branch} of the given {@link Project}. If the given branch doesn't exist yet, a tracking
* branch is created assuming the branch exists in the {@code origin} remote. Pulls the latest changes from the * branch is created assuming the branch exists in the {@code origin} remote. Pulls the latest changes from the
* checked out branch to make sure we see the latest changes. * checked out branch will be pulled to make sure we see them.
* *
* @param project must not be {@literal null}. * @param project must not be {@literal null}.
* @param branch must not be {@literal null}. * @param branch must not be {@literal null}.
*/ */
public void checkout(Project project, Branch branch) { public void checkout(Project project, Branch branch) {
checkout(project, branch, BranchCheckoutMode.CREATE_AND_UPDATE);
}
/**
* Checks out the given {@link Branch} of the given {@link Project}. If the given branch doesn't exist yet, a tracking
* branch is created assuming the branch exists in the {@code origin} remote. If the {@link BranchCheckoutMode} is set
* to {@code CREATE_AND_UPDATE} the latest changes from the checked out branch will be pulled to make sure we see
* them.
*
* @param project must not be {@literal null}.
* @param branch must not be {@literal null}.
* @param mode must not be {@literal null}.
*/
private void checkout(Project project, Branch branch, BranchCheckoutMode mode) {
Assert.notNull(project, "Project must not be null!"); Assert.notNull(project, "Project must not be null!");
Assert.notNull(branch, "Branch must not be null!"); Assert.notNull(branch, "Branch must not be null!");
@@ -465,13 +483,21 @@ public class GitOperations {
// TODO: // TODO:
} }
// Pull latest changes to make sure the branch is up to date switch (mode) {
logger.log(project, "git pull origin %s", branch);
git.pull()// case CREATE_ONLY:
.setRemote("origin")// break;
.setRemoteBranchName(branch.toString())// case CREATE_AND_UPDATE:
.call(); default:
// Pull latest changes to make sure the branch is up to date
logger.log(project, "git pull origin %s", branch);
git.pull()//
.setRemote("origin")//
.setRemoteBranchName(branch.toString())//
.call();
break;
}
}); });
logger.log(project, "Checkout done!"); logger.log(project, "Checkout done!");
@@ -488,7 +514,7 @@ public class GitOperations {
ExecutionUtils.run(iteration, module -> { ExecutionUtils.run(iteration, module -> {
Branch branch = createMaintenanceBranch(module); Branch branch = createMaintenanceBranch(module);
checkout(module.getProject(), branch); checkout(module.getProject(), branch, BranchCheckoutMode.CREATE_ONLY);
}); });
} }