Merge branch 'master' of https://github.com/jesseduffield/lazygit

Precise supported ubuntu releases by ppa

.goreleaser.yml

@@ -0,0 +1,54 @@
+# This is an example goreleaser.yaml file with some sane defaults.
+# Make sure to check the documentation at http://goreleaser.com
+builds:
+- env:
+  - CGO_ENABLED=0
+  goos:
+    - freebsd
+    - windows
+    - darwin
+    - linux
+  goarch:
+    - amd64
+    - arm
+    - arm64
+archive:
+  replacements:
+    darwin: Darwin
+    linux: Linux
+    windows: Windows
+    386: i386
+    amd64: x86_64
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+    - '^docs:'
+    - '^test:'
+brew:
+  # 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 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

.travis.yml

@@ -1,39 +0,0 @@
-language: go
-sudo: false
-env:
-  - DEP_VERSION="0.5.0"
-matrix:
-  include:
-  - go: 1.x
-    env: LATEST=true
-  - go: tip
-  allow_failures:
-  - go: tip
-before_install:
-  # Download the binary to bin folder in $GOPATH
-  # - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep
-  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-  # Make the binary executable
-  - chmod +x $GOPATH/bin/dep
-  - ls $GOPATH/bin/
-  - dep ensure
-  - go get github.com/mitchellh/gox
-install:
-  -
-script:
-# - go get -v ./...
-# - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory
-# - go vet $(go list ./... | grep -v /vendor/)
-  - if [ "${LATEST}" = "true" ]; then gox -ldflags "-X main.Rev=`git rev-parse --short HEAD` -X main.builddate=`date -u +%Y%m%d.%H%M%S` -X main.Version=${TRAVIS_TAG}" -verbose ./...; fi
-deploy:
-  provider: releases
-  skip_cleanup: true
-  api_key:
-    secure: TnB8I+swjicHuGTXk3ncm1Aaa12eIJqWV/Lhcnbb01i39p6+fyn3vDMdWPcejt3R8gcJqv4wyP8UQVO9G1qkLppt6V/qAuY5x6nX0MgEa3t+8JLJnGYHZYsuIgan/ecAmeu5+6dgUhr9Oq6zQOEv/O88NsALzMlqnEQNXI8XSoScfhkiVDIp3zWov0vBizCdThnNgTx9zRpJVoqxmhWvgt+me2+fOhSx1Y+3ZA2gE7zq8IFAbxp36d0rsR5lKqmTuF+YsF9iQ7Ar+xCjbRunLsZx+VwGqGfpS/qS7EwsEqBI0vEO76eFJkwEsIzOvJiFNhBDUu3upquBFMT4uzxRxH3eV+J4mZtu29UDLdvKI5Q730Lk9AgmH4now+RmP08M0SEXJa+AnHeuBv2u1iU5bu+sI6CORVQzKQwOph9AABDjSZ54wrXIpYEeIW2sz8nx+hiG6QL1mqfM/l+55BR69u3vxKYMryQBxPuzhZCTOqqI4uahlb6GIUNZJ9vGZeIA9HFJq3ymW8cdrpYzhKf3Nx9jK+Yb81h5/AHq9iChXEC63VPCDXXGRllh2UYWNYCaAdtk+ekpLR8299e4CaEregy6g5U2S3/xrBKl87miu1uJ/fquXoxGdSU+JcmsmXZ26sGIU2TCYdNjSfIgpOyfMmB4JNtKHqWRHA9Fe42CRpA=
-  file_glob: true
-  file:
-  - lazygit_*
-  on:
-    repo: jesseduffield/lazygit
-    tags: true
-    condition: $LATEST = true

README.md

@@ -12,9 +12,6 @@ Are YOU tired of typing every git command directly into the terminal, but you're
 
 ### Via binary release
 You can download a binary release [here](https://github.com/jesseduffield/lazygit/releases)
-You may need to grant execute permission via `chmod +x ./<filename>`.
-You can move this file to your local /bin directory and rename to `lazygit` so that you can run it anywhere
-(Easier-install coming soon)
 
 ### Via Go
 In a terminal call this command:
@@ -25,7 +22,7 @@ Please note:
 If you get an error claiming that lazygit cannot be found or is not defined, you may need to add `~/go/bin` to your $PATH (MacOS/Linux), or `%HOME%\go\bin` (Windows). Not to be mistaked for `C:\Go\bin` (which is for Go's own binaries, not apps like Lazygit)
 
 ### Ubuntu
-Packages for Ubuntu 16.04 and up are available via Launchpad PPA.
+Packages for Ubuntu 16.04, 18.04 and 18.10 are available via Launchpad PPA.
 
 They are built daily, straight from master branch.
 
@@ -40,6 +37,7 @@ sudo apt-get install lazygit
 Call `lazygit` in your terminal inside a git repository.
 If you want, you can also add an alias for this with `echo "alias lg='lazygit'" >> ~/.zshrc` (or whichever rc file you're using).
 Basic tutorial [Here](https://www.youtube.com/watch?v=VDXvbHZYeKY)
+
 [Keybindings](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md)
 
 ## Cool features

files_panel.go

@@ -74,6 +74,9 @@ func handleAddPatch(g *gocui.Gui, v *gocui.View) error {
 	if !file.HasUnstagedChanges {
 		return createErrorPanel(g, "File has no unstaged changes to add")
 	}
+	if !file.Tracked {
+		return createErrorPanel(g, "Cannot git add --patch untracked files")
+	}
 	gitAddPatch(g, file.Name)
 	return err
 }

gitcommands.go

@@ -306,7 +306,7 @@ func getOpenCommand() (string, string, error) {
 }
 
 func gitAddPatch(g *gocui.Gui, filename string) {
-	runSubProcess(g, "git", "add", "-p", filename)
+	runSubProcess(g, "git", "add", "--patch", filename)
 }
 
 func editFile(g *gocui.Gui, filename string) (string, error) {

gui.go

@@ -5,7 +5,6 @@ import (
 	// "io"
 	// "io/ioutil"
 
-	"runtime"
 	"strings"
 	"time"
 
@@ -73,9 +72,6 @@ func handleRefresh(g *gocui.Gui, v *gocui.View) error {
 func layout(g *gocui.Gui) error {
 	g.Highlight = true
 	g.SelFgColor = gocui.ColorWhite | gocui.AttrBold
-	if runtime.GOOS != "windows" && runtime.GOOS != "linux" {
-		g.FgColor = gocui.ColorDefault
-	}
 	width, height := g.Size()
 	leftSideWidth := width / 3
 	statusFilesBoundary := 2
@@ -161,7 +157,7 @@ func layout(g *gocui.Gui) error {
 		v.FgColor = gocui.ColorWhite
 	}
 
-	if v, err := g.SetView("options", -1, optionsTop, width-len(Version)-2, optionsTop+2, 0); err != nil {
+	if v, err := g.SetView("options", -1, optionsTop, width-len(version)-2, optionsTop+2, 0); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -170,14 +166,14 @@ func layout(g *gocui.Gui) error {
 		v.Frame = false
 	}
 
-	if v, err := g.SetView("version", width-len(Version)-1, optionsTop, width, optionsTop+2, 0); err != nil {
+	if v, err := g.SetView("version", width-len(version)-1, optionsTop, width, optionsTop+2, 0); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
 		v.BgColor = gocui.ColorDefault
 		v.FgColor = gocui.ColorGreen
 		v.Frame = false
-		renderString(g, "version", Version)
+		renderString(g, "version", version)
 
 		// these are only called once
 		handleFileSelect(g, filesView)

main.go

@@ -20,13 +20,10 @@ var (
 	subprocess    *exec.Cmd
 	startTime     time.Time
 
-	// Rev - Git Revision
-	Rev string
+	commit  string
+	version = "unversioned"
 
-	// Version - Version number
-	Version = "unversioned"
-
-	builddate     string
+	date          string
 	debuggingFlag = flag.Bool("debug", false, "a boolean")
 	versionFlag   = flag.Bool("v", false, "Print the current version")
 )
@@ -77,7 +74,7 @@ func main() {
 	devLog("\n\n\n\n\n\n\n\n\n\n")
 	flag.Parse()
 	if *versionFlag {
-		fmt.Printf("rev=%s, build date=%s, version=%s", Rev, builddate, Version)
+		fmt.Printf("commit=%s, build date=%s, version=%s", commit, date, version)
 		os.Exit(0)
 	}
 	verifyInGitRepo()