From 35d695fd0cdd775f7624567598da32cb104f5386 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 12 Aug 2018 23:00:51 +1000 Subject: [PATCH 1/9] update gitignore to reflect new test repo directory structure --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f516cbbaa..dac0b46b6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ notes/go.notes TODO.notes TODO.md test/testrepo/ -test/repos/*/repo \ No newline at end of file +test/repos/repo \ No newline at end of file From 4cd2d7065993a8dfbb0f933177b128990f699e28 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 12 Aug 2018 23:14:37 +1000 Subject: [PATCH 2/9] revert to using cli git command rather than go-git for committing --- gitcommands.go | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gitcommands.go b/gitcommands.go index 14dee6dac..c65841e99 100644 --- a/gitcommands.go +++ b/gitcommands.go @@ -8,12 +8,10 @@ import ( "os" "os/exec" "strings" - "time" "github.com/jesseduffield/gocui" gitconfig "github.com/tcnksm/go-gitconfig" git "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing/object" ) var ( @@ -418,22 +416,7 @@ func gitCommit(g *gocui.Gui, message string) (string, error) { runSubProcess(g, "git", "commit") return "", nil } - userName, err := gitconfig.Username() - if userName == "" { - return "", errNoUsername - } - userEmail, err := gitconfig.Email() - _, err = w.Commit(message, &git.CommitOptions{ - Author: &object.Signature{ - Name: userName, - Email: userEmail, - When: time.Now(), - }, - }) - if err != nil { - return err.Error(), err - } - return "", nil + return runDirectCommand("git commit -m \"" + message + "\"") } func gitPull() (string, error) { From 1eb0061357e32c287f94746d0c5c18e390a291b1 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 12 Aug 2018 23:16:58 +1000 Subject: [PATCH 3/9] bump dependencies --- Gopkg.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Gopkg.lock b/Gopkg.lock index 2e64ed23e..af729a2cb 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -289,7 +289,6 @@ "github.com/tcnksm/go-gitconfig", "gopkg.in/src-d/go-git.v4", "gopkg.in/src-d/go-git.v4/plumbing", - "gopkg.in/src-d/go-git.v4/plumbing/object", ] solver-name = "gps-cdcl" solver-version = 1 From bb0e580a2717b3f5b503230e6ad2369f7a49557a Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 12 Aug 2018 23:17:25 +1000 Subject: [PATCH 4/9] bump version to v0.1.53 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c4865faa0..5974d4d2e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.1.52 \ No newline at end of file +v0.1.53 \ No newline at end of file From 360bfa4642d86113994e8161c15bbae704ba400e Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 12 Aug 2018 23:17:47 +1000 Subject: [PATCH 5/9] bump version to v0.1.54 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5974d4d2e..1ba20ca41 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.1.53 \ No newline at end of file +v0.1.54 \ No newline at end of file From 1354885db06d72607145836d77a912882ed1bcc3 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 12 Aug 2018 23:20:10 +1000 Subject: [PATCH 6/9] bump version to v0.1.55 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1ba20ca41..388e9d45b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.1.54 \ No newline at end of file +v0.1.55 \ No newline at end of file From 84b27d402de3e5bb173cc9835614df64ee4cb645 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 12 Aug 2018 23:46:38 +1000 Subject: [PATCH 7/9] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 28 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 17 ++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..1a96635a3 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,28 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. Windows] + - Lazygit Version [e.g. v0.1.45] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..066b2d920 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 1571e6b9623bffec6828319bc020ccf732a720a7 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 13 Aug 2018 12:27:26 +1000 Subject: [PATCH 8/9] add newline to version output --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index aec4051bf..28ecb9ec6 100644 --- a/main.go +++ b/main.go @@ -118,7 +118,7 @@ func main() { version = fallbackVersion() } if *versionFlag { - fmt.Printf("commit=%s, build date=%s, version=%s", commit, date, version) + fmt.Printf("commit=%s, build date=%s, version=%s\n", commit, date, version) os.Exit(0) } verifyInGitRepo() From a32fc34a4922a2ae2801298e5fbe6d2af8bac13b Mon Sep 17 00:00:00 2001 From: codingInSpace Date: Mon, 13 Aug 2018 03:48:00 -0400 Subject: [PATCH 9/9] Add C-u and C-d keybindings for scrolling up and down diff --- docs/Keybindings.md | 11 ++++++----- keybindings.go | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/Keybindings.md b/docs/Keybindings.md index 8ef749277..2b9f9d952 100644 --- a/docs/Keybindings.md +++ b/docs/Keybindings.md @@ -2,11 +2,12 @@ ## Global: 
-  ←→↑↓/hjkl:  navigate
-  PgUp/PgDn:           scroll diff panel (use fn+up/fn+down on osx)
-  q:                    quit
-  p:                    pull
-  shift+P:             push
+  ←→↑↓/hjkl:               navigate
+  PgUp/PgDn or ctrl+u/ctrl+d:   scroll diff panel 
+                                     (for PgUp and PgDn, use fn+up/fn+down on osx)
+  q:                                quit
+  p:                                pull
+  shift+P:                         push
## Files Panel: diff --git a/keybindings.go b/keybindings.go index afaa09527..e789dc8f6 100644 --- a/keybindings.go +++ b/keybindings.go @@ -16,6 +16,8 @@ func keybindings(g *gocui.Gui) error { bindings := []Binding{ {ViewName: "", Key: 'q', Modifier: gocui.ModNone, Handler: quit}, {ViewName: "", Key: gocui.KeyCtrlC, Modifier: gocui.ModNone, Handler: quit}, + {ViewName: "", Key: gocui.KeyCtrlU, Modifier: gocui.ModNone, Handler: scrollUpMain}, + {ViewName: "", Key: gocui.KeyCtrlD, Modifier: gocui.ModNone, Handler: scrollDownMain}, {ViewName: "", Key: gocui.KeyPgup, Modifier: gocui.ModNone, Handler: scrollUpMain}, {ViewName: "", Key: gocui.KeyPgdn, Modifier: gocui.ModNone, Handler: scrollDownMain}, {ViewName: "", Key: 'P', Modifier: gocui.ModNone, Handler: pushFiles},