mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 18:24:17 -05:00
Henry MaddocksandStefan Haller
dd0d90837d
git-flow-next (https://github.com/gittower/git-flow-next) uses a different config schema than legacy git-flow: gitflow.branch.<type>.prefix instead of gitflow.prefix.<type>. Recognize both schemas in GetGitFlowPrefixMap by querying each and merging into a single prefix → branchType map. GitFlowEnabled now consults the merged map so a next-only setup counts as enabled. When both schemas configure the same prefix, the legacy entry wins. In normal usage both schemas agree, so the rule mainly matters as a deterministic tie-breaker.
50 lines
1.1 KiB
Go
50 lines
1.1 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/go-errors/errors"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
)
|
|
|
|
type FlowCommands struct {
|
|
*GitCommon
|
|
}
|
|
|
|
func NewFlowCommands(
|
|
gitCommon *GitCommon,
|
|
) *FlowCommands {
|
|
return &FlowCommands{
|
|
GitCommon: gitCommon,
|
|
}
|
|
}
|
|
|
|
func (self *FlowCommands) GitFlowEnabled() bool {
|
|
return len(self.config.GetGitFlowPrefixMap()) > 0
|
|
}
|
|
|
|
func (self *FlowCommands) FinishCmdObj(branchName string) (*oscommands.CmdObj, error) {
|
|
prefixMap := self.config.GetGitFlowPrefixMap()
|
|
|
|
prefixPart, suffix, ok := strings.Cut(branchName, "/")
|
|
if !ok || prefixPart == "" || suffix == "" {
|
|
return nil, errors.New(self.Tr.NotAGitFlowBranch)
|
|
}
|
|
prefix := prefixPart + "/"
|
|
|
|
branchType := prefixMap[prefix]
|
|
if branchType == "" {
|
|
return nil, errors.New(self.Tr.NotAGitFlowBranch)
|
|
}
|
|
|
|
cmdArgs := NewGitCmd("flow").Arg(branchType, "finish", suffix).ToArgv()
|
|
|
|
return self.cmd.New(cmdArgs), nil
|
|
}
|
|
|
|
func (self *FlowCommands) StartCmdObj(branchType string, name string) *oscommands.CmdObj {
|
|
cmdArgs := NewGitCmd("flow").Arg(branchType, "start", name).ToArgv()
|
|
|
|
return self.cmd.New(cmdArgs)
|
|
}
|