go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-27 22:38:09 +02:00
Code Issues Releases Activity

shorten name

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-08 14:10:01 +11:00
parent c9a0cc6b30
commit 364c5db19c
37 changed files with 207 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/gui/rebase_options_panel.go
View File

@@ -18,7 +18,7 @@ const (
func (gui *Gui) handleCreateRebaseOptionsMenu() error {
options := []string{REBASE_OPTION_CONTINUE, REBASE_OPTION_ABORT}
if gui.GitCommand.Status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
if gui.Git.Status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
options = append(options, REBASE_OPTION_SKIP)
}
@@ -35,7 +35,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu() error {
}
var title string
if gui.GitCommand.Status.WorkingTreeState() == enums.REBASE_MODE_MERGING {
if gui.Git.Status.WorkingTreeState() == enums.REBASE_MODE_MERGING {
title = gui.Tr.MergeOptionsTitle
} else {
title = gui.Tr.RebaseOptionsTitle
@@ -45,7 +45,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu() error {
}
func (gui *Gui) genericMergeCommand(command string) error {
status := gui.GitCommand.Status.WorkingTreeState()
status := gui.Git.Status.WorkingTreeState()
if status != enums.REBASE_MODE_MERGING && status != enums.REBASE_MODE_REBASING {
return gui.createErrorPanel(gui.Tr.NotMergingOrRebasing)
@@ -65,12 +65,12 @@ func (gui *Gui) genericMergeCommand(command string) error {
// it's impossible for a rebase to require a commit so we'll use a subprocess only if it's a merge
if status == enums.REBASE_MODE_MERGING && command != REBASE_OPTION_ABORT && gui.UserConfig.Git.Merging.ManualCommit {
// TODO: see if we should be calling more of the code from gui.GitCommand.Rebase.GenericMergeOrRebaseAction
// TODO: see if we should be calling more of the code from gui.Git.Rebase.GenericMergeOrRebaseAction
return gui.runSubprocessWithSuspenseAndRefresh(
gui.GitCommand.Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command),
gui.Git.Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command),
)
}
result := gui.GitCommand.Rebase.GenericMergeOrRebaseAction(commandType, command)
result := gui.Git.Rebase.GenericMergeOrRebaseAction(commandType, command)
if err := gui.handleGenericMergeCommandResult(result); err != nil {
return err
}
@@ -141,7 +141,7 @@ func (gui *Gui) abortMergeOrRebaseWithConfirm() error {
}
func (gui *Gui) workingTreeStateNoun() string {
workingTreeState := gui.GitCommand.Status.WorkingTreeState()
workingTreeState := gui.Git.Status.WorkingTreeState()
switch workingTreeState {
case enums.REBASE_MODE_NONE:
return ""