2018-08-14 11:05:26 +02:00
|
|
|
package gui
|
|
|
|
|
|
|
|
|
|
import (
|
2019-02-24 04:51:52 +02:00
|
|
|
"strconv"
|
2018-08-14 11:05:26 +02:00
|
|
|
|
2019-02-11 12:30:27 +02:00
|
|
|
"github.com/go-errors/errors"
|
|
|
|
|
|
2018-08-14 11:05:26 +02:00
|
|
|
"github.com/jesseduffield/gocui"
|
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands"
|
2020-02-25 11:11:07 +02:00
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/presentation"
|
2018-09-17 13:02:30 +02:00
|
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
2018-08-14 11:05:26 +02:00
|
|
|
)
|
|
|
|
|
|
2018-12-06 13:18:17 +02:00
|
|
|
// list panel functions
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) getSelectedCommit(g *gocui.Gui) *commands.Commit {
|
|
|
|
|
selectedLine := gui.State.Panels.Commits.SelectedLine
|
|
|
|
|
if selectedLine == -1 {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gui.State.Commits[selectedLine]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
|
2019-02-25 13:11:35 +02:00
|
|
|
if gui.popupPanelFocused() {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-05 06:11:35 +02:00
|
|
|
// this probably belongs in an 'onFocus' function than a 'commit selected' function
|
|
|
|
|
if err := gui.refreshSecondaryPatchPanel(); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-25 13:11:35 +02:00
|
|
|
if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
2019-11-10 07:20:35 +02:00
|
|
|
|
2020-01-11 09:23:35 +02:00
|
|
|
state := gui.State.Panels.Commits
|
|
|
|
|
if state.SelectedLine > 20 && state.LimitCommits {
|
|
|
|
|
state.LimitCommits = false
|
|
|
|
|
go func() {
|
|
|
|
|
if err := gui.refreshCommitsWithLimit(); err != nil {
|
|
|
|
|
_ = gui.createErrorPanel(gui.g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
}()
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-10 07:20:35 +02:00
|
|
|
gui.getMainView().Title = "Patch"
|
|
|
|
|
gui.getSecondaryView().Title = "Custom Patch"
|
2020-01-30 23:07:34 +02:00
|
|
|
gui.handleEscapeLineByLinePanel()
|
2019-11-10 07:20:35 +02:00
|
|
|
|
2018-12-06 13:18:17 +02:00
|
|
|
commit := gui.getSelectedCommit(g)
|
|
|
|
|
if commit == nil {
|
allow fast flicking through any list panel
Up till now our approach to rendering things like file diffs, branch logs, and
commit patches, has been to run a command on the command line, wait for it to
complete, take its output as a string, and then write that string to the main
view (or secondary view e.g. when showing both staged and unstaged changes of a
file).
This has caused various issues. For once, if you are flicking through a list of
files and an untracked file is particularly large, not only will this require
lazygit to load that whole file into memory (or more accurately it's equally
large diff), it also will slow down the UI thread while loading that file, and
if the user continued down the list, the original command might eventually
resolve and replace whatever the diff is for the newly selected file.
Following what we've done in lazydocker, I've added a tasks package for when you
need something done but you want it to cancel as soon as something newer comes
up. Given this typically involves running a command to display to a view, I've
added a viewBufferManagerMap struct to the Gui struct which allows you to define
these tasks on a per-view basis.
viewBufferManagers can run files and directly write the output to their view,
meaning we no longer need to use so much memory.
In the tasks package there is a helper method called NewCmdTask which takes a
command, an initial amount of lines to read, and then runs that command, reads
that number of lines, and allows for a readLines channel to tell it to read more
lines. We read more lines when we scroll or resize the window.
There is an adapter for the tasks package in a file called tasks_adapter which
wraps the functions from the tasks package in gui-specific stuff like clearing
the main view before starting the next task that wants to write to the main
view.
I've removed some small features as part of this work, namely the little headers
that were at the top of the main view for some situations. For example, we no
longer show the upstream of a selected branch. I want to re-introduce this in
the future, but I didn't want to make this tasks system too complicated, and in
order to facilitate a header section in the main view we'd need to have a task
that gets the upstream for the current branch, writes it to the header, then
tells another task to write the branch log to the main view, but without
clearing inbetween. So it would get messy. I'm thinking instead of having a
separate 'header' view atop the main view to render that kind of thing (which
can happen in another PR)
I've also simplified the 'git show' to just call 'git show' and not do anything
fancy when it comes to merge commits.
I considered using this tasks approach whenever we write to a view. The only
thing is that the renderString method currently resets the origin of a view and
I don't want to lose that. So I've left some in there that I consider harmless,
but we should probably be just using tasks now for all rendering, even if it's
just strings we can instantly make.
2020-01-11 05:54:59 +02:00
|
|
|
return gui.newStringTask("main", gui.Tr.SLocalize("NoCommitsThisBranch"))
|
2018-12-06 13:18:17 +02:00
|
|
|
}
|
|
|
|
|
|
2019-03-23 02:42:19 +02:00
|
|
|
if err := gui.focusPoint(0, gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits), v); err != nil {
|
2018-12-06 13:18:17 +02:00
|
|
|
return err
|
|
|
|
|
}
|
2019-03-23 15:46:08 +02:00
|
|
|
|
|
|
|
|
// if specific diff mode is on, don't show diff
|
|
|
|
|
if gui.State.Panels.Commits.SpecificDiffMode {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
allow fast flicking through any list panel
Up till now our approach to rendering things like file diffs, branch logs, and
commit patches, has been to run a command on the command line, wait for it to
complete, take its output as a string, and then write that string to the main
view (or secondary view e.g. when showing both staged and unstaged changes of a
file).
This has caused various issues. For once, if you are flicking through a list of
files and an untracked file is particularly large, not only will this require
lazygit to load that whole file into memory (or more accurately it's equally
large diff), it also will slow down the UI thread while loading that file, and
if the user continued down the list, the original command might eventually
resolve and replace whatever the diff is for the newly selected file.
Following what we've done in lazydocker, I've added a tasks package for when you
need something done but you want it to cancel as soon as something newer comes
up. Given this typically involves running a command to display to a view, I've
added a viewBufferManagerMap struct to the Gui struct which allows you to define
these tasks on a per-view basis.
viewBufferManagers can run files and directly write the output to their view,
meaning we no longer need to use so much memory.
In the tasks package there is a helper method called NewCmdTask which takes a
command, an initial amount of lines to read, and then runs that command, reads
that number of lines, and allows for a readLines channel to tell it to read more
lines. We read more lines when we scroll or resize the window.
There is an adapter for the tasks package in a file called tasks_adapter which
wraps the functions from the tasks package in gui-specific stuff like clearing
the main view before starting the next task that wants to write to the main
view.
I've removed some small features as part of this work, namely the little headers
that were at the top of the main view for some situations. For example, we no
longer show the upstream of a selected branch. I want to re-introduce this in
the future, but I didn't want to make this tasks system too complicated, and in
order to facilitate a header section in the main view we'd need to have a task
that gets the upstream for the current branch, writes it to the header, then
tells another task to write the branch log to the main view, but without
clearing inbetween. So it would get messy. I'm thinking instead of having a
separate 'header' view atop the main view to render that kind of thing (which
can happen in another PR)
I've also simplified the 'git show' to just call 'git show' and not do anything
fancy when it comes to merge commits.
I considered using this tasks approach whenever we write to a view. The only
thing is that the renderString method currently resets the origin of a view and
I don't want to lose that. So I've left some in there that I consider harmless,
but we should probably be just using tasks now for all rendering, even if it's
just strings we can instantly make.
2020-01-11 05:54:59 +02:00
|
|
|
cmd := gui.OSCommand.ExecutableFromString(
|
|
|
|
|
gui.GitCommand.ShowCmdStr(commit.Sha),
|
|
|
|
|
)
|
2020-03-01 03:30:48 +02:00
|
|
|
if err := gui.newPtyTask("main", cmd); err != nil {
|
allow fast flicking through any list panel
Up till now our approach to rendering things like file diffs, branch logs, and
commit patches, has been to run a command on the command line, wait for it to
complete, take its output as a string, and then write that string to the main
view (or secondary view e.g. when showing both staged and unstaged changes of a
file).
This has caused various issues. For once, if you are flicking through a list of
files and an untracked file is particularly large, not only will this require
lazygit to load that whole file into memory (or more accurately it's equally
large diff), it also will slow down the UI thread while loading that file, and
if the user continued down the list, the original command might eventually
resolve and replace whatever the diff is for the newly selected file.
Following what we've done in lazydocker, I've added a tasks package for when you
need something done but you want it to cancel as soon as something newer comes
up. Given this typically involves running a command to display to a view, I've
added a viewBufferManagerMap struct to the Gui struct which allows you to define
these tasks on a per-view basis.
viewBufferManagers can run files and directly write the output to their view,
meaning we no longer need to use so much memory.
In the tasks package there is a helper method called NewCmdTask which takes a
command, an initial amount of lines to read, and then runs that command, reads
that number of lines, and allows for a readLines channel to tell it to read more
lines. We read more lines when we scroll or resize the window.
There is an adapter for the tasks package in a file called tasks_adapter which
wraps the functions from the tasks package in gui-specific stuff like clearing
the main view before starting the next task that wants to write to the main
view.
I've removed some small features as part of this work, namely the little headers
that were at the top of the main view for some situations. For example, we no
longer show the upstream of a selected branch. I want to re-introduce this in
the future, but I didn't want to make this tasks system too complicated, and in
order to facilitate a header section in the main view we'd need to have a task
that gets the upstream for the current branch, writes it to the header, then
tells another task to write the branch log to the main view, but without
clearing inbetween. So it would get messy. I'm thinking instead of having a
separate 'header' view atop the main view to render that kind of thing (which
can happen in another PR)
I've also simplified the 'git show' to just call 'git show' and not do anything
fancy when it comes to merge commits.
I considered using this tasks approach whenever we write to a view. The only
thing is that the renderString method currently resets the origin of a view and
I don't want to lose that. So I've left some in there that I consider harmless,
but we should probably be just using tasks now for all rendering, even if it's
just strings we can instantly make.
2020-01-11 05:54:59 +02:00
|
|
|
gui.Log.Error(err)
|
2018-12-06 13:18:17 +02:00
|
|
|
}
|
allow fast flicking through any list panel
Up till now our approach to rendering things like file diffs, branch logs, and
commit patches, has been to run a command on the command line, wait for it to
complete, take its output as a string, and then write that string to the main
view (or secondary view e.g. when showing both staged and unstaged changes of a
file).
This has caused various issues. For once, if you are flicking through a list of
files and an untracked file is particularly large, not only will this require
lazygit to load that whole file into memory (or more accurately it's equally
large diff), it also will slow down the UI thread while loading that file, and
if the user continued down the list, the original command might eventually
resolve and replace whatever the diff is for the newly selected file.
Following what we've done in lazydocker, I've added a tasks package for when you
need something done but you want it to cancel as soon as something newer comes
up. Given this typically involves running a command to display to a view, I've
added a viewBufferManagerMap struct to the Gui struct which allows you to define
these tasks on a per-view basis.
viewBufferManagers can run files and directly write the output to their view,
meaning we no longer need to use so much memory.
In the tasks package there is a helper method called NewCmdTask which takes a
command, an initial amount of lines to read, and then runs that command, reads
that number of lines, and allows for a readLines channel to tell it to read more
lines. We read more lines when we scroll or resize the window.
There is an adapter for the tasks package in a file called tasks_adapter which
wraps the functions from the tasks package in gui-specific stuff like clearing
the main view before starting the next task that wants to write to the main
view.
I've removed some small features as part of this work, namely the little headers
that were at the top of the main view for some situations. For example, we no
longer show the upstream of a selected branch. I want to re-introduce this in
the future, but I didn't want to make this tasks system too complicated, and in
order to facilitate a header section in the main view we'd need to have a task
that gets the upstream for the current branch, writes it to the header, then
tells another task to write the branch log to the main view, but without
clearing inbetween. So it would get messy. I'm thinking instead of having a
separate 'header' view atop the main view to render that kind of thing (which
can happen in another PR)
I've also simplified the 'git show' to just call 'git show' and not do anything
fancy when it comes to merge commits.
I considered using this tasks approach whenever we write to a view. The only
thing is that the renderString method currently resets the origin of a view and
I don't want to lose that. So I've left some in there that I consider harmless,
but we should probably be just using tasks now for all rendering, even if it's
just strings we can instantly make.
2020-01-11 05:54:59 +02:00
|
|
|
|
|
|
|
|
return nil
|
2018-12-06 13:18:17 +02:00
|
|
|
}
|
|
|
|
|
|
2018-08-14 11:05:26 +02:00
|
|
|
func (gui *Gui) refreshCommits(g *gocui.Gui) error {
|
|
|
|
|
g.Update(func(*gocui.Gui) error {
|
2020-01-11 09:23:35 +02:00
|
|
|
// I think this is here for the sake of some kind of rebasing thing
|
|
|
|
|
gui.refreshStatus(g)
|
|
|
|
|
|
|
|
|
|
if err := gui.refreshCommitsWithLimit(); err != nil {
|
2018-09-25 12:11:33 +02:00
|
|
|
return err
|
|
|
|
|
}
|
2018-09-17 13:02:30 +02:00
|
|
|
|
2020-01-09 12:34:17 +02:00
|
|
|
// doing this async because it shouldn't hold anything up
|
|
|
|
|
go func() {
|
|
|
|
|
if err := gui.refreshReflogCommits(); err != nil {
|
|
|
|
|
_ = gui.createErrorPanel(gui.g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
}()
|
2018-09-17 13:02:30 +02:00
|
|
|
|
2019-11-16 03:41:04 +02:00
|
|
|
if g.CurrentView() == gui.getCommitFilesView() || (g.CurrentView() == gui.getMainView() || gui.State.MainContext == "patch-building") {
|
2019-03-12 10:20:19 +02:00
|
|
|
return gui.refreshCommitFilesView()
|
2019-03-11 04:04:08 +02:00
|
|
|
}
|
2018-08-14 11:05:26 +02:00
|
|
|
return nil
|
|
|
|
|
})
|
|
|
|
|
return nil
|
2020-01-11 09:23:35 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) refreshCommitsWithLimit() error {
|
|
|
|
|
builder, err := commands.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.CherryPickedCommits, gui.State.DiffEntries)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
commits, err := builder.GetCommits(gui.State.Panels.Commits.LimitCommits)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
gui.State.Commits = commits
|
|
|
|
|
|
|
|
|
|
if gui.getCommitsView().Context == "branch-commits" {
|
|
|
|
|
if err := gui.renderBranchCommitsWithSelection(); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nil
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
|
|
|
|
|
2018-12-06 13:18:17 +02:00
|
|
|
// specific functions
|
|
|
|
|
|
2018-08-14 11:05:26 +02:00
|
|
|
func (gui *Gui) handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error {
|
2019-11-05 06:19:43 +02:00
|
|
|
return gui.createConfirmationPanel(g, commitView, true, gui.Tr.SLocalize("ResetToCommit"), gui.Tr.SLocalize("SureResetThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
|
2018-12-04 10:50:11 +02:00
|
|
|
commit := gui.getSelectedCommit(g)
|
|
|
|
|
if commit == nil {
|
|
|
|
|
panic(errors.New(gui.Tr.SLocalize("NoCommitsThisBranch")))
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2019-04-02 10:53:16 +02:00
|
|
|
|
|
|
|
|
if err := gui.GitCommand.ResetToCommit(commit.Sha, "mixed"); err != nil {
|
2018-08-14 11:05:26 +02:00
|
|
|
return gui.createErrorPanel(g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
if err := gui.refreshCommits(g); err != nil {
|
|
|
|
|
panic(err)
|
|
|
|
|
}
|
2018-12-08 07:54:54 +02:00
|
|
|
if err := gui.refreshFiles(); err != nil {
|
2018-08-14 11:05:26 +02:00
|
|
|
panic(err)
|
|
|
|
|
}
|
|
|
|
|
gui.resetOrigin(commitView)
|
2018-12-07 09:52:31 +02:00
|
|
|
gui.State.Panels.Commits.SelectedLine = 0
|
|
|
|
|
return gui.handleCommitSelect(g, commitView)
|
2018-08-14 11:05:26 +02:00
|
|
|
}, nil)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
|
2018-12-04 10:50:11 +02:00
|
|
|
if len(gui.State.Commits) <= 1 {
|
2018-08-16 07:16:32 +02:00
|
|
|
return gui.createErrorPanel(g, gui.Tr.SLocalize("YouNoCommitsToSquash"))
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2019-02-19 14:36:29 +02:00
|
|
|
|
|
|
|
|
applied, err := gui.handleMidRebaseCommand("squash")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2019-02-19 14:36:29 +02:00
|
|
|
if applied {
|
|
|
|
|
return nil
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2019-02-19 14:36:29 +02:00
|
|
|
|
2019-11-05 06:19:43 +02:00
|
|
|
gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Squash"), gui.Tr.SLocalize("SureSquashThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
|
2019-03-03 07:11:20 +02:00
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("SquashingStatus"), func() error {
|
2019-03-03 06:21:33 +02:00
|
|
|
err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "squash")
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
2019-02-19 14:36:29 +02:00
|
|
|
}, nil)
|
|
|
|
|
return nil
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: move to files panel
|
2018-09-17 13:02:30 +02:00
|
|
|
func (gui *Gui) anyUnStagedChanges(files []*commands.File) bool {
|
2018-08-14 11:05:26 +02:00
|
|
|
for _, file := range files {
|
|
|
|
|
if file.Tracked && file.HasUnstagedChanges {
|
|
|
|
|
return true
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitFixup(g *gocui.Gui, v *gocui.View) error {
|
2018-12-04 10:50:11 +02:00
|
|
|
if len(gui.State.Commits) <= 1 {
|
2018-08-16 07:16:32 +02:00
|
|
|
return gui.createErrorPanel(g, gui.Tr.SLocalize("YouNoCommitsToSquash"))
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2019-02-19 14:36:29 +02:00
|
|
|
|
|
|
|
|
applied, err := gui.handleMidRebaseCommand("fixup")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2019-02-19 14:36:29 +02:00
|
|
|
if applied {
|
|
|
|
|
return nil
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2019-02-19 14:36:29 +02:00
|
|
|
|
2019-11-05 06:19:43 +02:00
|
|
|
gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Fixup"), gui.Tr.SLocalize("SureFixupThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
|
2019-03-03 07:11:20 +02:00
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("FixingStatus"), func() error {
|
2019-03-03 06:21:33 +02:00
|
|
|
err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "fixup")
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
2018-08-14 11:05:26 +02:00
|
|
|
}, nil)
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
|
2019-02-19 14:36:29 +02:00
|
|
|
applied, err := gui.handleMidRebaseCommand("reword")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if applied {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2018-12-06 13:18:17 +02:00
|
|
|
if gui.State.Panels.Commits.SelectedLine != 0 {
|
2018-08-16 07:16:32 +02:00
|
|
|
return gui.createErrorPanel(g, gui.Tr.SLocalize("OnlyRenameTopCommit"))
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2019-11-11 14:22:09 +02:00
|
|
|
return gui.createPromptPanel(g, v, gui.Tr.SLocalize("renameCommit"), "", func(g *gocui.Gui, v *gocui.View) error {
|
2018-08-14 11:05:26 +02:00
|
|
|
if err := gui.GitCommand.RenameCommit(v.Buffer()); err != nil {
|
|
|
|
|
return gui.createErrorPanel(g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
if err := gui.refreshCommits(g); err != nil {
|
|
|
|
|
panic(err)
|
|
|
|
|
}
|
|
|
|
|
return gui.handleCommitSelect(g, v)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-29 14:27:17 +02:00
|
|
|
func (gui *Gui) handleRenameCommitEditor(g *gocui.Gui, v *gocui.View) error {
|
2019-02-19 14:36:29 +02:00
|
|
|
applied, err := gui.handleMidRebaseCommand("reword")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if applied {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-18 14:27:54 +02:00
|
|
|
subProcess, err := gui.GitCommand.RewordCommit(gui.State.Commits, gui.State.Panels.Commits.SelectedLine)
|
2019-02-18 12:29:43 +02:00
|
|
|
if err != nil {
|
2019-02-18 14:27:54 +02:00
|
|
|
return gui.createErrorPanel(gui.g, err.Error())
|
2018-08-29 14:27:17 +02:00
|
|
|
}
|
2019-02-18 12:29:43 +02:00
|
|
|
if subProcess != nil {
|
|
|
|
|
gui.SubProcess = subProcess
|
2018-08-29 14:27:17 +02:00
|
|
|
return gui.Errors.ErrSubProcess
|
2019-02-18 12:29:43 +02:00
|
|
|
}
|
2018-08-29 14:27:17 +02:00
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
}
|
2019-02-18 14:27:54 +02:00
|
|
|
|
2019-02-19 14:36:29 +02:00
|
|
|
// handleMidRebaseCommand sees if the selected commit is in fact a rebasing
|
|
|
|
|
// commit meaning you are trying to edit the todo file rather than actually
|
|
|
|
|
// begin a rebase. It then updates the todo file with that action
|
|
|
|
|
func (gui *Gui) handleMidRebaseCommand(action string) (bool, error) {
|
2019-02-24 00:42:24 +02:00
|
|
|
selectedCommit := gui.State.Commits[gui.State.Panels.Commits.SelectedLine]
|
|
|
|
|
if selectedCommit.Status != "rebasing" {
|
|
|
|
|
return false, nil
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-20 13:52:17 +02:00
|
|
|
// for now we do not support setting 'reword' because it requires an editor
|
|
|
|
|
// and that means we either unconditionally wait around for the subprocess to ask for
|
|
|
|
|
// our input or we set a lazygit client as the EDITOR env variable and have it
|
|
|
|
|
// request us to edit the commit message when prompted.
|
|
|
|
|
if action == "reword" {
|
|
|
|
|
return true, gui.createErrorPanel(gui.g, gui.Tr.SLocalize("rewordNotSupported"))
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-19 14:36:29 +02:00
|
|
|
if err := gui.GitCommand.EditRebaseTodo(gui.State.Panels.Commits.SelectedLine, action); err != nil {
|
|
|
|
|
return false, gui.createErrorPanel(gui.g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
return true, gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-20 11:51:24 +02:00
|
|
|
// handleMoveTodoDown like handleMidRebaseCommand but for moving an item up in the todo list
|
|
|
|
|
func (gui *Gui) handleMoveTodoDown(index int) (bool, error) {
|
|
|
|
|
selectedCommit := gui.State.Commits[index]
|
|
|
|
|
if selectedCommit.Status != "rebasing" {
|
|
|
|
|
return false, nil
|
|
|
|
|
}
|
|
|
|
|
if gui.State.Commits[index+1].Status != "rebasing" {
|
|
|
|
|
return true, nil
|
|
|
|
|
}
|
|
|
|
|
if err := gui.GitCommand.MoveTodoDown(index); err != nil {
|
|
|
|
|
return true, gui.createErrorPanel(gui.g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
return true, gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-18 14:27:54 +02:00
|
|
|
func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error {
|
2019-02-19 14:36:29 +02:00
|
|
|
applied, err := gui.handleMidRebaseCommand("drop")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if applied {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-05 06:19:43 +02:00
|
|
|
return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("DeleteCommitTitle"), gui.Tr.SLocalize("DeleteCommitPrompt"), func(*gocui.Gui, *gocui.View) error {
|
2019-03-03 07:11:20 +02:00
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("DeletingStatus"), func() error {
|
2019-03-03 06:21:33 +02:00
|
|
|
err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "drop")
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
2019-02-18 14:27:54 +02:00
|
|
|
}, nil)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitMoveDown(g *gocui.Gui, v *gocui.View) error {
|
2019-02-20 11:51:24 +02:00
|
|
|
index := gui.State.Panels.Commits.SelectedLine
|
|
|
|
|
selectedCommit := gui.State.Commits[index]
|
|
|
|
|
if selectedCommit.Status == "rebasing" {
|
|
|
|
|
if gui.State.Commits[index+1].Status != "rebasing" {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
if err := gui.GitCommand.MoveTodoDown(index); err != nil {
|
|
|
|
|
return gui.createErrorPanel(gui.g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
gui.State.Panels.Commits.SelectedLine++
|
|
|
|
|
return gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
2019-02-18 14:27:54 +02:00
|
|
|
|
2019-03-03 07:11:20 +02:00
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("MovingStatus"), func() error {
|
2019-03-03 06:21:33 +02:00
|
|
|
err := gui.GitCommand.MoveCommitDown(gui.State.Commits, index)
|
|
|
|
|
if err == nil {
|
|
|
|
|
gui.State.Panels.Commits.SelectedLine++
|
|
|
|
|
}
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
2019-02-18 14:27:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitMoveUp(g *gocui.Gui, v *gocui.View) error {
|
2019-02-20 11:51:24 +02:00
|
|
|
index := gui.State.Panels.Commits.SelectedLine
|
|
|
|
|
if index == 0 {
|
|
|
|
|
return nil
|
2019-02-18 14:27:54 +02:00
|
|
|
}
|
2019-02-20 11:51:24 +02:00
|
|
|
selectedCommit := gui.State.Commits[index]
|
|
|
|
|
if selectedCommit.Status == "rebasing" {
|
|
|
|
|
if err := gui.GitCommand.MoveTodoDown(index - 1); err != nil {
|
|
|
|
|
return gui.createErrorPanel(gui.g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
gui.State.Panels.Commits.SelectedLine--
|
|
|
|
|
return gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
2019-02-18 14:27:54 +02:00
|
|
|
|
2019-03-03 07:11:20 +02:00
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("MovingStatus"), func() error {
|
2019-03-03 06:21:33 +02:00
|
|
|
err := gui.GitCommand.MoveCommitDown(gui.State.Commits, index-1)
|
|
|
|
|
if err == nil {
|
|
|
|
|
gui.State.Panels.Commits.SelectedLine--
|
|
|
|
|
}
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
2019-02-18 14:27:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitEdit(g *gocui.Gui, v *gocui.View) error {
|
2019-02-19 14:36:29 +02:00
|
|
|
applied, err := gui.handleMidRebaseCommand("edit")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if applied {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-03 07:11:20 +02:00
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
|
2019-03-03 06:21:33 +02:00
|
|
|
err = gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "edit")
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
2019-02-18 14:27:54 +02:00
|
|
|
}
|
2019-02-19 14:36:29 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitAmendTo(g *gocui.Gui, v *gocui.View) error {
|
2019-11-05 06:19:43 +02:00
|
|
|
return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("AmendCommitTitle"), gui.Tr.SLocalize("AmendCommitPrompt"), func(*gocui.Gui, *gocui.View) error {
|
2019-03-03 07:11:20 +02:00
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("AmendingStatus"), func() error {
|
2019-03-03 06:21:33 +02:00
|
|
|
err := gui.GitCommand.AmendTo(gui.State.Commits[gui.State.Panels.Commits.SelectedLine].Sha)
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
2019-02-20 10:46:27 +02:00
|
|
|
}, nil)
|
2019-02-19 14:36:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitPick(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
applied, err := gui.handleMidRebaseCommand("pick")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
if applied {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// at this point we aren't actually rebasing so we will interpret this as an
|
|
|
|
|
// attempt to pull. We might revoke this later after enabling configurable keybindings
|
2019-11-13 12:16:24 +02:00
|
|
|
return gui.handlePullFiles(g, v)
|
2019-02-19 14:36:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCommitRevert(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
if err := gui.GitCommand.Revert(gui.State.Commits[gui.State.Panels.Commits.SelectedLine].Sha); err != nil {
|
|
|
|
|
return gui.createErrorPanel(gui.g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
gui.State.Panels.Commits.SelectedLine++
|
|
|
|
|
return gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
2019-02-24 04:51:52 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) handleCopyCommit(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
// get currently selected commit, add the sha to state.
|
2019-02-24 08:34:19 +02:00
|
|
|
commit := gui.State.Commits[gui.State.Panels.Commits.SelectedLine]
|
2019-02-24 04:51:52 +02:00
|
|
|
|
|
|
|
|
// we will un-copy it if it's already copied
|
2019-02-24 08:34:19 +02:00
|
|
|
for index, cherryPickedCommit := range gui.State.CherryPickedCommits {
|
|
|
|
|
if commit.Sha == cherryPickedCommit.Sha {
|
|
|
|
|
gui.State.CherryPickedCommits = append(gui.State.CherryPickedCommits[0:index], gui.State.CherryPickedCommits[index+1:]...)
|
2019-02-24 04:51:52 +02:00
|
|
|
return gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-24 08:34:19 +02:00
|
|
|
gui.addCommitToCherryPickedCommits(gui.State.Panels.Commits.SelectedLine)
|
2019-02-24 04:51:52 +02:00
|
|
|
return gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-24 08:34:19 +02:00
|
|
|
func (gui *Gui) addCommitToCherryPickedCommits(index int) {
|
2019-02-24 04:51:52 +02:00
|
|
|
// not super happy with modifying the state of the Commits array here
|
|
|
|
|
// but the alternative would be very tricky
|
|
|
|
|
gui.State.Commits[index].Copied = true
|
|
|
|
|
|
2019-02-24 08:34:19 +02:00
|
|
|
newCommits := []*commands.Commit{}
|
2019-02-24 04:51:52 +02:00
|
|
|
for _, commit := range gui.State.Commits {
|
|
|
|
|
if commit.Copied {
|
2019-02-24 08:34:19 +02:00
|
|
|
// duplicating just the things we need to put in the rebase TODO list
|
|
|
|
|
newCommits = append(newCommits, &commands.Commit{Name: commit.Name, Sha: commit.Sha})
|
2019-02-24 04:51:52 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-24 08:34:19 +02:00
|
|
|
gui.State.CherryPickedCommits = newCommits
|
2019-02-24 04:51:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCopyCommitRange(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
// whenever I add a commit, I need to make sure I retain its order
|
|
|
|
|
|
|
|
|
|
// find the last commit that is copied that's above our position
|
|
|
|
|
// if there are none, startIndex = 0
|
|
|
|
|
startIndex := 0
|
|
|
|
|
for index, commit := range gui.State.Commits[0:gui.State.Panels.Commits.SelectedLine] {
|
|
|
|
|
if commit.Copied {
|
|
|
|
|
startIndex = index
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gui.Log.Info("commit copy start index: " + strconv.Itoa(startIndex))
|
|
|
|
|
|
|
|
|
|
for index := startIndex; index <= gui.State.Panels.Commits.SelectedLine; index++ {
|
2019-02-24 08:34:19 +02:00
|
|
|
gui.addCommitToCherryPickedCommits(index)
|
2019-02-24 04:51:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied
|
|
|
|
|
func (gui *Gui) HandlePasteCommits(g *gocui.Gui, v *gocui.View) error {
|
2019-11-05 06:19:43 +02:00
|
|
|
return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("CherryPick"), gui.Tr.SLocalize("SureCherryPick"), func(g *gocui.Gui, v *gocui.View) error {
|
2019-03-03 07:11:20 +02:00
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("CherryPickingStatus"), func() error {
|
|
|
|
|
err := gui.GitCommand.CherryPickCommits(gui.State.CherryPickedCommits)
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
2019-02-24 04:51:52 +02:00
|
|
|
}, nil)
|
|
|
|
|
}
|
2019-03-09 16:42:10 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) handleSwitchToCommitFilesPanel(g *gocui.Gui, v *gocui.View) error {
|
2019-03-11 04:04:08 +02:00
|
|
|
if err := gui.refreshCommitFilesView(); err != nil {
|
2019-03-09 16:42:10 +02:00
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-10 07:20:35 +02:00
|
|
|
return gui.switchFocus(g, gui.getCommitsView(), gui.getCommitFilesView())
|
2019-03-09 16:42:10 +02:00
|
|
|
}
|
2019-03-23 15:46:08 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) handleToggleDiffCommit(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
selectLimit := 2
|
|
|
|
|
|
|
|
|
|
// get selected commit
|
|
|
|
|
commit := gui.getSelectedCommit(g)
|
|
|
|
|
if commit == nil {
|
allow fast flicking through any list panel
Up till now our approach to rendering things like file diffs, branch logs, and
commit patches, has been to run a command on the command line, wait for it to
complete, take its output as a string, and then write that string to the main
view (or secondary view e.g. when showing both staged and unstaged changes of a
file).
This has caused various issues. For once, if you are flicking through a list of
files and an untracked file is particularly large, not only will this require
lazygit to load that whole file into memory (or more accurately it's equally
large diff), it also will slow down the UI thread while loading that file, and
if the user continued down the list, the original command might eventually
resolve and replace whatever the diff is for the newly selected file.
Following what we've done in lazydocker, I've added a tasks package for when you
need something done but you want it to cancel as soon as something newer comes
up. Given this typically involves running a command to display to a view, I've
added a viewBufferManagerMap struct to the Gui struct which allows you to define
these tasks on a per-view basis.
viewBufferManagers can run files and directly write the output to their view,
meaning we no longer need to use so much memory.
In the tasks package there is a helper method called NewCmdTask which takes a
command, an initial amount of lines to read, and then runs that command, reads
that number of lines, and allows for a readLines channel to tell it to read more
lines. We read more lines when we scroll or resize the window.
There is an adapter for the tasks package in a file called tasks_adapter which
wraps the functions from the tasks package in gui-specific stuff like clearing
the main view before starting the next task that wants to write to the main
view.
I've removed some small features as part of this work, namely the little headers
that were at the top of the main view for some situations. For example, we no
longer show the upstream of a selected branch. I want to re-introduce this in
the future, but I didn't want to make this tasks system too complicated, and in
order to facilitate a header section in the main view we'd need to have a task
that gets the upstream for the current branch, writes it to the header, then
tells another task to write the branch log to the main view, but without
clearing inbetween. So it would get messy. I'm thinking instead of having a
separate 'header' view atop the main view to render that kind of thing (which
can happen in another PR)
I've also simplified the 'git show' to just call 'git show' and not do anything
fancy when it comes to merge commits.
I considered using this tasks approach whenever we write to a view. The only
thing is that the renderString method currently resets the origin of a view and
I don't want to lose that. So I've left some in there that I consider harmless,
but we should probably be just using tasks now for all rendering, even if it's
just strings we can instantly make.
2020-01-11 05:54:59 +02:00
|
|
|
return gui.newStringTask("main", gui.Tr.SLocalize("NoCommitsThisBranch"))
|
2019-03-23 15:46:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// if already selected commit delete
|
2019-03-28 11:58:34 +02:00
|
|
|
if idx, has := gui.hasCommit(gui.State.DiffEntries, commit.Sha); has {
|
|
|
|
|
gui.State.DiffEntries = gui.unchooseCommit(gui.State.DiffEntries, idx)
|
2019-03-23 15:46:08 +02:00
|
|
|
} else {
|
|
|
|
|
if len(gui.State.DiffEntries) == selectLimit {
|
2019-03-28 11:58:34 +02:00
|
|
|
gui.State.DiffEntries = gui.unchooseCommit(gui.State.DiffEntries, 0)
|
2019-03-23 15:46:08 +02:00
|
|
|
}
|
2019-03-28 11:58:34 +02:00
|
|
|
gui.State.DiffEntries = append(gui.State.DiffEntries, commit)
|
2019-03-23 15:46:08 +02:00
|
|
|
}
|
|
|
|
|
|
2019-03-28 11:58:34 +02:00
|
|
|
gui.setDiffMode()
|
2019-03-23 15:46:08 +02:00
|
|
|
|
2019-03-28 11:58:34 +02:00
|
|
|
// if selected two commits, display diff between
|
|
|
|
|
if len(gui.State.DiffEntries) == selectLimit {
|
|
|
|
|
commitText, err := gui.GitCommand.DiffCommits(gui.State.DiffEntries[0].Sha, gui.State.DiffEntries[1].Sha)
|
2019-03-23 15:46:08 +02:00
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
return gui.createErrorPanel(gui.g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
|
allow fast flicking through any list panel
Up till now our approach to rendering things like file diffs, branch logs, and
commit patches, has been to run a command on the command line, wait for it to
complete, take its output as a string, and then write that string to the main
view (or secondary view e.g. when showing both staged and unstaged changes of a
file).
This has caused various issues. For once, if you are flicking through a list of
files and an untracked file is particularly large, not only will this require
lazygit to load that whole file into memory (or more accurately it's equally
large diff), it also will slow down the UI thread while loading that file, and
if the user continued down the list, the original command might eventually
resolve and replace whatever the diff is for the newly selected file.
Following what we've done in lazydocker, I've added a tasks package for when you
need something done but you want it to cancel as soon as something newer comes
up. Given this typically involves running a command to display to a view, I've
added a viewBufferManagerMap struct to the Gui struct which allows you to define
these tasks on a per-view basis.
viewBufferManagers can run files and directly write the output to their view,
meaning we no longer need to use so much memory.
In the tasks package there is a helper method called NewCmdTask which takes a
command, an initial amount of lines to read, and then runs that command, reads
that number of lines, and allows for a readLines channel to tell it to read more
lines. We read more lines when we scroll or resize the window.
There is an adapter for the tasks package in a file called tasks_adapter which
wraps the functions from the tasks package in gui-specific stuff like clearing
the main view before starting the next task that wants to write to the main
view.
I've removed some small features as part of this work, namely the little headers
that were at the top of the main view for some situations. For example, we no
longer show the upstream of a selected branch. I want to re-introduce this in
the future, but I didn't want to make this tasks system too complicated, and in
order to facilitate a header section in the main view we'd need to have a task
that gets the upstream for the current branch, writes it to the header, then
tells another task to write the branch log to the main view, but without
clearing inbetween. So it would get messy. I'm thinking instead of having a
separate 'header' view atop the main view to render that kind of thing (which
can happen in another PR)
I've also simplified the 'git show' to just call 'git show' and not do anything
fancy when it comes to merge commits.
I considered using this tasks approach whenever we write to a view. The only
thing is that the renderString method currently resets the origin of a view and
I don't want to lose that. So I've left some in there that I consider harmless,
but we should probably be just using tasks now for all rendering, even if it's
just strings we can instantly make.
2020-01-11 05:54:59 +02:00
|
|
|
return gui.newStringTask("main", commitText)
|
2019-03-23 15:46:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) setDiffMode() {
|
|
|
|
|
v := gui.getCommitsView()
|
|
|
|
|
if len(gui.State.DiffEntries) != 0 {
|
|
|
|
|
gui.State.Panels.Commits.SpecificDiffMode = true
|
|
|
|
|
v.Title = gui.Tr.SLocalize("CommitsDiffTitle")
|
|
|
|
|
} else {
|
|
|
|
|
gui.State.Panels.Commits.SpecificDiffMode = false
|
|
|
|
|
v.Title = gui.Tr.SLocalize("CommitsTitle")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gui.refreshCommits(gui.g)
|
|
|
|
|
}
|
2019-03-28 11:58:34 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) hasCommit(commits []*commands.Commit, target string) (int, bool) {
|
|
|
|
|
for idx, commit := range commits {
|
|
|
|
|
if commit.Sha == target {
|
|
|
|
|
return idx, true
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return -1, false
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) unchooseCommit(commits []*commands.Commit, i int) []*commands.Commit {
|
|
|
|
|
return append(commits[:i], commits[i+1:]...)
|
|
|
|
|
}
|
2019-04-07 03:35:34 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) handleCreateFixupCommit(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
commit := gui.getSelectedCommit(g)
|
|
|
|
|
if commit == nil {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-05 06:19:43 +02:00
|
|
|
return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("CreateFixupCommit"), gui.Tr.TemplateLocalize(
|
2019-04-07 03:35:34 +02:00
|
|
|
"SureCreateFixupCommit",
|
|
|
|
|
Teml{
|
|
|
|
|
"commit": commit.Sha,
|
|
|
|
|
},
|
|
|
|
|
), func(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
if err := gui.GitCommand.CreateFixupCommit(commit.Sha); err != nil {
|
|
|
|
|
return gui.createErrorPanel(g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gui.refreshSidePanels(gui.g)
|
|
|
|
|
}, nil)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleSquashAllAboveFixupCommits(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
commit := gui.getSelectedCommit(g)
|
|
|
|
|
if commit == nil {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-05 06:19:43 +02:00
|
|
|
return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("SquashAboveCommits"), gui.Tr.TemplateLocalize(
|
2019-04-07 03:35:34 +02:00
|
|
|
"SureSquashAboveCommits",
|
|
|
|
|
Teml{
|
|
|
|
|
"commit": commit.Sha,
|
|
|
|
|
},
|
|
|
|
|
), func(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
return gui.WithWaitingStatus(gui.Tr.SLocalize("SquashingStatus"), func() error {
|
|
|
|
|
err := gui.GitCommand.SquashAllAboveFixupCommits(commit.Sha)
|
|
|
|
|
return gui.handleGenericMergeCommandResult(err)
|
|
|
|
|
})
|
|
|
|
|
}, nil)
|
|
|
|
|
}
|
2019-04-02 10:53:16 +02:00
|
|
|
|
2019-11-18 00:38:36 +02:00
|
|
|
func (gui *Gui) handleTagCommit(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
// TODO: bring up menu asking if you want to make a lightweight or annotated tag
|
|
|
|
|
// if annotated, switch to a subprocess to create the message
|
|
|
|
|
|
|
|
|
|
commit := gui.getSelectedCommit(g)
|
|
|
|
|
if commit == nil {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gui.handleCreateLightweightTag(commit.Sha)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleCreateLightweightTag(commitSha string) error {
|
|
|
|
|
return gui.createPromptPanel(gui.g, gui.getCommitsView(), gui.Tr.SLocalize("TagNameTitle"), "", func(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
if err := gui.GitCommand.CreateLightweightTag(v.Buffer(), commitSha); err != nil {
|
|
|
|
|
return gui.createErrorPanel(g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
if err := gui.refreshCommits(g); err != nil {
|
|
|
|
|
return gui.createErrorPanel(g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
if err := gui.refreshTags(); err != nil {
|
|
|
|
|
return gui.createErrorPanel(g, err.Error())
|
|
|
|
|
}
|
|
|
|
|
return gui.handleCommitSelect(g, v)
|
|
|
|
|
})
|
|
|
|
|
}
|
2020-01-07 11:24:10 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) handleCheckoutCommit(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
commit := gui.getSelectedCommit(g)
|
|
|
|
|
if commit == nil {
|
2020-01-09 13:08:28 +02:00
|
|
|
return nil
|
2020-01-07 11:24:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
return gui.handleCheckoutRef(commit.Sha)
|
|
|
|
|
}, nil)
|
|
|
|
|
}
|
2020-01-09 12:34:17 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) renderBranchCommitsWithSelection() error {
|
|
|
|
|
commitsView := gui.getCommitsView()
|
|
|
|
|
|
|
|
|
|
gui.refreshSelectedLine(&gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits))
|
2020-02-25 11:11:07 +02:00
|
|
|
displayStrings := presentation.GetCommitListDisplayStrings(gui.State.Commits, gui.State.ScreenMode != SCREEN_NORMAL)
|
|
|
|
|
gui.renderDisplayStrings(commitsView, displayStrings)
|
2020-01-09 12:34:17 +02:00
|
|
|
if gui.g.CurrentView() == commitsView && commitsView.Context == "branch-commits" {
|
|
|
|
|
if err := gui.handleCommitSelect(gui.g, commitsView); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) onCommitsTabClick(tabIndex int) error {
|
|
|
|
|
contexts := []string{"branch-commits", "reflog-commits"}
|
|
|
|
|
commitsView := gui.getCommitsView()
|
|
|
|
|
commitsView.TabIndex = tabIndex
|
|
|
|
|
|
|
|
|
|
return gui.switchCommitsPanelContext(contexts[tabIndex])
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) switchCommitsPanelContext(context string) error {
|
|
|
|
|
commitsView := gui.getCommitsView()
|
|
|
|
|
commitsView.Context = context
|
2020-02-24 13:15:10 +02:00
|
|
|
gui.onSearchEscape()
|
2020-01-09 12:34:17 +02:00
|
|
|
|
|
|
|
|
contextTabIndexMap := map[string]int{
|
|
|
|
|
"branch-commits": 0,
|
|
|
|
|
"reflog-commits": 1,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
commitsView.TabIndex = contextTabIndexMap[context]
|
|
|
|
|
|
2020-02-25 11:55:36 +02:00
|
|
|
return gui.refreshCommitsViewWithSelection()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) refreshCommitsViewWithSelection() error {
|
|
|
|
|
commitsView := gui.getCommitsView()
|
|
|
|
|
|
|
|
|
|
switch commitsView.Context {
|
2020-01-09 12:34:17 +02:00
|
|
|
case "branch-commits":
|
|
|
|
|
return gui.renderBranchCommitsWithSelection()
|
|
|
|
|
case "reflog-commits":
|
|
|
|
|
return gui.renderReflogCommitsWithSelection()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleNextCommitsTab(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
return gui.onCommitsTabClick(
|
|
|
|
|
utils.ModuloWithWrap(v.TabIndex+1, len(v.Tabs)),
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handlePrevCommitsTab(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
return gui.onCommitsTabClick(
|
|
|
|
|
utils.ModuloWithWrap(v.TabIndex-1, len(v.Tabs)),
|
|
|
|
|
)
|
|
|
|
|
}
|
2020-02-15 23:59:48 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) handleCreateCommitResetMenu(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
commit := gui.getSelectedCommit(g)
|
|
|
|
|
if commit == nil {
|
|
|
|
|
return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoCommitsThisBranch"))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gui.createResetMenu(commit.Sha)
|
|
|
|
|
}
|
2020-02-23 12:53:30 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) onCommitsPanelSearchSelect(selectedLine int) error {
|
|
|
|
|
commitsView := gui.getCommitsView()
|
|
|
|
|
switch commitsView.Context {
|
|
|
|
|
case "branch-commits":
|
|
|
|
|
gui.State.Panels.Commits.SelectedLine = selectedLine
|
|
|
|
|
return gui.handleCommitSelect(gui.g, commitsView)
|
|
|
|
|
case "reflog-commits":
|
|
|
|
|
gui.State.Panels.ReflogCommits.SelectedLine = selectedLine
|
|
|
|
|
return gui.handleReflogCommitSelect(gui.g, commitsView)
|
|
|
|
|
}
|
|
|
|
|
return nil
|
|
|
|
|
}
|
2020-02-23 13:00:42 +02:00
|
|
|
|
|
|
|
|
func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) error {
|
|
|
|
|
// we usually lazyload these commits but now that we're searching we need to load them now
|
|
|
|
|
if gui.State.Panels.Commits.LimitCommits {
|
|
|
|
|
gui.State.Panels.Commits.LimitCommits = false
|
|
|
|
|
if err := gui.refreshCommits(gui.g); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gui.handleOpenSearch(gui.g, v)
|
|
|
|
|
}
|
