add half and fullscreen modes

For now we're just doing side panels, because it will take more work
to support this in the various main panel contexts

.goreleaser.yml

@@ -17,16 +17,16 @@ builds:
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease
 
-archive:
-  replacements:
-    darwin: Darwin
-    linux: Linux
-    windows: Windows
-    386: 32-bit
-    amd64: x86_64
-  format_overrides:
-    - goos: windows
-      format: zip
+archives:
+  - replacements:
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      386: 32-bit
+      amd64: x86_64
+    format_overrides:
+      - goos: windows
+        format: zip
 checksum:
   name_template: 'checksums.txt'
 snapshot:
@@ -38,27 +38,28 @@ changelog:
       - '^docs:'
       - '^test:'
       - '^bump'
-brew:
-  # Reporitory to push the tap to.
-  github:
-    owner: jesseduffield
-    name: homebrew-lazygit
+brews:
+  -
+    # Reporitory to push the tap to.
+    github:
+      owner: jesseduffield
+      name: homebrew-lazygit
 
-  # Your app's homepage.
-  # Default is empty.
-  homepage: 'https://github.com/jesseduffield/lazygit/'
+    # Your app's homepage.
+    # Default is empty.
+    homepage: 'https://github.com/jesseduffield/lazygit/'
 
-  # Your app's description.
-  # Default is empty.
-  description: 'A simple terminal UI for git commands, written in Go'
+    # Your app's description.
+    # Default is empty.
+    description: 'A simple terminal UI for git commands, written in Go'
 
-  # # Packages your package depends on.
-  # dependencies:
-  #   - git
-  #   - zsh
-  # # Packages that conflict with your package.
-  # conflicts:
-  #   - svn
-  #   - bash
+    # # Packages your package depends on.
+    # dependencies:
+    #   - git
+    #   - zsh
+    # # Packages that conflict with your package.
+    # conflicts:
+    #   - svn
+    #   - bash
 
-# test comment to see if goreleaser only releases on new commits
+  # test comment to see if goreleaser only releases on new commits

docs/Config.md

@@ -1,6 +1,9 @@
 # User Config:
 
-Default path for the config file: `~/.config/jesseduffield/lazygit/config.yml`
+Default path for the config file:
+
+* Linux: `~/.config/jesseduffield/lazygit/config.yml`
+* MacOS: `~/Library/Application Support/jesseduffield/lazygit/config.yml`
 
 ## Default:
 
@@ -18,9 +21,12 @@ Default path for the config file: `~/.config/jesseduffield/lazygit/config.yml`
         - white
       optionsTextColor:
         - blue
+      selectedLineBgColor:
+        - blue
     commitLength:
       show: true
     mouseEvents: true
+    skipUnstageLineWarning: false
   git:
     merging:
       # only applicable to unix users
@@ -61,14 +67,16 @@ Default path for the config file: `~/.config/jesseduffield/lazygit/config.yml`
       scrollDownMain-alt1: 'J' # main panel scrool down
       scrollUpMain-alt2: '<c-u>' # main panel scrool up
       scrollDownMain-alt2: '<c-d>' # main panel scrool down
-      executeCustomCommand: 'X'
+      executeCustomCommand: ':'
       createRebaseOptionsMenu: 'm'
       pushFiles: 'P'
       pullFiles: 'p'
       refresh: 'R'
       createPatchOptionsMenu: '<c-p>'
-      nextBranchTab: ']'
-      prevBranchTab: '['
+      nextTab: ']'
+      prevTab: '['
+      nextScreenMode: '+'
+      prevScreenMode: '_'
     status:
       checkForUpdate: 'u'
       recentRepos: '<enter>'
@@ -112,7 +120,7 @@ Default path for the config file: `~/.config/jesseduffield/lazygit/config.yml`
       cherryPickCopyRange: 'C'
       pasteCommits: 'v'
       tagCommit: 'T'
-      toggleDiffCommit: 'h'
+      toggleDiffCommit: 'i'
       checkoutCommit: '<space>'
     stash:
       popStash: 'g'
@@ -189,6 +197,8 @@ If you have issues with a light terminal theme where you can't read / see the te
         - bold
       inactiveBorderColor:
         - black
+      selectedLineBgColor:
+        - blue
 ```
 
 ## Example Coloring:
@@ -196,7 +206,7 @@ If you have issues with a light terminal theme where you can't read / see the te
 ![border example](/docs/resources/colored-border-example.png)
 
 ## Keybindings:
-For all possible keybinding options, check [Custom_Keybinding.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybinding.md) <++>
+For all possible keybinding options, check [Custom_Keybinding.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybinding.md)
 
 
 #### Example Keybindings For Colemak Users:
@@ -219,5 +229,8 @@ For all possible keybinding options, check [Custom_Keybinding.md](https://github
     commits:
       moveDownCommit: '<c-e>'
       moveUpCommit: '<c-u>'
+      toggleDiffCommit: 'l'
+    branches:
+      viewGitFlowOptions: 'I'
 ```
 

go.mod

@@ -11,15 +11,15 @@ require (
 	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.3.1 // indirect
 	github.com/integrii/flaggy v1.4.0
-	github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532
+	github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed
 	github.com/jesseduffield/pty v1.2.1
-	github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7
-	github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e // indirect
+	github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7 // indirect
+	github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9 // indirect
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mattn/go-isatty v0.0.11 // indirect
-	github.com/mattn/go-runewidth v0.0.7
+	github.com/mattn/go-runewidth v0.0.8
 	github.com/mgutz/str v1.2.0
 	github.com/nicksnyder/go-i18n/v2 v2.0.3
 	github.com/onsi/ginkgo v1.10.3 // indirect

go.sum

@@ -79,6 +79,18 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532 h1:V1Lk2rm5/p27NjnlF2ezzkxDaisHNcveMNueSD7RYgs=
 github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200112025325-6c933915c351 h1:+sSqd2YotacWt+1MNRN8ZmXnYoiJeblZeptzKiHIyv0=
+github.com/jesseduffield/gocui v0.3.1-0.20200112025325-6c933915c351/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200131125953-f679540a7039 h1:CVhilJ8ZdN7GmAI+fbH9829Cp/8hbK7Lijbd4VaNgo0=
+github.com/jesseduffield/gocui v0.3.1-0.20200131125953-f679540a7039/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200131131454-a319843434ac h1:vp7I0RpFq4L46nFA9QQokzhFgr68LRGtwDO9xfq4F+A=
+github.com/jesseduffield/gocui v0.3.1-0.20200131131454-a319843434ac/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200201013258-57fdcf23edc5 h1:tE0w3tuL/bj1o5VMhjjE0ep6i7Fva+RYjKcMFcniJEY=
+github.com/jesseduffield/gocui v0.3.1-0.20200201013258-57fdcf23edc5/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200223105115-3e1f0f7c3efe h1:UQyebauOcBzbGq32kTXwEyuJaqp3BkI8JoCrGs2jijU=
+github.com/jesseduffield/gocui v0.3.1-0.20200223105115-3e1f0f7c3efe/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed h1:glGs+mzPZOl1iHiUsBW3918WeFwqsbQQ/jtLkkQXDi4=
+github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
 github.com/jesseduffield/pty v1.2.1 h1:7xYBiwNH0PpWqC8JmvrPq1a/ksNqyCavzWu9pbBGYWI=
 github.com/jesseduffield/pty v1.2.1/go.mod h1:7jlS40+UhOqkZJDIG1B/H21xnuET/+fvbbnHCa8wSIo=
 github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00 h1:+JaOkfBNYQYlGD7dgru8mCwYNEc5tRRI8mThlVANhSM=
@@ -87,6 +99,8 @@ github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7 h1:CRD7bVjlG
 github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7/go.mod h1:VspA3aTkEo0Q7TPCLmX1uHNP+Wb4iSDX09hmTRo1QYc=
 github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e h1:tth7wr6+sfSbdpRWWrwvLYyS56HyIRVfq0Qcl2h28wM=
 github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e/go.mod h1:anMibpZtqNxjDbxrcDEAwSdaJ37vyUeM1f/M4uekib4=
+github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9 h1:iBBk1lhFwjwJw//J2m1yyz9S368GeXQTpMVACTyQMh0=
+github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9/go.mod h1:anMibpZtqNxjDbxrcDEAwSdaJ37vyUeM1f/M4uekib4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
@@ -118,6 +132,8 @@ github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGe
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0=
+github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw=
 github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w=

pkg/app/app.go

@@ -14,7 +14,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/updates"
-	"github.com/jesseduffield/rollrus"
 	"github.com/shibukawa/configdir"
 	"github.com/sirupsen/logrus"
 )
@@ -73,9 +72,7 @@ func newDevelopmentLogger(config config.AppConfigurer) *logrus.Logger {
 
 func newLogger(config config.AppConfigurer) *logrus.Entry {
 	var log *logrus.Logger
-	environment := "production"
 	if config.GetDebug() || os.Getenv("DEBUG") == "TRUE" {
-		environment = "development"
 		log = newDevelopmentLogger(config)
 	} else {
 		log = newProductionLogger(config)
@@ -85,11 +82,6 @@ func newLogger(config config.AppConfigurer) *logrus.Entry {
 	// https://github.com/aybabtme/humanlog
 	log.Formatter = &logrus.JSONFormatter{}
 
-	if config.GetUserConfig().GetString("reporting") == "on" {
-		// this isn't really a secret token: it only has permission to push new rollbar items
-		hook := rollrus.NewHook("23432119147a4367abf7c0de2aa99a2d", environment)
-		log.Hooks.Add(hook)
-	}
 	return log.WithFields(logrus.Fields{
 		"debug":     config.GetDebug(),
 		"version":   config.GetVersion(),

pkg/commands/branch_list_builder.go

@@ -48,7 +48,7 @@ func (b *BranchListBuilder) obtainCurrentBranch() *Branch {
 func (b *BranchListBuilder) obtainReflogBranches() []*Branch {
 	branches := make([]*Branch, 0)
 	// if we directly put this string in RunCommandWithOutput the compiler complains because it thinks it's a format string
-	unescaped := "git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD"
+	unescaped := "git reflog --date=relative --pretty='%gd|%gs' --grep-reflog='checkout: moving' HEAD"
 	rawString, err := b.GitCommand.OSCommand.RunCommandWithOutput(unescaped)
 	if err != nil {
 		return branches
@@ -56,9 +56,11 @@ func (b *BranchListBuilder) obtainReflogBranches() []*Branch {
 
 	branchLines := utils.SplitLines(rawString)
 	for _, line := range branchLines {
-		timeNumber, timeUnit, branchName := branchInfoFromLine(line)
-		timeUnit = abbreviatedTimeUnit(timeUnit)
-		branch := &Branch{Name: branchName, Recency: timeNumber + timeUnit}
+		recency, branchName := branchInfoFromLine(line)
+		if branchName == "" {
+			continue
+		}
+		branch := &Branch{Name: branchName, Recency: recency}
 		branches = append(branches, branch)
 	}
 	return uniqueByName(branches)
@@ -143,11 +145,17 @@ func uniqueByName(branches []*Branch) []*Branch {
 
 // A line will have the form '10 days ago master' so we need to strip out the
 // useful information from that into timeNumber, timeUnit, and branchName
-func branchInfoFromLine(line string) (string, string, string) {
-	r := regexp.MustCompile("\\|.*\\s")
-	line = r.ReplaceAllString(line, " ")
-	words := strings.Split(line, " ")
-	return words[0], words[1], words[len(words)-1]
+func branchInfoFromLine(line string) (string, string) {
+	// example line: HEAD@{12 minutes ago}|checkout: moving from pulling-from-forks to tim77-patch-1
+	r := regexp.MustCompile(`HEAD\@\{([^\s]+) ([^\s]+) ago\}\|.*?([^\s]*)$`)
+	matches := r.FindStringSubmatch(strings.TrimSpace(line))
+	if len(matches) == 0 {
+		return "", ""
+	}
+	since := matches[1]
+	unit := matches[2]
+	branchName := matches[3]
+	return since + abbreviatedTimeUnit(unit), branchName
 }
 
 func abbreviatedTimeUnit(timeUnit string) string {

pkg/commands/commit.go

@@ -44,6 +44,8 @@ func (c *Commit) GetDisplayStrings(isFocused bool) []string {
 		shaColor = green
 	case "rebasing":
 		shaColor = blue
+	case "reflog":
+		shaColor = blue
 	case "selected":
 		shaColor = magenta
 	default:
@@ -59,8 +61,9 @@ func (c *Commit) GetDisplayStrings(isFocused bool) []string {
 	if c.Action != "" {
 		actionString = cyan.Sprint(utils.WithPadding(c.Action, 7)) + " "
 	} else if len(c.Tags) > 0 {
-		tagString = utils.ColoredString(strings.Join(c.Tags, " "), color.FgMagenta) + " "
+		tagColor := color.New(color.FgMagenta, color.Bold)
+		tagString = utils.ColoredStringDirect(strings.Join(c.Tags, " "), tagColor) + " "
 	}
 
-	return []string{shaColor.Sprint(c.Sha), actionString + tagString + defaultColor.Sprint(c.Name)}
+	return []string{shaColor.Sprint(c.Sha[:8]), actionString + tagString + defaultColor.Sprint(c.Name)}
 }

pkg/commands/commit_list_builder.go

@@ -45,8 +45,46 @@ func NewCommitListBuilder(log *logrus.Entry, gitCommand *GitCommand, osCommand *
 	}, nil
 }
 
+// nameAndTag takes a line from a git log and extracts the sha, message and tag (if present)
+// example inputs:
+// 66e6369c284e96ed5af5 (tag: v0.14.4) allow fastforwarding the current branch
+// 32e650e0bb3f4327749f (HEAD -> show-tags) this is my commit
+// 32e650e0bb3f4327749e this is my other commit
+func (c *CommitListBuilder) commitLineParts(line string) (string, string, []string) {
+	re := regexp.MustCompile(`(\w+) (.*)`)
+	shaMatch := re.FindStringSubmatch(line)
+
+	if len(shaMatch) <= 1 {
+		return line, "", nil
+	}
+	sha := shaMatch[1]
+	rest := shaMatch[2]
+
+	if !strings.HasPrefix(rest, "(") {
+		return sha, rest, nil
+	}
+
+	re = regexp.MustCompile(`\((.*)\) (.*)`)
+
+	parensMatch := re.FindStringSubmatch(rest)
+	if len(parensMatch) <= 1 {
+		return sha, rest, nil
+	}
+
+	notes := parensMatch[1]
+	message := parensMatch[2]
+	re = regexp.MustCompile(`tag: ([^,]+)`)
+	tagMatch := re.FindStringSubmatch(notes)
+	if len(tagMatch) <= 1 {
+		return sha, message, nil
+	}
+
+	tag := tagMatch[1]
+	return sha, message, []string{tag}
+}
+
 // GetCommits obtains the commits of the current branch
-func (c *CommitListBuilder) GetCommits() ([]*Commit, error) {
+func (c *CommitListBuilder) GetCommits(limit bool) ([]*Commit, error) {
 	commits := []*Commit{}
 	var rebasingCommits []*Commit
 	rebaseMode, err := c.GitCommand.RebaseMode()
@@ -65,20 +103,19 @@ func (c *CommitListBuilder) GetCommits() ([]*Commit, error) {
 	}
 
 	unpushedCommits := c.getUnpushedCommits()
-	log := c.getLog()
+	log := c.getLog(limit)
 
 	// now we can split it up and turn it into commits
 	for _, line := range utils.SplitLines(log) {
-		splitLine := strings.Split(line, " ")
-		sha := splitLine[0]
+		sha, name, tags := c.commitLineParts(line)
 		_, unpushed := unpushedCommits[sha]
 		status := map[bool]string{true: "unpushed", false: "pushed"}[unpushed]
 		commits = append(commits, &Commit{
 			Sha:           sha,
-			Name:          strings.Join(splitLine[1:], " "),
+			Name:          name,
 			Status:        status,
-			DisplayString: strings.Join(splitLine, " "),
-			// TODO: add tags here
+			DisplayString: line,
+			Tags:          tags,
 		})
 	}
 	if rebaseMode != "" {
@@ -190,7 +227,7 @@ func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*Commit, error) {
 		}
 		splitLine := strings.Split(line, " ")
 		commits = append([]*Commit{{
-			Sha:    splitLine[1][0:7],
+			Sha:    splitLine[1],
 			Name:   strings.Join(splitLine[2:], " "),
 			Status: "rebasing",
 			Action: splitLine[0],
@@ -207,7 +244,7 @@ func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*Commit, error) {
 // Subject: second commit on master
 func (c *CommitListBuilder) commitFromPatch(content string) (*Commit, error) {
 	lines := strings.Split(content, "\n")
-	sha := strings.Split(lines[0], " ")[1][0:7]
+	sha := strings.Split(lines[0], " ")[1]
 	name := strings.TrimPrefix(lines[3], "Subject: ")
 	return &Commit{
 		Sha:    sha,
@@ -281,12 +318,14 @@ func (c *CommitListBuilder) getUnpushedCommits() map[string]bool {
 	return pushables
 }
 
-// getLog gets the git log (currently limited to 30 commits for performance
-// until we work out lazy loading
-func (c *CommitListBuilder) getLog() string {
-	// currently limiting to 30 for performance reasons
-	// TODO: add lazyloading when you scroll down
-	result, err := c.OSCommand.RunCommandWithOutput("git log --oneline -30")
+// getLog gets the git log.
+func (c *CommitListBuilder) getLog(limit bool) string {
+	limitFlag := ""
+	if limit {
+		limitFlag = "-30"
+	}
+
+	result, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git log --decorate --oneline %s --abbrev=%d", limitFlag, 20))
 	if err != nil {
 		// assume if there is an error there are no commits yet for this branch
 		return ""

pkg/commands/commit_list_builder_test.go

@@ -163,7 +163,7 @@ func TestCommitListBuilderGetLog(t *testing.T) {
 			"Retrieves logs",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+				assert.EqualValues(t, []string{"log", "--decorate", "--oneline", "-30", "--abbrev=20"}, args)
 
 				return exec.Command("echo", "6f0b32f commands/git : add GetCommits tests refactor\n9d9d775 circle : remove new line")
 			},
@@ -175,7 +175,7 @@ func TestCommitListBuilderGetLog(t *testing.T) {
 			"An error occurred when retrieving logs",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+				assert.EqualValues(t, []string{"log", "--decorate", "--oneline", "-30", "--abbrev=20"}, args)
 				return exec.Command("test")
 			},
 			func(output string) {
@@ -188,7 +188,7 @@ func TestCommitListBuilderGetLog(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			c := NewDummyCommitListBuilder()
 			c.OSCommand.SetCommand(s.command)
-			s.test(c.getLog())
+			s.test(c.getLog(true))
 		})
 	}
 }
@@ -212,7 +212,7 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 					assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args)
 					return exec.Command("echo")
 				case "log":
-					assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+					assert.EqualValues(t, []string{"log", "--decorate", "--oneline", "-30", "--abbrev=20"}, args)
 					return exec.Command("echo")
 				case "merge-base":
 					assert.EqualValues(t, []string{"merge-base", "HEAD", "master"}, args)
@@ -239,7 +239,7 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 					assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args)
 					return exec.Command("echo", "8a2bb0e")
 				case "log":
-					assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+					assert.EqualValues(t, []string{"log", "--decorate", "--oneline", "-30", "--abbrev=20"}, args)
 					return exec.Command("echo", "8a2bb0e commit 1\n78976bc commit 2")
 				case "merge-base":
 					assert.EqualValues(t, []string{"merge-base", "HEAD", "master"}, args)
@@ -280,7 +280,7 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 					assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args)
 					return exec.Command("echo", "8a2bb0e")
 				case "log":
-					assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+					assert.EqualValues(t, []string{"log", "--decorate", "--oneline", "-30", "--abbrev=20"}, args)
 					return exec.Command("echo", "8a2bb0e commit 1\n78976bc commit 2")
 				case "merge-base":
 					assert.EqualValues(t, []string{"merge-base", "HEAD", "master"}, args)
@@ -312,7 +312,7 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			c := NewDummyCommitListBuilder()
 			c.OSCommand.SetCommand(s.command)
-			s.test(c.GetCommits())
+			s.test(c.GetCommits(true))
 		})
 	}
 }

pkg/commands/git.go

@@ -176,8 +176,8 @@ func stashEntryFromLine(line string, index int) *StashEntry {
 }
 
 // GetStashEntryDiff stash diff
-func (c *GitCommand) GetStashEntryDiff(index int) (string, error) {
-	return c.OSCommand.RunCommandWithOutput("git stash show -p --color stash@{%d}", index)
+func (c *GitCommand) ShowStashEntryCmdStr(index int) string {
+	return fmt.Sprintf("git stash show -p --color stash@{%d}", index)
 }
 
 // GetStatusFiles git status files
@@ -191,10 +191,10 @@ func (c *GitCommand) GetStatusFiles() []*File {
 		stagedChange := change[0:1]
 		unstagedChange := statusString[1:2]
 		filename := c.OSCommand.Unquote(statusString[3:])
-		_, untracked := map[string]bool{"??": true, "A ": true, "AM": true}[change]
-		_, hasNoStagedChanges := map[string]bool{" ": true, "U": true, "?": true}[stagedChange]
-		hasMergeConflicts := change == "UU" || change == "AA" || change == "DU"
-		hasInlineMergeConflicts := change == "UU" || change == "AA"
+		untracked := utils.IncludesString([]string{"??", "A ", "AM"}, change)
+		hasNoStagedChanges := utils.IncludesString([]string{" ", "U", "?"}, stagedChange)
+		hasMergeConflicts := utils.IncludesString([]string{"DD", "AA", "UU", "AU", "UA", "UD", "DU"}, change)
+		hasInlineMergeConflicts := utils.IncludesString([]string{"UU", "AA"}, change)
 
 		file := &File{
 			Name:                    filename,
@@ -404,12 +404,17 @@ func (c *GitCommand) AmendHead() (*exec.Cmd, error) {
 }
 
 // Pull pulls from repo
-func (c *GitCommand) Pull(ask func(string) string) error {
-	return c.OSCommand.DetectUnamePass("git pull --no-edit", ask)
+func (c *GitCommand) Pull(args string, ask func(string) string) error {
+	return c.OSCommand.DetectUnamePass("git pull --no-edit "+args, ask)
+}
+
+// PullWithoutPasswordCheck assumes that the pull will not prompt the user for a password
+func (c *GitCommand) PullWithoutPasswordCheck(args string) error {
+	return c.OSCommand.RunCommand("git pull --no-edit " + args)
 }
 
 // Push pushes to a branch
-func (c *GitCommand) Push(branchName string, force bool, upstream string, ask func(string) string) error {
+func (c *GitCommand) Push(branchName string, force bool, upstream string, args string, ask func(string) string) error {
 	forceFlag := ""
 	if force {
 		forceFlag = "--force-with-lease"
@@ -420,7 +425,7 @@ func (c *GitCommand) Push(branchName string, force bool, upstream string, ask fu
 		setUpstreamArg = "--set-upstream " + upstream
 	}
 
-	cmd := fmt.Sprintf("git push --follow-tags %s %s", forceFlag, setUpstreamArg)
+	cmd := fmt.Sprintf("git push --follow-tags %s %s %s", forceFlag, setUpstreamArg, args)
 	return c.OSCommand.DetectUnamePass(cmd, ask)
 }
 
@@ -538,7 +543,8 @@ func (c *GitCommand) PrepareCommitAmendSubProcess() *exec.Cmd {
 // Currently it limits the result to 100 commits, but when we get async stuff
 // working we can do lazy loading
 func (c *GitCommand) GetBranchGraph(branchName string) (string, error) {
-	return c.OSCommand.RunCommandWithOutput("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium -100 %s", branchName)
+	cmdStr := c.GetBranchGraphCmdStr(branchName)
+	return c.OSCommand.RunCommandWithOutput(cmdStr)
 }
 
 func (c *GitCommand) GetUpstreamForBranch(branchName string) (string, error) {
@@ -551,41 +557,12 @@ func (c *GitCommand) Ignore(filename string) error {
 	return c.OSCommand.AppendLineToFile(".gitignore", filename)
 }
 
-// Show shows the diff of a commit
-func (c *GitCommand) Show(sha string) (string, error) {
-	show, err := c.OSCommand.RunCommandWithOutput("git show --color --no-renames %s", sha)
-	if err != nil {
-		return "", err
-	}
+func (c *GitCommand) ShowCmdStr(sha string) string {
+	return fmt.Sprintf("git show --color --no-renames --stat -p %s", sha)
+}
 
-	// if this is a merge commit, we need to go a step further and get the diff between the two branches we merged
-	revList, err := c.OSCommand.RunCommandWithOutput("git rev-list -1 --merges %s^...%s", sha, sha)
-	if err != nil {
-		// turns out we get an error here when it's the first commit. We'll just return the original show
-		return show, nil
-	}
-	if len(revList) == 0 {
-		return show, nil
-	}
-
-	// we want to pull out 1a6a69a and 3b51d7c from this:
-	// commit ccc771d8b13d5b0d4635db4463556366470fd4f6
-	// Merge: 1a6a69a 3b51d7c
-	lines := utils.SplitLines(show)
-	if len(lines) < 2 {
-		return show, nil
-	}
-
-	secondLineWords := strings.Split(lines[1], " ")
-	if len(secondLineWords) < 3 {
-		return show, nil
-	}
-
-	mergeDiff, err := c.OSCommand.RunCommandWithOutput("git diff --color %s...%s", secondLineWords[1], secondLineWords[2])
-	if err != nil {
-		return "", err
-	}
-	return show + mergeDiff, nil
+func (c *GitCommand) GetBranchGraphCmdStr(branchName string) string {
+	return fmt.Sprintf("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium %s", branchName)
 }
 
 // GetRemoteURL returns current repo remote url
@@ -606,6 +583,12 @@ func (c *GitCommand) CheckRemoteBranchExists(branch *Branch) bool {
 
 // Diff returns the diff of a file
 func (c *GitCommand) Diff(file *File, plain bool, cached bool) string {
+	// for now we assume an error means the file was deleted
+	s, _ := c.OSCommand.RunCommandWithOutput(c.DiffCmdStr(file, plain, cached))
+	return s
+}
+
+func (c *GitCommand) DiffCmdStr(file *File, plain bool, cached bool) string {
 	cachedArg := ""
 	trackedArg := "--"
 	colorArg := "--color"
@@ -614,16 +597,14 @@ func (c *GitCommand) Diff(file *File, plain bool, cached bool) string {
 	if cached {
 		cachedArg = "--cached"
 	}
-	if !file.Tracked && !file.HasStagedChanges {
+	if !file.Tracked && !file.HasStagedChanges && !cached {
 		trackedArg = "--no-index /dev/null"
 	}
 	if plain {
 		colorArg = ""
 	}
 
-	// for now we assume an error means the file was deleted
-	s, _ := c.OSCommand.RunCommandWithOutput("git diff %s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
-	return s
+	return fmt.Sprintf("git diff --stat -p %s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
 }
 
 func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
@@ -647,10 +628,12 @@ func (c *GitCommand) FastForward(branchName string, remoteName string, remoteBra
 
 func (c *GitCommand) RunSkipEditorCommand(command string) error {
 	cmd := c.OSCommand.ExecutableFromString(command)
+	lazyGitPath := c.OSCommand.GetLazygitPath()
 	cmd.Env = append(
 		cmd.Env,
 		"LAZYGIT_CLIENT_COMMAND=EXIT_IMMEDIATELY",
-		"EDITOR="+c.OSCommand.GetLazygitPath(),
+		"EDITOR="+lazyGitPath,
+		"VISUAL="+lazyGitPath,
 	)
 	return c.OSCommand.RunExecutable(cmd)
 }
@@ -908,11 +891,17 @@ func (c *GitCommand) GetCommitFiles(commitSha string, patchManager *PatchManager
 
 // ShowCommitFile get the diff of specified commit file
 func (c *GitCommand) ShowCommitFile(commitSha, fileName string, plain bool) (string, error) {
+	cmdStr := c.ShowCommitFileCmdStr(commitSha, fileName, plain)
+	return c.OSCommand.RunCommandWithOutput(cmdStr)
+}
+
+func (c *GitCommand) ShowCommitFileCmdStr(commitSha, fileName string, plain bool) string {
 	colorArg := "--color"
 	if plain {
 		colorArg = ""
 	}
-	return c.OSCommand.RunCommandWithOutput("git show --no-renames %s %s -- %s", colorArg, commitSha, fileName)
+
+	return fmt.Sprintf("git show --no-renames %s %s -- %s", colorArg, commitSha, fileName)
 }
 
 // CheckoutFile checks out the file for the given commit
@@ -956,6 +945,11 @@ func (c *GitCommand) DiscardAnyUnstagedFileChanges() error {
 	return c.OSCommand.RunCommand("git checkout -- .")
 }
 
+// RemoveTrackedFiles will delete the given file(s) even if they are currently tracked
+func (c *GitCommand) RemoveTrackedFiles(name string) error {
+	return c.OSCommand.RunCommand("git rm -r --cached %s", name)
+}
+
 // RemoveUntrackedFiles runs `git clean -fd`
 func (c *GitCommand) RemoveUntrackedFiles() error {
 	return c.OSCommand.RunCommand("git clean -fd")
@@ -1098,10 +1092,6 @@ func (c *GitCommand) CreateLightweightTag(tagName string, commitSha string) erro
 	return c.OSCommand.RunCommand("git tag %s %s", tagName, commitSha)
 }
 
-func (c *GitCommand) ShowTag(tagName string) (string, error) {
-	return c.OSCommand.RunCommandWithOutput("git tag -n99 %s", tagName)
-}
-
 func (c *GitCommand) DeleteTag(tagName string) error {
 	return c.OSCommand.RunCommand("git tag -d %s", tagName)
 }
@@ -1113,3 +1103,28 @@ func (c *GitCommand) PushTag(remoteName string, tagName string) error {
 func (c *GitCommand) FetchRemote(remoteName string) error {
 	return c.OSCommand.RunCommand("git fetch %s", remoteName)
 }
+
+func (c *GitCommand) GetReflogCommits() ([]*Commit, error) {
+	output, err := c.OSCommand.RunCommandWithOutput("git reflog --abbrev=20")
+	if err != nil {
+		return nil, err
+	}
+
+	lines := strings.Split(strings.TrimSpace(output), "\n")
+	commits := make([]*Commit, len(lines))
+	re := regexp.MustCompile(`(\w+).*HEAD@\{\d+\}: (.*)`)
+	for i, line := range lines {
+		match := re.FindStringSubmatch(line)
+		if len(match) == 1 {
+			continue
+		}
+
+		commits[i] = &Commit{
+			Sha:    match[1],
+			Name:   match[2],
+			Status: "reflog",
+		}
+	}
+
+	return commits, nil
+}

pkg/commands/git_test.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"regexp"
 	"testing"
 	"time"
 
@@ -318,21 +319,6 @@ func TestGitCommandGetStashEntries(t *testing.T) {
 	}
 }
 
-// TestGitCommandGetStashEntryDiff is a function.
-func TestGitCommandGetStashEntryDiff(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-	gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
-		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"stash", "show", "-p", "--color", "stash@{1}"}, args)
-
-		return exec.Command("echo")
-	}
-
-	_, err := gitCmd.GetStashEntryDiff(1)
-
-	assert.NoError(t, err)
-}
-
 // TestGitCommandGetStatusFiles is a function.
 func TestGitCommandGetStatusFiles(t *testing.T) {
 	type scenario struct {
@@ -1030,7 +1016,7 @@ func TestGitCommandPush(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.command = s.command
-			err := gitCmd.Push("test", s.forcePush, "", func(passOrUname string) string {
+			err := gitCmd.Push("test", s.forcePush, "", "", func(passOrUname string) string {
 				return "\n"
 			})
 			s.test(err)
@@ -1411,66 +1397,6 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) {
 	}
 }
 
-// TestGitCommandShow is a function.
-func TestGitCommandShow(t *testing.T) {
-	type scenario struct {
-		testName string
-		arg      string
-		command  func(string, ...string) *exec.Cmd
-		test     func(string, error)
-	}
-
-	scenarios := []scenario{
-		{
-			"regular commit",
-			"456abcde",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  "git show --color --no-renames 456abcde",
-					Replace: "echo \"commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nblah\"",
-				},
-				{
-					Expect:  "git rev-list -1 --merges 456abcde^...456abcde",
-					Replace: "echo",
-				},
-			}),
-			func(result string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nblah\n", result)
-			},
-		},
-		{
-			"merge commit",
-			"456abcde",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  "git show --color --no-renames 456abcde",
-					Replace: "echo \"commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nMerge: 1a6a69a 3b51d7c\"",
-				},
-				{
-					Expect:  "git rev-list -1 --merges 456abcde^...456abcde",
-					Replace: "echo aa30e006433628ba9281652952b34d8aacda9c01",
-				},
-				{
-					Expect:  "git diff --color 1a6a69a...3b51d7c",
-					Replace: "echo blah",
-				},
-			}),
-			func(result string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nMerge: 1a6a69a 3b51d7c\nblah\n", result)
-			},
-		},
-	}
-
-	gitCmd := NewDummyGitCommand()
-
-	for _, s := range scenarios {
-		gitCmd.OSCommand.command = s.command
-		s.test(gitCmd.Show(s.arg))
-	}
-}
-
 // TestGitCommandCheckout is a function.
 func TestGitCommandCheckout(t *testing.T) {
 	type scenario struct {
@@ -1523,7 +1449,7 @@ func TestGitCommandGetBranchGraph(t *testing.T) {
 	gitCmd := NewDummyGitCommand()
 	gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
 		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"log", "--graph", "--color", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "-100", "test"}, args)
+		assert.EqualValues(t, []string{"log", "--graph", "--color", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "test"}, args)
 
 		return exec.Command("echo")
 	}
@@ -1547,7 +1473,7 @@ func TestGitCommandDiff(t *testing.T) {
 			"Default case",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--color", "--", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--stat", "-p", "--color", "--", "test.txt"}, args)
 
 				return exec.Command("echo")
 			},
@@ -1563,7 +1489,7 @@ func TestGitCommandDiff(t *testing.T) {
 			"cached",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--color", "--cached", "--", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--stat", "-p", "--color", "--cached", "--", "test.txt"}, args)
 
 				return exec.Command("echo")
 			},
@@ -1579,7 +1505,7 @@ func TestGitCommandDiff(t *testing.T) {
 			"plain",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--stat", "-p", "--", "test.txt"}, args)
 
 				return exec.Command("echo")
 			},
@@ -1595,7 +1521,7 @@ func TestGitCommandDiff(t *testing.T) {
 			"File not tracked and file has no staged changes",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--color", "--no-index", "/dev/null", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--stat", "-p", "--color", "--no-index", "/dev/null", "test.txt"}, args)
 
 				return exec.Command("echo")
 			},
@@ -2176,6 +2102,37 @@ func TestGitCommandCreateFixupCommit(t *testing.T) {
 	}
 }
 
+// TestGitCommandSkipEditorCommand confirms that SkipEditorCommand injects
+// environment variables that suppress an interactive editor
+func TestGitCommandSkipEditorCommand(t *testing.T) {
+	cmd := NewDummyGitCommand()
+
+	cmd.OSCommand.SetBeforeExecuteCmd(func(cmd *exec.Cmd) {
+		test.AssertContainsMatch(
+			t,
+			cmd.Env,
+			regexp.MustCompile("^VISUAL="),
+			"expected VISUAL to be set for a non-interactive external command",
+		)
+
+		test.AssertContainsMatch(
+			t,
+			cmd.Env,
+			regexp.MustCompile("^EDITOR="),
+			"expected EDITOR to be set for a non-interactive external command",
+		)
+
+		test.AssertContainsMatch(
+			t,
+			cmd.Env,
+			regexp.MustCompile("^LAZYGIT_CLIENT_COMMAND=EXIT_IMMEDIATELY$"),
+			"expected LAZYGIT_CLIENT_COMMAND to be set for a non-interactive external command",
+		)
+	})
+
+	cmd.RunSkipEditorCommand("true")
+}
+
 func TestFindDotGitDir(t *testing.T) {
 	type scenario struct {
 		testName string

pkg/commands/os.go

@@ -36,6 +36,7 @@ type OSCommand struct {
 	Platform           *Platform
 	Config             config.AppConfigurer
 	command            func(string, ...string) *exec.Cmd
+	beforeExecuteCmd   func(*exec.Cmd)
 	getGlobalGitConfig func(string) (string, error)
 	getenv             func(string) string
 }
@@ -47,6 +48,7 @@ func NewOSCommand(log *logrus.Entry, config config.AppConfigurer) *OSCommand {
 		Platform:           getPlatform(),
 		Config:             config,
 		command:            exec.Command,
+		beforeExecuteCmd:   func(*exec.Cmd) {},
 		getGlobalGitConfig: gitconfig.Global,
 		getenv:             os.Getenv,
 	}
@@ -58,6 +60,10 @@ func (c *OSCommand) SetCommand(cmd func(string, ...string) *exec.Cmd) {
 	c.command = cmd
 }
 
+func (c *OSCommand) SetBeforeExecuteCmd(cmd func(*exec.Cmd)) {
+	c.beforeExecuteCmd = cmd
+}
+
 // RunCommandWithOutput wrapper around commands returning their output and error
 // NOTE: If you don't pass any formatArgs we'll just use the command directly,
 // however there's a bizarre compiler error/warning when you pass in a formatString
@@ -76,6 +82,7 @@ func (c *OSCommand) RunCommandWithOutput(formatString string, formatArgs ...inte
 
 // RunExecutableWithOutput runs an executable file and returns its output
 func (c *OSCommand) RunExecutableWithOutput(cmd *exec.Cmd) (string, error) {
+	c.beforeExecuteCmd(cmd)
 	return sanitisedCommandOutput(cmd.CombinedOutput())
 }
 
@@ -308,6 +315,7 @@ func (c *OSCommand) FileExists(path string) (bool, error) {
 // this is useful if you need to give your command some environment variables
 // before running it
 func (c *OSCommand) RunPreparedCommand(cmd *exec.Cmd) error {
+	c.beforeExecuteCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	outString := string(out)
 	c.Log.Info(outString)

pkg/commands/patch_parser.go

@@ -120,7 +120,7 @@ func coloredString(colorAttr color.Attribute, str string, selected bool, include
 	var cl *color.Color
 	attributes := []color.Attribute{colorAttr}
 	if selected {
-		attributes = append(attributes, color.BgBlue)
+		attributes = append(attributes, theme.SelectedLineBgColor)
 	}
 	cl = color.New(attributes...)
 	var clIncluded *color.Color

pkg/config/app_config.go

@@ -243,6 +243,7 @@ func GetDefaultConfig() []byte {
   scrollHeight: 2
   scrollPastBottom: true
   mouseEvents: true
+  skipUnstageLineWarning: false
   theme:
     lightTheme: false
     activeBorderColor:
@@ -252,6 +253,8 @@ func GetDefaultConfig() []byte {
       - white
     optionsTextColor:
       - blue
+    selectedLineBgColor:
+      - blue
   commitLength:
     show: true
 git:
@@ -280,6 +283,9 @@ keybinding:
     nextBlock: '<right>'
     prevBlock-alt: 'h'
     nextBlock-alt: 'l'
+    nextMatch: 'n'
+    prevMatch: 'N'
+    startSearch: '/'
     optionMenu: 'x'
     optionMenu-alt1: '?'
     select: '<space>'
@@ -294,14 +300,16 @@ keybinding:
     scrollDownMain-alt1: 'J'
     scrollUpMain-alt2: '<c-u>'
     scrollDownMain-alt2: '<c-d>'
-    executeCustomCommand: 'X'
+    executeCustomCommand: ':'
     createRebaseOptionsMenu: 'm'
     pushFiles: 'P'
     pullFiles: 'p'
     refresh: 'R'
     createPatchOptionsMenu: '<c-p>'
-    nextBranchTab: ']'
-    prevBranchTab: '['
+    nextTab: ']'
+    prevTab: '['
+    nextScreenMode: '+'
+    prevScreenMode: '_'
   status:
     checkForUpdate: 'u'
     recentRepos: '<enter>'
@@ -345,7 +353,7 @@ keybinding:
     cherryPickCopyRange: 'C'
     pasteCommits: 'v'
     tagCommit: 'T'
-    toggleDiffCommit: 'h'
+    toggleDiffCommit: 'i'
     checkoutCommit: '<space>'
   stash:
     popStash: 'g'

pkg/gui/app_status_manager.go

@@ -1,6 +1,8 @@
 package gui
 
 import (
+	"time"
+
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -49,15 +51,26 @@ func (m *statusManager) getStatusString() string {
 // WithWaitingStatus wraps a function and shows a waiting status while the function is still executing
 func (gui *Gui) WithWaitingStatus(name string, f func() error) error {
 	go func() {
-		gui.g.Update(func(g *gocui.Gui) error {
-			gui.statusManager.addWaitingStatus(name)
-			return nil
-		})
+		gui.statusManager.addWaitingStatus(name)
 
-		defer gui.g.Update(func(g *gocui.Gui) error {
+		defer func() {
 			gui.statusManager.removeStatus(name)
-			return nil
-		})
+		}()
+
+		go func() {
+			ticker := time.NewTicker(time.Millisecond * 50)
+			defer ticker.Stop()
+			for range ticker.C {
+				appStatus := gui.statusManager.getStatusString()
+				gui.Log.Warn(appStatus)
+				if appStatus == "" {
+					return
+				}
+				if err := gui.renderString(gui.g, "appStatus", appStatus); err != nil {
+					gui.Log.Warn(err)
+				}
+			}
+		}()
 
 		if err := f(); err != nil {
 			gui.g.Update(func(g *gocui.Gui) error {

pkg/gui/branches_panel.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -37,40 +36,45 @@ func (gui *Gui) handleBranchSelect(g *gocui.Gui, v *gocui.View) error {
 
 	// This really shouldn't happen: there should always be a master branch
 	if len(gui.State.Branches) == 0 {
-		return gui.renderString(g, "main", gui.Tr.SLocalize("NoBranchesThisRepo"))
+		return gui.newStringTask("main", gui.Tr.SLocalize("NoBranchesThisRepo"))
 	}
 	branch := gui.getSelectedBranch()
 	if err := gui.focusPoint(0, gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches), v); err != nil {
 		return err
 	}
-	go func() {
-		_ = gui.RenderSelectedBranchUpstreamDifferences()
-	}()
-	go func() {
-		upstream, _ := gui.GitCommand.GetUpstreamForBranch(branch.Name)
-		if strings.Contains(upstream, "no upstream configured for branch") || strings.Contains(upstream, "unknown revision or path not in the working tree") {
-			upstream = gui.Tr.SLocalize("notTrackingRemote")
-		}
-		graph, err := gui.GitCommand.GetBranchGraph(branch.Name)
-		if err != nil && strings.HasPrefix(graph, "fatal: ambiguous argument") {
-			graph = gui.Tr.SLocalize("NoTrackingThisBranch")
-		}
-		_ = gui.renderString(g, "main", fmt.Sprintf("%s → %s\n\n%s", utils.ColoredString(branch.Name, color.FgGreen), utils.ColoredString(upstream, color.FgRed), graph))
-	}()
+	if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
+		return err
+	}
+
+	cmd := gui.OSCommand.ExecutableFromString(
+		gui.GitCommand.GetBranchGraphCmdStr(branch.Name),
+	)
+	if err := gui.newCmdTask("main", cmd); err != nil {
+		gui.Log.Error(err)
+	}
 	return nil
 }
 
 func (gui *Gui) RenderSelectedBranchUpstreamDifferences() error {
-	// here we tell the selected branch that it is selected.
-	// this is necessary for showing stats on a branch that is selected, because
-	// the displaystring function doesn't have access to gui state to tell if it's selected
-	for i, branch := range gui.State.Branches {
-		branch.Selected = i == gui.State.Panels.Branches.SelectedLine
-	}
+	return gui.newTask("branches", func(stop chan struct{}) error {
+		// here we tell the selected branch that it is selected.
+		// this is necessary for showing stats on a branch that is selected, because
+		// the displaystring function doesn't have access to gui state to tell if it's selected
+		for i, branch := range gui.State.Branches {
+			branch.Selected = i == gui.State.Panels.Branches.SelectedLine
+		}
 
-	branch := gui.getSelectedBranch()
-	branch.Pushables, branch.Pullables = gui.GitCommand.GetBranchUpstreamDifferenceCount(branch.Name)
-	return gui.renderListPanel(gui.getBranchesView(), gui.State.Branches)
+		branch := gui.getSelectedBranch()
+		branch.Pushables, branch.Pullables = gui.GitCommand.GetBranchUpstreamDifferenceCount(branch.Name)
+
+		select {
+		case <-stop:
+			return nil
+		default:
+		}
+
+		return gui.renderListPanel(gui.getBranchesView(), gui.State.Branches)
+	})
 }
 
 // gui.refreshStatus is called at the end of this because that's when we can
@@ -93,8 +97,7 @@ func (gui *Gui) refreshBranches(g *gocui.Gui) error {
 
 		// TODO: if we're in the remotes view and we've just deleted a remote we need to refresh accordingly
 		if gui.getBranchesView().Context == "local-branches" {
-			gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
-			if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
+			if err := gui.renderLocalBranchesWithSelection(); err != nil {
 				return err
 			}
 		}
@@ -108,11 +111,13 @@ func (gui *Gui) renderLocalBranchesWithSelection() error {
 	branchesView := gui.getBranchesView()
 
 	gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
-	if err := gui.renderListPanel(branchesView, gui.State.Branches); err != nil {
+	if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
 		return err
 	}
-	if err := gui.handleBranchSelect(gui.g, branchesView); err != nil {
-		return err
+	if gui.g.CurrentView() == branchesView {
+		if err := gui.handleBranchSelect(gui.g, branchesView); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -367,12 +372,19 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error {
 	go func() {
 		_ = gui.createLoaderPanel(gui.g, v, message)
 
-		if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
-			_ = gui.createErrorPanel(gui.g, err.Error())
+		if gui.State.Panels.Branches.SelectedLine == 0 {
+			if err := gui.GitCommand.PullWithoutPasswordCheck("--ff-only"); err != nil {
+				_ = gui.createErrorPanel(gui.g, err.Error())
+			}
+			_ = gui.refreshSidePanels(gui.g)
 		} else {
-			_ = gui.closeConfirmationPrompt(gui.g, true)
+			if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
+				_ = gui.createErrorPanel(gui.g, err.Error())
+			}
 			_ = gui.RenderSelectedBranchUpstreamDifferences()
 		}
+
+		_ = gui.closeConfirmationPrompt(gui.g, true)
 	}()
 	return nil
 }
@@ -388,6 +400,7 @@ func (gui *Gui) onBranchesTabClick(tabIndex int) error {
 func (gui *Gui) switchBranchesPanelContext(context string) error {
 	branchesView := gui.getBranchesView()
 	branchesView.Context = context
+	gui.onSearchEscape()
 
 	contextTabIndexMap := map[string]int{
 		"local-branches":  0,
@@ -423,3 +436,28 @@ func (gui *Gui) handlePrevBranchesTab(g *gocui.Gui, v *gocui.View) error {
 		utils.ModuloWithWrap(v.TabIndex-1, len(v.Tabs)),
 	)
 }
+
+func (gui *Gui) handleCreateResetToBranchMenu(g *gocui.Gui, v *gocui.View) error {
+	branch := gui.getSelectedBranch()
+	if branch == nil {
+		return nil
+	}
+
+	return gui.createResetMenu(branch.Name)
+}
+
+func (gui *Gui) onBranchesPanelSearchSelect(selectedLine int) error {
+	branchesView := gui.getBranchesView()
+	switch branchesView.Context {
+	case "local-branches":
+		gui.State.Panels.Branches.SelectedLine = selectedLine
+		return gui.handleBranchSelect(gui.g, branchesView)
+	case "remotes":
+		gui.State.Panels.Remotes.SelectedLine = selectedLine
+		return gui.handleRemoteSelect(gui.g, branchesView)
+	case "remote-branches":
+		gui.State.Panels.RemoteBranches.SelectedLine = selectedLine
+		return gui.handleRemoteBranchSelect(gui.g, branchesView)
+	}
+	return nil
+}

pkg/gui/commit_files_panel.go

@@ -29,7 +29,9 @@ func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error {
 	}
 
 	gui.getMainView().Title = "Patch"
-	gui.State.Panels.LineByLine = nil
+	if gui.currentViewName() == "commitFiles" {
+		gui.handleEscapeLineByLinePanel()
+	}
 
 	commitFile := gui.getSelectedCommitFile(g)
 	if commitFile == nil {
@@ -43,11 +45,15 @@ func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error {
 	if err := gui.focusPoint(0, gui.State.Panels.CommitFiles.SelectedLine, len(gui.State.CommitFiles), v); err != nil {
 		return err
 	}
-	commitText, err := gui.GitCommand.ShowCommitFile(commitFile.Sha, commitFile.Name, false)
-	if err != nil {
-		return err
+
+	cmd := gui.OSCommand.ExecutableFromString(
+		gui.GitCommand.ShowCommitFileCmdStr(commitFile.Sha, commitFile.Name, false),
+	)
+	if err := gui.newCmdTask("main", cmd); err != nil {
+		gui.Log.Error(err)
 	}
-	return gui.renderString(g, "main", commitText)
+
+	return nil
 }
 
 func (gui *Gui) handleSwitchToCommitsPanel(g *gocui.Gui, v *gocui.View) error {
@@ -190,9 +196,7 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
 			}
 		}
 
-		if err := gui.changeMainViewsContext("patch-building"); err != nil {
-			return err
-		}
+		gui.changeMainViewsContext("patch-building")
 		if err := gui.switchFocus(gui.g, gui.getCommitFilesView(), gui.getMainView()); err != nil {
 			return err
 		}
@@ -208,3 +212,8 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
 
 	return enterTheFile(selectedLineIdx)
 }
+
+func (gui *Gui) onCommitFilesPanelSearchSelect(selectedLine int) error {
+	gui.State.Panels.CommitFiles.SelectedLine = selectedLine
+	return gui.handleCommitFileSelect(gui.g, gui.getCommitFilesView())
+}

pkg/gui/commits_panel.go

@@ -1,10 +1,8 @@
 package gui
 
 import (
-	"fmt"
 	"strconv"
 
-	"github.com/fatih/color"
 	"github.com/go-errors/errors"
 
 	"github.com/jesseduffield/gocui"
@@ -37,13 +35,23 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}
 
+	state := gui.State.Panels.Commits
+	if state.SelectedLine > 20 && state.LimitCommits {
+		state.LimitCommits = false
+		go func() {
+			if err := gui.refreshCommitsWithLimit(); err != nil {
+				_ = gui.createErrorPanel(gui.g, err.Error())
+			}
+		}()
+	}
+
 	gui.getMainView().Title = "Patch"
 	gui.getSecondaryView().Title = "Custom Patch"
-	gui.State.Panels.LineByLine = nil
+	gui.handleEscapeLineByLinePanel()
 
 	commit := gui.getSelectedCommit(g)
 	if commit == nil {
-		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
+		return gui.newStringTask("main", gui.Tr.SLocalize("NoCommitsThisBranch"))
 	}
 
 	if err := gui.focusPoint(0, gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits), v); err != nil {
@@ -55,41 +63,32 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
-	commitText, err := gui.GitCommand.Show(commit.Sha)
-	if err != nil {
-		return err
+	cmd := gui.OSCommand.ExecutableFromString(
+		gui.GitCommand.ShowCmdStr(commit.Sha),
+	)
+	if err := gui.newCmdTask("main", cmd); err != nil {
+		gui.Log.Error(err)
 	}
-	return gui.renderString(g, "main", commitText)
+
+	return nil
 }
 
 func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 	g.Update(func(*gocui.Gui) error {
-		builder, err := commands.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.CherryPickedCommits, gui.State.DiffEntries)
-		if err != nil {
-			return err
-		}
-		commits, err := builder.GetCommits()
-		if err != nil {
-			return err
-		}
-		gui.State.Commits = commits
-
-		gui.refreshSelectedLine(&gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits))
-
-		isFocused := gui.g.CurrentView().Name() == "commits"
-		list, err := utils.RenderList(gui.State.Commits, isFocused)
-		if err != nil {
-			return err
-		}
-
-		v := gui.getCommitsView()
-		v.Clear()
-		fmt.Fprint(v, list)
-
+		// I think this is here for the sake of some kind of rebasing thing
 		gui.refreshStatus(g)
-		if g.CurrentView() == v {
-			gui.handleCommitSelect(g, v)
+
+		if err := gui.refreshCommitsWithLimit(); err != nil {
+			return err
 		}
+
+		// doing this async because it shouldn't hold anything up
+		go func() {
+			if err := gui.refreshReflogCommits(); err != nil {
+				_ = gui.createErrorPanel(gui.g, err.Error())
+			}
+		}()
+
 		if g.CurrentView() == gui.getCommitFilesView() || (g.CurrentView() == gui.getMainView() || gui.State.MainContext == "patch-building") {
 			return gui.refreshCommitFilesView()
 		}
@@ -98,6 +97,27 @@ func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 	return nil
 }
 
+func (gui *Gui) refreshCommitsWithLimit() error {
+	builder, err := commands.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.CherryPickedCommits, gui.State.DiffEntries)
+	if err != nil {
+		return err
+	}
+
+	commits, err := builder.GetCommits(gui.State.Panels.Commits.LimitCommits)
+	if err != nil {
+		return err
+	}
+	gui.State.Commits = commits
+
+	if gui.getCommitsView().Context == "branch-commits" {
+		if err := gui.renderBranchCommitsWithSelection(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // specific functions
 
 func (gui *Gui) handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error {
@@ -444,7 +464,7 @@ func (gui *Gui) handleToggleDiffCommit(g *gocui.Gui, v *gocui.View) error {
 	// get selected commit
 	commit := gui.getSelectedCommit(g)
 	if commit == nil {
-		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
+		return gui.newStringTask("main", gui.Tr.SLocalize("NoCommitsThisBranch"))
 	}
 
 	// if already selected commit delete
@@ -467,7 +487,7 @@ func (gui *Gui) handleToggleDiffCommit(g *gocui.Gui, v *gocui.View) error {
 			return gui.createErrorPanel(gui.g, err.Error())
 		}
 
-		return gui.renderString(g, "main", commitText)
+		return gui.newStringTask("main", commitText)
 	}
 
 	return nil
@@ -538,53 +558,6 @@ func (gui *Gui) handleSquashAllAboveFixupCommits(g *gocui.Gui, v *gocui.View) er
 	}, nil)
 }
 
-type resetOption struct {
-	description string
-	command     string
-}
-
-// GetDisplayStrings is a function.
-func (r *resetOption) GetDisplayStrings(isFocused bool) []string {
-	return []string{r.description, color.New(color.FgRed).Sprint(r.command)}
-}
-
-func (gui *Gui) handleCreateCommitResetMenu(g *gocui.Gui, v *gocui.View) error {
-	commit := gui.getSelectedCommit(g)
-	if commit == nil {
-		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoCommitsThisBranch"))
-	}
-
-	strengths := []string{"soft", "mixed", "hard"}
-	options := make([]*resetOption, len(strengths))
-	for i, strength := range strengths {
-		options[i] = &resetOption{
-			description: fmt.Sprintf("%s reset", strength),
-			command:     fmt.Sprintf("reset --%s %s", strength, commit.Sha),
-		}
-	}
-
-	handleMenuPress := func(index int) error {
-		if err := gui.GitCommand.ResetToCommit(commit.Sha, strengths[index]); err != nil {
-			return err
-		}
-
-		if err := gui.refreshCommits(g); err != nil {
-			return err
-		}
-		if err := gui.refreshFiles(); err != nil {
-			return err
-		}
-		if err := gui.resetOrigin(gui.getCommitsView()); err != nil {
-			return err
-		}
-
-		gui.State.Panels.Commits.SelectedLine = 0
-		return gui.handleCommitSelect(g, gui.getCommitsView())
-	}
-
-	return gui.createMenu(fmt.Sprintf("%s %s", gui.Tr.SLocalize("resetTo"), commit.Sha), options, len(options), handleMenuPress)
-}
-
 func (gui *Gui) handleTagCommit(g *gocui.Gui, v *gocui.View) error {
 	// TODO: bring up menu asking if you want to make a lightweight or annotated tag
 	// if annotated, switch to a subprocess to create the message
@@ -615,10 +588,102 @@ func (gui *Gui) handleCreateLightweightTag(commitSha string) error {
 func (gui *Gui) handleCheckoutCommit(g *gocui.Gui, v *gocui.View) error {
 	commit := gui.getSelectedCommit(g)
 	if commit == nil {
-		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
+		return nil
 	}
 
 	return gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
 		return gui.handleCheckoutRef(commit.Sha)
 	}, nil)
 }
+
+func (gui *Gui) renderBranchCommitsWithSelection() error {
+	commitsView := gui.getCommitsView()
+
+	gui.refreshSelectedLine(&gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits))
+	if err := gui.renderListPanel(commitsView, gui.State.Commits); err != nil {
+		return err
+	}
+	if gui.g.CurrentView() == commitsView && commitsView.Context == "branch-commits" {
+		if err := gui.handleCommitSelect(gui.g, commitsView); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (gui *Gui) onCommitsTabClick(tabIndex int) error {
+	contexts := []string{"branch-commits", "reflog-commits"}
+	commitsView := gui.getCommitsView()
+	commitsView.TabIndex = tabIndex
+
+	return gui.switchCommitsPanelContext(contexts[tabIndex])
+}
+
+func (gui *Gui) switchCommitsPanelContext(context string) error {
+	commitsView := gui.getCommitsView()
+	commitsView.Context = context
+	gui.onSearchEscape()
+
+	contextTabIndexMap := map[string]int{
+		"branch-commits": 0,
+		"reflog-commits": 1,
+	}
+
+	commitsView.TabIndex = contextTabIndexMap[context]
+
+	switch context {
+	case "branch-commits":
+		return gui.renderBranchCommitsWithSelection()
+	case "reflog-commits":
+		return gui.renderReflogCommitsWithSelection()
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleNextCommitsTab(g *gocui.Gui, v *gocui.View) error {
+	return gui.onCommitsTabClick(
+		utils.ModuloWithWrap(v.TabIndex+1, len(v.Tabs)),
+	)
+}
+
+func (gui *Gui) handlePrevCommitsTab(g *gocui.Gui, v *gocui.View) error {
+	return gui.onCommitsTabClick(
+		utils.ModuloWithWrap(v.TabIndex-1, len(v.Tabs)),
+	)
+}
+
+func (gui *Gui) handleCreateCommitResetMenu(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoCommitsThisBranch"))
+	}
+
+	return gui.createResetMenu(commit.Sha)
+}
+
+func (gui *Gui) onCommitsPanelSearchSelect(selectedLine int) error {
+	commitsView := gui.getCommitsView()
+	switch commitsView.Context {
+	case "branch-commits":
+		gui.State.Panels.Commits.SelectedLine = selectedLine
+		return gui.handleCommitSelect(gui.g, commitsView)
+	case "reflog-commits":
+		gui.State.Panels.ReflogCommits.SelectedLine = selectedLine
+		return gui.handleReflogCommitSelect(gui.g, commitsView)
+	}
+	return nil
+}
+
+func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) error {
+	// we usually lazyload these commits but now that we're searching we need to load them now
+	if gui.State.Panels.Commits.LimitCommits {
+		gui.State.Panels.Commits.LimitCommits = false
+		if err := gui.refreshCommits(gui.g); err != nil {
+			return err
+		}
+	}
+
+	return gui.handleOpenSearch(gui.g, v)
+}

pkg/gui/confirmation_panel.go

@@ -75,6 +75,9 @@ func (gui *Gui) prepareConfirmationPanel(currentView *gocui.View, title, prompt
 			return nil, err
 		}
 		confirmationView.HasLoader = hasLoader
+		if hasLoader {
+			gui.g.StartTicking()
+		}
 		confirmationView.Title = title
 		confirmationView.Wrap = true
 		confirmationView.FgColor = theme.GocuiDefaultTextColor

pkg/gui/context.go

@@ -4,9 +4,9 @@ package gui
 // which currently just means a context that affects both the main and secondary views
 // other views can have their context changed directly but this function helps
 // keep the main and secondary views in sync
-func (gui *Gui) changeMainViewsContext(context string) error {
+func (gui *Gui) changeMainViewsContext(context string) {
 	if gui.State.MainContext == context {
-		return nil
+		return
 	}
 
 	switch context {
@@ -16,5 +16,5 @@ func (gui *Gui) changeMainViewsContext(context string) error {
 	}
 
 	gui.State.MainContext = context
-	return nil
+	return
 }

pkg/gui/discard_changes_menu_panel.go

@@ -0,0 +1,42 @@
+package gui
+
+import (
+	"github.com/jesseduffield/gocui"
+)
+
+func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error {
+	file, err := gui.getSelectedFile(g)
+	if err != nil {
+		if err != gui.Errors.ErrNoFiles {
+			return err
+		}
+		return nil
+	}
+
+	menuItems := []*menuItem{
+		{
+			displayString: gui.Tr.SLocalize("discardAllChanges"),
+			onPress: func() error {
+				if err := gui.GitCommand.DiscardAllFileChanges(file); err != nil {
+					return err
+				}
+				return gui.refreshFiles()
+			},
+		},
+	}
+
+	if file.HasStagedChanges && file.HasUnstagedChanges {
+		menuItems = append(menuItems, &menuItem{
+			displayString: gui.Tr.SLocalize("discardUnstagedChanges"),
+			onPress: func() error {
+				if err := gui.GitCommand.DiscardUnstagedFileChanges(file); err != nil {
+					return err
+				}
+
+				return gui.refreshFiles()
+			},
+		})
+	}
+
+	return gui.createMenu(file.Name, menuItems, createMenuOptions{showCancel: true})
+}

pkg/gui/file_watching.go

@@ -19,13 +19,20 @@ type fileWatcher struct {
 	Watcher          *fsnotify.Watcher
 	WatchedFilenames []string
 	Log              *logrus.Entry
+	Disabled         bool
 }
 
 func NewFileWatcher(log *logrus.Entry) *fileWatcher {
 	watcher, err := fsnotify.NewWatcher()
+	log.Error(err)
+	return &fileWatcher{
+		Disabled: true,
+	}
 	if err != nil {
 		log.Error(err)
-		return nil
+		return &fileWatcher{
+			Disabled: true,
+		}
 	}
 
 	return &fileWatcher{
@@ -66,6 +73,10 @@ func (w *fileWatcher) watchFilename(filename string) {
 }
 
 func (w *fileWatcher) addFilesToFileWatcher(files []*commands.File) error {
+	if w.Disabled {
+		return nil
+	}
+
 	if len(files) == 0 {
 		return nil
 	}
@@ -105,7 +116,7 @@ func min(a int, b int) int {
 // TODO: consider watching the whole directory recursively (could be more expensive)
 func (gui *Gui) watchFilesForChanges() {
 	gui.fileWatcher = NewFileWatcher(gui.Log)
-	if gui.fileWatcher == nil {
+	if gui.fileWatcher.Disabled {
 		return
 	}
 	go func() {

pkg/gui/files_panel.go

@@ -32,7 +32,9 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
 		if err != gui.Errors.ErrNoFiles {
 			return err
 		}
-		return gui.renderString(gui.g, "main", gui.Tr.SLocalize("NoChangedFiles"))
+		gui.State.SplitMainPanel = false
+		gui.getMainView().Title = ""
+		return gui.newStringTask("main", gui.Tr.SLocalize("NoChangedFiles"))
 	}
 
 	if err := gui.focusPoint(0, gui.State.Panels.Files.SelectedLine, len(gui.State.Files), gui.getFilesView()); err != nil {
@@ -45,37 +47,40 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
 		return gui.refreshMergePanel()
 	}
 
-	content := gui.GitCommand.Diff(file, false, false)
-	contentCached := gui.GitCommand.Diff(file, false, true)
-	leftContent := content
+	if !alreadySelected {
+		if err := gui.resetOrigin(gui.getMainView()); err != nil {
+			return err
+		}
+		if err := gui.resetOrigin(gui.getSecondaryView()); err != nil {
+			return err
+		}
+	}
+
 	if file.HasStagedChanges && file.HasUnstagedChanges {
 		gui.State.SplitMainPanel = true
 		gui.getMainView().Title = gui.Tr.SLocalize("UnstagedChanges")
 		gui.getSecondaryView().Title = gui.Tr.SLocalize("StagedChanges")
+		cmdStr := gui.GitCommand.DiffCmdStr(file, false, true)
+		cmd := gui.OSCommand.ExecutableFromString(cmdStr)
+		if err := gui.newCmdTask("secondary", cmd); err != nil {
+			return err
+		}
 	} else {
 		gui.State.SplitMainPanel = false
 		if file.HasUnstagedChanges {
-			leftContent = content
 			gui.getMainView().Title = gui.Tr.SLocalize("UnstagedChanges")
 		} else {
-			leftContent = contentCached
 			gui.getMainView().Title = gui.Tr.SLocalize("StagedChanges")
 		}
 	}
 
-	if alreadySelected {
-		gui.g.Update(func(*gocui.Gui) error {
-			if err := gui.setViewContent(gui.g, gui.getSecondaryView(), contentCached); err != nil {
-				return err
-			}
-			return gui.setViewContent(gui.g, gui.getMainView(), leftContent)
-		})
-		return nil
-	}
-	if err := gui.renderString(gui.g, "secondary", contentCached); err != nil {
+	cmdStr := gui.GitCommand.DiffCmdStr(file, false, !file.HasUnstagedChanges && file.HasStagedChanges)
+	cmd := gui.OSCommand.ExecutableFromString(cmdStr)
+	if err := gui.newCmdTask("main", cmd); err != nil {
 		return err
 	}
-	return gui.renderString(gui.g, "main", leftContent)
+
+	return nil
 }
 
 func (gui *Gui) refreshFiles() error {
@@ -168,9 +173,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error
 	if file.HasMergeConflicts {
 		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FileStagingRequirements"))
 	}
-	if err := gui.changeMainViewsContext("staging"); err != nil {
-		return err
-	}
+	gui.changeMainViewsContext("staging")
 	if err := gui.switchFocus(gui.g, gui.getFilesView(), gui.getMainView()); err != nil {
 		return err
 	}
@@ -239,16 +242,29 @@ func (gui *Gui) handleStageAll(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(gui.g)
 	if err != nil {
-		return gui.createErrorPanel(g, err.Error())
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
+
 	if file.Tracked {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantIgnoreTrackFiles"))
+		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
+				}
+				if err := gui.GitCommand.RemoveTrackedFiles(file.Name); err != nil {
+					return err
+				}
+				return gui.refreshFiles()
+			}, nil)
 	}
+
 	if err := gui.GitCommand.Ignore(file.Name); err != nil {
-		return gui.createErrorPanel(g, err.Error())
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
+
 	return gui.refreshFiles()
 }
 
@@ -369,15 +385,15 @@ func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) {
 		if err != gui.Errors.ErrNoFiles {
 			return "", err
 		}
-		return "", gui.renderString(g, "main", gui.Tr.SLocalize("NoFilesDisplay"))
+		return "", gui.newStringTask("main", gui.Tr.SLocalize("NoFilesDisplay"))
 	}
 	if item.Type != "file" {
-		return "", gui.renderString(g, "main", gui.Tr.SLocalize("NotAFile"))
+		return "", gui.newStringTask("main", gui.Tr.SLocalize("NotAFile"))
 	}
 	cat, err := gui.GitCommand.CatFile(item.Name)
 	if err != nil {
 		gui.Log.Error(err)
-		return "", gui.renderString(g, "main", err.Error())
+		return "", gui.newStringTask("main", err.Error())
 	}
 	return cat, nil
 }
@@ -390,6 +406,17 @@ func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}
 	if pullables == "?" {
+		// 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))
+			}
+		}
+
 		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 {
@@ -399,21 +426,21 @@ func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error {
 				}
 				return gui.createErrorPanel(gui.g, errorMessage)
 			}
-			return gui.pullFiles(v)
+			return gui.pullFiles(v, "")
 		})
 	}
 
-	return gui.pullFiles(v)
+	return gui.pullFiles(v, "")
 }
 
-func (gui *Gui) pullFiles(v *gocui.View) error {
+func (gui *Gui) pullFiles(v *gocui.View, args string) error {
 	if err := gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("PullWait")); err != nil {
 		return err
 	}
 
 	go func() {
 		unamePassOpend := false
-		err := gui.GitCommand.Pull(func(passOrUname string) string {
+		err := gui.GitCommand.Pull(args, func(passOrUname string) string {
 			unamePassOpend = true
 			return gui.waitForPassUname(gui.g, v, passOrUname)
 		})
@@ -423,14 +450,14 @@ func (gui *Gui) pullFiles(v *gocui.View) error {
 	return nil
 }
 
-func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstream string) error {
+func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstream string, args string) error {
 	if err := gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("PushWait")); err != nil {
 		return err
 	}
 	go func() {
 		unamePassOpend := false
 		branchName := gui.getCheckedOutBranch().Name
-		err := gui.GitCommand.Push(branchName, force, upstream, func(passOrUname string) string {
+		err := gui.GitCommand.Push(branchName, force, upstream, args, func(passOrUname string) string {
 			unamePassOpend = true
 			return gui.waitForPassUname(g, v, passOrUname)
 		})
@@ -448,14 +475,25 @@ func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
 	}
 
 	if pullables == "?" {
+		// 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))
+			}
+		}
+
 		return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranchName, func(g *gocui.Gui, v *gocui.View) error {
-			return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v))
+			return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v), "")
 		})
 	} else if pullables == "0" {
-		return gui.pushWithForceFlag(g, v, false, "")
+		return gui.pushWithForceFlag(g, v, false, "", "")
 	}
-	return gui.createConfirmationPanel(g, nil, true, gui.Tr.SLocalize("ForcePush"), gui.Tr.SLocalize("ForcePushPrompt"), func(g *gocui.Gui, v *gocui.View) error {
-		return gui.pushWithForceFlag(g, v, true, "")
+	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("ForcePush"), gui.Tr.SLocalize("ForcePushPrompt"), func(g *gocui.Gui, v *gocui.View) error {
+		return gui.pushWithForceFlag(g, v, true, "", "")
 	}, nil)
 }
 
@@ -470,9 +508,7 @@ func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error {
 	if !file.HasInlineMergeConflicts {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("FileNoMergeCons"))
 	}
-	if err := gui.changeMainViewsContext("merging"); err != nil {
-		return err
-	}
+	gui.changeMainViewsContext("merging")
 	if err := gui.switchFocus(g, v, gui.getMainView()); err != nil {
 		return err
 	}
@@ -504,67 +540,6 @@ func (gui *Gui) anyFilesWithMergeConflicts() bool {
 	return false
 }
 
-type discardOption struct {
-	handler     func(fileName *commands.File) error
-	description string
-}
-
-// GetDisplayStrings is a function.
-func (r *discardOption) GetDisplayStrings(isFocused bool) []string {
-	return []string{r.description}
-}
-
-func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile(g)
-	if err != nil {
-		if err != gui.Errors.ErrNoFiles {
-			return err
-		}
-		return nil
-	}
-
-	options := []*discardOption{
-		{
-			description: gui.Tr.SLocalize("discardAllChanges"),
-			handler: func(file *commands.File) error {
-				return gui.GitCommand.DiscardAllFileChanges(file)
-			},
-		},
-		{
-			description: gui.Tr.SLocalize("cancel"),
-			handler: func(file *commands.File) error {
-				return nil
-			},
-		},
-	}
-
-	if file.HasStagedChanges && file.HasUnstagedChanges {
-		discardUnstagedChanges := &discardOption{
-			description: gui.Tr.SLocalize("discardUnstagedChanges"),
-			handler: func(file *commands.File) error {
-				return gui.GitCommand.DiscardUnstagedFileChanges(file)
-			},
-		}
-
-		options = append(options[:1], append([]*discardOption{discardUnstagedChanges}, options[1:]...)...)
-	}
-
-	handleMenuPress := func(index int) error {
-		file, err := gui.getSelectedFile(g)
-		if err != nil {
-			return err
-		}
-
-		if err := options[index].handler(file); err != nil {
-			return err
-		}
-
-		return gui.refreshFiles()
-	}
-
-	return gui.createMenu(file.Name, options, len(options), handleMenuPress)
-}
-
 func (gui *Gui) handleCustomCommand(g *gocui.Gui, v *gocui.View) error {
 	return gui.createPromptPanel(g, v, gui.Tr.SLocalize("CustomCommand"), "", func(g *gocui.Gui, v *gocui.View) error {
 		command := gui.trimmedContent(v)
@@ -573,45 +548,34 @@ func (gui *Gui) handleCustomCommand(g *gocui.Gui, v *gocui.View) error {
 	})
 }
 
-type stashOption struct {
-	description string
-	handler     func() error
-}
-
-// GetDisplayStrings is a function.
-func (o *stashOption) GetDisplayStrings(isFocused bool) []string {
-	return []string{o.description}
-}
-
 func (gui *Gui) handleCreateStashMenu(g *gocui.Gui, v *gocui.View) error {
-	options := []*stashOption{
+	menuItems := []*menuItem{
 		{
-			description: gui.Tr.SLocalize("stashAllChanges"),
-			handler: func() error {
+			displayString: gui.Tr.SLocalize("stashAllChanges"),
+			onPress: func() error {
 				return gui.handleStashSave(gui.GitCommand.StashSave)
 			},
 		},
 		{
-			description: gui.Tr.SLocalize("stashStagedChanges"),
-			handler: func() error {
+			displayString: gui.Tr.SLocalize("stashStagedChanges"),
+			onPress: func() error {
 				return gui.handleStashSave(gui.GitCommand.StashSaveStagedChanges)
 			},
 		},
-		{
-			description: gui.Tr.SLocalize("cancel"),
-			handler: func() error {
-				return nil
-			},
-		},
 	}
 
-	handleMenuPress := func(index int) error {
-		return options[index].handler()
-	}
-
-	return gui.createMenu(gui.Tr.SLocalize("stashOptions"), options, len(options), handleMenuPress)
+	return gui.createMenu(gui.Tr.SLocalize("stashOptions"), menuItems, createMenuOptions{showCancel: true})
 }
 
 func (gui *Gui) handleStashChanges(g *gocui.Gui, v *gocui.View) error {
 	return gui.handleStashSave(gui.GitCommand.StashSave)
 }
+
+func (gui *Gui) handleCreateResetToUpstreamMenu(g *gocui.Gui, v *gocui.View) error {
+	return gui.createResetMenu("@{upstream}")
+}
+
+func (gui *Gui) onFilesPanelSearchSelect(selectedLine int) error {
+	gui.State.Panels.Files.SelectedLine = selectedLine
+	return gui.focusAndSelectFile(gui.g, gui.getFilesView())
+}

pkg/gui/git_flow.go

@@ -8,11 +8,6 @@ import (
 	"github.com/jesseduffield/gocui"
 )
 
-type gitFlowOption struct {
-	handler     func() error
-	description string
-}
-
 func (gui *Gui) gitFlowFinishBranch(gitFlowConfig string, branchName string) error {
 	// need to find out what kind of branch this is
 	prefix := strings.SplitAfterN(branchName, "/", 2)[0]
@@ -41,11 +36,6 @@ func (gui *Gui) gitFlowFinishBranch(gitFlowConfig string, branchName string) err
 	return gui.Errors.ErrSubProcess
 }
 
-// GetDisplayStrings is a function.
-func (r *gitFlowOption) GetDisplayStrings(isFocused bool) []string {
-	return []string{r.description}
-}
-
 func (gui *Gui) handleCreateGitFlowMenu(g *gocui.Gui, v *gocui.View) error {
 	branch := gui.getSelectedBranch()
 	if branch == nil {
@@ -70,37 +60,27 @@ func (gui *Gui) handleCreateGitFlowMenu(g *gocui.Gui, v *gocui.View) error {
 		}
 	}
 
-	options := []*gitFlowOption{
+	menuItems := []*menuItem{
 		{
 			// not localising here because it's one to one with the actual git flow commands
-			description: fmt.Sprintf("finish branch '%s'", branch.Name),
-			handler: func() error {
+			displayString: fmt.Sprintf("finish branch '%s'", branch.Name),
+			onPress: func() error {
 				return gui.gitFlowFinishBranch(gitFlowConfig, branch.Name)
 			},
 		},
 		{
-			description: "start feature",
-			handler:     startHandler("feature"),
+			displayString: "start feature",
+			onPress:       startHandler("feature"),
 		},
 		{
-			description: "start hotfix",
-			handler:     startHandler("hotfix"),
+			displayString: "start hotfix",
+			onPress:       startHandler("hotfix"),
 		},
 		{
-			description: "start release",
-			handler:     startHandler("release"),
-		},
-		{
-			description: gui.Tr.SLocalize("cancel"),
-			handler: func() error {
-				return nil
-			},
+			displayString: "start release",
+			onPress:       startHandler("release"),
 		},
 	}
 
-	handleMenuPress := func(index int) error {
-		return options[index].handler()
-	}
-
-	return gui.createMenu("git flow", options, len(options), handleMenuPress)
+	return gui.createMenu("git flow", menuItems, createMenuOptions{})
 }

pkg/gui/gui.go

@@ -25,6 +25,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
+	"github.com/jesseduffield/lazygit/pkg/tasks"
 	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/updates"
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -32,6 +33,12 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+const (
+	SCREEN_NORMAL int = iota
+	SCREEN_HALF
+	SCREEN_FULL
+)
+
 const StartupPopupVersion = 1
 
 // OverlappingEdges determines if panel edges overlap
@@ -68,20 +75,22 @@ type Teml i18n.Teml
 
 // Gui wraps the gocui Gui object which handles rendering and events
 type Gui struct {
-	g             *gocui.Gui
-	Log           *logrus.Entry
-	GitCommand    *commands.GitCommand
-	OSCommand     *commands.OSCommand
-	SubProcess    *exec.Cmd
-	State         guiState
-	Config        config.AppConfigurer
-	Tr            *i18n.Localizer
-	Errors        SentinelErrors
-	Updater       *updates.Updater
-	statusManager *statusManager
-	credentials   credentials
-	waitForIntro  sync.WaitGroup
-	fileWatcher   *fileWatcher
+	g                    *gocui.Gui
+	Log                  *logrus.Entry
+	GitCommand           *commands.GitCommand
+	OSCommand            *commands.OSCommand
+	SubProcess           *exec.Cmd
+	State                guiState
+	Config               config.AppConfigurer
+	Tr                   *i18n.Localizer
+	Errors               SentinelErrors
+	Updater              *updates.Updater
+	statusManager        *statusManager
+	credentials          credentials
+	waitForIntro         sync.WaitGroup
+	fileWatcher          *fileWatcher
+	viewBufferManagerMap map[string]*tasks.ViewBufferManager
+	stopChan             chan struct{}
 }
 
 // for now the staging panel state, unlike the other panel states, is going to be
@@ -128,6 +137,11 @@ type tagsPanelState struct {
 type commitPanelState struct {
 	SelectedLine     int
 	SpecificDiffMode bool
+	LimitCommits     bool
+}
+
+type reflogCommitPanelState struct {
+	SelectedLine int
 }
 
 type stashPanelState struct {
@@ -155,6 +169,7 @@ type panelStates struct {
 	RemoteBranches *remoteBranchesState
 	Tags           *tagsPanelState
 	Commits        *commitPanelState
+	ReflogCommits  *reflogCommitPanelState
 	Stash          *stashPanelState
 	Menu           *menuPanelState
 	LineByLine     *lineByLinePanelState
@@ -163,12 +178,19 @@ type panelStates struct {
 	Status         *statusPanelState
 }
 
+type searchingState struct {
+	view         *gocui.View
+	isSearching  bool
+	searchString string
+}
+
 type guiState struct {
 	Files                []*commands.File
 	Branches             []*commands.Branch
 	Commits              []*commands.Commit
 	StashEntries         []*commands.StashEntry
 	CommitFiles          []*commands.CommitFile
+	ReflogCommits        []*commands.Commit
 	DiffEntries          []*commands.Commit
 	Remotes              []*commands.Remote
 	RemoteBranches       []*commands.RemoteBranch
@@ -185,6 +207,9 @@ type guiState struct {
 	RetainOriginalDir    bool
 	IsRefreshingFiles    bool
 	RefreshingFilesMutex sync.Mutex
+	Searching            searchingState
+	ScreenMode           int
+	SideView             *gocui.View
 }
 
 // for now the split view will always be on
@@ -206,7 +231,8 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 			Remotes:        &remotePanelState{SelectedLine: 0},
 			RemoteBranches: &remoteBranchesState{SelectedLine: -1},
 			Tags:           &tagsPanelState{SelectedLine: -1},
-			Commits:        &commitPanelState{SelectedLine: -1},
+			Commits:        &commitPanelState{SelectedLine: -1, LimitCommits: true},
+			ReflogCommits:  &reflogCommitPanelState{SelectedLine: 0}, // TODO: might need to make -1
 			CommitFiles:    &commitFilesPanelState{SelectedLine: -1},
 			Stash:          &stashPanelState{SelectedLine: -1},
 			Menu:           &menuPanelState{SelectedLine: 0},
@@ -218,17 +244,20 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 			},
 			Status: &statusPanelState{},
 		},
+		ScreenMode: SCREEN_NORMAL,
+		SideView:   nil,
 	}
 
 	gui := &Gui{
-		Log:           log,
-		GitCommand:    gitCommand,
-		OSCommand:     oSCommand,
-		State:         initialState,
-		Config:        config,
-		Tr:            tr,
-		Updater:       updater,
-		statusManager: &statusManager{},
+		Log:                  log,
+		GitCommand:           gitCommand,
+		OSCommand:            oSCommand,
+		State:                initialState,
+		Config:               config,
+		Tr:                   tr,
+		Updater:              updater,
+		statusManager:        &statusManager{},
+		viewBufferManagerMap: map[string]*tasks.ViewBufferManager{},
 	}
 
 	gui.watchFilesForChanges()
@@ -238,6 +267,18 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 	return gui, nil
 }
 
+func (gui *Gui) nextScreenMode(g *gocui.Gui, v *gocui.View) error {
+	gui.State.ScreenMode = utils.NextIntInCycle([]int{SCREEN_NORMAL, SCREEN_HALF, SCREEN_FULL}, gui.State.ScreenMode)
+
+	return nil
+}
+
+func (gui *Gui) prevScreenMode(g *gocui.Gui, v *gocui.View) error {
+	gui.State.ScreenMode = utils.PrevIntInCycle([]int{SCREEN_NORMAL, SCREEN_HALF, SCREEN_FULL}, gui.State.ScreenMode)
+
+	return nil
+}
+
 func (gui *Gui) scrollUpView(viewName string) error {
 	mainView, _ := gui.g.View(viewName)
 	ox, oy := mainView.Origin()
@@ -253,8 +294,14 @@ func (gui *Gui) scrollDownView(viewName string) error {
 		_, sy := mainView.Size()
 		y += sy
 	}
-	if y < len(mainView.BufferLines()) {
-		return mainView.SetOrigin(ox, oy+gui.Config.GetUserConfig().GetInt("gui.scrollHeight"))
+	scrollHeight := gui.Config.GetUserConfig().GetInt("gui.scrollHeight")
+	if y < mainView.LinesHeight() {
+		if err := mainView.SetOrigin(ox, oy+scrollHeight); err != nil {
+			return err
+		}
+	}
+	if manager, ok := gui.viewBufferManagerMap[viewName]; ok {
+		manager.ReadLines(scrollHeight)
 	}
 	return nil
 }
@@ -320,6 +367,9 @@ func (gui *Gui) onFocusLost(v *gocui.View, newView *gocui.View) error {
 	if v == nil {
 		return nil
 	}
+	if v.IsSearching() && newView.Name() != "search" {
+		gui.onSearchEscape()
+	}
 	switch v.Name() {
 	case "branches":
 		if v.Context == "local-branches" {
@@ -331,9 +381,7 @@ func (gui *Gui) onFocusLost(v *gocui.View, newView *gocui.View) error {
 		}
 	case "main":
 		// if we have lost focus to a first-class panel, we need to do some cleanup
-		if err := gui.changeMainViewsContext("normal"); err != nil {
-			return err
-		}
+		gui.changeMainViewsContext("normal")
 	case "commitFiles":
 		if gui.State.MainContext != "patch-building" {
 			if _, err := gui.g.SetViewOnBottom(v.Name()); err != nil {
@@ -353,6 +401,75 @@ func (gui *Gui) onFocus(v *gocui.View) error {
 	return nil
 }
 
+func (gui *Gui) getViewHeights() map[string]int {
+	currView := gui.g.CurrentView()
+	currentCyclebleView := gui.State.PreviousView
+	if currView != nil {
+		viewName := currView.Name()
+		usePreviousView := true
+		for _, view := range cyclableViews {
+			if view == viewName {
+				currentCyclebleView = viewName
+				usePreviousView = false
+				break
+			}
+		}
+		if usePreviousView {
+			currentCyclebleView = gui.State.PreviousView
+		}
+	}
+
+	// unfortunate result of the fact that these are separate views, have to map explicitly
+	if currentCyclebleView == "commitFiles" {
+		currentCyclebleView = "commits"
+	}
+
+	_, height := gui.g.Size()
+
+	if gui.State.ScreenMode == SCREEN_FULL || gui.State.ScreenMode == SCREEN_HALF {
+		vHeights := map[string]int{
+			"status":   0,
+			"files":    0,
+			"branches": 0,
+			"commits":  0,
+			"stash":    0,
+			"options":  0,
+		}
+		vHeights[currentCyclebleView] = height - 1
+		return vHeights
+	}
+
+	usableSpace := height - 7
+	extraSpace := usableSpace - (usableSpace/3)*3
+
+	if height >= 28 {
+		return map[string]int{
+			"status":   3,
+			"files":    (usableSpace / 3) + extraSpace,
+			"branches": usableSpace / 3,
+			"commits":  usableSpace / 3,
+			"stash":    3,
+			"options":  1,
+		}
+	}
+
+	defaultHeight := 3
+	if height < 21 {
+		defaultHeight = 1
+	}
+	vHeights := map[string]int{
+		"status":   defaultHeight,
+		"files":    defaultHeight,
+		"branches": defaultHeight,
+		"commits":  defaultHeight,
+		"stash":    defaultHeight,
+		"options":  defaultHeight,
+	}
+	vHeights[currentCyclebleView] = height - defaultHeight*4 - 1
+
+	return vHeights
+}
+
 // layout is called for every screen re-render e.g. when the screen is resized
 func (gui *Gui) layout(g *gocui.Gui) error {
 	g.Highlight = true
@@ -379,50 +496,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		return nil
 	}
 
-	currView := gui.g.CurrentView()
-	currentCyclebleView := gui.State.PreviousView
-	if currView != nil {
-		viewName := currView.Name()
-		usePreviouseView := true
-		for _, view := range cyclableViews {
-			if view == viewName {
-				currentCyclebleView = viewName
-				usePreviouseView = false
-				break
-			}
-		}
-		if usePreviouseView {
-			currentCyclebleView = gui.State.PreviousView
-		}
-	}
-
-	usableSpace := height - 7
-	extraSpace := usableSpace - (usableSpace/3)*3
-
-	vHeights := map[string]int{
-		"status":   3,
-		"files":    (usableSpace / 3) + extraSpace,
-		"branches": usableSpace / 3,
-		"commits":  usableSpace / 3,
-		"stash":    3,
-		"options":  1,
-	}
-
-	if height < 28 {
-		defaultHeight := 3
-		if height < 21 {
-			defaultHeight = 1
-		}
-		vHeights = map[string]int{
-			"status":   defaultHeight,
-			"files":    defaultHeight,
-			"branches": defaultHeight,
-			"commits":  defaultHeight,
-			"stash":    defaultHeight,
-			"options":  defaultHeight,
-		}
-		vHeights[currentCyclebleView] = height - defaultHeight*4 - 1
-	}
+	vHeights := gui.getViewHeights()
 
 	optionsVersionBoundary := width - max(len(utils.Decolorise(information)), 1)
 
@@ -432,21 +506,49 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		appStatusOptionsBoundary = len(appStatus) + 2
 	}
 
-	panelSpacing := 1
-	if OverlappingEdges {
-		panelSpacing = 0
-	}
-
 	_, _ = g.SetViewOnBottom("limit")
 	g.DeleteView("limit")
 
 	textColor := theme.GocuiDefaultTextColor
-	leftSideWidth := width / 3
+	var leftSideWidth int
+	switch gui.State.ScreenMode {
+	case SCREEN_NORMAL:
+		leftSideWidth = width / 3
+	case SCREEN_HALF:
+		leftSideWidth = width / 2
+	case SCREEN_FULL:
+		currentView := gui.g.CurrentView()
+		if currentView != nil && currentView.Name() == "main" {
+			leftSideWidth = 0
+		} else {
+			leftSideWidth = width - 1
+		}
+	}
+
 	panelSplitX := width - 1
+	mainPanelLeft := leftSideWidth + 1
+	mainPanelRight := width - 1
+	secondaryPanelLeft := width - 1
+	secondaryPanelTop := 0
+	mainPanelBottom := height - 2
 	if gui.State.SplitMainPanel {
-		units := 7
-		leftSideWidth = width / units
-		panelSplitX = (1 + ((units - 1) / 2)) * width / units
+		if gui.State.ScreenMode == SCREEN_FULL {
+			mainPanelLeft = 0
+			panelSplitX = width/2 - 4
+			mainPanelRight = panelSplitX
+			secondaryPanelLeft = panelSplitX + 1
+		} else if width < 220 {
+			mainPanelBottom = height/2 - 1
+			secondaryPanelTop = mainPanelBottom + 1
+			secondaryPanelLeft = leftSideWidth + 1
+		} else {
+			units := 5
+			leftSideWidth = width / units
+			mainPanelLeft = leftSideWidth + 1
+			panelSplitX = (1 + ((units - 1) / 2)) * width / units
+			mainPanelRight = panelSplitX
+			secondaryPanelLeft = panelSplitX + 1
+		}
 	}
 
 	main := "main"
@@ -457,7 +559,22 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		secondary = "main"
 	}
 
-	v, err := g.SetView(main, leftSideWidth+panelSpacing, 0, panelSplitX, height-2, gocui.LEFT)
+	// reading more lines into main view buffers upon resize
+	prevMainView, err := gui.g.View("main")
+	if err == nil {
+		_, prevMainHeight := prevMainView.Size()
+		heightDiff := mainPanelBottom - prevMainHeight - 1
+		if heightDiff > 0 {
+			if manager, ok := gui.viewBufferManagerMap["main"]; ok {
+				manager.ReadLines(heightDiff)
+			}
+			if manager, ok := gui.viewBufferManagerMap["secondary"]; ok {
+				manager.ReadLines(heightDiff)
+			}
+		}
+	}
+
+	v, err := g.SetView(main, mainPanelLeft, 0, mainPanelRight, mainPanelBottom, gocui.LEFT)
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
@@ -465,13 +582,16 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		v.Title = gui.Tr.SLocalize("DiffTitle")
 		v.Wrap = true
 		v.FgColor = textColor
+		v.IgnoreCarriageReturns = true
 	}
 
-	hiddenViewOffset := 0
+	hiddenViewOffset := 9999
+
+	hiddenSecondaryPanelOffset := 0
 	if !gui.State.SplitMainPanel {
-		hiddenViewOffset = 9999
+		hiddenSecondaryPanelOffset = hiddenViewOffset
 	}
-	secondaryView, err := g.SetView(secondary, panelSplitX+1+hiddenViewOffset, hiddenViewOffset, width-1+hiddenViewOffset, height-2+hiddenViewOffset, gocui.LEFT)
+	secondaryView, err := g.SetView(secondary, secondaryPanelLeft+hiddenSecondaryPanelOffset, hiddenSecondaryPanelOffset+secondaryPanelTop, width-1+hiddenSecondaryPanelOffset, height-2+hiddenSecondaryPanelOffset, gocui.LEFT)
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
@@ -479,6 +599,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		secondaryView.Title = gui.Tr.SLocalize("DiffTitle")
 		secondaryView.Wrap = true
 		secondaryView.FgColor = gocui.ColorWhite
+		secondaryView.IgnoreCarriageReturns = true
 	}
 
 	if v, err := g.SetView("status", 0, 0, leftSideWidth, vHeights["status"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil {
@@ -496,7 +617,8 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 		filesView.Highlight = true
 		filesView.Title = gui.Tr.SLocalize("FilesTitle")
-		v.FgColor = textColor
+		filesView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onFilesPanelSearchSelect))
+		filesView.ContainsList = true
 	}
 
 	branchesView, err := g.SetViewBeneath("branches", "files", vHeights["branches"])
@@ -507,6 +629,8 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		branchesView.Title = gui.Tr.SLocalize("BranchesTitle")
 		branchesView.Tabs = []string{"Local Branches", "Remotes", "Tags"}
 		branchesView.FgColor = textColor
+		branchesView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onBranchesPanelSearchSelect))
+		branchesView.ContainsList = true
 	}
 
 	if v, err := g.SetViewBeneath("commitFiles", "branches", vHeights["commits"]); err != nil {
@@ -515,6 +639,8 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 		v.Title = gui.Tr.SLocalize("CommitFiles")
 		v.FgColor = textColor
+		v.SetOnSelectItem(gui.onSelectItemWrapper(gui.onCommitFilesPanelSearchSelect))
+		v.ContainsList = true
 	}
 
 	commitsView, err := g.SetViewBeneath("commits", "branches", vHeights["commits"])
@@ -523,7 +649,10 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}
 		commitsView.Title = gui.Tr.SLocalize("CommitsTitle")
+		commitsView.Tabs = []string{"Commits", "Reflog"}
 		commitsView.FgColor = textColor
+		commitsView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onCommitsPanelSearchSelect))
+		commitsView.ContainsList = true
 	}
 
 	stashView, err := g.SetViewBeneath("stash", "commits", vHeights["stash"])
@@ -533,6 +662,8 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 		stashView.Title = gui.Tr.SLocalize("StashTitle")
 		stashView.FgColor = textColor
+		stashView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onStashPanelSearchSelect))
+		stashView.ContainsList = true
 	}
 
 	if v, err := g.SetView("options", appStatusOptionsBoundary-1, height-2, optionsVersionBoundary-1, height, 0); err != nil {
@@ -540,13 +671,12 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}
 		v.Frame = false
-		userConfig := gui.Config.GetUserConfig()
-		v.FgColor = theme.GetColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
+		v.FgColor = theme.OptionsColor
 	}
 
 	if gui.getCommitMessageView() == nil {
 		// doesn't matter where this view starts because it will be hidden
-		if commitMessageView, err := g.SetView("commitMessage", width, height, width*2, height*2, 0); err != nil {
+		if commitMessageView, err := g.SetView("commitMessage", hiddenViewOffset, hiddenViewOffset, hiddenViewOffset+10, hiddenViewOffset+10, 0); err != nil {
 			if err.Error() != "unknown view" {
 				return err
 			}
@@ -560,7 +690,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 
 	if check, _ := g.View("credentials"); check == nil {
 		// doesn't matter where this view starts because it will be hidden
-		if credentialsView, err := g.SetView("credentials", width, height, width*2, height*2, 0); err != nil {
+		if credentialsView, err := g.SetView("credentials", hiddenViewOffset, hiddenViewOffset, hiddenViewOffset+10, hiddenViewOffset+10, 0); err != nil {
 			if err.Error() != "unknown view" {
 				return err
 			}
@@ -574,6 +704,35 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 	}
 
+	searchViewOffset := hiddenViewOffset
+	if gui.State.Searching.isSearching {
+		searchViewOffset = 0
+	}
+
+	// this view takes up one character. Its only purpose is to show the slash when searching
+	searchPrefix := "search: "
+	if searchPrefixView, err := g.SetView("searchPrefix", appStatusOptionsBoundary-1+searchViewOffset, height-2+searchViewOffset, len(searchPrefix)+searchViewOffset, height+searchViewOffset, 0); err != nil {
+		if err.Error() != "unknown view" {
+			return err
+		}
+
+		searchPrefixView.BgColor = gocui.ColorDefault
+		searchPrefixView.FgColor = gocui.ColorGreen
+		searchPrefixView.Frame = false
+		gui.setViewContent(gui.g, searchPrefixView, searchPrefix)
+	}
+
+	if searchView, err := g.SetView("search", appStatusOptionsBoundary-1+searchViewOffset+len(searchPrefix), height-2+searchViewOffset, optionsVersionBoundary+searchViewOffset, height+searchViewOffset, 0); err != nil {
+		if err.Error() != "unknown view" {
+			return err
+		}
+
+		searchView.BgColor = gocui.ColorDefault
+		searchView.FgColor = gocui.ColorGreen
+		searchView.Frame = false
+		searchView.Editable = true
+	}
+
 	if appStatusView, err := g.SetView("appStatus", -1, height-2, width, height, 0); err != nil {
 		if err.Error() != "unknown view" {
 			return err
@@ -625,7 +784,8 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		{view: branchesView, context: "local-branches", selectedLine: gui.State.Panels.Branches.SelectedLine, lineCount: len(gui.State.Branches)},
 		{view: branchesView, context: "remotes", selectedLine: gui.State.Panels.Remotes.SelectedLine, lineCount: len(gui.State.Remotes)},
 		{view: branchesView, context: "remote-branches", selectedLine: gui.State.Panels.RemoteBranches.SelectedLine, lineCount: len(gui.State.Remotes)},
-		{view: commitsView, context: "", selectedLine: gui.State.Panels.Commits.SelectedLine, lineCount: len(gui.State.Commits)},
+		{view: commitsView, context: "branch-commits", selectedLine: gui.State.Panels.Commits.SelectedLine, lineCount: len(gui.State.Commits)},
+		{view: commitsView, context: "reflog-commits", selectedLine: gui.State.Panels.ReflogCommits.SelectedLine, lineCount: len(gui.State.ReflogCommits)},
 		{view: stashView, context: "", selectedLine: gui.State.Panels.Stash.SelectedLine, lineCount: len(gui.State.StashEntries)},
 	}
 
@@ -652,11 +812,10 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 }
 
 func (gui *Gui) onInitialViewsCreation() error {
-	if err := gui.changeMainViewsContext("normal"); err != nil {
-		return err
-	}
+	gui.changeMainViewsContext("normal")
 
 	gui.getBranchesView().Context = "local-branches"
+	gui.getCommitsView().Context = "branch-commits"
 
 	return gui.loadNewRepo()
 }
@@ -732,14 +891,6 @@ func (gui *Gui) fetch(g *gocui.Gui, v *gocui.View, canAskForCredentials bool) (u
 	return unamePassOpend, err
 }
 
-func (gui *Gui) renderAppStatus() error {
-	appStatus := gui.statusManager.getStatusString()
-	if appStatus != "" {
-		return gui.renderString(gui.g, "appStatus", appStatus)
-	}
-	return nil
-}
-
 func (gui *Gui) renderGlobalOptions() error {
 	return gui.renderOptionsMap(map[string]string{
 		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.scrollUpMain"), gui.getKeyDisplay("universal.scrollDownMain")):                                                                                 gui.Tr.SLocalize("scroll"),
@@ -750,10 +901,17 @@ func (gui *Gui) renderGlobalOptions() error {
 	})
 }
 
-func (gui *Gui) goEvery(interval time.Duration, function func() error) {
+func (gui *Gui) goEvery(interval time.Duration, stop chan struct{}, function func() error) {
 	go func() {
-		for range time.Tick(interval) {
-			_ = function()
+		ticker := time.NewTicker(interval)
+		defer ticker.Stop()
+		for {
+			select {
+			case <-ticker.C:
+				_ = function()
+			case <-stop:
+				return
+			}
 		}
 	}()
 }
@@ -768,7 +926,7 @@ func (gui *Gui) startBackgroundFetch() {
 	if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew {
 		_ = gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil)
 	} else {
-		gui.goEvery(time.Second*60, func() error {
+		gui.goEvery(time.Second*60, gui.stopChan, func() error {
 			_, err := gui.fetch(gui.g, gui.g.CurrentView(), false)
 			return err
 		})
@@ -783,6 +941,13 @@ func (gui *Gui) Run() error {
 	}
 	defer g.Close()
 
+	g.OnSearchEscape = gui.onSearchEscape
+	g.SearchEscapeKey = gui.getKey("universal.return")
+	g.NextSearchMatchKey = gui.getKey("universal.nextMatch")
+	g.PrevSearchMatchKey = gui.getKey("universal.prevMatch")
+
+	gui.stopChan = make(chan struct{})
+
 	g.ASCII = runtime.GOOS == "windows" && runewidth.IsEastAsian()
 
 	if gui.Config.GetUserConfig().GetBool("gui.mouseEvents") {
@@ -811,8 +976,7 @@ func (gui *Gui) Run() error {
 		go gui.startBackgroundFetch()
 	}
 
-	gui.goEvery(time.Second*10, gui.refreshFiles)
-	gui.goEvery(time.Millisecond*50, gui.renderAppStatus)
+	gui.goEvery(time.Second*10, gui.stopChan, gui.refreshFiles)
 
 	g.SetManager(gocui.ManagerFunc(gui.layout), gocui.ManagerFunc(gui.getFocusLayout()))
 
@@ -832,6 +996,17 @@ func (gui *Gui) Run() error {
 func (gui *Gui) RunWithSubprocesses() error {
 	for {
 		if err := gui.Run(); err != nil {
+			for _, manager := range gui.viewBufferManagerMap {
+				manager.Close()
+			}
+			gui.viewBufferManagerMap = map[string]*tasks.ViewBufferManager{}
+
+			if !gui.fileWatcher.Disabled {
+				gui.fileWatcher.Watcher.Close()
+			}
+
+			close(gui.stopChan)
+
 			if err == gocui.ErrQuit {
 				if !gui.State.RetainOriginalDir {
 					if err := gui.recordCurrentDirectory(); err != nil {
@@ -839,8 +1014,6 @@ func (gui *Gui) RunWithSubprocesses() error {
 					}
 				}
 
-				gui.fileWatcher.Watcher.Close()
-
 				break
 			} else if err == gui.Errors.ErrSwitchRepo {
 				continue

pkg/gui/keybindings.go

@@ -317,6 +317,20 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.handleEditConfig,
 			Description: gui.Tr.SLocalize("EditConfig"),
 		},
+		{
+			ViewName:    "",
+			Key:         gui.getKey("universal.nextScreenMode"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.nextScreenMode,
+			Description: gui.Tr.SLocalize("nextScreenMode"),
+		},
+		{
+			ViewName:    "",
+			Key:         gui.getKey("universal.prevScreenMode"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.prevScreenMode,
+			Description: gui.Tr.SLocalize("prevScreenMode"),
+		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey("universal.openFile"),
@@ -451,12 +465,19 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Description: gui.Tr.SLocalize("fetch"),
 		},
 		{
-			ViewName:    "files",
+			ViewName:    "",
 			Key:         gui.getKey("universal.executeCustomCommand"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCustomCommand,
 			Description: gui.Tr.SLocalize("executeCustomCommand"),
 		},
+		{
+			ViewName:    "files",
+			Key:         gui.getKey("commits.viewResetOptions"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleCreateResetToUpstreamMenu,
+			Description: gui.Tr.SLocalize("viewResetToUpstreamOptions"),
+		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{"local-branches"},
@@ -537,6 +558,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.handleFastForward,
 			Description: gui.Tr.SLocalize("FastForward"),
 		},
+		{
+			ViewName:    "branches",
+			Contexts:    []string{"local-branches"},
+			Key:         gui.getKey("commits.viewResetOptions"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleCreateResetToBranchMenu,
+			Description: gui.Tr.SLocalize("viewResetOptions"),
+		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{"tags"},
@@ -569,15 +598,23 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.handleCreateTag,
 			Description: gui.Tr.SLocalize("createTag"),
 		},
+		{
+			ViewName:    "branches",
+			Contexts:    []string{"tags"},
+			Key:         gui.getKey("commits.viewResetOptions"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleCreateResetToTagMenu,
+			Description: gui.Tr.SLocalize("viewResetOptions"),
+		},
 		{
 			ViewName: "branches",
-			Key:      gui.getKey("universal.nextBranchTab"),
+			Key:      gui.getKey("universal.nextTab"),
 			Modifier: gocui.ModNone,
 			Handler:  gui.handleNextBranchesTab,
 		},
 		{
 			ViewName: "branches",
-			Key:      gui.getKey("universal.prevBranchTab"),
+			Key:      gui.getKey("universal.prevTab"),
 			Modifier: gocui.ModNone,
 			Handler:  gui.handlePrevBranchesTab,
 		},
@@ -589,6 +626,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.handleRemoteBranchesEscape,
 			Description: gui.Tr.SLocalize("ReturnToRemotesList"),
 		},
+		{
+			ViewName:    "branches",
+			Contexts:    []string{"remote-branches"},
+			Key:         gui.getKey("commits.viewResetOptions"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleCreateResetToRemoteBranchMenu,
+			Description: gui.Tr.SLocalize("viewResetOptions"),
+		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{"remotes"},
@@ -597,8 +642,27 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.handleFetchRemote,
 			Description: gui.Tr.SLocalize("fetchRemote"),
 		},
+		{
+			ViewName: "commits",
+			Key:      gui.getKey("universal.nextTab"),
+			Modifier: gocui.ModNone,
+			Handler:  gui.handleNextCommitsTab,
+		},
+		{
+			ViewName: "commits",
+			Key:      gui.getKey("universal.prevTab"),
+			Modifier: gocui.ModNone,
+			Handler:  gui.handlePrevCommitsTab,
+		},
+		{
+			ViewName: "commits",
+			Key:      gui.getKey("universal.startSearch"),
+			Modifier: gocui.ModNone,
+			Handler:  gui.handleOpenSearchForCommitsPanel,
+		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.squashDown"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitSquashDown,
@@ -606,6 +670,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.renameCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleRenameCommit,
@@ -613,6 +678,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.renameCommitWithEditor"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleRenameCommitEditor,
@@ -620,6 +686,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.viewResetOptions"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCreateCommitResetMenu,
@@ -627,6 +694,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.markCommitAsFixup"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitFixup,
@@ -634,6 +702,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.createFixupCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCreateFixupCommit,
@@ -641,6 +710,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.squashAboveCommits"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleSquashAllAboveFixupCommits,
@@ -648,6 +718,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("universal.remove"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitDelete,
@@ -655,6 +726,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.moveDownCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitMoveDown,
@@ -662,6 +734,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.moveUpCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitMoveUp,
@@ -669,6 +742,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("universal.edit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitEdit,
@@ -676,6 +750,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.amendToCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitAmendTo,
@@ -683,6 +758,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.pickCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitPick,
@@ -690,6 +766,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.revertCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitRevert,
@@ -697,6 +774,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.cherryPickCopy"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCopyCommit,
@@ -704,6 +782,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.cherryPickCopyRange"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCopyCommitRange,
@@ -711,6 +790,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.pasteCommits"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.HandlePasteCommits,
@@ -718,6 +798,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("universal.goInto"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleSwitchToCommitFilesPanel,
@@ -725,6 +806,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.checkoutCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCheckoutCommit,
@@ -732,6 +814,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.toggleDiffCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleToggleDiffCommit,
@@ -739,11 +822,28 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
 			Key:         gui.getKey("commits.tagCommit"),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleTagCommit,
 			Description: gui.Tr.SLocalize("tagCommit"),
 		},
+		{
+			ViewName:    "commits",
+			Contexts:    []string{"reflog-commits"},
+			Key:         gui.getKey("universal.select"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleCheckoutReflogCommit,
+			Description: gui.Tr.SLocalize("checkoutCommit"),
+		},
+		{
+			ViewName:    "commits",
+			Contexts:    []string{"reflog-commits"},
+			Key:         gui.getKey("commits.viewResetOptions"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleCreateReflogResetMenu,
+			Description: gui.Tr.SLocalize("viewResetOptions"),
+		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey("universal.select"),
@@ -1099,6 +1199,30 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Modifier: gocui.ModNone,
 			Handler:  gui.handleMouseScrollDown,
 		},
+		{
+			ViewName:    "main",
+			Contexts:    []string{"staging"},
+			Key:         gui.getKey("files.commitChanges"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleCommitPress,
+			Description: gui.Tr.SLocalize("CommitChanges"),
+		},
+		{
+			ViewName:    "main",
+			Contexts:    []string{"staging"},
+			Key:         gui.getKey("files.commitChangesWithoutHook"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleWIPCommitPress,
+			Description: gui.Tr.SLocalize("commitChangesWithoutHook"),
+		},
+		{
+			ViewName:    "main",
+			Contexts:    []string{"staging"},
+			Key:         gui.getKey("files.commitChangesWithEditor"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleCommitEditorPress,
+			Description: gui.Tr.SLocalize("CommitChangesWithEditor"),
+		},
 		{
 			ViewName:    "main",
 			Contexts:    []string{"merging"},
@@ -1294,6 +1418,18 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Modifier: gocui.ModNone,
 			Handler:  gui.handleCommitFilesClick,
 		},
+		{
+			ViewName: "search",
+			Key:      gocui.KeyEnter,
+			Modifier: gocui.ModNone,
+			Handler:  gui.handleSearch,
+		},
+		{
+			ViewName: "search",
+			Key:      gui.getKey("universal.return"),
+			Modifier: gocui.ModNone,
+			Handler:  gui.handleSearchEscape,
+		},
 	}
 
 	for _, viewName := range []string{"status", "branches", "files", "commits", "commitFiles", "stash", "menu"} {
@@ -1321,6 +1457,11 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			{ViewName: listView.viewName, Contexts: []string{listView.context}, Key: gocui.MouseWheelDown, Modifier: gocui.ModNone, Handler: listView.handleNextLine},
 			{ViewName: listView.viewName, Contexts: []string{listView.context}, Key: gocui.MouseLeft, Modifier: gocui.ModNone, Handler: listView.handleClick},
 		}...)
+
+		// we need a specific keybinding for the commits panel beacuse it usually lazyloads commits
+		if listView.viewName != "commits" {
+			bindings = append(bindings, &Binding{ViewName: listView.viewName, Contexts: []string{listView.context}, Key: gui.getKey("universal.startSearch"), Modifier: gocui.ModNone, Handler: gui.handleOpenSearch})
+		}
 	}
 
 	return bindings
@@ -1335,8 +1476,15 @@ func (gui *Gui) keybindings(g *gocui.Gui) error {
 		}
 	}
 
-	if err := g.SetTabClickBinding("branches", gui.onBranchesTabClick); err != nil {
-		return err
+	tabClickBindings := map[string]func(int) error{
+		"branches": gui.onBranchesTabClick,
+		"commits":  gui.onCommitsTabClick,
+	}
+
+	for viewName, binding := range tabClickBindings {
+		if err := g.SetTabClickBinding(viewName, binding); err != nil {
+			return err
+		}
 	}
 
 	return nil

pkg/gui/line_by_line_panel.go

@@ -314,3 +314,8 @@ func (gui *Gui) handleToggleSelectHunk(g *gocui.Gui, v *gocui.View) error {
 
 	return gui.focusSelection(state.SelectMode == HUNK)
 }
+
+func (gui *Gui) handleEscapeLineByLinePanel() {
+	gui.changeMainViewsContext("normal")
+	gui.State.Panels.LineByLine = nil
+}

pkg/gui/list_view.go

@@ -34,6 +34,7 @@ func (lv *listView) handleLineChange(change int) error {
 			return err
 		}
 	}
+
 	view, err := lv.gui.g.View(lv.viewName)
 	if err != nil {
 		return err
@@ -56,7 +57,14 @@ func (lv *listView) handleClick(g *gocui.Gui, v *gocui.View) error {
 
 	*selectedLineIdxPtr = newSelectedLineIdx
 
-	if prevSelectedLineIdx == newSelectedLineIdx && lv.gui.currentViewName() == lv.viewName && lv.handleClickSelectedItem != nil {
+	if lv.rendersToMainView {
+		if err := lv.gui.resetOrigin(lv.gui.getMainView()); err != nil {
+			return err
+		}
+	}
+
+	prevViewName := lv.gui.currentViewName()
+	if prevSelectedLineIdx == newSelectedLineIdx && prevViewName == lv.viewName && lv.handleClickSelectedItem != nil {
 		return lv.handleClickSelectedItem(lv.gui.g, v)
 	}
 	return lv.handleItemSelect(lv.gui.g, v)
@@ -126,8 +134,10 @@ func (gui *Gui) getListViews() []*listView {
 			gui:                   gui,
 			rendersToMainView:     true,
 		},
+
 		{
 			viewName:                "commits",
+			context:                 "branch-commits",
 			getItemsLength:          func() int { return len(gui.State.Commits) },
 			getSelectedLineIdxPtr:   func() *int { return &gui.State.Panels.Commits.SelectedLine },
 			handleFocus:             gui.handleCommitSelect,
@@ -136,6 +146,16 @@ func (gui *Gui) getListViews() []*listView {
 			gui:                     gui,
 			rendersToMainView:       true,
 		},
+		{
+			viewName:              "commits",
+			context:               "reflog-commits",
+			getItemsLength:        func() int { return len(gui.State.ReflogCommits) },
+			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.ReflogCommits.SelectedLine },
+			handleFocus:           gui.handleReflogCommitSelect,
+			handleItemSelect:      gui.handleReflogCommitSelect,
+			gui:                   gui,
+			rendersToMainView:     true,
+		},
 		{
 			viewName:              "stash",
 			getItemsLength:        func() int { return len(gui.State.StashEntries) },

pkg/gui/menu_panel.go

@@ -8,6 +8,12 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
+type menuItem struct {
+	displayString  string
+	displayStrings []string
+	onPress        func() error
+}
+
 // list panel functions
 
 func (gui *Gui) handleMenuSelect(g *gocui.Gui, v *gocui.View) error {
@@ -38,27 +44,49 @@ func (gui *Gui) handleMenuClose(g *gocui.Gui, v *gocui.View) error {
 	return gui.returnFocus(g, v)
 }
 
-func (gui *Gui) createMenu(title string, items interface{}, itemCount int, handlePress func(int) error) error {
-	isFocused := gui.g.CurrentView().Name() == "menu"
-	gui.State.MenuItemCount = itemCount
-	list, err := utils.RenderList(items, isFocused)
-	if err != nil {
-		return err
+type createMenuOptions struct {
+	showCancel bool
+}
+
+func (gui *Gui) createMenu(title string, items []*menuItem, createMenuOptions createMenuOptions) error {
+	if createMenuOptions.showCancel {
+		// this is mutative but I'm okay with that for now
+		items = append(items, &menuItem{
+			displayStrings: []string{gui.Tr.SLocalize("cancel")},
+			onPress: func() error {
+				return nil
+			},
+		})
 	}
 
+	gui.State.MenuItemCount = len(items)
+
+	stringArrays := make([][]string, len(items))
+	for i, item := range items {
+		if item.displayStrings == nil {
+			stringArrays[i] = []string{item.displayString}
+		} else {
+			stringArrays[i] = item.displayStrings
+		}
+	}
+
+	list := utils.RenderDisplayStrings(stringArrays)
+
 	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(gui.g, false, list)
 	menuView, _ := gui.g.SetView("menu", x0, y0, x1, y1, 0)
 	menuView.Title = title
 	menuView.FgColor = theme.GocuiDefaultTextColor
+	menuView.ContainsList = true
 	menuView.Clear()
 	fmt.Fprint(menuView, list)
 	gui.State.Panels.Menu.SelectedLine = 0
 
 	wrappedHandlePress := func(g *gocui.Gui, v *gocui.View) error {
 		selectedLine := gui.State.Panels.Menu.SelectedLine
-		if err := handlePress(selectedLine); err != nil {
+		if err := items[selectedLine].onPress(); err != nil {
 			return err
 		}
+
 		if _, err := gui.g.View("menu"); err == nil {
 			if _, err := gui.g.SetViewOnBottom("menu"); err != nil {
 				return err

pkg/gui/merge_panel.go

@@ -212,15 +212,16 @@ func (gui *Gui) refreshMergePanel() error {
 	if err != nil {
 		return err
 	}
-	if err := gui.renderString(gui.g, "main", content); err != nil {
-		return err
-	}
-	if err := gui.scrollToConflict(gui.g); err != nil {
-		return err
-	}
 
 	mainView := gui.getMainView()
 	mainView.Wrap = false
+	if err := gui.setViewContent(gui.g, mainView, content); err != nil {
+		return err
+	}
+	gui.Log.Warn("scrolling to conflict")
+	if err := gui.scrollToConflict(gui.g); err != nil {
+		return err
+	}
 
 	return nil
 }

pkg/gui/options_menu_panel.go

@@ -3,8 +3,6 @@ package gui
 import (
 	"strings"
 
-	"github.com/go-errors/errors"
-
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -38,19 +36,23 @@ func (gui *Gui) getBindings(v *gocui.View) []*Binding {
 func (gui *Gui) handleCreateOptionsMenu(g *gocui.Gui, v *gocui.View) error {
 	bindings := gui.getBindings(v)
 
-	handleMenuPress := func(index int) error {
-		if bindings[index].Key == nil {
-			return nil
+	menuItems := make([]*menuItem, len(bindings))
+
+	for i, binding := range bindings {
+		innerBinding := binding // note to self, never close over loop variables
+		menuItems[i] = &menuItem{
+			displayStrings: []string{GetKeyDisplay(innerBinding.Key), innerBinding.Description},
+			onPress: func() error {
+				if innerBinding.Key == nil {
+					return nil
+				}
+				if err := gui.handleMenuClose(g, v); err != nil {
+					return err
+				}
+				return innerBinding.Handler(g, v)
+			},
 		}
-		if index >= len(bindings) {
-			return errors.New("Index is greater than size of bindings")
-		}
-		err := gui.handleMenuClose(g, v)
-		if err != nil {
-			return err
-		}
-		return bindings[index].Handler(g, v)
 	}
 
-	return gui.createMenu(strings.Title(gui.Tr.SLocalize("menu")), bindings, len(bindings), handleMenuPress)
+	return gui.createMenu(strings.Title(gui.Tr.SLocalize("menu")), menuItems, createMenuOptions{})
 }

pkg/gui/patch_building_panel.go

@@ -87,8 +87,7 @@ func (gui *Gui) handleRemoveSelectionFromPatch(g *gocui.Gui, v *gocui.View) erro
 }
 
 func (gui *Gui) handleEscapePatchBuildingPanel(g *gocui.Gui, v *gocui.View) error {
-	gui.State.Panels.LineByLine = nil
-	gui.changeMainViewsContext("normal")
+	gui.handleEscapeLineByLinePanel()
 
 	if gui.GitCommand.PatchManager.IsEmpty() {
 		gui.GitCommand.PatchManager.Reset()

pkg/gui/patch_options_panel.go

@@ -6,48 +6,43 @@ import (
 	"github.com/jesseduffield/gocui"
 )
 
-type patchMenuOption struct {
-	displayName string
-	function    func() error
-}
-
-// GetDisplayStrings is a function.
-func (o *patchMenuOption) GetDisplayStrings(isFocused bool) []string {
-	return []string{o.displayName}
-}
-
 func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error {
 	if !gui.GitCommand.PatchManager.CommitSelected() {
 		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoPatchError"))
 	}
 
-	options := []*patchMenuOption{
-		{displayName: fmt.Sprintf("remove patch from original commit (%s)", gui.GitCommand.PatchManager.CommitSha), function: gui.handleDeletePatchFromCommit},
-		{displayName: "pull patch out into index", function: gui.handlePullPatchIntoWorkingTree},
-		{displayName: "reset patch", function: gui.handleResetPatch},
+	menuItems := []*menuItem{
+		{
+			displayString: fmt.Sprintf("remove patch from original commit (%s)", gui.GitCommand.PatchManager.CommitSha),
+			onPress:       gui.handleDeletePatchFromCommit,
+		},
+		{
+			displayString: "pull patch out into index",
+			onPress:       gui.handlePullPatchIntoWorkingTree,
+		},
+		{
+			displayString: "reset patch",
+			onPress:       gui.handleResetPatch,
+		},
 	}
 
 	selectedCommit := gui.getSelectedCommit(gui.g)
 	if selectedCommit != nil && gui.GitCommand.PatchManager.CommitSha != selectedCommit.Sha {
 		// adding this option to index 1
-		options = append(
-			options[:1],
+		menuItems = append(
+			menuItems[:1],
 			append(
-				[]*patchMenuOption{
+				[]*menuItem{
 					{
-						displayName: fmt.Sprintf("move patch to selected commit (%s)", selectedCommit.Sha),
-						function:    gui.handleMovePatchToSelectedCommit,
+						displayString: fmt.Sprintf("move patch to selected commit (%s)", selectedCommit.Sha),
+						onPress:       gui.handleMovePatchToSelectedCommit,
 					},
-				}, options[1:]...,
+				}, menuItems[1:]...,
 			)...,
 		)
 	}
 
-	handleMenuPress := func(index int) error {
-		return options[index].function()
-	}
-
-	return gui.createMenu(gui.Tr.SLocalize("PatchOptionsTitle"), options, len(options), handleMenuPress)
+	return gui.createMenu(gui.Tr.SLocalize("PatchOptionsTitle"), menuItems, createMenuOptions{showCancel: true})
 }
 
 func (gui *Gui) getPatchCommitIndex() int {

pkg/gui/rebase_options_panel.go

@@ -7,33 +7,21 @@ import (
 	"github.com/jesseduffield/gocui"
 )
 
-type option struct {
-	value string
-}
-
-// GetDisplayStrings is a function.
-func (r *option) GetDisplayStrings(isFocused bool) []string {
-	return []string{r.value}
-}
-
 func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error {
-	options := []*option{
-		{value: "continue"},
-		{value: "abort"},
-	}
+	options := []string{"continue", "abort"}
 
 	if gui.State.WorkingTreeState == "rebasing" {
-		options = append(options, &option{value: "skip"})
+		options = append(options, "skip")
 	}
 
-	options = append(options, &option{value: "cancel"})
-
-	handleMenuPress := func(index int) error {
-		command := options[index].value
-		if command == "cancel" {
-			return nil
+	menuItems := make([]*menuItem, len(options))
+	for i, option := range options {
+		menuItems[i] = &menuItem{
+			displayString: option,
+			onPress: func() error {
+				return gui.genericMergeCommand(option)
+			},
 		}
-		return gui.genericMergeCommand(command)
 	}
 
 	var title string
@@ -43,7 +31,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error
 		title = gui.Tr.SLocalize("RebaseOptionsTitle")
 	}
 
-	return gui.createMenu(title, options, len(options), handleMenuPress)
+	return gui.createMenu(title, menuItems, createMenuOptions{showCancel: true})
 }
 
 func (gui *Gui) genericMergeCommand(command string) error {

pkg/gui/recent_repos_panel.go

@@ -10,41 +10,34 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
-type recentRepo struct {
-	path string
-}
-
-// GetDisplayStrings returns the path from a recent repo.
-func (r *recentRepo) GetDisplayStrings(isFocused bool) []string {
-	yellow := color.New(color.FgMagenta)
-	base := filepath.Base(r.path)
-	path := yellow.Sprint(r.path)
-	return []string{base, path}
-}
-
 func (gui *Gui) handleCreateRecentReposMenu(g *gocui.Gui, v *gocui.View) error {
 	recentRepoPaths := gui.Config.GetAppState().RecentRepos
 	reposCount := utils.Min(len(recentRepoPaths), 20)
+	yellow := color.New(color.FgMagenta)
 	// we won't show the current repo hence the -1
-	recentRepos := make([]*recentRepo, reposCount-1)
+	menuItems := make([]*menuItem, reposCount-1)
 	for i, path := range recentRepoPaths[1:reposCount] {
-		recentRepos[i] = &recentRepo{path: path}
+		innerPath := path
+		menuItems[i] = &menuItem{
+			displayStrings: []string{
+				filepath.Base(innerPath),
+				yellow.Sprint(innerPath),
+			},
+			onPress: func() error {
+				if err := os.Chdir(innerPath); err != nil {
+					return err
+				}
+				newGitCommand, err := commands.NewGitCommand(gui.Log, gui.OSCommand, gui.Tr, gui.Config)
+				if err != nil {
+					return err
+				}
+				gui.GitCommand = newGitCommand
+				return gui.Errors.ErrSwitchRepo
+			},
+		}
 	}
 
-	handleMenuPress := func(index int) error {
-		repo := recentRepos[index]
-		if err := os.Chdir(repo.path); err != nil {
-			return err
-		}
-		newGitCommand, err := commands.NewGitCommand(gui.Log, gui.OSCommand, gui.Tr, gui.Config)
-		if err != nil {
-			return err
-		}
-		gui.GitCommand = newGitCommand
-		return gui.Errors.ErrSwitchRepo
-	}
-
-	return gui.createMenu(gui.Tr.SLocalize("RecentRepos"), recentRepos, len(recentRepos), handleMenuPress)
+	return gui.createMenu(gui.Tr.SLocalize("RecentRepos"), menuItems, createMenuOptions{showCancel: true})
 }
 
 // updateRecentRepoList registers the fact that we opened lazygit in this repo,

pkg/gui/reflog_panel.go

@@ -0,0 +1,103 @@
+package gui
+
+import (
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/commands"
+)
+
+// list panel functions
+
+func (gui *Gui) getSelectedReflogCommit() *commands.Commit {
+	selectedLine := gui.State.Panels.ReflogCommits.SelectedLine
+	if selectedLine == -1 || len(gui.State.ReflogCommits) == 0 {
+		return nil
+	}
+
+	return gui.State.ReflogCommits[selectedLine]
+}
+
+func (gui *Gui) handleReflogCommitSelect(g *gocui.Gui, v *gocui.View) error {
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	gui.State.SplitMainPanel = false
+
+	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
+		return err
+	}
+
+	gui.getMainView().Title = "Reflog Entry"
+
+	commit := gui.getSelectedReflogCommit()
+	if commit == nil {
+		return gui.newStringTask("main", "No reflog history")
+	}
+	if err := gui.focusPoint(0, gui.State.Panels.ReflogCommits.SelectedLine, len(gui.State.ReflogCommits), v); err != nil {
+		return err
+	}
+
+	cmd := gui.OSCommand.ExecutableFromString(
+		gui.GitCommand.ShowCmdStr(commit.Sha),
+	)
+	if err := gui.newCmdTask("main", cmd); err != nil {
+		gui.Log.Error(err)
+	}
+
+	return nil
+}
+
+func (gui *Gui) refreshReflogCommits() error {
+	commits, err := gui.GitCommand.GetReflogCommits()
+	if err != nil {
+		return gui.createErrorPanel(gui.g, err.Error())
+	}
+
+	gui.State.ReflogCommits = commits
+
+	if gui.getCommitsView().Context == "reflog-commits" {
+		return gui.renderReflogCommitsWithSelection()
+	}
+
+	return nil
+}
+
+func (gui *Gui) renderReflogCommitsWithSelection() error {
+	commitsView := gui.getCommitsView()
+
+	gui.refreshSelectedLine(&gui.State.Panels.ReflogCommits.SelectedLine, len(gui.State.ReflogCommits))
+	if err := gui.renderListPanel(commitsView, gui.State.ReflogCommits); err != nil {
+		return err
+	}
+	if gui.g.CurrentView() == commitsView && commitsView.Context == "reflog-commits" {
+		if err := gui.handleReflogCommitSelect(gui.g, commitsView); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleCheckoutReflogCommit(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedReflogCommit()
+	if commit == nil {
+		return nil
+	}
+
+	err := gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
+		return gui.handleCheckoutRef(commit.Sha)
+	}, nil)
+	if err != nil {
+		return err
+	}
+
+	gui.State.Panels.ReflogCommits.SelectedLine = 0
+
+	return nil
+}
+
+func (gui *Gui) handleCreateReflogResetMenu(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedReflogCommit()
+
+	return gui.createResetMenu(commit.Sha)
+}

pkg/gui/remote_branches_panel.go

@@ -2,12 +2,9 @@ package gui
 
 import (
 	"fmt"
-	"strings"
 
-	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
 // list panel functions
@@ -37,7 +34,7 @@ func (gui *Gui) handleRemoteBranchSelect(g *gocui.Gui, v *gocui.View) error {
 	remote := gui.getSelectedRemote()
 	remoteBranch := gui.getSelectedRemoteBranch()
 	if remoteBranch == nil {
-		return gui.renderString(g, "main", "No branches for this remote")
+		return gui.newStringTask("main", "No branches for this remote")
 	}
 
 	gui.focusPoint(0, gui.State.Panels.Menu.SelectedLine, gui.State.MenuItemCount, v)
@@ -45,13 +42,14 @@ func (gui *Gui) handleRemoteBranchSelect(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}
 
-	go func() {
-		graph, err := gui.GitCommand.GetBranchGraph(fmt.Sprintf("%s/%s", remote.Name, remoteBranch.Name))
-		if err != nil && strings.HasPrefix(graph, "fatal: ambiguous argument") {
-			graph = gui.Tr.SLocalize("NoTrackingThisBranch")
-		}
-		_ = gui.renderString(g, "main", fmt.Sprintf("%s/%s\n\n%s", utils.ColoredString(remote.Name, color.FgRed), utils.ColoredString(remoteBranch.Name, color.FgGreen), graph))
-	}()
+	branchName := fmt.Sprintf("%s/%s", remote.Name, remoteBranch.Name)
+
+	cmd := gui.OSCommand.ExecutableFromString(
+		gui.GitCommand.GetBranchGraphCmdStr(branchName),
+	)
+	if err := gui.newCmdTask("main", cmd); err != nil {
+		gui.Log.Error(err)
+	}
 
 	return nil
 }
@@ -67,8 +65,10 @@ func (gui *Gui) renderRemoteBranchesWithSelection() error {
 	if err := gui.renderListPanel(branchesView, gui.State.RemoteBranches); err != nil {
 		return err
 	}
-	if err := gui.handleRemoteBranchSelect(gui.g, branchesView); err != nil {
-		return err
+	if gui.g.CurrentView() == branchesView && branchesView.Context == "remote-branches" {
+		if err := gui.handleRemoteBranchSelect(gui.g, branchesView); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -132,3 +132,12 @@ func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error {
 		return gui.refreshSidePanels(gui.g)
 	}, nil)
 }
+
+func (gui *Gui) handleCreateResetToRemoteBranchMenu(g *gocui.Gui, v *gocui.View) error {
+	selectedBranch := gui.getSelectedRemoteBranch()
+	if selectedBranch == nil {
+		return nil
+	}
+
+	return gui.createResetMenu(fmt.Sprintf("%s/%s", selectedBranch.RemoteName, selectedBranch.Name))
+}

pkg/gui/remotes_panel.go

@@ -36,13 +36,13 @@ func (gui *Gui) handleRemoteSelect(g *gocui.Gui, v *gocui.View) error {
 
 	remote := gui.getSelectedRemote()
 	if remote == nil {
-		return gui.renderString(g, "main", "No remotes")
+		return gui.newStringTask("main", "No remotes")
 	}
 	if err := gui.focusPoint(0, gui.State.Panels.Remotes.SelectedLine, len(gui.State.Remotes), v); err != nil {
 		return err
 	}
 
-	return gui.renderString(g, "main", fmt.Sprintf("%s\nUrls:\n%s", utils.ColoredString(remote.Name, color.FgGreen), strings.Join(remote.Urls, "\n")))
+	return gui.newStringTask("main", fmt.Sprintf("%s\nUrls:\n%s", utils.ColoredString(remote.Name, color.FgGreen), strings.Join(remote.Urls, "\n")))
 }
 
 func (gui *Gui) refreshRemotes() error {
@@ -83,8 +83,10 @@ func (gui *Gui) renderRemotesWithSelection() error {
 	if err := gui.renderListPanel(branchesView, gui.State.Remotes); err != nil {
 		return err
 	}
-	if err := gui.handleRemoteSelect(gui.g, branchesView); err != nil {
-		return err
+	if gui.g.CurrentView() == branchesView && branchesView.Context == "remotes" {
+		if err := gui.handleRemoteSelect(gui.g, branchesView); err != nil {
+			return err
+		}
 	}
 
 	return nil

pkg/gui/reset_menu_panel.go

@@ -0,0 +1,46 @@
+package gui
+
+import (
+	"fmt"
+
+	"github.com/fatih/color"
+)
+
+func (gui *Gui) createResetMenu(ref string) error {
+	strengths := []string{"soft", "mixed", "hard"}
+	menuItems := make([]*menuItem, len(strengths))
+	for i, strength := range strengths {
+		innerStrength := strength
+		menuItems[i] = &menuItem{
+			displayStrings: []string{
+				fmt.Sprintf("%s reset", strength),
+				color.New(color.FgRed).Sprint(
+					fmt.Sprintf("reset --%s %s", strength, ref),
+				),
+			},
+			onPress: func() error {
+				if err := gui.GitCommand.ResetToCommit(ref, innerStrength); err != nil {
+					return gui.createErrorPanel(gui.g, err.Error())
+				}
+
+				gui.switchCommitsPanelContext("branch-commits")
+				gui.State.Panels.Commits.SelectedLine = 0
+				gui.State.Panels.ReflogCommits.SelectedLine = 0
+
+				if err := gui.refreshCommits(gui.g); err != nil {
+					return err
+				}
+				if err := gui.refreshFiles(); err != nil {
+					return err
+				}
+				if err := gui.resetOrigin(gui.getCommitsView()); err != nil {
+					return err
+				}
+
+				return gui.handleCommitSelect(gui.g, gui.getCommitsView())
+			},
+		}
+	}
+
+	return gui.createMenu(fmt.Sprintf("%s %s", gui.Tr.SLocalize("resetTo"), ref), menuItems, createMenuOptions{showCancel: true})
+}

pkg/gui/searching.go

@@ -0,0 +1,91 @@
+package gui
+
+import (
+	"fmt"
+
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/theme"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+func (gui *Gui) handleOpenSearch(g *gocui.Gui, v *gocui.View) error {
+	gui.State.Searching.isSearching = true
+	gui.State.Searching.view = v
+	gui.renderString(gui.g, "search", "")
+	gui.switchFocus(gui.g, v, gui.getSearchView())
+
+	return nil
+}
+
+func (gui *Gui) handleSearch(g *gocui.Gui, v *gocui.View) error {
+	gui.State.Searching.searchString = gui.getSearchView().Buffer()
+	gui.switchFocus(gui.g, nil, gui.State.Searching.view)
+	if err := gui.State.Searching.view.Search(gui.State.Searching.searchString); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, int) error {
+	return func(y int, index int, total int) error {
+		if total == 0 {
+			gui.renderString(
+				gui.g,
+				"search",
+				fmt.Sprintf(
+					"no matches for '%s' %s",
+					gui.State.Searching.searchString,
+					utils.ColoredString(
+						fmt.Sprintf("%s: exit search mode", gui.getKeyDisplay("universal.return")),
+						theme.OptionsFgColor,
+					),
+				),
+			)
+			return nil
+		}
+		gui.renderString(
+			gui.g,
+			"search",
+			fmt.Sprintf(
+				"matches for '%s' (%d of %d) %s",
+				gui.State.Searching.searchString,
+				index+1,
+				total,
+				utils.ColoredString(
+					fmt.Sprintf(
+						"%s: next match, %s: previous match, %s: exit search mode",
+						gui.getKeyDisplay("universal.nextMatch"),
+						gui.getKeyDisplay("universal.prevMatch"),
+						gui.getKeyDisplay("universal.return"),
+					),
+					theme.OptionsFgColor,
+				),
+			),
+		)
+		if err := innerFunc(y); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func (gui *Gui) onSearchEscape() error {
+	gui.State.Searching.isSearching = false
+	if gui.State.Searching.view != nil {
+		gui.State.Searching.view.ClearSearch()
+		gui.State.Searching.view = nil
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleSearchEscape(g *gocui.Gui, v *gocui.View) error {
+	if err := gui.switchFocus(gui.g, nil, gui.State.Searching.view); err != nil {
+		return err
+	}
+
+	gui.onSearchEscape()
+
+	return nil
+}

pkg/gui/staging_panel.go

@@ -12,6 +12,13 @@ func (gui *Gui) refreshStagingPanel(forceSecondaryFocused bool, selectedLineIdx
 
 	state := gui.State.Panels.LineByLine
 
+	// We need to force focus here because the confirmation panel for safely staging lines does not return focus automatically.
+	// This is because if we tell it to return focus it will unconditionally return it to the main panel which may not be what we want
+	// e.g. in the event that there's nothing left to stage.
+	if err := gui.switchFocus(gui.g, nil, gui.getMainView()); err != nil {
+		return err
+	}
+
 	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
@@ -87,26 +94,36 @@ func (gui *Gui) handleTogglePanel(g *gocui.Gui, v *gocui.View) error {
 }
 
 func (gui *Gui) handleStagingEscape(g *gocui.Gui, v *gocui.View) error {
-	gui.State.Panels.LineByLine = nil
+	gui.handleEscapeLineByLinePanel()
 
 	return gui.switchFocus(gui.g, nil, gui.getFilesView())
 }
 
 func (gui *Gui) handleStageSelection(g *gocui.Gui, v *gocui.View) error {
-	return gui.applySelection(false)
+	return gui.applySelectionWithPrompt(false)
 }
 
 func (gui *Gui) handleResetSelection(g *gocui.Gui, v *gocui.View) error {
-	return gui.applySelection(true)
+	return gui.applySelectionWithPrompt(true)
 }
 
-func (gui *Gui) applySelection(reverse bool) error {
+func (gui *Gui) applySelectionWithPrompt(reverse bool) error {
 	state := gui.State.Panels.LineByLine
 
 	if !reverse && state.SecondaryFocused {
 		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantStageStaged"))
+	} else if reverse && !state.SecondaryFocused && !gui.Config.GetUserConfig().GetBool("gui.skipUnstageLineWarning") {
+		return gui.createConfirmationPanel(gui.g, gui.getMainView(), false, "unstage lines", "Are you sure you want to unstage these lines? It is irreversible.\nTo disable this dialogue set the config key of 'gui.skipUnstageLineWarning' to true", func(*gocui.Gui, *gocui.View) error {
+			return gui.applySelection(reverse)
+		}, nil)
 	}
 
+	return gui.applySelection(reverse)
+}
+
+func (gui *Gui) applySelection(reverse bool) error {
+	state := gui.State.Panels.LineByLine
+
 	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		return err

pkg/gui/stash_panel.go

@@ -34,16 +34,19 @@ func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error {
 
 	stashEntry := gui.getSelectedStashEntry(v)
 	if stashEntry == nil {
-		return gui.renderString(g, "main", gui.Tr.SLocalize("NoStashEntries"))
+		return gui.newStringTask("main", gui.Tr.SLocalize("NoStashEntries"))
 	}
 	if err := gui.focusPoint(0, gui.State.Panels.Stash.SelectedLine, len(gui.State.StashEntries), v); err != nil {
 		return err
 	}
-	go func() {
-		// doing this asynchronously cos it can take time
-		diff, _ := gui.GitCommand.GetStashEntryDiff(stashEntry.Index)
-		_ = gui.renderString(g, "main", diff)
-	}()
+
+	cmd := gui.OSCommand.ExecutableFromString(
+		gui.GitCommand.ShowStashEntryCmdStr(stashEntry.Index),
+	)
+	if err := gui.newCmdTask("main", cmd); err != nil {
+		gui.Log.Error(err)
+	}
+
 	return nil
 }
 
@@ -119,3 +122,8 @@ func (gui *Gui) handleStashSave(stashFunc func(message string) error) error {
 		return gui.refreshFiles()
 	})
 }
+
+func (gui *Gui) onStashPanelSearchSelect(selectedLine int) error {
+	gui.State.Panels.Stash.SelectedLine = selectedLine
+	return gui.handleStashEntrySelect(gui.g, gui.getStashView())
+}

pkg/gui/status_panel.go

@@ -111,7 +111,7 @@ func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
 			magenta.Sprint("Become a sponsor (github is matching all donations for 12 months): https://github.com/sponsors/jesseduffield"), // caffeine ain't free
 		}, "\n\n")
 
-	return gui.renderString(g, "main", dashboardString)
+	return gui.newStringTask("main", dashboardString)
 }
 
 func (gui *Gui) handleOpenConfig(g *gocui.Gui, v *gocui.View) error {

pkg/gui/tags_panel.go

@@ -1,8 +1,6 @@
 package gui
 
 import (
-	"fmt"
-
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 )
@@ -33,25 +31,18 @@ func (gui *Gui) handleTagSelect(g *gocui.Gui, v *gocui.View) error {
 
 	tag := gui.getSelectedTag()
 	if tag == nil {
-		return gui.renderString(g, "main", "No tags")
+		return gui.newStringTask("main", "No tags")
 	}
 	if err := gui.focusPoint(0, gui.State.Panels.Tags.SelectedLine, len(gui.State.Tags), v); err != nil {
 		return err
 	}
 
-	go func() {
-		show, err := gui.GitCommand.ShowTag(tag.Name)
-		if err != nil {
-			show = ""
-		}
-
-		graph, err := gui.GitCommand.GetBranchGraph(tag.Name)
-		if err != nil {
-			graph = "No graph for tag " + tag.Name
-		}
-
-		_ = gui.renderString(g, "main", fmt.Sprintf("%s\n%s", show, graph))
-	}()
+	cmd := gui.OSCommand.ExecutableFromString(
+		gui.GitCommand.GetBranchGraphCmdStr(tag.Name),
+	)
+	if err := gui.newCmdTask("main", cmd); err != nil {
+		gui.Log.Error(err)
+	}
 
 	return nil
 }
@@ -78,8 +69,10 @@ func (gui *Gui) renderTagsWithSelection() error {
 	if err := gui.renderListPanel(branchesView, gui.State.Tags); err != nil {
 		return err
 	}
-	if err := gui.handleTagSelect(gui.g, branchesView); err != nil {
-		return err
+	if gui.g.CurrentView() == branchesView && branchesView.Context == "tags" {
+		if err := gui.handleTagSelect(gui.g, branchesView); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -147,3 +140,12 @@ func (gui *Gui) handleCreateTag(g *gocui.Gui, v *gocui.View) error {
 		return gui.refreshTags()
 	})
 }
+
+func (gui *Gui) handleCreateResetToTagMenu(g *gocui.Gui, v *gocui.View) error {
+	tag := gui.getSelectedTag()
+	if tag == nil {
+		return nil
+	}
+
+	return gui.createResetMenu(tag.Name)
+}

pkg/gui/tasks_adapter.go

@@ -0,0 +1,78 @@
+package gui
+
+import (
+	"os/exec"
+
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/tasks"
+)
+
+func (gui *Gui) newCmdTask(viewName string, cmd *exec.Cmd) error {
+	view, err := gui.g.View(viewName)
+	if err != nil {
+		return nil // swallowing for now
+	}
+
+	_, height := view.Size()
+	_, oy := view.Origin()
+
+	manager := gui.getManager(view)
+
+	if err := manager.NewTask(manager.NewCmdTask(cmd, height+oy+10)); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) newTask(viewName string, f func(chan struct{}) error) error {
+	view, err := gui.g.View(viewName)
+	if err != nil {
+		return nil // swallowing for now
+	}
+
+	manager := gui.getManager(view)
+
+	if err := manager.NewTask(f); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) newStringTask(viewName string, str string) error {
+	view, err := gui.g.View(viewName)
+	if err != nil {
+		return nil // swallowing for now
+	}
+
+	manager := gui.getManager(view)
+
+	f := func(stop chan struct{}) error {
+		return gui.renderString(gui.g, viewName, str)
+	}
+
+	if err := manager.NewTask(f); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
+	manager, ok := gui.viewBufferManagerMap[view.Name()]
+	if !ok {
+		manager = tasks.NewViewBufferManager(
+			gui.Log,
+			view,
+			func() {
+				view.Clear()
+			},
+			func() {
+				gui.g.Update(func(*gocui.Gui) error { return nil })
+			})
+		gui.viewBufferManagerMap[view.Name()] = manager
+	}
+
+	return manager
+}

pkg/gui/view_helpers.go

@@ -135,6 +135,8 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 		}
 		v.Highlight = false
 		return nil
+	case "search":
+		return nil
 	default:
 		panic(gui.Tr.SLocalize("NoViewMachingNewLineFocusedSwitchStatement"))
 	}
@@ -218,32 +220,7 @@ func (gui *Gui) resetOrigin(v *gocui.View) error {
 
 // if the cursor down past the last item, move it to the last line
 func (gui *Gui) focusPoint(cx int, cy int, lineCount int, v *gocui.View) error {
-	if cy < 0 || cy > lineCount {
-		return nil
-	}
-	ox, oy := v.Origin()
-	_, height := v.Size()
-
-	ly := height - 1
-	if ly == -1 {
-		ly = 0
-	}
-
-	// if line is above origin, move origin and set cursor to zero
-	// if line is below origin + height, move origin and set cursor to max
-	// otherwise set cursor to value - origin
-	if ly > lineCount {
-		_ = v.SetCursor(cx, cy)
-		_ = v.SetOrigin(ox, 0)
-	} else if cy < oy {
-		_ = v.SetCursor(cx, 0)
-		_ = v.SetOrigin(ox, cy)
-	} else if cy > oy+ly {
-		_ = v.SetCursor(cx, ly)
-		_ = v.SetOrigin(ox, cy-ly)
-	} else {
-		_ = v.SetCursor(cx, cy-oy)
-	}
+	v.FocusPoint(cx, cy)
 	return nil
 }
 
@@ -268,6 +245,9 @@ func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) error {
 		if err := v.SetOrigin(0, 0); err != nil {
 			return err
 		}
+		if err := v.SetCursor(0, 0); err != nil {
+			return err
+		}
 		return gui.setViewContent(gui.g, v, s)
 	})
 	return nil
@@ -333,6 +313,11 @@ func (gui *Gui) getMenuView() *gocui.View {
 	return v
 }
 
+func (gui *Gui) getSearchView() *gocui.View {
+	v, _ := gui.g.View("search")
+	return v
+}
+
 func (gui *Gui) trimmedContent(v *gocui.View) string {
 	return strings.TrimSpace(v.Buffer())
 }

pkg/gui/workspace_reset_options_panel.go

@@ -5,23 +5,16 @@ import (
 	"github.com/jesseduffield/gocui"
 )
 
-type workspaceResetOption struct {
-	handler     func() error
-	description string
-	command     string
-}
-
-// GetDisplayStrings is a function.
-func (r *workspaceResetOption) GetDisplayStrings(isFocused bool) []string {
-	return []string{r.description, color.New(color.FgRed).Sprint(r.command)}
-}
-
 func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
-	options := []*workspaceResetOption{
+	red := color.New(color.FgRed)
+
+	menuItems := []*menuItem{
 		{
-			description: gui.Tr.SLocalize("discardAllChangesToAllFiles"),
-			command:     "reset --hard HEAD && git clean -fd",
-			handler: func() error {
+			displayStrings: []string{
+				gui.Tr.SLocalize("discardAllChangesToAllFiles"),
+				red.Sprint("reset --hard HEAD && git clean -fd"),
+			},
+			onPress: func() error {
 				if err := gui.GitCommand.ResetAndClean(); err != nil {
 					return gui.createErrorPanel(gui.g, err.Error())
 				}
@@ -30,9 +23,11 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 		},
 		{
-			description: gui.Tr.SLocalize("discardAnyUnstagedChanges"),
-			command:     "git checkout -- .",
-			handler: func() error {
+			displayStrings: []string{
+				gui.Tr.SLocalize("discardAnyUnstagedChanges"),
+				red.Sprint("git checkout -- ."),
+			},
+			onPress: func() error {
 				if err := gui.GitCommand.DiscardAnyUnstagedFileChanges(); err != nil {
 					return gui.createErrorPanel(gui.g, err.Error())
 				}
@@ -41,9 +36,11 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 		},
 		{
-			description: gui.Tr.SLocalize("discardUntrackedFiles"),
-			command:     "git clean -fd",
-			handler: func() error {
+			displayStrings: []string{
+				gui.Tr.SLocalize("discardUntrackedFiles"),
+				red.Sprint("git clean -fd"),
+			},
+			onPress: func() error {
 				if err := gui.GitCommand.RemoveUntrackedFiles(); err != nil {
 					return gui.createErrorPanel(gui.g, err.Error())
 				}
@@ -52,9 +49,11 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 		},
 		{
-			description: gui.Tr.SLocalize("softReset"),
-			command:     "git reset --soft HEAD",
-			handler: func() error {
+			displayStrings: []string{
+				gui.Tr.SLocalize("softReset"),
+				red.Sprint("git reset --soft HEAD"),
+			},
+			onPress: func() error {
 				if err := gui.GitCommand.ResetSoft("HEAD"); err != nil {
 					return gui.createErrorPanel(gui.g, err.Error())
 				}
@@ -63,10 +62,12 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 		},
 		{
-			description: gui.Tr.SLocalize("hardReset"),
-			command:     "git reset --hard HEAD",
-			handler: func() error {
-				if err := gui.GitCommand.ResetHard("HEAD"); err != nil {
+			displayStrings: []string{
+				"mixed reset",
+				red.Sprint("git reset --mixed HEAD"),
+			},
+			onPress: func() error {
+				if err := gui.GitCommand.ResetSoft("HEAD"); err != nil {
 					return gui.createErrorPanel(gui.g, err.Error())
 				}
 
@@ -74,27 +75,19 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 		},
 		{
-			description: gui.Tr.SLocalize("hardResetUpstream"),
-			command:     "git reset --hard @{upstream}",
-			handler: func() error {
-				if err := gui.GitCommand.ResetHard("@{upstream}"); err != nil {
+			displayStrings: []string{
+				gui.Tr.SLocalize("hardReset"),
+				red.Sprint("git reset --hard HEAD"),
+			},
+			onPress: func() error {
+				if err := gui.GitCommand.ResetHard("HEAD"); err != nil {
 					return gui.createErrorPanel(gui.g, err.Error())
 				}
 
-				return gui.refreshSidePanels(gui.g)
-			},
-		},
-		{
-			description: gui.Tr.SLocalize("cancel"),
-			handler: func() error {
-				return nil
+				return gui.refreshFiles()
 			},
 		},
 	}
 
-	handleMenuPress := func(index int) error {
-		return options[index].handler()
-	}
-
-	return gui.createMenu("", options, len(options), handleMenuPress)
+	return gui.createMenu("", menuItems, createMenuOptions{showCancel: true})
 }

pkg/i18n/dutch.go

@@ -136,9 +136,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CannotGitAdd",
 			Other: "Kan commando niet uitvoeren git add --path untracked files",
-		}, &i18n.Message{
-			ID:    "CantIgnoreTrackFiles",
-			Other: "Kan gevolgde bestanden niet negeren",
 		}, &i18n.Message{
 			ID:    "NoStagedFilesToCommit",
 			Other: "Er zijn geen staged bestanden om te commiten",
@@ -760,6 +757,12 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "ReturnToRemotesList",
 			Other: `return to remotes list`,
+		}, &i18n.Message{
+			ID:    "IgnoreTracked",
+			Other: "Ignore tracked file",
+		}, &i18n.Message{
+			ID:    "IgnoreTrackedPrompt",
+			Other: "Are you sure you want to ignore a tracked file?",
 		},
 	)
 }

pkg/i18n/english.go

@@ -162,9 +162,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CannotGitAdd",
 			Other: "Cannot git add --patch untracked files",
-		}, &i18n.Message{
-			ID:    "CantIgnoreTrackFiles",
-			Other: "Cannot ignore tracked files",
 		}, &i18n.Message{
 			ID:    "NoStagedFilesToCommit",
 			Other: "There are no staged files to commit",
@@ -939,6 +936,21 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "NewBranchNamePrompt",
 			Other: "new {{.branchType}} name:",
+		}, &i18n.Message{
+			ID:    "IgnoreTracked",
+			Other: "Ignore tracked file",
+		}, &i18n.Message{
+			ID:    "IgnoreTrackedPrompt",
+			Other: "Are you sure you want to ignore a tracked file?",
+		}, &i18n.Message{
+			ID:    "viewResetToUpstreamOptions",
+			Other: "view upstream reset options",
+		}, &i18n.Message{
+			ID:    "nextScreenMode",
+			Other: "next screen mode (normal/half/fullscreen)",
+		}, &i18n.Message{
+			ID:    "prevScreenMode",
+			Other: "prev screen mode",
 		},
 	)
 }

pkg/i18n/polish.go

@@ -128,9 +128,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CannotGitAdd",
 			Other: "Nie można git add --patch nieśledzonych plików",
-		}, &i18n.Message{
-			ID:    "CantIgnoreTrackFiles",
-			Other: "Nie można zignorować nieśledzonych plików",
 		}, &i18n.Message{
 			ID:    "NoStagedFilesToCommit",
 			Other: "Brak zatwierdzonych plików do commita",
@@ -743,6 +740,12 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "ReturnToRemotesList",
 			Other: `return to remotes list`,
+		}, &i18n.Message{
+			ID:    "IgnoreTracked",
+			Other: "Ignore tracked file",
+		}, &i18n.Message{
+			ID:    "IgnoreTrackedPrompt",
+			Other: "Are you sure you want to ignore a tracked file?",
 		},
 	)
 }

pkg/tasks/tasks.go

@@ -0,0 +1,228 @@
+package tasks
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"os/exec"
+	"sync"
+	"time"
+
+	"github.com/sirupsen/logrus"
+)
+
+type Task struct {
+	stop          chan struct{}
+	stopped       bool
+	stopMutex     sync.Mutex
+	notifyStopped chan struct{}
+	Log           *logrus.Entry
+	f             func(chan struct{}) error
+}
+
+type ViewBufferManager struct {
+	writer       io.Writer
+	waitingTask  *Task
+	currentTask  *Task
+	waitingMutex sync.Mutex
+	taskIDMutex  sync.Mutex
+	Log          *logrus.Entry
+	newTaskId    int
+	readLines    chan int
+
+	// beforeStart is the function that is called before starting a new task
+	beforeStart func()
+	refreshView func()
+}
+
+func NewViewBufferManager(log *logrus.Entry, writer io.Writer, beforeStart func(), refreshView func()) *ViewBufferManager {
+	return &ViewBufferManager{Log: log, writer: writer, beforeStart: beforeStart, refreshView: refreshView, readLines: make(chan int, 1024)}
+}
+
+func (m *ViewBufferManager) ReadLines(n int) {
+	go func() {
+		m.readLines <- n
+	}()
+}
+
+func (m *ViewBufferManager) NewCmdTask(cmd *exec.Cmd, linesToRead int) func(chan struct{}) error {
+	return func(stop chan struct{}) error {
+		r, err := cmd.StdoutPipe()
+		if err != nil {
+			return err
+		}
+		cmd.Stderr = cmd.Stdout
+
+		if err := cmd.Start(); err != nil {
+			return err
+		}
+
+		go func() {
+			<-stop
+			if cmd.ProcessState == nil {
+				if err := kill(cmd); err != nil {
+					m.Log.Warn(err)
+				}
+			}
+		}()
+
+		// not sure if it's the right move to redefine this or not
+		m.readLines = make(chan int, 1024)
+
+		done := make(chan struct{})
+
+		go func() {
+			scanner := bufio.NewScanner(r)
+			scanner.Split(bufio.ScanLines)
+
+			loaded := false
+
+			go func() {
+				ticker := time.NewTicker(time.Millisecond * 100)
+				defer ticker.Stop()
+				select {
+				case <-ticker.C:
+					if !loaded {
+						m.beforeStart()
+						m.writer.Write([]byte("loading..."))
+						m.refreshView()
+					}
+				case <-stop:
+					return
+				}
+			}()
+
+		outer:
+			for {
+				select {
+				case linesToRead := <-m.readLines:
+					for i := 0; i < linesToRead; i++ {
+						ok := scanner.Scan()
+						if !loaded {
+							m.beforeStart()
+							loaded = true
+						}
+
+						select {
+						case <-stop:
+							break outer
+						default:
+						}
+						if !ok {
+							m.refreshView()
+							break outer
+						}
+						m.writer.Write(append(scanner.Bytes(), []byte("\n")...))
+					}
+					m.refreshView()
+				case <-stop:
+					break outer
+				}
+			}
+
+			if err := cmd.Wait(); err != nil {
+				m.Log.Warn(err)
+			}
+
+			close(done)
+		}()
+
+		m.readLines <- linesToRead
+
+		<-done
+
+		return nil
+	}
+}
+
+// Close closes the task manager, killing whatever task may currently be running
+func (t *ViewBufferManager) Close() {
+	if t.currentTask == nil {
+		return
+	}
+
+	c := make(chan struct{}, 1)
+
+	go func() {
+		t.currentTask.Stop()
+		c <- struct{}{}
+	}()
+
+	select {
+	case <-c:
+		return
+	case <-time.After(3 * time.Second):
+		fmt.Println("cannot kill child process")
+	}
+}
+
+// different kinds of tasks:
+// 1) command based, where the manager can be asked to read more lines,  but the command can be killed
+// 2) string based, where the manager can also be asked to read more lines
+
+func (m *ViewBufferManager) NewTask(f func(stop chan struct{}) error) error {
+	go func() {
+		m.taskIDMutex.Lock()
+		m.newTaskId++
+		taskID := m.newTaskId
+		m.Log.Infof("starting task %d", taskID)
+		m.taskIDMutex.Unlock()
+
+		m.waitingMutex.Lock()
+		defer m.waitingMutex.Unlock()
+		if taskID < m.newTaskId {
+			return
+		}
+
+		stop := make(chan struct{})
+		notifyStopped := make(chan struct{})
+
+		if m.currentTask != nil {
+			m.Log.Info("asking task to stop")
+			m.currentTask.Stop()
+			m.Log.Info("task stopped")
+		}
+
+		m.currentTask = &Task{
+			stop:          stop,
+			notifyStopped: notifyStopped,
+			Log:           m.Log,
+			f:             f,
+		}
+
+		go func() {
+			if err := f(stop); err != nil {
+				m.Log.Error(err) // might need an onError callback
+			}
+
+			m.Log.Infof("returning from task %d", taskID)
+			close(notifyStopped)
+		}()
+	}()
+
+	return nil
+}
+
+func (t *Task) Stop() {
+	t.stopMutex.Lock()
+	defer t.stopMutex.Unlock()
+	if t.stopped {
+		return
+	}
+	close(t.stop)
+	t.Log.Info("closed stop channel, waiting for notifyStopped message")
+	<-t.notifyStopped
+	t.Log.Info("received notifystopped message")
+	t.stopped = true
+	return
+}
+
+// kill kills a process
+func kill(cmd *exec.Cmd) error {
+	if cmd.Process == nil {
+		// somebody got to it before we were able to, poor bastard
+		return nil
+	}
+
+	return cmd.Process.Kill()
+}

pkg/test/utils.go

@@ -3,6 +3,7 @@ package test
 import (
 	"fmt"
 	"os/exec"
+	"regexp"
 	"strings"
 	"testing"
 
@@ -43,3 +44,15 @@ func CreateMockCommand(t *testing.T, swappers []*CommandSwapper) func(cmd string
 		return command
 	}
 }
+
+func AssertContainsMatch(t *testing.T, strs []string, pattern *regexp.Regexp, message string) {
+	t.Helper()
+
+	for _, str := range strs {
+		if pattern.Match([]byte(str)) {
+			return
+		}
+	}
+
+	assert.Fail(t, message)
+}

pkg/theme/theme.go

@@ -20,12 +20,22 @@ var (
 
 	// InactiveBorderColor is the border color of the inactive active frames
 	InactiveBorderColor gocui.Attribute
+
+	// SelectedLineBgColor is the background color for the selected line
+	SelectedLineBgColor color.Attribute
+
+	OptionsFgColor color.Attribute
+
+	OptionsColor gocui.Attribute
 )
 
 // UpdateTheme updates all theme variables
 func UpdateTheme(userConfig *viper.Viper) {
-	ActiveBorderColor = getColor(userConfig.GetStringSlice("gui.theme.activeBorderColor"))
-	InactiveBorderColor = getColor(userConfig.GetStringSlice("gui.theme.inactiveBorderColor"))
+	ActiveBorderColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.activeBorderColor"))
+	InactiveBorderColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.inactiveBorderColor"))
+	SelectedLineBgColor = GetBgColor(userConfig.GetStringSlice("gui.theme.selectedLineBgColor"))
+	OptionsColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
+	OptionsFgColor = GetFgColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
 
 	isLightTheme := userConfig.GetBool("gui.theme.lightTheme")
 	if isLightTheme {
@@ -39,8 +49,8 @@ func UpdateTheme(userConfig *viper.Viper) {
 	}
 }
 
-// getAttribute gets the gocui color attribute from the string
-func getAttribute(key string) gocui.Attribute {
+// GetAttribute gets the gocui color attribute from the string
+func GetGocuiAttribute(key string) gocui.Attribute {
 	colorMap := map[string]gocui.Attribute{
 		"default":   gocui.ColorDefault,
 		"black":     gocui.ColorBlack,
@@ -62,43 +72,75 @@ func getAttribute(key string) gocui.Attribute {
 	return gocui.ColorWhite
 }
 
-// getColor bitwise OR's a list of attributes obtained via the given keys
-func getColor(keys []string) gocui.Attribute {
+// GetFgAttribute gets the color foreground attribute from the string
+func GetFgAttribute(key string) color.Attribute {
+	colorMap := map[string]color.Attribute{
+		"default":   color.FgWhite,
+		"black":     color.FgBlack,
+		"red":       color.FgRed,
+		"green":     color.FgGreen,
+		"yellow":    color.FgYellow,
+		"blue":      color.FgBlue,
+		"magenta":   color.FgMagenta,
+		"cyan":      color.FgCyan,
+		"white":     color.FgWhite,
+		"bold":      color.Bold,
+		"reverse":   color.ReverseVideo,
+		"underline": color.Underline,
+	}
+	value, present := colorMap[key]
+	if present {
+		return value
+	}
+	return color.FgWhite
+}
+
+// GetBgAttribute gets the color background attribute from the string
+func GetBgAttribute(key string) color.Attribute {
+	colorMap := map[string]color.Attribute{
+		"default":   color.BgWhite,
+		"black":     color.BgBlack,
+		"red":       color.BgRed,
+		"green":     color.BgGreen,
+		"yellow":    color.BgYellow,
+		"blue":      color.BgBlue,
+		"magenta":   color.BgMagenta,
+		"cyan":      color.BgCyan,
+		"white":     color.BgWhite,
+		"bold":      color.Bold,
+		"reverse":   color.ReverseVideo,
+		"underline": color.Underline,
+	}
+	value, present := colorMap[key]
+	if present {
+		return value
+	}
+	return color.FgWhite
+}
+
+// GetGocuiColor bitwise OR's a list of attributes obtained via the given keys
+func GetGocuiColor(keys []string) gocui.Attribute {
 	var attribute gocui.Attribute
 	for _, key := range keys {
-		attribute |= getAttribute(key)
+		attribute |= GetGocuiAttribute(key)
 	}
 	return attribute
 }
 
-// GetAttribute gets the gocui color attribute from the string
-func GetAttribute(key string) gocui.Attribute {
-	colorMap := map[string]gocui.Attribute{
-		"default":   gocui.ColorDefault,
-		"black":     gocui.ColorBlack,
-		"red":       gocui.ColorRed,
-		"green":     gocui.ColorGreen,
-		"yellow":    gocui.ColorYellow,
-		"blue":      gocui.ColorBlue,
-		"magenta":   gocui.ColorMagenta,
-		"cyan":      gocui.ColorCyan,
-		"white":     gocui.ColorWhite,
-		"bold":      gocui.AttrBold,
-		"reverse":   gocui.AttrReverse,
-		"underline": gocui.AttrUnderline,
-	}
-	value, present := colorMap[key]
-	if present {
-		return value
-	}
-	return gocui.ColorWhite
-}
-
 // GetColor bitwise OR's a list of attributes obtained via the given keys
-func GetColor(keys []string) gocui.Attribute {
-	var attribute gocui.Attribute
+func GetBgColor(keys []string) color.Attribute {
+	var attribute color.Attribute
 	for _, key := range keys {
-		attribute |= GetAttribute(key)
+		attribute |= GetBgAttribute(key)
+	}
+	return attribute
+}
+
+// GetColor bitwise OR's a list of attributes obtained via the given keys
+func GetFgColor(keys []string) color.Attribute {
+	var attribute color.Attribute
+	for _, key := range keys {
+		attribute |= GetFgAttribute(key)
 	}
 	return attribute
 }

pkg/utils/utils.go

@@ -151,14 +151,14 @@ func renderDisplayableList(items []Displayable, isFocused bool) (string, error)
 
 	stringArrays := getDisplayStringArrays(items, isFocused)
 
-	if !displayArraysAligned(stringArrays) {
-		return "", errors.New("Each item must return the same number of strings to display")
-	}
+	return RenderDisplayStrings(stringArrays), nil
+}
 
-	padWidths := getPadWidths(stringArrays)
-	paddedDisplayStrings := getPaddedDisplayStrings(stringArrays, padWidths)
+func RenderDisplayStrings(displayStringsArr [][]string) string {
+	padWidths := getPadWidths(displayStringsArr)
+	paddedDisplayStrings := getPaddedDisplayStrings(displayStringsArr, padWidths)
 
-	return strings.Join(paddedDisplayStrings, "\n"), nil
+	return strings.Join(paddedDisplayStrings, "\n")
 }
 
 // Decolorise strips a string of color
@@ -168,10 +168,16 @@ func Decolorise(str string) string {
 }
 
 func getPadWidths(stringArrays [][]string) []int {
-	if len(stringArrays[0]) <= 1 {
+	maxWidth := 0
+	for _, stringArray := range stringArrays {
+		if len(stringArray) > maxWidth {
+			maxWidth = len(stringArray)
+		}
+	}
+	if maxWidth-1 < 0 {
 		return []int{}
 	}
-	padWidths := make([]int, len(stringArrays[0])-1)
+	padWidths := make([]int, maxWidth-1)
 	for i := range padWidths {
 		for _, strings := range stringArrays {
 			uncoloredString := Decolorise(strings[i])
@@ -190,8 +196,14 @@ func getPaddedDisplayStrings(stringArrays [][]string, padWidths []int) []string
 			continue
 		}
 		for j, padWidth := range padWidths {
+			if len(stringArray)-1 < j {
+				continue
+			}
 			paddedDisplayStrings[i] += WithPadding(stringArray[j], padWidth) + " "
 		}
+		if len(stringArray)-1 < len(padWidths) {
+			continue
+		}
 		paddedDisplayStrings[i] += stringArray[len(padWidths)]
 	}
 	return paddedDisplayStrings
@@ -310,3 +322,29 @@ func ModuloWithWrap(n, max int) int {
 		return n
 	}
 }
+
+// NextIntInCycle returns the next int in a slice, returning to the first index if we've reached the end
+func NextIntInCycle(sl []int, current int) int {
+	for i, val := range sl {
+		if val == current {
+			if i == len(sl)-1 {
+				return sl[0]
+			}
+			return sl[i+1]
+		}
+	}
+	return sl[0]
+}
+
+// PrevIntInCycle returns the prev int in a slice, returning to the first index if we've reached the end
+func PrevIntInCycle(sl []int, current int) int {
+	for i, val := range sl {
+		if val == current {
+			if i > 0 {
+				return sl[i-1]
+			}
+			return sl[len(sl)-1]
+		}
+	}
+	return sl[len(sl)-1]
+}

pkg/utils/utils_test.go

@@ -276,8 +276,8 @@ func TestRenderDisplayableList(t *testing.T) {
 				Displayable(&myDisplayable{[]string{"b", "c"}}),
 			},
 			false,
+			"a \nb c",
 			"",
-			"Each item must return the same number of strings to display",
 		},
 		{
 			[]Displayable{

vendor/github.com/jesseduffield/gocui/escape.go

@@ -5,8 +5,9 @@
 package gocui
 
 import (
-	"github.com/go-errors/errors"
 	"strconv"
+
+	"github.com/go-errors/errors"
 )
 
 type escapeInterpreter struct {

vendor/github.com/jesseduffield/gocui/gui.go

@@ -6,7 +6,9 @@ package gocui
 
 import (
 	standardErrors "errors"
+	"fmt"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/go-errors/errors"
@@ -89,6 +91,16 @@ type Gui struct {
 	// SupportOverlaps is true when we allow for view edges to overlap with other
 	// view edges
 	SupportOverlaps bool
+
+	// tickingMutex ensures we don't have two loops ticking. The point of 'ticking'
+	// is to refresh the gui rapidly so that loader characters can be animated.
+	tickingMutex sync.Mutex
+
+	OnSearchEscape func() error
+	// these keys must either be of type Key of rune
+	SearchEscapeKey    interface{}
+	NextSearchMatchKey interface{}
+	PrevSearchMatchKey interface{}
 }
 
 // NewGui returns a new Gui object with a given output mode.
@@ -119,15 +131,18 @@ func NewGui(mode OutputMode, supportOverlaps bool) (*Gui, error) {
 	// view edges
 	g.SupportOverlaps = supportOverlaps
 
+	// default keys for when searching strings in a view
+	g.SearchEscapeKey = KeyEsc
+	g.NextSearchMatchKey = 'n'
+	g.PrevSearchMatchKey = 'N'
+
 	return g, nil
 }
 
 // Close finalizes the library. It should be called after a successful
 // initialization and when gocui is not needed anymore.
 func (g *Gui) Close() {
-	go func() {
-		g.stop <- struct{}{}
-	}()
+	close(g.stop)
 	termbox.Close()
 }
 
@@ -409,7 +424,6 @@ func (g *Gui) SetManagerFunc(manager func(*Gui) error) {
 // MainLoop runs the main loop until an error is returned. A successful
 // finish should return ErrQuit.
 func (g *Gui) MainLoop() error {
-	g.loaderTick()
 	if err := g.flush(); err != nil {
 		return err
 	}
@@ -529,6 +543,11 @@ func (g *Gui) flush() error {
 					return err
 				}
 			}
+			if v.ContainsList {
+				if err := g.drawListFooter(v, fgColor, bgColor); err != nil {
+					return err
+				}
+			}
 		}
 		if err := g.draw(v); err != nil {
 			return err
@@ -716,6 +735,34 @@ func (g *Gui) drawSubtitle(v *View, fgColor, bgColor Attribute) error {
 	return nil
 }
 
+// drawListFooter draws the footer of a list view, showing something like '1 of 10'
+func (g *Gui) drawListFooter(v *View, fgColor, bgColor Attribute) error {
+	if len(v.lines) == 0 {
+		return nil
+	}
+
+	message := fmt.Sprintf("%d of %d", v.cy+v.oy+1, len(v.lines))
+
+	if v.y1 < 0 || v.y1 >= g.maxY {
+		return nil
+	}
+
+	start := v.x1 - 1 - len(message)
+	if start < v.x0 {
+		return nil
+	}
+	for i, ch := range message {
+		x := start + i
+		if x >= v.x1 {
+			break
+		}
+		if err := g.SetRune(x, v.y1, ch, fgColor, bgColor); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // draw manages the cursor and calls the draw function of a view.
 func (g *Gui) draw(v *View) error {
 	if g.Cursor {
@@ -801,6 +848,23 @@ func (g *Gui) execKeybindings(v *View, ev *termbox.Event) (matched bool, err err
 	var globalKb *keybinding
 	var matchingParentViewKb *keybinding
 
+	// if we're searching, and we've hit n/N/Esc, we ignore the default keybinding
+	if v.IsSearching() && Modifier(ev.Mod) == ModNone {
+		if eventMatchesKey(ev, g.NextSearchMatchKey) {
+			return true, v.gotoNextMatch()
+		} else if eventMatchesKey(ev, g.PrevSearchMatchKey) {
+			return true, v.gotoPreviousMatch()
+		} else if eventMatchesKey(ev, g.SearchEscapeKey) {
+			v.searcher.clearSearch()
+			if g.OnSearchEscape != nil {
+				if err := g.OnSearchEscape(); err != nil {
+					return true, err
+				}
+			}
+			return true, nil
+		}
+	}
+
 	for _, kb := range g.keybindings {
 		if kb.handler == nil {
 			continue
@@ -835,14 +899,25 @@ func (g *Gui) execKeybinding(v *View, kb *keybinding) (bool, error) {
 	return true, nil
 }
 
-func (g *Gui) loaderTick() {
+func (g *Gui) StartTicking() {
 	go func() {
-		for range time.Tick(time.Millisecond * 50) {
-			for _, view := range g.Views() {
-				if view.HasLoader {
-					g.userEvents <- userEvent{func(g *Gui) error { return nil }}
-					break
+		g.tickingMutex.Lock()
+		defer g.tickingMutex.Unlock()
+		ticker := time.NewTicker(time.Millisecond * 50)
+		defer ticker.Stop()
+	outer:
+		for {
+			select {
+			case <-ticker.C:
+				for _, view := range g.Views() {
+					if view.HasLoader {
+						g.userEvents <- userEvent{func(g *Gui) error { return nil }}
+						continue outer
+					}
 				}
+				return
+			case <-g.stop:
+				return
 			}
 		}
 	}()

vendor/github.com/jesseduffield/gocui/keybinding.go

@@ -29,6 +29,20 @@ func newKeybinding(viewname string, contexts []string, key Key, ch rune, mod Mod
 	return kb
 }
 
+func eventMatchesKey(ev *termbox.Event, key interface{}) bool {
+	// assuming ModNone for now
+	if Modifier(ev.Mod) != ModNone {
+		return false
+	}
+
+	k, ch, err := getKey(key)
+	if err != nil {
+		return false
+	}
+
+	return k == Key(ev.Key) && ch == ev.Ch
+}
+
 // matchKeypress returns if the keybinding matches the keypress.
 func (kb *keybinding) matchKeypress(key Key, ch rune, mod Modifier) bool {
 	return kb.key == key && kb.ch == ch && kb.mod == mod

vendor/github.com/jesseduffield/gocui/view.go

@@ -105,6 +105,140 @@ type View struct {
 	ParentView *View
 
 	Context string // this is for assigning keybindings to a view only in certain contexts
+
+	searcher *searcher
+
+	// when ContainsList is true, we show the current index and total count in the view
+	ContainsList bool
+}
+
+type searcher struct {
+	searchString       string
+	searchPositions    []cellPos
+	currentSearchIndex int
+	onSelectItem       func(int, int, int) error
+}
+
+func (v *View) SetOnSelectItem(onSelectItem func(int, int, int) error) {
+	v.searcher.onSelectItem = onSelectItem
+}
+
+func (v *View) gotoNextMatch() error {
+	if len(v.searcher.searchPositions) == 0 {
+		return nil
+	}
+	if v.searcher.currentSearchIndex == len(v.searcher.searchPositions)-1 {
+		v.searcher.currentSearchIndex = 0
+	} else {
+		v.searcher.currentSearchIndex++
+	}
+	return v.SelectSearchResult(v.searcher.currentSearchIndex)
+}
+
+func (v *View) gotoPreviousMatch() error {
+	if len(v.searcher.searchPositions) == 0 {
+		return nil
+	}
+	if v.searcher.currentSearchIndex == 0 {
+		if len(v.searcher.searchPositions) > 0 {
+			v.searcher.currentSearchIndex = len(v.searcher.searchPositions) - 1
+		}
+	} else {
+		v.searcher.currentSearchIndex--
+	}
+	return v.SelectSearchResult(v.searcher.currentSearchIndex)
+}
+
+func (v *View) SelectSearchResult(index int) error {
+	y := v.searcher.searchPositions[index].y
+	v.FocusPoint(0, y)
+	if v.searcher.onSelectItem != nil {
+		return v.searcher.onSelectItem(y, index, len(v.searcher.searchPositions))
+	}
+	return nil
+}
+
+func (v *View) Search(str string) error {
+	v.writeMutex.Lock()
+	defer v.writeMutex.Unlock()
+
+	v.searcher.search(str)
+	v.updateSearchPositions()
+	if len(v.searcher.searchPositions) > 0 {
+		// get the first result past the current cursor
+		currentIndex := 0
+		adjustedY := v.oy + v.cy
+		adjustedX := v.ox + v.cx
+		for i, pos := range v.searcher.searchPositions {
+			if pos.y > adjustedY || (pos.y == adjustedY && pos.x > adjustedX) {
+				currentIndex = i
+				break
+			}
+		}
+		v.searcher.currentSearchIndex = currentIndex
+		return v.SelectSearchResult(currentIndex)
+	} else {
+		return v.searcher.onSelectItem(-1, -1, 0)
+	}
+	return nil
+}
+
+func (v *View) ClearSearch() {
+	v.searcher.clearSearch()
+}
+
+func (v *View) IsSearching() bool {
+	return v.searcher.searchString != ""
+}
+
+func (v *View) FocusPoint(cx int, cy int) {
+	lineCount := len(v.lines)
+	if cy < 0 || cy > lineCount {
+		return
+	}
+	_, height := v.Size()
+
+	ly := height - 1
+	if ly == -1 {
+		ly = 0
+	}
+
+	// if line is above origin, move origin and set cursor to zero
+	// if line is below origin + height, move origin and set cursor to max
+	// otherwise set cursor to value - origin
+	if ly > lineCount {
+		v.cx = cx
+		v.cy = cy
+		v.oy = 0
+	} else if cy < v.oy {
+		v.cx = cx
+		v.cy = 0
+		v.oy = cy
+	} else if cy > v.oy+ly {
+		v.cx = cx
+		v.cy = ly
+		v.oy = cy - ly
+	} else {
+		v.cx = cx
+		v.cy = cy - v.oy
+	}
+}
+
+func (s *searcher) search(str string) {
+	s.searchString = str
+	s.searchPositions = []cellPos{}
+	s.currentSearchIndex = 0
+}
+
+func (s *searcher) clearSearch() {
+	s.searchString = ""
+	s.searchPositions = []cellPos{}
+	s.currentSearchIndex = 0
+}
+
+type cellPos struct {
+	x int
+	y int
 }
 
 type viewLine struct {
@@ -131,15 +265,16 @@ func (l lineType) String() string {
 // newView returns a new View object.
 func newView(name string, x0, y0, x1, y1 int, mode OutputMode) *View {
 	v := &View{
-		name:    name,
-		x0:      x0,
-		y0:      y0,
-		x1:      x1,
-		y1:      y1,
-		Frame:   true,
-		Editor:  DefaultEditor,
-		tainted: true,
-		ei:      newEscapeInterpreter(mode),
+		name:     name,
+		x0:       x0,
+		y0:       y0,
+		x1:       x1,
+		y1:       y1,
+		Frame:    true,
+		Editor:   DefaultEditor,
+		tainted:  true,
+		ei:       newEscapeInterpreter(mode),
+		searcher: &searcher{},
 	}
 	return v
 }
@@ -331,8 +466,35 @@ func (v *View) Rewind() {
 	v.readOffset = 0
 }
 
+func (v *View) updateSearchPositions() {
+	if v.searcher.searchString != "" {
+		v.searcher.searchPositions = []cellPos{}
+		for y, line := range v.lines {
+		lineLoop:
+			for x, _ := range line {
+				if line[x].chr == rune(v.searcher.searchString[0]) {
+					for offset := 1; offset < len(v.searcher.searchString); offset++ {
+						if len(line)-1 < x+offset {
+							continue lineLoop
+						}
+						if line[x+offset].chr != rune(v.searcher.searchString[offset]) {
+							continue lineLoop
+						}
+					}
+					v.searcher.searchPositions = append(v.searcher.searchPositions, cellPos{x: x, y: y})
+				}
+			}
+		}
+	}
+
+}
+
 // draw re-draws the view's contents.
 func (v *View) draw() error {
+	v.writeMutex.Lock()
+	defer v.writeMutex.Unlock()
+
+	v.updateSearchPositions()
 	maxX, maxY := v.Size()
 
 	if v.Wrap {
@@ -392,6 +554,13 @@ func (v *View) draw() error {
 			if bgColor == ColorDefault {
 				bgColor = v.BgColor
 			}
+			if matched, selected := v.isPatternMatchedRune(x, y); matched {
+				if selected {
+					bgColor = ColorCyan
+				} else {
+					bgColor = ColorYellow
+				}
+			}
 
 			if err := v.setRune(x, y, c.chr, fgColor, bgColor); err != nil {
 				return err
@@ -403,6 +572,18 @@ func (v *View) draw() error {
 	return nil
 }
 
+func (v *View) isPatternMatchedRune(x, y int) (bool, bool) {
+	searchStringLength := len(v.searcher.searchString)
+	for i, pos := range v.searcher.searchPositions {
+		adjustedY := y + v.oy
+		adjustedX := x + v.ox
+		if adjustedY == pos.y && adjustedX >= pos.x && adjustedX < pos.x+searchStringLength {
+			return true, i == v.searcher.currentSearchIndex
+		}
+	}
+	return false, false
+}
+
 // realPosition returns the position in the internal buffer corresponding to the
 // point (x, y) of the view.
 func (v *View) realPosition(vx, vy int) (x, y int, err error) {
@@ -458,6 +639,8 @@ func (v *View) clearRunes() {
 // BufferLines returns the lines in the view's internal
 // buffer.
 func (v *View) BufferLines() []string {
+	v.writeMutex.Lock()
+	defer v.writeMutex.Unlock()
 	lines := make([]string, len(v.lines))
 	for i, l := range v.lines {
 		str := lineType(l).String()
@@ -476,6 +659,8 @@ func (v *View) Buffer() string {
 // ViewBufferLines returns the lines in the view's internal
 // buffer that is shown to the user.
 func (v *View) ViewBufferLines() []string {
+	v.writeMutex.Lock()
+	defer v.writeMutex.Unlock()
 	lines := make([]string, len(v.viewLines))
 	for i, l := range v.viewLines {
 		str := lineType(l.line).String()

vendor/github.com/jesseduffield/roll/.gitignore

@@ -1 +0,0 @@
-rollbar.test

vendor/github.com/jesseduffield/roll/CHANGELOG

@@ -1,24 +0,0 @@
-0.2.0 - May 22nd, 2016
-====================
-
-* Do not use title to determine fingerprint.
-
-0.1.1 - August 24th, 2016
-=========================
-
-* Fix Go 1.6 support by removing call to runtime.CallersFrames, which was added
-	in Go 1.7.
-
-0.1.0 - August 23rd, 2016
-=========================
-
-* Allow passing in arbitrary function pointer stacks. (thanks @apg!)
-* Remove unneeded exported constants.
-* Make HTTP(S) endpoint configurable.
-* Remove unneeded debug print statement.
-
-0.0.1 - January 19th, 2015
-==========================
-
-* Initial release based on https://github.com/stvp/rollbar
-

vendor/github.com/jesseduffield/roll/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2016 Stovepipe Studios
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/github.com/jesseduffield/roll/README.md

@@ -1,53 +0,0 @@
-roll
-----
-
-`roll` is a basic Rollbar client for Go that reports errors and logs
-messages. It automatically builds stack traces and also supports
-arbitrary traces. All errors and messages are sent to Rollbar
-synchronously.
-
-`roll` is intentionally simple. For more advanced functionality, check
-out [heroku/rollbar](https://github.com/heroku/rollbar).
-
-[API docs on godoc.org](http://godoc.org/github.com/stvp/roll)
-
-Notes
-=====
-
-* Critical-, Error-, and Warning-level messages include a stack trace.
-  However, Go's `error` type doesn't include stack information from the
-  location the error was set or allocated. Instead, `roll` uses the
-  stack information from where the error was reported.
-* Info- and Debug-level Rollbar messages do not include stack traces.
-* When calling `roll` away from where the error actually occurred,
-  `roll`'s stack walking won't represent the actual stack trace at the
-  time the error occurred. The `*Stack` variants of Critical, Error, and
-  Warning take a `[]uintptr`, allowing the stack to be provided, rather
-  than walked.
-
-Running Tests
-=============
-
-`go test` will run tests against a fake server by default.
-
-If the environment variable `TOKEN` is a Rollbar access token, running
-`go test` will produce errors using an environment named `test`.
-
-    TOKEN=f0df01587b8f76b2c217af34c479f9ea go test
-
-Verify the reported errors manually in the Rollbar dashboard.
-
-Contributors
-============
-
-* @challiwill
-* @tysonmote
-* @apg
-
-This library was forked from [stvp/rollbar](https://github.com/stvp/rollbar),
-which had contributions from:
-
-* @kjk
-* @Soulou
-* @paulmach
-

vendor/github.com/jesseduffield/roll/client.go

@@ -1,242 +0,0 @@
-package roll
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"hash/adler32"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"reflect"
-	"runtime"
-	"strings"
-	"time"
-)
-
-const (
-	// By default, all Rollbar API requests are sent to this endpoint.
-	endpoint = "https://api.rollbar.com/api/1/item/"
-
-	// Identify this Rollbar client library to the Rollbar API.
-	clientName     = "go-roll"
-	clientVersion  = "0.2.0"
-	clientLanguage = "go"
-)
-
-var (
-	// Endpoint is the default HTTP(S) endpoint that all Rollbar API requests
-	// will be sent to. By default, this is Rollbar's "Items" API endpoint. If
-	// this is blank, no items will be sent to Rollbar.
-	Endpoint = endpoint
-
-	// Rollbar access token for the global client. If this is blank, no items
-	// will be sent to Rollbar.
-	Token = ""
-
-	// Environment for all items reported with the global client.
-	Environment = "development"
-)
-
-type rollbarSuccess struct {
-	Result map[string]string `json:"result"`
-}
-
-// Client reports items to a single Rollbar project.
-type Client interface {
-	Critical(err error, custom map[string]string) (uuid string, e error)
-	CriticalStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error)
-	Error(err error, custom map[string]string) (uuid string, e error)
-	ErrorStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error)
-	Warning(err error, custom map[string]string) (uuid string, e error)
-	WarningStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error)
-	Info(msg string, custom map[string]string) (uuid string, e error)
-	Debug(msg string, custom map[string]string) (uuid string, e error)
-}
-
-type rollbarClient struct {
-	token string
-	env   string
-}
-
-// New creates a new Rollbar client that reports items to the given project
-// token and with the given environment (eg. "production", "development", etc).
-func New(token, env string) Client {
-	return &rollbarClient{token, env}
-}
-
-func Critical(err error, custom map[string]string) (uuid string, e error) {
-	return CriticalStack(err, getCallers(2), custom)
-}
-
-func CriticalStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error) {
-	return New(Token, Environment).CriticalStack(err, ptrs, custom)
-}
-
-func Error(err error, custom map[string]string) (uuid string, e error) {
-	return ErrorStack(err, getCallers(2), custom)
-}
-
-func ErrorStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error) {
-	return New(Token, Environment).ErrorStack(err, ptrs, custom)
-}
-
-func Warning(err error, custom map[string]string) (uuid string, e error) {
-	return WarningStack(err, getCallers(2), custom)
-}
-
-func WarningStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error) {
-	return New(Token, Environment).WarningStack(err, ptrs, custom)
-}
-
-func Info(msg string, custom map[string]string) (uuid string, e error) {
-	return New(Token, Environment).Info(msg, custom)
-}
-
-func Debug(msg string, custom map[string]string) (uuid string, e error) {
-	return New(Token, Environment).Debug(msg, custom)
-}
-
-func (c *rollbarClient) Critical(err error, custom map[string]string) (uuid string, e error) {
-	return c.CriticalStack(err, getCallers(2), custom)
-}
-
-func (c *rollbarClient) CriticalStack(err error, callers []uintptr, custom map[string]string) (uuid string, e error) {
-	item := c.buildTraceItem("critical", err, callers, custom)
-	return c.send(item)
-}
-
-func (c *rollbarClient) Error(err error, custom map[string]string) (uuid string, e error) {
-	return c.ErrorStack(err, getCallers(2), custom)
-}
-
-func (c *rollbarClient) ErrorStack(err error, callers []uintptr, custom map[string]string) (uuid string, e error) {
-	item := c.buildTraceItem("error", err, callers, custom)
-	return c.send(item)
-}
-
-func (c *rollbarClient) Warning(err error, custom map[string]string) (uuid string, e error) {
-	return c.WarningStack(err, getCallers(2), custom)
-}
-
-func (c *rollbarClient) WarningStack(err error, callers []uintptr, custom map[string]string) (uuid string, e error) {
-	item := c.buildTraceItem("warning", err, callers, custom)
-	return c.send(item)
-}
-
-func (c *rollbarClient) Info(msg string, custom map[string]string) (uuid string, e error) {
-	item := c.buildMessageItem("info", msg, custom)
-	return c.send(item)
-}
-
-func (c *rollbarClient) Debug(msg string, custom map[string]string) (uuid string, e error) {
-	item := c.buildMessageItem("debug", msg, custom)
-	return c.send(item)
-}
-
-func (c *rollbarClient) buildTraceItem(level string, err error, callers []uintptr, custom map[string]string) (item map[string]interface{}) {
-	stack := buildRollbarFrames(callers)
-	item = c.buildItem(level, err.Error(), custom)
-	itemData := item["data"].(map[string]interface{})
-	itemData["fingerprint"] = stack.fingerprint()
-	itemData["body"] = map[string]interface{}{
-		"trace": map[string]interface{}{
-			"frames": stack,
-			"exception": map[string]interface{}{
-				"class":   errorClass(err),
-				"message": err.Error(),
-			},
-		},
-	}
-
-	return item
-}
-
-func (c *rollbarClient) buildMessageItem(level string, msg string, custom map[string]string) (item map[string]interface{}) {
-	item = c.buildItem(level, msg, custom)
-	itemData := item["data"].(map[string]interface{})
-	itemData["body"] = map[string]interface{}{
-		"message": map[string]interface{}{
-			"body": msg,
-		},
-	}
-
-	return item
-}
-
-func (c *rollbarClient) buildItem(level, title string, custom map[string]string) map[string]interface{} {
-	hostname, _ := os.Hostname()
-
-	return map[string]interface{}{
-		"access_token": c.token,
-		"data": map[string]interface{}{
-			"environment": c.env,
-			"title":       title,
-			"level":       level,
-			"timestamp":   time.Now().Unix(),
-			"platform":    runtime.GOOS,
-			"language":    clientLanguage,
-			"server": map[string]interface{}{
-				"host": hostname,
-			},
-			"notifier": map[string]interface{}{
-				"name":    clientName,
-				"version": clientVersion,
-			},
-			"custom": custom,
-		},
-	}
-}
-
-// send reports the given item to Rollbar and returns either a UUID for the
-// reported item or an error.
-func (c *rollbarClient) send(item map[string]interface{}) (uuid string, err error) {
-	if len(c.token) == 0 || len(Endpoint) == 0 {
-		return "", nil
-	}
-
-	jsonBody, err := json.Marshal(item)
-	if err != nil {
-		return "", err
-	}
-
-	resp, err := http.Post(Endpoint, "application/json", bytes.NewReader(jsonBody))
-	if err != nil {
-		// If something goes wrong it really does not matter
-		return "", nil
-	}
-	defer func() {
-		io.Copy(ioutil.Discard, resp.Body)
-		resp.Body.Close()
-	}()
-
-	if resp.StatusCode != http.StatusOK {
-		// If something goes wrong it really does not matter
-		return "", nil
-	}
-
-	// Extract UUID from JSON response
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", nil
-	}
-	success := rollbarSuccess{}
-	json.Unmarshal(body, &success)
-
-	return success.Result["uuid"], nil
-}
-
-// errorClass returns a class name for an error (eg.  "ErrUnexpectedEOF"). For
-// string errors, it returns an Adler-32 checksum of the error string.
-func errorClass(err error) string {
-	class := reflect.TypeOf(err).String()
-	if class == "" {
-		return "panic"
-	} else if class == "*errors.errorString" {
-		checksum := adler32.Checksum([]byte(err.Error()))
-		return fmt.Sprintf("{%x}", checksum)
-	} else {
-		return strings.TrimPrefix(class, "*")
-	}
-}

vendor/github.com/jesseduffield/roll/stack.go

@@ -1,98 +0,0 @@
-package roll
-
-import (
-	"fmt"
-	"hash/crc32"
-	"os"
-	"runtime"
-	"strings"
-)
-
-var (
-	knownFilePathPatterns = []string{
-		"github.com/",
-		"code.google.com/",
-		"bitbucket.org/",
-		"launchpad.net/",
-		"gopkg.in/",
-	}
-)
-
-func getCallers(skip int) (pc []uintptr) {
-	pc = make([]uintptr, 1000)
-	i := runtime.Callers(skip+1, pc)
-	return pc[0:i]
-}
-
-// -- rollbarFrames
-
-type rollbarFrame struct {
-	Filename string `json:"filename"`
-	Method   string `json:"method"`
-	Line     int    `json:"lineno"`
-}
-
-type rollbarFrames []rollbarFrame
-
-// buildRollbarFrames takes a slice of function pointers and returns a Rollbar
-// API payload containing the filename, method name, and line number of each
-// function.
-func buildRollbarFrames(callers []uintptr) (frames rollbarFrames) {
-	frames = rollbarFrames{}
-
-	// 2016-08-24 - runtime.CallersFrames was added in Go 1.7, which should
-	// replace the following code when roll is able to require Go 1.7+.
-	for _, caller := range callers {
-		frame := rollbarFrame{
-			Filename: "???",
-			Method:   "???",
-		}
-		if fn := runtime.FuncForPC(caller); fn != nil {
-			name, line := fn.FileLine(caller)
-			frame.Filename = scrubFile(name)
-			frame.Line = line
-			frame.Method = scrubFunction(fn.Name())
-		}
-		frames = append(frames, frame)
-	}
-
-	return frames
-}
-
-// fingerprint returns a checksum that uniquely identifies a stacktrace by the
-// filename, method name, and line number of every frame in the stack.
-func (f rollbarFrames) fingerprint() string {
-	hash := crc32.NewIEEE()
-	for _, frame := range f {
-		fmt.Fprintf(hash, "%s%s%d", frame.Filename, frame.Method, frame.Line)
-	}
-	return fmt.Sprintf("%x", hash.Sum32())
-}
-
-// -- Helpers
-
-// scrubFile removes unneeded information from the path of a source file. This
-// makes them shorter in Rollbar UI as well as making them the same, regardless
-// of the machine the code was compiled on.
-//
-// Example:
-//   /home/foo/go/src/github.com/stvp/roll/rollbar.go -> github.com/stvp/roll/rollbar.go
-func scrubFile(s string) string {
-	var i int
-	for _, pattern := range knownFilePathPatterns {
-		i = strings.Index(s, pattern)
-		if i != -1 {
-			return s[i:]
-		}
-	}
-	return s
-}
-
-// scrubFunction removes unneeded information from the full name of a function.
-//
-// Example:
-//   github.com/stvp/roll.getCallers -> roll.getCallers
-func scrubFunction(name string) string {
-	end := strings.LastIndex(name, string(os.PathSeparator))
-	return name[end+1 : len(name)]
-}

vendor/github.com/jesseduffield/rollrus/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright © Heroku 2014 - 2015
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/github.com/jesseduffield/rollrus/README.md

@@ -1,15 +0,0 @@
-[![Build Status](https://travis-ci.org/heroku/rollrus.svg?branch=master)](https://travis-ci.org/heroku/rollrus) [![GoDoc](https://godoc.org/github.com/heroku/rollrus?status.svg)](https://godoc.org/github.com/heroku/rollrus)
-
-# What
-
-Rollrus is what happens when [Logrus](https://github.com/sirupsen/logrus) meets [Roll](https://github.com/stvp/roll).
-
-When a .Error, .Fatal or .Panic logging function is called, report the details to rollbar via a Logrus hook.
-
-Delivery is synchronous to help ensure that logs are delivered.
-
-If the error includes a [`StackTrace`](https://godoc.org/github.com/pkg/errors#StackTrace), that `StackTrace` is reported to rollbar.
-
-# Usage
-
-Examples available in the [tests](https://github.com/heroku/rollrus/blob/master/rollrus_test.go) or on [GoDoc](https://godoc.org/github.com/heroku/rollrus).

vendor/github.com/jesseduffield/rollrus/go.mod

@@ -1,7 +0,0 @@
-module github.com/jesseduffield/rollrus
-
-require (
-	github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00
-	github.com/pkg/errors v0.8.1
-	github.com/sirupsen/logrus v1.3.0
-)

vendor/github.com/jesseduffield/rollrus/go.sum

@@ -1,19 +0,0 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00 h1:+JaOkfBNYQYlGD7dgru8mCwYNEc5tRRI8mThlVANhSM=
-github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00/go.mod h1:cWNQljQAWYBp4wchyGfql4q2jRNZXxiE1KhVQgz+JaM=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
-github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

vendor/github.com/jesseduffield/rollrus/rollrus.go

@@ -1,287 +0,0 @@
-// Package rollrus combines github.com/jesseduffield/roll with github.com/sirupsen/logrus
-// via logrus.Hook mechanism, so that whenever logrus' logger.Error/f(),
-// logger.Fatal/f() or logger.Panic/f() are used the messages are
-// intercepted and sent to rollbar.
-//
-// Using SetupLogging should suffice for basic use cases that use the logrus
-// singleton logger.
-//
-// More custom uses are supported by creating a new Hook with NewHook and
-// registering that hook with the logrus Logger of choice.
-//
-// The levels can be customized with the WithLevels OptionFunc.
-//
-// Specific errors can be ignored with the WithIgnoredErrors OptionFunc. This is
-// useful for ignoring errors such as context.Canceled.
-//
-// See the Examples in the tests for more usage.
-package rollrus
-
-import (
-	"fmt"
-	"os"
-	"time"
-
-	"github.com/jesseduffield/roll"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-)
-
-var defaultTriggerLevels = []logrus.Level{
-	logrus.ErrorLevel,
-	logrus.FatalLevel,
-	logrus.PanicLevel,
-}
-
-// Hook is a wrapper for the rollbar Client and is usable as a logrus.Hook.
-type Hook struct {
-	roll.Client
-	triggers        []logrus.Level
-	ignoredErrors   []error
-	ignoreErrorFunc func(error) bool
-	ignoreFunc      func(error, map[string]string) bool
-
-	// only used for tests to verify whether or not a report happened.
-	reported bool
-}
-
-// OptionFunc that can be passed to NewHook.
-type OptionFunc func(*Hook)
-
-// wellKnownErrorFields are the names of the fields to be checked for values of
-// type `error`, in priority order.
-var wellKnownErrorFields = []string{
-	logrus.ErrorKey, "err",
-}
-
-// WithLevels is an OptionFunc that customizes the log.Levels the hook will
-// report on.
-func WithLevels(levels ...logrus.Level) OptionFunc {
-	return func(h *Hook) {
-		h.triggers = levels
-	}
-}
-
-// WithMinLevel is an OptionFunc that customizes the log.Levels the hook will
-// report on by selecting all levels more severe than the one provided.
-func WithMinLevel(level logrus.Level) OptionFunc {
-	var levels []logrus.Level
-	for _, l := range logrus.AllLevels {
-		if l <= level {
-			levels = append(levels, l)
-		}
-	}
-
-	return func(h *Hook) {
-		h.triggers = levels
-	}
-}
-
-// WithIgnoredErrors is an OptionFunc that whitelists certain errors to prevent
-// them from firing. See https://golang.org/ref/spec#Comparison_operators
-func WithIgnoredErrors(errors ...error) OptionFunc {
-	return func(h *Hook) {
-		h.ignoredErrors = append(h.ignoredErrors, errors...)
-	}
-}
-
-// WithIgnoreErrorFunc is an OptionFunc that receives the error that is about
-// to be logged and returns true/false if it wants to fire a rollbar alert for.
-func WithIgnoreErrorFunc(fn func(error) bool) OptionFunc {
-	return func(h *Hook) {
-		h.ignoreErrorFunc = fn
-	}
-}
-
-// WithIgnoreFunc is an OptionFunc that receives the error and custom fields that are about
-// to be logged and returns true/false if it wants to fire a rollbar alert for.
-func WithIgnoreFunc(fn func(err error, fields map[string]string) bool) OptionFunc {
-	return func(h *Hook) {
-		h.ignoreFunc = fn
-	}
-}
-
-// NewHook creates a hook that is intended for use with your own logrus.Logger
-// instance. Uses the defualt report levels defined in wellKnownErrorFields.
-func NewHook(token string, env string, opts ...OptionFunc) *Hook {
-	h := NewHookForLevels(token, env, defaultTriggerLevels)
-
-	for _, o := range opts {
-		o(h)
-	}
-
-	return h
-}
-
-// NewHookForLevels provided by the caller. Otherwise works like NewHook.
-func NewHookForLevels(token string, env string, levels []logrus.Level) *Hook {
-	return &Hook{
-		Client:          roll.New(token, env),
-		triggers:        levels,
-		ignoredErrors:   make([]error, 0),
-		ignoreErrorFunc: func(error) bool { return false },
-		ignoreFunc:      func(error, map[string]string) bool { return false },
-	}
-}
-
-// SetupLogging for use on Heroku. If token is not an empty string a rollbar
-// hook is added with the environment set to env. The log formatter is set to a
-// TextFormatter with timestamps disabled.
-func SetupLogging(token, env string) {
-	setupLogging(token, env, defaultTriggerLevels)
-}
-
-// SetupLoggingForLevels works like SetupLogging, but allows you to
-// set the levels on which to trigger this hook.
-func SetupLoggingForLevels(token, env string, levels []logrus.Level) {
-	setupLogging(token, env, levels)
-}
-
-func setupLogging(token, env string, levels []logrus.Level) {
-	logrus.SetFormatter(&logrus.TextFormatter{DisableTimestamp: true})
-
-	if token != "" {
-		logrus.AddHook(NewHookForLevels(token, env, levels))
-	}
-}
-
-// ReportPanic attempts to report the panic to rollbar using the provided
-// client and then re-panic. If it can't report the panic it will print an
-// error to stderr.
-func (r *Hook) ReportPanic() {
-	if p := recover(); p != nil {
-		if _, err := r.Client.Critical(fmt.Errorf("panic: %q", p), nil); err != nil {
-			fmt.Fprintf(os.Stderr, "reporting_panic=false err=%q\n", err)
-		}
-		panic(p)
-	}
-}
-
-// ReportPanic attempts to report the panic to rollbar if the token is set
-func ReportPanic(token, env string) {
-	if token != "" {
-		h := &Hook{Client: roll.New(token, env)}
-		h.ReportPanic()
-	}
-}
-
-// Levels returns the logrus log.Levels that this hook handles
-func (r *Hook) Levels() []logrus.Level {
-	if r.triggers == nil {
-		return defaultTriggerLevels
-	}
-	return r.triggers
-}
-
-// Fire the hook. This is called by Logrus for entries that match the levels
-// returned by Levels().
-func (r *Hook) Fire(entry *logrus.Entry) error {
-	trace, cause := extractError(entry)
-	for _, ie := range r.ignoredErrors {
-		if ie == cause {
-			return nil
-		}
-	}
-
-	if r.ignoreErrorFunc(cause) {
-		return nil
-	}
-
-	m := convertFields(entry.Data)
-	if _, exists := m["time"]; !exists {
-		m["time"] = entry.Time.Format(time.RFC3339)
-	}
-
-	if r.ignoreFunc(cause, m) {
-		return nil
-	}
-
-	return r.report(entry, cause, m, trace)
-}
-
-func (r *Hook) report(entry *logrus.Entry, cause error, m map[string]string, trace []uintptr) (err error) {
-	hasTrace := len(trace) > 0
-	level := entry.Level
-
-	r.reported = true
-
-	switch {
-	case hasTrace && level == logrus.FatalLevel:
-		_, err = r.Client.CriticalStack(cause, trace, m)
-	case hasTrace && level == logrus.PanicLevel:
-		_, err = r.Client.CriticalStack(cause, trace, m)
-	case hasTrace && level == logrus.ErrorLevel:
-		_, err = r.Client.ErrorStack(cause, trace, m)
-	case hasTrace && level == logrus.WarnLevel:
-		_, err = r.Client.WarningStack(cause, trace, m)
-	case level == logrus.FatalLevel || level == logrus.PanicLevel:
-		_, err = r.Client.Critical(cause, m)
-	case level == logrus.ErrorLevel:
-		_, err = r.Client.Error(cause, m)
-	case level == logrus.WarnLevel:
-		_, err = r.Client.Warning(cause, m)
-	case level == logrus.InfoLevel:
-		_, err = r.Client.Info(entry.Message, m)
-	case level == logrus.DebugLevel:
-		_, err = r.Client.Debug(entry.Message, m)
-	}
-	return err
-}
-
-// convertFields converts from log.Fields to map[string]string so that we can
-// report extra fields to Rollbar
-func convertFields(fields logrus.Fields) map[string]string {
-	m := make(map[string]string)
-	for k, v := range fields {
-		switch t := v.(type) {
-		case time.Time:
-			m[k] = t.Format(time.RFC3339)
-		default:
-			if s, ok := v.(fmt.Stringer); ok {
-				m[k] = s.String()
-			} else {
-				m[k] = fmt.Sprintf("%+v", t)
-			}
-		}
-	}
-
-	return m
-}
-
-// extractError attempts to extract an error from a well known field, err or error
-func extractError(entry *logrus.Entry) ([]uintptr, error) {
-	var trace []uintptr
-	fields := entry.Data
-
-	type stackTracer interface {
-		StackTrace() errors.StackTrace
-	}
-
-	for _, f := range wellKnownErrorFields {
-		e, ok := fields[f]
-		if !ok {
-			continue
-		}
-		err, ok := e.(error)
-		if !ok {
-			continue
-		}
-
-		cause := errors.Cause(err)
-		tracer, ok := err.(stackTracer)
-		if ok {
-			return copyStackTrace(tracer.StackTrace()), cause
-		}
-		return trace, cause
-	}
-
-	// when no error found, default to the logged message.
-	return trace, fmt.Errorf(entry.Message)
-}
-
-func copyStackTrace(trace errors.StackTrace) (out []uintptr) {
-	for _, frame := range trace {
-		out = append(out, uintptr(frame))
-	}
-	return
-}

vendor/github.com/jesseduffield/termbox-go/api.go

@@ -2,13 +2,16 @@
 
 package termbox
 
-import "github.com/mattn/go-runewidth"
-import "fmt"
-import "os"
-import "os/signal"
-import "syscall"
-import "runtime"
-import "time"
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"runtime"
+	"syscall"
+	"time"
+
+	"github.com/mattn/go-runewidth"
+)
 
 // public API
 
@@ -26,13 +29,21 @@ func Init() error {
 
 	var err error
 
-	out, err = os.OpenFile("/dev/tty", syscall.O_WRONLY, 0)
-	if err != nil {
-		return err
-	}
-	in, err = syscall.Open("/dev/tty", syscall.O_RDONLY, 0)
-	if err != nil {
-		return err
+	if runtime.GOOS == "openbsd" || runtime.GOOS == "freebsd" {
+		out, err = os.OpenFile("/dev/tty", os.O_RDWR, 0)
+		if err != nil {
+			return err
+		}
+		in = int(out.Fd())
+	} else {
+		out, err = os.OpenFile("/dev/tty", os.O_WRONLY, 0)
+		if err != nil {
+			return err
+		}
+		in, err = syscall.Open("/dev/tty", syscall.O_RDONLY, 0)
+		if err != nil {
+			return err
+		}
 	}
 
 	err = setup_term()

vendor/github.com/mattn/go-runewidth/README.md

@@ -2,7 +2,7 @@ go-runewidth
 ============
 
 [![Build Status](https://travis-ci.org/mattn/go-runewidth.png?branch=master)](https://travis-ci.org/mattn/go-runewidth)
-[![Coverage Status](https://coveralls.io/repos/mattn/go-runewidth/badge.png?branch=HEAD)](https://coveralls.io/r/mattn/go-runewidth?branch=HEAD)
+[![Codecov](https://codecov.io/gh/mattn/go-runewidth/branch/master/graph/badge.svg)](https://codecov.io/gh/mattn/go-runewidth)
 [![GoDoc](https://godoc.org/github.com/mattn/go-runewidth?status.svg)](http://godoc.org/github.com/mattn/go-runewidth)
 [![Go Report Card](https://goreportcard.com/badge/github.com/mattn/go-runewidth)](https://goreportcard.com/report/github.com/mattn/go-runewidth)
 

vendor/github.com/mattn/go-runewidth/go.test.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+echo "" > coverage.txt
+
+for d in $(go list ./... | grep -v vendor); do
+    go test -race -coverprofile=profile.out -covermode=atomic "$d"
+    if [ -f profile.out ]; then
+        cat profile.out >> coverage.txt
+        rm profile.out
+    fi
+done

vendor/github.com/mattn/go-runewidth/runewidth.go

@@ -50,7 +50,6 @@ func inTables(r rune, ts ...table) bool {
 }
 
 func inTable(r rune, t table) bool {
-	// func (t table) IncludesRune(r rune) bool {
 	if r < t[0].first {
 		return false
 	}

vendor/github.com/mattn/go-runewidth/runewidth_table.go

@@ -1,3 +1,5 @@
+// Code generated by script/generate.go. DO NOT EDIT.
+
 package runewidth
 
 var combining = table{

vendor/github.com/pkg/errors/.gitignore

@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof

vendor/github.com/pkg/errors/LICENSE

@@ -1,23 +0,0 @@
-Copyright (c) 2015, Dave Cheney <dave@cheney.net>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

vendor/github.com/pkg/errors/README.md

@@ -1,52 +0,0 @@
-# errors [![Travis-CI](https://travis-ci.org/pkg/errors.svg)](https://travis-ci.org/pkg/errors) [![AppVeyor](https://ci.appveyor.com/api/projects/status/b98mptawhudj53ep/branch/master?svg=true)](https://ci.appveyor.com/project/davecheney/errors/branch/master) [![GoDoc](https://godoc.org/github.com/pkg/errors?status.svg)](http://godoc.org/github.com/pkg/errors) [![Report card](https://goreportcard.com/badge/github.com/pkg/errors)](https://goreportcard.com/report/github.com/pkg/errors) [![Sourcegraph](https://sourcegraph.com/github.com/pkg/errors/-/badge.svg)](https://sourcegraph.com/github.com/pkg/errors?badge)
-
-Package errors provides simple error handling primitives.
-
-`go get github.com/pkg/errors`
-
-The traditional error handling idiom in Go is roughly akin to
-```go
-if err != nil {
-        return err
-}
-```
-which applied recursively up the call stack results in error reports without context or debugging information. The errors package allows programmers to add context to the failure path in their code in a way that does not destroy the original value of the error.
-
-## Adding context to an error
-
-The errors.Wrap function returns a new error that adds context to the original error. For example
-```go
-_, err := ioutil.ReadAll(r)
-if err != nil {
-        return errors.Wrap(err, "read failed")
-}
-```
-## Retrieving the cause of an error
-
-Using `errors.Wrap` constructs a stack of errors, adding context to the preceding error. Depending on the nature of the error it may be necessary to reverse the operation of errors.Wrap to retrieve the original error for inspection. Any error value which implements this interface can be inspected by `errors.Cause`.
-```go
-type causer interface {
-        Cause() error
-}
-```
-`errors.Cause` will recursively retrieve the topmost error which does not implement `causer`, which is assumed to be the original cause. For example:
-```go
-switch err := errors.Cause(err).(type) {
-case *MyError:
-        // handle specifically
-default:
-        // unknown error
-}
-```
-
-[Read the package documentation for more information](https://godoc.org/github.com/pkg/errors).
-
-## Contributing
-
-We welcome pull requests, bug fixes and issue reports. With that said, the bar for adding new symbols to this package is intentionally set high.
-
-Before proposing a change, please discuss your change by raising an issue.
-
-## License
-
-BSD-2-Clause

vendor/github.com/pkg/errors/appveyor.yml

@@ -1,32 +0,0 @@
-version: build-{build}.{branch}
-
-clone_folder: C:\gopath\src\github.com\pkg\errors
-shallow_clone: true # for startup speed
-
-environment:
-  GOPATH: C:\gopath
-
-platform:
-  - x64
-
-# http://www.appveyor.com/docs/installed-software
-install:
-  # some helpful output for debugging builds
-  - go version
-  - go env
-  # pre-installed MinGW at C:\MinGW is 32bit only
-  # but MSYS2 at C:\msys64 has mingw64
-  - set PATH=C:\msys64\mingw64\bin;%PATH%
-  - gcc --version
-  - g++ --version
-
-build_script:
-  - go install -v ./...
-
-test_script:
-  - set PATH=C:\gopath\bin;%PATH%
-  - go test -v ./...
-
-#artifacts:
-#  - path: '%GOPATH%\bin\*.exe'
-deploy: off

vendor/github.com/pkg/errors/errors.go

@@ -1,282 +0,0 @@
-// Package errors provides simple error handling primitives.
-//
-// The traditional error handling idiom in Go is roughly akin to
-//
-//     if err != nil {
-//             return err
-//     }
-//
-// which when applied recursively up the call stack results in error reports
-// without context or debugging information. The errors package allows
-// programmers to add context to the failure path in their code in a way
-// that does not destroy the original value of the error.
-//
-// Adding context to an error
-//
-// The errors.Wrap function returns a new error that adds context to the
-// original error by recording a stack trace at the point Wrap is called,
-// together with the supplied message. For example
-//
-//     _, err := ioutil.ReadAll(r)
-//     if err != nil {
-//             return errors.Wrap(err, "read failed")
-//     }
-//
-// If additional control is required, the errors.WithStack and
-// errors.WithMessage functions destructure errors.Wrap into its component
-// operations: annotating an error with a stack trace and with a message,
-// respectively.
-//
-// Retrieving the cause of an error
-//
-// Using errors.Wrap constructs a stack of errors, adding context to the
-// preceding error. Depending on the nature of the error it may be necessary
-// to reverse the operation of errors.Wrap to retrieve the original error
-// for inspection. Any error value which implements this interface
-//
-//     type causer interface {
-//             Cause() error
-//     }
-//
-// can be inspected by errors.Cause. errors.Cause will recursively retrieve
-// the topmost error that does not implement causer, which is assumed to be
-// the original cause. For example:
-//
-//     switch err := errors.Cause(err).(type) {
-//     case *MyError:
-//             // handle specifically
-//     default:
-//             // unknown error
-//     }
-//
-// Although the causer interface is not exported by this package, it is
-// considered a part of its stable public interface.
-//
-// Formatted printing of errors
-//
-// All error values returned from this package implement fmt.Formatter and can
-// be formatted by the fmt package. The following verbs are supported:
-//
-//     %s    print the error. If the error has a Cause it will be
-//           printed recursively.
-//     %v    see %s
-//     %+v   extended format. Each Frame of the error's StackTrace will
-//           be printed in detail.
-//
-// Retrieving the stack trace of an error or wrapper
-//
-// New, Errorf, Wrap, and Wrapf record a stack trace at the point they are
-// invoked. This information can be retrieved with the following interface:
-//
-//     type stackTracer interface {
-//             StackTrace() errors.StackTrace
-//     }
-//
-// The returned errors.StackTrace type is defined as
-//
-//     type StackTrace []Frame
-//
-// The Frame type represents a call site in the stack trace. Frame supports
-// the fmt.Formatter interface that can be used for printing information about
-// the stack trace of this error. For example:
-//
-//     if err, ok := err.(stackTracer); ok {
-//             for _, f := range err.StackTrace() {
-//                     fmt.Printf("%+s:%d", f)
-//             }
-//     }
-//
-// Although the stackTracer interface is not exported by this package, it is
-// considered a part of its stable public interface.
-//
-// See the documentation for Frame.Format for more details.
-package errors
-
-import (
-	"fmt"
-	"io"
-)
-
-// New returns an error with the supplied message.
-// New also records the stack trace at the point it was called.
-func New(message string) error {
-	return &fundamental{
-		msg:   message,
-		stack: callers(),
-	}
-}
-
-// Errorf formats according to a format specifier and returns the string
-// as a value that satisfies error.
-// Errorf also records the stack trace at the point it was called.
-func Errorf(format string, args ...interface{}) error {
-	return &fundamental{
-		msg:   fmt.Sprintf(format, args...),
-		stack: callers(),
-	}
-}
-
-// fundamental is an error that has a message and a stack, but no caller.
-type fundamental struct {
-	msg string
-	*stack
-}
-
-func (f *fundamental) Error() string { return f.msg }
-
-func (f *fundamental) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		if s.Flag('+') {
-			io.WriteString(s, f.msg)
-			f.stack.Format(s, verb)
-			return
-		}
-		fallthrough
-	case 's':
-		io.WriteString(s, f.msg)
-	case 'q':
-		fmt.Fprintf(s, "%q", f.msg)
-	}
-}
-
-// WithStack annotates err with a stack trace at the point WithStack was called.
-// If err is nil, WithStack returns nil.
-func WithStack(err error) error {
-	if err == nil {
-		return nil
-	}
-	return &withStack{
-		err,
-		callers(),
-	}
-}
-
-type withStack struct {
-	error
-	*stack
-}
-
-func (w *withStack) Cause() error { return w.error }
-
-func (w *withStack) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		if s.Flag('+') {
-			fmt.Fprintf(s, "%+v", w.Cause())
-			w.stack.Format(s, verb)
-			return
-		}
-		fallthrough
-	case 's':
-		io.WriteString(s, w.Error())
-	case 'q':
-		fmt.Fprintf(s, "%q", w.Error())
-	}
-}
-
-// Wrap returns an error annotating err with a stack trace
-// at the point Wrap is called, and the supplied message.
-// If err is nil, Wrap returns nil.
-func Wrap(err error, message string) error {
-	if err == nil {
-		return nil
-	}
-	err = &withMessage{
-		cause: err,
-		msg:   message,
-	}
-	return &withStack{
-		err,
-		callers(),
-	}
-}
-
-// Wrapf returns an error annotating err with a stack trace
-// at the point Wrapf is called, and the format specifier.
-// If err is nil, Wrapf returns nil.
-func Wrapf(err error, format string, args ...interface{}) error {
-	if err == nil {
-		return nil
-	}
-	err = &withMessage{
-		cause: err,
-		msg:   fmt.Sprintf(format, args...),
-	}
-	return &withStack{
-		err,
-		callers(),
-	}
-}
-
-// WithMessage annotates err with a new message.
-// If err is nil, WithMessage returns nil.
-func WithMessage(err error, message string) error {
-	if err == nil {
-		return nil
-	}
-	return &withMessage{
-		cause: err,
-		msg:   message,
-	}
-}
-
-// WithMessagef annotates err with the format specifier.
-// If err is nil, WithMessagef returns nil.
-func WithMessagef(err error, format string, args ...interface{}) error {
-	if err == nil {
-		return nil
-	}
-	return &withMessage{
-		cause: err,
-		msg:   fmt.Sprintf(format, args...),
-	}
-}
-
-type withMessage struct {
-	cause error
-	msg   string
-}
-
-func (w *withMessage) Error() string { return w.msg + ": " + w.cause.Error() }
-func (w *withMessage) Cause() error  { return w.cause }
-
-func (w *withMessage) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		if s.Flag('+') {
-			fmt.Fprintf(s, "%+v\n", w.Cause())
-			io.WriteString(s, w.msg)
-			return
-		}
-		fallthrough
-	case 's', 'q':
-		io.WriteString(s, w.Error())
-	}
-}
-
-// Cause returns the underlying cause of the error, if possible.
-// An error value has a cause if it implements the following
-// interface:
-//
-//     type causer interface {
-//            Cause() error
-//     }
-//
-// If the error does not implement Cause, the original error will
-// be returned. If the error is nil, nil will be returned without further
-// investigation.
-func Cause(err error) error {
-	type causer interface {
-		Cause() error
-	}
-
-	for err != nil {
-		cause, ok := err.(causer)
-		if !ok {
-			break
-		}
-		err = cause.Cause()
-	}
-	return err
-}

vendor/github.com/pkg/errors/stack.go

@@ -1,147 +0,0 @@
-package errors
-
-import (
-	"fmt"
-	"io"
-	"path"
-	"runtime"
-	"strings"
-)
-
-// Frame represents a program counter inside a stack frame.
-type Frame uintptr
-
-// pc returns the program counter for this frame;
-// multiple frames may have the same PC value.
-func (f Frame) pc() uintptr { return uintptr(f) - 1 }
-
-// file returns the full path to the file that contains the
-// function for this Frame's pc.
-func (f Frame) file() string {
-	fn := runtime.FuncForPC(f.pc())
-	if fn == nil {
-		return "unknown"
-	}
-	file, _ := fn.FileLine(f.pc())
-	return file
-}
-
-// line returns the line number of source code of the
-// function for this Frame's pc.
-func (f Frame) line() int {
-	fn := runtime.FuncForPC(f.pc())
-	if fn == nil {
-		return 0
-	}
-	_, line := fn.FileLine(f.pc())
-	return line
-}
-
-// Format formats the frame according to the fmt.Formatter interface.
-//
-//    %s    source file
-//    %d    source line
-//    %n    function name
-//    %v    equivalent to %s:%d
-//
-// Format accepts flags that alter the printing of some verbs, as follows:
-//
-//    %+s   function name and path of source file relative to the compile time
-//          GOPATH separated by \n\t (<funcname>\n\t<path>)
-//    %+v   equivalent to %+s:%d
-func (f Frame) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 's':
-		switch {
-		case s.Flag('+'):
-			pc := f.pc()
-			fn := runtime.FuncForPC(pc)
-			if fn == nil {
-				io.WriteString(s, "unknown")
-			} else {
-				file, _ := fn.FileLine(pc)
-				fmt.Fprintf(s, "%s\n\t%s", fn.Name(), file)
-			}
-		default:
-			io.WriteString(s, path.Base(f.file()))
-		}
-	case 'd':
-		fmt.Fprintf(s, "%d", f.line())
-	case 'n':
-		name := runtime.FuncForPC(f.pc()).Name()
-		io.WriteString(s, funcname(name))
-	case 'v':
-		f.Format(s, 's')
-		io.WriteString(s, ":")
-		f.Format(s, 'd')
-	}
-}
-
-// StackTrace is stack of Frames from innermost (newest) to outermost (oldest).
-type StackTrace []Frame
-
-// Format formats the stack of Frames according to the fmt.Formatter interface.
-//
-//    %s	lists source files for each Frame in the stack
-//    %v	lists the source file and line number for each Frame in the stack
-//
-// Format accepts flags that alter the printing of some verbs, as follows:
-//
-//    %+v   Prints filename, function, and line number for each Frame in the stack.
-func (st StackTrace) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		switch {
-		case s.Flag('+'):
-			for _, f := range st {
-				fmt.Fprintf(s, "\n%+v", f)
-			}
-		case s.Flag('#'):
-			fmt.Fprintf(s, "%#v", []Frame(st))
-		default:
-			fmt.Fprintf(s, "%v", []Frame(st))
-		}
-	case 's':
-		fmt.Fprintf(s, "%s", []Frame(st))
-	}
-}
-
-// stack represents a stack of program counters.
-type stack []uintptr
-
-func (s *stack) Format(st fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		switch {
-		case st.Flag('+'):
-			for _, pc := range *s {
-				f := Frame(pc)
-				fmt.Fprintf(st, "\n%+v", f)
-			}
-		}
-	}
-}
-
-func (s *stack) StackTrace() StackTrace {
-	f := make([]Frame, len(*s))
-	for i := 0; i < len(f); i++ {
-		f[i] = Frame((*s)[i])
-	}
-	return f
-}
-
-func callers() *stack {
-	const depth = 32
-	var pcs [depth]uintptr
-	n := runtime.Callers(3, pcs[:])
-	var st stack = pcs[0:n]
-	return &st
-}
-
-// funcname removes the path prefix component of a function's name reported by func.Name().
-func funcname(name string) string {
-	i := strings.LastIndex(name, "/")
-	name = name[i+1:]
-	i = strings.Index(name, ".")
-	return name[i+1:]
-}

vendor/modules.txt

@@ -32,15 +32,11 @@ github.com/hashicorp/hcl/json/token
 github.com/integrii/flaggy
 # github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99
 github.com/jbenet/go-context/io
-# github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532
+# github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed
 github.com/jesseduffield/gocui
 # github.com/jesseduffield/pty v1.2.1
 github.com/jesseduffield/pty
-# github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00
-github.com/jesseduffield/roll
-# github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7
-github.com/jesseduffield/rollrus
-# github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e
+# github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9
 github.com/jesseduffield/termbox-go
 # github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 github.com/kardianos/osext
@@ -54,7 +50,7 @@ github.com/magiconair/properties
 github.com/mattn/go-colorable
 # github.com/mattn/go-isatty v0.0.11
 github.com/mattn/go-isatty
-# github.com/mattn/go-runewidth v0.0.7
+# github.com/mattn/go-runewidth v0.0.8
 github.com/mattn/go-runewidth
 # github.com/mgutz/str v1.2.0
 github.com/mgutz/str
@@ -68,8 +64,6 @@ github.com/nicksnyder/go-i18n/v2/internal
 github.com/nicksnyder/go-i18n/v2/internal/plural
 # github.com/pelletier/go-toml v1.6.0
 github.com/pelletier/go-toml
-# github.com/pkg/errors v0.8.1
-github.com/pkg/errors
 # github.com/pmezard/go-difflib v1.0.0
 github.com/pmezard/go-difflib/difflib
 # github.com/sergi/go-diff v1.0.0