mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-20 05:19:24 +02:00
remove old add patch keybinding
This commit is contained in:
parent
89a9b4e6d5
commit
d0d92c7697
@ -508,12 +508,6 @@ func (c *GitCommand) Checkout(branch string, force bool) error {
|
|||||||
return c.OSCommand.RunCommand(fmt.Sprintf("git checkout %s %s", forceArg, branch))
|
return c.OSCommand.RunCommand(fmt.Sprintf("git checkout %s %s", forceArg, branch))
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddPatch prepares a subprocess for adding a patch by patch
|
|
||||||
// this will eventually be swapped out for a better solution inside the Gui
|
|
||||||
func (c *GitCommand) AddPatch(filename string) *exec.Cmd {
|
|
||||||
return c.OSCommand.PrepareSubProcess("git", "add", "--patch", c.OSCommand.Quote(filename))
|
|
||||||
}
|
|
||||||
|
|
||||||
// PrepareCommitSubProcess prepares a subprocess for `git commit`
|
// PrepareCommitSubProcess prepares a subprocess for `git commit`
|
||||||
func (c *GitCommand) PrepareCommitSubProcess() *exec.Cmd {
|
func (c *GitCommand) PrepareCommitSubProcess() *exec.Cmd {
|
||||||
return c.OSCommand.PrepareSubProcess("git", "commit")
|
return c.OSCommand.PrepareSubProcess("git", "commit")
|
||||||
|
@ -264,25 +264,6 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
|
|||||||
return gui.handleFileSelect(g, v, false)
|
return gui.handleFileSelect(g, v, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error {
|
|
||||||
file, err := gui.getSelectedFile(g)
|
|
||||||
if err != nil {
|
|
||||||
if err == gui.Errors.ErrNoFiles {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if !file.HasUnstagedChanges {
|
|
||||||
return gui.createErrorPanel(g, gui.Tr.SLocalize("FileHasNoUnstagedChanges"))
|
|
||||||
}
|
|
||||||
if !file.Tracked {
|
|
||||||
return gui.createErrorPanel(g, gui.Tr.SLocalize("CannotGitAdd"))
|
|
||||||
}
|
|
||||||
|
|
||||||
gui.SubProcess = gui.GitCommand.AddPatch(file.Name)
|
|
||||||
return gui.Errors.ErrSubProcess
|
|
||||||
}
|
|
||||||
|
|
||||||
func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
|
func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
|
||||||
file, err := gui.getSelectedFile(g)
|
file, err := gui.getSelectedFile(g)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -253,12 +253,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
|
|||||||
Modifier: gocui.ModNone,
|
Modifier: gocui.ModNone,
|
||||||
Handler: gui.handleStageAll,
|
Handler: gui.handleStageAll,
|
||||||
Description: gui.Tr.SLocalize("toggleStagedAll"),
|
Description: gui.Tr.SLocalize("toggleStagedAll"),
|
||||||
}, {
|
|
||||||
ViewName: "files",
|
|
||||||
Key: 't',
|
|
||||||
Modifier: gocui.ModNone,
|
|
||||||
Handler: gui.handleAddPatch,
|
|
||||||
Description: gui.Tr.SLocalize("addPatch"),
|
|
||||||
}, {
|
}, {
|
||||||
ViewName: "files",
|
ViewName: "files",
|
||||||
Key: 'D',
|
Key: 'D',
|
||||||
|
@ -109,9 +109,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
|
|||||||
}, &i18n.Message{
|
}, &i18n.Message{
|
||||||
ID: "pull",
|
ID: "pull",
|
||||||
Other: "pull",
|
Other: "pull",
|
||||||
}, &i18n.Message{
|
|
||||||
ID: "addPatch",
|
|
||||||
Other: "bewerkingen toevoegen",
|
|
||||||
}, &i18n.Message{
|
}, &i18n.Message{
|
||||||
ID: "edit",
|
ID: "edit",
|
||||||
Other: "bewerken",
|
Other: "bewerken",
|
||||||
|
@ -132,9 +132,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
|
|||||||
}, &i18n.Message{
|
}, &i18n.Message{
|
||||||
ID: "pull",
|
ID: "pull",
|
||||||
Other: "pull",
|
Other: "pull",
|
||||||
}, &i18n.Message{
|
|
||||||
ID: "addPatch",
|
|
||||||
Other: "add patch",
|
|
||||||
}, &i18n.Message{
|
}, &i18n.Message{
|
||||||
ID: "edit",
|
ID: "edit",
|
||||||
Other: "edit",
|
Other: "edit",
|
||||||
|
@ -101,9 +101,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
|
|||||||
}, &i18n.Message{
|
}, &i18n.Message{
|
||||||
ID: "refresh",
|
ID: "refresh",
|
||||||
Other: "odśwież",
|
Other: "odśwież",
|
||||||
}, &i18n.Message{
|
|
||||||
ID: "addPatch",
|
|
||||||
Other: "dodaj łatkę",
|
|
||||||
}, &i18n.Message{
|
}, &i18n.Message{
|
||||||
ID: "edit",
|
ID: "edit",
|
||||||
Other: "edytuj",
|
Other: "edytuj",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user