Always render diffs to the main/secondary context pair, even for files

Previously we would render the diff for a directory to the main/secondary pair,
but a diff for a file to the staging/stagingSecondary pair. (And similar for
commit files: main/secondary for directories, but
patchBuilding/patchBuildingSecondary for files.)

I always found this confusing and couldn't really understand why we are doing
this; but now it gets in my way because I want to attach a controller to
main/secondary so that they can be focused. So change it to always use the main
context pair for everything we render from a side panel.

Author: stefanhaller

pkg/gui/controllers/commits_files_controller.go

@@ -138,7 +138,7 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []
 func (self *CommitFilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
 	return []*gocui.ViewMouseBinding{
 		{
-			ViewName:    "patchBuilding",
+			ViewName:    "main",
 			Key:         gocui.MouseLeft,
 			Handler:     self.onClickMain,
 			FocusedView: self.context().GetViewName(),
@@ -163,13 +163,8 @@ func (self *CommitFilesController) GetOnRenderToMain() func() {
 		cmdObj := self.c.Git().WorkingTree.ShowFileDiffCmdObj(from, to, reverse, node.GetPath(), false)
 		task := types.NewRunPtyTask(cmdObj.GetCmd())
 
-		pair := self.c.MainViewPairs().Normal
-		if node.File != nil {
-			pair = self.c.MainViewPairs().PatchBuilding
-		}
-
 		self.c.RenderToMainViews(types.RefreshMainOpts{
-			Pair: pair,
+			Pair: self.c.MainViewPairs().Normal,
 			Main: &types.ViewUpdateOpts{
 				Title:    self.c.Tr.Patch,
 				SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(),

pkg/gui/controllers/files_controller.go

@@ -213,12 +213,6 @@ func (self *FilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []*
 			Handler:     self.onClickMain,
 			FocusedView: self.context().GetViewName(),
 		},
-		{
-			ViewName:    "patchBuilding",
-			Key:         gocui.MouseLeft,
-			Handler:     self.onClickMain,
-			FocusedView: self.context().GetViewName(),
-		},
 		{
 			ViewName:    "mergeConflicts",
 			Key:         gocui.MouseLeft,
@@ -231,12 +225,6 @@ func (self *FilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []*
 			Handler:     self.onClickSecondary,
 			FocusedView: self.context().GetViewName(),
 		},
-		{
-			ViewName:    "patchBuildingSecondary",
-			Key:         gocui.MouseLeft,
-			Handler:     self.onClickSecondary,
-			FocusedView: self.context().GetViewName(),
-		},
 	}
 }
 
@@ -271,11 +259,6 @@ func (self *FilesController) GetOnRenderToMain() func() {
 
 			self.c.Helpers().MergeConflicts.ResetMergeState()
 
-			pair := self.c.MainViewPairs().Normal
-			if node.File != nil {
-				pair = self.c.MainViewPairs().Staging
-			}
-
 			split := self.c.UserConfig().Gui.SplitDiff == "always" || (node.GetHasUnstagedChanges() && node.GetHasStagedChanges())
 			mainShowsStaged := !split && node.GetHasStagedChanges()
 
@@ -285,7 +268,7 @@ func (self *FilesController) GetOnRenderToMain() func() {
 				title = self.c.Tr.StagedChanges
 			}
 			refreshOpts := types.RefreshMainOpts{
-				Pair: pair,
+				Pair: self.c.MainViewPairs().Normal,
 				Main: &types.ViewUpdateOpts{
 					Task:     types.NewRunPtyTask(cmdObj.GetCmd()),
 					SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(),

pkg/integration/tests/patch_building/apply.go

@@ -48,7 +48,7 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Information().Content(Contains("Building patch"))
 
-		t.Views().PatchBuildingSecondary().Content(Contains("second line"))
+		t.Views().Secondary().Content(Contains("second line"))
 
 		t.Common().SelectPatchOption(MatchesRegexp(`Apply patch$`))
 

pkg/integration/tests/patch_building/apply_in_reverse.go

@@ -35,7 +35,7 @@ var ApplyInReverse = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Information().Content(Contains("Building patch"))
 
-		t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
+		t.Views().Secondary().Content(Contains("+file1 content"))
 
 		t.Common().SelectPatchOption(Contains("Apply patch in reverse"))
 

pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go

@@ -44,13 +44,13 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 			Tap(func() {
 				t.Views().Information().Content(Contains("Building patch"))
 
-				t.Views().PatchBuildingSecondary().Content(
+				t.Views().Secondary().Content(
 					Contains("+more file1 content"))
 			}).
 			SelectNextItem().
 			PressPrimaryAction()
 
-		t.Views().PatchBuildingSecondary().Content(
+		t.Views().Secondary().Content(
 			Contains("+more file1 content").Contains("+more file2 content"))
 
 		t.Common().SelectPatchOption(Contains("Apply patch in reverse"))

pkg/integration/tests/patch_building/move_range_to_index.go

@@ -43,8 +43,8 @@ var MoveRangeToIndex = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Information().Content(Contains("Building patch"))
 
-		t.Views().PatchBuildingSecondary().Content(Contains("second line"))
-		t.Views().PatchBuildingSecondary().Content(Contains("file two content"))
+		t.Views().Secondary().Content(Contains("second line"))
+		t.Views().Secondary().Content(Contains("file two content"))
 
 		t.Common().SelectPatchOption(MatchesRegexp(`Move patch out into index$`))
 

pkg/integration/tests/patch_building/move_to_index.go

@@ -35,7 +35,7 @@ var MoveToIndex = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Information().Content(Contains("Building patch"))
 
-		t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
+		t.Views().Secondary().Content(Contains("+file1 content"))
 
 		t.Common().SelectPatchOption(Contains("Move patch out into index"))
 

pkg/integration/tests/patch_building/move_to_index_partial.go

@@ -53,7 +53,7 @@ var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{
 			Tap(func() {
 				t.Views().Information().Content(Contains("Building patch"))
 
-				t.Views().PatchBuildingSecondary().
+				t.Views().Secondary().
 					ContainsLines(
 						Contains(`-first line`),
 						Contains(`+first line2`),

pkg/integration/tests/patch_building/move_to_index_works_even_if_noprefix_is_set.go

@@ -33,7 +33,7 @@ var MoveToIndexWorksEvenIfNoprefixIsSet = NewIntegrationTest(NewIntegrationTestA
 			).
 			PressPrimaryAction()
 
-		t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
+		t.Views().Secondary().Content(Contains("+file1 content"))
 
 		t.Common().SelectPatchOption(Contains("Move patch out into index"))
 

pkg/integration/tests/patch_building/remove_from_commit.go

@@ -35,7 +35,7 @@ var RemoveFromCommit = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Information().Content(Contains("Building patch"))
 
-		t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
+		t.Views().Secondary().Content(Contains("+file1 content"))
 
 		t.Common().SelectPatchOption(Contains("Remove patch from original commit"))