Merge branch 'master' into custom-keybindings

4 files changed, 59 insertions, 0 deletions

diff --git a/pkg/gui/commit_message_panel.go b/pkg/gui/commit_message_panel.go
index b087f5904..8d2d02524 100644
--- a/pkg/gui/commit_message_panel.go
+++ b/pkg/gui/commit_message_panel.go
@@ -83,3 +83,38 @@ func (gui *Gui) RenderCommitLength() {
 	v := gui.getCommitMessageView()
 	v.Subtitle = gui.getBufferLength(v)
 }
+
+// we've just copy+pasted the editor from gocui to here so that we can also re-
+// render the commit message length on each keypress
+func (gui *Gui) commitMessageEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
+	switch {
+	case key == gocui.KeyBackspace || key == gocui.KeyBackspace2:
+		v.EditDelete(true)
+	case key == gocui.KeyDelete:
+		v.EditDelete(false)
+	case key == gocui.KeyArrowDown:
+		v.MoveCursor(0, 1, false)
+	case key == gocui.KeyArrowUp:
+		v.MoveCursor(0, -1, false)
+	case key == gocui.KeyArrowLeft:
+		v.MoveCursor(-1, 0, false)
+	case key == gocui.KeyArrowRight:
+		v.MoveCursor(1, 0, false)
+	case key == gocui.KeyTab:
+		v.EditNewLine()
+	case key == gocui.KeySpace:
+		v.EditWrite(' ')
+	case key == gocui.KeyInsert:
+		v.Overwrite = !v.Overwrite
+	case key == gocui.KeyCtrlU:
+		v.EditDeleteToStartOfLine()
+	case key == gocui.KeyCtrlA:
+		v.EditGotoToStartOfLine()
+	case key == gocui.KeyCtrlE:
+		v.EditGotoToEndOfLine()
+	default:
+		v.EditWrite(ch)
+	}
+
+	gui.RenderCommitLength()
+}
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 3b6f2fb11..ba379fc56 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -553,6 +553,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			commitMessageView.Title = gui.Tr.SLocalize("CommitMessage")
 			commitMessageView.FgColor = textColor
 			commitMessageView.Editable = true
+			commitMessageView.Editor = gocui.EditorFunc(gui.commitMessageEditor)
 		}
 	}
 
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 2b0719189..0d9607574 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -738,6 +738,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Description: gui.Tr.SLocalize("ReturnToRemotesList"),
 		},
 		{
+			ViewName:    "branches",
+			Contexts:    []string{"remotes"},
+			Key:         'f',
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleFetchRemote,
+			Description: gui.Tr.SLocalize("fetchRemote"),
+		},
+		{
 			ViewName:    "commits",
 			Key:         gui.getKey("commits.squashDown"),
 			Modifier:    gocui.ModNone,
diff --git a/pkg/gui/remotes_panel.go b/pkg/gui/remotes_panel.go
index 90c2c8d59..6964bf108 100644
--- a/pkg/gui/remotes_panel.go
+++ b/pkg/gui/remotes_panel.go
@@ -176,3 +176,18 @@ func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error {
 		})
 	})
 }
+
+func (gui *Gui) handleFetchRemote(g *gocui.Gui, v *gocui.View) error {
+	remote := gui.getSelectedRemote()
+	if remote == nil {
+		return nil
+	}
+
+	return gui.WithWaitingStatus(gui.Tr.SLocalize("FetchingRemoteStatus"), func() error {
+		if err := gui.GitCommand.FetchRemote(remote.Name); err != nil {
+			return err
+		}
+
+		return gui.refreshRemotes()
+	})
+}