mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
The existing git log logic fetched the first 300 commits of a repo and displayed them in the local and sub-commit views. Once a user selected a commit beyond a threshold of 200 commits the whole repository was loaded. This is problematic with large repos e.g. the linux kernel with currently ~138k commits as lazygit slows down substantially with such a large number of commits in memory. This commit replaces the current all or only the first 300 commits logic with an incremental fetching approach: 1. The first 400 commits of repo are loaded by default. 2. If the user selects a commit beyond a threshold (current limit-100) the git log limit is increased by 400 if there are more commits available. If there are more commits available is currently checked by comparing the previous log limit with the real commit count in the model, if the commit count is less then the limit it is assumed that we reached the end of the commit log. Ideally it would be better to call `git rev-list --count xyz` in the right places and compare with this result, but this requires more changes. Adding a "paginated implementation" by utilizing `git log --skip=x --max-count=y` and appending commits to the model instead of replacing the whole collection would be nice, but this requires deeper changes to keep everything consistent. Signed-off-by: Stefan Kerkmann <s.kerkmann@pengutronix.de> Co-authored-by: DeepSeek V4 Flash
660 lines
21 KiB
Go
660 lines
21 KiB
Go
package helpers
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"text/template"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/context"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
type RefsHelper struct {
|
|
c *HelperCommon
|
|
|
|
rebaseHelper *MergeAndRebaseHelper
|
|
}
|
|
|
|
func NewRefsHelper(
|
|
c *HelperCommon,
|
|
rebaseHelper *MergeAndRebaseHelper,
|
|
) *RefsHelper {
|
|
return &RefsHelper{
|
|
c: c,
|
|
rebaseHelper: rebaseHelper,
|
|
}
|
|
}
|
|
|
|
func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions) error {
|
|
waitingStatus := options.WaitingStatus
|
|
if waitingStatus == "" {
|
|
waitingStatus = self.c.Tr.CheckingOutStatus
|
|
}
|
|
|
|
cmdOptions := git_commands.CheckoutOptions{Force: false, EnvVars: options.EnvVars}
|
|
|
|
refresh := func() {
|
|
// loading a heap of commits is slow so we limit them whenever doing a reset
|
|
self.c.Contexts().LocalCommits.SetGitLogLimit(git_commands.DefaultGitLogLimit())
|
|
|
|
scope := []types.RefreshableView{
|
|
types.COMMITS,
|
|
types.BRANCHES,
|
|
types.FILES,
|
|
types.REFLOG,
|
|
types.WORKTREES,
|
|
types.BISECT_INFO,
|
|
types.STAGING,
|
|
}
|
|
if options.RefreshPullRequests {
|
|
scope = append(scope, types.PULL_REQUESTS)
|
|
}
|
|
self.c.RefreshFromWorker(types.RefreshOptions{
|
|
BatchUIUpdates: true,
|
|
Scope: scope,
|
|
BranchSelection: types.SelectCheckedOutBranch,
|
|
CommitSelection: types.SelectHeadCommit,
|
|
SelectTopReflogCommit: true,
|
|
})
|
|
}
|
|
|
|
localBranch, found := lo.Find(self.c.Model().Branches, func(branch *models.Branch) bool {
|
|
return branch.Name == ref
|
|
})
|
|
|
|
withCheckoutStatus := func(f func(gocui.Task) error) error {
|
|
if found {
|
|
return self.c.WithInlineStatus(localBranch, types.ItemOperationCheckingOut, context.LOCAL_BRANCHES_CONTEXT_KEY, f)
|
|
}
|
|
|
|
return self.c.WithWaitingStatus(waitingStatus, f)
|
|
}
|
|
|
|
// Switch to the branches context _before_ starting to check out the branch, so that we see the
|
|
// inline status. This is a no-op if the branches panel is already focused.
|
|
self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{})
|
|
|
|
return withCheckoutStatus(func(gocui.Task) error {
|
|
if err := self.c.Git().Branch.Checkout(ref, cmdOptions); err != nil {
|
|
// note, this will only work for english-language git commands. If we force git to use english, and the error isn't this one, then the user will receive an english command they may not understand. I'm not sure what the best solution to this is. Running the command once in english and a second time in the native language is one option
|
|
|
|
if options.OnRefNotFound != nil && strings.Contains(err.Error(), "did not match any file(s) known to git") {
|
|
return options.OnRefNotFound(ref)
|
|
}
|
|
|
|
if IsSwitchBranchUncommittedChangesError(err) {
|
|
// offer to autostash changes
|
|
self.c.OnUIThread(func() error {
|
|
// (Before showing the prompt, render again to remove the inline status)
|
|
self.c.Contexts().Branches.HandleRender()
|
|
self.c.Confirm(types.ConfirmOpts{
|
|
Title: self.c.Tr.AutoStashTitle,
|
|
Prompt: self.c.Tr.AutoStashPrompt,
|
|
HandleConfirm: func() error {
|
|
return withCheckoutStatus(func(gocui.Task) error {
|
|
if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForCheckout, ref)); err != nil {
|
|
return err
|
|
}
|
|
if err := self.c.Git().Branch.Checkout(ref, cmdOptions); err != nil {
|
|
return err
|
|
}
|
|
err := self.c.Git().Stash.Pop(0)
|
|
// Branch switch successful so re-render the UI even if the pop operation failed (e.g. conflict).
|
|
refresh()
|
|
return err
|
|
})
|
|
},
|
|
})
|
|
|
|
return nil
|
|
})
|
|
return nil
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
refresh()
|
|
return nil
|
|
})
|
|
}
|
|
|
|
// Shows a prompt to choose between creating a new branch or checking out a detached head
|
|
func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchName string) error {
|
|
checkout := func(branchName string, refreshPullRequests bool) error {
|
|
return self.CheckoutRef(branchName, types.CheckoutRefOptions{RefreshPullRequests: refreshPullRequests})
|
|
}
|
|
|
|
// If a branch with this name already exists locally, just check it out. We
|
|
// don't bother checking whether it actually tracks this remote branch, since
|
|
// it's very unlikely that it doesn't.
|
|
if lo.ContainsBy(self.c.Model().Branches, func(branch *models.Branch) bool {
|
|
return branch.Name == localBranchName
|
|
}) {
|
|
return checkout(localBranchName, false)
|
|
}
|
|
|
|
return self.c.Menu(types.CreateMenuOptions{
|
|
Title: utils.ResolvePlaceholderString(self.c.Tr.RemoteBranchCheckoutTitle, map[string]string{
|
|
"branchName": fullBranchName,
|
|
}),
|
|
Prompt: self.c.Tr.RemoteBranchCheckoutPrompt,
|
|
Items: []*types.MenuItem{
|
|
{
|
|
Label: self.c.Tr.CheckoutTypeNewBranch,
|
|
Tooltip: self.c.Tr.CheckoutTypeNewBranchTooltip,
|
|
OnPress: func() error {
|
|
// First create the local branch with the upstream set, and
|
|
// then check it out. We could do that in one step using
|
|
// "git checkout -b", but we want to benefit from all the
|
|
// nice features of the CheckoutRef function.
|
|
if err := self.c.Git().Branch.CreateWithUpstream(localBranchName, fullBranchName); err != nil {
|
|
return err
|
|
}
|
|
// Refresh the branches and check out from Then, so that the
|
|
// new branch is already in the model when CheckoutRef looks
|
|
// it up; that's what makes it show an inline status on the
|
|
// branch rather than a global waiting status.
|
|
self.c.Refresh(types.RefreshOptions{
|
|
Scope: []types.RefreshableView{types.BRANCHES},
|
|
Then: func() error {
|
|
return checkout(localBranchName, true)
|
|
},
|
|
})
|
|
return nil
|
|
},
|
|
},
|
|
{
|
|
Label: self.c.Tr.CheckoutTypeDetachedHead,
|
|
Tooltip: self.c.Tr.CheckoutTypeDetachedHeadTooltip,
|
|
OnPress: func() error {
|
|
return checkout(fullBranchName, false)
|
|
},
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
func (self *RefsHelper) CheckoutPreviousRef() error {
|
|
previousRef, err := self.c.Git().Branch.PreviousRef()
|
|
if err == nil && strings.HasPrefix(previousRef, "refs/heads/") {
|
|
return self.CheckoutRef(strings.TrimPrefix(previousRef, "refs/heads/"), types.CheckoutRefOptions{})
|
|
}
|
|
|
|
return self.CheckoutRef("-", types.CheckoutRefOptions{})
|
|
}
|
|
|
|
func (self *RefsHelper) GetCheckedOutRef() *models.Branch {
|
|
if len(self.c.Model().Branches) == 0 {
|
|
return nil
|
|
}
|
|
|
|
return self.c.Model().Branches[0]
|
|
}
|
|
|
|
func (self *RefsHelper) ResetToRef(ref string, strength string, envVars []string) error {
|
|
if err := self.c.Git().Commit.ResetToCommit(ref, strength, envVars); err != nil {
|
|
return err
|
|
}
|
|
|
|
// loading a heap of commits is slow so we limit them whenever doing a reset
|
|
self.c.Contexts().LocalCommits.SetGitLogLimit(git_commands.DefaultGitLogLimit())
|
|
|
|
self.c.RefreshFromWorker(types.RefreshOptions{
|
|
Scope: []types.RefreshableView{types.FILES, types.BRANCHES, types.REFLOG, types.COMMITS},
|
|
CommitSelection: types.SelectHeadCommit,
|
|
SelectTopReflogCommit: true,
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func (self *RefsHelper) CreateSortOrderMenu(sortOptionsOrder []string, menuPrompt string, onSelected func(sortOrder string) error, currentValue string) error {
|
|
type sortMenuOption struct {
|
|
keys []gocui.Key
|
|
label string
|
|
description string
|
|
sortOrder string
|
|
}
|
|
availableSortOptions := map[string]sortMenuOption{
|
|
"recency": {label: self.c.Tr.SortByRecency, description: self.c.Tr.SortBasedOnReflog, keys: menuKey('r')},
|
|
"alphabetical": {label: self.c.Tr.SortAlphabetical, description: "--sort=refname", keys: menuKey('a')},
|
|
"date": {label: self.c.Tr.SortByDate, description: "--sort=-committerdate", keys: menuKey('d')},
|
|
}
|
|
sortOptions := make([]sortMenuOption, 0, len(sortOptionsOrder))
|
|
for _, key := range sortOptionsOrder {
|
|
sortOption, ok := availableSortOptions[key]
|
|
if !ok {
|
|
panic(fmt.Sprintf("unexpected sort order: %s", key))
|
|
}
|
|
sortOption.sortOrder = key
|
|
sortOptions = append(sortOptions, sortOption)
|
|
}
|
|
|
|
menuItems := lo.Map(sortOptions, func(opt sortMenuOption, _ int) *types.MenuItem {
|
|
return &types.MenuItem{
|
|
LabelColumns: []string{
|
|
opt.label,
|
|
style.FgYellow.Sprint(opt.description),
|
|
},
|
|
OnPress: func() error {
|
|
return onSelected(opt.sortOrder)
|
|
},
|
|
Keys: opt.keys,
|
|
Widget: types.MakeMenuRadioButton(opt.sortOrder == currentValue),
|
|
}
|
|
})
|
|
return self.c.Menu(types.CreateMenuOptions{
|
|
Title: self.c.Tr.SortOrder,
|
|
Items: menuItems,
|
|
Prompt: menuPrompt,
|
|
})
|
|
}
|
|
|
|
func (self *RefsHelper) CreateGitResetMenu(name string, ref string) error {
|
|
type strengthWithKey struct {
|
|
strength string
|
|
label string
|
|
keys []gocui.Key
|
|
tooltip string
|
|
}
|
|
strengths := []strengthWithKey{
|
|
// not i18'ing because it's git terminology
|
|
{strength: "mixed", label: "Mixed reset", keys: menuKey('m'), tooltip: self.c.Tr.ResetMixedTooltip},
|
|
{strength: "soft", label: "Soft reset", keys: menuKey('s'), tooltip: self.c.Tr.ResetSoftTooltip},
|
|
{strength: "hard", label: "Hard reset", keys: menuKey('h'), tooltip: self.c.Tr.ResetHardTooltip},
|
|
}
|
|
|
|
menuItems := lo.Map(strengths, func(row strengthWithKey, _ int) *types.MenuItem {
|
|
return &types.MenuItem{
|
|
LabelColumns: []string{
|
|
row.label,
|
|
style.FgRed.Sprintf("reset --%s %s", row.strength, name),
|
|
},
|
|
OnPress: func() error {
|
|
return self.c.ConfirmIf(row.strength == "hard" && IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules),
|
|
types.ConfirmOpts{
|
|
Title: self.c.Tr.Actions.HardReset,
|
|
Prompt: self.c.Tr.ResetHardConfirmation,
|
|
HandleConfirm: func() error {
|
|
self.c.LogAction("Reset")
|
|
return self.c.WithWaitingStatus(self.c.Tr.ResettingStatus, func(gocui.Task) error {
|
|
return self.ResetToRef(ref, row.strength, []string{})
|
|
})
|
|
},
|
|
})
|
|
},
|
|
Keys: row.keys,
|
|
Tooltip: row.tooltip,
|
|
}
|
|
})
|
|
|
|
return self.c.Menu(types.CreateMenuOptions{
|
|
Title: fmt.Sprintf("%s %s", self.c.Tr.ResetTo, name),
|
|
Items: menuItems,
|
|
})
|
|
}
|
|
|
|
func (self *RefsHelper) CreateCheckoutMenu(commit *models.Commit) error {
|
|
branches := lo.Filter(self.c.Model().Branches, func(branch *models.Branch, _ int) bool {
|
|
return commit.Hash() == branch.CommitHash && branch.Name != self.c.Model().CheckedOutBranch
|
|
})
|
|
|
|
hash := commit.Hash()
|
|
|
|
menuItems := []*types.MenuItem{
|
|
{
|
|
LabelColumns: []string{fmt.Sprintf(self.c.Tr.Actions.CheckoutCommitAsDetachedHead, utils.ShortHash(hash))},
|
|
OnPress: func() error {
|
|
self.c.LogAction(self.c.Tr.Actions.CheckoutCommit)
|
|
return self.CheckoutRef(hash, types.CheckoutRefOptions{})
|
|
},
|
|
Keys: menuKey('d'),
|
|
},
|
|
}
|
|
|
|
if len(branches) > 0 {
|
|
menuItems = append(menuItems, lo.Map(branches, func(branch *models.Branch, index int) *types.MenuItem {
|
|
var keys []gocui.Key
|
|
if index < 9 {
|
|
keys = menuKey(rune(index + 1 + '0')) // Convert 1-based index to key
|
|
}
|
|
return &types.MenuItem{
|
|
LabelColumns: []string{fmt.Sprintf(self.c.Tr.Actions.CheckoutBranchAtCommit, branch.Name)},
|
|
OnPress: func() error {
|
|
self.c.LogAction(self.c.Tr.Actions.CheckoutBranch)
|
|
return self.CheckoutRef(branch.RefName(), types.CheckoutRefOptions{})
|
|
},
|
|
Keys: keys,
|
|
}
|
|
})...)
|
|
} else {
|
|
menuItems = append(menuItems, &types.MenuItem{
|
|
LabelColumns: []string{self.c.Tr.Actions.CheckoutBranch},
|
|
OnPress: func() error { return nil },
|
|
DisabledReason: &types.DisabledReason{Text: self.c.Tr.NoBranchesFoundAtCommitTooltip},
|
|
Keys: menuKey('1'),
|
|
})
|
|
}
|
|
|
|
return self.c.Menu(types.CreateMenuOptions{
|
|
Title: self.c.Tr.Actions.CheckoutBranchOrCommit,
|
|
Items: menuItems,
|
|
})
|
|
}
|
|
|
|
func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggestedBranchName string) error {
|
|
message := utils.ResolvePlaceholderString(
|
|
self.c.Tr.NewBranchNameBranchOff,
|
|
map[string]string{
|
|
"branchName": fromFormattedName,
|
|
},
|
|
)
|
|
|
|
if suggestedBranchName == "" {
|
|
var err error
|
|
|
|
suggestedBranchName, err = self.getSuggestedBranchName()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
refresh := func() {
|
|
self.c.RefreshFromWorker(types.RefreshOptions{
|
|
BatchUIUpdates: true,
|
|
BranchSelection: types.SelectCheckedOutBranch,
|
|
CommitSelection: types.SelectHeadCommit,
|
|
SelectTopReflogCommit: true,
|
|
Then: func() error {
|
|
// Switch to the branches panel only now, in the same batched
|
|
// frame that applies the refreshed data, so the panel switch
|
|
// and the new branch appear together rather than flashing the
|
|
// old branch list while the checkout is still in progress.
|
|
if self.c.Context().Current() != self.c.Contexts().Branches {
|
|
self.c.Context().Push(self.c.Contexts().Branches, types.OnFocusOpts{})
|
|
}
|
|
return nil
|
|
},
|
|
})
|
|
}
|
|
|
|
self.c.Prompt(types.PromptOpts{
|
|
Title: message,
|
|
InitialContent: suggestedBranchName,
|
|
HandleConfirm: func(response string) error {
|
|
self.c.LogAction(self.c.Tr.Actions.CreateBranch)
|
|
newBranchName := SanitizedBranchName(response)
|
|
newBranchFunc := self.c.Git().Branch.New
|
|
if newBranchName != suggestedBranchName {
|
|
newBranchFunc = self.c.Git().Branch.NewWithoutTracking
|
|
}
|
|
|
|
// Creating the branch checks it out, which can take a while when
|
|
// the ref we're branching off is distant, so do it on a worker.
|
|
return self.c.WithWaitingStatus(self.c.Tr.CreatingBranchStatus, func(gocui.Task) error {
|
|
if err := newBranchFunc(newBranchName, from); err != nil {
|
|
if IsSwitchBranchUncommittedChangesError(err) {
|
|
// offer to autostash changes
|
|
self.c.OnUIThread(func() error {
|
|
self.c.Confirm(types.ConfirmOpts{
|
|
Title: self.c.Tr.AutoStashTitle,
|
|
Prompt: self.c.Tr.AutoStashPrompt,
|
|
HandleConfirm: func() error {
|
|
return self.c.WithWaitingStatus(self.c.Tr.CreatingBranchStatus, func(gocui.Task) error {
|
|
if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForNewBranch, newBranchName)); err != nil {
|
|
return err
|
|
}
|
|
if err := newBranchFunc(newBranchName, from); err != nil {
|
|
return err
|
|
}
|
|
err := self.c.Git().Stash.Pop(0)
|
|
// Branch switch successful so re-render the UI even if the pop operation failed (e.g. conflict).
|
|
refresh()
|
|
return err
|
|
})
|
|
},
|
|
})
|
|
return nil
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
refresh()
|
|
return nil
|
|
})
|
|
},
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func (self *RefsHelper) MoveCommitsToNewBranch() error {
|
|
currentBranch := self.c.Model().Branches[0]
|
|
baseBranchRef, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(currentBranch, self.c.Model().MainBranches)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
mustStash := IsWorkingTreeDirtyExceptSubmodules(self.c.Model().Files, self.c.Model().Submodules)
|
|
|
|
withNewBranchNamePrompt := func(baseBranchName string, f func(string) error) error {
|
|
prompt := utils.ResolvePlaceholderString(
|
|
self.c.Tr.NewBranchNameBranchOff,
|
|
map[string]string{
|
|
"branchName": baseBranchName,
|
|
},
|
|
)
|
|
suggestedBranchName, err := self.getSuggestedBranchName()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
self.c.Prompt(types.PromptOpts{
|
|
Title: prompt,
|
|
InitialContent: suggestedBranchName,
|
|
HandleConfirm: func(response string) error {
|
|
self.c.LogAction(self.c.Tr.MoveCommitsToNewBranch)
|
|
newBranchName := SanitizedBranchName(response)
|
|
return self.c.WithWaitingStatus(self.c.Tr.MovingCommitsToNewBranchStatus, func(gocui.Task) error {
|
|
return f(newBranchName)
|
|
})
|
|
},
|
|
})
|
|
return nil
|
|
}
|
|
|
|
isMainBranch := lo.Contains(self.c.UserConfig().Git.MainBranches, currentBranch.Name)
|
|
if isMainBranch {
|
|
prompt := utils.ResolvePlaceholderString(
|
|
self.c.Tr.MoveCommitsToNewBranchFromMainPrompt,
|
|
map[string]string{
|
|
"baseBranchName": currentBranch.Name,
|
|
},
|
|
)
|
|
self.c.Confirm(types.ConfirmOpts{
|
|
Title: self.c.Tr.MoveCommitsToNewBranch,
|
|
Prompt: prompt,
|
|
HandleConfirm: func() error {
|
|
return withNewBranchNamePrompt(currentBranch.Name, func(newBranchName string) error {
|
|
return self.moveCommitsToNewBranchStackedOnCurrentBranch(newBranchName, mustStash)
|
|
})
|
|
},
|
|
})
|
|
return nil
|
|
}
|
|
|
|
shortBaseBranchName := ShortBranchName(baseBranchRef)
|
|
prompt := utils.ResolvePlaceholderString(
|
|
self.c.Tr.MoveCommitsToNewBranchMenuPrompt,
|
|
map[string]string{
|
|
"baseBranchName": shortBaseBranchName,
|
|
},
|
|
)
|
|
return self.c.Menu(types.CreateMenuOptions{
|
|
Title: self.c.Tr.MoveCommitsToNewBranch,
|
|
Prompt: prompt,
|
|
Items: []*types.MenuItem{
|
|
{
|
|
Label: fmt.Sprintf(self.c.Tr.MoveCommitsToNewBranchFromBaseItem, shortBaseBranchName),
|
|
OnPress: func() error {
|
|
commitsToCherryPick := lo.Filter(self.c.Model().Commits, func(commit *models.Commit, _ int) bool {
|
|
return commit.Status == models.StatusUnpushed
|
|
})
|
|
return withNewBranchNamePrompt(shortBaseBranchName, func(newBranchName string) error {
|
|
return self.moveCommitsToNewBranchOffOfMainBranch(newBranchName, baseBranchRef, commitsToCherryPick, mustStash)
|
|
})
|
|
},
|
|
},
|
|
{
|
|
Label: fmt.Sprintf(self.c.Tr.MoveCommitsToNewBranchStackedItem, currentBranch.Name),
|
|
OnPress: func() error {
|
|
return withNewBranchNamePrompt(currentBranch.Name, func(newBranchName string) error {
|
|
return self.moveCommitsToNewBranchStackedOnCurrentBranch(newBranchName, mustStash)
|
|
})
|
|
},
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
func (self *RefsHelper) moveCommitsToNewBranchStackedOnCurrentBranch(newBranchName string, mustStash bool) error {
|
|
if err := self.c.Git().Branch.NewWithoutCheckout(newBranchName, "HEAD"); err != nil {
|
|
return err
|
|
}
|
|
|
|
if mustStash {
|
|
if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForNewBranch, newBranchName)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if err := self.c.Git().Commit.ResetToCommit("@{u}", "hard", []string{}); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := self.c.Git().Branch.Checkout(newBranchName, git_commands.CheckoutOptions{}); err != nil {
|
|
return err
|
|
}
|
|
|
|
if mustStash {
|
|
if err := self.c.Git().Stash.Pop(0); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
self.c.RefreshFromWorker(types.RefreshOptions{
|
|
BatchUIUpdates: true,
|
|
BranchSelection: types.SelectCheckedOutBranch,
|
|
CommitSelection: types.SelectHeadCommit,
|
|
SelectTopReflogCommit: true,
|
|
})
|
|
return nil
|
|
}
|
|
|
|
func (self *RefsHelper) moveCommitsToNewBranchOffOfMainBranch(newBranchName string, baseBranchRef string, commitsToCherryPick []*models.Commit, mustStash bool) error {
|
|
if mustStash {
|
|
if err := self.c.Git().Stash.Push(fmt.Sprintf(self.c.Tr.AutoStashForNewBranch, newBranchName)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if err := self.c.Git().Commit.ResetToCommit("@{u}", "hard", []string{}); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := self.c.Git().Branch.NewWithoutTracking(newBranchName, baseBranchRef); err != nil {
|
|
return err
|
|
}
|
|
|
|
err := self.c.Git().Rebase.CherryPickCommits(commitsToCherryPick)
|
|
err = self.rebaseHelper.CheckMergeOrRebaseWithRefreshOptions(err, types.RefreshOptions{})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if mustStash {
|
|
if err := self.c.Git().Stash.Pop(0); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
self.c.RefreshFromWorker(types.RefreshOptions{
|
|
BatchUIUpdates: true,
|
|
BranchSelection: types.SelectCheckedOutBranch,
|
|
CommitSelection: types.SelectHeadCommit,
|
|
SelectTopReflogCommit: true,
|
|
})
|
|
return nil
|
|
}
|
|
|
|
func (self *RefsHelper) CanMoveCommitsToNewBranch() *types.DisabledReason {
|
|
if len(self.c.Model().Branches) == 0 {
|
|
return &types.DisabledReason{Text: self.c.Tr.NoBranchesThisRepo}
|
|
}
|
|
currentBranch := self.GetCheckedOutRef()
|
|
if currentBranch.DetachedHead {
|
|
return &types.DisabledReason{Text: self.c.Tr.CannotMoveCommitsFromDetachedHead, ShowErrorInPanel: true}
|
|
}
|
|
if !currentBranch.RemoteBranchStoredLocally() {
|
|
return &types.DisabledReason{Text: self.c.Tr.CannotMoveCommitsNoUpstream, ShowErrorInPanel: true}
|
|
}
|
|
if currentBranch.IsBehindForPull() {
|
|
return &types.DisabledReason{Text: self.c.Tr.CannotMoveCommitsBehindUpstream, ShowErrorInPanel: true}
|
|
}
|
|
if !currentBranch.IsAheadForPull() {
|
|
return &types.DisabledReason{Text: self.c.Tr.CannotMoveCommitsNoUnpushedCommits, ShowErrorInPanel: true}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// SanitizedBranchName will remove all spaces in favor of a dash "-" to meet
|
|
// git's branch naming requirement.
|
|
func SanitizedBranchName(input string) string {
|
|
return strings.ReplaceAll(input, " ", "-")
|
|
}
|
|
|
|
// Checks if the given branch name is a remote branch, and returns the name of
|
|
// the remote and the bare branch name if it is.
|
|
func (self *RefsHelper) ParseRemoteBranchName(fullBranchName string) (string, string, bool) {
|
|
remoteName, branchName, found := strings.Cut(fullBranchName, "/")
|
|
if !found {
|
|
return "", "", false
|
|
}
|
|
|
|
// See if the part before the first slash is actually one of our remotes
|
|
if !lo.ContainsBy(self.c.Model().Remotes, func(remote *models.Remote) bool {
|
|
return remote.Name == remoteName
|
|
}) {
|
|
return "", "", false
|
|
}
|
|
|
|
return remoteName, branchName, true
|
|
}
|
|
|
|
func IsSwitchBranchUncommittedChangesError(err error) bool {
|
|
return strings.Contains(err.Error(), "Please commit your changes or stash them before you switch branch")
|
|
}
|
|
|
|
func (self *RefsHelper) getSuggestedBranchName() (string, error) {
|
|
suggestedBranchName, err := utils.ResolveTemplate(self.c.UserConfig().Git.BranchPrefix, nil, template.FuncMap{
|
|
"runCommand": self.c.Git().Custom.TemplateFunctionRunCommand,
|
|
})
|
|
if err != nil {
|
|
return suggestedBranchName, err
|
|
}
|
|
suggestedBranchName = strings.ReplaceAll(suggestedBranchName, "\t", " ")
|
|
return suggestedBranchName, nil
|
|
}
|