func merge(mergeTask, current, parent string) (act action.Action, err error) {
// Remember the current branch hash.
currentSHA, err := git.BranchHexsha(current)
if err != nil {
return nil, err
}
// Checkout the parent branch so that we can perform the merge.
if err := git.Checkout(parent); err != nil {
return nil, err
}
// Checkout the current branch on return to be consistent.
defer func() {
if ex := git.Checkout(current); ex != nil {
if err == nil {
err = ex
} else {
errs.Log(ex)
}
}
}()
// Perform the merge.
// Use --no-ff in case -merge_no_ff is set.
if flagMergeNoFF {
err = git.Merge(current, "--no-ff")
} else {
err = git.Merge(current)
}
if err != nil {
return nil, err
}
// Return a rollback action.
return action.ActionFunc(func() (err error) {
log.Rollback(mergeTask)
task := fmt.Sprintf("Reset branch '%v' to the original position", current)
// Get the branch is the current branch now.
currentNow, err := gitutil.CurrentBranch()
if err != nil {
return errs.NewError(task, err)
}
// Checkout current in case it is not the same as the current branch now.
if currentNow != current {
if err := git.Checkout(current); err != nil {
return errs.NewError(task, err)
}
defer func() {
if ex := git.Checkout(currentNow); ex != nil {
if err == nil {
err = ex
} else {
errs.Log(ex)
}
}
}()
}
// Reset the branch to the original position.
if err := git.Reset("--keep", currentSHA); err != nil {
return errs.NewError(task, err)
}
return nil
}), nil
}
func SetForBranch(ver *Version, branch string) (act action.Action, err error) {
var mainTask = fmt.Sprintf("Bump version to %v for branch '%v'", ver, branch)
// Make sure the repository is clean (don't check untracked files).
task := "Make sure the repository is clean"
if err := git.EnsureCleanWorkingTree(false); err != nil {
return nil, errs.NewError(task, err)
}
// Remember the current branch.
currentBranch, err := git.CurrentBranch()
if err != nil {
return nil, err
}
// Remember the current position of the target branch.
task = fmt.Sprintf("Remember the position of branch '%v'", branch)
originalPosition, err := git.Hexsha("refs/heads/" + branch)
if err != nil {
return nil, errs.NewError(task, err)
}
// Checkout the target branch.
task = fmt.Sprintf("Checkout branch '%v'", branch)
if err := git.Checkout(branch); err != nil {
return nil, errs.NewError(task, err)
}
defer func() {
// Checkout the original branch on return.
task := fmt.Sprintf("Checkout branch '%v'", currentBranch)
if ex := git.Checkout(currentBranch); ex != nil {
if err == nil {
err = ex
} else {
errs.LogError(task, ex)
}
}
}()
// Set the project version to the desired value.
if err := Set(ver); err != nil {
if ex, ok := err.(*scripts.ErrNotFound); ok {
return nil, fmt.Errorf(
"custom SalsaFlow script '%v' not found on branch '%v'", ex.ScriptName(), branch)
}
return nil, err
}
// Commit changes.
_, err = git.RunCommand("commit", "-a",
"-m", fmt.Sprintf("Bump version to %v", ver),
"-m", fmt.Sprintf("Story-Id: %v", git.StoryIdUnassignedTagValue))
if err != nil {
task := "Reset the working tree to the original state"
if err := git.Reset("--keep"); err != nil {
errs.LogError(task, err)
}
return nil, err
}
return action.ActionFunc(func() (err error) {
// On rollback, reset the target branch to the original position.
log.Rollback(mainTask)
return git.ResetKeep(branch, originalPosition)
}), nil
}
