WIP: Staging Lines #338

jesseduffield · 2018-12-02T10:27:42Z

Feels GOOD to put this PR up.

It's a WIP right now but basically works. Press enter in the files panel on a tracked file with unstaged changes, and you'll be able to use the up/down keys to cycle through unstaged lines, and left/right to cycle through hunks. Pressing space on a line will stage that line, and pressing 'a' will stage the hunk of the currently focused line.

Before I merge this I want to add some more unit tests and ensure that I've got my strings all i18n'd, and that I'm logging the right stuff where I should be. I might make another PR down the line to support reverting lines.

golangcibot · 2018-12-02T10:28:00Z

pkg/gui/files_panel.go

+	if !file.Tracked || !file.HasUnstagedChanges {
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("FileStagingRequirements"))
+	}
+	gui.switchFocus(g, v, stagingView)


Error return value of gui.switchFocus is not checked (from errcheck)

golangcibot · 2018-12-02T10:28:00Z

pkg/gui/staging_panel.go

+		return errors.New("No lines to stage")
+	}
+
+	gui.focusLineAndHunk()


Error return value of gui.focusLineAndHunk is not checked (from errcheck)

golangcibot · 2018-12-02T10:28:00Z

pkg/gui/staging_panel.go

+	if overScroll < 0 {
+		overScroll = 0
+	}
+	v.SetOrigin(0, overScroll)


Error return value of v.SetOrigin is not checked (from errcheck)

golangcibot · 2018-12-02T10:28:00Z

pkg/gui/staging_panel.go

+		overScroll = 0
+	}
+	v.SetOrigin(0, overScroll)
+	v.SetCursor(0, lineNumber-overScroll)


Error return value of v.SetCursor is not checked (from errcheck)

golangcibot · 2018-12-02T10:28:00Z

pkg/gui/staging_panel.go

+	}
+
+	// for logging purposes
+	ioutil.WriteFile("patch.diff", []byte(patch), 0600)


Error return value of ioutil.WriteFile is not checked (from errcheck)

golangcibot · 2018-12-02T10:28:00Z

pkg/gui/staging_panel.go

+		panic(err)
+	}
+
+	gui.refreshStagingPanel()


Error return value of gui.refreshStagingPanel is not checked (from errcheck)

golangcibot · 2018-12-02T10:28:00Z

pkg/gui/staging_panel.go

+	}
+
+	gui.refreshStagingPanel()
+	gui.refreshFiles(gui.g)


Error return value of gui.refreshFiles is not checked (from errcheck)

codecov-io · 2018-12-02T10:28:03Z

Codecov Report

Merging #338 into master will decrease coverage by 5.62%.
The diff coverage is 76.47%.

@@            Coverage Diff             @@
##           master     #338      +/-   ##
==========================================
- Coverage   94.43%   88.81%   -5.63%     
==========================================
  Files          13       16       +3     
  Lines        1797     2083     +286     
==========================================
+ Hits         1697     1850     +153     
- Misses         97      221     +124     
- Partials        3       12       +9

Impacted Files	Coverage Δ
pkg/i18n/english.go	`100% <100%> (ø)`	⬆️
pkg/i18n/dutch.go	`100% <100%> (ø)`	⬆️
pkg/utils/utils.go	`78.76% <100%> (+2.29%)`	⬆️
pkg/i18n/polish.go	`100% <100%> (ø)`	⬆️
pkg/commands/os.go	`76.84% <35.71%> (-7.11%)`	⬇️
pkg/git/patch_modifier.go	`58.97% <58.97%> (ø)`
pkg/commands/git.go	`92.6% <75%> (-0.78%)`	⬇️
pkg/git/patch_parser.go	`76.47% <76.47%> (ø)`
pkg/git/branch_list_builder.go	`0% <0%> (ø)`
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6006055...933874f. Read the comment docs.

jesseduffield · 2018-12-02T10:28:35Z

pkg/commands/git.go

+func (c *GitCommand) ApplyPatch(patch string) (string, error) {
+
+	content := []byte(patch)
+	tmpfile, err := ioutil.TempFile("", "patch")


I should move the write-to-temp-file code to the OS package because it's not git-specific

golangcibot · 2018-12-03T10:09:52Z

pkg/gui/staging_panel.go

+	}
+
+	gui.refreshFiles(gui.g)
+	gui.refreshStagingPanel()


Error return value of gui.refreshStagingPanel is not checked (from errcheck)

jesseduffield · 2018-12-03T11:44:27Z

The remaining negative percentage points from codecov can only really be covered with some mocking infrastructure which I don't quite have the energy to implement at the moment. I'll leave that for another PR.

golangcibot · 2018-12-04T09:03:00Z

pkg/gui/files_panel.go

+		}
+		fmt.Fprint(filesView, list)
+
+		gui.correctCursor(filesView)


Error return value of gui.correctCursor is not checked (from errcheck)

golangcibot · 2018-12-04T09:03:00Z

pkg/gui/files_panel.go

+
+		gui.correctCursor(filesView)
+		if filesView == g.CurrentView() {
+			gui.handleFileSelect(g, filesView)


Error return value of gui.handleFileSelect is not checked (from errcheck)

golangcibot · 2018-12-04T09:03:00Z

pkg/gui/gui.go

@@ -304,7 +331,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}

-		gui.handleFileSelect(g, filesView)
+		gui.g.SetCurrentView(filesView.Name())


Error return value of gui.g.SetCurrentView is not checked (from errcheck)

rafi · 2019-01-08T18:23:48Z

This change deserves a new release ;)

glvr182 · 2019-01-08T21:33:16Z

@rafi @jesseduffield is currently unavailable (afaik) so the release might be next week or later.

jesseduffield · 2019-01-14T12:17:29Z

I'm back from my holiday now :)

I'm gonna get a couple more bugfixes in, then do a release :)

golangcibot reviewed Dec 2, 2018

View reviewed changes

jesseduffield commented Dec 2, 2018

View reviewed changes

jesseduffield mentioned this pull request Dec 2, 2018

add/remove individual lines to/from staging in the diff view #337

Closed

jesseduffield force-pushed the feature/staging_lines branch from 4ca1154 to a2f336f Compare December 3, 2018 10:09

golangcibot reviewed Dec 3, 2018

View reviewed changes

jesseduffield force-pushed the feature/staging_lines branch 4 times, most recently from 5df55c9 to fe3e3ea Compare December 3, 2018 11:19

jesseduffield mentioned this pull request Dec 3, 2018

Stage lines #11

Closed

golangcibot reviewed Dec 4, 2018

View reviewed changes

jesseduffield force-pushed the feature/staging_lines branch from b679bbe to fe3e3ea Compare December 4, 2018 10:13

jesseduffield added 2 commits December 4, 2018 22:11

add patch modifier struct

99824c8

initial support for staging individual lines

658e5a9

jesseduffield force-pushed the feature/staging_lines branch from fe3e3ea to 2df6789 Compare December 4, 2018 11:12

jesseduffield added 2 commits December 5, 2018 19:33

staging lines and hunks

c0f9795

dutch and polish translations to be updated

933874f

jesseduffield force-pushed the feature/staging_lines branch from 2df6789 to 933874f Compare December 5, 2018 08:34

jesseduffield merged commit 1a6a69a into master Dec 5, 2018

jesseduffield deleted the feature/staging_lines branch July 7, 2019 11:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Staging Lines #338

WIP: Staging Lines #338

jesseduffield commented Dec 2, 2018

golangcibot Dec 2, 2018

golangcibot Dec 2, 2018

golangcibot Dec 2, 2018

golangcibot Dec 2, 2018

golangcibot Dec 2, 2018

golangcibot Dec 2, 2018

golangcibot Dec 2, 2018

codecov-io commented Dec 2, 2018 •

edited

jesseduffield Dec 2, 2018

golangcibot Dec 3, 2018

jesseduffield commented Dec 3, 2018

golangcibot Dec 4, 2018

golangcibot Dec 4, 2018

golangcibot Dec 4, 2018

rafi commented Jan 8, 2019

glvr182 commented Jan 8, 2019

jesseduffield commented Jan 14, 2019

WIP: Staging Lines #338

WIP: Staging Lines #338

Conversation

jesseduffield commented Dec 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Dec 2, 2018 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jesseduffield commented Dec 3, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rafi commented Jan 8, 2019

glvr182 commented Jan 8, 2019

jesseduffield commented Jan 14, 2019

codecov-io commented Dec 2, 2018 •

edited