2018-08-14 11:05:26 +02:00
package gui
import (
// "io"
// "io/ioutil"
// "strings"
2018-09-12 10:23:25 +02:00
"fmt"
2018-08-14 11:05:26 +02:00
"strings"
"github.com/jesseduffield/gocui"
"github.com/jesseduffield/lazygit/pkg/commands"
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 ) getSelectedFile ( g * gocui . Gui ) ( * commands . File , error ) {
selectedLine := gui . State . Panels . Files . SelectedLine
if selectedLine == - 1 {
return & commands . File { } , gui . Errors . ErrNoFiles
}
return gui . State . Files [ selectedLine ] , nil
}
2019-11-16 05:00:27 +02:00
func ( gui * Gui ) selectFile ( alreadySelected bool ) error {
file , err := gui . getSelectedFile ( gui . g )
2018-12-06 13:18:17 +02:00
if err != nil {
if err != gui . Errors . ErrNoFiles {
return err
}
2020-01-12 06:02:00 +02:00
gui . State . SplitMainPanel = false
gui . getMainView ( ) . Title = ""
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 ( "NoChangedFiles" ) )
2018-12-06 13:18:17 +02:00
}
2019-11-16 05:00:27 +02:00
if err := gui . focusPoint ( 0 , gui . State . Panels . Files . SelectedLine , len ( gui . State . Files ) , gui . getFilesView ( ) ) ; err != nil {
2018-12-06 13:18:17 +02:00
return err
}
2019-03-03 06:55:19 +02:00
if file . HasInlineMergeConflicts {
2019-11-12 12:24:01 +02:00
gui . getMainView ( ) . Title = gui . Tr . SLocalize ( "MergeConflictsTitle" )
gui . State . SplitMainPanel = false
2019-02-16 03:07:27 +02:00
return gui . refreshMergePanel ( )
2018-12-08 07:54:54 +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
if ! alreadySelected {
if err := gui . resetOrigin ( gui . getMainView ( ) ) ; err != nil {
return err
}
if err := gui . resetOrigin ( gui . getSecondaryView ( ) ) ; err != nil {
return err
}
}
2019-10-30 11:23:25 +02:00
if file . HasStagedChanges && file . HasUnstagedChanges {
gui . State . SplitMainPanel = true
2019-11-10 07:20:35 +02:00
gui . getMainView ( ) . Title = gui . Tr . SLocalize ( "UnstagedChanges" )
gui . getSecondaryView ( ) . Title = gui . Tr . SLocalize ( "StagedChanges" )
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
cmdStr := gui . GitCommand . DiffCmdStr ( file , false , true )
cmd := gui . OSCommand . ExecutableFromString ( cmdStr )
if err := gui . newCmdTask ( "secondary" , cmd ) ; err != nil {
return err
}
2019-10-30 11:23:25 +02:00
} else {
gui . State . SplitMainPanel = false
if file . HasUnstagedChanges {
2019-11-10 07:20:35 +02:00
gui . getMainView ( ) . Title = gui . Tr . SLocalize ( "UnstagedChanges" )
2019-10-30 11:23:25 +02:00
} else {
2019-11-10 07:20:35 +02:00
gui . getMainView ( ) . Title = gui . Tr . SLocalize ( "StagedChanges" )
2019-10-30 11:23:25 +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
cmdStr := gui . GitCommand . DiffCmdStr ( file , false , ! file . HasUnstagedChanges && file . HasStagedChanges )
cmd := gui . OSCommand . ExecutableFromString ( cmdStr )
if err := gui . newCmdTask ( "main" , cmd ) ; err != nil {
2019-10-30 11:23:25 +02:00
return err
}
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-12-08 07:54:54 +02:00
func ( gui * Gui ) refreshFiles ( ) error {
2019-11-12 13:19:20 +02:00
gui . State . RefreshingFilesMutex . Lock ( )
gui . State . IsRefreshingFiles = true
defer func ( ) {
gui . State . IsRefreshingFiles = false
gui . State . RefreshingFilesMutex . Unlock ( )
} ( )
2019-01-15 11:12:31 +02:00
selectedFile , _ := gui . getSelectedFile ( gui . g )
2018-12-08 07:54:54 +02:00
filesView := gui . getFilesView ( )
2019-05-06 14:29:35 +02:00
if filesView == nil {
// if the filesView hasn't been instantiated yet we just return
return nil
}
2019-03-02 04:22:02 +02:00
if err := gui . refreshStateFiles ( ) ; err != nil {
return err
}
2018-12-06 13:18:17 +02:00
gui . g . Update ( func ( g * gocui . Gui ) error {
filesView . Clear ( )
2019-02-16 06:17:44 +02:00
isFocused := gui . g . CurrentView ( ) . Name ( ) == "files"
list , err := utils . RenderList ( gui . State . Files , isFocused )
2018-12-06 13:18:17 +02:00
if err != nil {
return err
}
fmt . Fprint ( filesView , list )
2019-11-21 12:17:31 +02:00
if g . CurrentView ( ) == filesView || ( g . CurrentView ( ) == gui . getMainView ( ) && g . CurrentView ( ) . Context == "merging" ) {
2019-01-15 11:12:31 +02:00
newSelectedFile , _ := gui . getSelectedFile ( gui . g )
alreadySelected := newSelectedFile . Name == selectedFile . Name
2019-11-16 05:00:27 +02:00
return gui . selectFile ( alreadySelected )
2018-12-06 13:18:17 +02:00
}
return nil
} )
return nil
}
// specific functions
2018-09-17 13:02:30 +02:00
func ( gui * Gui ) stagedFiles ( ) [ ] * commands . File {
2018-08-14 11:05:26 +02:00
files := gui . State . Files
2018-09-17 13:02:30 +02:00
result := make ( [ ] * commands . File , 0 )
2018-08-14 11:05:26 +02:00
for _ , file := range files {
if file . HasStagedChanges {
result = append ( result , file )
}
}
return result
}
2018-09-17 13:02:30 +02:00
func ( gui * Gui ) trackedFiles ( ) [ ] * commands . File {
2018-08-14 11:05:26 +02:00
files := gui . State . Files
2018-09-17 13:02:30 +02:00
result := make ( [ ] * commands . File , 0 )
2018-08-14 11:05:26 +02:00
for _ , file := range files {
if file . Tracked {
result = append ( result , file )
}
}
return result
}
func ( gui * Gui ) stageSelectedFile ( g * gocui . Gui ) error {
file , err := gui . getSelectedFile ( g )
if err != nil {
return err
}
return gui . GitCommand . StageFile ( file . Name )
}
2018-12-05 13:30:10 +02:00
func ( gui * Gui ) handleEnterFile ( g * gocui . Gui , v * gocui . View ) error {
2019-11-10 07:20:35 +02:00
return gui . enterFile ( false , - 1 )
}
func ( gui * Gui ) enterFile ( forceSecondaryFocused bool , selectedLineIdx int ) error {
file , err := gui . getSelectedFile ( gui . g )
2018-12-02 10:57:01 +02:00
if err != nil {
if err != gui . Errors . ErrNoFiles {
return err
}
return nil
}
2019-03-03 06:55:19 +02:00
if file . HasInlineMergeConflicts {
2019-11-10 07:20:35 +02:00
return gui . handleSwitchToMerge ( gui . g , gui . getFilesView ( ) )
2018-12-05 13:30:10 +02:00
}
2019-10-30 11:23:25 +02:00
if file . HasMergeConflicts {
2019-11-10 07:20:35 +02:00
return gui . createErrorPanel ( gui . g , gui . Tr . SLocalize ( "FileStagingRequirements" ) )
2018-12-02 10:57:01 +02:00
}
2020-01-30 23:07:34 +02:00
gui . changeMainViewsContext ( "staging" )
2019-11-10 07:20:35 +02:00
if err := gui . switchFocus ( gui . g , gui . getFilesView ( ) , gui . getMainView ( ) ) ; err != nil {
2018-12-05 10:33:46 +02:00
return err
}
2019-11-10 07:20:35 +02:00
return gui . refreshStagingPanel ( forceSecondaryFocused , selectedLineIdx )
2018-12-02 10:57:01 +02:00
}
2018-08-14 11:05:26 +02:00
func ( gui * Gui ) handleFilePress ( g * gocui . Gui , v * gocui . View ) error {
file , err := gui . getSelectedFile ( g )
if err != nil {
2018-08-14 15:47:14 +02:00
if err == gui . Errors . ErrNoFiles {
2018-08-14 11:05:26 +02:00
return nil
}
return err
}
2019-03-03 06:55:19 +02:00
if file . HasInlineMergeConflicts {
2018-08-14 11:05:26 +02:00
return gui . handleSwitchToMerge ( g , v )
}
if file . HasUnstagedChanges {
gui . GitCommand . StageFile ( file . Name )
} else {
gui . GitCommand . UnStageFile ( file . Name , file . Tracked )
}
2018-12-08 07:54:54 +02:00
if err := gui . refreshFiles ( ) ; err != nil {
2018-08-14 11:05:26 +02:00
return err
}
2019-11-16 05:00:27 +02:00
return gui . selectFile ( true )
2018-08-14 11:05:26 +02:00
}
2018-08-25 00:51:47 +02:00
func ( gui * Gui ) allFilesStaged ( ) bool {
for _ , file := range gui . State . Files {
if file . HasUnstagedChanges {
return false
}
}
return true
}
2019-12-08 12:23:51 +02:00
func ( gui * Gui ) focusAndSelectFile ( g * gocui . Gui , v * gocui . View ) error {
if _ , err := gui . g . SetCurrentView ( "files" ) ; err != nil {
return err
}
return gui . selectFile ( false )
}
2018-08-25 00:51:47 +02:00
func ( gui * Gui ) handleStageAll ( g * gocui . Gui , v * gocui . View ) error {
var err error
if gui . allFilesStaged ( ) {
err = gui . GitCommand . UnstageAll ( )
} else {
err = gui . GitCommand . StageAll ( )
}
if err != nil {
_ = gui . createErrorPanel ( g , err . Error ( ) )
}
2018-12-08 07:54:54 +02:00
if err := gui . refreshFiles ( ) ; err != nil {
2018-08-25 00:51:47 +02:00
return err
}
2019-12-08 12:23:51 +02:00
return gui . selectFile ( false )
2018-08-25 00:51:47 +02:00
}
2018-08-14 11:05:26 +02:00
func ( gui * Gui ) handleIgnoreFile ( g * gocui . Gui , v * gocui . View ) error {
2020-02-03 17:59:46 +02:00
file , err := gui . getSelectedFile ( gui . g )
2018-08-14 11:05:26 +02:00
if err != nil {
2020-02-03 17:59:46 +02:00
return gui . createErrorPanel ( gui . g , err . Error ( ) )
2018-08-14 11:05:26 +02:00
}
2020-02-03 17:59:46 +02:00
2018-08-14 11:05:26 +02:00
if file . Tracked {
2020-02-03 17:59:46 +02:00
return gui . createConfirmationPanel ( gui . g , gui . g . CurrentView ( ) , true , gui . Tr . SLocalize ( "IgnoreTracked" ) , gui . Tr . SLocalize ( "IgnoreTrackedPrompt" ) ,
// On confirmation
func ( _ * gocui . Gui , _ * gocui . View ) error {
if err := gui . GitCommand . Ignore ( file . Name ) ; err != nil {
return err
}
2020-02-04 13:50:13 +02:00
if err := gui . GitCommand . RemoveTrackedFiles ( file . Name ) ; err != nil {
2020-02-03 17:59:46 +02:00
return err
}
return gui . refreshFiles ( )
} , nil )
2018-08-14 11:05:26 +02:00
}
2020-02-03 17:59:46 +02:00
2018-08-19 12:41:04 +02:00
if err := gui . GitCommand . Ignore ( file . Name ) ; err != nil {
2020-02-03 17:59:46 +02:00
return gui . createErrorPanel ( gui . g , err . Error ( ) )
2018-08-19 12:41:04 +02:00
}
2020-02-03 17:59:46 +02:00
2018-12-08 07:54:54 +02:00
return gui . refreshFiles ( )
2018-08-14 11:05:26 +02:00
}
2019-04-13 05:56:31 +02:00
func ( gui * Gui ) handleWIPCommitPress ( g * gocui . Gui , filesView * gocui . View ) error {
skipHookPreifx := gui . Config . GetUserConfig ( ) . GetString ( "git.skipHookPrefix" )
if skipHookPreifx == "" {
return gui . createErrorPanel ( gui . g , gui . Tr . SLocalize ( "SkipHookPrefixNotConfigured" ) )
}
if err := gui . renderString ( g , "commitMessage" , skipHookPreifx ) ; err != nil {
return err
}
if err := gui . getCommitMessageView ( ) . SetCursor ( len ( skipHookPreifx ) , 0 ) ; err != nil {
return err
}
return gui . handleCommitPress ( g , filesView )
}
2018-08-14 11:05:26 +02:00
func ( gui * Gui ) handleCommitPress ( g * gocui . Gui , filesView * gocui . View ) error {
2018-12-05 13:30:10 +02:00
if len ( gui . stagedFiles ( ) ) == 0 && gui . State . WorkingTreeState == "normal" {
2018-08-16 07:16:32 +02:00
return gui . createErrorPanel ( g , gui . Tr . SLocalize ( "NoStagedFilesToCommit" ) )
2018-08-14 11:05:26 +02:00
}
2018-12-08 07:54:54 +02:00
commitMessageView := gui . getCommitMessageView ( )
2018-09-12 15:20:35 +02:00
g . Update ( func ( g * gocui . Gui ) error {
g . SetViewOnTop ( "commitMessage" )
gui . switchFocus ( g , filesView , commitMessageView )
gui . RenderCommitLength ( )
return nil
} )
return nil
}
func ( gui * Gui ) handleAmendCommitPress ( g * gocui . Gui , filesView * gocui . View ) error {
2018-12-05 13:30:10 +02:00
if len ( gui . stagedFiles ( ) ) == 0 && gui . State . WorkingTreeState == "normal" {
2018-09-12 15:20:35 +02:00
return gui . createErrorPanel ( g , gui . Tr . SLocalize ( "NoStagedFilesToCommit" ) )
}
2018-10-08 21:19:45 +02:00
if len ( gui . State . Commits ) == 0 {
return gui . createErrorPanel ( g , gui . Tr . SLocalize ( "NoCommitToAmend" ) )
}
2019-02-24 00:42:24 +02:00
title := strings . Title ( gui . Tr . SLocalize ( "AmendLastCommit" ) )
question := gui . Tr . SLocalize ( "SureToAmend" )
2019-11-05 06:19:43 +02:00
return gui . createConfirmationPanel ( g , filesView , true , title , question , func ( g * gocui . Gui , v * gocui . View ) error {
2019-03-23 03:16:55 +02:00
ok , err := gui . runSyncOrAsyncCommand ( gui . GitCommand . AmendHead ( ) )
if err != nil {
2019-02-24 00:42:24 +02:00
return err
2018-09-25 22:11:51 +02:00
}
2019-03-23 03:16:55 +02:00
if ! ok {
return nil
}
2018-09-12 15:20:35 +02:00
2018-10-06 07:40:12 +02:00
return gui . refreshSidePanels ( g )
2018-09-25 22:11:51 +02:00
} , nil )
2018-08-14 11:05:26 +02:00
}
// handleCommitEditorPress - handle when the user wants to commit changes via
// their editor rather than via the popup panel
func ( gui * Gui ) handleCommitEditorPress ( g * gocui . Gui , filesView * gocui . View ) error {
2018-12-05 13:30:10 +02:00
if len ( gui . stagedFiles ( ) ) == 0 && gui . State . WorkingTreeState == "normal" {
2018-08-16 07:16:32 +02:00
return gui . createErrorPanel ( g , gui . Tr . SLocalize ( "NoStagedFilesToCommit" ) )
2018-08-14 11:05:26 +02:00
}
gui . PrepareSubProcess ( g , "git" , "commit" )
return nil
}
// PrepareSubProcess - prepare a subprocess for execution and tell the gui to switch to it
2018-08-21 22:33:25 +02:00
func ( gui * Gui ) PrepareSubProcess ( g * gocui . Gui , commands ... string ) {
gui . SubProcess = gui . GitCommand . PrepareCommitSubProcess ( )
2018-08-14 11:05:26 +02:00
g . Update ( func ( g * gocui . Gui ) error {
2018-08-16 11:31:03 +02:00
return gui . Errors . ErrSubProcess
2018-08-14 11:05:26 +02:00
} )
}
2018-08-31 10:43:54 +02:00
func ( gui * Gui ) editFile ( filename string ) error {
2019-03-23 03:16:55 +02:00
_ , err := gui . runSyncOrAsyncCommand ( gui . OSCommand . EditFile ( filename ) )
return err
2018-08-14 11:05:26 +02:00
}
func ( gui * Gui ) handleFileEdit ( g * gocui . Gui , v * gocui . View ) error {
2018-08-18 06:52:01 +02:00
file , err := gui . getSelectedFile ( g )
if err != nil {
2019-03-16 03:48:09 +02:00
return gui . createErrorPanel ( gui . g , err . Error ( ) )
2018-08-18 06:52:01 +02:00
}
2018-08-31 10:43:54 +02:00
return gui . editFile ( file . Name )
2018-08-14 11:05:26 +02:00
}
func ( gui * Gui ) handleFileOpen ( g * gocui . Gui , v * gocui . View ) error {
2018-08-18 06:52:01 +02:00
file , err := gui . getSelectedFile ( g )
if err != nil {
2019-03-16 03:48:09 +02:00
return gui . createErrorPanel ( gui . g , err . Error ( ) )
2018-08-18 06:52:01 +02:00
}
2018-08-23 21:05:09 +02:00
return gui . openFile ( file . Name )
2018-08-14 11:05:26 +02:00
}
func ( gui * Gui ) handleRefreshFiles ( g * gocui . Gui , v * gocui . View ) error {
2018-12-08 07:54:54 +02:00
return gui . refreshFiles ( )
2018-08-14 11:05:26 +02:00
}
2019-03-02 04:22:02 +02:00
func ( gui * Gui ) refreshStateFiles ( ) error {
2018-08-14 11:05:26 +02:00
// get files to stage
files := gui . GitCommand . GetStatusFiles ( )
gui . State . Files = gui . GitCommand . MergeStatusFiles ( gui . State . Files , files )
2019-11-12 13:19:20 +02:00
2020-01-08 12:02:01 +02:00
if err := gui . fileWatcher . addFilesToFileWatcher ( files ) ; err != nil {
2019-11-12 13:19:20 +02:00
return err
}
2018-12-04 10:50:11 +02:00
gui . refreshSelectedLine ( & gui . State . Panels . Files . SelectedLine , len ( gui . State . Files ) )
2019-03-02 04:22:02 +02:00
return gui . updateWorkTreeState ( )
2018-08-14 11:05:26 +02:00
}
func ( gui * Gui ) catSelectedFile ( g * gocui . Gui ) ( string , error ) {
item , err := gui . getSelectedFile ( g )
if err != nil {
2018-08-14 15:47:14 +02:00
if err != gui . Errors . ErrNoFiles {
2018-08-14 11:05:26 +02:00
return "" , err
}
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 ( "NoFilesDisplay" ) )
2018-08-14 11:05:26 +02:00
}
2018-08-28 11:12:35 +02:00
if item . Type != "file" {
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 ( "NotAFile" ) )
2018-08-28 11:12:35 +02:00
}
2018-08-14 11:05:26 +02:00
cat , err := gui . GitCommand . CatFile ( item . Name )
if err != nil {
2018-08-28 11:12:35 +02:00
gui . Log . Error ( err )
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" , err . Error ( ) )
2018-08-14 11:05:26 +02:00
}
return cat , nil
}
2019-11-13 12:16:24 +02:00
func ( gui * Gui ) handlePullFiles ( g * gocui . Gui , v * gocui . View ) error {
// if we have no upstream branch we need to set that first
_ , pullables := gui . GitCommand . GetCurrentBranchUpstreamDifferenceCount ( )
currentBranchName , err := gui . GitCommand . CurrentBranchName ( )
if err != nil {
return err
}
if pullables == "?" {
2020-01-28 11:35:23 +02:00
// see if we have this branch in our config with an upstream
conf , err := gui . GitCommand . Repo . Config ( )
if err != nil {
return gui . createErrorPanel ( gui . g , err . Error ( ) )
}
for branchName , branch := range conf . Branches {
if branchName == currentBranchName {
return gui . pullFiles ( v , fmt . Sprintf ( "%s %s" , branch . Remote , branchName ) )
}
}
2019-11-13 12:16:24 +02:00
return gui . createPromptPanel ( g , v , gui . Tr . SLocalize ( "EnterUpstream" ) , "origin/" + currentBranchName , func ( g * gocui . Gui , v * gocui . View ) error {
upstream := gui . trimmedContent ( v )
if err := gui . GitCommand . SetUpstreamBranch ( upstream ) ; err != nil {
errorMessage := err . Error ( )
if strings . Contains ( errorMessage , "does not exist" ) {
errorMessage = fmt . Sprintf ( "upstream branch %s not found.\nIf you expect it to exist, you should fetch (with 'f').\nOtherwise, you should push (with 'shift+P')" , upstream )
}
return gui . createErrorPanel ( gui . g , errorMessage )
}
2020-01-28 11:35:23 +02:00
return gui . pullFiles ( v , "" )
2019-11-13 12:16:24 +02:00
} )
}
2020-01-28 11:35:23 +02:00
return gui . pullFiles ( v , "" )
2019-11-13 12:16:24 +02:00
}
2020-01-28 11:35:23 +02:00
func ( gui * Gui ) pullFiles ( v * gocui . View , args string ) error {
2019-02-16 03:03:22 +02:00
if err := gui . createLoaderPanel ( gui . g , v , gui . Tr . SLocalize ( "PullWait" ) ) ; err != nil {
2018-11-02 10:54:54 +02:00
return err
}
2019-02-16 03:03:22 +02:00
2018-08-14 11:05:26 +02:00
go func ( ) {
2018-11-02 10:54:54 +02:00
unamePassOpend := false
2020-01-28 11:35:23 +02:00
err := gui . GitCommand . Pull ( args , func ( passOrUname string ) string {
2018-11-02 10:54:54 +02:00
unamePassOpend = true
2019-11-13 12:16:24 +02:00
return gui . waitForPassUname ( gui . g , v , passOrUname )
2018-11-02 10:54:54 +02:00
} )
2019-11-13 12:16:24 +02:00
gui . HandleCredentialsPopup ( gui . g , unamePassOpend , err )
2018-08-14 11:05:26 +02:00
} ( )
2019-11-13 12:16:24 +02:00
2018-08-14 11:05:26 +02:00
return nil
}
2020-01-28 11:35:23 +02:00
func ( gui * Gui ) pushWithForceFlag ( g * gocui . Gui , v * gocui . View , force bool , upstream string , args string ) error {
2019-02-16 03:03:22 +02:00
if err := gui . createLoaderPanel ( gui . g , v , gui . Tr . SLocalize ( "PushWait" ) ) ; err != nil {
2018-08-19 13:28:13 +02:00
return err
}
2018-08-14 11:05:26 +02:00
go func ( ) {
2018-11-02 10:54:54 +02:00
unamePassOpend := false
2019-11-17 05:50:12 +02:00
branchName := gui . getCheckedOutBranch ( ) . Name
2020-01-28 11:35:23 +02:00
err := gui . GitCommand . Push ( branchName , force , upstream , args , func ( passOrUname string ) string {
2018-11-02 10:54:54 +02:00
unamePassOpend = true
return gui . waitForPassUname ( g , v , passOrUname )
2018-10-17 21:12:33 +02:00
} )
2018-12-10 09:22:52 +02:00
gui . HandleCredentialsPopup ( g , unamePassOpend , err )
2018-08-14 11:05:26 +02:00
} ( )
return nil
}
2018-08-19 13:28:13 +02:00
func ( gui * Gui ) pushFiles ( g * gocui . Gui , v * gocui . View ) error {
// if we have pullables we'll ask if the user wants to force push
2018-12-07 09:52:31 +02:00
_ , pullables := gui . GitCommand . GetCurrentBranchUpstreamDifferenceCount ( )
2019-11-11 14:22:09 +02:00
currentBranchName , err := gui . GitCommand . CurrentBranchName ( )
if err != nil {
return err
}
if pullables == "?" {
2020-01-28 11:35:23 +02:00
// see if we have this branch in our config with an upstream
conf , err := gui . GitCommand . Repo . Config ( )
if err != nil {
return gui . createErrorPanel ( gui . g , err . Error ( ) )
}
for branchName , branch := range conf . Branches {
if branchName == currentBranchName {
return gui . pushWithForceFlag ( g , v , false , "" , fmt . Sprintf ( "%s %s" , branch . Remote , branchName ) )
}
}
2019-11-11 14:22:09 +02:00
return gui . createPromptPanel ( g , v , gui . Tr . SLocalize ( "EnterUpstream" ) , "origin " + currentBranchName , func ( g * gocui . Gui , v * gocui . View ) error {
2020-01-28 11:35:23 +02:00
return gui . pushWithForceFlag ( g , v , false , gui . trimmedContent ( v ) , "" )
2019-11-11 14:22:09 +02:00
} )
} else if pullables == "0" {
2020-01-28 11:35:23 +02:00
return gui . pushWithForceFlag ( g , v , false , "" , "" )
2018-08-19 13:28:13 +02:00
}
2020-01-12 01:55:10 +02:00
return gui . createConfirmationPanel ( g , v , true , gui . Tr . SLocalize ( "ForcePush" ) , gui . Tr . SLocalize ( "ForcePushPrompt" ) , func ( g * gocui . Gui , v * gocui . View ) error {
2020-01-28 11:35:23 +02:00
return gui . pushWithForceFlag ( g , v , true , "" , "" )
2018-08-19 13:28:13 +02:00
} , nil )
}
2018-08-14 11:05:26 +02:00
func ( gui * Gui ) handleSwitchToMerge ( g * gocui . Gui , v * gocui . View ) error {
file , err := gui . getSelectedFile ( g )
if err != nil {
2018-08-14 15:47:14 +02:00
if err != gui . Errors . ErrNoFiles {
2019-03-16 03:48:09 +02:00
return gui . createErrorPanel ( gui . g , err . Error ( ) )
2018-08-14 11:05:26 +02:00
}
return nil
}
2019-03-03 06:55:19 +02:00
if ! file . HasInlineMergeConflicts {
2018-08-16 07:16:32 +02:00
return gui . createErrorPanel ( g , gui . Tr . SLocalize ( "FileNoMergeCons" ) )
2018-08-14 11:05:26 +02:00
}
2020-01-30 23:07:34 +02:00
gui . changeMainViewsContext ( "merging" )
2019-02-16 03:07:27 +02:00
if err := gui . switchFocus ( g , v , gui . getMainView ( ) ) ; err != nil {
return err
}
return gui . refreshMergePanel ( )
2018-08-14 11:05:26 +02:00
}
func ( gui * Gui ) handleAbortMerge ( g * gocui . Gui , v * gocui . View ) error {
if err := gui . GitCommand . AbortMerge ( ) ; err != nil {
return gui . createErrorPanel ( g , err . Error ( ) )
}
2018-08-16 07:16:32 +02:00
gui . createMessagePanel ( g , v , "" , gui . Tr . SLocalize ( "MergeAborted" ) )
2018-08-14 11:05:26 +02:00
gui . refreshStatus ( g )
2018-12-08 07:54:54 +02:00
return gui . refreshFiles ( )
2018-08-14 11:05:26 +02:00
}
2018-08-23 21:05:09 +02:00
func ( gui * Gui ) openFile ( filename string ) error {
if err := gui . OSCommand . OpenFile ( filename ) ; err != nil {
return gui . createErrorPanel ( gui . g , err . Error ( ) )
}
return nil
}
2018-12-08 07:54:54 +02:00
func ( gui * Gui ) anyFilesWithMergeConflicts ( ) bool {
for _ , file := range gui . State . Files {
if file . HasMergeConflicts {
return true
}
}
return false
}
2019-02-19 14:36:29 +02:00
2019-03-12 12:43:56 +02:00
func ( gui * Gui ) handleCustomCommand ( g * gocui . Gui , v * gocui . View ) error {
2019-11-11 14:22:09 +02:00
return gui . createPromptPanel ( g , v , gui . Tr . SLocalize ( "CustomCommand" ) , "" , func ( g * gocui . Gui , v * gocui . View ) error {
2019-03-12 12:43:56 +02:00
command := gui . trimmedContent ( v )
gui . SubProcess = gui . OSCommand . RunCustomCommand ( command )
return gui . Errors . ErrSubProcess
} )
}
2019-05-30 14:45:56 +02:00
func ( gui * Gui ) handleCreateStashMenu ( g * gocui . Gui , v * gocui . View ) error {
2020-02-14 14:36:55 +02:00
menuItems := [ ] * menuItem {
2019-05-30 14:45:56 +02:00
{
2020-02-14 14:36:55 +02:00
displayString : gui . Tr . SLocalize ( "stashAllChanges" ) ,
onPress : func ( ) error {
2019-05-30 14:45:56 +02:00
return gui . handleStashSave ( gui . GitCommand . StashSave )
} ,
} ,
{
2020-02-14 14:36:55 +02:00
displayString : gui . Tr . SLocalize ( "stashStagedChanges" ) ,
onPress : func ( ) error {
2019-05-30 14:45:56 +02:00
return gui . handleStashSave ( gui . GitCommand . StashSaveStagedChanges )
} ,
} ,
}
2020-02-14 14:39:02 +02:00
return gui . createMenu ( gui . Tr . SLocalize ( "stashOptions" ) , menuItems , createMenuOptions { showCancel : true } )
2019-05-30 14:45:56 +02:00
}
func ( gui * Gui ) handleStashChanges ( g * gocui . Gui , v * gocui . View ) error {
return gui . handleStashSave ( gui . GitCommand . StashSave )
}
2020-02-16 00:21:23 +02:00
func ( gui * Gui ) handleCreateResetToUpstreamMenu ( g * gocui . Gui , v * gocui . View ) error {
return gui . createResetMenu ( "@{upstream}" )
}
