-
-
Notifications
You must be signed in to change notification settings - Fork 105
/
squash_merge.go
67 lines (60 loc) · 1.75 KB
/
squash_merge.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
package opcode
import (
"fmt"
"github.com/git-town/git-town/v11/src/cli/dialog"
"github.com/git-town/git-town/v11/src/domain"
"github.com/git-town/git-town/v11/src/messages"
"github.com/git-town/git-town/v11/src/vm/shared"
)
// SquashMerge squash merges the branch with the given name into the current branch.
type SquashMerge struct {
Branch domain.LocalBranchName
CommitMessage string
Parent domain.LocalBranchName
undeclaredOpcodeMethods
}
func (self *SquashMerge) CreateAbortProgram() []shared.Opcode {
return []shared.Opcode{
&DiscardOpenChanges{},
}
}
func (self *SquashMerge) CreateAutomaticUndoError() error {
return fmt.Errorf(messages.ShipAbortedMergeError)
}
func (self *SquashMerge) Run(args shared.RunArgs) error {
err := args.Runner.Frontend.SquashMerge(self.Branch)
if err != nil {
return err
}
branchAuthors, err := args.Runner.Backend.BranchAuthors(self.Branch, self.Parent)
if err != nil {
return err
}
author, err := dialog.SelectSquashCommitAuthor(self.Branch, branchAuthors)
if err != nil {
return fmt.Errorf(messages.SquashCommitAuthorProblem, err)
}
repoAuthor, err := args.Runner.Backend.Author()
if err != nil {
return fmt.Errorf(messages.GitUserProblem, err)
}
if err = args.Runner.Backend.CommentOutSquashCommitMessage(""); err != nil {
return fmt.Errorf(messages.SquashMessageProblem, err)
}
if repoAuthor == author {
author = ""
}
err = args.Runner.Frontend.Commit(self.CommitMessage, author)
if err != nil {
return err
}
squashedCommitSHA, err := args.Runner.Backend.SHAForBranch(self.Parent.BranchName())
if err != nil {
return err
}
args.RegisterUndoablePerennialCommit(squashedCommitSHA)
return nil
}
func (self *SquashMerge) ShouldAutomaticallyUndoOnError() bool {
return true
}