2018-08-14 11:05:26 +02:00
|
|
|
package gui
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"github.com/jesseduffield/gocui"
|
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands"
|
2020-02-25 11:55:36 +02:00
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/presentation"
|
2018-08-14 11:05:26 +02:00
|
|
|
)
|
|
|
|
|
|
2018-12-06 13:18:17 +02:00
|
|
|
// list panel functions
|
|
|
|
|
|
2020-03-29 05:34:17 +02:00
|
|
|
func (gui *Gui) getSelectedStashEntry() *commands.StashEntry {
|
2018-12-06 13:18:17 +02:00
|
|
|
selectedLine := gui.State.Panels.Stash.SelectedLine
|
|
|
|
|
if selectedLine == -1 {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gui.State.StashEntries[selectedLine]
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-15 09:01:43 +02:00
|
|
|
func (gui *Gui) handleStashEntrySelect() error {
|
2019-02-25 13:11:35 +02:00
|
|
|
if gui.popupPanelFocused() {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-05 06:11:35 +02:00
|
|
|
gui.State.SplitMainPanel = false
|
|
|
|
|
|
2020-08-15 09:01:43 +02:00
|
|
|
if _, err := gui.g.SetCurrentView("stash"); err != nil {
|
2019-02-25 13:11:35 +02:00
|
|
|
return err
|
|
|
|
|
}
|
2019-11-10 07:20:35 +02:00
|
|
|
|
|
|
|
|
gui.getMainView().Title = "Stash"
|
|
|
|
|
|
2020-03-29 05:34:17 +02:00
|
|
|
stashEntry := gui.getSelectedStashEntry()
|
2018-12-06 13:18:17 +02:00
|
|
|
if stashEntry == 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("NoStashEntries"))
|
2018-12-06 13:18:17 +02:00
|
|
|
}
|
2020-08-15 09:01:43 +02:00
|
|
|
gui.getStashView().FocusPoint(0, gui.State.Panels.Stash.SelectedLine)
|
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
|
|
|
|
2020-03-29 05:34:17 +02:00
|
|
|
if gui.inDiffMode() {
|
|
|
|
|
return gui.renderDiff()
|
|
|
|
|
}
|
|
|
|
|
|
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.ShowStashEntryCmdStr(stashEntry.Index),
|
|
|
|
|
)
|
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
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-14 11:05:26 +02:00
|
|
|
func (gui *Gui) refreshStashEntries(g *gocui.Gui) error {
|
2020-03-29 01:11:15 +02:00
|
|
|
gui.State.StashEntries = gui.GitCommand.GetStashEntries(gui.State.FilterPath)
|
2018-09-12 10:23:25 +02:00
|
|
|
|
2020-03-27 12:20:45 +02:00
|
|
|
gui.refreshSelectedLine(&gui.State.Panels.Stash.SelectedLine, len(gui.State.StashEntries))
|
2018-12-06 13:18:17 +02:00
|
|
|
|
2020-03-27 12:20:45 +02:00
|
|
|
stashView := gui.getStashView()
|
2018-12-06 13:18:17 +02:00
|
|
|
|
2020-03-29 05:34:17 +02:00
|
|
|
displayStrings := presentation.GetStashEntryListDisplayStrings(gui.State.StashEntries, gui.State.Diff.Ref)
|
2020-03-27 12:20:45 +02:00
|
|
|
gui.renderDisplayStrings(stashView, displayStrings)
|
2018-09-12 10:23:25 +02:00
|
|
|
|
2020-03-27 12:20:45 +02:00
|
|
|
return gui.resetOrigin(stashView)
|
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) handleStashApply(g *gocui.Gui, v *gocui.View) error {
|
2020-04-20 10:53:40 +02:00
|
|
|
skipStashWarning := gui.Config.GetUserConfig().GetBool("gui.skipStashWarning")
|
|
|
|
|
|
|
|
|
|
apply := func() error {
|
2020-08-15 09:23:16 +02:00
|
|
|
return gui.stashDo("apply")
|
2020-04-20 10:53:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if skipStashWarning {
|
|
|
|
|
return apply()
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-15 08:38:16 +02:00
|
|
|
return gui.ask(askOpts{
|
2020-08-15 08:36:39 +02:00
|
|
|
returnToView: v,
|
|
|
|
|
returnFocusOnClose: true,
|
|
|
|
|
title: gui.Tr.SLocalize("StashApply"),
|
|
|
|
|
prompt: gui.Tr.SLocalize("SureApplyStashEntry"),
|
|
|
|
|
handleConfirm: func() error {
|
|
|
|
|
return apply()
|
|
|
|
|
},
|
|
|
|
|
})
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleStashPop(g *gocui.Gui, v *gocui.View) error {
|
2020-04-20 10:53:40 +02:00
|
|
|
skipStashWarning := gui.Config.GetUserConfig().GetBool("gui.skipStashWarning")
|
|
|
|
|
|
|
|
|
|
pop := func() error {
|
2020-08-15 09:23:16 +02:00
|
|
|
return gui.stashDo("pop")
|
2020-04-20 10:53:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if skipStashWarning {
|
|
|
|
|
return pop()
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-15 08:38:16 +02:00
|
|
|
return gui.ask(askOpts{
|
2020-08-15 08:36:39 +02:00
|
|
|
returnToView: v,
|
|
|
|
|
returnFocusOnClose: true,
|
|
|
|
|
title: gui.Tr.SLocalize("StashPop"),
|
|
|
|
|
prompt: gui.Tr.SLocalize("SurePopStashEntry"),
|
|
|
|
|
handleConfirm: func() error {
|
|
|
|
|
return pop()
|
|
|
|
|
},
|
|
|
|
|
})
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) handleStashDrop(g *gocui.Gui, v *gocui.View) error {
|
2020-08-15 08:38:16 +02:00
|
|
|
return gui.ask(askOpts{
|
2020-08-15 08:36:39 +02:00
|
|
|
returnToView: v,
|
|
|
|
|
returnFocusOnClose: true,
|
|
|
|
|
title: gui.Tr.SLocalize("StashDrop"),
|
|
|
|
|
prompt: gui.Tr.SLocalize("SureDropStashEntry"),
|
|
|
|
|
handleConfirm: func() error {
|
2020-08-15 09:23:16 +02:00
|
|
|
return gui.stashDo("drop")
|
2020-08-15 08:36:39 +02:00
|
|
|
},
|
|
|
|
|
})
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
|
|
|
|
|
2020-08-15 09:23:16 +02:00
|
|
|
func (gui *Gui) stashDo(method string) error {
|
2020-03-29 05:34:17 +02:00
|
|
|
stashEntry := gui.getSelectedStashEntry()
|
2018-08-14 11:05:26 +02:00
|
|
|
if stashEntry == nil {
|
2018-08-15 11:12:46 +02:00
|
|
|
errorMessage := gui.Tr.TemplateLocalize(
|
|
|
|
|
"NoStashTo",
|
2018-08-16 11:31:50 +02:00
|
|
|
Teml{
|
2018-08-15 11:12:46 +02:00
|
|
|
"method": method,
|
|
|
|
|
},
|
|
|
|
|
)
|
2020-03-28 02:47:54 +02:00
|
|
|
return gui.createErrorPanel(errorMessage)
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
|
|
|
|
if err := gui.GitCommand.StashDo(stashEntry.Index, method); err != nil {
|
2020-03-28 02:47:54 +02:00
|
|
|
return gui.surfaceError(err)
|
2020-03-09 02:34:10 +02:00
|
|
|
}
|
2020-03-27 12:20:45 +02:00
|
|
|
return gui.refreshSidePanels(refreshOptions{scope: []int{STASH, FILES}})
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
|
|
|
|
|
2019-05-30 14:45:56 +02:00
|
|
|
func (gui *Gui) handleStashSave(stashFunc func(message string) error) error {
|
2018-08-14 11:05:26 +02:00
|
|
|
if len(gui.trackedFiles()) == 0 && len(gui.stagedFiles()) == 0 {
|
2020-03-28 02:47:54 +02:00
|
|
|
return gui.createErrorPanel(gui.Tr.SLocalize("NoTrackedStagedFilesStash"))
|
2018-08-14 11:05:26 +02:00
|
|
|
}
|
2020-08-15 08:38:16 +02:00
|
|
|
return gui.prompt(gui.getFilesView(), gui.Tr.SLocalize("StashChanges"), "", func(stashComment string) error {
|
2020-08-15 08:36:39 +02:00
|
|
|
if err := stashFunc(stashComment); err != nil {
|
2020-03-28 02:47:54 +02:00
|
|
|
return gui.surfaceError(err)
|
2020-03-09 02:34:10 +02:00
|
|
|
}
|
2020-03-27 12:20:45 +02:00
|
|
|
return gui.refreshSidePanels(refreshOptions{scope: []int{STASH, FILES}})
|
2018-08-14 11:05:26 +02:00
|
|
|
})
|
|
|
|
|
}
|
