go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-10 04:07:18 +02:00
Code Issues Releases Activity

WIP

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-18 22:23:36 +10:00
parent ae1c4536e6
commit 6c270b6e26
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/gui/merge_panel.go
View File

@ -19,8 +19,13 @@ import (
"github.com/jesseduffield/lazygit/pkg/utils"
)
func (gui *Gui) findConflicts(content string) ([]commands.Conflict, error) {
func (gui *Gui) findConflicts(content string) []commands.Conflict {
conflicts := make([]commands.Conflict, 0)
if content == "" {
return conflicts
}
var newConflict commands.Conflict
for i, line := range utils.SplitLines(content) {
trimmedLine := strings.TrimPrefix(line, "++")
@ -34,7 +39,7 @@ func (gui *Gui) findConflicts(content string) ([]commands.Conflict, error) {
conflicts = append(conflicts, newConflict)
}
}
return conflicts, nil
return conflicts
}
func (gui *Gui) shiftConflict(conflicts []commands.Conflict) (commands.Conflict, []commands.Conflict) {
@ -211,16 +216,16 @@ func (gui *Gui) refreshMergePanel() error {
panelState := gui.State.Panels.Merging
cat, err := gui.catSelectedFile(gui.g)
if err != nil {
return err
}
if cat == "" {
return nil
}
panelState.Conflicts, err = gui.findConflicts(cat)
if err != nil {
return err
return gui.refreshMain(refreshMainOpts{
main: &viewUpdateOpts{
title: "",
task: gui.createRenderStringTask(err.Error()),
},
})
}
panelState.Conflicts = gui.findConflicts(cat)
// handle potential fixes that the user made in their editor since we last refreshed
if len(panelState.Conflicts) == 0 {
return gui.handleCompleteMerge()

20
pkg/gui/stash_panel.go
View File

@ -26,23 +26,23 @@ func (gui *Gui) handleStashEntrySelect() error {
return gui.renderDiff()
}
gui.splitMainPanel(false)
gui.getMainView().Title = "Stash"
var task updateTask
stashEntry := gui.getSelectedStashEntry()
if stashEntry == nil {
return gui.newStringTask("main", gui.Tr.SLocalize("NoStashEntries"))
}
task = gui.createRenderStringTask(gui.Tr.SLocalize("NoStashEntries"))
} else {
cmd := gui.OSCommand.ExecutableFromString(
gui.GitCommand.ShowStashEntryCmdStr(stashEntry.Index),
)
if err := gui.newPtyTask("main", cmd); err != nil {
gui.Log.Error(err)
task = gui.createRunPtyTask(cmd)
}
return nil
return gui.refreshMain(refreshMainOpts{
main: &viewUpdateOpts{
title: "Stash",
task: task,
},
})
}
func (gui *Gui) refreshStashEntries(g *gocui.Gui) error {