WIP After going straight to patch building from main view, esc goes all the way back out

I *think* I like it better this way, but it needs more testing.

Author: stefanhaller

pkg/gui/controllers/helpers/patch_building_helper.go

@@ -30,7 +30,11 @@ func (self *PatchBuildingHelper) ValidateNormalWorkingTreeState() (bool, error)
 
 // takes us from the patch building panel back to the commit files panel
 func (self *PatchBuildingHelper) Escape() {
-	self.c.Context().Pop()
+	if parentCtx := self.c.Contexts().CustomPatchBuilder.GetParentContext(); parentCtx != nil {
+		self.c.Context().Push(parentCtx, types.OnFocusOpts{})
+	} else {
+		self.c.Context().Pop()
+	}
 }
 
 // kills the custom patch and returns us back to the commit files panel if needed

pkg/gui/controllers/switch_to_diff_files_controller.go

@@ -81,6 +81,7 @@ func (self *SwitchToDiffFilesController) GetOnClickFocusedMainView() func(mainVi
 		context.GetViewTrait().FocusPoint(
 			context.ModelIndexToViewIndex(idx))
 		node = context.GetSelected()
+		self.c.Contexts().CustomPatchBuilder.SetParentContext(self.context)
 		return self.c.Helpers().CommitFiles.EnterCommitFile(node, types.OnFocusOpts{ClickedWindowName: "main", ClickedViewLineIdx: line, ClickedViewRealLineIdx: line})
 	}
 }