Edit the selected hunk from the focused main view

The staging view can hand the hunk you are on to an editor and apply what
comes back, which is how you stage something the diff cannot express: half
of a changed line, or a change written differently from either side. The
focused main view has to be able to do the same before that view can go.

The hunk is git's own, context and all, rather than lazygit's block of
adjacent changes: an editable patch is one that still applies, and the
context lines are what let git place it. What the editor leaves behind is
applied whole rather than matched against the file's diff again, the point
being that it says something the diff didn't.

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>

README.md

@@ -135,7 +135,7 @@ Lazygit is not my fulltime job but it is a hefty part time job so if you want to
 
 ### Stage individual lines
 
-Press `<enter>` on a changed file to focus its diff in the main view. Press `<space>` on the selected line to stage it, or press `v` to start selecting a range of lines. You can also press `a` to switch to hunk selection mode. When a file has both staged and unstaged changes, use `<tab>` to move between the two diff panes; the same actions stage or unstage the selection depending on the pane.
+Press space on the selected line to stage it, or press `v` to start selecting a range of lines. You can also press `a` to select the entirety of the current hunk.
 
 ![stage_lines](../assets/demo/stage_lines-compressed.gif)
 
@@ -195,7 +195,7 @@ You can create worktrees to have multiple branches going at once without the nee
 
 You can build a custom patch from an old commit and then remove the patch from the commit, split out a new commit, apply the patch in reverse to the index, and more.
 
-In this example we have a redundant comment that we want to remove from an old commit. We hit `<enter>` on the commit to view its files, then `<enter>` on a file to focus its diff. From there, `<space>` adds the selected comment line to the custom patch and `ctrl+p` opens the custom patch options, where we choose to remove the patch from the original commit.
+In this example we have a redundant comment that we want to remove from an old commit. We hit `<enter>` on the commit to view its files, then `<enter>` on a file to focus the patch, then `<space>` to add the comment line to our custom patch, and then `ctrl+p` to view the custom patch options; selecting to remove the patch from the current commit.
 
 Learn more in the [Rebase magic Youtube tutorial](https://youtu.be/4XaToVut_hs).
 

docs-master/Config.md

@@ -72,7 +72,7 @@ gui:
   # If true, do not show a warning when amending a commit.
   skipAmendWarning: false
 
-  # If true, do not show a warning when discarding changes from a focused diff.
+  # If true, do not show a warning when discarding changes in the staging view.
   skipDiscardChangeWarning: false
 
   # If true, do not show warning when applying/popping the stash
@@ -142,13 +142,14 @@ gui:
   # - 'top': split the window vertically (side panel on top, main view below)
   enlargedSideViewLocation: left
 
-  # If true, wrap lines in focused diffs to the width of the view. This makes it
-  # much easier to work with diffs that have long lines, e.g. paragraphs of
+  # If true, wrap lines in the staging view to the width of the view. This makes
+  # it much easier to work with diffs that have long lines, e.g. paragraphs of
   # markdown text.
-  wrapLinesInDiffView: true
+  wrapLinesInStagingView: true
 
-  # If true, hunk selection mode will be enabled by default when focusing a diff.
-  useHunkModeInDiffView: true
+  # If true, hunk selection mode will be enabled by default when entering the
+  # staging view.
+  useHunkModeInStagingView: true
 
   # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko'
   # | 'ru' | 'pt'
@@ -697,7 +698,6 @@ keybinding:
       - "4"
       - "5"
     focusMainView: "0"
-    jumpToFile: <ctrl+g>
     nextMatch: "n"
     prevMatch: "N"
     startSearch: /
@@ -937,9 +937,7 @@ It is used, for example, when pasting a commit message into the commit message p
 
 ## Configuring File Editing
 
-There are two commands for opening files, `o` for "open" and `e` for "edit". `o` acts as if the file was double-clicked in the Finder/Explorer, so it also works for non-text files, whereas `e` opens the file in an editor. `e` can also jump to the right line in the file when you invoke it from a focused diff.
-
-You can also open a line in your editor with the mouse: alt-click or shift-click it. Both modifiers do the same thing, because some terminals only support one or the other. The click leaves the focus and the selection where they are, so it works while you are reading a diff from another panel, or while a popup is open.
+There are two commands for opening files, `o` for "open" and `e` for "edit". `o` acts as if the file was double-clicked in the Finder/Explorer, so it also works for non-text files, whereas `e` opens the file in an editor. `e` can also jump to the right line in the file if you invoke it from the staging panel, for example.
 
 To tell lazygit which editor to use for the `e` command, the easiest way to do that is to provide an editPreset config, e.g.
 
@@ -1002,7 +1000,7 @@ When the selected line gets close to the bottom of the window and you hit down-a
 
 That's the behavior when `gui.scrollOffBehavior` is set to "margin" (the default). If you set `gui.scrollOffBehavior` to "jump", then upon reaching the last line of a view and hitting down-arrow the view will scroll by half a page so that the selection ends up in the middle of the view. This may feel a little jarring because the cursor jumps around when continuously moving down, but it has the advantage that the view doesn't scroll as often.
 
-This setting applies both to all list views (e.g. commits and branches etc), and to focused diffs.
+This setting applies both to all list views (e.g. commits and branches etc), and to the staging view.
 
 ## Filtering
 

docs-master/dev/Codebase_Guide.md

@@ -31,6 +31,7 @@
 * `pkg/gui/keybindings`: Contains code for mapping between keybindings and their labels
 * `pkg/gui/mergeconflicts`: Contains code relating to the handling of merge conflicts
 * `pkg/gui/modes`: Contains code relating to the state of different modes e.g. cherry picking mode, rebase mode.
+* `pkg/gui/patch_exploring`: Contains code relating to the state of patch-oriented views like the staging view.
 * `pkg/gui/popup`: Contains code that lets you easily raise popups
 * `pkg/gui/presentation`: Contains presentation code i.e. code concerned with rendering content inside views
 * `pkg/gui/services/custom_commands`: Contains code related to user-defined custom commands.

docs-master/keybindings/Keybindings_en.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Prev screen mode |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Cancel |  |
 | `` ? `` | Open keybindings menu |  |
 | `` <ctrl+s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -66,7 +65,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
 | `` ` `` | Toggle file tree view | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Expand all files | Expand all directories in the file tree |
@@ -150,7 +149,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | View stash options | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Stage all | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Focus file diff / Collapse directory | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Stage lines / Collapse directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
 | `` d `` | Discard | View options for discarding changes to the selected file. |
 | `` g `` | View upstream reset options |  |
 | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
@@ -223,20 +222,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Scroll down |  |
 | `` <mouse wheel up> (fn+down) `` | Scroll up |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Toggle range select |  |
 | `` e `` | Edit file | Open file in external editor. |
 | `` <space> `` | Stage | Toggle selection staged / unstaged. |
 | `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
 | `` <left>, h `` | Go to previous hunk |  |
 | `` <right>, l `` | Go to next hunk |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Commit staged changes. |
 | `` w `` | Commit changes without pre-commit hook |  |
@@ -244,6 +241,44 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Search the current view by text |  |
 
+## Main panel (patch building)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Go to previous hunk |  |
+| `` <right>, l `` | Go to next hunk |  |
+| `` v `` | Toggle range select |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` o `` | Open file | Open file in default application. |
+| `` e `` | Edit file | Open file in external editor. |
+| `` <space> `` | Toggle lines in patch |  |
+| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
+| `` <esc> `` | Exit custom patch builder |  |
+| `` / `` | Search the current view by text |  |
+
+## Main panel (staging)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Go to previous hunk |  |
+| `` <right>, l `` | Go to next hunk |  |
+| `` v `` | Toggle range select |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` <space> `` | Stage | Toggle selection staged / unstaged. |
+| `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
+| `` o `` | Open file | Open file in default application. |
+| `` e `` | Edit file | Open file in external editor. |
+| `` <esc> `` | Return to files panel |  |
+| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
+| `` E `` | Edit hunk | Edit selected hunk in external editor. |
+| `` c `` | Commit | Commit staged changes. |
+| `` w `` | Commit changes without pre-commit hook |  |
+| `` C `` | Commit changes using git editor |  |
+| `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | Search the current view by text |  |
+
 ## Menu
 
 | Key | Action | Info |
@@ -307,20 +342,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Toggle range select |  |
 | `` e `` | Edit file | Open file in external editor. |
 | `` <space> `` | Stage | Toggle selection staged / unstaged. |
 | `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
 | `` <left>, h `` | Go to previous hunk |  |
 | `` <right>, l `` | Go to next hunk |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Commit staged changes. |
 | `` w `` | Commit changes without pre-commit hook |  |

docs-master/keybindings/Keybindings_ja.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | 前の画面モード |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | キャンセル |  |
 | `` ? `` | キーバインディングメニューを開く |  |
 | `` <ctrl+s> `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 |
@@ -115,7 +114,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 外部差分ツールを開く（git difftool） |  |
 | `` <space> `` | パッチに含めるファイルを切り替え | ファイルがカスタムパッチに含まれるかどうかを切り替えます。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 |
 | `` a `` | すべてのファイルを切り替え | コミットのすべてのファイルをカスタムパッチに追加/削除します。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | ファイルに入る / ディレクトリの折りたたみを切り替える | ファイルが選択されている場合、そのファイルに入ってカスタムパッチに個々の行を追加/削除できます。ディレクトリが選択されている場合、ディレクトリを切り替えます。 |
 | `` ` `` | ファイルツリービューを切り替え | ファイル表示をフラット表示とツリー表示で切り替えます。フラット表示はすべてのファイルパスを一覧で表示し、ツリー表示はディレクトリごとにファイルをグループ化します。<br><br>デフォルトは設定ファイル内の 'gui.showFileTree' キーで変更できます。 |
 | `` - `` | すべてのファイルを折りたたむ | ファイルツリー内のすべてのディレクトリを折りたたみます |
 | `` = `` | すべてのファイルを展開 | ファイルツリー内のすべてのディレクトリを展開します |
@@ -192,20 +191,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 |
 | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | 範囲選択を切り替え |  |
 | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
 | `` <space> `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 |
 | `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 |
 | `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
 | `` <left>, h `` | 前のハンクに移動 |  |
 | `` <right>, l `` | 次のハンクに移動 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | サイドパネルに戻る |  |
 | `` c `` | コミット | ステージされた変更をコミットします。 |
 | `` w `` | pre-commitフックなしで変更をコミット |  |
@@ -262,6 +259,44 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 0 `` | メインビューにフォーカス |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |
 
+## メインパネル（ステージング）
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 前のハンクに移動 |  |
+| `` <right>, l `` | 次のハンクに移動 |  |
+| `` v `` | 範囲選択を切り替え |  |
+| `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
+| `` <space> `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 |
+| `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 |
+| `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 |
+| `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
+| `` <esc> `` | ファイルパネルに戻る |  |
+| `` <tab> `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 |
+| `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 |
+| `` c `` | コミット | ステージされた変更をコミットします。 |
+| `` w `` | pre-commitフックなしで変更をコミット |  |
+| `` C `` | Gitエディタを使用して変更をコミット |  |
+| `` <ctrl+f> `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | 現在のビューをテキストで検索 |  |
+
+## メインパネル（パッチ作成）
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 前のハンクに移動 |  |
+| `` <right>, l `` | 次のハンクに移動 |  |
+| `` v `` | 範囲選択を切り替え |  |
+| `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
+| `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 |
+| `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
+| `` <space> `` | パッチ内の行を切り替え |  |
+| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
+| `` <esc> `` | カスタムパッチビルダーを終了 |  |
+| `` / `` | 現在のビューをテキストで検索 |  |
+
 ## メインパネル（マージ中）
 
 | Key | Action | Info |
@@ -284,20 +319,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 下にスクロール |  |
 | `` <mouse wheel up> (fn+down) `` | 上にスクロール |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 |
 | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | 範囲選択を切り替え |  |
 | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
 | `` <space> `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 |
 | `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 |
 | `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
 | `` <left>, h `` | 前のハンクに移動 |  |
 | `` <right>, l `` | 次のハンクに移動 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | サイドパネルに戻る |  |
 | `` c `` | コミット | ステージされた変更をコミットします。 |
 | `` w `` | pre-commitフックなしで変更をコミット |  |

docs-master/keybindings/Keybindings_ko.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | 이전 스크린 모드 |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | 취소 |  |
 | `` ? `` | 매뉴 열기 |  |
 | `` <ctrl+s> `` | View filter-by-path options | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -84,20 +83,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | 드래그 선택 전환 |  |
 | `` e `` | 파일 편집 | Open file in external editor. |
 | `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
 | `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
 | `` <left>, h `` | 이전 hunk를 선택 |  |
 | `` <right>, l `` | 다음 hunk를 선택 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. |
 | `` w `` | Commit changes without pre-commit hook |  |
@@ -179,20 +176,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 아래로 스크롤 |  |
 | `` <mouse wheel up> (fn+down) `` | 위로 스크롤 |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | 드래그 선택 전환 |  |
 | `` e `` | 파일 편집 | Open file in external editor. |
 | `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
 | `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
 | `` <left>, h `` | 이전 hunk를 선택 |  |
 | `` <right>, l `` | 다음 hunk를 선택 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. |
 | `` w `` | Commit changes without pre-commit hook |  |
@@ -200,6 +195,44 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 검색 시작 |  |
 
+## 메인 패널 (Patch Building)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 이전 hunk를 선택 |  |
+| `` <right>, l `` | 다음 hunk를 선택 |  |
+| `` v `` | 드래그 선택 전환 |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
+| `` o `` | 파일 닫기 | Open file in default application. |
+| `` e `` | 파일 편집 | Open file in external editor. |
+| `` <space> `` | Line(s)을 패치에 추가/삭제 |  |
+| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
+| `` <esc> `` | Exit custom patch builder |  |
+| `` / `` | 검색 시작 |  |
+
+## 메인 패널 (Staging)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 이전 hunk를 선택 |  |
+| `` <right>, l `` | 다음 hunk를 선택 |  |
+| `` v `` | 드래그 선택 전환 |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
+| `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
+| `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
+| `` o `` | 파일 닫기 | Open file in default application. |
+| `` e `` | 파일 편집 | Open file in external editor. |
+| `` <esc> `` | 파일 목록으로 돌아가기 |  |
+| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
+| `` E `` | Edit hunk | Edit selected hunk in external editor. |
+| `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. |
+| `` w `` | Commit changes without pre-commit hook |  |
+| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  |
+| `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | 검색 시작 |  |
+
 ## 브랜치
 
 | Key | Action | Info |
@@ -342,7 +375,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files included in patch | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
 | `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Expand all files | Expand all directories in the file tree |
@@ -392,7 +425,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Stash 옵션 보기 | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | 모든 변경을 Staged/unstaged으로 전환 | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
 | `` d `` | View 'discard changes' options | View options for discarding changes to the selected file. |
 | `` g `` | View upstream reset options |  |
 | `` D `` | 초기화 | View reset options for working tree (e.g. nuking the working tree). |

docs-master/keybindings/Keybindings_nl.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Vorige scherm modus |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Annuleren |  |
 | `` ? `` | Open menu |  |
 | `` <ctrl+s> `` | Bekijk scoping opties | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -73,7 +72,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Bekijk stash opties | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Toggle staged alle | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage individuele hunks/lijnen | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Stage individuele hunks/lijnen | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
 | `` d `` | Bekijk 'veranderingen ongedaan maken' opties | View options for discarding changes to the selected file. |
 | `` g `` | Bekijk upstream reset opties |  |
 | `` D `` | Resetten | View reset options for working tree (e.g. nuking the working tree). |
@@ -145,7 +144,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
 | `` <space> `` | Toggle bestand inbegrepen in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
 | `` ` `` | Toggle bestandsboom weergave | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit |
@@ -231,20 +230,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Scroll omlaag |  |
 | `` <mouse wheel up> (fn+down) `` | Scroll omhoog |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
 | `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
 | `` v `` | Toggle drag selecteer |  |
 | `` e `` | Verander bestand | Open bestand in externe editor. |
 | `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
 | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
@@ -252,6 +249,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Start met zoeken |  |
 
+## Patch bouwen
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Selecteer de vorige hunk |  |
+| `` <right>, l `` | Selecteer de volgende hunk |  |
+| `` v `` | Toggle drag selecteer |  |
+| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
+| `` e `` | Verander bestand | Open bestand in externe editor. |
+| `` <space> `` | Voeg toe/verwijder lijn(en) in patch |  |
+| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
+| `` <esc> `` | Sluit lijn-bij-lijn modus |  |
+| `` / `` | Start met zoeken |  |
+
 ## Reflog
 
 | Key | Action | Info |
@@ -307,20 +320,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
 | `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
 | `` v `` | Toggle drag selecteer |  |
 | `` e `` | Verander bestand | Open bestand in externe editor. |
 | `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
 | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
@@ -328,6 +339,28 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Start met zoeken |  |
 
+## Staging
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Selecteer de vorige hunk |  |
+| `` <right>, l `` | Selecteer de volgende hunk |  |
+| `` v `` | Toggle drag selecteer |  |
+| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
+| `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
+| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
+| `` e `` | Verander bestand | Open bestand in externe editor. |
+| `` <esc> `` | Ga terug naar het bestanden paneel |  |
+| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
+| `` E `` | Edit hunk | Edit selected hunk in external editor. |
+| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
+| `` w `` | Commit veranderingen zonder pre-commit hook |  |
+| `` C `` | Commit veranderingen met de git editor |  |
+| `` <ctrl+f> `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | Start met zoeken |  |
+
 ## Stash
 
 | Key | Action | Info |

docs-master/keybindings/Keybindings_pl.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Poprzedni tryb ekranu |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Anuluj |  |
 | `` ? `` | Otwórz menu przypisań klawiszy |  |
 | `` <ctrl+s> `` | Pokaż opcje filtrowania | Pokaż opcje filtrowania dziennika commitów, tak aby pokazywane były tylko commity pasujące do filtra. |
@@ -99,20 +98,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Przełącz zaznaczenie zakresu |  |
 | `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
 | `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
 | `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
 | `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
 | `` <left>, h `` | Idź do poprzedniego fragmentu |  |
 | `` <right>, l `` | Idź do następnego fragmentu |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
 | `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
@@ -150,6 +147,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <enter> `` | Pokaż commity |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |
 
+## Główny panel (budowanie łatki)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
+| `` <right>, l `` | Idź do następnego fragmentu |  |
+| `` v `` | Przełącz zaznaczenie zakresu |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
+| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
+| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
+| `` <space> `` | Przełącz linie w łatce |  |
+| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
+| `` <esc> `` | Wyjdź z budowniczego niestandardowej łatki |  |
+| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+
 ## Input prompt
 
 | Key | Action | Info |
@@ -202,20 +215,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Przewiń w dół |  |
 | `` <mouse wheel up> (fn+down) `` | Przewiń w górę |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Przełącz zaznaczenie zakresu |  |
 | `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
 | `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
 | `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
 | `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
 | `` <left>, h `` | Idź do poprzedniego fragmentu |  |
 | `` <right>, l `` | Idź do następnego fragmentu |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
 | `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
@@ -239,6 +250,28 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Wróć do panelu plików |  |
 
+## Panel główny (zatwierdzanie)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
+| `` <right>, l `` | Idź do następnego fragmentu |  |
+| `` v `` | Przełącz zaznaczenie zakresu |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
+| `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
+| `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
+| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
+| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
+| `` <esc> `` | Wróć do panelu plików |  |
+| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
+| `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
+| `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
+| `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
+| `` C `` | Zatwierdź zmiany używając edytora git |  |
+| `` <ctrl+f> `` | Znajdź bazowy commit do poprawki | Znajdź commit, na którym opierają się Twoje obecne zmiany, w celu poprawienia/zmiany commita. To pozwala Ci uniknąć przeglądania commitów w Twojej gałęzi jeden po drugim, aby zobaczyć, który commit powinien być poprawiony/zmieniony. Zobacz dokumentację: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+
 ## Panel potwierdzenia
 
 | Key | Action | Info |
@@ -293,7 +326,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
 | `` <space> `` | Przełącz plik włączony w łatkę | Przełącz, czy plik jest włączony w niestandardową łatkę. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Przełącz wszystkie pliki | Dodaj/usuń wszystkie pliki commita do niestandardowej łatki. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Wejdź do pliku / Przełącz zwiń katalog | Jeśli plik jest wybrany, wejdź do pliku, aby móc dodawać/usuwać poszczególne linie do niestandardowej łatki. Jeśli wybrany jest katalog, przełącz katalog. |
 | `` ` `` | Przełącz widok drzewa plików | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Expand all files | Expand all directories in the file tree |

docs-master/keybindings/Keybindings_pt.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Modo de tela anterior |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Cancelar |  |
 | `` ? `` | Abrir o menu de atalhos do teclado |  |
 | `` <ctrl+s> `` | Ver opções de filtro | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -149,7 +148,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Abrir ferramenta de diff externa (git difftool) |  |
 | `` <space> `` | Alternar entre o arquivo incluído no patch | Alternar se o arquivo está incluído no patch personalizado. Veja https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Alternar todos os arquivos | Adicionar/remover todos os arquivos de commit para atualização personalizada. Consulte https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Insira o arquivo / Alternar diretório recolhido | Se um arquivo estiver selecionado, insira o arquivo para que você possa adicionar/remover linhas individuais no patch personalizado. Se um diretório for selecionado, ative o diretório. |
 | `` ` `` | Alternar exibição de árvore de arquivo | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos |
 | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo |
@@ -235,20 +234,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Rolar para baixo |  |
 | `` <mouse wheel up> (fn+down) `` | Rolar para cima |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
 | `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
 | `` v `` | Toggle range select |  |
 | `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
 | `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
 | `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
 | `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
 | `` <left>, h `` | Ir para o local anterior |  |
 | `` <right>, l `` | Ir para o próximo trecho |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Submeter mudanças em staging |
 | `` w `` | Fazer commit de alterações sem pré-commit |  |
@@ -256,6 +253,28 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado<br>Veja a documentação:<br><https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Pesquisar na visualização atual por texto |  |
 
+## Painel Principal (preparação)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Ir para o local anterior |  |
+| `` <right>, l `` | Ir para o próximo trecho |  |
+| `` v `` | Toggle range select |  |
+| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
+| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
+| `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
+| `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
+| `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. |
+| `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
+| `` <esc> `` | Retornar ao painel de arquivos |  |
+| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
+| `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
+| `` c `` | Commit | Submeter mudanças em staging |
+| `` w `` | Fazer commit de alterações sem pré-commit |  |
+| `` C `` | Enviar alteração usando um editor Git |  |
+| `` <ctrl+f> `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado<br>Veja a documentação:<br><https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | Pesquisar na visualização atual por texto |  |
+
 ## Painel de confirmação
 
 | Key | Action | Info |
@@ -280,6 +299,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Retornar ao painel de arquivos |  |
 
+## Painel principal (patch build)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Ir para o local anterior |  |
+| `` <right>, l `` | Ir para o próximo trecho |  |
+| `` v `` | Toggle range select |  |
+| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
+| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
+| `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. |
+| `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
+| `` <space> `` | Alternar linhas no caminho |  |
+| `` d `` | Remover linhas do commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
+| `` <esc> `` | Sair do construtor de patch personalizado |  |
+| `` / `` | Pesquisar na visualização atual por texto |  |
+
 ## Reflog
 
 | Key | Action | Info |
@@ -316,20 +351,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
 | `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
 | `` v `` | Toggle range select |  |
 | `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
 | `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
 | `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
 | `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
 | `` <left>, h `` | Ir para o local anterior |  |
 | `` <right>, l `` | Ir para o próximo trecho |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Submeter mudanças em staging |
 | `` w `` | Fazer commit de alterações sem pré-commit |  |

docs-master/keybindings/Keybindings_ru.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Предыдущий режим экрана |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Отменить |  |
 | `` ? `` | Открыть меню |  |
 | `` <ctrl+s> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -74,20 +73,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Переключить выборку перетаскивания |  |
 | `` e `` | Редактировать файл | Open file in external editor. |
 | `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
 | `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
 | `` <left>, h `` | Выбрать предыдущую часть |  |
 | `` <right>, l `` | Выбрать следующую часть |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Сохранить изменения | Commit staged changes. |
 | `` w `` | Закоммитить изменения без предварительного хука коммита |  |
@@ -95,26 +92,46 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Найти |  |
 
+## Главная панель (Индексирование)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Выбрать предыдущую часть |  |
+| `` <right>, l `` | Выбрать следующую часть |  |
+| `` v `` | Переключить выборку перетаскивания |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
+| `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
+| `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
+| `` o `` | Открыть файл | Open file in default application. |
+| `` e `` | Редактировать файл | Open file in external editor. |
+| `` <esc> `` | Вернуться к панели файлов |  |
+| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
+| `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
+| `` c `` | Сохранить изменения | Commit staged changes. |
+| `` w `` | Закоммитить изменения без предварительного хука коммита |  |
+| `` C `` | Сохранить изменения с помощью редактора git |  |
+| `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | Найти |  |
+
 ## Главная панель (Обычный)
 
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Прокрутить вниз |  |
 | `` <mouse wheel up> (fn+down) `` | Прокрутить вверх |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Переключить выборку перетаскивания |  |
 | `` e `` | Редактировать файл | Open file in external editor. |
 | `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
 | `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
 | `` <left>, h `` | Выбрать предыдущую часть |  |
 | `` <right>, l `` | Выбрать следующую часть |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Сохранить изменения | Commit staged changes. |
 | `` w `` | Закоммитить изменения без предварительного хука коммита |  |
@@ -138,6 +155,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Вернуться к панели файлов |  |
 
+## Главная панель (сборка патчей)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Выбрать предыдущую часть |  |
+| `` <right>, l `` | Выбрать следующую часть |  |
+| `` v `` | Переключить выборку перетаскивания |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
+| `` o `` | Открыть файл | Open file in default application. |
+| `` e `` | Редактировать файл | Open file in external editor. |
+| `` <space> `` | Добавить/удалить строку(и) для патча |  |
+| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
+| `` <esc> `` | Выйти из сборщика пользовательских патчей |  |
+| `` / `` | Найти |  |
+
 ## Журнал ссылок (Reflog)
 
 | Key | Action | Info |
@@ -301,7 +334,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Переключить файлы включённые в патч | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Переключить все файлы, включённые в патч | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
 | `` ` `` | Переключить вид дерева файлов | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Expand all files | Expand all directories in the file tree |
@@ -386,7 +419,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Просмотреть параметры хранилища | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Все проиндексированные/непроиндексированные | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
 | `` d `` | Просмотреть параметры «отмены изменении» | View options for discarding changes to the selected file. |
 | `` g `` | Просмотреть параметры сброса upstream-ветки |  |
 | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |

docs-master/keybindings/Keybindings_zh-CN.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | 上一屏模式 |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 打开菜单 |  |
 | `` <ctrl+s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |
@@ -179,7 +178,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` <space> `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
 | `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | 如果已选择一个文件，则Enter进入该文件，以便您可以向自定义补丁添加/删除单独的行。如果选择了目录，则切换目录。 |
 | `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
 | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
 | `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
@@ -250,6 +249,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <enter> `` | 查看提交 |  |
 | `` / `` | 通过文本过滤当前视图 |  |
 
+## 构建补丁中
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 选择上一个区块 |  |
+| `` <right>, l `` | 选择下一个区块 |  |
+| `` v `` | 切换拖动选择 |  |
+| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
+| `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
+| `` o `` | 打开文件 | 使用默认程序打开该文件 |
+| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
+| `` <space> `` | 添加/移除 行到补丁 |  |
+| `` d `` | 从提交中移除行 | 从本次提交中移除所选行。此操作会在后台运行交互式变基，因此如果后续提交也修改了这些行，您可能会遇到合并冲突。 |
+| `` <esc> `` | 退出逐行模式 |  |
+| `` / `` | 开始搜索 |  |
+
 ## 标签
 
 | Key | Action | Info |
@@ -270,20 +285,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
 | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` v `` | 切换拖动选择 |  |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
 | `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
 | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
 | `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
 | `` <left>, h `` | 选择上一个区块 |  |
 | `` <right>, l `` | 选择下一个区块 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | 退出回到侧边面板 |  |
 | `` c `` | 提交变更 | 提交暂存文件 |
 | `` w `` | 提交变更而无需预先提交钩子 |  |
@@ -307,26 +320,46 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 |
 | `` <esc> `` | 返回文件面板 |  |
 
+## 正在暂存
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 选择上一个区块 |  |
+| `` <right>, l `` | 选择下一个区块 |  |
+| `` v `` | 切换拖动选择 |  |
+| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
+| `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
+| `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
+| `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
+| `` o `` | 打开文件 | 使用默认程序打开该文件 |
+| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
+| `` <esc> `` | 返回文件面板 |  |
+| `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
+| `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 |
+| `` c `` | 提交变更 | 提交暂存文件 |
+| `` w `` | 提交变更而无需预先提交钩子 |  |
+| `` C `` | 使用 Git 编辑器提交变更 |  |
+| `` <ctrl+f> `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | 开始搜索 |  |
+
 ## 正常
 
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 向下滚动 |  |
 | `` <mouse wheel up> (fn+down) `` | 向上滚动 |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
 | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` v `` | 切换拖动选择 |  |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
 | `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
 | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
 | `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
 | `` <left>, h `` | 选择上一个区块 |  |
 | `` <right>, l `` | 选择下一个区块 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | 退出回到侧边面板 |  |
 | `` c `` | 提交变更 | 提交暂存文件 |
 | `` w `` | 提交变更而无需预先提交钩子 |  |

docs-master/keybindings/Keybindings_zh-TW.md

@@ -24,7 +24,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | 上一個螢幕模式 |  |
 | `` \| `` | 切換差異渲染器 | 選擇已設定的差異渲染器清單中的下一個渲染器。 |
 | `` \ `` | 切換差異渲染器（反向） | 選擇已設定的差異渲染器清單中的上一個渲染器。 |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 開啟選單 |  |
 | `` <ctrl+s> `` | 檢視篩選路徑選項 | 檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。 |
@@ -53,26 +52,40 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` ] `` | 下一個索引標籤 |  |
 | `` [ `` | 上一個索引標籤 |  |
 
+## 主面板 (補丁生成)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 選擇上一段 |  |
+| `` <right>, l `` | 選擇下一段 |  |
+| `` v `` | 切換拖曳選擇 |  |
+| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
+| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
+| `` o `` | 開啟檔案 | 使用預設軟體開啟 |
+| `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
+| `` <space> `` | 向 (或從) 補丁中添加/刪除行 |  |
+| `` d `` | 從提交中移除行 | 從本次提交中移除所選行。此操作會在背景執行互動式變基，因此如果後續提交也修改了這些行，您可能會遇到合併衝突。 |
+| `` <esc> `` | 退出自訂補丁建立器 |  |
+| `` / `` | 搜尋 |  |
+
 ## 主面板（一般）
 
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 向下捲動 |  |
 | `` <mouse wheel up> (fn+down) `` | 向上捲動 |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
 | `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
 | `` v `` | 切換拖曳選擇 |  |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
 | `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
 | `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
 | `` <left>, h `` | 選擇上一段 |  |
 | `` <right>, l `` | 選擇下一段 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | 退出回到側邊面板 |  |
 | `` c `` | 提交變更 | 提交暫存區變更 |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |
@@ -96,6 +109,28 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 |
 | `` <esc> `` | 返回檔案面板 |  |
 
+## 主面板（預存）
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 選擇上一段 |  |
+| `` <right>, l `` | 選擇下一段 |  |
+| `` v `` | 切換拖曳選擇 |  |
+| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
+| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
+| `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
+| `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
+| `` o `` | 開啟檔案 | 使用預設軟體開啟 |
+| `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
+| `` <esc> `` | 返回檔案面板 |  |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
+| `` c `` | 提交變更 | 提交暫存區變更 |
+| `` w `` | 沒有預提交 hook 就提交更改 |  |
+| `` C `` | 使用 git 編輯器提交變更 |  |
+| `` <ctrl+f> `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：<https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | 搜尋 |  |
+
 ## 功能表
 
 | Key | Action | Info |
@@ -210,7 +245,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
 | `` <space> `` | 切換檔案是否包含在補丁中 | 切換檔案是否包含在自定義補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
 | `` a `` | 切換所有檔案是否包含在補丁中 | 新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 如果已選擇一個檔案，則Enter進入該檔案，以便您可以向自定義補丁新增/刪除單獨的行。如果選擇了目錄，則切換目錄。 |
 | `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
 | `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
 | `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
@@ -335,20 +370,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
 | `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
 | `` v `` | 切換拖曳選擇 |  |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
 | `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
 | `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
 | `` <left>, h `` | 選擇上一段 |  |
 | `` <right>, l `` | 選擇下一段 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | 退出回到側邊面板 |  |
 | `` c `` | 提交變更 | 提交暫存區變更 |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |

pkg/app/entry_point.go

@@ -152,6 +152,9 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 
 	if integrationTest != nil {
 		integrationTest.SetupConfig(appConfig)
+		// Set this to true so that integration tests don't have to explicitly deal with the hunk
+		// staging hint:
+		appConfig.GetAppState().DidShowHunkStagingHint = true
 
 		// Preserve the changes that the test setup just made to the config, so
 		// they don't get lost when we reload the config while running the test

pkg/cheatsheet/generate.go

@@ -120,7 +120,9 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 		"prompt":            tr.PromptTitle,
 		"information":       tr.InformationTitle,
 		"main":              tr.NormalTitle,
+		"patchBuilding":     tr.PatchBuildingTitle,
 		"mergeConflicts":    tr.MergingTitle,
+		"staging":           tr.StagingTitle,
 		"menu":              tr.MenuTitle,
 		"search":            tr.SearchTitle,
 		"secondary":         tr.SecondaryTitle,
@@ -139,7 +141,12 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 }
 
 func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*bindingSection {
+	excludedViews := []string{"stagingSecondary", "patchBuildingSecondary"}
 	bindingsToDisplay := lo.Filter(bindings, func(binding *types.Binding, _ int) bool {
+		if lo.Contains(excludedViews, binding.ViewName) {
+			return false
+		}
+
 		return (binding.Description != "" || binding.Alternative != "") && len(binding.Keys) > 0
 	})
 

pkg/commands/git.go

@@ -139,11 +139,6 @@ func NewGitCommandAux(
 			// A patch is built from git's own diff: what a diff renderer would make of it
 			// is a picture of it, not something that can be applied.
 			return workingTreeCommands.ShowFileDiff(from, to, reverse, filename, previousPath, git_commands.DiffModePlain)
-		},
-		func() (string, error) {
-			// Under lazygit's own temp dir, so that it honours the configured location
-			// and is cleaned up with everything else when we exit.
-			return os.MkdirTemp(osCommand.GetTempDir(), "custom-patch-")
 		})
 	patchCommands := git_commands.NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
 	bisectCommands := git_commands.NewBisectCommands(gitCommon)

pkg/commands/git_commands/diff.go

@@ -156,28 +156,6 @@ func (self *DiffCommands) DiffCmdObj(diffArgs []string, mode DiffMode) *oscomman
 	)
 }
 
-// CustomPatchDiffCmdObj is the command that renders the custom patch being built: a diff
-// of the two trees the patch was materialized into (PatchCommands.WriteCustomPatchDiffTrees),
-// under the directory holding them. It goes through the same wiring as any other diff we
-// show, so the patch is rendered by whatever renders the rest of them, and git works out
-// how much context to give it.
-//
-// git's own path prefixes are suppressed because the trees are named a and b themselves,
-// which leaves the paths reading like an ordinary diff's over the repo's own paths.
-func (self *DiffCommands) CustomPatchDiffCmdObj(dir string, mode DiffMode) *oscommands.CmdObj {
-	return self.cmd.New(
-		NewGitCmd("diff").
-			AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), mode).
-			NoLineEndingConversion().
-			Arg("--no-index").
-			Arg("--no-prefix").
-			Arg(fmt.Sprintf("--color=%s", mode.colorArg(self.diffRendererConfigManager))).
-			Arg("a", "b").
-			Dir(dir).
-			ToArgv(),
-	)
-}
-
 // This is a basic generic diff command that can be used for any diff operation
 // (e.g. copying a diff to the clipboard). It will not use a custom diff renderer,
 // and does not use user configs such as ignore whitespace.

pkg/commands/git_commands/git_command_builder.go

@@ -123,27 +123,6 @@ func (self *GitCommandBuilder) GitDirIf(condition bool, path string) *GitCommand
 	return self
 }
 
-// NoLineEndingConversion keeps git's line-ending machinery away from files that are not
-// a working tree's. The trees the custom patch is materialized into hold the bytes git
-// states the patch in, so a command over them has to read and write those bytes as they
-// are. On a machine that checks files out with CRLF, `git apply` writes the after tree
-// in that form while the before tree keeps the LF it was written with. git's own diff
-// converts both back, but it warns about a round trip through a working tree these
-// files never belong to, and an external diff renderer is handed the two files as they
-// stand, one line ending apart in every line.
-func (self *GitCommandBuilder) NoLineEndingConversion() *GitCommandBuilder {
-	return self.
-		// The setting that converts on most machines, and the one Git for Windows
-		// installs itself with.
-		Config("core.autocrlf=false").
-		// An attributes file outside the repo can still mark the files as text. The
-		// form to keep them in is then the form they are written in.
-		Config("core.eol=lf").
-		// An attribute naming CRLF outright overrides that, and git converts after all.
-		// The warning it gives is about a checkout these files never have.
-		Config("core.safecrlf=false")
-}
-
 func (self *GitCommandBuilder) AddCommonDiffArgs(diffRendererConfigManager *config.DiffRendererConfigManager, userConfig *config.UserConfig, mode DiffMode) *GitCommandBuilder {
 	contextSize := userConfig.Git.DiffContextSize
 	useExtDiff := mode == DiffModeRendered && diffRendererConfigManager.GetDiffRendererType() == config.DiffRendererType_ExtDiff

pkg/commands/git_commands/patch.go

@@ -2,16 +2,13 @@ package git_commands
 
 import (
 	"fmt"
-	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/app/daemon"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
-	"github.com/samber/lo"
 	"github.com/stefanhaller/git-todo-parser/todo"
 )
 
@@ -23,10 +20,6 @@ type PatchCommands struct {
 	stash  *StashCommands
 
 	PatchBuilder *patch.PatchBuilder
-
-	// The version of the patch the diff trees were last written for, so that they are
-	// written again when, and only when, the patch has changed since.
-	treesWrittenForGeneration int
 }
 
 func NewPatchCommands(
@@ -47,88 +40,6 @@ func NewPatchCommands(
 	}
 }
 
-// EnsureCustomPatchDiffTrees writes the custom patch's diff trees if what is there no
-// longer describes the patch. Call it before rendering the patch, which is often — every
-// time the panel showing it re-renders — while the patch itself changes rarely.
-func (self *PatchCommands) EnsureCustomPatchDiffTrees() error {
-	if self.PatchBuilder.Generation() == self.treesWrittenForGeneration {
-		return nil
-	}
-	if err := self.WriteCustomPatchDiffTrees(); err != nil {
-		return err
-	}
-	self.treesWrittenForGeneration = self.PatchBuilder.Generation()
-	return nil
-}
-
-// WriteCustomPatchDiffTrees materializes the custom patch as two file trees under the
-// directory the patch builder keeps for it: `a` holds each of the patch's files as it is
-// before the patch, `b` as it is after. Diffing those two trees against each other
-// (DiffCommands.CustomPatchDiffCmdObj) turns the patch into a diff of real files, which
-// can then be rendered exactly as any other diff is — through a diff renderer of any
-// kind, and with git's own idea of how much context to show.
-//
-// The trees are named a and b so that the diff's paths, with git's own prefixes
-// suppressed, come out reading like the a/ and b/ of an ordinary diff, over the real
-// repo-relative paths.
-func (self *PatchCommands) WriteCustomPatchDiffTrees() error {
-	dir := self.PatchBuilder.TempDir()
-	if dir == "" {
-		return nil
-	}
-
-	before := filepath.Join(dir, "a")
-	after := filepath.Join(dir, "b")
-	for _, tree := range []string{before, after} {
-		if err := os.RemoveAll(tree); err != nil {
-			return err
-		}
-		if err := os.MkdirAll(tree, 0o700); err != nil {
-			return err
-		}
-	}
-
-	for _, file := range self.PatchBuilder.FilesInPatch() {
-		content, err := self.commit.ShowFileContentCmdObj(self.PatchBuilder.From, file.ContentPath).RunWithOutput()
-		// A file the patch adds has no content on the before side, so git has nothing to
-		// show for it.
-		added := err != nil
-
-		// The before side holds an added file as an empty file rather than not at all, so
-		// that the diff pairs the two sides up and states the file's real path, instead of
-		// reporting a file that only one of the trees has.
-		if err := self.os.CreateFileWithContent(filepath.Join(before, file.Path),
-			lo.Ternary(added, "", content)); err != nil {
-			return err
-		}
-		// The after side is seeded with the same content, for the patch to change; a file
-		// the patch adds is left absent, for the patch to create.
-		if !added {
-			if err := self.os.CreateFileWithContent(filepath.Join(after, file.Path), content); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Write added files as creations rather than as diffs against an empty file: the
-	// patch is applied in one go, so a file it expects to be there already would make
-	// the whole of it fail.
-	patchText := self.PatchBuilder.PatchToApply(false, false)
-	if strings.TrimSpace(patchText) == "" {
-		// Nothing in the patch, so the two trees are alike and the diff is empty.
-		return nil
-	}
-	patchFilePath, err := self.SaveTemporaryPatch(patchText)
-	if err != nil {
-		return err
-	}
-	return self.cmd.New(NewGitCmd("apply").
-		NoLineEndingConversion().
-		Arg(patchFilePath).
-		Dir(after).
-		ToArgv()).Run()
-}
-
 type ApplyPatchOpts struct {
 	ThreeWay bool
 	Cached   bool

pkg/commands/patch/patch.go

@@ -265,3 +265,17 @@ func (self *Patch) AdjustLineNumber(lineNumber int) int {
 
 	return adjustedLineNumber
 }
+
+func (self *Patch) IsSingleHunkForWholeFile() bool {
+	if len(self.hunks) != 1 {
+		return false
+	}
+
+	// We consider a patch to be a single hunk for the whole file if it has only additions or
+	// deletions but not both, and no context lines. This not quite correct, because it will also
+	// return true for a block of added or deleted lines if the diff context size is 0, but in this
+	// case you wouldn't be able to stage things anyway, so it doesn't matter.
+	bodyLines := self.hunks[0].bodyLines
+	return nLinesWithKind(bodyLines, []PatchLineKind{DELETION, CONTEXT}) == 0 ||
+		nLinesWithKind(bodyLines, []PatchLineKind{ADDITION, CONTEXT}) == 0
+}

pkg/commands/patch/patch_builder.go

@@ -1,12 +1,10 @@
 package patch
 
 import (
-	"os"
 	"sort"
 	"strings"
 
 	"github.com/jesseduffield/generics/maps"
-	"github.com/jesseduffield/generics/set"
 	"github.com/samber/lo"
 	"github.com/sasha-s/go-deadlock"
 	"github.com/sirupsen/logrus"
@@ -62,27 +60,12 @@ type PatchBuilder struct {
 
 	// loadFileDiff loads the diff of a file, for a given to (typically a commit hash)
 	loadFileDiff loadFileDiffFunc
-
-	// newTempDir makes a directory for the current patch to be materialized into, as
-	// two file trees that can be diffed against each other and so rendered like any
-	// other diff (see PatchCommands.WriteCustomPatchDiffTrees). Its lifetime is the
-	// patch's: made when one is started, removed when it is given up.
-	newTempDir func() (string, error)
-	tempDir    string
-
-	// generation counts the changes made to the patch, so that whoever materializes it
-	// can tell whether what they last built still describes it — and rebuild only then,
-	// rather than on every render of it.
-	generation int
 }
 
-func NewPatchBuilder(
-	log *logrus.Entry, loadFileDiff loadFileDiffFunc, newTempDir func() (string, error),
-) *PatchBuilder {
+func NewPatchBuilder(log *logrus.Entry, loadFileDiff loadFileDiffFunc) *PatchBuilder {
 	return &PatchBuilder{
 		Log:          log,
 		loadFileDiff: loadFileDiff,
-		newTempDir:   newTempDir,
 	}
 }
 
@@ -90,9 +73,6 @@ func (p *PatchBuilder) Start(from, to string, reverse bool, canRebase bool) {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
-	p.generation++
-	p.makeTempDir()
-
 	p.To = to
 	p.From = from
 	p.reverse = reverse
@@ -111,89 +91,6 @@ func (p *PatchBuilder) snapshotFileInfoMap() map[string]*fileInfo {
 	return p.fileInfoMap
 }
 
-// TempDir is the directory the patch is materialized into for rendering, and "" when
-// there is none — no patch, or a directory we failed to make.
-func (p *PatchBuilder) TempDir() string {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
-	return p.tempDir
-}
-
-// Generation says which version of the patch this is; see the field.
-func (p *PatchBuilder) Generation() int {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
-	return p.generation
-}
-
-// makeTempDir replaces the directory the patch is materialized into with a fresh one.
-// Only call this with the lock held.
-func (p *PatchBuilder) makeTempDir() {
-	p.removeTempDir()
-	if p.newTempDir == nil {
-		return
-	}
-	dir, err := p.newTempDir()
-	if err != nil {
-		p.Log.Error(err)
-		return
-	}
-	p.tempDir = dir
-}
-
-// removeTempDir takes the patch's materialized form away with the patch. Only call this
-// with the lock held.
-func (p *PatchBuilder) removeTempDir() {
-	if p.tempDir == "" {
-		return
-	}
-	if err := os.RemoveAll(p.tempDir); err != nil {
-		p.Log.Error(err)
-	}
-	p.tempDir = ""
-}
-
-// PatchFile records what materializing the patch needs to know about one of its files:
-// where the patch expects to find it, and where its content before the patch comes from.
-type PatchFile struct {
-	// Path is the name the patch knows the file by: for a renamed file, the name it had
-	// before where the patch carries the rename, and the name it was renamed to where the
-	// patch keeps only a content change and leaves the rename behind.
-	Path string
-	// ContentPath is where the file's content before the patch is to be found in the
-	// commit the patch is built from — for a renamed file always the name it had there,
-	// whatever the patch calls it.
-	ContentPath string
-}
-
-// FilesInPatch says which files the patch touches, in a stable order, and where each of
-// them comes from.
-func (p *PatchBuilder) FilesInPatch() []PatchFile {
-	fileInfoMap := p.snapshotFileInfoMap()
-
-	filenames := maps.Keys(fileInfoMap)
-	sort.Strings(filenames)
-
-	files := make([]PatchFile, 0, len(filenames))
-	for _, filename := range filenames {
-		info := fileInfoMap[filename]
-		if info.mode == UNSELECTED {
-			continue
-		}
-		file := PatchFile{Path: filename, ContentPath: filename}
-		if info.previousPath != "" {
-			file.ContentPath = info.previousPath
-			if info.mode == WHOLE {
-				file.Path = info.previousPath
-			}
-		}
-		files = append(files, file)
-	}
-	return files
-}
-
 func (p *PatchBuilder) PatchToApply(reverse bool, turnAddedFilesIntoDiffAgainstEmptyFile bool) string {
 	var patch strings.Builder
 
@@ -238,7 +135,6 @@ func (p *PatchBuilder) AddFileWhole(filename string, previousPath string) error
 		return err
 	}
 
-	p.generation++
 	p.addFileWhole(info)
 
 	return nil
@@ -250,7 +146,6 @@ func (p *PatchBuilder) RemoveFile(filename string, previousPath string) error {
 		return err
 	}
 
-	p.generation++
 	p.removeFile(info)
 
 	return nil
@@ -287,7 +182,6 @@ func (p *PatchBuilder) AddFileLineRange(filename string, previousPath string, li
 	if err != nil {
 		return err
 	}
-	p.generation++
 	info.mode = PART
 	info.includedLineIndices = lo.Union(info.includedLineIndices, lineIndices)
 
@@ -299,7 +193,6 @@ func (p *PatchBuilder) RemoveFileLineRange(filename string, previousPath string,
 	if err != nil {
 		return err
 	}
-	p.generation++
 	info.mode = PART
 	info.includedLineIndices, _ = lo.Difference(info.includedLineIndices, lineIndices)
 	if len(info.includedLineIndices) == 0 {
@@ -398,110 +291,6 @@ func (p *PatchBuilder) GetFileStatus(filename string, parent string) PatchStatus
 	return info.mode
 }
 
-// LineIdentity says which change line of a file is meant — the line number it has on
-// the side it belongs to, and whether it is a deletion — without reference to where
-// that line sits in the file's parsed diff.
-//
-// It is how a diff shown in the main view speaks about its lines: what a rendered row
-// resolves to is a line of a file, while the index of that line in the diff depends on
-// how much of the diff is being shown and in what order a renderer laid it out.
-type LineIdentity struct {
-	LineNumber int
-	IsDeletion bool
-}
-
-// ChangeLineIndexByIdentity indexes a parsed diff's change lines by their identity. An
-// addition is numbered in the new file and a deletion in the old one. Two consecutive
-// deletions share the one new-file position between them, and numbering them in the
-// old file keeps them apart.
-func ChangeLineIndexByIdentity(parsed *Patch) map[LineIdentity]int {
-	byIdentity := map[LineIdentity]int{}
-	for idx, line := range parsed.Lines() {
-		switch {
-		case line.IsAddition():
-			byIdentity[LineIdentity{parsed.LineNumberOfLine(idx), false}] = idx
-		case line.IsDeletion():
-			byIdentity[LineIdentity{parsed.OldLineNumberOfLine(idx), true}] = idx
-		}
-	}
-	return byIdentity
-}
-
-// ChangeLineIndicesForLines maps the given change lines of a parsed diff to their
-// indices in it. A line that names no change line of the diff — a context line, or a
-// line that isn't in the diff at all — contributes nothing.
-func ChangeLineIndicesForLines(parsed *Patch, lines []LineIdentity) []int {
-	byIdentity := ChangeLineIndexByIdentity(parsed)
-	indices := make([]int, 0, len(lines))
-	for _, line := range lines {
-		if idx, ok := byIdentity[line]; ok {
-			indices = append(indices, idx)
-		}
-	}
-	return indices
-}
-
-// PatchLineIndicesForLines maps change lines of filename to their indices in that
-// file's diff; the patch is built in terms of those indices. everyChange reports
-// whether the given lines cover all of the file's changes; this distinguishes acting
-// on some of a file's lines from acting on the file itself.
-func (p *PatchBuilder) PatchLineIndicesForLines(
-	filename string, previousPath string, lines []LineIdentity,
-) (indices []int, everyChange bool, err error) {
-	info, err := p.getFileInfo(filename, previousPath)
-	if err != nil {
-		return nil, false, err
-	}
-
-	parsed := Parse(info.diff)
-	selected := set.NewFromSlice(lines)
-	everyChange = lo.EveryBy(maps.Keys(ChangeLineIndexByIdentity(parsed)),
-		func(identity LineIdentity) bool { return selected.Includes(identity) })
-	return ChangeLineIndicesForLines(parsed, lines), everyChange, nil
-}
-
-// IncludedLineIdentities says which change lines of filename are in the patch, as the
-// identities a diff of that file shown anywhere can be compared against. Empty for a
-// file that is no part of the patch.
-func (p *PatchBuilder) IncludedLineIdentities(filename string) []LineIdentity {
-	info, ok := p.snapshotFileInfoMap()[filename]
-	if !ok || info.mode == UNSELECTED {
-		return nil
-	}
-
-	included := set.NewFromSlice(info.includedLineIndices)
-	identities := []LineIdentity{}
-	for identity, idx := range ChangeLineIndexByIdentity(Parse(info.diff)) {
-		if included.Includes(idx) {
-			identities = append(identities, identity)
-		}
-	}
-	return identities
-}
-
-// IncludedChangeLineIndices says which of filename's change lines are in the patch, as
-// their indices in the file's diff and in the order the file has them.
-//
-// It is how a line of the patch as it is shown names the line of the diff it came from:
-// all that can be said about a line of the patch is which of the file's changes it is,
-// its line numbers being the patch's own — a patch that leaves an earlier addition out
-// numbers everything after it differently from the diff it was built from.
-func (p *PatchBuilder) IncludedChangeLineIndices(filename string) []int {
-	info, ok := p.snapshotFileInfoMap()[filename]
-	if !ok || info.mode == UNSELECTED {
-		return nil
-	}
-
-	included := set.NewFromSlice(info.includedLineIndices)
-	indices := []int{}
-	for idx, line := range Parse(info.diff).Lines() {
-		if (line.IsAddition() || line.IsDeletion()) && included.Includes(idx) {
-			indices = append(indices, idx)
-		}
-	}
-	return indices
-}
-
 func (p *PatchBuilder) GetFileIncLineIndices(filename string, previousPath string) ([]int, error) {
 	info, err := p.getFileInfo(filename, previousPath)
 	if err != nil {
@@ -515,9 +304,6 @@ func (p *PatchBuilder) Reset() {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
-	p.generation++
-	p.removeTempDir()
-
 	p.To = ""
 	p.fileInfoMap = map[string]*fileInfo{}
 }

pkg/commands/patch/patch_builder_test.go

@@ -1,140 +0,0 @@
-package patch
-
-import (
-	"testing"
-
-	"github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-// newTestPatchBuilder returns a patch builder started for a dummy commit, in which
-// every file's diff is the given one.
-func newTestPatchBuilder(diff string) *PatchBuilder {
-	patchBuilder := NewPatchBuilder(logrus.New().WithField("test", "test"),
-		func(from string, to string, reverse bool, filename string, previousPath string) (string, error) {
-			return diff, nil
-		},
-		// Nothing here renders the patch, so it needs no directory to be
-		// materialized into.
-		nil)
-	patchBuilder.Start("from", "to", false, true)
-	return patchBuilder
-}
-
-// In simpleDiff the deletion "-orange" is line index 6 of the parsed diff (line 2 of
-// the old file) and the addition "+grape" is index 7 (line 2 of the new file).
-func TestPatchLineIndicesForLines(t *testing.T) {
-	patchBuilder := newTestPatchBuilder(simpleDiff)
-
-	indices, everyChange, err := patchBuilder.PatchLineIndicesForLines("filename", "", []LineIdentity{
-		{LineNumber: 2, IsDeletion: true},  // -orange
-		{LineNumber: 2, IsDeletion: false}, // +grape
-		{LineNumber: 1, IsDeletion: false}, // " apple", a context line
-	})
-	assert.NoError(t, err)
-	assert.Equal(t, []int{6, 7}, indices, "the context line names no change line")
-	assert.True(t, everyChange, "the two changes are all the diff has")
-}
-
-// A renamed file's rename header makes its change lines sit further down the diff, and
-// its old-file line numbers are of the file under its previous name.
-func TestPatchLineIndicesForLinesOfARenamedFile(t *testing.T) {
-	patchBuilder := newTestPatchBuilder(renameWithModificationDiff)
-
-	indices, everyChange, err := patchBuilder.PatchLineIndicesForLines("newname", "oldname", []LineIdentity{
-		{LineNumber: 2, IsDeletion: true},  // -orange
-		{LineNumber: 2, IsDeletion: false}, // +grape
-	})
-	assert.NoError(t, err)
-	assert.Equal(t, []int{9, 10}, indices)
-	assert.True(t, everyChange)
-}
-
-// everyChange is about the diff alone: whether anything the file changes was left out
-// of the selection. What that then means for the patch is the caller's question.
-func TestPatchLineIndicesForLinesEveryChange(t *testing.T) {
-	patchBuilder := newTestPatchBuilder(newFile)
-
-	_, everyChange, err := patchBuilder.PatchLineIndicesForLines("newfile", "", []LineIdentity{
-		{LineNumber: 1},
-		{LineNumber: 2},
-	})
-	assert.NoError(t, err)
-	assert.False(t, everyChange, "the file's third added line is left out")
-
-	_, everyChange, err = patchBuilder.PatchLineIndicesForLines("newfile", "", []LineIdentity{
-		{LineNumber: 1},
-		{LineNumber: 2},
-		{LineNumber: 3},
-	})
-	assert.NoError(t, err)
-	assert.True(t, everyChange)
-
-	// A line the diff doesn't have doesn't stand in for one it does.
-	patchBuilder = newTestPatchBuilder(deletedFile)
-	_, everyChange, err = patchBuilder.PatchLineIndicesForLines("newfile", "", []LineIdentity{
-		{LineNumber: 1, IsDeletion: true},
-		{LineNumber: 2, IsDeletion: true},
-		{LineNumber: 4, IsDeletion: true},
-	})
-	assert.NoError(t, err)
-	assert.False(t, everyChange)
-}
-
-func TestIncludedLineIdentities(t *testing.T) {
-	patchBuilder := newTestPatchBuilder(simpleDiff)
-
-	// A file no part of the patch has nothing included.
-	assert.Empty(t, patchBuilder.IncludedLineIdentities("filename"))
-
-	// With only the deletion in, only its identity comes back.
-	assert.NoError(t, patchBuilder.AddFileLineRange("filename", "", []int{6}))
-	assert.Equal(t,
-		[]LineIdentity{{LineNumber: 2, IsDeletion: true}},
-		patchBuilder.IncludedLineIdentities("filename"))
-
-	// With the addition in as well, both do.
-	assert.NoError(t, patchBuilder.AddFileLineRange("filename", "", []int{7}))
-	assert.ElementsMatch(t,
-		[]LineIdentity{{LineNumber: 2, IsDeletion: true}, {LineNumber: 2, IsDeletion: false}},
-		patchBuilder.IncludedLineIdentities("filename"))
-}
-
-func TestFilesInPatch(t *testing.T) {
-	patchBuilder := newTestPatchBuilder(simpleDiff)
-
-	// A file no part of the patch is no part of what the patch is materialized from.
-	assert.Empty(t, patchBuilder.FilesInPatch())
-
-	assert.NoError(t, patchBuilder.AddFileLineRange("filename", "", []int{6}))
-	assert.Equal(t,
-		[]PatchFile{{Path: "filename", ContentPath: "filename"}},
-		patchBuilder.FilesInPatch())
-}
-
-// A renamed file's content is under the name it had before whatever the patch calls the
-// file, and the patch calls it by the name it had before only where it carries the
-// rename — a partial selection has the rename stripped and names the file by the new one.
-func TestFilesInPatchOfARenamedFile(t *testing.T) {
-	patchBuilder := newTestPatchBuilder(renameWithModificationDiff)
-
-	assert.NoError(t, patchBuilder.AddFileLineRange("newname", "oldname", []int{9}))
-	assert.Equal(t,
-		[]PatchFile{{Path: "newname", ContentPath: "oldname"}},
-		patchBuilder.FilesInPatch())
-
-	assert.NoError(t, patchBuilder.AddFileWhole("newname", "oldname"))
-	assert.Equal(t,
-		[]PatchFile{{Path: "oldname", ContentPath: "oldname"}},
-		patchBuilder.FilesInPatch())
-}
-
-// A file taken into the patch whole has every one of its change lines in it.
-func TestIncludedLineIdentitiesOfAWholeFile(t *testing.T) {
-	patchBuilder := newTestPatchBuilder(simpleDiff)
-
-	assert.NoError(t, patchBuilder.AddFileWhole("filename", ""))
-	assert.ElementsMatch(t,
-		[]LineIdentity{{LineNumber: 2, IsDeletion: true}, {LineNumber: 2, IsDeletion: false}},
-		patchBuilder.IncludedLineIdentities("filename"))
-}

pkg/commands/patch/patch_test.go

@@ -921,3 +921,64 @@ func TestAdjustLineNumber(t *testing.T) {
 		})
 	}
 }
+
+func TestIsSingleHunkForWholeFile(t *testing.T) {
+	scenarios := []struct {
+		testName       string
+		patchStr       string
+		expectedResult bool
+	}{
+		{
+			testName:       "simpleDiff",
+			patchStr:       simpleDiff,
+			expectedResult: false,
+		},
+		{
+			testName:       "addNewlineToEndOfFile",
+			patchStr:       addNewlineToEndOfFile,
+			expectedResult: false,
+		},
+		{
+			testName:       "removeNewlinefromEndOfFile",
+			patchStr:       removeNewlinefromEndOfFile,
+			expectedResult: false,
+		},
+		{
+			testName:       "twoHunks",
+			patchStr:       twoHunks,
+			expectedResult: false,
+		},
+		{
+			testName:       "twoChangesInOneHunk",
+			patchStr:       twoChangesInOneHunk,
+			expectedResult: false,
+		},
+		{
+			testName:       "newFile",
+			patchStr:       newFile,
+			expectedResult: true,
+		},
+		{
+			testName:       "deletedFile",
+			patchStr:       deletedFile,
+			expectedResult: true,
+		},
+		{
+			testName:       "addNewlineToPreviouslyEmptyFile",
+			patchStr:       addNewlineToPreviouslyEmptyFile,
+			expectedResult: true,
+		},
+		{
+			testName:       "exampleHunk",
+			patchStr:       exampleHunk,
+			expectedResult: false,
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			patch := Parse(s.patchStr)
+			assert.Equal(t, s.expectedResult, patch.IsSingleHunkForWholeFile())
+		})
+	}
+}

pkg/config/app_config.go

@@ -297,8 +297,6 @@ func computeMigratedConfig(path string, content []byte, changes *ChangesSet) ([]
 		{[]string{"keybinding", "universal", "cyclePagers"}, "cycleDiffRenderers"},
 		{[]string{"keybinding", "universal", "cyclePagersReverse"}, "cycleDiffRenderersReverse"},
 		{[]string{"gui", "windowSize"}, "screenMode"},
-		{[]string{"gui", "wrapLinesInStagingView"}, "wrapLinesInDiffView"},
-		{[]string{"gui", "useHunkModeInStagingView"}, "useHunkModeInDiffView"},
 		{[]string{"keybinding", "files", "openMergeTool"}, "openMergeOptions"},
 	}
 
@@ -900,10 +898,11 @@ func (c *AppConfig) SaveGlobalUserConfig() {
 // AppState stores data between runs of the app like when the last update check
 // was performed and which other repos have been checked out
 type AppState struct {
-	LastUpdateCheck     int64
-	RecentRepos         []string
-	StartupPopupVersion int
-	LastVersion         string // this is the last version the user was using, for the purpose of showing release notes
+	LastUpdateCheck        int64
+	RecentRepos            []string
+	StartupPopupVersion    int
+	DidShowHunkStagingHint bool
+	LastVersion            string // this is the last version the user was using, for the purpose of showing release notes
 
 	// these are for shell commands typed in directly, not for custom commands in the lazygit config.
 	// For backwards compatibility we keep the old name in yaml files.

pkg/config/app_config_test.go

@@ -108,22 +108,6 @@ func TestMigrationOfRenamedKeys(t *testing.T) {
 				"Renamed 'gui.windowSize' to 'screenMode'",
 			},
 		},
-		{
-			name: "Rename staging view options",
-			input: `gui:
-  wrapLinesInStagingView: false
-  useHunkModeInStagingView: true
-`,
-			expected: `gui:
-  wrapLinesInDiffView: false
-  useHunkModeInDiffView: true
-`,
-			expectedDidChange: true,
-			expectedChanges: []string{
-				"Renamed 'gui.wrapLinesInStagingView' to 'wrapLinesInDiffView'",
-				"Renamed 'gui.useHunkModeInStagingView' to 'useHunkModeInDiffView'",
-			},
-		},
 	}
 
 	for _, s := range scenarios {

pkg/config/user_config.go

@@ -87,7 +87,7 @@ type GuiConfig struct {
 	MouseEvents bool `yaml:"mouseEvents"`
 	// If true, do not show a warning when amending a commit.
 	SkipAmendWarning bool `yaml:"skipAmendWarning"`
-	// If true, do not show a warning when discarding changes from a focused diff.
+	// If true, do not show a warning when discarding changes in the staging view.
 	SkipDiscardChangeWarning bool `yaml:"skipDiscardChangeWarning"`
 	// If true, do not show warning when applying/popping the stash
 	SkipStashWarning bool `yaml:"skipStashWarning"`
@@ -122,10 +122,10 @@ type GuiConfig struct {
 	// - 'left': split the window horizontally (side panel on the left, main view on the right)
 	// - 'top': split the window vertically (side panel on top, main view below)
 	EnlargedSideViewLocation string `yaml:"enlargedSideViewLocation"`
-	// If true, wrap lines in focused diffs to the width of the view. This makes it much easier to work with diffs that have long lines, e.g. paragraphs of markdown text.
-	WrapLinesInDiffView bool `yaml:"wrapLinesInDiffView"`
-	// If true, hunk selection mode will be enabled by default when focusing a diff.
-	UseHunkModeInDiffView bool `yaml:"useHunkModeInDiffView"`
+	// If true, wrap lines in the staging view to the width of the view. This makes it much easier to work with diffs that have long lines, e.g. paragraphs of markdown text.
+	WrapLinesInStagingView bool `yaml:"wrapLinesInStagingView"`
+	// If true, hunk selection mode will be enabled by default when entering the staging view.
+	UseHunkModeInStagingView bool `yaml:"useHunkModeInStagingView"`
 	// One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru' | 'pt'
 	Language string `yaml:"language" jsonschema:"enum=auto,enum=en,enum=zh-TW,enum=zh-CN,enum=pl,enum=nl,enum=ja,enum=ko,enum=ru"`
 	// Format used when displaying time e.g. commit time.
@@ -511,7 +511,6 @@ type KeybindingUniversalConfig struct {
 	PrevBlockAlt2     Keybinding   `yaml:"prevBlock-alt2"`
 	JumpToBlock       []Keybinding `yaml:"jumpToBlock"`
 	FocusMainView     Keybinding   `yaml:"focusMainView"`
-	JumpToFile        Keybinding   `yaml:"jumpToFile"`
 	NextMatch         Keybinding   `yaml:"nextMatch"`
 	PrevMatch         Keybinding   `yaml:"prevMatch"`
 	StartSearch       Keybinding   `yaml:"startSearch"`
@@ -891,8 +890,8 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig {
 			},
 			MainPanelSplitMode:       "flexible",
 			EnlargedSideViewLocation: "left",
-			WrapLinesInDiffView:      true,
-			UseHunkModeInDiffView:    true,
+			WrapLinesInStagingView:   true,
+			UseHunkModeInStagingView: true,
 			Language:                 "auto",
 			TimeFormat:               "02 Jan 06",
 			ShortTimeFormat:          time.Kitchen,
@@ -1038,7 +1037,6 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig {
 				NextBlockAlt2:                     Keybinding{"<tab>"},
 				JumpToBlock:                       []Keybinding{{"1"}, {"2"}, {"3"}, {"4"}, {"5"}},
 				FocusMainView:                     Keybinding{"0"},
-				JumpToFile:                        Keybinding{"<ctrl+g>"},
 				NextMatch:                         Keybinding{"n"},
 				PrevMatch:                         Keybinding{"N"},
 				StartSearch:                       Keybinding{"/"},

pkg/config/user_config_validation.go

@@ -228,6 +228,10 @@ var ValidCustomCommandContexts = []string{
 	"stash",
 	"normal",
 	"normalSecondary",
+	"staging",
+	"stagingSecondary",
+	"patchBuilding",
+	"patchBuildingSecondary",
 	"mergeConflicts",
 	"menu",
 	"confirmation",

pkg/config/user_config_validation_test.go

@@ -242,10 +242,6 @@ func TestUserConfigValidate_enums(t *testing.T) {
 				{value: "commits,subCommits", valid: true},
 				{value: "invalid_value", valid: false},
 				{value: "commits, invalid_value", valid: false},
-				// The staging and patch-building panels are gone, so a config that
-				// still names their contexts is reported rather than fatal.
-				{value: "staging", valid: false},
-				{value: "patchBuilding", valid: false},
 			},
 		},
 		{

pkg/gocui/double_click_test.go

@@ -32,37 +32,3 @@ func TestMouseReleaseDoesNotBreakDoubleClickDetection(t *testing.T) {
 
 	assert.Equal(t, []bool{false, true}, doubleClicks)
 }
-
-func TestASwallowedClickIsNoHalfOfADoubleClick(t *testing.T) {
-	t.Cleanup(resetMouseState)
-	resetMouseState()
-	g := newTestGui(t)
-	view, _ := g.SetView("list", 0, 0, 20, 10, 0)
-	doubleClicks := []bool{}
-	g.SetViewClickBinding(&ViewMouseBinding{
-		ViewName: "list",
-		Key:      MouseLeft,
-		Handler: func(opts ViewMouseBindingOpts) error {
-			doubleClicks = append(doubleClicks, opts.IsDoubleClick)
-			return nil
-		},
-	})
-
-	press := gocuiEventFromTcellEvent(
-		tcell.NewEventMouse(view.x0+1, view.y0+1, tcell.ButtonPrimary, tcell.ModNone))
-	release := gocuiEventFromTcellEvent(
-		tcell.NewEventMouse(view.x0+1, view.y0+1, tcell.ButtonNone, tcell.ModNone))
-
-	// A click the client rejects, as it does for one landing behind a popup panel.
-	g.ShouldHandleMouseEvent = func(*View, KeyName) bool { return false }
-	assert.NoError(t, g.onKey(&press))
-	assert.NoError(t, g.onKey(&release))
-	assert.Empty(t, doubleClicks)
-
-	// The same spot clicked again once clicks are accepted. It is a click of its
-	// own, not the second half of the one that nothing acted on.
-	g.ShouldHandleMouseEvent = func(*View, KeyName) bool { return true }
-	assert.NoError(t, g.onKey(&press))
-
-	assert.Equal(t, []bool{false}, doubleClicks)
-}

pkg/gocui/flush_test.go

@@ -64,8 +64,8 @@ func TestFlushContentOnly_SkipsUntaintedViews(t *testing.T) {
 	assert.True(t, status.IsTainted(), "status view should be tainted after SetContent")
 	assert.False(t, main.IsTainted(), "main view should not be tainted (was not modified)")
 
-	// flushContentOnly should clear status tainted flag
-	g.flushContentOnly(g.views)
+	// flushContentOnly should succeed and clear status tainted flag
+	assert.NoError(t, g.flushContentOnly(g.views))
 
 	assert.False(t, status.IsTainted(), "status view should not be tainted after flushContentOnly")
 	assert.False(t, main.IsTainted(), "main view should not be tainted after flushContentOnly")
@@ -76,28 +76,11 @@ func TestFlushContentOnly_WritesCorrectContent(t *testing.T) {
 	status, _ := setupViews(t, g)
 
 	status.SetContent("Fetching |")
-	g.flushContentOnly(g.views)
+	assert.NoError(t, g.flushContentOnly(g.views))
 
 	assert.Equal(t, "Fetching |", status.Buffer())
 }
 
-func TestForceFlushViewsContentOnlyDrawsLineFlash(t *testing.T) {
-	g := newTestGui(t)
-	_, main := setupViews(t, g)
-	main.Highlight = true
-	main.SelBgColor = ColorBlue
-	main.SelectedLineColorWidth = 2
-	main.FocusPoint(0, 0, false)
-
-	main.SetLineFlash(0)
-	g.ForceFlushViewsContentOnly(g.Views())
-
-	for x := main.x0 + 1; x <= main.x0+2; x++ {
-		_, style, _ := Screen.Get(x, main.y0+1)
-		assert.True(t, style.HasReverse(), "selection-bar cell at x=%d should flash", x)
-	}
-}
-
 func TestProcessEvent_ContentOnlyEvent_SkipsTaintedCheck(t *testing.T) {
 	g := newTestGui(t)
 	status, main := setupViews(t, g)
@@ -248,7 +231,7 @@ func TestFlushContentOnly_DoesNotOverdrawHigherZViews(t *testing.T) {
 	assert.False(t, popup.IsTainted(), "popup should not be tainted")
 
 	// flushContentOnly is what spinner ticks ultimately invoke.
-	g.flushContentOnly(g.views)
+	assert.NoError(t, g.flushContentOnly(g.views))
 
 	assert.Equal(t, "P", cellAt(21, 9),
 		"popup region must still show popup content after flushContentOnly; "+
@@ -296,7 +279,7 @@ func TestFlushContentOnly_RedrawsTransitivelyOverlappingViews(t *testing.T) {
 	assert.False(t, b.IsTainted())
 	assert.False(t, c.IsTainted())
 
-	g.flushContentOnly(g.views)
+	assert.NoError(t, g.flushContentOnly(g.views))
 
 	// a redrawn (direct).
 	assert.Equal(t, "X", cellAt(5, 5), "a should be redrawn (tainted)")

pkg/gocui/gui.go

@@ -91,14 +91,6 @@ type ViewMouseBinding struct {
 
 	// must be a mouse key
 	Key KeyName
-
-	// If true, this binding is dispatched before ShouldHandleMouseEvent is
-	// consulted, so it fires even when a popup panel is focused and the click
-	// lands on a view other than that panel (which is normally swallowed). This
-	// is the same early phase that hyperlink clicks are handled in; use it for
-	// clicks that must stay live behind a popup, e.g. opening a diff line in the
-	// editor from the main view behind the commit-message panel.
-	HandleWhenPopupPanelFocused bool
 }
 
 type ViewMouseBindingOpts struct {
@@ -421,12 +413,13 @@ func (g *Gui) Size() (x, y int) {
 // corner of the terminal. It checks if the position is valid and applies
 // the given colors.
 // Should only be used if you know that the given rune is not part of a grapheme cluster.
-func (g *Gui) SetRune(x, y int, ch rune, fgColor, bgColor Attribute) {
+func (g *Gui) SetRune(x, y int, ch rune, fgColor, bgColor Attribute) error {
 	if x < 0 || y < 0 || x >= g.maxX || y >= g.maxY {
 		// swallowing error because it's not that big of a deal
-		return
+		return nil
 	}
 	tcellSetCell(x, y, string(ch), fgColor, bgColor, g.outputMode)
+	return nil
 }
 
 // SetView creates a new view with its top-left corner at (x0, y0)
@@ -1196,8 +1189,7 @@ func (g *Gui) processEvent() error {
 	contentOnly = contentOnly && remainingContentOnly
 
 	if contentOnly {
-		g.flushContentOnly(g.views)
-		return nil
+		return g.flushContentOnly(g.views)
 	}
 	return g.flush()
 }
@@ -1298,7 +1290,7 @@ func (g *Gui) onResize() {
 }
 
 // drawFrameEdges draws the horizontal and vertical edges of a view.
-func (g *Gui) drawFrameEdges(v *View, fgColor, bgColor Attribute) {
+func (g *Gui) drawFrameEdges(v *View, fgColor, bgColor Attribute) error {
 	runeH, runeV := '─', '│'
 	if len(v.FrameRunes) >= 2 {
 		runeH, runeV = v.FrameRunes[0], v.FrameRunes[1]
@@ -1309,10 +1301,14 @@ func (g *Gui) drawFrameEdges(v *View, fgColor, bgColor Attribute) {
 			continue
 		}
 		if v.y0 > -1 && v.y0 < g.maxY {
-			g.SetRune(x, v.y0, runeH, fgColor, bgColor)
+			if err := g.SetRune(x, v.y0, runeH, fgColor, bgColor); err != nil {
+				return err
+			}
 		}
 		if v.y1 > -1 && v.y1 < g.maxY {
-			g.SetRune(x, v.y1, runeH, fgColor, bgColor)
+			if err := g.SetRune(x, v.y1, runeH, fgColor, bgColor); err != nil {
+				return err
+			}
 		}
 	}
 
@@ -1322,14 +1318,19 @@ func (g *Gui) drawFrameEdges(v *View, fgColor, bgColor Attribute) {
 			continue
 		}
 		if v.x0 > -1 && v.x0 < g.maxX {
-			g.SetRune(v.x0, y, runeV, fgColor, bgColor)
+			if err := g.SetRune(v.x0, y, runeV, fgColor, bgColor); err != nil {
+				return err
+			}
 		}
 		if v.x1 > -1 && v.x1 < g.maxX {
 			runeToPrint := calcScrollbarRune(showScrollbar, realScrollbarStart, realScrollbarEnd, y, runeV)
 
-			g.SetRune(v.x1, y, runeToPrint, fgColor, bgColor)
+			if err := g.SetRune(v.x1, y, runeToPrint, fgColor, bgColor); err != nil {
+				return err
+			}
 		}
 	}
+	return nil
 }
 
 func calcScrollbarRune(
@@ -1429,13 +1430,17 @@ func corner(v *View, directions byte) rune {
 }
 
 // drawFrameCorners draws the corners of the view.
-func (g *Gui) drawFrameCorners(v *View, fgColor, bgColor Attribute) {
+func (g *Gui) drawFrameCorners(v *View, fgColor, bgColor Attribute) error {
 	if v.y0 == v.y1 {
 		if !g.SupportOverlaps && v.x0 >= 0 && v.x1 >= 0 && v.y0 >= 0 && v.x0 < g.maxX && v.x1 < g.maxX && v.y0 < g.maxY {
-			g.SetRune(v.x0, v.y0, '╶', fgColor, bgColor)
-			g.SetRune(v.x1, v.y0, '╴', fgColor, bgColor)
+			if err := g.SetRune(v.x0, v.y0, '╶', fgColor, bgColor); err != nil {
+				return err
+			}
+			if err := g.SetRune(v.x1, v.y0, '╴', fgColor, bgColor); err != nil {
+				return err
+			}
 		}
-		return
+		return nil
 	}
 
 	runeTL, runeTR, runeBL, runeBR := '┌', '┐', '└', '┘'
@@ -1456,15 +1461,18 @@ func (g *Gui) drawFrameCorners(v *View, fgColor, bgColor Attribute) {
 
 	for _, c := range corners {
 		if c.x >= 0 && c.y >= 0 && c.x < g.maxX && c.y < g.maxY {
-			g.SetRune(c.x, c.y, c.ch, fgColor, bgColor)
+			if err := g.SetRune(c.x, c.y, c.ch, fgColor, bgColor); err != nil {
+				return err
+			}
 		}
 	}
+	return nil
 }
 
 // drawTitle draws the title of the view.
-func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) {
+func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) error {
 	if v.y0 < 0 || v.y0 >= g.maxY {
-		return
+		return nil
 	}
 
 	tabs := v.Tabs
@@ -1500,7 +1508,9 @@ func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) {
 
 	x := v.x0 + 2
 	for _, ch := range prefix {
-		g.SetRune(x, v.y0, ch, fgColor, bgColor)
+		if err := g.SetRune(x, v.y0, ch, fgColor, bgColor); err != nil {
+			return err
+		}
 		x += uniseg.StringWidth(string(ch))
 	}
 	for i, ch := range str {
@@ -1523,55 +1533,64 @@ func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) {
 				currentFgColor &= ^AttrBold
 			}
 		}
-		g.SetRune(x, v.y0, ch, currentFgColor, currentBgColor)
+		if err := g.SetRune(x, v.y0, ch, currentFgColor, currentBgColor); err != nil {
+			return err
+		}
 		x += uniseg.StringWidth(string(ch))
 	}
+	return nil
 }
 
 // drawSubtitle draws the subtitle of the view.
-func (g *Gui) drawSubtitle(v *View, fgColor, bgColor Attribute) {
+func (g *Gui) drawSubtitle(v *View, fgColor, bgColor Attribute) error {
 	if v.y0 < 0 || v.y0 >= g.maxY {
-		return
+		return nil
 	}
 
 	start := v.x1 - 5 - uniseg.StringWidth(v.Subtitle)
 	if start < v.x0 {
-		return
+		return nil
 	}
 	x := start
 	for _, ch := range v.Subtitle {
 		if x >= v.x1 {
 			break
 		}
-		g.SetRune(x, v.y0, ch, fgColor, bgColor)
+		if err := g.SetRune(x, v.y0, ch, fgColor, bgColor); err != nil {
+			return err
+		}
 		x += uniseg.StringWidth(string(ch))
 	}
+	return nil
 }
 
 // drawListFooter draws the footer of a list view, showing something like '1 of 10'
-func (g *Gui) drawListFooter(v *View, fgColor, bgColor Attribute) {
+func (g *Gui) drawListFooter(v *View, fgColor, bgColor Attribute) error {
 	if len(v.buf.lines) == 0 {
-		return
+		return nil
 	}
 
 	message := v.Footer
 
 	if v.y1 < 0 || v.y1 >= g.maxY {
-		return
+		return nil
 	}
 
 	start := v.x1 - 1 - uniseg.StringWidth(message)
 	if start < v.x0 {
-		return
+		return nil
 	}
 	x := start
 	for _, ch := range message {
 		if x >= v.x1 {
 			break
 		}
-		g.SetRune(x, v.y1, ch, fgColor, bgColor)
+		if err := g.SetRune(x, v.y1, ch, fgColor, bgColor); err != nil {
+			return err
+		}
 		x += uniseg.StringWidth(string(ch))
 	}
+	return nil
 }
 
 // flush updates the gui, re-drawing frames and buffers.
@@ -1599,35 +1618,40 @@ func (g *Gui) flush() error {
 		}
 	}
 	for _, v := range g.views {
-		g.draw(v)
+		if err := g.draw(v); err != nil {
+			return err
+		}
 	}
 
 	Screen.Show()
 	return nil
 }
 
-// Redraws only dirty views and skips the layout pass.
+// Redraws only tainted views and skips the layout pass.
 // tcell's cell-level dirty tracking ensures only
 // actually-changed cells are emitted to the terminal.
-// Will also redraw any views that overlap dirty views.
-func (g *Gui) flushContentOnly(views []*View) {
+// Will also redraw any views that overlap tainted views
+func (g *Gui) flushContentOnly(views []*View) error {
 	// The screen must not be touched while suspended (see Suspend).
 	if g.isSuspended() {
-		return
+		return nil
 	}
 
 	for _, v := range viewsToRedrawContentOnly(views) {
-		g.draw(v)
+		if err := g.draw(v); err != nil {
+			return err
+		}
 	}
 
 	Screen.Show()
+	return nil
 }
 
 func viewsToRedrawContentOnly(views []*View) []*View {
 	redrawIndexes := set.New[int]()
 
 	for i, v := range views {
-		if !v.NeedsRedraw() && !redrawIndexes.Includes(i) {
+		if !v.IsTainted() && !redrawIndexes.Includes(i) {
 			continue
 		}
 
@@ -1657,11 +1681,11 @@ func (g *Gui) ForceLayoutAndRedraw() error {
 	return g.flush()
 }
 
-// Redraws only dirty views outside of the normal main
+// Redraws only tainted views outside of the normal main
 // loop, without a layout pass. Useful during longer operations that block the
 // main thread, e.g. to update a spinner in a status view.
-func (g *Gui) ForceFlushViewsContentOnly(views []*View) {
-	g.flushContentOnly(views)
+func (g *Gui) ForceFlushViewsContentOnly(views []*View) error {
+	return g.flushContentOnly(views)
 }
 
 // hasFocus reports whether a view is drawn as focused. Views that are embedded
@@ -1679,9 +1703,9 @@ func outermostView(v *View) *View {
 }
 
 // draw manages the cursor and calls the draw function of a view.
-func (g *Gui) draw(v *View) {
+func (g *Gui) draw(v *View) error {
 	if !v.Visible || v.y1 < v.y0 || v.x1 < v.x0 {
-		return
+		return nil
 	}
 
 	if g.Cursor {
@@ -1720,18 +1744,30 @@ func (g *Gui) draw(v *View) {
 			}
 		}
 
-		g.drawFrameEdges(v, frameColor, bgColor)
-		g.drawFrameCorners(v, frameColor, bgColor)
+		if err := g.drawFrameEdges(v, frameColor, bgColor); err != nil {
+			return err
+		}
+		if err := g.drawFrameCorners(v, frameColor, bgColor); err != nil {
+			return err
+		}
 		if v.Title != "" || len(v.Tabs) > 0 {
-			g.drawTitle(v, fgColor, bgColor)
+			if err := g.drawTitle(v, fgColor, bgColor); err != nil {
+				return err
+			}
 		}
 		if v.Subtitle != "" {
-			g.drawSubtitle(v, fgColor, bgColor)
+			if err := g.drawSubtitle(v, fgColor, bgColor); err != nil {
+				return err
+			}
 		}
 		if v.Footer != "" && g.ShowListFooter {
-			g.drawListFooter(v, fgColor, bgColor)
+			if err := g.drawListFooter(v, fgColor, bgColor); err != nil {
+				return err
+			}
 		}
 	}
+
+	return nil
 }
 
 // onKey manages key-press events. A keybinding handler is called when
@@ -1815,25 +1851,6 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
 			}
 		}
 
-		var mouseOpts ViewMouseBindingOpts
-		if IsMouseKey(ev.Key) {
-			mouseOpts = ViewMouseBindingOpts{
-				X: newX, Y: newY, Key: ev.Key.KeyName(),
-				IsDoubleClick: g.isDoubleClick(newX, newY, ev.Key.KeyName(), v),
-			}
-
-			// Dispatch bindings that opt into firing while a popup panel is focused
-			// before the gate below gets a chance to reject the click.
-			matched, err := g.execMouseKeybindings(v, ev, mouseOpts, true)
-			if err != nil {
-				return err
-			}
-			if matched {
-				g.recordClickInfo(newX, newY, ev.Key.KeyName(), v)
-				return nil
-			}
-		}
-
 		if g.ShouldHandleMouseEvent != nil {
 			if !g.ShouldHandleMouseEvent(v, ev.Key.KeyName()) {
 				// Give clients a chance to reject clicks, for example clicks in inactive views
@@ -1841,21 +1858,11 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
 				break
 			}
 		}
-		// Bindings match modifiers exactly, so a gesture with a keyboard modifier held
-		// is a gesture of its own, and the bindings that act on a plain click pass it
-		// by. It therefore has to leave the view as it found it: the cursor stays where
-		// the selection is (a list view draws its selection at the cursor), and no
-		// mouse capture begins for a drag that no binding will extend. ModMotion comes
-		// from the mouse rather than the keyboard, and every drag carries it, so it is
-		// masked out here.
-		gestureIsModified := ev.Key.Mod()&^ModMotion != ModNone
-
-		if ev.Key.KeyName() == MouseLeft && ev.Key.Mod() == ModNone {
+		if ev.Key.KeyName() == MouseLeft && ev.Key.Mod()&ModMotion == 0 {
 			g.captureMouse(v)
 		}
 
-		if !IsMouseScrollKey(ev.Key.KeyName()) && ev.Key.KeyName() != MouseRelease &&
-			!gestureIsModified {
+		if !IsMouseScrollKey(ev.Key.KeyName()) && ev.Key.KeyName() != MouseRelease {
 			cursorX, cursorY := newCx, newCy
 			// A captured drag can report positions outside the view; keep the
 			// view cursor inside its bounds in that case. Handlers still get
@@ -1893,8 +1900,9 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
 		}
 
 		if IsMouseKey(ev.Key) {
-			g.recordClickInfo(newX, newY, ev.Key.KeyName(), v)
-			matched, err := g.execMouseKeybindings(v, ev, mouseOpts, false)
+			isDoubleClick := g.recordClickInfo(newX, newY, ev.Key.KeyName(), v)
+			opts := ViewMouseBindingOpts{X: newX, Y: newY, Key: ev.Key.KeyName(), IsDoubleClick: isDoubleClick}
+			matched, err := g.execMouseKeybindings(v, ev, opts)
 			if err != nil {
 				return err
 			}
@@ -1926,49 +1934,43 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
 	return nil
 }
 
-// isDoubleClick reports whether this click follows one just like it, closely
-// enough in time to count as a double click.
-func (g *Gui) isDoubleClick(x, y int, key KeyName, v *View) bool {
-	return g.lastClick != nil &&
-		!IsMouseScrollKey(key) &&
-		key != MouseRelease &&
-		x == g.lastClick.x &&
-		y == g.lastClick.y &&
-		key == g.lastClick.key &&
-		v.Name() == g.lastClick.viewName &&
-		time.Now().Before(g.lastClick.time.Add(DOUBLE_CLICK_THRESHOLD))
-}
-
-// recordClickInfo remembers this click as the one a following click is compared
-// against. Only the clicks that reach a binding are recorded, so a click the
-// client rejects leaves double-click detection where it was.
-func (g *Gui) recordClickInfo(x, y int, key KeyName, v *View) {
+// remember the information for this click, and return true if it was a double click
+func (g *Gui) recordClickInfo(x, y int, key KeyName, v *View) bool {
 	if IsMouseScrollKey(key) {
 		g.lastClick = nil
-		return
+		return false
 	}
 	// A release ends a gesture but is not a click of its own; it must leave
 	// the click info of the press that started it alone, or no double click
 	// could ever be detected.
 	if key == MouseRelease {
-		return
+		return false
 	}
 
-	g.lastClick = &clickInfo{
+	clickInfo := &clickInfo{
 		x:        x,
 		y:        y,
 		key:      key,
 		viewName: v.Name(),
 		time:     time.Now(),
 	}
+
+	isDoubleClick := g.lastClick != nil &&
+		clickInfo.x == g.lastClick.x &&
+		clickInfo.y == g.lastClick.y &&
+		clickInfo.key == g.lastClick.key &&
+		clickInfo.viewName == g.lastClick.viewName &&
+		clickInfo.time.Before(g.lastClick.time.Add(DOUBLE_CLICK_THRESHOLD))
+
+	g.lastClick = clickInfo
+	return isDoubleClick
 }
 
-func (g *Gui) execMouseKeybindings(view *View, ev *GocuiEvent, opts ViewMouseBindingOpts, handleWhenPopupPanelFocused bool) (bool, error) {
+func (g *Gui) execMouseKeybindings(view *View, ev *GocuiEvent, opts ViewMouseBindingOpts) (bool, error) {
 	isMatch := func(binding *ViewMouseBinding) bool {
 		return binding.ViewName == view.Name() &&
 			ev.Key.KeyName() == binding.Key &&
-			ev.Key.Mod() == binding.Modifier &&
-			binding.HandleWhenPopupPanelFocused == handleWhenPopupPanelFocused
+			ev.Key.Mod() == binding.Modifier
 	}
 
 	// first pass looks for ones that match the focused view
@@ -2143,9 +2145,6 @@ func (g *Gui) Suspend() error {
 		return errors.New("Already suspended")
 	}
 
-	for _, view := range g.views {
-		view.ClearLineFlash()
-	}
 	g.suspended = true
 
 	if err := g.screen.Suspend(); err != nil {

pkg/gocui/modified_click_test.go

@@ -1,46 +0,0 @@
-package gocui
-
-import (
-	"testing"
-
-	"github.com/gdamore/tcell/v3"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAModifiedClickNoBindingWantsLeavesTheViewAlone(t *testing.T) {
-	t.Cleanup(resetMouseState)
-	resetMouseState()
-	g := newTestGui(t)
-	view, _ := g.SetView("list", 0, 0, 20, 10, 0)
-
-	clicks := 0
-	g.SetViewClickBinding(&ViewMouseBinding{
-		ViewName: "list",
-		Key:      MouseLeft,
-		Handler: func(ViewMouseBindingOpts) error {
-			clicks++
-			return nil
-		},
-	})
-
-	click := func(y int, modifier tcell.ModMask) {
-		for _, button := range []tcell.ButtonMask{tcell.ButtonPrimary, tcell.ButtonNone} {
-			event := gocuiEventFromTcellEvent(
-				tcell.NewEventMouse(view.x0+1, y, button, modifier))
-			assert.NoError(t, g.onKey(&event))
-		}
-	}
-
-	// A plain click is the binding's, and moves the cursor it acts on.
-	click(view.y0+4, tcell.ModNone)
-	assert.Equal(t, 1, clicks)
-	assert.Equal(t, 3, view.CursorY())
-
-	// An alt-click is nobody's here, bindings matching modifiers exactly. It has to
-	// leave the cursor where the selection is, or a list view would draw its
-	// selection on a line its owner never selected.
-	click(view.y0+8, tcell.ModAlt)
-	assert.Equal(t, 1, clicks)
-	assert.Equal(t, 3, view.CursorY())
-	assert.Nil(t, g.mouseCapture, "and no drag begins for it either")
-}

pkg/gocui/mouse_binding_test.go

@@ -1,49 +0,0 @@
-package gocui
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestOnlyBindingsThatOptedInFireBehindAFocusedPopup(t *testing.T) {
-	g := newTestGui(t)
-	_, _ = g.SetView("main", 0, 0, 20, 10, 0)
-
-	fired := []string{}
-	g.SetViewClickBinding(&ViewMouseBinding{
-		ViewName:                    "main",
-		Key:                         MouseLeft,
-		Modifier:                    ModAlt,
-		HandleWhenPopupPanelFocused: true,
-		Handler: func(ViewMouseBindingOpts) error {
-			fired = append(fired, "opted in")
-			return nil
-		},
-	})
-	g.SetViewClickBinding(&ViewMouseBinding{
-		ViewName: "main",
-		Key:      MouseLeft,
-		Handler: func(ViewMouseBindingOpts) error {
-			fired = append(fired, "ordinary")
-			return nil
-		},
-	})
-
-	// This is how a client reports that a popup panel has the focus and the click
-	// landed on a view behind it.
-	g.ShouldHandleMouseEvent = func(*View, KeyName) bool { return false }
-
-	assert.NoError(t, g.onKey(&GocuiEvent{
-		Type: eventMouse, MouseX: 3, MouseY: 4,
-		Key: NewKey(MouseLeft, "", ModAlt),
-	}))
-	assert.Equal(t, []string{"opted in"}, fired)
-
-	assert.NoError(t, g.onKey(&GocuiEvent{
-		Type: eventMouse, MouseX: 3, MouseY: 4,
-		Key: NewKey(MouseLeft, "", ModNone),
-	}))
-	assert.Equal(t, []string{"opted in"}, fired,
-		"a binding that didn't opt in must still be swallowed")
-}

pkg/gocui/suspend_test.go

@@ -18,7 +18,7 @@ func TestFlushIsNoOpWhileSuspended(t *testing.T) {
 		flush func(g *Gui) error
 	}{
 		{"flush", func(g *Gui) error { return g.flush() }},
-		{"flushContentOnly", func(g *Gui) error { g.flushContentOnly(g.views); return nil }},
+		{"flushContentOnly", func(g *Gui) error { return g.flushContentOnly(g.views) }},
 	}
 
 	for _, tc := range tests {
@@ -67,14 +67,3 @@ func TestResumeSchedulesRedraw(t *testing.T) {
 	assert.Equal(t, eventResize, ev.Type,
 		"resuming must schedule a redraw; without one the screen stays blank until the next event arrives")
 }
-
-func TestSuspendClearsLineFlashes(t *testing.T) {
-	g := newTestGui(t)
-	v, err := g.SetView("main", 0, 0, 20, 10, 0)
-	assert.ErrorIs(t, err, ErrUnknownView)
-	v.SetLineFlash(3)
-
-	assert.NoError(t, g.Suspend())
-	assert.Equal(t, -1, v.lineFlashY)
-	assert.NoError(t, g.Resume())
-}

pkg/gocui/tcell_driver.go

@@ -209,7 +209,6 @@ const (
 
 var (
 	lastMouseKey tcell.ButtonMask = tcell.ButtonNone
-	lastMouseMod tcell.ModMask    = tcell.ModNone
 	dragState                     = NOT_DRAGGING
 	lastX                         = 0
 	lastY                         = 0
@@ -378,12 +377,6 @@ func gocuiEventFromTcellEvent(tev tcell.Event) GocuiEvent {
 		if button != tcell.ButtonNone && lastMouseKey == tcell.ButtonNone {
 			newButtonPress = true
 			lastMouseKey = button
-			// The keyboard modifiers held at press time apply to the whole gesture:
-			// the press, every drag event, and the release. Snapshotting them here
-			// keeps a modified press from producing events that match unmodified
-			// bindings, and ignores modifier changes while the button is held.
-			lastMouseMod = tev.Modifiers()
-			mouseMod = Modifier(lastMouseMod)
 			switch button {
 			case tcell.ButtonPrimary:
 				mouseKey = MouseLeft
@@ -409,8 +402,7 @@ func gocuiEventFromTcellEvent(tev tcell.Event) GocuiEvent {
 				case tcell.ButtonMiddle:
 				default:
 				}
-				mouseMod = Modifier(lastMouseMod)
-				lastMouseMod = tcell.ModNone
+				mouseMod = ModNone
 				lastMouseKey = tcell.ButtonNone
 			}
 		default:
@@ -441,10 +433,10 @@ func gocuiEventFromTcellEvent(tev tcell.Event) GocuiEvent {
 				// reaches drag bindings instead of being delivered with the
 				// default MouseRelease key.
 				dragState = DRAGGING
-				mouseMod = Modifier(lastMouseMod) | ModMotion
+				mouseMod = ModMotion
 				mouseKey = MouseLeft
 			case DRAGGING:
-				mouseMod = Modifier(lastMouseMod) | ModMotion
+				mouseMod = ModMotion
 				mouseKey = MouseLeft
 			}
 		}

pkg/gocui/tcell_driver_test.go

@@ -36,55 +36,21 @@ func TestMouseReleaseAfterDragIsMouseEvent(t *testing.T) {
 	assert.Equal(t, MouseRelease, releaseEvent.Key.KeyName())
 }
 
-func TestWholeGestureCarriesPressModifiers(t *testing.T) {
+func TestMouseReleaseDoesNotKeepPressModifiers(t *testing.T) {
 	t.Cleanup(resetMouseState)
 	resetMouseState()
 
-	pressEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModAlt))
-	dragEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModAlt))
+	gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModAlt))
+	gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModAlt))
 	releaseEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonNone, tcell.ModAlt))
 
-	assert.Equal(t, eventMouse, pressEvent.Type)
-	assert.Equal(t, MouseLeft, pressEvent.Key.KeyName())
-	assert.Equal(t, ModAlt, pressEvent.Key.Mod())
-	assert.Equal(t, eventMouse, dragEvent.Type)
-	assert.Equal(t, MouseLeft, dragEvent.Key.KeyName())
-	assert.Equal(t, ModAlt|ModMotion, dragEvent.Key.Mod())
 	assert.Equal(t, eventMouse, releaseEvent.Type)
 	assert.Equal(t, MouseRelease, releaseEvent.Key.KeyName())
-	assert.Equal(t, ModAlt, releaseEvent.Key.Mod())
-}
-
-func TestModifierChangesWhileButtonHeldAreIgnored(t *testing.T) {
-	t.Cleanup(resetMouseState)
-	resetMouseState()
-
-	gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModNone))
-	dragEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModAlt))
-	releaseEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonNone, tcell.ModAlt))
-
-	assert.Equal(t, ModMotion, dragEvent.Key.Mod())
 	assert.Equal(t, ModNone, releaseEvent.Key.Mod())
 }
 
-func TestModifiedClickWithoutDragCarriesModifierOnPressAndRelease(t *testing.T) {
-	t.Cleanup(resetMouseState)
-	resetMouseState()
-
-	pressEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModShift))
-	releaseEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonNone, tcell.ModShift))
-
-	assert.Equal(t, eventMouse, pressEvent.Type)
-	assert.Equal(t, MouseLeft, pressEvent.Key.KeyName())
-	assert.Equal(t, ModShift, pressEvent.Key.Mod())
-	assert.Equal(t, eventMouse, releaseEvent.Type)
-	assert.Equal(t, MouseRelease, releaseEvent.Key.KeyName())
-	assert.Equal(t, ModShift, releaseEvent.Key.Mod())
-}
-
 func resetMouseState() {
 	lastMouseKey = tcell.ButtonNone
-	lastMouseMod = tcell.ModNone
 	dragState = NOT_DRAGGING
 	lastX = 0
 	lastY = 0

pkg/gocui/view.go

@@ -80,27 +80,18 @@ type View struct {
 	// a user starts a range select and then moves the cursor up.
 	rangeSelectStartY int
 
-	// The view line whose selection-width bar is temporarily reversed. A value
-	// of -1 means that no line is flashing.
-	lineFlashY int
-
 	// readBuffer is used for storing unread bytes
 	readBuffer []byte
 
 	// tained is true if the viewLines must be updated
 	tainted bool
 
-	// needsRedraw is true if the view's current state has not been drawn to the
-	// screen yet. A tainted view always needs a redraw, but draw-only state can
-	// require one without invalidating viewLines.
-	needsRedraw bool
-
 	// firstDirtyLine is the index of the lowest line in `lines` that has been
-	// written to since viewLines was last refreshed, and whose cached wrapping
-	// (lineType.wrappedCells) may therefore be stale. Lines below it are
-	// unchanged and can reuse their cached wrapping instead of being
-	// re-wrapped, which keeps refreshViewLinesIfNeeded cheap while scrolling
-	// appends new lines to a long buffer.
+	// written to or highlighted since viewLines was last refreshed, and whose
+	// cached wrapping (lineType.wrappedCells) may therefore be stale. Lines
+	// below it are unchanged and can reuse their cached wrapping instead of
+	// being re-wrapped, which keeps refreshViewLinesIfNeeded cheap while
+	// scrolling appends new lines to a long buffer.
 	firstDirtyLine int
 
 	// the last position that the mouse was hovering over; nil if the mouse is outside of
@@ -179,17 +170,6 @@ type View struct {
 	// For content that conveys meaning by color of its own.
 	SelectedLineColorWidth int
 
-	// InclusionGutterMarker is the glyph the inclusion gutter draws on a marked line
-	// (see SetInclusionGutter), and InclusionGutterMarkerColor its color. Both are
-	// set once, when the view is created.
-	InclusionGutterMarker      string
-	InclusionGutterMarkerColor Attribute
-	// showInclusionGutter reserves the gutter's columns at the left of every line,
-	// and inclusionGutterMarks, indexed by line of the content, says which lines get
-	// the marker. Set together, via SetInclusionGutter.
-	showInclusionGutter  bool
-	inclusionGutterMarks []bool
-
 	// If Frame is true, a border will be drawn around the view.
 	Frame bool
 
@@ -283,18 +263,11 @@ type pos struct {
 // a view whose size has changed, whose content is the same but has to be wrapped
 // afresh, call RewrapContent instead.
 func (v *View) clearViewLines() {
-	v.markViewLinesDirty()
+	v.tainted = true
 	v.viewLines = nil
 	v.clearHover()
 }
 
-// markViewLinesDirty records that the cached viewLines no longer represent the
-// view's buffer or wrapping, so both rebuilding and redrawing are required.
-func (v *View) markViewLinesDirty() {
-	v.tainted = true
-	v.needsRedraw = true
-}
-
 // RewrapContent wraps the view's content for the size the view has now, and puts
 // the positions into that content — the scroll offset, the cursor, a range's
 // anchor — back on the lines they were on. They are all view lines, which count
@@ -809,13 +782,11 @@ func NewView(name string, x0, y0, x1, y1 int, mode OutputMode) *View {
 		Frame:             true,
 		Editor:            DefaultEditor,
 		tainted:           true,
-		needsRedraw:       true,
 		outMode:           mode,
 		buf:               &viewBuffer{ei: newEscapeInterpreter(mode)},
 		searcher:          &searcher{},
 		TextArea:          &TextArea{},
 		rangeSelectStartY: -1,
-		lineFlashY:        -1,
 		TabWidth:          4,
 	}
 
@@ -889,38 +860,6 @@ func (v *View) Name() string {
 	return v.name
 }
 
-// SetInclusionGutter shows or hides a column reserved at the left of every line, in
-// which marks — indexed by line of the content — say which lines get
-// InclusionGutterMarker drawn, on every segment of a line the view wrapped. The
-// content is drawn shifted past it.
-//
-// It is drawn over the content rather than written into it, so the content itself —
-// and with it what each line of the view means, where a click lands, and how the
-// lines wrap — is untouched but for the width the gutter takes.
-func (v *View) SetInclusionGutter(show bool, marks []bool) {
-	v.writeMutex.Lock()
-	changed := v.showInclusionGutter != show
-	v.showInclusionGutter = show
-	v.inclusionGutterMarks = marks
-	v.writeMutex.Unlock()
-
-	if changed {
-		// The gutter takes its columns from the content, so what is left of it wraps
-		// differently, and everything pointing into it has to come along.
-		v.RewrapContent()
-	}
-}
-
-// inclusionGutterWidth is how many columns the inclusion gutter takes while it is
-// shown — the marker plus a column of space before the content — and 0 while it is
-// not. Only call this with a lock on writeMutex.
-func (v *View) inclusionGutterWidth() int {
-	if !v.showInclusionGutter {
-		return 0
-	}
-	return uniseg.StringWidth(v.InclusionGutterMarker) + 1
-}
-
 // setCharacter sets a character (grapheme cluster) at the given point relative to the view. It applies
 // the specified colors, taking into account if the cell must be highlighted. Also, it checks if the
 // position is valid.
@@ -967,10 +906,6 @@ func (v *View) setCharacter(x, y int, ch string, fgColor, bgColor Attribute, isW
 		fgColor |= AttrUnderline
 	}
 
-	if v.lineFlashY == v.oy+y && (v.SelectedLineColorWidth == 0 || x < v.SelectedLineColorWidth) {
-		fgColor ^= AttrReverse
-	}
-
 	// Don't display empty characters
 	if ch == "" {
 		ch = " "
@@ -1191,7 +1126,7 @@ func (v *View) write(p []byte) {
 		return
 	}
 
-	v.markViewLinesDirty()
+	v.tainted = true
 	// write only ever touches lines from v.buf.wy onwards, so any cached wrapping
 	// below that stays valid.
 	v.firstDirtyLine = min(v.firstDirtyLine, v.buf.wy)
@@ -1626,7 +1561,7 @@ func (v *View) SwapInOffscreenRender() {
 	}
 	v.buf = v.offscreen
 	v.offscreen = nil
-	v.markViewLinesDirty()
+	v.tainted = true
 	v.clearHover()
 }
 
@@ -1790,12 +1725,6 @@ func (v *View) IsTainted() bool {
 	return v.tainted
 }
 
-func (v *View) NeedsRedraw() bool {
-	v.writeMutex.Lock()
-	defer v.writeMutex.Unlock()
-	return v.needsRedraw
-}
-
 // draw re-draws the view's contents.
 func (v *View) draw(isWindowFocused bool) {
 	v.writeMutex.Lock()
@@ -1804,7 +1733,6 @@ func (v *View) draw(isWindowFocused bool) {
 	if !v.Visible {
 		return
 	}
-	defer func() { v.needsRedraw = false }()
 
 	v.clearRunes()
 
@@ -1836,8 +1764,6 @@ func (v *View) draw(isWindowFocused bool) {
 
 	emptyCell := cell{chr: " ", width: 1, fgColor: ColorDefault, bgColor: ColorDefault}
 
-	gutterWidth := v.inclusionGutterWidth()
-
 	for y, vline := range v.viewLines[start:] {
 		if y >= maxY {
 			break
@@ -1852,20 +1778,10 @@ func (v *View) draw(isWindowFocused bool) {
 			trailingCell.bgColor = attrs.bg
 		}
 
-		// The inclusion gutter is blank but for the marker on a marked line, and the
-		// content begins after it. The blanks go through setCharacter like everything
-		// else, so that a selection reaching the left edge covers the gutter too.
-		for gx := range gutterWidth {
-			v.setCharacter(gx, y, " ", v.FgColor, v.BgColor, isWindowFocused)
-		}
-		if gutterWidth > 0 && vline.linesY < len(v.inclusionGutterMarks) && v.inclusionGutterMarks[vline.linesY] {
-			v.setCharacter(0, y, v.InclusionGutterMarker, v.InclusionGutterMarkerColor, v.BgColor, isWindowFocused)
-		}
-
 		// x tracks the current x position in the view, and cellIdx tracks the
 		// index of the cell. If we print a double-sized rune, we increment cellIdx
 		// by one but x by two.
-		x := gutterWidth - v.ox
+		x := -v.ox
 		cellIdx := 0
 
 		var c cell
@@ -1879,7 +1795,7 @@ func (v *View) draw(isWindowFocused bool) {
 
 				// no more characters to write so we're only going to be printing empty cells
 				// past this point
-				x = gutterWidth
+				x = 0
 			}
 
 			// if we're out of cells to write, we'll just print empty cells.
@@ -1914,11 +1830,10 @@ func (v *View) refreshViewLinesIfNeeded() {
 		return
 	}
 
+	maxX := v.InnerWidth()
 	wrap := 0
 	if v.Wrap {
-		// The inclusion gutter, while it is shown, takes its columns out of the width
-		// the content has to wrap in.
-		wrap = max(0, v.InnerWidth()-v.inclusionGutterWidth())
+		wrap = maxX
 	}
 
 	lineIdx := 0
@@ -1929,8 +1844,8 @@ func (v *View) refreshViewLinesIfNeeded() {
 		// Reuse the previously wrapped result for lines that haven't changed
 		// since the last refresh (i.e. below firstDirtyLine) and were wrapped at
 		// the current width. Wrapping is expensive and this loop runs on every
-		// scroll event, so only the lines that were actually just read should
-		// be wrapped afresh.
+		// scroll event, so only the lines that were actually just read (or
+		// re-highlighted) should be wrapped afresh.
 		if line.wrappedCells == nil || line.wrappedColumns != wrap || i >= v.firstDirtyLine {
 			line.wrappedCells = lineWrap(line.cells, wrap)
 			line.wrappedColumns = wrap
@@ -2060,26 +1975,6 @@ func (v *View) BufferLines() []string {
 	return lines
 }
 
-// MarkedLines returns the lines of the view's content that the inclusion gutter is
-// marking (see SetInclusionGutter), in the order they appear. Empty while the gutter
-// is hidden.
-func (v *View) MarkedLines() []string {
-	v.writeMutex.Lock()
-	defer v.writeMutex.Unlock()
-
-	if !v.showInclusionGutter {
-		return nil
-	}
-
-	lines := []string{}
-	for i, line := range v.buf.lines {
-		if i < len(v.inclusionGutterMarks) && v.inclusionGutterMarks[i] {
-			lines = append(lines, line.cells.String())
-		}
-	}
-	return lines
-}
-
 // DiffLineContent holds what one line of a rendered diff offers to a reader trying
 // to recover which line of which file it came from: the line's text, which can be
 // parsed as a unified diff when the rendering preserves one, and the OSC 1717
@@ -2324,22 +2219,28 @@ func applySelTextColor(fgColor, selTextColor Attribute) Attribute {
 	return fgColor | selTextColor&AttrStyleBits
 }
 
-// SetLineFlash temporarily marks a view line without moving or changing the
-// selection. The caller owns the lifetime and clears it with ClearLineFlash.
-func (v *View) SetLineFlash(viewLine int) {
-	v.writeMutex.Lock()
-	defer v.writeMutex.Unlock()
+// SetHighlight toggles highlighting of separate lines, for custom lists
+// or multiple selection in views.
+func (v *View) SetHighlight(y int, on bool) {
+	if y < 0 || y >= len(v.buf.lines) {
+		return
+	}
 
-	v.lineFlashY = viewLine
-	v.needsRedraw = true
-}
-
-func (v *View) ClearLineFlash() {
-	v.writeMutex.Lock()
-	defer v.writeMutex.Unlock()
-
-	v.lineFlashY = -1
-	v.needsRedraw = true
+	cells := make([]cell, 0, len(v.buf.lines[y].cells))
+	for _, c := range v.buf.lines[y].cells {
+		if on {
+			c.bgColor = v.SelBgColor
+			c.fgColor = v.SelFgColor
+		} else {
+			c.bgColor = v.BgColor
+			c.fgColor = v.FgColor
+		}
+		cells = append(cells, c)
+	}
+	v.tainted = true
+	v.firstDirtyLine = min(v.firstDirtyLine, y)
+	v.buf.lines[y].cells = cells
+	v.clearHover()
 }
 
 func lineWrap(line []cell, columns int) [][]cell {

pkg/gocui/view_test.go

@@ -1093,32 +1093,6 @@ func TestSelectedLinesOfWrappedContent(t *testing.T) {
 	assert.Equal(t, []string{"a line that wraps"}, v.SelectedLines())
 }
 
-func TestLineFlashReversesTheSelectionBarWithoutChangingSelection(t *testing.T) {
-	WithSimulationScreen(t, 14, 6)
-
-	v := NewView("name", 0, 0, 11, 5, OutputNormal)
-	v.Highlight = true
-	v.SelBgColor = ColorBlue
-	v.SelectedLineColorWidth = 2
-	v.writeString("one\ntwo\nthree\n")
-	v.FocusPoint(0, 1, false)
-	v.SetLineFlash(1)
-	v.draw(true)
-
-	for x := 1; x <= 2; x++ {
-		_, style, _ := Screen.Get(x, 2)
-		assert.True(t, style.HasReverse(), "selection-bar cell at (%d, 2) should flash", x)
-	}
-	_, style, _ := Screen.Get(3, 2)
-	assert.False(t, style.HasReverse(), "the flash should stop after the selection bar")
-	assert.Equal(t, "two", v.SelectedLine(), "flashing should not change the selection")
-
-	v.ClearLineFlash()
-	v.draw(true)
-	_, style, _ = Screen.Get(1, 2)
-	assert.False(t, style.HasReverse(), "clearing should remove the flash")
-}
-
 // Resizing a view throws away the wrapping of its content and wraps it again for
 // the new width, which moves every line of it to a different view line. The
 // positions into the view count view lines, so they all have to come along.
@@ -1145,91 +1119,3 @@ func TestResizingAWrappingViewKeepsItsPlaceInTheContent(t *testing.T) {
 
 	assert.Equal(t, []string{"another wrapping line"}, v.SelectedLines())
 }
-
-// The inclusion gutter reserves columns at the left of every line, draws its marker
-// on the marked lines only, and moves the content out of the way.
-func TestInclusionGutter(t *testing.T) {
-	WithSimulationScreen(t, 14, 6)
-
-	// InnerWidth 10; the frame puts view x=0 at screen x=1.
-	v := NewView("name", 0, 0, 11, 5, OutputNormal)
-	v.Wrap = true
-	v.InclusionGutterMarker = "✓"
-
-	v.writeString("aaa\nbbb\nccc\n")
-
-	// The gutter is two columns wide — the marker and a space; mark the middle line.
-	v.SetInclusionGutter(true, []bool{false, true, false})
-	v.draw(true)
-
-	chr, _, _ := Screen.Get(1, 1)
-	assert.Equal(t, " ", chr, "an unmarked line has no marker")
-	chr, _, _ = Screen.Get(1, 2)
-	assert.Equal(t, "✓", chr, "a marked line has one")
-	chr, _, _ = Screen.Get(1, 3)
-	assert.Equal(t, " ", chr, "an unmarked line has no marker")
-
-	// The content begins after the gutter: view x=2, i.e. screen x=3.
-	chr, _, _ = Screen.Get(3, 1)
-	assert.Equal(t, "a", chr)
-	chr, _, _ = Screen.Get(3, 2)
-	assert.Equal(t, "b", chr)
-	chr, _, _ = Screen.Get(3, 3)
-	assert.Equal(t, "c", chr)
-
-	// Hiding the gutter puts the content back at the left edge.
-	v.SetInclusionGutter(false, nil)
-	v.draw(true)
-	chr, _, _ = Screen.Get(1, 1)
-	assert.Equal(t, "a", chr)
-}
-
-// A marked line the view wraps is marked on every segment it is drawn as, so that
-// the mark doesn't look like it belongs to the first part of the line alone. The
-// gutter takes its columns out of the width the content wraps in.
-func TestInclusionGutterMarksEverySegmentOfAWrappedLine(t *testing.T) {
-	WithSimulationScreen(t, 14, 6)
-
-	v := NewView("name", 0, 0, 11, 5, OutputNormal) // InnerWidth 10
-	v.Wrap = true
-	v.InclusionGutterMarker = "✓"
-
-	// Ten cells, wrapping at eight once the two-column gutter is shown.
-	v.writeString("0123456789\n")
-	v.SetInclusionGutter(true, []bool{true})
-	v.draw(true)
-
-	chr, _, _ := Screen.Get(1, 1)
-	assert.Equal(t, "✓", chr)
-	chr, _, _ = Screen.Get(3, 1)
-	assert.Equal(t, "0", chr)
-	chr, _, _ = Screen.Get(10, 1)
-	assert.Equal(t, "7", chr, "the content wraps at the width the gutter leaves it")
-
-	chr, _, _ = Screen.Get(1, 2)
-	assert.Equal(t, "✓", chr, "the line's second segment is marked too")
-	chr, _, _ = Screen.Get(3, 2)
-	assert.Equal(t, "8", chr)
-}
-
-// Showing the gutter narrows the content, so the content wraps again — and the
-// positions into it, which count the segments lines are drawn as, have to come
-// along, as they do for any other change of width.
-func TestShowingTheInclusionGutterKeepsThePlaceInTheContent(t *testing.T) {
-	v := NewView("name", 0, 0, 11, 10, OutputNormal) // InnerWidth 10
-	v.Wrap = true
-	v.Highlight = true
-	v.InclusionGutterMarker = "✓"
-
-	v.writeString("one\ntwo\nthree\nsomethingfartoolong\n")
-	assert.Equal(t, 5, v.ViewLinesHeight())
-
-	v.FocusPoint(0, 2, false)
-	assert.Equal(t, "three", v.SelectedLine())
-
-	// With eight columns left for the content, the last line wraps into three
-	// segments rather than two.
-	v.SetInclusionGutter(true, []bool{false, false, true, false})
-	assert.Equal(t, 6, v.ViewLinesHeight())
-	assert.Equal(t, "three", v.SelectedLine())
-}

pkg/gui/context.go

@@ -350,6 +350,18 @@ func (self *ContextMgr) AllList() []types.IListContext {
 	return listContexts
 }
 
+func (self *ContextMgr) AllPatchExplorer() []types.IPatchExplorerContext {
+	var listContexts []types.IPatchExplorerContext
+
+	for _, context := range self.allContexts.Flatten() {
+		if listContext, ok := context.(types.IPatchExplorerContext); ok {
+			listContexts = append(listContexts, listContext)
+		}
+	}
+
+	return listContexts
+}
+
 func (self *ContextMgr) ContextForKey(key types.ContextKey) types.Context {
 	self.RLock()
 	defer self.RUnlock()

pkg/gui/context/commit_files_context.go

@@ -19,36 +19,16 @@ type CommitFilesContext struct {
 }
 
 var (
-	_ types.IListContext           = (*CommitFilesContext)(nil)
-	_ types.DiffableContext        = (*CommitFilesContext)(nil)
-	_ types.IFilterableContext     = (*CommitFilesContext)(nil)
-	_ types.DiffMainViewContext    = (*CommitFilesContext)(nil)
-	_ types.PullRequestDiffContext = (*CommitFilesContext)(nil)
+	_ types.IListContext        = (*CommitFilesContext)(nil)
+	_ types.DiffableContext     = (*CommitFilesContext)(nil)
+	_ types.IFilterableContext  = (*CommitFilesContext)(nil)
+	_ types.DiffMainViewContext = (*CommitFilesContext)(nil)
 )
 
 func (self *CommitFilesContext) GetDiffMainViewType() types.DiffMainViewType {
 	return types.DiffMainViewTypePatchBuilding
 }
 
-// BranchForPullRequest asks the panel this one was entered from: the files are a
-// commit's, and which branch's pull request that commit is up for review in is known
-// there rather than here.
-func (self *CommitFilesContext) BranchForPullRequest() string {
-	if parent, ok := self.GetParentContext().(types.PullRequestDiffContext); ok {
-		return parent.BranchForPullRequest()
-	}
-	return ""
-}
-
-// CommitsForPullRequest asks the panel this one was entered from as well: the files
-// listed here are those of the commits selected there.
-func (self *CommitFilesContext) CommitsForPullRequest() ([]*models.Commit, string) {
-	if parent, ok := self.GetParentContext().(types.PullRequestDiffContext); ok {
-		return parent.CommitsForPullRequest()
-	}
-	return nil, ""
-}
-
 func NewCommitFilesContext(c *ContextCommon) *CommitFilesContext {
 	viewModel := filetree.NewCommitFileTreeViewModel(
 		func() []*models.CommitFile { return c.Model().CommitFiles },

pkg/gui/context/context.go

@@ -8,23 +8,27 @@ const (
 	// used as a nil value when passing a context key as an arg
 	NO_CONTEXT types.ContextKey = "none"
 
-	GLOBAL_CONTEXT_KEY           types.ContextKey = "global"
-	STATUS_CONTEXT_KEY           types.ContextKey = "status"
-	SNAKE_CONTEXT_KEY            types.ContextKey = "snake"
-	FILES_CONTEXT_KEY            types.ContextKey = "files"
-	LOCAL_BRANCHES_CONTEXT_KEY   types.ContextKey = "localBranches"
-	REMOTES_CONTEXT_KEY          types.ContextKey = "remotes"
-	WORKTREES_CONTEXT_KEY        types.ContextKey = "worktrees"
-	REMOTE_BRANCHES_CONTEXT_KEY  types.ContextKey = "remoteBranches"
-	TAGS_CONTEXT_KEY             types.ContextKey = "tags"
-	LOCAL_COMMITS_CONTEXT_KEY    types.ContextKey = "commits"
-	REFLOG_COMMITS_CONTEXT_KEY   types.ContextKey = "reflogCommits"
-	SUB_COMMITS_CONTEXT_KEY      types.ContextKey = "subCommits"
-	COMMIT_FILES_CONTEXT_KEY     types.ContextKey = "commitFiles"
-	STASH_CONTEXT_KEY            types.ContextKey = "stash"
-	NORMAL_MAIN_CONTEXT_KEY      types.ContextKey = "normal"
-	NORMAL_SECONDARY_CONTEXT_KEY types.ContextKey = "normalSecondary"
-	MERGE_CONFLICTS_CONTEXT_KEY  types.ContextKey = "mergeConflicts"
+	GLOBAL_CONTEXT_KEY                   types.ContextKey = "global"
+	STATUS_CONTEXT_KEY                   types.ContextKey = "status"
+	SNAKE_CONTEXT_KEY                    types.ContextKey = "snake"
+	FILES_CONTEXT_KEY                    types.ContextKey = "files"
+	LOCAL_BRANCHES_CONTEXT_KEY           types.ContextKey = "localBranches"
+	REMOTES_CONTEXT_KEY                  types.ContextKey = "remotes"
+	WORKTREES_CONTEXT_KEY                types.ContextKey = "worktrees"
+	REMOTE_BRANCHES_CONTEXT_KEY          types.ContextKey = "remoteBranches"
+	TAGS_CONTEXT_KEY                     types.ContextKey = "tags"
+	LOCAL_COMMITS_CONTEXT_KEY            types.ContextKey = "commits"
+	REFLOG_COMMITS_CONTEXT_KEY           types.ContextKey = "reflogCommits"
+	SUB_COMMITS_CONTEXT_KEY              types.ContextKey = "subCommits"
+	COMMIT_FILES_CONTEXT_KEY             types.ContextKey = "commitFiles"
+	STASH_CONTEXT_KEY                    types.ContextKey = "stash"
+	NORMAL_MAIN_CONTEXT_KEY              types.ContextKey = "normal"
+	NORMAL_SECONDARY_CONTEXT_KEY         types.ContextKey = "normalSecondary"
+	STAGING_MAIN_CONTEXT_KEY             types.ContextKey = "staging"
+	STAGING_SECONDARY_CONTEXT_KEY        types.ContextKey = "stagingSecondary"
+	PATCH_BUILDING_MAIN_CONTEXT_KEY      types.ContextKey = "patchBuilding"
+	PATCH_BUILDING_SECONDARY_CONTEXT_KEY types.ContextKey = "patchBuildingSecondary"
+	MERGE_CONFLICTS_CONTEXT_KEY          types.ContextKey = "mergeConflicts"
 
 	// these shouldn't really be needed for anything but I'm giving them unique keys nonetheless
 	OPTIONS_CONTEXT_KEY        types.ContextKey = "options"
@@ -62,6 +66,10 @@ var AllContextKeys = []types.ContextKey{
 	STASH_CONTEXT_KEY,
 	NORMAL_MAIN_CONTEXT_KEY,
 	NORMAL_SECONDARY_CONTEXT_KEY,
+	STAGING_MAIN_CONTEXT_KEY,
+	STAGING_SECONDARY_CONTEXT_KEY,
+	PATCH_BUILDING_MAIN_CONTEXT_KEY,
+	PATCH_BUILDING_SECONDARY_CONTEXT_KEY,
 	MERGE_CONFLICTS_CONTEXT_KEY,
 
 	MENU_CONTEXT_KEY,
@@ -75,31 +83,35 @@ var AllContextKeys = []types.ContextKey{
 }
 
 type ContextTree struct {
-	Global            types.Context
-	Status            types.Context
-	Snake             types.Context
-	Files             *WorkingTreeContext
-	Menu              *MenuContext
-	Branches          *BranchesContext
-	Tags              *TagsContext
-	LocalCommits      *LocalCommitsContext
-	CommitFiles       *CommitFilesContext
-	Remotes           *RemotesContext
-	Worktrees         *WorktreesContext
-	Submodules        *SubmodulesContext
-	RemoteBranches    *RemoteBranchesContext
-	ReflogCommits     *ReflogCommitsContext
-	SubCommits        *SubCommitsContext
-	Stash             *StashContext
-	Suggestions       *SuggestionsContext
-	Normal            *MainContext
-	NormalSecondary   *MainContext
-	MergeConflicts    *MergeConflictsContext
-	Confirmation      *ConfirmationContext
-	Prompt            *PromptContext
-	CommitMessage     *CommitMessageContext
-	CommitDescription types.Context
-	CommandLog        types.Context
+	Global                      types.Context
+	Status                      types.Context
+	Snake                       types.Context
+	Files                       *WorkingTreeContext
+	Menu                        *MenuContext
+	Branches                    *BranchesContext
+	Tags                        *TagsContext
+	LocalCommits                *LocalCommitsContext
+	CommitFiles                 *CommitFilesContext
+	Remotes                     *RemotesContext
+	Worktrees                   *WorktreesContext
+	Submodules                  *SubmodulesContext
+	RemoteBranches              *RemoteBranchesContext
+	ReflogCommits               *ReflogCommitsContext
+	SubCommits                  *SubCommitsContext
+	Stash                       *StashContext
+	Suggestions                 *SuggestionsContext
+	Normal                      *MainContext
+	NormalSecondary             *MainContext
+	Staging                     *PatchExplorerContext
+	StagingSecondary            *PatchExplorerContext
+	CustomPatchBuilder          *PatchExplorerContext
+	CustomPatchBuilderSecondary types.Context
+	MergeConflicts              *MergeConflictsContext
+	Confirmation                *ConfirmationContext
+	Prompt                      *PromptContext
+	CommitMessage               *CommitMessageContext
+	CommitDescription           types.Context
+	CommandLog                  types.Context
 
 	// display contexts
 	AppStatus     types.Context
@@ -137,6 +149,10 @@ func (self *ContextTree) Flatten() []types.Context {
 		self.CommitDescription,
 
 		self.MergeConflicts,
+		self.StagingSecondary,
+		self.Staging,
+		self.CustomPatchBuilderSecondary,
+		self.CustomPatchBuilder,
 		self.NormalSecondary,
 		self.Normal,
 

pkg/gui/context/local_commits_context.go

@@ -31,70 +31,16 @@ type commitDropIndicator struct {
 }
 
 var (
-	_ types.IListContext           = (*LocalCommitsContext)(nil)
-	_ types.DiffableContext        = (*LocalCommitsContext)(nil)
-	_ types.ISearchableContext     = (*LocalCommitsContext)(nil)
-	_ types.DiffMainViewContext    = (*LocalCommitsContext)(nil)
-	_ types.PullRequestDiffContext = (*LocalCommitsContext)(nil)
+	_ types.IListContext        = (*LocalCommitsContext)(nil)
+	_ types.DiffableContext     = (*LocalCommitsContext)(nil)
+	_ types.ISearchableContext  = (*LocalCommitsContext)(nil)
+	_ types.DiffMainViewContext = (*LocalCommitsContext)(nil)
 )
 
 func (self *LocalCommitsContext) GetDiffMainViewType() types.DiffMainViewType {
 	return types.DiffMainViewTypePatchBuilding
 }
 
-// BranchForPullRequest returns the checked-out branch: this panel shows its commits,
-// so a pull request for it is where they are up for review.
-func (self *LocalCommitsContext) BranchForPullRequest() string {
-	return self.ListContextTrait.c.Model().CheckedOutBranch
-}
-
-func (self *LocalCommitsContext) CommitsForPullRequest() ([]*models.Commit, string) {
-	selectedCommits, _, _ := self.GetSelectedItems()
-	commits := commitsShownInDiff(selectedCommits, self.GetSelected(), self.GetSelectedRefRangeForDiffFiles())
-	return commits, pullRequestBaseForCommits(self.GetCommits(), commits)
-}
-
-// commitsShownInDiff returns the commits whose combined diff a panel listing a branch's
-// commits renders into the main view: the selected range where it has a range to diff,
-// and the commit at the cursor otherwise. The panel hands the same two to
-// DiffHelper.GetUpdateTaskForRenderingCommitsDiff, so anything acting on the diff on
-// screen acts on the commits that diff is of.
-func commitsShownInDiff(
-	selectedCommits []*models.Commit, commitAtCursor *models.Commit, refRange *types.RefRange,
-) []*models.Commit {
-	if refRange != nil {
-		return selectedCommits
-	}
-	if commitAtCursor == nil {
-		return nil
-	}
-	return []*models.Commit{commitAtCursor}
-}
-
-// pullRequestBaseForCommits returns the hash of the commit the diff of the given commits
-// starts after: the parent of the oldest of them. A pull request holds only the commits
-// of the branch that are pushed, so a parent that isn't pushed is none of its own. The
-// diff then starts where the pull request itself does, and "" says so.
-func pullRequestBaseForCommits(allCommits []*models.Commit, commits []*models.Commit) string {
-	if len(commits) == 0 {
-		return ""
-	}
-
-	oldest := commits[len(commits)-1]
-	if oldest.IsFirstCommit() {
-		return ""
-	}
-
-	parentHash := oldest.Parents()[0]
-	parentIsInPullRequest := lo.ContainsBy(allCommits, func(commit *models.Commit) bool {
-		return commit.Hash() == parentHash && commit.Status == models.StatusPushed
-	})
-	if !parentIsInPullRequest {
-		return ""
-	}
-	return parentHash
-}
-
 func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 	dropIndicator := &commitDropIndicator{insertionIndex: -1}
 	viewModel := NewLocalCommitsViewModel(

pkg/gui/context/local_commits_context_test.go

@@ -4,12 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -55,101 +51,3 @@ func TestAddMovingCommitsIndicator(t *testing.T) {
 		},
 	}, items)
 }
-
-func TestCommitsShownInDiff(t *testing.T) {
-	hashPool := &utils.StringPool{}
-	newer := models.NewCommit(hashPool, models.NewCommitOpts{Hash: "newer"})
-	older := models.NewCommit(hashPool, models.NewCommitOpts{Hash: "older"})
-	selected := []*models.Commit{newer, older}
-
-	scenarios := []struct {
-		name           string
-		selectedCommit *models.Commit
-		refRange       *types.RefRange
-		expected       []*models.Commit
-	}{
-		{
-			name:           "a range is diffed as a whole",
-			selectedCommit: newer,
-			refRange:       &types.RefRange{From: older, To: newer},
-			expected:       selected,
-		},
-		{
-			name:           "without a range to diff, only the commit at the cursor is",
-			selectedCommit: newer,
-			expected:       []*models.Commit{newer},
-		},
-		{
-			name: "nothing is diffed while nothing is selected",
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			assert.Equal(t, s.expected, commitsShownInDiff(selected, s.selectedCommit, s.refRange))
-		})
-	}
-}
-
-func TestPullRequestBaseForCommits(t *testing.T) {
-	hashPool := &utils.StringPool{}
-	commit := func(hash string, parent string, status models.CommitStatus) *models.Commit {
-		return models.NewCommit(hashPool, models.NewCommitOpts{
-			Hash:    hash,
-			Parents: lo.Ternary(parent == "", []string{}, []string{parent}),
-			Status:  status,
-		})
-	}
-
-	// A branch of three pushed commits whose tip was amended, on top of a commit that
-	// is in a main branch already, as the panel lists them: newest first.
-	amended := commit("amended", "third", models.StatusUnpushed)
-	third := commit("third", "second", models.StatusPushed)
-	second := commit("second", "first", models.StatusPushed)
-	first := commit("first", "merged", models.StatusPushed)
-	merged := commit("merged", "ancient", models.StatusMerged)
-	ancient := commit("ancient", "", models.StatusMerged)
-	allCommits := []*models.Commit{amended, third, second, first, merged, ancient}
-
-	scenarios := []struct {
-		name     string
-		commits  []*models.Commit
-		expected string
-	}{
-		{
-			name:     "a single commit starts after its parent",
-			commits:  []*models.Commit{second},
-			expected: "first",
-		},
-		{
-			name:     "a range starts after the parent of its oldest commit",
-			commits:  []*models.Commit{third, second},
-			expected: "first",
-		},
-		{
-			name:    "the pull request's first commit starts where the pull request does",
-			commits: []*models.Commit{first},
-		},
-		{
-			name:    "so does a range reaching down to it",
-			commits: []*models.Commit{third, second, first},
-		},
-		{
-			name:    "and so does the first commit of the repository",
-			commits: []*models.Commit{ancient},
-		},
-		{
-			name:    "a parent the panel doesn't list is none of the pull request's",
-			commits: []*models.Commit{commit("elsewhere", "unlisted", models.StatusPushed)},
-		},
-		{
-			name: "nothing is shown",
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			assert.Equal(t, s.expected, pullRequestBaseForCommits(allCommits, s.commits))
-		})
-	}
-}

pkg/gui/context/patch_explorer_context.go

@@ -0,0 +1,154 @@
+package context
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	deadlock "github.com/sasha-s/go-deadlock"
+)
+
+type PatchExplorerContext struct {
+	*SimpleContext
+	*SearchTrait
+
+	state                  *patch_exploring.State
+	viewTrait              *ViewTrait
+	getIncludedLineIndices func() []int
+	c                      *ContextCommon
+	mutex                  deadlock.Mutex
+
+	// true if we're inside the OnSelectItem callback; in that case we don't want to update the
+	// search result index.
+	inOnSelectItemCallback bool
+}
+
+var (
+	_ types.IPatchExplorerContext = (*PatchExplorerContext)(nil)
+	_ types.ISearchableContext    = (*PatchExplorerContext)(nil)
+)
+
+func NewPatchExplorerContext(
+	view *gocui.View,
+	windowName string,
+	key types.ContextKey,
+
+	getIncludedLineIndices func() []int,
+
+	c *ContextCommon,
+) *PatchExplorerContext {
+	ctx := &PatchExplorerContext{
+		state:                  nil,
+		viewTrait:              NewViewTrait(view),
+		c:                      c,
+		getIncludedLineIndices: getIncludedLineIndices,
+		SimpleContext: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
+			View:                       view,
+			WindowName:                 windowName,
+			Key:                        key,
+			Kind:                       types.MAIN_CONTEXT,
+			Focusable:                  true,
+			HasSelectableContent:       true,
+			NeedsRerenderOnWidthChange: types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_WIDTH_CHANGES,
+		})),
+		SearchTrait: NewSearchTrait(c),
+	}
+
+	ctx.SetHandleRenderFunc(ctx.OnViewWidthChanged)
+
+	return ctx
+}
+
+func (self *PatchExplorerContext) IsPatchExplorerContext() {}
+
+func (self *PatchExplorerContext) GetState() *patch_exploring.State {
+	return self.state
+}
+
+func (self *PatchExplorerContext) SetState(state *patch_exploring.State) {
+	self.state = state
+}
+
+func (self *PatchExplorerContext) GetViewTrait() types.IViewTrait {
+	return self.viewTrait
+}
+
+func (self *PatchExplorerContext) GetIncludedLineIndices() []int {
+	return self.getIncludedLineIndices()
+}
+
+func (self *PatchExplorerContext) RenderAndFocus() {
+	self.setContent()
+
+	self.FocusSelection()
+	self.c.Render()
+}
+
+func (self *PatchExplorerContext) Render() {
+	self.setContent()
+
+	self.c.Render()
+}
+
+func (self *PatchExplorerContext) setContent() {
+	self.GetView().SetContent(self.GetContentToRender())
+}
+
+func (self *PatchExplorerContext) FocusSelection() {
+	view := self.GetView()
+	state := self.GetState()
+	bufferHeight := view.InnerHeight()
+	_, origin := view.Origin()
+	numLines := view.ViewLinesHeight()
+
+	newOriginY := state.CalculateOrigin(origin, bufferHeight, numLines)
+
+	view.SetOriginY(newOriginY)
+
+	startIdx, endIdx := state.SelectedViewRange()
+	// As far as the view is concerned, we are always selecting a range
+	view.SetRangeSelectStart(startIdx)
+	view.SetCursorY(endIdx - newOriginY)
+
+	if !self.inOnSelectItemCallback {
+		view.SetNearestSearchPosition()
+	}
+}
+
+func (self *PatchExplorerContext) GetContentToRender() string {
+	if self.GetState() == nil {
+		return ""
+	}
+
+	return self.GetState().RenderForLineIndices(self.GetIncludedLineIndices())
+}
+
+func (self *PatchExplorerContext) NavigateTo(selectedLineIdx int) {
+	self.GetState().SetLineSelectMode()
+	self.GetState().SelectLine(selectedLineIdx)
+
+	self.RenderAndFocus()
+}
+
+func (self *PatchExplorerContext) GetMutex() *deadlock.Mutex {
+	return &self.mutex
+}
+
+func (self *PatchExplorerContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
+	return nil
+}
+
+func (self *PatchExplorerContext) OnSearchSelect(selectedLineIdx int) {
+	self.GetMutex().Lock()
+	defer self.GetMutex().Unlock()
+	self.inOnSelectItemCallback = true
+	self.NavigateTo(selectedLineIdx)
+	self.inOnSelectItemCallback = false
+}
+
+func (self *PatchExplorerContext) OnViewWidthChanged() {
+	if state := self.GetState(); state != nil {
+		state.OnViewWidthChanged(self.GetView())
+		self.setContent()
+		self.RenderAndFocus()
+	}
+}

pkg/gui/context/setup.go

@@ -41,6 +41,48 @@ func NewContextTree(c *ContextCommon) *ContextTree {
 		Suggestions:     NewSuggestionsContext(c),
 		Normal:          NewMainContext(c.Views().Main, "main", NORMAL_MAIN_CONTEXT_KEY, c),
 		NormalSecondary: NewMainContext(c.Views().Secondary, "secondary", NORMAL_SECONDARY_CONTEXT_KEY, c),
+		Staging: NewPatchExplorerContext(
+			c.Views().Staging,
+			"main",
+			STAGING_MAIN_CONTEXT_KEY,
+			func() []int { return nil },
+			c,
+		),
+		StagingSecondary: NewPatchExplorerContext(
+			c.Views().StagingSecondary,
+			"secondary",
+			STAGING_SECONDARY_CONTEXT_KEY,
+			func() []int { return nil },
+			c,
+		),
+		CustomPatchBuilder: NewPatchExplorerContext(
+			c.Views().PatchBuilding,
+			"main",
+			PATCH_BUILDING_MAIN_CONTEXT_KEY,
+			func() []int {
+				file := commitFilesContext.GetSelectedFile()
+				if file == nil {
+					return nil
+				}
+				includedLineIndices, err := c.Git().Patch.PatchBuilder.GetFileIncLineIndices(file.Path, file.PreviousPath)
+				if err != nil {
+					c.Log.Error(err)
+					return nil
+				}
+
+				return includedLineIndices
+			},
+			c,
+		),
+		CustomPatchBuilderSecondary: NewSimpleContext(
+			NewBaseContext(NewBaseContextOpts{
+				Kind:       types.MAIN_CONTEXT,
+				View:       c.Views().PatchBuildingSecondary,
+				WindowName: "secondary",
+				Key:        PATCH_BUILDING_SECONDARY_CONTEXT_KEY,
+				Focusable:  false,
+			}),
+		),
 		MergeConflicts: NewMergeConflictsContext(
 			c,
 		),

pkg/gui/context/sub_commits_context.go

@@ -21,33 +21,16 @@ type SubCommitsContext struct {
 }
 
 var (
-	_ types.IListContext           = (*SubCommitsContext)(nil)
-	_ types.DiffableContext        = (*SubCommitsContext)(nil)
-	_ types.ISearchableContext     = (*SubCommitsContext)(nil)
-	_ types.DiffMainViewContext    = (*SubCommitsContext)(nil)
-	_ types.PullRequestDiffContext = (*SubCommitsContext)(nil)
+	_ types.IListContext        = (*SubCommitsContext)(nil)
+	_ types.DiffableContext     = (*SubCommitsContext)(nil)
+	_ types.ISearchableContext  = (*SubCommitsContext)(nil)
+	_ types.DiffMainViewContext = (*SubCommitsContext)(nil)
 )
 
 func (self *SubCommitsContext) GetDiffMainViewType() types.DiffMainViewType {
 	return types.DiffMainViewTypePatchBuilding
 }
 
-// BranchForPullRequest returns the branch this panel was entered from, whose commits it
-// shows. The panel is also entered from a tag, a remote branch and the reflog, none of
-// which a pull request is made from.
-func (self *SubCommitsContext) BranchForPullRequest() string {
-	if branch, ok := self.GetRef().(*models.Branch); ok {
-		return branch.Name
-	}
-	return ""
-}
-
-func (self *SubCommitsContext) CommitsForPullRequest() ([]*models.Commit, string) {
-	selectedCommits, _, _ := self.GetSelectedItems()
-	commits := commitsShownInDiff(selectedCommits, self.GetSelected(), self.GetSelectedRefRangeForDiffFiles())
-	return commits, pullRequestBaseForCommits(self.GetCommits(), commits)
-}
-
 func NewSubCommitsContext(
 	c *ContextCommon,
 ) *SubCommitsContext {

pkg/gui/controllers.go

@@ -52,7 +52,8 @@ func (gui *Gui) resetHelpersAndControllers() {
 
 	gpgHelper := helpers.NewGpgHelper(helperCommon)
 	viewHelper := helpers.NewViewHelper(helperCommon, gui.State.Contexts)
-	customPatchHelper := helpers.NewCustomPatchHelper(helperCommon)
+	patchBuildingHelper := helpers.NewPatchBuildingHelper(helperCommon)
+	stagingHelper := helpers.NewStagingHelper(helperCommon)
 	mergeConflictsHelper := helpers.NewMergeConflictsHelper(helperCommon)
 	searchHelper := helpers.NewSearchHelper(helperCommon)
 
@@ -60,6 +61,8 @@ func (gui *Gui) resetHelpersAndControllers() {
 		helperCommon,
 		refsHelper,
 		rebaseHelper,
+		patchBuildingHelper,
+		stagingHelper,
 		mergeConflictsHelper,
 		worktreeHelper,
 		searchHelper,
@@ -75,7 +78,7 @@ func (gui *Gui) resetHelpersAndControllers() {
 	modeHelper := helpers.NewModeHelper(
 		helperCommon,
 		diffHelper,
-		customPatchHelper,
+		patchBuildingHelper,
 		cherryPickHelper,
 		rebaseHelper,
 		bisectHelper,
@@ -89,7 +92,8 @@ func (gui *Gui) resetHelpersAndControllers() {
 	gui.helpers = &helpers.Helpers{
 		Refs:            refsHelper,
 		Host:            helpers.NewHostHelper(helperCommon),
-		CustomPatch:     customPatchHelper,
+		PatchBuilding:   patchBuildingHelper,
+		Staging:         stagingHelper,
 		Bisect:          bisectHelper,
 		Suggestions:     suggestionsHelper,
 		Files:           helpers.NewFilesHelper(helperCommon),
@@ -179,8 +183,12 @@ func (gui *Gui) resetHelpersAndControllers() {
 	gitFlowController := controllers.NewGitFlowController(common)
 	stashController := controllers.NewStashController(common)
 	commitFilesController := controllers.NewCommitFilesController(common)
+	patchExplorerControllerFactory := controllers.NewPatchExplorerControllerFactory(common)
+	stagingController := controllers.NewStagingController(common, gui.State.Contexts.Staging, gui.State.Contexts.StagingSecondary, false)
+	stagingSecondaryController := controllers.NewStagingController(common, gui.State.Contexts.StagingSecondary, gui.State.Contexts.Staging, true)
 	mainViewController := controllers.NewMainViewController(common, gui.State.Contexts.Normal, gui.State.Contexts.NormalSecondary)
 	secondaryViewController := controllers.NewMainViewController(common, gui.State.Contexts.NormalSecondary, gui.State.Contexts.Normal)
+	patchBuildingController := controllers.NewPatchBuildingController(common)
 	snakeController := controllers.NewSnakeController(common)
 	reflogCommitsController := controllers.NewReflogCommitsController(common)
 	subCommitsController := controllers.NewSubCommitsController(common)
@@ -277,6 +285,28 @@ func (gui *Gui) resetHelpersAndControllers() {
 	)
 
 	// TODO: add scroll controllers for main panels (need to bring some more functionality across for that e.g. reading more from the currently displayed git command)
+	controllers.AttachControllers(gui.State.Contexts.Staging,
+		stagingController,
+		patchExplorerControllerFactory.Create(gui.State.Contexts.Staging),
+		verticalScrollControllerFactory.Create(gui.State.Contexts.Staging),
+	)
+
+	controllers.AttachControllers(gui.State.Contexts.StagingSecondary,
+		stagingSecondaryController,
+		patchExplorerControllerFactory.Create(gui.State.Contexts.StagingSecondary),
+		verticalScrollControllerFactory.Create(gui.State.Contexts.StagingSecondary),
+	)
+
+	controllers.AttachControllers(gui.State.Contexts.CustomPatchBuilder,
+		patchBuildingController,
+		patchExplorerControllerFactory.Create(gui.State.Contexts.CustomPatchBuilder),
+		verticalScrollControllerFactory.Create(gui.State.Contexts.CustomPatchBuilder),
+	)
+
+	controllers.AttachControllers(gui.State.Contexts.CustomPatchBuilderSecondary,
+		verticalScrollControllerFactory.Create(gui.State.Contexts.CustomPatchBuilderSecondary),
+	)
+
 	controllers.AttachControllers(gui.State.Contexts.MergeConflicts,
 		mergeConflictsController,
 	)

pkg/gui/controllers/branches_controller.go

@@ -208,7 +208,7 @@ func (self *BranchesController) GetOnRenderToMain() func() {
 				rendererTask := types.NewRunDiffRendererTask(cmdObj.GetCmd())
 				task = rendererTask
 
-				pr, ok := self.c.Helpers().Host.PullRequestForBranch(branch.Name)
+				pr, ok := self.c.Model().PullRequestsMap[branch.Name]
 				if ok && presentation.ShouldShowPrForBranch(pr, branch.Name, self.c.UserConfig()) {
 					rendererTask.Prefix = presentation.FormatPullRequestHeader(pr, self.c.Tr)
 					rendererTask.Prefix += strings.Repeat("─", self.c.Contexts().Normal.GetView().InnerWidth()) + "\n"
@@ -462,7 +462,7 @@ func (self *BranchesController) handleCreatePullRequestMenu(selectedBranch *mode
 
 func (self *BranchesController) getPullRequestURL() (string, error) {
 	branch := self.context().GetSelected()
-	if pr, ok := self.c.Helpers().Host.PullRequestForBranch(branch.Name); ok {
+	if pr, ok := self.c.Model().PullRequestsMap[branch.Name]; ok {
 		return pr.Url, nil
 	}
 
@@ -855,11 +855,15 @@ func (self *BranchesController) branchIsReal(branch *models.Branch) *types.Disab
 }
 
 func (self *BranchesController) branchHasPR(branch *models.Branch) *types.DisabledReason {
-	return self.c.Helpers().Host.NoPullRequestDisabledReason(branch.Name)
+	if _, ok := self.c.Model().PullRequestsMap[branch.Name]; !ok {
+		return &types.DisabledReason{Text: self.c.Tr.NoPullRequestForBranch, ShowErrorInPanel: true}
+	}
+
+	return nil
 }
 
 func (self *BranchesController) openPRInBrowser(branch *models.Branch) error {
-	pr, ok := self.c.Helpers().Host.PullRequestForBranch(branch.Name)
+	pr, ok := self.c.Model().PullRequestsMap[branch.Name]
 	if !ok {
 		// Should be guarded against by the DisabledReason check, but be defensive in case
 		// PullRequestsMap was updated concurrently by a background refresh

pkg/gui/controllers/commit_diff_actions.go

@@ -1,461 +0,0 @@
-package controllers
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/patch"
-	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/samber/lo"
-)
-
-// CommitDiffActions implements what a panel showing a commit's diff offers on that diff
-// in the focused main view. Five panels do: the commit files panel shows the diff of one
-// file of a commit, and the commits, sub-commits, stash and reflog panels the whole diff
-// of whatever they have selected. They all offer the same thing and differ only in which
-// diff they show, so they share this, each saying which diff that is.
-type CommitDiffActions struct {
-	c *ControllerCommon
-
-	// The panel this belongs to, and what it is showing the diff of — nil when it has
-	// nothing selected, and so no diff.
-	panel  types.Context
-	target func() *commitDiffTarget
-}
-
-// commitDiffTarget is the diff a panel is showing: the two ends of it, and whether it
-// belongs to a commit lazygit may rewrite.
-type commitDiffTarget struct {
-	from      string
-	to        string
-	canRebase bool
-}
-
-var _ types.FocusedMainViewActions = &CommitDiffActions{}
-
-func NewCommitDiffActions(
-	c *ControllerCommon, panel types.Context, target func() *commitDiffTarget,
-) *CommitDiffActions {
-	return &CommitDiffActions{c: c, panel: panel, target: target}
-}
-
-// PlainDiff hands out the diff the asking pane is showing, for the given files — the
-// commit's diff as in the main view, only without the commit's message and stat above it,
-// or the diff the custom patch is previewed as, whose lines are the patch's own rather
-// than the commit's.
-//
-// The patch's own diff is handed out whole: it is only ever as big as the patch, and it
-// names its files under the trees the patch was materialized into rather than under the
-// paths asked for.
-func (self *CommitDiffActions) PlainDiff(pane types.DiffPaneContext, paths []string) string {
-	if self.showsCustomPatch(pane) {
-		return self.customPatchDiff()
-	}
-
-	target := self.target()
-	if target == nil {
-		return ""
-	}
-	return self.c.Helpers().Diff.PlainDiffBetweenRefs(target.from, target.to, paths)
-}
-
-// customPatchDiff is the diff the custom patch is previewed as, as git writes it — the
-// diff behind what the pane previewing the patch shows, in which the lines shown there
-// can be found again.
-func (self *CommitDiffActions) customPatchDiff() string {
-	treesDir := self.c.Git().Patch.PatchBuilder.TempDir()
-	if treesDir == "" {
-		return ""
-	}
-	// An error means the two trees differ, as they do for any patch with something in
-	// it. We are after the diff itself either way.
-	diff, _ := self.c.Git().Diff.
-		CustomPatchDiffCmdObj(treesDir, git_commands.DiffModePlain).
-		RunWithOutput()
-	return diff
-}
-
-// PrimaryAction takes the selected lines into the custom patch being built from this
-// diff, or back out of it when the first of them is already in — the same toggling the
-// commit files panel does to a whole file at a time.
-//
-// The commit is not touched, so the diff stays as it is: what changes is the patch
-// beside it, and which of its lines are marked as being in that patch.
-func (self *CommitDiffActions) PrimaryAction(pane types.DiffPaneContext, firstLineIdx int, lastLineIdx int) error {
-	// In the pane showing the patch, the lines are the patch's own, so there they only
-	// come back out of it.
-	if self.showsCustomPatch(pane) {
-		return self.removePatchLines(pane, firstLineIdx, lastLineIdx)
-	}
-
-	if self.c.UserConfig().Git.DiffContextSize == 0 {
-		return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextForCustomPatch,
-			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
-	}
-
-	target := self.target()
-	if target == nil {
-		return nil
-	}
-	lines := self.c.Helpers().DiffLine.ChangeLinesInViewRange(pane.GetView(), firstLineIdx, lastLineIdx)
-	if len(lines) == 0 {
-		return nil
-	}
-
-	patchBuilder := self.c.Git().Patch.PatchBuilder
-	from, reverse := self.patchEndpoints(target)
-	// A patch is built from one diff, so building from another one means giving up the
-	// patch there is — which the user is asked about, as entering the patch builder asks.
-	mustDiscardPatch := patchBuilder.Active() && patchBuilder.NewPatchRequired(from, target.to, reverse)
-	return self.c.ConfirmIf(mustDiscardPatch, types.ConfirmOpts{
-		Title:  self.c.Tr.DiscardPatch,
-		Prompt: self.c.Tr.DiscardPatchConfirm,
-		HandleConfirm: func() error {
-			if mustDiscardPatch {
-				patchBuilder.Reset()
-			}
-			if !patchBuilder.Active() {
-				patchBuilder.Start(from, target.to, reverse, target.canRebase)
-			}
-
-			if err := self.togglePatchLines(lines); err != nil {
-				return err
-			}
-			// Taking the last line back out ends the patch rather than leaving an empty
-			// one, so that the pane previewing it and the marks over the diff go with it.
-			if patchBuilder.IsEmpty() {
-				patchBuilder.Reset()
-			}
-
-			// The diff on screen is the one the marks belong to, so they can be brought up
-			// to date at once rather than waiting for the render below.
-			self.c.Helpers().DiffLine.RefreshInclusionGutter()
-
-			// The selection moves on past the lines just toggled, to the next change of
-			// the diff — which is still there, a toggle leaving the diff as it was, so
-			// hold input back until it has moved: a second press meanwhile would toggle
-			// the same lines straight back.
-			self.c.GocuiGui().BeginBlockingEvents()
-			self.c.Helpers().DiffLine.RevealSelectionAfterAction(pane, pane, firstLineIdx, len(lines),
-				self.c.GocuiGui().EndBlockingEvents)
-
-			// The panel's own render, which is all that is needed: the marks over the diff
-			// and the patch previewed beside it have changed, while the commit has not.
-			self.c.PostRefreshUpdate(self.panel)
-			return nil
-		},
-	})
-}
-
-// removePatchLines takes the selected lines of the custom patch out of it. The primary
-// action does this in the pane showing the patch: everything shown there is in the patch
-// already, so there is nothing else it could mean.
-//
-// A line of the patch is named by its position among its file's changes, counted in the
-// diff the patch is shown as. That position is the same one the line has among the
-// changes the patch holds for that file. Line numbers would not do: a patch that leaves
-// an earlier addition out numbers everything after it differently from the commit's diff.
-func (self *CommitDiffActions) removePatchLines(
-	pane types.DiffPaneContext, firstLineIdx int, lastLineIdx int,
-) error {
-	lines := self.c.Helpers().DiffLine.ChangeLinesInViewRange(pane.GetView(), firstLineIdx, lastLineIdx)
-	if len(lines) == 0 {
-		return nil
-	}
-
-	patchBuilder := self.c.Git().Patch.PatchBuilder
-	files := self.filesInDiff()
-	for path, ordinals := range self.c.Helpers().DiffLine.ChangeLineOrdinals(self.customPatchDiff(), lines) {
-		filename := self.patchBuilderPath(path)
-		if filename == "" {
-			continue
-		}
-		included := patchBuilder.IncludedChangeLineIndices(filename)
-		indices := []int{}
-		for _, ordinal := range ordinals {
-			if ordinal < len(included) {
-				indices = append(indices, included[ordinal])
-			}
-		}
-		if len(indices) == 0 {
-			continue
-		}
-		if err := patchBuilder.RemoveFileLineRange(filename, files.previousPath(filename), indices); err != nil {
-			return err
-		}
-	}
-	// Taking the last line out ends the patch rather than leaving an empty one, as it does
-	// in the diff beside this pane.
-	if patchBuilder.IsEmpty() {
-		patchBuilder.Reset()
-	}
-
-	self.c.Helpers().DiffLine.RefreshInclusionGutter()
-
-	// The lines are gone from the patch, so the selection carries on from where they were,
-	// as unstaging leaves it. Input is held until it has moved, so that a second press acts
-	// on the patch as it now is.
-	self.c.GocuiGui().BeginBlockingEvents()
-	self.c.Helpers().DiffLine.RevealSelectionAfterAction(pane, pane, firstLineIdx, 0,
-		self.c.GocuiGui().EndBlockingEvents)
-
-	self.c.PostRefreshUpdate(self.panel)
-	return nil
-}
-
-// DiscardSelection takes the selected lines out of the commit they are part of, by
-// building a patch of exactly those lines and removing that patch from the commit. It is
-// a rebase, so a later commit that touches the same lines can conflict with it.
-//
-// The patch it needs is its own, so a patch being built is given up first — which the
-// prompt says, there being no way to get it back.
-func (self *CommitDiffActions) DiscardSelection(pane types.DiffPaneContext, firstLineIdx int, lastLineIdx int) error {
-	target := self.target()
-	if target == nil {
-		return nil
-	}
-	lines := self.c.Helpers().DiffLine.ChangeLinesInViewRange(pane.GetView(), firstLineIdx, lastLineIdx)
-	if len(lines) == 0 {
-		return nil
-	}
-	commitIndex := self.indexOfTargetCommit(target)
-	if commitIndex == -1 {
-		return nil
-	}
-
-	patchBuilder := self.c.Git().Patch.PatchBuilder
-	prompt := lo.Ternary(patchBuilder.IsEmpty(),
-		self.c.Tr.DiscardLinesFromCommitPrompt,
-		self.c.Tr.DiscardLinesFromCommitPromptWithReset)
-
-	self.c.Confirm(types.ConfirmOpts{
-		Title:  self.c.Tr.DiscardLinesFromCommitTitle,
-		Prompt: prompt,
-		HandleConfirm: func() error {
-			from, reverse := self.patchEndpoints(target)
-			patchBuilder.Reset()
-			patchBuilder.Start(from, target.to, reverse, target.canRebase)
-			if err := self.togglePatchLines(lines); err != nil {
-				return err
-			}
-			if patchBuilder.IsEmpty() {
-				return nil
-			}
-
-			// The rebase runs on a worker, which may not read the model, so the commits
-			// it rewrites are taken here.
-			commits := self.c.Model().Commits
-			return self.c.WithWaitingStatusBlockingInput(types.WaitingStatusOpts{
-				Message:              self.c.Tr.RebasingStatus,
-				HideWorkingTreeState: true,
-			}, func(gocui.Task) error {
-				self.c.LogAction(self.c.Tr.Actions.RemovePatchFromCommit)
-				err := self.c.Git().Patch.DeletePatchesFromCommit(commits, commitIndex)
-				return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
-			})
-		},
-	})
-	return nil
-}
-
-// DiscardSelectionDisabledReason says why the selected lines can't be taken out of the
-// commit: doing so rewrites it, which is only ours to do for a commit of the branch we
-// are on, and not while a rebase is already under way. In the pane previewing the custom
-// patch there is nothing to discard from — the lines there are the patch's, and space
-// takes them back out of it.
-func (self *CommitDiffActions) DiscardSelectionDisabledReason(pane types.DiffPaneContext) *types.DisabledReason {
-	if self.showsCustomPatch(pane) {
-		return &types.DisabledReason{Text: self.c.Tr.CannotDiscardFromCustomPatchView, ShowErrorInPanel: true}
-	}
-	target := self.target()
-	if target == nil || !target.canRebase {
-		return &types.DisabledReason{Text: self.c.Tr.CanOnlyDiscardFromLocalCommits, ShowErrorInPanel: true}
-	}
-	if self.c.Git().Status.WorkingTreeState().Any() {
-		return &types.DisabledReason{Text: self.c.Tr.CantPatchWhileRebasingError, ShowErrorInPanel: true}
-	}
-	if self.c.UserConfig().Git.DiffContextSize == 0 {
-		return &types.DisabledReason{
-			Text: fmt.Sprintf(self.c.Tr.Actions.NotEnoughContextToRemoveLines,
-				self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView),
-			ShowErrorInPanel: true,
-		}
-	}
-	return nil
-}
-
-// PatchInclusion says which lines of the commit's diff are in the custom patch being
-// built from it. nil when there is no such patch: none is being built at all, or the one
-// being built is of another diff, whose lines are not these however alike they look.
-func (self *CommitDiffActions) PatchInclusion() func(types.DiffLineInfo) bool {
-	patchBuilder := self.c.Git().Patch.PatchBuilder
-	target := self.target()
-	if !patchBuilder.Active() || target == nil {
-		return nil
-	}
-	from, reverse := self.patchEndpoints(target)
-	if patchBuilder.NewPatchRequired(from, target.to, reverse) {
-		return nil
-	}
-
-	// Which lines of a file are in the patch is asked of the patch builder per file, and
-	// a diff can span many, so each is asked about when a line of it first comes up.
-	includedByPath := map[string]*set.Set[patch.LineIdentity]{}
-	return func(info types.DiffLineInfo) bool {
-		path := self.patchBuilderPath(info.Path)
-		if path == "" {
-			return false
-		}
-		included, asked := includedByPath[path]
-		if !asked {
-			included = set.NewFromSlice(patchBuilder.IncludedLineIdentities(path))
-			includedByPath[path] = included
-		}
-		return included.Includes(info.PatchLineIdentity())
-	}
-}
-
-// togglePatchLines takes the given lines of the commit's diff into the custom patch, or
-// out of it. The first line of the selection decides which of the two happens, once for
-// the whole selection: pointing at a line that is already in the patch takes the whole
-// selection out of it, as toggling a selection of files in the commit files panel does.
-func (self *CommitDiffActions) togglePatchLines(lines []types.DiffLineInfo) error {
-	patchBuilder := self.c.Git().Patch.PatchBuilder
-
-	// The files the selection covers, in the order the diff shows them, and per file the
-	// lines of it that are selected: a patch is built a file at a time, while a selection
-	// can span several of them.
-	paths := []string{}
-	linesByPath := map[string][]patch.LineIdentity{}
-	for _, line := range lines {
-		path := self.patchBuilderPath(line.Path)
-		if path == "" {
-			continue
-		}
-		if _, seen := linesByPath[path]; !seen {
-			paths = append(paths, path)
-		}
-		linesByPath[path] = append(linesByPath[path], line.PatchLineIdentity())
-	}
-	if len(paths) == 0 {
-		return nil
-	}
-
-	files := self.filesInDiff()
-	indicesByPath := map[string][]int{}
-	wholeFileByPath := map[string]bool{}
-	for _, path := range paths {
-		indices, everyChange, err := patchBuilder.PatchLineIndicesForLines(
-			path, files.previousPath(path), linesByPath[path])
-		if err != nil {
-			return err
-		}
-		indicesByPath[path] = indices
-
-		// Selecting every change of a file the commit adds or deletes is selecting the
-		// file: what the commit did to it is not something its content lines can carry,
-		// so a patch of those alone would move the content and leave the file behind.
-		wholeFileByPath[path] = everyChange && files.isWholeFileOperation(path)
-	}
-
-	included, err := patchBuilder.GetFileIncLineIndices(paths[0], files.previousPath(paths[0]))
-	if err != nil {
-		return err
-	}
-	removing := len(indicesByPath[paths[0]]) > 0 && lo.Contains(included, indicesByPath[paths[0]][0])
-
-	for _, path := range paths {
-		if len(indicesByPath[path]) == 0 {
-			continue
-		}
-		previousPath := files.previousPath(path)
-		var err error
-		switch {
-		case wholeFileByPath[path] && removing:
-			err = patchBuilder.RemoveFile(path, previousPath)
-		case wholeFileByPath[path]:
-			err = patchBuilder.AddFileWhole(path, previousPath)
-		case removing:
-			err = patchBuilder.RemoveFileLineRange(path, previousPath, indicesByPath[path])
-		default:
-			err = patchBuilder.AddFileLineRange(path, previousPath, indicesByPath[path])
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// commitDiffFiles records what the diff a patch is being built from says about each of
-// the files it covers, by the path the diff shows them under.
-type commitDiffFiles map[string]*models.CommitFile
-
-// previousPath says what a file of the diff was called before, and is empty for one
-// that wasn't renamed. A renamed file's diff only comes out as a rename when git is
-// asked about both of its paths, and its lines are numbered in the file under its old
-// name, so the patch builder has to be told the old path along with them.
-func (self commitDiffFiles) previousPath(path string) string {
-	if file, ok := self[path]; ok {
-		return file.PreviousPath
-	}
-	return ""
-}
-
-// isWholeFileOperation reports whether what the commit did to this file is something
-// its diff's content lines don't say: creating it or deleting it, which the file
-// header carries and a patch built from lines alone would leave out.
-func (self commitDiffFiles) isWholeFileOperation(path string) bool {
-	file, ok := self[path]
-	return ok && (file.Added() || file.Deleted())
-}
-
-// filesInDiff asks git which files the diff a patch is being built from covers, and
-// what it does to each.
-func (self *CommitDiffActions) filesInDiff() commitDiffFiles {
-	target := self.target()
-	if target == nil {
-		return nil
-	}
-	from, reverse := self.patchEndpoints(target)
-	files, err := self.c.Git().Loaders.CommitFileLoader.GetFilesInDiff(from, target.to, reverse)
-	if err != nil {
-		return nil
-	}
-
-	return lo.SliceToMap(files, func(file *models.CommitFile) (string, *models.CommitFile) {
-		return file.Path, file
-	})
-}
-
-// patchEndpoints gives the two ends of the diff a patch is built from. They are the ends
-// of the diff shown, except in diffing mode, where what is shown is a diff against
-// another ref, possibly the other way around.
-func (self *CommitDiffActions) patchEndpoints(target *commitDiffTarget) (string, bool) {
-	return self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(target.from)
-}
-
-// patchBuilderPath turns the absolute path a diff line carries into the repo-relative
-// one the patch builder keys a file by, and "" for a path that is no file of this repo.
-func (self *CommitDiffActions) patchBuilderPath(path string) string {
-	return repoRelativePath(self.c.Git().RepoPaths.WorktreePath(), path)
-}
-
-// indexOfTargetCommit finds the commit the diff belongs to among the commits of the
-// branch we are on, which is how a rebase is told which commit to rewrite. -1 when it
-// isn't one of them, in which case there is nothing we can rewrite.
-func (self *CommitDiffActions) indexOfTargetCommit(target *commitDiffTarget) int {
-	return lo.IndexOf(
-		lo.Map(self.c.Model().Commits, func(commit *models.Commit, _ int) string { return commit.Hash() }),
-		target.to)
-}
-
-// showsCustomPatch reports whether the given main pane is the one previewing the custom
-// patch being built, rather than the commit's diff — which for a commit's diff is always
-// the lower one.
-func (self *CommitDiffActions) showsCustomPatch(pane types.DiffPaneContext) bool {
-	return pane.GetKey() == self.c.Contexts().NormalSecondary.GetKey()
-}

pkg/gui/controllers/commits_files_controller.go

@@ -23,9 +23,6 @@ type CommitFilesController struct {
 	baseController
 	*ListControllerTrait[*filetree.CommitFileNode]
 	c *ControllerCommon
-
-	// what this panel offers on the diff it shows in the focused main view
-	diffActions *CommitDiffActions
 }
 
 var _ types.IController = &CommitFilesController{}
@@ -33,7 +30,7 @@ var _ types.IController = &CommitFilesController{}
 func NewCommitFilesController(
 	c *ControllerCommon,
 ) *CommitFilesController {
-	controller := &CommitFilesController{
+	return &CommitFilesController{
 		baseController: baseController{},
 		c:              c,
 		ListControllerTrait: NewListControllerTrait(
@@ -43,18 +40,6 @@ func NewCommitFilesController(
 			c.Contexts().CommitFiles.GetSelectedItems,
 		),
 	}
-	controller.diffActions = NewCommitDiffActions(c, c.Contexts().CommitFiles, controller.diffTarget)
-	return controller
-}
-
-// diffTarget is the commit whose files this panel is showing. Its main view shows the
-// diff of that commit.
-func (self *CommitFilesController) diffTarget() *commitDiffTarget {
-	if self.context().GetRef() == nil && self.context().GetRefRange() == nil {
-		return nil
-	}
-	from, to := self.context().GetFromAndToForDiff()
-	return &commitDiffTarget{from: from, to: to, canRebase: self.context().GetCanRebase()}
 }
 
 func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
@@ -124,8 +109,8 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []
 			Keys:              opts.GetKeys(opts.Config.Universal.GoInto),
 			Handler:           self.withItem(self.enter),
 			GetDisabledReason: self.require(self.singleItemSelected()),
-			Description:       self.c.Tr.FocusCommitFileDiff,
-			Tooltip:           self.c.Tr.FocusCommitFileDiffTooltip,
+			Description:       self.c.Tr.EnterCommitFile,
+			Tooltip:           self.c.Tr.EnterCommitFileTooltip,
 		},
 		{
 			Keys:        opts.GetKeys(opts.Config.Files.ToggleTreeView),
@@ -208,7 +193,15 @@ func (self *CommitFilesController) GetOnRenderToMain() func() {
 }
 
 func (self *CommitFilesController) GetFocusedMainViewDiffSource() types.FocusedMainViewDiffSource {
-	return self.diffActions
+	return self
+}
+
+// PlainDiff hands out the commit's diff for the given files. Both panes show the same
+// diff here — the secondary one shows the custom patch built from it, which is not a
+// diff of the commit — so which pane asks makes no difference.
+func (self *CommitFilesController) PlainDiff(_ types.DiffPaneContext, paths []string) string {
+	from, to := self.context().GetFromAndToForDiff()
+	return self.c.Helpers().Diff.PlainDiffBetweenRefs(from, to, paths)
 }
 
 func (self *CommitFilesController) copyDiffToClipboard(paths []string, toastMessage string) error {
@@ -557,15 +550,41 @@ func (self *CommitFilesController) currentFromToReverseForPatchBuilding() (strin
 }
 
 func (self *CommitFilesController) enter(node *filetree.CommitFileNode) error {
+	return self.enterCommitFile(node, types.OnFocusOpts{ClickedWindowName: "", ClickedViewLineIdx: -1})
+}
+
+func (self *CommitFilesController) enterCommitFile(node *filetree.CommitFileNode, opts types.OnFocusOpts) error {
 	if node.File == nil {
 		return self.handleToggleCommitFileDirCollapsed(node)
 	}
 
-	return focusMainView(self.c, self.context(), -1)
-}
+	if self.c.UserConfig().Git.DiffContextSize == 0 {
+		return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextForCustomPatch,
+			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
+	}
 
-func (self *CommitFilesController) GetOnDoubleClick() func() error {
-	return self.withItemGraceful(self.enter)
+	from, to, reverse := self.currentFromToReverseForPatchBuilding()
+	mustDiscardPatch := self.c.Git().Patch.PatchBuilder.Active() && self.c.Git().Patch.PatchBuilder.NewPatchRequired(from, to, reverse)
+	return self.c.ConfirmIf(mustDiscardPatch, types.ConfirmOpts{
+		Title:  self.c.Tr.DiscardPatch,
+		Prompt: self.c.Tr.DiscardPatchConfirm,
+		HandleConfirm: func() error {
+			if mustDiscardPatch {
+				self.c.Git().Patch.PatchBuilder.Reset()
+			}
+
+			if !self.c.Git().Patch.PatchBuilder.Active() {
+				if err := self.startPatchBuilder(); err != nil {
+					return err
+				}
+			}
+
+			self.c.Context().Push(self.c.Contexts().CustomPatchBuilder, opts)
+			self.c.Helpers().PatchBuilding.ShowHunkStagingHint()
+
+			return nil
+		},
+	})
 }
 
 func (self *CommitFilesController) handleToggleCommitFileDirCollapsed(node *filetree.CommitFileNode) error {

pkg/gui/controllers/context_lines_controller.go

@@ -1,9 +1,11 @@
 package controllers
 
 import (
+	"errors"
 	"fmt"
 	"math"
 
+	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
@@ -49,6 +51,10 @@ func (self *ContextLinesController) Context() types.Context {
 }
 
 func (self *ContextLinesController) Increase() error {
+	if err := self.checkCanChangeContext(); err != nil {
+		return err
+	}
+
 	if self.c.UserConfig().Git.DiffContextSize < math.MaxUint64 {
 		self.c.UserConfig().Git.DiffContextSize++
 	}
@@ -56,6 +62,10 @@ func (self *ContextLinesController) Increase() error {
 }
 
 func (self *ContextLinesController) Decrease() error {
+	if err := self.checkCanChangeContext(); err != nil {
+		return err
+	}
+
 	if self.c.UserConfig().Git.DiffContextSize > 0 {
 		self.c.UserConfig().Git.DiffContextSize--
 	}
@@ -66,11 +76,27 @@ func (self *ContextLinesController) applyChange() error {
 	self.c.Toast(fmt.Sprintf(self.c.Tr.DiffContextSizeChanged, self.c.UserConfig().Git.DiffContextSize))
 
 	currentContext := self.c.Context().CurrentSide()
-	// The diff is about to be rendered again with more or less context around
-	// each change, which reads as the lines you were looking at moving up or down
-	// the view; keep them where they are instead.
-	self.c.Helpers().DiffLine.PreserveDiffPositionOnRerender(self.c.Contexts().Normal.GetView())
-	self.c.Helpers().DiffLine.PreserveDiffPositionOnRerender(self.c.Contexts().NormalSecondary.GetView())
-	currentContext.HandleRenderToMain()
+	switch currentContext.GetKey() {
+	// we make an exception for our staging and patch building contexts because they actually need to refresh their state afterwards.
+	case context.PATCH_BUILDING_MAIN_CONTEXT_KEY:
+		self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.PATCH_BUILDING}})
+	case context.STAGING_MAIN_CONTEXT_KEY, context.STAGING_SECONDARY_CONTEXT_KEY:
+		self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STAGING}})
+	default:
+		// The diff is about to be rendered again with more or less context around
+		// each change, which reads as the lines you were looking at moving up or down
+		// the view; keep them where they are instead.
+		self.c.Helpers().DiffLine.PreserveDiffPositionOnRerender(self.c.Contexts().Normal.GetView())
+		self.c.Helpers().DiffLine.PreserveDiffPositionOnRerender(self.c.Contexts().NormalSecondary.GetView())
+		currentContext.HandleRenderToMain()
+	}
+	return nil
+}
+
+func (self *ContextLinesController) checkCanChangeContext() error {
+	if self.c.Git().Patch.PatchBuilder.Active() {
+		return errors.New(self.c.Tr.CantChangeContextSizeError)
+	}
+
 	return nil
 }

pkg/gui/controllers/custom_patch_options_menu_action.go

@@ -30,7 +30,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
 		{
 			Label:   self.c.Tr.ResetPatch,
 			Tooltip: self.c.Tr.ResetPatchTooltip,
-			OnPress: self.c.Helpers().CustomPatch.Reset,
+			OnPress: self.c.Helpers().PatchBuilding.Reset,
 			Keys:    menuKey('c'),
 		},
 		{
@@ -123,7 +123,15 @@ func (self *CustomPatchOptionsMenuAction) getPatchCommitIndex() int {
 	return -1
 }
 
+func (self *CustomPatchOptionsMenuAction) returnFocusFromPatchExplorerIfNecessary() {
+	if self.c.Context().Current().GetKey() == self.c.Contexts().CustomPatchBuilder.GetKey() {
+		self.c.Helpers().PatchBuilding.Escape()
+	}
+}
+
 func (self *CustomPatchOptionsMenuAction) handleDeletePatchFromCommit() error {
+	self.returnFocusFromPatchExplorerIfNecessary()
+
 	commits := self.c.Model().Commits
 	commitIndex := self.getPatchCommitIndex()
 	return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
@@ -134,6 +142,8 @@ func (self *CustomPatchOptionsMenuAction) handleDeletePatchFromCommit() error {
 }
 
 func (self *CustomPatchOptionsMenuAction) handleMovePatchToSelectedCommit() error {
+	self.returnFocusFromPatchExplorerIfNecessary()
+
 	commits := self.c.Model().Commits
 	commitIndex := self.getPatchCommitIndex()
 	toCommitIndex := self.c.Contexts().LocalCommits.GetSelectedLineIdx()
@@ -145,6 +155,8 @@ func (self *CustomPatchOptionsMenuAction) handleMovePatchToSelectedCommit() erro
 }
 
 func (self *CustomPatchOptionsMenuAction) handleMovePatchIntoWorkingTree() error {
+	self.returnFocusFromPatchExplorerIfNecessary()
+
 	mustStash := self.c.Helpers().WorkingTree.IsWorkingTreeDirtyExceptSubmodules()
 	return self.c.ConfirmIf(mustStash, types.ConfirmOpts{
 		Title:  self.c.Tr.MustStashTitle,
@@ -162,6 +174,8 @@ func (self *CustomPatchOptionsMenuAction) handleMovePatchIntoWorkingTree() error
 }
 
 func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {
+	self.returnFocusFromPatchExplorerIfNecessary()
+
 	commitIndex := self.getPatchCommitIndex()
 	self.c.Helpers().Commits.OpenCommitMessagePanel(
 		&helpers.OpenCommitMessagePanelOpts{
@@ -195,6 +209,8 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {
 }
 
 func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommitBefore() error {
+	self.returnFocusFromPatchExplorerIfNecessary()
+
 	commitIndex := self.getPatchCommitIndex()
 	self.c.Helpers().Commits.OpenCommitMessagePanel(
 		&helpers.OpenCommitMessagePanelOpts{
@@ -228,6 +244,8 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommitBefore() e
 }
 
 func (self *CustomPatchOptionsMenuAction) handleApplyPatch(reverse bool) error {
+	self.returnFocusFromPatchExplorerIfNecessary()
+
 	affectedUnstagedFiles := self.getAffectedUnstagedFiles()
 
 	mustStageFiles := len(affectedUnstagedFiles) > 0

pkg/gui/controllers/diff_copy.go

@@ -1,43 +0,0 @@
-package controllers
-
-import (
-	"strings"
-
-	"github.com/samber/lo"
-)
-
-// Removes '+' or '-' from the beginning of each line in the diff string, except
-// when both '+' and '-' lines are present, or diff header lines, in which case
-// the diff is returned unchanged. This is useful for copying parts of diffs to
-// the clipboard in order to paste them into code.
-func dropDiffPrefix(diff string) string {
-	lines := strings.Split(strings.TrimRight(diff, "\n"), "\n")
-
-	const (
-		PLUS int = iota
-		MINUS
-		CONTEXT
-		OTHER
-	)
-
-	linesByType := lo.GroupBy(lines, func(line string) int {
-		switch {
-		case strings.HasPrefix(line, "+"):
-			return PLUS
-		case strings.HasPrefix(line, "-"):
-			return MINUS
-		case strings.HasPrefix(line, " "):
-			return CONTEXT
-		}
-		return OTHER
-	})
-
-	hasLinesOfType := func(lineType int) bool { return len(linesByType[lineType]) > 0 }
-
-	keepPrefix := hasLinesOfType(OTHER) || (hasLinesOfType(PLUS) && hasLinesOfType(MINUS))
-	if keepPrefix {
-		return diff
-	}
-
-	return strings.Join(lo.Map(lines, func(line string, _ int) string { return line[1:] + "\n" }), "")
-}

pkg/gui/controllers/diff_paths.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"path"
-	"path/filepath"
 	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
@@ -131,14 +130,3 @@ func isInDir(path string, dir string) bool {
 	// "." is the root item, which contains every file
 	return dir == "." || strings.HasPrefix(path, dir+"/")
 }
-
-// repoRelativePath turns the absolute path a diff line carries into the one git speaks
-// of the file: relative to the worktree, with forward slashes. It is "" for a path that
-// is no file of this repo, which a diff renderer's own naming of a line can produce.
-func repoRelativePath(worktreePath string, absolutePath string) string {
-	relativePath, err := filepath.Rel(worktreePath, absolutePath)
-	if err != nil || strings.HasPrefix(relativePath, "..") {
-		return ""
-	}
-	return filepath.ToSlash(relativePath)
-}

pkg/gui/controllers/files_controller.go

@@ -415,7 +415,9 @@ func (self *FilesController) GetFocusedMainViewDiffSource() types.FocusedMainVie
 }
 
 func (self *FilesController) GetOnDoubleClick() func() error {
-	return self.enter
+	return self.withItemGraceful(func(node *filetree.FileNode) error {
+		return self.press([]*filetree.FileNode{node})
+	})
 }
 
 // if we are dealing with a status for which there is no key in this map,
@@ -692,7 +694,7 @@ func (self *FilesController) getSelectedFile() *models.File {
 }
 
 func (self *FilesController) enter() error {
-	return self.enterFile(-1)
+	return self.EnterFile(types.OnFocusOpts{ClickedWindowName: "", ClickedViewLineIdx: -1})
 }
 
 func (self *FilesController) collapseAll() error {
@@ -711,10 +713,7 @@ func (self *FilesController) expandAll() error {
 	return nil
 }
 
-// enterFile focuses the diff of the selected file, which is where the commands that
-// act on its lines live. clickedViewLineIdx is the row of the diff a click landed on,
-// or -1 when the diff wasn't clicked.
-func (self *FilesController) enterFile(clickedViewLineIdx int) error {
+func (self *FilesController) EnterFile(opts types.OnFocusOpts) error {
 	node := self.context().GetSelected()
 	if node == nil {
 		return nil
@@ -740,7 +739,11 @@ func (self *FilesController) enterFile(clickedViewLineIdx int) error {
 		return self.switchToMerge()
 	}
 
-	return focusMainView(self.c, self.context(), clickedViewLineIdx)
+	context := lo.Ternary(opts.ClickedWindowName == "secondary", self.c.Contexts().StagingSecondary, self.c.Contexts().Staging)
+	self.c.Context().Push(context, opts)
+	self.c.Helpers().PatchBuilding.ShowHunkStagingHint()
+
+	return nil
 }
 
 // conflictResolutionHint formats a conflict description for the main view,
@@ -1531,7 +1534,7 @@ func (self *FilesController) handleStashSave(stashFunc func(message string) erro
 }
 
 func (self *FilesController) onClickMain(opts gocui.ViewMouseBindingOpts) error {
-	return self.enterFile(opts.Y)
+	return self.EnterFile(types.OnFocusOpts{ClickedWindowName: "main", ClickedViewLineIdx: opts.Y})
 }
 
 func (self *FilesController) fetch() error {

pkg/gui/controllers/global_controller.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"strconv"
 
-	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -75,14 +74,6 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
 			Description:       self.c.Tr.CycleDiffRenderersReverse,
 			Tooltip:           self.c.Tr.CycleDiffRenderersReverseTooltip,
 		},
-		{
-			Keys:            opts.GetKeys(opts.Config.Universal.JumpToFile),
-			Handler:         opts.Guards.NoPopupPanel(self.jumpToFileInDiff),
-			Description:     self.c.Tr.JumpToFileInDiff,
-			DescriptionFunc: self.jumpToFileInDiffDescription,
-			Tooltip:         self.c.Tr.JumpToFileInDiffTooltip,
-			OpensMenu:       true,
-		},
 		{
 			Keys:              opts.GetKeys(opts.Config.Universal.Return),
 			Handler:           self.escape,
@@ -215,58 +206,6 @@ func (self *GlobalController) canCycleDiffRenderers() *types.DisabledReason {
 	return nil
 }
 
-// jumpToFileInDiff offers the files of the diff the main section is showing in a menu,
-// and scrolls that pane to the file picked. The panel the user is in keeps the focus;
-// they are reading the diff from there, and the next commit or file to read is picked
-// there too.
-func (self *GlobalController) jumpToFileInDiff() error {
-	pane := self.diffPane()
-	if pane == nil {
-		return nil
-	}
-
-	return self.c.Helpers().DiffLine.OpenJumpToFileMenu(pane, self.c.Tr.JumpToFileInDiff)
-}
-
-// jumpToFileInDiffDescription qualifies the command's description so that it is listed
-// only where it applies. A command with no description is left out of the keybindings
-// menu.
-//
-// It doesn't apply where the main section is showing content that is no diff of the
-// panel's — a branch's commit log, the status dashboard, a message. Nor does it while
-// the focus is in one of the panes, which bind the key themselves; the menu would
-// otherwise offer it twice there, once for the pane and once among the global keys.
-//
-// The static Description stays as it is: the cheatsheets are generated from that, and
-// they document what a key does rather than when it applies.
-func (self *GlobalController) jumpToFileInDiffDescription() string {
-	_, focusIsInAPane := self.c.Context().Current().(*context.MainContext)
-	if focusIsInAPane || self.diffPane() == nil {
-		return ""
-	}
-	return self.c.Tr.JumpToFileInDiff
-}
-
-// diffPane returns the pane of the main section showing the diff of the panel the user
-// is in, and nil when neither of them is showing one. A pane is cleared as it is
-// emptied, so a pane that says it is showing a diff is showing one. Its window also has
-// to be showing the pane. Resolving a conflicted file puts the merge conflicts view
-// there instead, and the pane behind it goes on holding the diff it last rendered.
-//
-// Where both panes show a diff — the unstaged and staged sides of a file — the answer
-// is the upper one, the pane the keys for scrolling the section act on.
-func (self *GlobalController) diffPane() *context.MainContext {
-	for _, pane := range []*context.MainContext{
-		self.c.Contexts().Normal, self.c.Contexts().NormalSecondary,
-	} {
-		onScreen := self.c.Helpers().Window.GetContextForWindow(pane.GetWindowName()) == pane
-		if onScreen && pane.ContentIsDiff() {
-			return pane
-		}
-	}
-	return nil
-}
-
 func (self *GlobalController) createOptionsMenu() error {
 	return (&OptionsMenuAction{c: self.c}).Call()
 }

pkg/gui/controllers/helpers/custom_patch_helper.go

@@ -1,25 +0,0 @@
-package helpers
-
-import "github.com/jesseduffield/lazygit/pkg/gui/types"
-
-type CustomPatchHelper struct {
-	c *HelperCommon
-}
-
-func NewCustomPatchHelper(c *HelperCommon) *CustomPatchHelper {
-	return &CustomPatchHelper{c: c}
-}
-
-func (self *CustomPatchHelper) Reset() error {
-	self.c.Git().Patch.PatchBuilder.Reset()
-	self.c.Refresh(types.RefreshOptions{
-		Scope: []types.RefreshableView{types.COMMIT_FILES},
-	})
-
-	// Render again so that the pane that was previewing the patch goes with it. The
-	// panel asked to do that is the side panel rather than whichever context has the
-	// focus. Both main panes are rendered by the panel beneath them, so a reset from
-	// within the focused main view has to go through that panel too.
-	self.c.PostRefreshUpdate(self.c.Context().CurrentSide())
-	return nil
-}

pkg/gui/controllers/helpers/diff_helper.go

@@ -14,9 +14,7 @@ import (
 )
 
 type DiffHelper struct {
-	c *HelperCommon
-	// diffLineHelper says how a diff for the main view is to be produced, which depends
-	// on whether the focused main view could act on what a diff renderer would make of it.
+	c              *HelperCommon
 	diffLineHelper *DiffLineHelper
 }
 
@@ -229,7 +227,7 @@ func (self *DiffHelper) OpenDiffToolForRef(selectedRef models.Ref) error {
 // AdjustLineNumber is used to adjust a line number in the diff that's currently
 // being viewed, so that it corresponds to the line number in the actual working
 // copy state of the file. It is used when clicking on a delta hyperlink in a
-// diff, or when pressing `e` in a focused diff. It works
+// diff, or when pressing `e` in the staging or patch building panels. It works
 // by getting a diff of what's being viewed in the main view against the working
 // copy, and then using that diff to adjust the line number.
 // path is the file path of the file being viewed
@@ -240,7 +238,7 @@ func (self *DiffHelper) OpenDiffToolForRef(selectedRef models.Ref) error {
 func (self *DiffHelper) AdjustLineNumber(path string, linenumber int, viewname string) int {
 	switch viewname {
 
-	case "main":
+	case "main", "patchBuilding":
 		if diffableContext, ok := self.c.Context().CurrentSide().(types.DiffableContext); ok {
 			ref := diffableContext.RefForAdjustingLineNumberInDiff()
 			if len(ref) != 0 {
@@ -251,7 +249,7 @@ func (self *DiffHelper) AdjustLineNumber(path string, linenumber int, viewname s
 		// unstaged changes view of the Files panel; no need to adjust line
 		// numbers in this case
 
-	case "secondary":
+	case "secondary", "stagingSecondary":
 		return self.adjustLineNumber(linenumber, "--", path)
 	}
 

pkg/gui/controllers/helpers/diff_line_file_menu.go

@@ -1,70 +0,0 @@
-package helpers
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/samber/lo"
-)
-
-// OpenJumpToFileMenu offers the files of the diff the given pane is showing in a menu,
-// so that one of them can be gone to directly rather than by stepping through the diff
-// a file at a time. Picking one goes to where that file's diff begins, the way stepping
-// to it with next-file does: the selection moves there in a focused pane, and an
-// unfocused one scrolls the file to the top.
-//
-// The diff is read to the end before the menu is built: a file below the part of it that
-// has been read so far is in neither the list nor the view, and reaching the far end of
-// a long diff is what the menu is for.
-func (self *DiffLineHelper) OpenJumpToFileMenu(pane types.DiffPaneContext, title string) error {
-	manager := self.c.GetViewBufferManagerForView(pane.GetView())
-	if manager == nil {
-		return nil
-	}
-	manager.ReadToEnd(func() {
-		self.c.OnUIThread(func() error { return self.showJumpToFileMenu(pane, title) })
-	})
-	return nil
-}
-
-// showJumpToFileMenu offers the diff's files by the paths git names them by. Each item
-// names its file rather than the row that file begins at, so that a diff re-rendered
-// while the menu is up is jumped into at the row the file begins at now.
-//
-// A menu offering the one file of a single-file diff would be a menu with nothing to
-// choose, so it says what it found instead. It says it here rather than as the key's
-// disabled reason because how many files there are is only known once the diff has been
-// read to the end, which is too much to do for every keypress that asks whether a key
-// applies.
-func (self *DiffLineHelper) showJumpToFileMenu(pane types.DiffPaneContext, title string) error {
-	view := pane.GetView()
-	files := self.FilesInDiff(view)
-	if len(files) == 0 {
-		return nil
-	}
-	if len(files) == 1 {
-		self.c.ErrorToast(self.c.Tr.DisabledMenuItemPrefix + self.c.Tr.OnlyOneFileInDiff)
-		return nil
-	}
-
-	worktreePath := self.c.Git().RepoPaths.WorktreePath()
-	menuItems := lo.Map(files, func(path string, _ int) *types.MenuItem {
-		label := repoRelativePath(worktreePath, path)
-		if label == "" {
-			label = path
-		}
-		return &types.MenuItem{
-			Label: label,
-			OnPress: func() error {
-				if target, ok := self.StartOfFileInDiff(view, path); ok {
-					self.PlaceNavigationTarget(pane, target, true)
-				}
-				return nil
-			},
-		}
-	})
-
-	return self.c.Menu(types.CreateMenuOptions{
-		Title:           title,
-		Items:           menuItems,
-		FilterAsYouType: true,
-	})
-}

pkg/gui/controllers/helpers/diff_line_helper.go

@@ -66,7 +66,7 @@ func (self *DiffLineHelper) diffLineIdentitiesAt(
 
 	if renderingStatesDiffLines(contents) {
 		if identities := self.diffLineIdentitiesFromRecords(contents[bufferLineIdx].Metadata); len(identities) > 0 {
-			return self.inRepoTerms(view, identities), true
+			return identities, true
 		}
 		return nil, false
 	}
@@ -76,7 +76,7 @@ func (self *DiffLineHelper) diffLineIdentitiesAt(
 		return nil, false
 	}
 
-	return self.inRepoTerms(view, []types.DiffLineInfo{self.diffLineInfo(parsed)}), true
+	return []types.DiffLineInfo{self.diffLineInfo(parsed)}, true
 }
 
 // diffLineIdentitiesFromRecords recovers the identity of every diff line the row's

pkg/gui/controllers/helpers/diff_line_plain_text.go

@@ -162,19 +162,11 @@ func (self *selectedDiffLines) covers(info types.DiffLineInfo) bool {
 func repoRelativePaths(worktreePath string, paths []string) []string {
 	relPaths := make([]string, 0, len(paths))
 	for _, path := range paths {
-		if relPath := repoRelativePath(worktreePath, path); relPath != "" {
-			relPaths = append(relPaths, relPath)
+		relPath, err := filepath.Rel(worktreePath, path)
+		if err != nil || strings.HasPrefix(relPath, "..") {
+			continue
 		}
+		relPaths = append(relPaths, filepath.ToSlash(relPath))
 	}
 	return relPaths
 }
-
-// repoRelativePath turns one such path into the repo-relative one, and is "" for a path
-// that lies outside the worktree.
-func repoRelativePath(worktreePath string, path string) string {
-	relPath, err := filepath.Rel(worktreePath, path)
-	if err != nil || strings.HasPrefix(relPath, "..") {
-		return ""
-	}
-	return filepath.ToSlash(relPath)
-}

pkg/gui/controllers/helpers/diff_line_queries.go

@@ -1,9 +1,6 @@
 package helpers
 
 import (
-	"path/filepath"
-	"strings"
-
 	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"
@@ -35,91 +32,7 @@ func (self *DiffLineHelper) DiffLinesInViewRange(view *gocui.View, first int, la
 		previousBufferLine = bufferLine
 		infos = append(infos, identities[bufferLine]...)
 	}
-	return self.inRepoTerms(view, infos)
-}
-
-// ChangeLineOrdinals says, for each of the given change lines, which of its file's
-// changes it is in the given diff — its place among them, counted from the top of the
-// file — keyed by file. Lines the diff doesn't have are left out.
-//
-// It is how a line is named in something built out of a diff rather than being that diff:
-// the custom patch holds the lines it was given in the order the file has them, so a
-// place among a file's changes is a line of the patch.
-func (self *DiffLineHelper) ChangeLineOrdinals(
-	diff string, infos []types.DiffLineInfo,
-) map[string][]int {
-	ordinals := map[patchLine]int{}
-	counts := map[string]int{}
-	for _, parsed := range parseAllDiffLinesFromBuffer(strings.Split(diff, "\n")) {
-		if !parsed.ok {
-			continue
-		}
-		info := self.diffLineInfo(parsed.parsed)
-		if !info.IsChange() {
-			continue
-		}
-		ordinals[patchLineOf(info)] = counts[info.Path]
-		counts[info.Path]++
-	}
-
-	ordinalsByPath := map[string][]int{}
-	for _, info := range infos {
-		if ordinal, ok := ordinals[patchLineOf(info)]; ok {
-			ordinalsByPath[info.Path] = append(ordinalsByPath[info.Path], ordinal)
-		}
-	}
-	return ordinalsByPath
-}
-
-// inRepoTerms brings the paths of lines recovered from a view into the repo's terms.
-//
-// They are in them already for a diff of the repo's own files. The pane previewing the
-// custom patch, though, shows a diff of the two trees the patch was materialized into: a
-// diff renderer states the path it was handed there, which is under the tree's own name,
-// while the diff's text names the trees where an ordinary diff has git's a/ and b/
-// prefixes and so needs nothing.
-func (self *DiffLineHelper) inRepoTerms(view *gocui.View, infos []types.DiffLineInfo) []types.DiffLineInfo {
-	toRepoTerms := self.repoTermsMapper(view)
-	return lo.Map(infos, func(info types.DiffLineInfo, _ int) types.DiffLineInfo {
-		info.Path = toRepoTerms(info.Path)
-		return info
-	})
-}
-
-// repoTermsMapper returns how a path recovered from view is brought into the repo's
-// terms, for the callers that have a path rather than a whole identity to bring. The
-// mapping is worked out once, per view rather than per path.
-func (self *DiffLineHelper) repoTermsMapper(view *gocui.View) func(string) string {
-	if !self.ShowsCustomPatch(view) {
-		return func(path string) string { return path }
-	}
-
-	worktreePath := self.c.Git().RepoPaths.WorktreePath()
-	treesDir := self.c.Git().Patch.PatchBuilder.TempDir()
-	return func(path string) string {
-		return repoPathOfTreePath(path, treesDir, worktreePath)
-	}
-}
-
-// repoPathOfTreePath maps a path under one of the trees the custom patch was materialized
-// into to the file of the repo it stands for: the path is the tree's name followed by the
-// file's own, stated either against the directory holding the trees or against the repo,
-// depending on how the renderer that stated it was given it.
-func repoPathOfTreePath(path string, treesDir string, worktreePath string) string {
-	root := worktreePath
-	if treesDir != "" && strings.HasPrefix(path, treesDir+string(filepath.Separator)) {
-		root = treesDir
-	}
-	relativePath, err := filepath.Rel(root, path)
-	if err != nil {
-		return path
-	}
-
-	segments := strings.Split(filepath.ToSlash(relativePath), "/")
-	if len(segments) > 1 && (segments[0] == "a" || segments[0] == "b") {
-		relativePath = filepath.Join(segments[1:]...)
-	}
-	return filepath.Join(worktreePath, relativePath)
+	return infos
 }
 
 // ChangeLinesInViewRange returns the change lines — the additions and deletions —
@@ -230,7 +143,8 @@ func (self *DiffLineHelper) IsChangeLine(view *gocui.View, viewLineIdx int) bool
 // is shown as one solid block of changes — every row of its diff a change of the same
 // kind, no context — which is what a newly added or deleted file looks like. That is
 // the case where widening the selection to the change block would select the file
-// entire, so hunk mode drops to a single line there instead.
+// entire, so hunk mode drops to a single line there instead. It asks of a rendered
+// diff the question patch.Patch.IsSingleHunkForWholeFile asks of a patch.
 //
 // It says false while the diff is still being read in, since the rows that would
 // answer otherwise — a context line, a change of the other kind — may not have
@@ -346,98 +260,62 @@ func (self *DiffLineHelper) AdjacentFile(view *gocui.View, anchorViewLine int, f
 	return view.ViewLineForBufferLine(target)
 }
 
-// FilesInDiff lists the files of view's (possibly multi-file) rendered diff, in the
-// order it shows them, by the paths of the repo's files. It is what a menu offering to
-// jump between them is built from; jumping to one of them goes to StartOfFileInDiff.
-func (self *DiffLineHelper) FilesInDiff(view *gocui.View) []string {
-	return lo.Map(fileStarts(self.filePaths(view)),
-		func(start diffFileStart, _ int) string { return start.path })
-}
-
-// StartOfFileInDiff returns the view line the given file's section of view's rendered
-// diff begins at. That is the row file navigation lands on, so jumping to a file from a
-// menu and stepping to it with next-file land in the same place. ok is false for a file
-// the diff doesn't show, e.g. because it was re-rendered since the file was listed.
-func (self *DiffLineHelper) StartOfFileInDiff(view *gocui.View, path string) (int, bool) {
-	start, ok := lo.Find(fileStarts(self.filePaths(view)), func(start diffFileStart) bool {
-		return start.path == path
-	})
-	if !ok {
-		return 0, false
-	}
-	return view.ViewLineForBufferLine(start.row)
-}
-
-// filePaths resolves view's rendered diff to the path each buffer line belongs to, in
-// the repo's terms, and empty for a row whose identity couldn't be recovered. Naming the
-// files the way the rest of the queries name them means a row of the custom patch's
-// preview belongs to the repo's file rather than to the copy of it in the tree the patch
-// was materialized into, so that both halves of a change belong to the same file however
-// the diff renderer states them.
+// filePaths resolves view's rendered diff to the path each buffer line belongs to,
+// empty for a row whose identity couldn't be recovered.
 func (self *DiffLineHelper) filePaths(view *gocui.View) []string {
 	resolved := self.resolveDiffLines(view.DiffLineContents())
-	toRepoTerms := self.repoTermsMapper(view)
 	paths := make([]string, len(resolved))
 	for i, row := range resolved {
 		if row.ok {
-			paths[i] = toRepoTerms(row.info.Path)
+			paths[i] = row.info.Path
 		}
 	}
 	return paths
 }
 
-// diffFileStart is where one file of a diff begins: the path of the file, and the row
-// of the diff its section starts at.
-type diffFileStart struct {
-	path string
-	row  int
-}
-
-// fileStarts finds, in a diff whose lines carry the file path they belong to (empty for
-// a row no backend could place), where each file of it begins, in the order the diff
-// shows them.
+// fileStart finds, in a diff whose lines carry the file path they belong to (empty for
+// a row no backend could place), the first located row of the file adjacent to `from`
+// in the given direction — the row file navigation lands on. It is the pure index
+// arithmetic behind AdjacentFile.
 //
-// A file is identified by its path, and the rows showing it are consecutive, so a path
-// differing from the one before it begins a file. Rows carrying no path are passed over:
-// those are the blank separator rows between files, or the header rows of a diff
-// renderer that doesn't state which file its headers belong to. So a file begins at its
-// header wherever the source says so (a parseable buffer, or a renderer that tags its
-// headers), and at its first content line otherwise, which is an accepted degradation.
-func fileStarts(paths []string) []diffFileStart {
-	starts := []diffFileStart{}
-	previousPath := ""
-	for row, path := range paths {
-		if path == "" || path == previousPath {
-			continue
-		}
-		previousPath = path
-		starts = append(starts, diffFileStart{path: path, row: row})
-	}
-	return starts
-}
-
-// fileStart returns where the file adjacent to `from` in the given direction begins —
-// the row file navigation lands on. It is the pure index arithmetic behind AdjacentFile.
-// ok is false at the first or last file of the diff.
+// A file is identified by its path, so we look for where the path changes, skipping
+// rows that carry none: those are the blank separator rows between files, or the
+// header rows of a diff renderer that doesn't state which file its headers belong to.
+// So the landing row is the file's header wherever the source says so — a parseable
+// buffer, or a renderer that tags its headers — and the file's first content line
+// otherwise, which is an accepted degradation.
 func fileStart(paths []string, from int, forward bool) (int, bool) {
 	anchorPath, ok := anchorFilePath(paths, from)
 	if !ok {
 		return 0, false
 	}
 
-	starts := fileStarts(paths)
-	_, anchor, ok := lo.FindIndexOf(starts, func(start diffFileStart) bool {
-		return start.path == anchorPath
-	})
-	if !ok {
+	if forward {
+		for i := from; i < len(paths); i++ {
+			if paths[i] != "" && paths[i] != anchorPath {
+				return i, true
+			}
+		}
 		return 0, false
 	}
 
-	target := anchor + lo.Ternary(forward, 1, -1)
-	if target < 0 || target >= len(starts) {
+	// Walk back past the current file (its rows and any unlocated ones) to the previous
+	// file's last located row, then back over that whole file, landing on its first.
+	i := from
+	for i >= 0 && (paths[i] == "" || paths[i] == anchorPath) {
+		i--
+	}
+	if i < 0 {
 		return 0, false
 	}
-	return starts[target].row, true
+	prevPath := paths[i]
+	for i > 0 && (paths[i-1] == "" || paths[i-1] == prevPath) {
+		i--
+	}
+	for paths[i] != prevPath {
+		i++
+	}
+	return i, true
 }
 
 // anchorFilePath returns the path of the file the anchor sits in: the first row at or

pkg/gui/controllers/helpers/diff_line_queries_test.go

@@ -48,41 +48,6 @@ func TestChangeBlockStart(t *testing.T) {
 	}
 }
 
-func TestFileStarts(t *testing.T) {
-	scenarios := []struct {
-		name     string
-		paths    []string
-		expected []diffFileStart
-	}{
-		{
-			name:     "a parseable diff begins each file at its header",
-			paths:    []string{"a", "a", "a", "b", "b"},
-			expected: []diffFileStart{{path: "a", row: 0}, {path: "b", row: 3}},
-		},
-		{
-			name:     "a diff whose headers carry no path begins each file at its first content line",
-			paths:    []string{"", "", "a", "a", "", "", "b", "b"},
-			expected: []diffFileStart{{path: "a", row: 2}, {path: "b", row: 6}},
-		},
-		{
-			name:     "an unlocated row within a file doesn't begin another one",
-			paths:    []string{"a", "", "a", "b"},
-			expected: []diffFileStart{{path: "a", row: 0}, {path: "b", row: 3}},
-		},
-		{
-			name:     "a diff with no located rows shows no files",
-			paths:    []string{"", ""},
-			expected: []diffFileStart{},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			assert.Equal(t, s.expected, fileStarts(s.paths))
-		})
-	}
-}
-
 func TestFileStart(t *testing.T) {
 	// A parseable two-file diff: every row carries its file's path, headers included,
 	// as the buffer parser reports it.

pkg/gui/controllers/helpers/diff_line_raw_fallback.go

@@ -33,21 +33,6 @@ func (self *DiffLineHelper) MainViewDiffMode() git_commands.DiffMode {
 	return git_commands.DiffModeRendered
 }
 
-// DiffRowsCanBePlaced reports whether the rows of the diff the main view is about to be
-// given can be placed in the file they show. git's own diff describes itself, whether it
-// is what the user configured or what MainViewDiffMode is about to substitute for a
-// rendering that can't be acted on; any other rendering says where its rows belong only
-// if it states records for them.
-//
-// It is what anything that means to go from a row back to the file it shows has to ask
-// first: with neither records nor a diff that describes itself, there is nothing to go
-// on, and offering the user the way there would be offering nothing.
-func (self *DiffLineHelper) DiffRowsCanBePlaced() bool {
-	return !self.diffNeedsMetadata() ||
-		self.MainViewDiffMode() == git_commands.DiffModeRaw ||
-		self.diffRendererEmitsMetadata()
-}
-
 // RenderFocusedMainViewAgain has the panel beneath the focused main view render its
 // diff again — which, the main view now holding focus, is git's own diff rather than
 // the renderer's — and calls place once that is on screen.

pkg/gui/controllers/helpers/diff_line_restore.go

@@ -549,59 +549,3 @@ func patchLineOf(info types.DiffLineInfo) patchLine {
 		return patchLine{path: info.Path, kind: types.DiffLineContext, line: info.NewLine}
 	}
 }
-
-// RevealSelectionAfterAction moves a diff pane's selection to the change that takes the
-// place of the one just acted on, once the changed diff has re-rendered. Call it with
-// the pane acted in, the pane the work carries on in, and the first line of the
-// selection, before triggering the re-render.
-//
-// The line acted on is gone from the diff, so what is remembered is its place among the
-// diff's changes: the next change moves up into it, which is where you want to be to
-// carry on. A range collapses to a single line at its start, and hunk mode selects the
-// whole block it lands in, so that pressing the key again acts on the next hunk. The
-// target pane inherits that select mode, this being the same piece of work continuing
-// in another pane — and shows no selection until the restore places one, so that what
-// it was left showing the last time it was used doesn't appear for a frame.
-//
-// advanceBy moves on by that many changes past the place remembered, for an action that
-// leaves the diff as it was: lines taken into a custom patch are still in the commit's
-// diff, so the place remembered is still the line acted on, and carrying on means going
-// past the lines just dealt with rather than staying on them.
-//
-// done, which may be nil, is called once the selection is where it belongs, or once it
-// turns out that no render is coming to put it there — for a caller that must not let
-// the user act again in between.
-func (self *DiffLineHelper) RevealSelectionAfterAction(
-	source types.DiffPaneContext, target types.DiffPaneContext, firstLineIdx int, advanceBy int, done func(),
-) {
-	ordinal, ok := self.ChangeLineOrdinal(source.GetView(), firstLineIdx)
-	if !ok {
-		if done != nil {
-			done()
-		}
-		return
-	}
-
-	sel := source.DiffSelectState()
-	if sel.Mode == types.DiffSelectModeRange {
-		sel.Mode = types.DiffSelectModeLine
-		sel.RangeIsSticky = false
-	}
-	*target.DiffSelectState() = *sel
-	selectHunk := sel.Mode == types.DiffSelectModeHunk
-
-	targetView := target.GetView()
-	if target != source {
-		target.SetHasSelectableContent(false)
-		self.c.Context().UpdateSelectionHighlights()
-	}
-
-	self.RevealChangeLineAtOrdinal(targetView, ordinal+advanceBy, func(viewLine int) {
-		if selectHunk {
-			self.SelectChangeBlock(target, viewLine, true)
-			return
-		}
-		targetView.CancelRangeSelect()
-		self.ShowSelectionAtLine(targetView, viewLine, true)
-	}, done)
-}

pkg/gui/controllers/helpers/diff_line_selection.go

@@ -7,9 +7,9 @@ import (
 	"github.com/samber/lo"
 )
 
-// Putting a selection in the focused main view: where it starts out, where a jump
-// leaves it, and how it is widened to a whole change block. All three are answered
-// from what the view is showing, as recovered by the queries next door.
+// Putting a selection in the focused main view: where it starts out, and how it is
+// widened to a whole change block. Both are answered from what the view is showing,
+// as recovered by the queries next door.
 
 // EstablishSelection turns on the focused main view's selection once the view has
 // been focused. clickedViewLine is the view line a click pointed at, or -1 for
@@ -63,66 +63,6 @@ func (self *DiffLineHelper) EstablishSelection(mainContext *context.MainContext,
 	self.ShowSelectionAtLine(view, target, false)
 }
 
-// PlaceNavigationTarget moves the pane's selection to the row a jump found, bringing
-// it on screen if it isn't already. With no selection to move — a pane that isn't
-// focused, or one showing a diff with nothing selectable in it — the row goes to the
-// top of the view instead, that being all a jump can do there.
-//
-// alignTop asks for the target to become the view's top line, so that everything that
-// begins there is on screen. It only applies to a target the view has to scroll to: a
-// jump to something already on screen leaves the view alone, there being nothing to
-// gain from moving what the user is looking at. In hunk mode what ends up selected is
-// the first change block at or below the target, which a large context size can put
-// further down than a screenful; the selection is then scrolled into view as any other
-// jump's is, and the alignment gives way to that.
-func (self *DiffLineHelper) PlaceNavigationTarget(
-	pane types.DiffPaneContext, target int, alignTop bool,
-) {
-	view := pane.GetView()
-	if !view.Highlight {
-		view.SetOrigin(0, target)
-		return
-	}
-	if alignTop {
-		self.scrollTargetToTop(pane, target)
-	}
-	// Jumping to another block or file moves the cursor without shift held, so a
-	// range that grows only while shift is held collapses rather than stretching all
-	// the way to the target. A sticky range stretches instead; this is the point of
-	// being sticky.
-	self.CollapseNonStickyRange(pane)
-	if pane.DiffSelectState().Mode == types.DiffSelectModeHunk {
-		self.SelectChangeBlock(pane, target, true)
-		return
-	}
-	// Line mode leaves a single-line selection at the target; an active range extends
-	// to it, the anchor being untouched.
-	self.ShowSelectionAtLine(view, target, true)
-}
-
-// scrollTargetToTop scrolls the given row of the diff to the top of the view, leaving
-// the view where it is when that row is on screen already. The last screenful of the
-// diff is as far as it goes, so that the view doesn't scroll past the end of what it is
-// showing.
-func (self *DiffLineHelper) scrollTargetToTop(pane types.DiffPaneContext, target int) {
-	view := pane.GetView()
-	originY, height := pane.GetViewTrait().ViewPortYBounds()
-	if target >= originY && target < originY+height {
-		return
-	}
-	view.SetOriginY(min(target, max(0, view.ViewLinesHeight()-height)))
-}
-
-// CollapseNonStickyRange drops a range that only grows while shift is held back to a
-// single line at the cursor.
-func (self *DiffLineHelper) CollapseNonStickyRange(pane types.DiffPaneContext) {
-	sel := pane.DiffSelectState()
-	if sel.Mode == types.DiffSelectModeRange && !sel.RangeIsSticky {
-		sel.Mode = types.DiffSelectModeLine
-		pane.GetView().CancelRangeSelect()
-	}
-}
-
 // changeToSelectOnScreen returns the change line keyboard focus establishes the
 // selection on. In hunk mode that is the first block that begins on screen, so that
 // the block being offered up is one the user can see the extent of, falling back to a
@@ -130,7 +70,7 @@ func (self *DiffLineHelper) CollapseNonStickyRange(pane types.DiffPaneContext) {
 // there is nothing else to offer. Line by line it is simply the first change line on
 // screen. ok is false when the viewport shows no change at all.
 func (self *DiffLineHelper) changeToSelectOnScreen(view *gocui.View) (int, bool) {
-	if self.c.UserConfig().Gui.UseHunkModeInDiffView {
+	if self.c.UserConfig().Gui.UseHunkModeInStagingView {
 		return self.FirstChangeBlockInView(view)
 	}
 	return self.FirstChangeLineInView(view)
@@ -141,7 +81,7 @@ func (self *DiffLineHelper) changeToSelectOnScreen(view *gocui.View) (int, bool)
 // except over a file shown as one solid block of changes, where it would select the
 // whole file — see IsSingleHunkForWholeFile.
 func (self *DiffLineHelper) hunkModeApplies(view *gocui.View, changeViewLine int) bool {
-	return self.c.UserConfig().Gui.UseHunkModeInDiffView &&
+	return self.c.UserConfig().Gui.UseHunkModeInStagingView &&
 		!self.IsSingleHunkForWholeFile(view, changeViewLine)
 }
 
@@ -191,70 +131,3 @@ func (self *DiffLineHelper) SelectedHunkBounds(view *gocui.View) (int, int, bool
 	}
 	return self.ChangeBlockBounds(view, anchor)
 }
-
-// RefreshInclusionGutter updates the marks drawn over the diff in the main pane, which
-// say which of its lines are in the custom patch being built from it.
-//
-// They are shown while the focused main view holds the focus — either of its panes, so
-// that moving between the diff and the patch previewed beside it doesn't make them come
-// and go — and only over a diff a patch is being built from: a patch built from some
-// other commit says nothing about the lines of this one.
-//
-// Call it whenever either of those can have changed: as a pane's content settles, when
-// the focus arrives or leaves, and when the patch itself changes.
-func (self *DiffLineHelper) RefreshInclusionGutter() {
-	view := self.c.Contexts().Normal.GetView()
-
-	included := self.patchInclusion()
-	if included == nil {
-		view.SetInclusionGutter(false, nil)
-		return
-	}
-
-	resolved := self.resolveDiffLines(view.DiffLineContents())
-	marks := make([]bool, len(resolved))
-	showsChanges := false
-	for i, row := range resolved {
-		if !row.ok || !row.info.IsChange() {
-			continue
-		}
-		showsChanges = true
-		marks[i] = included(row.info)
-	}
-
-	// Nothing to mark and nowhere to mark it: the pane is showing a message rather than
-	// a diff, or a diff with nothing in it.
-	if !showsChanges {
-		view.SetInclusionGutter(false, nil)
-		return
-	}
-	view.SetInclusionGutter(true, marks)
-}
-
-// patchInclusion asks the panel whose diff the focused main view is showing which of
-// that diff's lines are in the custom patch being built from it, and answers nil where
-// there is no such patch — including when the focus is elsewhere, the marks being an
-// affordance of the focused view.
-func (self *DiffLineHelper) patchInclusion() func(types.DiffLineInfo) bool {
-	if !self.mainViewIsFocused() {
-		return nil
-	}
-	// The panel beneath is found from the pane that holds the focus, which is not always
-	// the one the diff is in: moving to the pane beside it takes the other off the stack.
-	sidePanel := self.c.Context().NextInStack(self.c.Context().CurrentStatic())
-	if sidePanel == nil {
-		return nil
-	}
-	actions, ok := sidePanel.GetFocusedMainViewDiffSource().(types.FocusedMainViewActions)
-	if !ok {
-		return nil
-	}
-	return actions.PatchInclusion()
-}
-
-// ShowsCustomPatch reports whether the given view is the one previewing the custom patch
-// being built, which is the lower pane while a patch is being built from the diff in the
-// upper one.
-func (self *DiffLineHelper) ShowsCustomPatch(view *gocui.View) bool {
-	return view == self.c.Contexts().NormalSecondary.GetView() && self.patchInclusion() != nil
-}

pkg/gui/controllers/helpers/diff_stat_links.go

@@ -1,319 +0,0 @@
-package helpers
-
-import (
-	"bytes"
-	"io"
-	"regexp"
-	"strings"
-	"sync/atomic"
-
-	"github.com/jesseduffield/lazygit/pkg/gui/style"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-)
-
-// A diff opens with a diffstat naming every file in it, above the diff of each of
-// them. Here each of those names is made a link to where that file's diff begins, so
-// that a file of a long diff can be gone to by clicking the line that names it.
-//
-// The names are recognized in the output as it is written to the pane, where they cost
-// next to nothing to find. The diffstat is git's own text whichever renderer the diff
-// goes through — delta, diff-so-fancy and difftastic all pass it on untouched — and it
-// comes first, so the scan for it ends with it.
-
-// DiffStatLinkScheme names a link to a file of the diff the pane is showing, as
-// lazygit-edit names one that opens a file in the editor. The link is never handed to
-// the terminal — gocui takes the escape sequence out of the content and gives the URL
-// back when the cell it covers is clicked — so the path in it needs no escaping.
-const DiffStatLinkScheme = "lazygit-diff-file://"
-
-// diffStatEntryPattern matches a line of a diffstat and captures the path it states.
-// Such a line holds the name of the file, padded out to the width of the longest, then
-// the number of lines it changes (or "Bin" for a binary file) and the graph of them.
-//
-// The name is captured greedily, so that the separator found is the last one on the
-// line rather than one in a file name that contains " | " itself.
-var diffStatEntryPattern = regexp.MustCompile(`^ (.*[^ ]) +\| +(?:Bin|\d+)`)
-
-// DiffStatLinkWriter hands a pane's content on to it, turning the file names in the
-// diffstat the content opens with into links (see DiffStatLinkScheme).
-type DiffStatLinkWriter struct {
-	writer io.Writer
-
-	// Whether the diffstat is still to come, is being written now, or is behind us. It
-	// is behind us once a line comes that is no entry of it, or that the diff proper
-	// begins with, and nothing past that is looked at. A name down there names the file
-	// the reader is already in.
-	//
-	// It is atomic because the render is begun on the UI thread while the content of
-	// it arrives on the goroutine reading the command's output.
-	state atomic.Int32
-}
-
-type diffStatState int32
-
-const (
-	diffStatToCome diffStatState = iota
-	inDiffStat
-	diffStatDone
-)
-
-func NewDiffStatLinkWriter(writer io.Writer) *DiffStatLinkWriter {
-	return &DiffStatLinkWriter{writer: writer}
-}
-
-// BeginRender starts a fresh render, whose own diffstat is the one to look for. It is
-// called as the render is asked for, before any of it is written.
-//
-// linkFiles says whether this render is one whose file names lead anywhere: the pane's
-// own diff, whose rows can be placed in the files they show. Either is passed through
-// untouched without it. Content that is no diff of the panel's — a commit log, a
-// message — has no diffstat in it, and a line of one that happens to read like an entry
-// of a diffstat names no file to go to. A rendering whose rows nothing can place does
-// have the files in it, but nothing to find the one a name stands for with.
-func (self *DiffStatLinkWriter) BeginRender(linkFiles bool) {
-	self.setState(lo.Ternary(linkFiles, diffStatToCome, diffStatDone))
-}
-
-func (self *DiffStatLinkWriter) getState() diffStatState {
-	return diffStatState(self.state.Load())
-}
-
-func (self *DiffStatLinkWriter) setState(state diffStatState) {
-	self.state.Store(int32(state))
-}
-
-func (self *DiffStatLinkWriter) Write(p []byte) (int, error) {
-	linked := self.withFileNameLinked(p)
-
-	written, err := self.writer.Write(linked)
-	if err != nil {
-		return 0, err
-	}
-	if written < len(linked) {
-		return 0, io.ErrShortWrite
-	}
-	// The caller is owed an answer about what it gave us, not about what we passed on.
-	return len(p), nil
-}
-
-// withFileNameLinked returns the given line of the render with the name in it linked,
-// where the line is an entry of the diffstat.
-func (self *DiffStatLinkWriter) withFileNameLinked(line []byte) []byte {
-	state := self.getState()
-	if state == diffStatDone {
-		return line
-	}
-
-	if beginsTheDiffItself(line) {
-		// A diffstat that hasn't come by now isn't coming: the pane is showing a diff
-		// that was asked for without one.
-		self.setState(diffStatDone)
-		return line
-	}
-
-	match := diffStatEntry(line)
-	if match == nil {
-		if state == inDiffStat {
-			self.setState(diffStatDone)
-		}
-		return line
-	}
-	self.setState(inDiffStat)
-
-	start, end := match[2], match[3]
-	// The link states the name as it reads on screen, so that a renderer that colors
-	// the diffstat doesn't put escape sequences into it.
-	name := utils.Decolorise(string(line[start:end]))
-	linked := make([]byte, 0, len(line)+len(name)+32)
-	linked = append(linked, line[:start]...)
-	linked = append(linked, style.PrintHyperlink(string(line[start:end]), DiffStatLinkScheme+name)...)
-	return append(linked, line[end:]...)
-}
-
-// diffLineRecordOpener opens an OSC 1717 record, ahead of the version whose fields the
-// record states (see parseDiffLineMetadata).
-const diffLineRecordOpener = "\x1b]1717;"
-
-// beginsTheDiffItself reports whether the line is one of the diff proper rather than
-// one of the diffstat above it: git's own header for a file, or a line a renderer
-// states a record for.
-func beginsTheDiffItself(line []byte) bool {
-	return bytes.HasPrefix(line, []byte("diff --")) || statesADiffLine(line)
-}
-
-// statesADiffLine reports whether the line carries a record in which a diff renderer
-// states which line of which file it is rendering. Every such record is about a line of
-// the diff, and the diffstat comes before all of them.
-//
-// The version the record opens with is passed over rather than read. This asks which
-// lines a renderer states records for, and the answer holds whichever version of the
-// protocol it speaks. A record with nothing after the version is the handshake a
-// renderer announces itself with, which is about no line, so the search goes on past it.
-func statesADiffLine(line []byte) bool {
-	for rest := line; ; {
-		at := bytes.Index(rest, []byte(diffLineRecordOpener))
-		if at == -1 {
-			return false
-		}
-		rest = rest[at+len(diffLineRecordOpener):]
-
-		digits := 0
-		for digits < len(rest) && rest[digits] >= '0' && rest[digits] <= '9' {
-			digits++
-		}
-		if digits > 0 && digits < len(rest) && rest[digits] == ';' {
-			return true
-		}
-	}
-}
-
-// diffStatEntry matches line against diffStatEntryPattern, behind the two checks that
-// answer for nearly every line of a diff without the pattern being run at all: an entry
-// of a diffstat is indented by a space, and holds the separator. The indices it returns
-// are into the whole line, whatever the match was made past.
-func diffStatEntry(line []byte) []int {
-	start := handshakeEnd(line)
-	rest := line[start:]
-	if len(rest) == 0 || rest[0] != ' ' || bytes.IndexByte(rest, '|') == -1 {
-		return nil
-	}
-
-	match := diffStatEntryPattern.FindSubmatchIndex(rest)
-	for i := range match {
-		if match[i] >= 0 {
-			match[i] += start
-		}
-	}
-	return match
-}
-
-// handshakeEnd returns where the record a renderer announces itself with ends, for a
-// line that opens with one, and 0 for every other line.
-//
-// A renderer writes the handshake before anything else and with no newline after it,
-// so it lands at the start of the first line of its output. For a diff with nothing
-// above its diffstat — the diff of a range of commits, or of a stash — that is the line
-// naming the first file in it, and the entry begins after the record rather than at the
-// start of the line.
-func handshakeEnd(line []byte) int {
-	if !bytes.HasPrefix(line, []byte(diffLineRecordOpener)) {
-		return 0
-	}
-
-	after := len(diffLineRecordOpener)
-	for after < len(line) && line[after] >= '0' && line[after] <= '9' {
-		after++
-	}
-
-	// Either terminator ends a record. One that goes on into a field instead is about
-	// a line of the diff, which is below the whole diffstat and no entry of it.
-	switch {
-	case after < len(line) && line[after] == '\x07':
-		return after + 1
-	case after+1 < len(line) && line[after] == '\x1b' && line[after+1] == '\\':
-		return after + 2
-	}
-	return 0
-}
-
-// JumpToFileNamedInDiffStat goes to the file of the pane's diff that the given diffstat
-// entry names, for a click on the link made for that entry. It lands the way picking
-// the file from the menu of the diff's files does.
-//
-// The diff is read to the end first, as it is for that menu. The diffstat is on screen
-// only while the view is at the top of the diff, so the file clicked is nearly always
-// below the part of it that has been read.
-func (self *DiffLineHelper) JumpToFileNamedInDiffStat(pane types.DiffPaneContext, entry string) {
-	manager := self.c.GetViewBufferManagerForView(pane.GetView())
-	if manager == nil {
-		return
-	}
-	manager.ReadToEnd(func() {
-		self.c.OnUIThread(func() error {
-			self.jumpToFileNamedInDiffStat(pane, entry)
-			return nil
-		})
-	})
-}
-
-func (self *DiffLineHelper) jumpToFileNamedInDiffStat(pane types.DiffPaneContext, entry string) {
-	view := pane.GetView()
-	worktreePath := self.c.Git().RepoPaths.WorktreePath()
-	files := self.FilesInDiff(view)
-	names := lo.Map(files, func(file string, _ int) string {
-		return repoRelativePath(worktreePath, file)
-	})
-
-	index, ok := fileNamedByDiffStatEntry(entry, names)
-	if !ok {
-		self.c.ErrorToast(utils.ResolvePlaceholderString(
-			self.c.Tr.NoFileInDiffNamed, map[string]string{"path": entry}))
-		return
-	}
-
-	if target, ok := self.StartOfFileInDiff(view, files[index]); ok {
-		self.PlaceNavigationTarget(pane, target, true)
-	}
-}
-
-// fileNamedByDiffStatEntry returns which of the diff's files a diffstat entry names.
-//
-// An entry states the path as the diffstat has room for it rather than as git names
-// the file. A path too long for the column is cut off on the left behind "...", and a
-// rename is compacted to the "{old => new}" form. So the name is looked for among the
-// files the diff turned out to hold, whole and then as the end of one, and is taken
-// only where it names a single file.
-func fileNamedByDiffStatEntry(entry string, paths []string) (int, bool) {
-	name := renamedTo(strings.TrimSpace(entry))
-
-	if index, ok := theOneMatching(paths, func(p string) bool { return p == name }); ok {
-		return index, true
-	}
-
-	// Where the diffstat cut the path off, what is left is the end of it. The cut is at
-	// a directory boundary where there is room for one, and inside the file name where
-	// there isn't.
-	tail := strings.TrimPrefix(name, "...")
-	return theOneMatching(paths, func(p string) bool { return strings.HasSuffix(p, tail) })
-}
-
-// renamedTo returns the path a diffstat entry for a rename leaves the file at, and the
-// entry itself for any other one. A rename states both paths, with whatever they have
-// in common written once: "dir/{old => new}/file", or "old => new" where they share
-// nothing. The part shared with the old path is gone along with the "{" when the entry
-// is cut off on the left, which leaves a path to match the end of.
-func renamedTo(entry string) string {
-	const arrow = " => "
-	at := strings.Index(entry, arrow)
-	if at == -1 {
-		return entry
-	}
-
-	shared := ""
-	if brace := strings.Index(entry[:at], "{"); brace != -1 {
-		shared = entry[:brace]
-	}
-	renamed := entry[at+len(arrow):]
-	if closing := strings.Index(renamed, "}"); closing != -1 {
-		return shared + renamed[:closing] + renamed[closing+1:]
-	}
-	return shared + renamed
-}
-
-// theOneMatching returns the index of the one element the predicate holds for, and
-// false where it holds for none of them or for several.
-func theOneMatching(paths []string, matches func(string) bool) (int, bool) {
-	found := -1
-	for i, candidate := range paths {
-		if !matches(candidate) {
-			continue
-		}
-		if found != -1 {
-			return 0, false
-		}
-		found = i
-	}
-	return found, found != -1
-}

pkg/gui/controllers/helpers/diff_stat_links_test.go

@@ -1,270 +0,0 @@
-package helpers
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/gui/style"
-	"github.com/stretchr/testify/assert"
-)
-
-// link is the line the writer is expected to produce for a diffstat entry: the space
-// it is indented by, the name linked, and the rest of the line as it came.
-func link(name string, rest string) string {
-	return " " + style.PrintHyperlink(name, DiffStatLinkScheme+name) + rest
-}
-
-// record is the OSC 1717 record a diff renderer speaking the given version of the
-// protocol states a line of the given kind with, as it precedes that line in its
-// output.
-func record(version string, kind string) string {
-	return fmt.Sprintf("%s%s;%s;;;pkg/gui.go\x1b\\", diffLineRecordOpener, version, kind)
-}
-
-// handshake is the record a renderer announces the protocol with: the version it
-// speaks, and nothing about any line. Renderers end their records with either
-// terminator, so both turn up.
-var (
-	handshake    = diffLineRecordOpener + "1\x1b\\"
-	handshakeBel = diffLineRecordOpener + "1\x07"
-)
-
-func TestDiffStatLinkWriter(t *testing.T) {
-	scenarios := []struct {
-		name      string
-		linkFiles bool
-		lines     []string
-		expected  []string
-	}{
-		{
-			name:      "links the entries of the diffstat, and nothing after it",
-			linkFiles: true,
-			lines: []string{
-				"commit 1234567",
-				"",
-				"    A commit message",
-				"",
-				" pkg/gui.go    | 12 ++++++------",
-				" dir/other.go  |  3 ++-",
-				" 2 files changed, 8 insertions(+), 7 deletions(-)",
-				"",
-				"diff --git a/pkg/gui.go b/pkg/gui.go",
-				" a context line that reads like an entry | 3 ++-",
-			},
-			expected: []string{
-				"commit 1234567",
-				"",
-				"    A commit message",
-				"",
-				link("pkg/gui.go", "    | 12 ++++++------"),
-				link("dir/other.go", "  |  3 ++-"),
-				" 2 files changed, 8 insertions(+), 7 deletions(-)",
-				"",
-				"diff --git a/pkg/gui.go b/pkg/gui.go",
-				" a context line that reads like an entry | 3 ++-",
-			},
-		},
-		{
-			name:      "links a binary file, a file that changes nothing, and a name with spaces",
-			linkFiles: true,
-			lines: []string{
-				" logo.png     | Bin 0 -> 1234 bytes",
-				" script.sh    |   0",
-				" my file.txt  |   2 +-",
-			},
-			expected: []string{
-				link("logo.png", "     | Bin 0 -> 1234 bytes"),
-				link("script.sh", "    |   0"),
-				link("my file.txt", "  |   2 +-"),
-			},
-		},
-		{
-			name:      "stops looking once the diff itself has begun",
-			linkFiles: true,
-			lines: []string{
-				"diff --git a/pkg/gui.go b/pkg/gui.go",
-				" a context line that reads like an entry | 3 ++-",
-			},
-			expected: []string{
-				"diff --git a/pkg/gui.go b/pkg/gui.go",
-				" a context line that reads like an entry | 3 ++-",
-			},
-		},
-		{
-			name:      "stops looking at the first line a renderer states, whatever kind",
-			linkFiles: true,
-			lines: []string{
-				" pkg/gui.go | 1 +",
-				record("1", "c") + " a context line of the diff",
-				" this/looks/like/a/diff/stat | 2 +",
-			},
-			expected: []string{
-				link("pkg/gui.go", " | 1 +"),
-				record("1", "c") + " a context line of the diff",
-				" this/looks/like/a/diff/stat | 2 +",
-			},
-		},
-		{
-			name:      "stops for a record of a protocol version it doesn't read",
-			linkFiles: true,
-			lines: []string{
-				record("7", "f") + "── pkg/gui.go ──",
-				" this/looks/like/a/diff/stat | 2 +",
-			},
-			expected: []string{
-				record("7", "f") + "── pkg/gui.go ──",
-				" this/looks/like/a/diff/stat | 2 +",
-			},
-		},
-		{
-			name:      "keeps looking past the handshake, which states no line",
-			linkFiles: true,
-			lines: []string{
-				handshake,
-				" pkg/gui.go | 1 +",
-			},
-			expected: []string{
-				handshake,
-				link("pkg/gui.go", " | 1 +"),
-			},
-		},
-		{
-			// A diff with nothing above its diffstat. The handshake is written with no
-			// newline after it, so it runs into the entry naming the first file.
-			name:      "links an entry the handshake runs into",
-			linkFiles: true,
-			lines: []string{
-				handshake + " pkg/gui.go   | 1 +",
-				" dir/other.go | 2 +-",
-			},
-			expected: []string{
-				handshake + link("pkg/gui.go", "   | 1 +"),
-				link("dir/other.go", " | 2 +-"),
-			},
-		},
-		{
-			name:      "links an entry a handshake ended with a BEL runs into",
-			linkFiles: true,
-			lines: []string{
-				handshakeBel + " pkg/gui.go | 1 +",
-			},
-			expected: []string{
-				handshakeBel + link("pkg/gui.go", " | 1 +"),
-			},
-		},
-		{
-			name:      "leaves a render whose file names lead nowhere alone",
-			linkFiles: false,
-			lines: []string{
-				" pkg/gui.go    | 12 ++++++------",
-			},
-			expected: []string{
-				" pkg/gui.go    | 12 ++++++------",
-			},
-		},
-	}
-
-	for _, scenario := range scenarios {
-		t.Run(scenario.name, func(t *testing.T) {
-			buffer := &bytes.Buffer{}
-			writer := NewDiffStatLinkWriter(buffer)
-			writer.BeginRender(scenario.linkFiles)
-
-			for _, line := range scenario.lines {
-				written, err := writer.Write([]byte(line + "\n"))
-				assert.NoError(t, err)
-				// The writer answers for what it was given, not for what it passed on.
-				assert.Equal(t, len(line)+1, written)
-			}
-
-			assert.Equal(t, strings.Join(scenario.expected, "\n")+"\n", buffer.String())
-		})
-	}
-}
-
-func TestDiffStatLinkWriterStartsLookingAgainWithEachRender(t *testing.T) {
-	buffer := &bytes.Buffer{}
-	writer := NewDiffStatLinkWriter(buffer)
-
-	for range 2 {
-		buffer.Reset()
-		writer.BeginRender(true)
-		_, _ = writer.Write([]byte(" pkg/gui.go | 1 +\n"))
-		_, _ = writer.Write([]byte(" 1 file changed, 1 insertion(+)\n"))
-
-		assert.Equal(t, link("pkg/gui.go", " | 1 +")+
-			"\n 1 file changed, 1 insertion(+)\n", buffer.String())
-	}
-}
-
-func TestFileNamedByDiffStatEntry(t *testing.T) {
-	paths := []string{
-		"pkg/gui.go",
-		"pkg/integration/tests/main_view/jump_to_a_file_of_the_diff.go",
-		"vendor/github.com/gdamore/tcell/v3/AUTHORS",
-		"pkg/gocui/AUTHORS",
-		"renamed.txt",
-		"a/very/deeply/nested/directory/structure/some_long_file_name.txt",
-	}
-
-	scenarios := []struct {
-		name     string
-		entry    string
-		expected string
-	}{
-		{
-			name:     "a path the diffstat had room for",
-			entry:    "pkg/gui.go",
-			expected: "pkg/gui.go",
-		},
-		{
-			name:     "a path cut off at a directory boundary",
-			entry:    ".../tests/main_view/jump_to_a_file_of_the_diff.go",
-			expected: "pkg/integration/tests/main_view/jump_to_a_file_of_the_diff.go",
-		},
-		{
-			name:     "a path cut off inside the file name",
-			entry:    "..._long_file_name.txt",
-			expected: "a/very/deeply/nested/directory/structure/some_long_file_name.txt",
-		},
-		{
-			name:     "a rename, stated as the part the two paths share",
-			entry:    "vendor/github.com/gdamore/tcell/{v2 => v3}/AUTHORS",
-			expected: "vendor/github.com/gdamore/tcell/v3/AUTHORS",
-		},
-		{
-			name:     "a rename whose shared part was cut off along with the brace",
-			entry:    ".../github.com/jesseduffield => pkg}/gocui/AUTHORS",
-			expected: "pkg/gocui/AUTHORS",
-		},
-		{
-			name:     "a rename of paths that share nothing",
-			entry:    "original.txt => renamed.txt",
-			expected: "renamed.txt",
-		},
-		{
-			name:     "a name of no file of the diff",
-			entry:    "pkg/nowhere.go",
-			expected: "",
-		},
-		{
-			name:     "a name several files of the diff end with",
-			entry:    "AUTHORS",
-			expected: "",
-		},
-	}
-
-	for _, scenario := range scenarios {
-		t.Run(scenario.name, func(t *testing.T) {
-			index, ok := fileNamedByDiffStatEntry(scenario.entry, paths)
-			if scenario.expected == "" {
-				assert.False(t, ok)
-				return
-			}
-			assert.True(t, ok)
-			assert.Equal(t, scenario.expected, paths[index])
-		})
-	}
-}

pkg/gui/controllers/helpers/helpers.go

@@ -28,7 +28,8 @@ type Helpers struct {
 	MergeConflicts *MergeConflictsHelper
 	CherryPick     *CherryPickHelper
 	Host           *HostHelper
-	CustomPatch    *CustomPatchHelper
+	PatchBuilding  *PatchBuildingHelper
+	Staging        *StagingHelper
 	GPG            *GpgHelper
 	Upstream       *UpstreamHelper
 	AmendHelper    *AmendHelper
@@ -67,7 +68,8 @@ func NewStubHelpers() *Helpers {
 		MergeConflicts:    &MergeConflictsHelper{},
 		CherryPick:        &CherryPickHelper{},
 		Host:              &HostHelper{},
-		CustomPatch:       &CustomPatchHelper{},
+		PatchBuilding:     &PatchBuildingHelper{},
+		Staging:           &StagingHelper{},
 		GPG:               &GpgHelper{},
 		Upstream:          &UpstreamHelper{},
 		AmendHelper:       &AmendHelper{},

pkg/gui/controllers/helpers/host_helper.go

@@ -2,12 +2,9 @@ package helpers
 
 import (
 	"github.com/jesseduffield/lazygit/pkg/commands/hosting_service"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
-// this helper wraps our hosting_service package, and answers what we know about the
-// repo's pull requests on it
+// this helper just wraps our hosting_service package
 
 type HostHelper struct {
 	c *HelperCommon
@@ -21,24 +18,6 @@ func NewHostHelper(
 	}
 }
 
-// PullRequestForBranch returns the pull request the given local branch is the head of,
-// and false where it has none. That covers knowing of no pull requests at all: the repo
-// may not be on GitHub, or the answer may not have arrived yet.
-func (self *HostHelper) PullRequestForBranch(branchName string) (*models.GithubPullRequest, bool) {
-	pr, ok := self.c.Model().PullRequestsMap[branchName]
-	return pr, ok
-}
-
-// NoPullRequestDisabledReason disables a command that acts on a branch's pull request
-// while that branch has none.
-func (self *HostHelper) NoPullRequestDisabledReason(branchName string) *types.DisabledReason {
-	if _, ok := self.PullRequestForBranch(branchName); !ok {
-		return &types.DisabledReason{Text: self.c.Tr.NoPullRequestForBranch, ShowErrorInPanel: true}
-	}
-
-	return nil
-}
-
 func (self *HostHelper) GetPullRequestURL(from string, to string) (string, error) {
 	mgr, err := self.getHostingServiceMgr()
 	if err != nil {

pkg/gui/controllers/helpers/mode_helper.go

@@ -14,7 +14,7 @@ type ModeHelper struct {
 	c *HelperCommon
 
 	diffHelper                   *DiffHelper
-	customPatchHelper            *CustomPatchHelper
+	patchBuildingHelper          *PatchBuildingHelper
 	cherryPickHelper             *CherryPickHelper
 	mergeAndRebaseHelper         *MergeAndRebaseHelper
 	bisectHelper                 *BisectHelper
@@ -24,7 +24,7 @@ type ModeHelper struct {
 func NewModeHelper(
 	c *HelperCommon,
 	diffHelper *DiffHelper,
-	customPatchHelper *CustomPatchHelper,
+	patchBuildingHelper *PatchBuildingHelper,
 	cherryPickHelper *CherryPickHelper,
 	mergeAndRebaseHelper *MergeAndRebaseHelper,
 	bisectHelper *BisectHelper,
@@ -32,7 +32,7 @@ func NewModeHelper(
 	return &ModeHelper{
 		c:                    c,
 		diffHelper:           diffHelper,
-		customPatchHelper:    customPatchHelper,
+		patchBuildingHelper:  patchBuildingHelper,
 		cherryPickHelper:     cherryPickHelper,
 		mergeAndRebaseHelper: mergeAndRebaseHelper,
 		bisectHelper:         bisectHelper,
@@ -71,9 +71,9 @@ func (self *ModeHelper) Statuses() []ModeStatus {
 				return self.withResetButton(self.c.Tr.BuildingPatch, style.FgYellow.SetBold())
 			},
 			CancelLabel: func() string {
-				return self.c.Tr.ResetCustomPatch
+				return self.c.Tr.ExitCustomPatchBuilder
 			},
-			Reset: self.customPatchHelper.Reset,
+			Reset: self.patchBuildingHelper.Reset,
 		},
 		{
 			IsActive: self.c.Modes().Filtering.Active,

pkg/gui/controllers/helpers/patch_building_helper.go

@@ -0,0 +1,117 @@
+package helpers
+
+import (
+	"fmt"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/patch"
+	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+)
+
+type PatchBuildingHelper struct {
+	c *HelperCommon
+}
+
+func NewPatchBuildingHelper(
+	c *HelperCommon,
+) *PatchBuildingHelper {
+	return &PatchBuildingHelper{
+		c: c,
+	}
+}
+
+func (self *PatchBuildingHelper) ShowHunkStagingHint() {
+	if !self.c.AppState.DidShowHunkStagingHint && self.c.UserConfig().Gui.UseHunkModeInStagingView {
+		self.c.AppState.DidShowHunkStagingHint = true
+		self.c.SaveAppStateAndLogError()
+
+		message := fmt.Sprintf(self.c.Tr.HunkStagingHint, self.c.UserConfig().Keybinding.Main.ToggleSelectHunk)
+		self.c.Confirm(types.ConfirmOpts{
+			Prompt: message,
+		})
+	}
+}
+
+// takes us from the patch building panel back to the commit files panel
+func (self *PatchBuildingHelper) Escape() {
+	self.c.Context().Pop()
+}
+
+// kills the custom patch and returns us back to the commit files panel if needed
+func (self *PatchBuildingHelper) Reset() error {
+	self.c.Git().Patch.PatchBuilder.Reset()
+
+	if self.c.Context().CurrentStatic().GetKind() != types.SIDE_CONTEXT {
+		self.Escape()
+	}
+
+	self.c.Refresh(types.RefreshOptions{
+		Scope: []types.RefreshableView{types.COMMIT_FILES},
+	})
+
+	// refreshing the current context so that the secondary panel is hidden if necessary.
+	self.c.PostRefreshUpdate(self.c.Context().Current())
+	return nil
+}
+
+func (self *PatchBuildingHelper) RefreshPatchBuildingPanel(opts types.OnFocusOpts) {
+	selectedLineIdx := -1
+	if opts.ClickedWindowName == "main" {
+		selectedLineIdx = opts.ClickedViewLineIdx
+	}
+
+	if !self.c.Git().Patch.PatchBuilder.Active() {
+		self.Escape()
+		return
+	}
+
+	// get diff from commit file that's currently selected
+	file := self.c.Contexts().CommitFiles.GetSelectedFile()
+	if file == nil {
+		return
+	}
+
+	from, to := self.c.Contexts().CommitFiles.GetFromAndToForDiff()
+	from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(from)
+	diff, err := self.c.Git().WorkingTree.ShowFileDiff(from, to, reverse, file.Path, file.PreviousPath, git_commands.DiffModePlain)
+	if err != nil {
+		return
+	}
+
+	secondaryDiff := self.c.Git().Patch.PatchBuilder.RenderPatchForFile(patch.RenderPatchForFileOpts{
+		Filename:                               file.Path,
+		PreviousPath:                           file.PreviousPath,
+		Plain:                                  false,
+		Reverse:                                false,
+		TurnAddedFilesIntoDiffAgainstEmptyFile: true,
+	})
+
+	context := self.c.Contexts().CustomPatchBuilder
+
+	oldState := context.GetState()
+
+	state := patch_exploring.NewState(diff, selectedLineIdx, context.GetView(), oldState, self.c.UserConfig().Gui.UseHunkModeInStagingView)
+	context.SetState(state)
+	if state == nil {
+		self.Escape()
+		return
+	}
+
+	mainContent := context.GetContentToRender()
+
+	self.c.Contexts().CustomPatchBuilder.FocusSelection()
+
+	self.c.RenderToMainViews(types.RefreshMainOpts{
+		Pair: self.c.MainViewPairs().PatchBuilding,
+		Main: &types.ViewUpdateOpts{
+			Task:  types.NewRenderStringWithoutScrollTask(mainContent),
+			Title: self.c.Tr.Patch,
+		},
+		Secondary: &types.ViewUpdateOpts{
+			Task:  types.NewRenderStringWithoutScrollTask(secondaryDiff),
+			Title: self.c.Tr.CustomPatch,
+		},
+	})
+}

pkg/gui/controllers/helpers/refresh_helper.go

@@ -30,6 +30,8 @@ type RefreshHelper struct {
 	c                    *HelperCommon
 	refsHelper           *RefsHelper
 	mergeAndRebaseHelper *MergeAndRebaseHelper
+	patchBuildingHelper  *PatchBuildingHelper
+	stagingHelper        *StagingHelper
 	mergeConflictsHelper *MergeConflictsHelper
 	worktreeHelper       *WorktreeHelper
 	searchHelper         *SearchHelper
@@ -60,6 +62,8 @@ func NewRefreshHelper(
 	c *HelperCommon,
 	refsHelper *RefsHelper,
 	mergeAndRebaseHelper *MergeAndRebaseHelper,
+	patchBuildingHelper *PatchBuildingHelper,
+	stagingHelper *StagingHelper,
 	mergeConflictsHelper *MergeConflictsHelper,
 	worktreeHelper *WorktreeHelper,
 	searchHelper *SearchHelper,
@@ -68,6 +72,8 @@ func NewRefreshHelper(
 		c:                    c,
 		refsHelper:           refsHelper,
 		mergeAndRebaseHelper: mergeAndRebaseHelper,
+		patchBuildingHelper:  patchBuildingHelper,
+		stagingHelper:        stagingHelper,
 		mergeConflictsHelper: mergeConflictsHelper,
 		worktreeHelper:       worktreeHelper,
 		searchHelper:         searchHelper,
@@ -242,6 +248,8 @@ func (self *RefreshHelper) performRefresh(options types.RefreshOptions, calledFr
 
 	var scopeSet *set.Set[types.RefreshableView]
 	if len(options.Scope) == 0 {
+		// not refreshing staging/patch-building unless explicitly requested because we only need
+		// to refresh those while focused.
 		scopeSet = set.NewFromSlice([]types.RefreshableView{
 			types.COMMITS,
 			types.BRANCHES,
@@ -253,6 +261,7 @@ func (self *RefreshHelper) performRefresh(options types.RefreshOptions, calledFr
 			types.WORKTREES,
 			types.STATUS,
 			types.BISECT_INFO,
+			types.STAGING,
 			types.PULL_REQUESTS,
 		})
 	} else {
@@ -507,9 +516,37 @@ func (self *RefreshHelper) performRefresh(options types.RefreshOptions, calledFr
 		})
 	}
 
+	if scopeSet.Includes(types.STAGING) {
+		refresh("staging", func() {
+			fileWg.Wait()
+			// Bounce onto the UI thread so this runs after the files
+			// scope's model-update bounce — RefreshStagingPanel reads
+			// Model.Files (via Files.GetSelected) and would otherwise
+			// see the pre-refresh model. Guard on the generation so a
+			// repo switch mid-refresh drops it, like the model bounces.
+			self.onUIThreadUnlessRepoChanged(env, func() {
+				self.stagingHelper.RefreshStagingPanel(types.OnFocusOpts{})
+			})
+		})
+	}
+
+	if scopeSet.Includes(types.PATCH_BUILDING) {
+		refresh("patch building", func() {
+			// Bounce onto the UI thread, like the staging panel above:
+			// RefreshPatchBuildingPanel reads the commit-files selection and
+			// sets the patch view's origin, neither of which may run off the UI
+			// thread. Guard on the generation so a repo switch mid-refresh drops
+			// it, like the model bounces.
+			self.onUIThreadUnlessRepoChanged(env, func() {
+				self.patchBuildingHelper.RefreshPatchBuildingPanel(types.OnFocusOpts{})
+			})
+		})
+	}
+
 	if scopeSet.Includes(types.MERGE_CONFLICTS) {
 		refresh("merge conflicts", func() {
-			// Bounce onto the UI thread: RefreshMergeState reads the current context and
+			// Bounce onto the UI thread, like the staging and patch-building
+			// panels above: RefreshMergeState reads the current context and
 			// renders (or escapes) the merge-conflicts view, none of which may
 			// run off the UI thread.
 			self.onUIThreadUnlessRepoChanged(env, func() {
@@ -639,6 +676,8 @@ func getScopeNames(scopes []types.RefreshableView) []string {
 		types.WORKTREES:       "worktrees",
 		types.STATUS:          "status",
 		types.BISECT_INFO:     "bisect",
+		types.STAGING:         "staging",
+		types.PATCH_BUILDING:  "patchBuilding",
 		types.MERGE_CONFLICTS: "mergeConflicts",
 		types.COMMIT_FILES:    "commitFiles",
 		types.PULL_REQUESTS:   "pullRequests",
@@ -1047,31 +1086,17 @@ type capturedCommitFilesState struct {
 	from    string
 	to      string
 	reverse bool
-	// Whether there is a commit to load the files of at all. The panel is only ever
-	// pointed at one by being entered, and a patch can now be built from a commit's diff
-	// without that — after which anything that refreshes the panel would otherwise be
-	// asking for the files of nothing.
-	hasCommit bool
 }
 
 // captureCommitFilesState reads the commit-files refresh's diff endpoints into
 // an immutable snapshot. It must run on the UI thread.
 func (self *RefreshHelper) captureCommitFilesState() capturedCommitFilesState {
-	commitFilesContext := self.c.Contexts().CommitFiles
-	if commitFilesContext.GetRef() == nil && commitFilesContext.GetRefRange() == nil {
-		return capturedCommitFilesState{}
-	}
-
-	from, to := commitFilesContext.GetFromAndToForDiff()
+	from, to := self.c.Contexts().CommitFiles.GetFromAndToForDiff()
 	from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(from)
-	return capturedCommitFilesState{from: from, to: to, reverse: reverse, hasCommit: true}
+	return capturedCommitFilesState{from: from, to: to, reverse: reverse}
 }
 
 func (self *RefreshHelper) refreshCommitFilesContext(captured capturedCommitFilesState, env refreshEnv) error {
-	if !captured.hasCommit {
-		return nil
-	}
-
 	files, err := env.git.Loaders.CommitFileLoader.GetFilesInDiff(captured.from, captured.to, captured.reverse)
 	if err != nil {
 		return err

pkg/gui/controllers/helpers/refs_helper.go

@@ -50,6 +50,7 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
 			types.REFLOG,
 			types.WORKTREES,
 			types.BISECT_INFO,
+			types.STAGING,
 		}
 		if options.RefreshPullRequests {
 			scope = append(scope, types.PULL_REQUESTS)

pkg/gui/controllers/helpers/staging_helper.go

@@ -0,0 +1,128 @@
+package helpers
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+)
+
+type StagingHelper struct {
+	c *HelperCommon
+}
+
+func NewStagingHelper(
+	c *HelperCommon,
+) *StagingHelper {
+	return &StagingHelper{
+		c: c,
+	}
+}
+
+// NOTE: used from outside this file
+func (self *StagingHelper) RefreshStagingPanel(focusOpts types.OnFocusOpts) {
+	secondaryFocused := self.secondaryStagingFocused()
+	mainFocused := self.mainStagingFocused()
+
+	// this method could be called when the staging panel is not being used,
+	// in which case we don't want to do anything.
+	if !mainFocused && !secondaryFocused {
+		return
+	}
+
+	mainSelectedLineIdx := -1
+	secondarySelectedLineIdx := -1
+	if focusOpts.ClickedViewLineIdx > 0 {
+		if secondaryFocused {
+			secondarySelectedLineIdx = focusOpts.ClickedViewLineIdx
+		} else {
+			mainSelectedLineIdx = focusOpts.ClickedViewLineIdx
+		}
+	}
+
+	mainContext := self.c.Contexts().Staging
+	secondaryContext := self.c.Contexts().StagingSecondary
+
+	var file *models.File
+	node := self.c.Contexts().Files.GetSelected()
+	if node != nil {
+		file = node.File
+	}
+
+	if file == nil || (!file.HasUnstagedChanges && !file.HasStagedChanges) {
+		self.handleStagingEscape()
+		return
+	}
+
+	mainDiff := self.c.Git().WorkingTree.WorktreeFileDiff(file, git_commands.DiffModePlain, false)
+	secondaryDiff := self.c.Git().WorkingTree.WorktreeFileDiff(file, git_commands.DiffModePlain, true)
+
+	// grabbing locks here and releasing before we finish the function
+	// because pushing say the secondary context could mean entering this function
+	// again, and we don't want to have a deadlock
+	mainContext.GetMutex().Lock()
+	secondaryContext.GetMutex().Lock()
+
+	hunkMode := self.c.UserConfig().Gui.UseHunkModeInStagingView
+	mainContext.SetState(
+		patch_exploring.NewState(mainDiff, mainSelectedLineIdx, mainContext.GetView(), mainContext.GetState(), hunkMode),
+	)
+
+	secondaryContext.SetState(
+		patch_exploring.NewState(secondaryDiff, secondarySelectedLineIdx, secondaryContext.GetView(), secondaryContext.GetState(), hunkMode),
+	)
+
+	mainState := mainContext.GetState()
+	secondaryState := secondaryContext.GetState()
+
+	mainContent := mainContext.GetContentToRender()
+	secondaryContent := secondaryContext.GetContentToRender()
+
+	mainContext.GetMutex().Unlock()
+	secondaryContext.GetMutex().Unlock()
+
+	if mainState == nil && secondaryState == nil {
+		self.handleStagingEscape()
+		return
+	}
+
+	if mainState == nil && !secondaryFocused {
+		self.c.Context().Push(secondaryContext, focusOpts)
+		return
+	}
+
+	if secondaryState == nil && secondaryFocused {
+		self.c.Context().Push(mainContext, focusOpts)
+		return
+	}
+
+	if secondaryFocused {
+		self.c.Contexts().StagingSecondary.FocusSelection()
+	} else {
+		self.c.Contexts().Staging.FocusSelection()
+	}
+
+	self.c.RenderToMainViews(types.RefreshMainOpts{
+		Pair: self.c.MainViewPairs().Staging,
+		Main: &types.ViewUpdateOpts{
+			Task:  types.NewRenderStringWithoutScrollTask(mainContent),
+			Title: self.c.Tr.UnstagedChanges,
+		},
+		Secondary: &types.ViewUpdateOpts{
+			Task:  types.NewRenderStringWithoutScrollTask(secondaryContent),
+			Title: self.c.Tr.StagedChanges,
+		},
+	})
+}
+
+func (self *StagingHelper) handleStagingEscape() {
+	self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{})
+}
+
+func (self *StagingHelper) secondaryStagingFocused() bool {
+	return self.c.Context().CurrentStatic().GetKey() == self.c.Contexts().StagingSecondary.GetKey()
+}
+
+func (self *StagingHelper) mainStagingFocused() bool {
+	return self.c.Context().CurrentStatic().GetKey() == self.c.Contexts().Staging.GetKey()
+}

pkg/gui/controllers/local_commits_controller.go

@@ -667,11 +667,15 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
 }
 
 func (self *LocalCommitsController) checkedOutBranchHasPR() *types.DisabledReason {
-	return self.c.Helpers().Host.NoPullRequestDisabledReason(self.c.Model().CheckedOutBranch)
+	branch := self.c.Model().CheckedOutBranch
+	if _, ok := self.c.Model().PullRequestsMap[branch]; !ok {
+		return &types.DisabledReason{Text: self.c.Tr.NoPullRequestForBranch, ShowErrorInPanel: true}
+	}
+	return nil
 }
 
 func (self *LocalCommitsController) openPRInBrowser() error {
-	pr, ok := self.c.Helpers().Host.PullRequestForBranch(self.c.Model().CheckedOutBranch)
+	pr, ok := self.c.Model().PullRequestsMap[self.c.Model().CheckedOutBranch]
 	if !ok {
 		// Should be guarded against by the DisabledReason check, but be defensive in case
 		// PullRequestsMap was updated concurrently by a background refresh
@@ -718,30 +722,17 @@ func (self *LocalCommitsController) GetOnRenderToMain() func() {
 	}
 }
 
-// secondaryPatchPanelUpdateOpts renders the custom patch being built into the pane
-// beside the diff it is being built from, as a diff of the two trees the patch is
-// materialized into. This way it is shown by whatever renders the rest of the diffs,
-// and its lines can be pointed at and taken back out of the patch.
 func secondaryPatchPanelUpdateOpts(c *ControllerCommon) *types.ViewUpdateOpts {
-	if !c.Git().Patch.PatchBuilder.Active() {
-		return nil
+	if c.Git().Patch.PatchBuilder.Active() {
+		patch := c.Git().Patch.PatchBuilder.RenderAggregatedPatch(false)
+
+		return &types.ViewUpdateOpts{
+			Task:  types.NewMainViewDiffStringTask(patch),
+			Title: c.Tr.CustomPatch,
+		}
 	}
 
-	// A render of the same patch reuses the trees; only a change to the patch writes them
-	// again.
-	if err := c.Git().Patch.EnsureCustomPatchDiffTrees(); err != nil {
-		c.Log.Error(err)
-	}
-
-	// The same mode as the diff beside it: both panes of the pair have to agree about
-	// whether what they show can be acted on.
-	mode := c.Helpers().DiffLine.MainViewDiffMode()
-	cmdObj := c.Git().Diff.CustomPatchDiffCmdObj(c.Git().Patch.PatchBuilder.TempDir(), mode)
-
-	return &types.ViewUpdateOpts{
-		Task:  types.NewMainViewDiffTask(cmdObj.GetCmd(), mode),
-		Title: c.Tr.CustomPatch,
-	}
+	return nil
 }
 
 func (self *LocalCommitsController) squashDown(selectedCommits []*models.Commit, startIdx int, endIdx int) error {

pkg/gui/controllers/main_view_controller.go

@@ -1,13 +1,6 @@
 package controllers
 
 import (
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
@@ -22,13 +15,10 @@ type MainViewController struct {
 	context      *context.MainContext
 	otherContext *context.MainContext
 
-	dragAutoscroller    *helpers.DragAutoscroller
-	draggingWithMouse   bool
-	lineFlashGeneration uint64
+	dragAutoscroller  *helpers.DragAutoscroller
+	draggingWithMouse bool
 }
 
-const editedLineFlashDuration = 200 * time.Millisecond
-
 var _ types.IController = &MainViewController{}
 
 func NewMainViewController(
@@ -56,8 +46,8 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 		{
 			Keys:            opts.GetKeys(opts.Config.Universal.TogglePanel),
 			Handler:         self.togglePanel,
-			Description:     self.c.Tr.ToggleDiffPane,
-			Tooltip:         self.c.Tr.ToggleDiffPaneTooltip,
+			Description:     self.c.Tr.ToggleStagingView,
+			Tooltip:         self.c.Tr.ToggleStagingViewTooltip,
 			DisplayOnScreen: true,
 		},
 		{
@@ -90,31 +80,22 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 			Tooltip:           self.c.Tr.EditFileTooltip,
 		},
 		{
-			Keys:    opts.GetKeys(opts.Config.Universal.Select),
-			Handler: self.primaryAction,
-			// The description is of the working tree's diff, which is where the key does
-			// the thing users know it for; over a commit's diff it says so for itself.
+			Keys:              opts.GetKeys(opts.Config.Universal.Select),
+			Handler:           self.primaryAction,
 			Description:       self.c.Tr.Stage,
-			DescriptionFunc:   self.diffActionDescription(self.c.Tr.Stage, self.c.Tr.ToggleSelectionForPatch),
+			DescriptionFunc:   self.workingTreeActionDescription(self.c.Tr.Stage),
 			GetDisabledReason: self.diffSelectionDisabledReason,
 			Tooltip:           self.c.Tr.StageSelectionTooltip,
-			// Over a commit's diff the key toggles lines in the custom patch, which the
-			// description says for itself; there is nothing to add to it.
-			TooltipFunc:     self.diffActionDescription(self.c.Tr.StageSelectionTooltip, ""),
-			DisplayOnScreen: true,
+			DisplayOnScreen:   true,
 		},
 		{
 			Keys:              opts.GetKeys(opts.Config.Universal.Remove),
 			Handler:           self.discardSelection,
 			Description:       self.c.Tr.DiscardSelection,
-			DescriptionFunc:   self.diffActionDescription(self.c.Tr.DiscardSelection, self.c.Tr.RemoveSelectionFromPatch),
-			GetDisabledReason: self.discardSelectionDisabledReason,
+			DescriptionFunc:   self.workingTreeActionDescription(self.c.Tr.DiscardSelection),
+			GetDisabledReason: self.diffSelectionDisabledReason,
 			Tooltip:           self.c.Tr.DiscardSelectionTooltip,
-			// Over a commit's diff the key rewrites the commit rather than touching the
-			// index, which is worth the warning the other tooltip carries.
-			TooltipFunc: self.diffActionDescription(
-				self.c.Tr.DiscardSelectionTooltip, self.c.Tr.RemoveSelectionFromPatchTooltip),
-			DisplayOnScreen: true,
+			DisplayOnScreen:   true,
 		},
 		{
 			Keys:              opts.GetKeys(opts.Config.Main.EditSelectHunk),
@@ -127,8 +108,8 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 		{
 			Keys:              opts.GetKeys(opts.Config.Universal.CopyToClipboard),
 			Handler:           self.copySelection,
-			Description:       self.c.Tr.CopySelectedDiffLinesToClipboard,
-			DescriptionFunc:   self.diffSelectionDescriptionText(self.c.Tr.CopySelectedDiffLinesToClipboard),
+			Description:       self.c.Tr.CopySelectedTextToClipboard,
+			DescriptionFunc:   self.diffSelectionDescriptionText(self.c.Tr.CopySelectedTextToClipboard),
 			GetDisabledReason: self.diffSelectionDisabledReason,
 		},
 		{
@@ -159,23 +140,6 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 			DescriptionFunc:   self.diffSelectionDescriptionText(self.c.Tr.NextFileInDiff),
 			GetDisabledReason: self.diffSelectionDisabledReason,
 		},
-		{
-			Keys:              opts.GetKeys(opts.Config.Universal.JumpToFile),
-			Handler:           self.openJumpToFileMenu,
-			Description:       self.c.Tr.JumpToFile,
-			DescriptionFunc:   self.diffSelectionDescriptionText(self.c.Tr.JumpToFile),
-			GetDisabledReason: self.diffSelectionDisabledReason,
-			OpensMenu:         true,
-			DisplayOnScreen:   true,
-		},
-		{
-			Keys:              opts.GetKeys(opts.Config.Commits.OpenPullRequestInBrowser),
-			Handler:           self.openPullRequestAtSelectedLine,
-			Description:       self.c.Tr.OpenPullRequestAtSelectedLine,
-			DescriptionFunc:   self.pullRequestDescription(self.c.Tr.OpenPullRequestAtSelectedLine),
-			GetDisabledReason: self.openPullRequestDisabledReason,
-			Tooltip:           self.c.Tr.OpenPullRequestAtSelectedLineTooltip,
-		},
 		{
 			Keys:            opts.GetKeys(opts.Config.Universal.Return),
 			Handler:         self.escape,
@@ -268,20 +232,6 @@ func (self *MainViewController) GetMouseKeybindings(opts types.KeybindingsOpts)
 			Key:      gocui.MouseRelease,
 			Handler:  self.onDragRelease,
 		},
-		{
-			ViewName:                    self.context.GetViewName(),
-			Key:                         gocui.MouseLeft,
-			Modifier:                    gocui.ModAlt,
-			Handler:                     self.editClickedLine,
-			HandleWhenPopupPanelFocused: true,
-		},
-		{
-			ViewName:                    self.context.GetViewName(),
-			Key:                         gocui.MouseLeft,
-			Modifier:                    gocui.ModShift,
-			Handler:                     self.editClickedLine,
-			HandleWhenPopupPanelFocused: true,
-		},
 	}
 }
 
@@ -289,14 +239,6 @@ func (self *MainViewController) Context() types.Context {
 	return self.context
 }
 
-// GetOnFocus brings on the marks over the lines that are in the custom patch, which
-// are an affordance of the focused view, so they arrive with the focus.
-func (self *MainViewController) GetOnFocus() func(types.OnFocusOpts) {
-	return func(types.OnFocusOpts) {
-		self.c.Helpers().DiffLine.RefreshInclusionGutter()
-	}
-}
-
 func (self *MainViewController) togglePanel() error {
 	if !self.otherContext.GetView().Visible {
 		return nil
@@ -349,22 +291,17 @@ func (self *MainViewController) isDiffView() bool {
 	return self.diffMainViewType() != types.DiffMainViewTypeNone
 }
 
-// sidePanelBeneath returns the side panel this pane is showing the content of, and nil
-// when there is none. The IsInStack guard is essential: NextInStack panics for a context
-// that isn't in the stack, and GetKeybindings (which leads here) also runs for off-stack
-// panes — at startup and while generating the cheatsheets, where the stack is empty.
-func (self *MainViewController) sidePanelBeneath() types.Context {
-	if !self.c.Context().IsInStack(self.context) {
-		return nil
-	}
-	return self.c.Context().NextInStack(self.context)
-}
-
 // diffMainViewType reports what the diff in the focused main view belongs to, taken
 // from the side panel beneath it, or DiffMainViewTypeNone when this pane isn't on the
-// stack or has no diff panel beneath it.
+// stack or has no diff panel beneath it. The IsInStack guard is essential:
+// NextInStack panics for a context that isn't in the stack, and GetKeybindings (which
+// leads here) also runs for off-stack panes — at startup and while generating the
+// cheatsheets, where the stack is empty.
 func (self *MainViewController) diffMainViewType() types.DiffMainViewType {
-	if diffContext, ok := self.sidePanelBeneath().(types.DiffMainViewContext); ok {
+	if !self.c.Context().IsInStack(self.context) {
+		return types.DiffMainViewTypeNone
+	}
+	if diffContext, ok := self.c.Context().NextInStack(self.context).(types.DiffMainViewContext); ok {
 		return diffContext.GetDiffMainViewType()
 	}
 	return types.DiffMainViewTypeNone
@@ -374,7 +311,10 @@ func (self *MainViewController) diffMainViewType() types.DiffMainViewType {
 // hand out the diff it rendered there. nil when this pane isn't on the stack, or the
 // panel beneath shows no diff.
 func (self *MainViewController) diffSource() types.FocusedMainViewDiffSource {
-	sidePanel := self.sidePanelBeneath()
+	if !self.c.Context().IsInStack(self.context) {
+		return nil
+	}
+	sidePanel := self.c.Context().NextInStack(self.context)
 	if sidePanel == nil {
 		return nil
 	}
@@ -400,6 +340,56 @@ func (self *MainViewController) primaryAction() error {
 	return actions.PrimaryAction(self.context, first, last)
 }
 
+// revealSelectionAfterAction moves the selection to the change that takes the place of
+// the one just acted on, once the changed diff has re-rendered. Call it from the panel's
+// action handler with the pane it acted in, the pane the work carries on in, and the
+// first line of the selection, before triggering the re-render.
+//
+// The line acted on is gone from the diff, so what is remembered is its place among the
+// diff's changes: the next change moves up into it, which is where you want to be to
+// carry on. A range collapses to a single line at its start, and hunk mode selects the
+// whole block it lands in, so that pressing the key again acts on the next hunk. The
+// target pane inherits that select mode, this being the same piece of work continuing
+// in another pane — and shows no selection until the restore places one, so that what
+// it was left showing the last time it was used doesn't appear for a frame.
+//
+// done is called once the selection is where it belongs, or once it turns out that no
+// render is coming to put it there, for a caller that must not let the user act again
+// in between.
+func revealSelectionAfterAction(
+	c *ControllerCommon, source types.DiffPaneContext, target types.DiffPaneContext,
+	firstLineIdx int, done func(),
+) {
+	ordinal, ok := c.Helpers().DiffLine.ChangeLineOrdinal(source.GetView(), firstLineIdx)
+	if !ok {
+		done()
+		return
+	}
+
+	sel := source.DiffSelectState()
+	if sel.Mode == types.DiffSelectModeRange {
+		sel.Mode = types.DiffSelectModeLine
+		sel.RangeIsSticky = false
+	}
+	*target.DiffSelectState() = *sel
+	selectHunk := sel.Mode == types.DiffSelectModeHunk
+
+	targetView := target.GetView()
+	if target != source {
+		target.SetHasSelectableContent(false)
+		c.Context().UpdateSelectionHighlights()
+	}
+
+	c.Helpers().DiffLine.RevealChangeLineAtOrdinal(targetView, ordinal, func(viewLine int) {
+		if selectHunk {
+			c.Helpers().DiffLine.SelectChangeBlock(target, viewLine, true)
+			return
+		}
+		targetView.CancelRangeSelect()
+		c.Helpers().DiffLine.ShowSelectionAtLine(targetView, viewLine, true)
+	}, done)
+}
+
 // discardSelection takes the selected diff lines back out of what they are part of,
 // which — like the primary action — is the panel's business, and so is the re-render
 // that follows.
@@ -441,37 +431,12 @@ func (self *MainViewController) workingTreeAction(action func() error) func() er
 // workingTreeActionDescription gives a command's description only where the command
 // applies — over the working tree's diff — so that it is listed there and nowhere else.
 func (self *MainViewController) workingTreeActionDescription(description string) func() string {
-	return self.diffActionDescription(description, "")
-}
-
-// diffActionDescription describes a command in the words that suit the diff it applies
-// to: acting on the working tree's diff stages, acting on a commit's builds a custom
-// patch. Over content that is no diff at all the command doesn't apply, and describes
-// itself as nothing, which keeps it out of the keybindings menu there.
-func (self *MainViewController) diffActionDescription(staging string, patchBuilding string) func() string {
 	return func() string {
-		switch self.diffMainViewType() {
-		case types.DiffMainViewTypeStaging:
-			return staging
-		case types.DiffMainViewTypePatchBuilding:
-			return patchBuilding
-		default:
-			return ""
-		}
-	}
-}
-
-// pullRequestDescription describes a command that acts on the pull request of the
-// branch the diff belongs to. Over a diff that belongs to no branch (the working tree's,
-// a stash entry's) it describes it as nothing; this keeps the command out of the
-// keybindings menu there.
-func (self *MainViewController) pullRequestDescription(description string) func() string {
-	return self.diffSelectionDescription(func() string {
-		if self.pullRequestBranch() == "" {
+		if self.diffMainViewType() != types.DiffMainViewTypeStaging {
 			return ""
 		}
 		return description
-	})
+	}
 }
 
 // copySelection copies the selected diff lines to the clipboard — not as the diff
@@ -552,103 +517,11 @@ func (self *MainViewController) diffSelectionDisabledReason() *types.DisabledRea
 	return nil
 }
 
-// discardSelectionDisabledReason disables discarding while there is nothing to discard,
-// and where the panel beneath won't have it: taking lines out of a commit means
-// rewriting it, which isn't always something we may do.
-func (self *MainViewController) discardSelectionDisabledReason() *types.DisabledReason {
-	if reason := self.diffSelectionDisabledReason(); reason != nil {
-		return reason
-	}
-	if actions := self.focusedMainViewActions(); actions != nil {
-		return actions.DiscardSelectionDisabledReason(self.context)
-	}
-	return nil
-}
-
-// openPullRequestDisabledReason disables opening a line in the pull request where the
-// pull request has no view of what is on screen. The branch may have no pull request,
-// and the pane may be showing a diff that is not the commit's own: a diff against
-// another ref, or the custom patch, whose lines sit at the numbers the patch gives them
-// rather than the commit's.
-func (self *MainViewController) openPullRequestDisabledReason() *types.DisabledReason {
-	if reason := self.diffSelectionDisabledReason(); reason != nil {
-		return reason
-	}
-	if self.c.Modes().Diffing.Active() {
-		return &types.DisabledReason{Text: self.c.Tr.NotAvailableInDiffingMode}
-	}
-	if self.c.Helpers().DiffLine.ShowsCustomPatch(self.context.GetView()) {
-		return &types.DisabledReason{Text: self.c.Tr.NotAvailableForCustomPatch}
-	}
-	if reason := self.c.Helpers().Host.NoPullRequestDisabledReason(self.pullRequestBranch()); reason != nil {
-		return reason
-	}
-	return self.commitsOutsidePullRequestDisabledReason()
-}
-
-// commitsOutsidePullRequestDisabledReason disables opening a line of a diff whose
-// commits the pull request doesn't hold: it holds the commits of its branch that are on
-// the remote, so an unpushed commit is none of its own, and neither is one that is in a
-// main branch already and so from before the branch. Asked for such a commit, its pages
-// say they can't find it.
-func (self *MainViewController) commitsOutsidePullRequestDisabledReason() *types.DisabledReason {
-	commits, _ := self.pullRequestCommits()
-	if lo.EveryBy(commits, func(commit *models.Commit) bool {
-		return commit.Status == models.StatusPushed
-	}) {
-		return nil
-	}
-
-	if len(commits) == 1 {
-		return &types.DisabledReason{Text: self.c.Tr.CommitNotInPullRequest}
-	}
-	return &types.DisabledReason{Text: self.c.Tr.CommitsNotInPullRequest}
-}
-
 func (self *MainViewController) onClickInAlreadyFocusedView(opts gocui.ViewMouseBindingOpts) error {
 	self.selectClickedDiffLine(opts.Y)
 	return nil
 }
 
-func (self *MainViewController) editClickedLine(opts gocui.ViewMouseBindingOpts) error {
-	var flashGeneration uint64
-	err := self.editDiffLine(opts.Y, func() {
-		self.lineFlashGeneration++
-		flashGeneration = self.lineFlashGeneration
-		self.context.GetView().SetLineFlash(self.lineToFlash(opts.Y))
-		self.c.GocuiGui().ForceFlushViewsContentOnly(self.c.GocuiGui().Views())
-	})
-	if flashGeneration != 0 {
-		time.AfterFunc(editedLineFlashDuration, func() {
-			self.c.OnUIThreadContentOnlyBackground(func() error {
-				if self.lineFlashGeneration == flashGeneration {
-					self.context.GetView().ClearLineFlash()
-				}
-				return nil
-			})
-		})
-	}
-	return err
-}
-
-// lineToFlash returns the view line to flash for an edit of the line clicked at the
-// given one. The editor is sent to where that line begins, so a long line wrapped over
-// several view lines is flashed at the first of them. If the editor wraps the line too,
-// its cursor ends up on the flashed line. When the line begins above the top of the
-// viewport, the clicked line is flashed, as the only part of the line on screen.
-func (self *MainViewController) lineToFlash(clickedViewLine int) int {
-	view := self.context.GetView()
-	bufferLine, ok := view.BufferLineForViewLine(clickedViewLine)
-	if !ok {
-		return clickedViewLine
-	}
-	firstViewLine, ok := view.ViewLineForBufferLine(bufferLine)
-	if !ok || firstViewLine < view.OriginY() {
-		return clickedViewLine
-	}
-	return firstViewLine
-}
-
 func (self *MainViewController) onClickInOtherViewOfMainViewPair(opts gocui.ViewMouseBindingOpts) error {
 	// Carry the select mode over from the pane we're leaving, so that clicking into
 	// the other pane keeps hunk mode even the first time we enter it — its own mode
@@ -707,10 +580,6 @@ func (self *MainViewController) GetOnFocusLost() func(types.OnFocusLostOpts) {
 			self.draggingWithMouse = false
 			self.c.GocuiGui().CancelMouseCapture()
 		}
-		// Where the focus has gone is already known here, so asking again keeps the
-		// patch marks over a move to the pane beside this one, and takes them away
-		// when the focus leaves the pair.
-		self.c.Helpers().DiffLine.RefreshInclusionGutter()
 	}
 }
 
@@ -847,12 +716,50 @@ func (self *MainViewController) prevFile() error {
 	return nil
 }
 
+// placeNavigationTarget moves the selection to the row a jump found, bringing it on
+// screen if it isn't already.
+//
+// alignTop asks for the target to become the view's top line, so that everything that
+// begins there is on screen. It only applies to a target the view has to scroll to: a
+// jump to something already on screen leaves the view alone, there being nothing to
+// gain from moving what the user is looking at. In hunk mode what ends up selected is
+// the first change block at or below the target, which a large context size can put
+// further down than a screenful; the selection is then scrolled into view as any other
+// jump's is, and the alignment gives way to that.
 func (self *MainViewController) placeNavigationTarget(target int, alignTop bool) {
-	self.c.Helpers().DiffLine.PlaceNavigationTarget(self.context, target, alignTop)
+	v := self.context.GetView()
+	if !v.Highlight {
+		v.SetOrigin(0, target)
+		return
+	}
+	if alignTop {
+		self.scrollTargetToTop(target)
+	}
+	// Jumping to another block or file moves the cursor without shift held, so a
+	// range that grows only while shift is held collapses rather than stretching all
+	// the way to the target. A sticky range stretches instead; this is the point of
+	// being sticky.
+	self.collapseNonStickyRange()
+	if self.diffSelectState().Mode == types.DiffSelectModeHunk {
+		self.selectHunkAround(target, true)
+		return
+	}
+	// Line mode leaves a single-line selection at the target; an active range extends
+	// to it, the anchor being untouched.
+	self.c.Helpers().DiffLine.ShowSelectionAtLine(v, target, true)
 }
 
-func (self *MainViewController) openJumpToFileMenu() error {
-	return self.c.Helpers().DiffLine.OpenJumpToFileMenu(self.context, self.c.Tr.JumpToFile)
+// scrollTargetToTop scrolls the given row of the diff to the top of the view, leaving
+// the view where it is when that row is on screen already. The last screenful of the
+// diff is as far as it goes, so that the view doesn't scroll past the end of what it is
+// showing.
+func (self *MainViewController) scrollTargetToTop(target int) {
+	view := self.context.GetView()
+	originY, height := self.context.GetViewTrait().ViewPortYBounds()
+	if target >= originY && target < originY+height {
+		return
+	}
+	view.SetOriginY(min(target, max(0, view.ViewLinesHeight()-height)))
 }
 
 // moveCursor moves the selection cursor by delta view lines (negative = up), with the
@@ -884,7 +791,17 @@ func (self *MainViewController) collapseForLineMove() {
 		self.context.GetView().CancelRangeSelect()
 		return
 	}
-	self.c.Helpers().DiffLine.CollapseNonStickyRange(self.context)
+	self.collapseNonStickyRange()
+}
+
+// collapseNonStickyRange drops a range that only grows while shift is held back to a
+// single line at the cursor.
+func (self *MainViewController) collapseNonStickyRange() {
+	sel := self.diffSelectState()
+	if sel.Mode == types.DiffSelectModeRange && !sel.RangeIsSticky {
+		sel.Mode = types.DiffSelectModeLine
+		self.context.GetView().CancelRangeSelect()
+	}
 }
 
 // adjustSelection moves the selection by delta view lines, for the plain up/down and
@@ -1053,17 +970,11 @@ func (self *MainViewController) editLine() error {
 	if !view.Highlight {
 		return nil
 	}
-	return self.editDiffLine(view.SelectedLineIdx(), nil)
-}
 
-func (self *MainViewController) editDiffLine(viewLine int, beforeEdit func()) error {
-	info, ok := self.c.Helpers().DiffLine.GetDiffLineInfo(self.context.GetView(), viewLine)
+	info, ok := self.c.Helpers().DiffLine.GetDiffLineInfo(view, view.SelectedLineIdx())
 	if !ok {
 		return nil
 	}
-	if beforeEdit != nil {
-		beforeEdit()
-	}
 
 	// A file-header row points at the file as a whole rather than at a line in it, so
 	// it opens the file without jumping anywhere — as pressing edit on a file in a side
@@ -1078,104 +989,6 @@ func (self *MainViewController) editDiffLine(viewLine int, beforeEdit func()) er
 	return self.c.Helpers().Files.EditFileAtLine(info.Path, lineNumber)
 }
 
-// openPullRequestAtSelectedLine opens the pull request of the branch whose commit the
-// main view is showing the diff of, at the line the selection is on, so that the line
-// can be commented on there.
-func (self *MainViewController) openPullRequestAtSelectedLine() error {
-	pr, ok := self.c.Helpers().Host.PullRequestForBranch(self.pullRequestBranch())
-	if !ok {
-		// Guarded against by the disabled reason, but a refresh in the background may
-		// have taken the pull request away since it was asked.
-		return errors.New(self.c.Tr.NoPullRequestForBranch)
-	}
-
-	commits, baseHash := self.pullRequestCommits()
-	if len(commits) == 0 {
-		return nil
-	}
-
-	view := self.context.GetView()
-	info, ok := self.c.Helpers().DiffLine.GetDiffLineInfo(view, view.SelectedLineIdx())
-	if !ok {
-		return nil
-	}
-	relativePath := repoRelativePath(self.c.Git().RepoPaths.WorktreePath(), info.Path)
-	if relativePath == "" {
-		return nil
-	}
-
-	self.c.LogAction(self.c.Tr.Actions.OpenPullRequest)
-	url := githubPullRequestLineURL(pr.Url, githubCommitRange(commits, baseHash), relativePath, info)
-	return self.c.OS().OpenLink(url)
-}
-
-// pullRequestBranch returns the branch whose pull request would show the diff in this
-// pane, as the panel beneath names it, and "" where no pull request shows it.
-func (self *MainViewController) pullRequestBranch() string {
-	prContext, ok := self.sidePanelBeneath().(types.PullRequestDiffContext)
-	if !ok {
-		return ""
-	}
-	return prContext.BranchForPullRequest()
-}
-
-// pullRequestCommits returns the commits whose diff the pane is showing, and the commit
-// that diff starts after, as the panel beneath names them. The diff's line numbers are
-// the ones the pull request's page for those commits shows.
-func (self *MainViewController) pullRequestCommits() ([]*models.Commit, string) {
-	prContext, ok := self.sidePanelBeneath().(types.PullRequestDiffContext)
-	if !ok {
-		return nil, ""
-	}
-	return prContext.CommitsForPullRequest()
-}
-
-// githubPullRequestLineURL builds the URL of a line of a file, in the diff a pull request
-// shows for the given commits. The file is named by the SHA-256 of its path as git spells
-// it, and the line by which side of the diff it is on.
-//
-// GitHub documents none of this; the form was read off the URLs its own pages carry (see
-// https://github.com/orgs/community/discussions/55764).
-func githubPullRequestLineURL(
-	prURL string, commitRange string, relativePath string, info types.DiffLineInfo,
-) string {
-	pathHash := sha256.Sum256([]byte(relativePath))
-	anchor := "diff-" + hex.EncodeToString(pathHash[:]) + githubDiffLineSuffix(info)
-	return fmt.Sprintf("%s/changes/%s#%s", prURL, commitRange, anchor)
-}
-
-// githubCommitRange names the commits a pull request is to show the diff of: a single
-// commit by its hash, and a range of them as the commit the diff starts after, then the
-// commit it ends at. A range that starts where the pull request itself does names BASE
-// as the commit it starts after, the keyword its pages use for the commit the pull
-// request was opened against; naming that commit by its hash gets a page that says it
-// can't find those commits.
-func githubCommitRange(commits []*models.Commit, baseHash string) string {
-	newest := commits[0].Hash()
-	if len(commits) == 1 {
-		return newest
-	}
-	if baseHash == "" {
-		baseHash = "BASE"
-	}
-	return baseHash + ".." + newest
-}
-
-// githubDiffLineSuffix names a line within a file's diff: R for the new version of the
-// file, L for the old one, which is where a deleted line is found. Some rows are no line
-// of the file at all (the header naming it, or a marker like "\ No newline at end of
-// file"); those name none, and the anchor points at the file itself.
-func githubDiffLineSuffix(info types.DiffLineInfo) string {
-	switch info.Type {
-	case types.DiffLineDeleted:
-		return fmt.Sprintf("L%d", info.OldLine)
-	case types.DiffLineAdded, types.DiffLineContext, types.DiffLineHunkHeader:
-		return fmt.Sprintf("R%d", info.NewLine)
-	default:
-		return ""
-	}
-}
-
 func (self *MainViewController) openSearch() error {
 	if manager := self.c.GetViewBufferManagerForView(self.context.GetView()); manager != nil {
 		manager.ReadToEnd(func() {

pkg/gui/controllers/main_view_controller_test.go

@@ -1,115 +0,0 @@
-package controllers
-
-import (
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGithubPullRequestLineURL(t *testing.T) {
-	const prURL = "https://github.com/jesseduffield/lazygit/pull/1234"
-	const commitHash = "1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b"
-
-	// The anchor names the file by the SHA-256 of its repo-relative path, taken over
-	// exactly those bytes: no leading slash, no trailing newline, forward slashes.
-	const fileHash = "067980d6efc4249367ceb61b0d93a00bca100a0ddb6d4a72b6dbb0eb9d3825cc" // "dir/file1"
-
-	scenarios := []struct {
-		name     string
-		path     string
-		info     types.DiffLineInfo
-		expected string
-	}{
-		{
-			name:     "an added line is on the right side of the diff",
-			path:     "dir/file1",
-			info:     types.DiffLineInfo{Type: types.DiffLineAdded, NewLine: 12},
-			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash + "R12",
-		},
-		{
-			name: "a deleted line is on the left side, at the line it sat on",
-			path: "dir/file1",
-			// A deletion's NewLine is only where it sits in the new version of the
-			// file; the line it is, is the old one.
-			info:     types.DiffLineInfo{Type: types.DiffLineDeleted, NewLine: 12, OldLine: 34},
-			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash + "L34",
-		},
-		{
-			name:     "a context line is on the right side too",
-			path:     "dir/file1",
-			info:     types.DiffLineInfo{Type: types.DiffLineContext, NewLine: 7, OldLine: 5},
-			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash + "R7",
-		},
-		{
-			name:     "a hunk header points at the first line of its hunk",
-			path:     "dir/file1",
-			info:     types.DiffLineInfo{Type: types.DiffLineHunkHeader, NewLine: 20},
-			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash + "R20",
-		},
-		{
-			name:     "the header naming a file points at the file alone",
-			path:     "dir/file1",
-			info:     types.DiffLineInfo{Type: types.DiffLineFileHeader},
-			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash,
-		},
-		{
-			name:     "a row that is no line of the file points at the file alone",
-			path:     "dir/file1",
-			info:     types.DiffLineInfo{Type: types.DiffLineOther},
-			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash,
-		},
-		{
-			name: "a file at the root of the repo",
-			path: "file1",
-			info: types.DiffLineInfo{Type: types.DiffLineAdded, NewLine: 1},
-			expected: prURL + "/changes/" + commitHash +
-				"#diff-c147efcfc2d7ea666a9e4f5187b115c90903f0fc896a56df9a6ef5d8f3fc9f31R1",
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			assert.Equal(t, s.expected, githubPullRequestLineURL(prURL, commitHash, s.path, s.info))
-		})
-	}
-}
-
-func TestGithubCommitRange(t *testing.T) {
-	hashPool := &utils.StringPool{}
-	newest := models.NewCommit(hashPool, models.NewCommitOpts{Hash: "newest"})
-	oldest := models.NewCommit(hashPool, models.NewCommitOpts{Hash: "oldest"})
-
-	scenarios := []struct {
-		name     string
-		commits  []*models.Commit
-		baseHash string
-		expected string
-	}{
-		{
-			name:     "a single commit is named on its own",
-			commits:  []*models.Commit{newest},
-			baseHash: "parent",
-			expected: "newest",
-		},
-		{
-			name:     "a range is named as the commits it lies between",
-			commits:  []*models.Commit{newest, oldest},
-			baseHash: "parent",
-			expected: "parent..newest",
-		},
-		{
-			name:     "a range starting where the pull request does lies above BASE",
-			commits:  []*models.Commit{newest, oldest},
-			expected: "BASE..newest",
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			assert.Equal(t, s.expected, githubCommitRange(s.commits, s.baseHash))
-		})
-	}
-}

pkg/gui/controllers/options_menu_action.go

@@ -27,7 +27,7 @@ func (self *OptionsMenuAction) Call() error {
 				if binding.GetDisabledReason != nil {
 					disabledReason = binding.GetDisabledReason()
 				}
-				tooltip := binding.GetTooltip()
+				tooltip := binding.Tooltip
 				if len(binding.Keys) > 1 {
 					if tooltip != "" {
 						tooltip += "\n\n"

pkg/gui/controllers/patch_building_controller.go

@@ -0,0 +1,277 @@
+package controllers
+
+import (
+	"fmt"
+
+	"github.com/jesseduffield/lazygit/pkg/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/samber/lo"
+)
+
+type PatchBuildingController struct {
+	baseController
+	c *ControllerCommon
+}
+
+var _ types.IController = &PatchBuildingController{}
+
+func NewPatchBuildingController(
+	c *ControllerCommon,
+) *PatchBuildingController {
+	return &PatchBuildingController{
+		baseController: baseController{},
+		c:              c,
+	}
+}
+
+func (self *PatchBuildingController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
+	return []*types.Binding{
+		{
+			Keys:        opts.GetKeys(opts.Config.Universal.OpenFile),
+			Handler:     self.OpenFile,
+			Description: self.c.Tr.OpenFile,
+			Tooltip:     self.c.Tr.OpenFileTooltip,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Universal.Edit),
+			Handler:     self.EditFile,
+			Description: self.c.Tr.EditFile,
+			Tooltip:     self.c.Tr.EditFileTooltip,
+		},
+		{
+			Keys:            opts.GetKeys(opts.Config.Universal.Select),
+			Handler:         self.ToggleSelectionAndRefresh,
+			Description:     self.c.Tr.ToggleSelectionForPatch,
+			DisplayOnScreen: true,
+		},
+		{
+			Keys:              opts.GetKeys(opts.Config.Universal.Remove),
+			Handler:           self.discardSelection,
+			GetDisabledReason: self.getDisabledReasonForDiscard,
+			Description:       self.c.Tr.RemoveSelectionFromPatch,
+			Tooltip:           self.c.Tr.RemoveSelectionFromPatchTooltip,
+			DisplayOnScreen:   true,
+		},
+		{
+			Keys:            opts.GetKeys(opts.Config.Universal.Return),
+			Handler:         self.Escape,
+			Description:     self.c.Tr.ExitCustomPatchBuilder,
+			DescriptionFunc: self.EscapeDescription,
+			DisplayOnScreen: true,
+		},
+	}
+}
+
+func (self *PatchBuildingController) Context() types.Context {
+	return self.c.Contexts().CustomPatchBuilder
+}
+
+func (self *PatchBuildingController) context() types.IPatchExplorerContext {
+	return self.c.Contexts().CustomPatchBuilder
+}
+
+func (self *PatchBuildingController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
+	return []*gocui.ViewMouseBinding{}
+}
+
+func (self *PatchBuildingController) GetOnFocus() func(types.OnFocusOpts) {
+	return func(opts types.OnFocusOpts) {
+		// no need to change wrap on the secondary view because it can't be interacted with
+		self.c.Views().PatchBuilding.Wrap = self.c.UserConfig().Gui.WrapLinesInStagingView
+
+		self.c.Helpers().PatchBuilding.RefreshPatchBuildingPanel(opts)
+	}
+}
+
+func (self *PatchBuildingController) GetOnFocusLost() func(types.OnFocusLostOpts) {
+	return func(opts types.OnFocusLostOpts) {
+		self.context().SetState(nil)
+
+		self.c.Views().PatchBuilding.Wrap = true
+
+		if self.c.Git().Patch.PatchBuilder.IsEmpty() {
+			self.c.Git().Patch.PatchBuilder.Reset()
+		}
+	}
+}
+
+func (self *PatchBuildingController) OpenFile() error {
+	self.context().GetMutex().Lock()
+	defer self.context().GetMutex().Unlock()
+
+	path := self.c.Contexts().CommitFiles.GetSelectedPath()
+
+	if path == "" {
+		return nil
+	}
+
+	return self.c.Helpers().Files.OpenFile(path)
+}
+
+func (self *PatchBuildingController) EditFile() error {
+	self.context().GetMutex().Lock()
+	defer self.context().GetMutex().Unlock()
+
+	path := self.c.Contexts().CommitFiles.GetSelectedPath()
+
+	if path == "" {
+		return nil
+	}
+
+	lineNumber := self.context().GetState().CurrentLineNumber()
+	lineNumber = self.c.Helpers().Diff.AdjustLineNumber(path, lineNumber, self.context().GetViewName())
+	return self.c.Helpers().Files.EditFileAtLine(path, lineNumber)
+}
+
+func (self *PatchBuildingController) ToggleSelectionAndRefresh() error {
+	if err := self.toggleSelection(); err != nil {
+		return err
+	}
+
+	self.c.Refresh(types.RefreshOptions{
+		Scope: []types.RefreshableView{types.PATCH_BUILDING, types.COMMIT_FILES},
+	})
+	return nil
+}
+
+func (self *PatchBuildingController) toggleSelection() error {
+	self.context().GetMutex().Lock()
+	defer self.context().GetMutex().Unlock()
+
+	file := self.c.Contexts().CommitFiles.GetSelectedFile()
+	if file == nil {
+		return nil
+	}
+
+	state := self.context().GetState()
+
+	// Get added/deleted lines in the selected patch range
+	lineIndicesToToggle := state.LineIndicesOfAddedOrDeletedLinesInSelectedPatchRange()
+	if len(lineIndicesToToggle) == 0 {
+		// Only context lines or header lines selected, so nothing to do
+		return nil
+	}
+
+	includedLineIndices, err := self.c.Git().Patch.PatchBuilder.GetFileIncLineIndices(file.Path, file.PreviousPath)
+	if err != nil {
+		return err
+	}
+
+	toggleFunc := self.c.Git().Patch.PatchBuilder.AddFileLineRange
+	firstSelectedChangeLineIsStaged := lo.Contains(includedLineIndices, lineIndicesToToggle[0])
+	if firstSelectedChangeLineIsStaged {
+		toggleFunc = self.c.Git().Patch.PatchBuilder.RemoveFileLineRange
+	}
+
+	// add range of lines to those set for the file
+	if err := toggleFunc(file.Path, file.PreviousPath, lineIndicesToToggle); err != nil {
+		// might actually want to return an error here
+		self.c.Log.Error(err)
+	}
+
+	if state.SelectingRange() {
+		state.SetLineSelectMode()
+	}
+
+	state.SelectNextStageableLineOfSameIncludedState(self.context().GetIncludedLineIndices(), firstSelectedChangeLineIsStaged)
+
+	return nil
+}
+
+func (self *PatchBuildingController) getDisabledReasonForDiscard() *types.DisabledReason {
+	if !self.c.Git().Patch.PatchBuilder.CanRebase {
+		return &types.DisabledReason{Text: self.c.Tr.CanOnlyDiscardFromLocalCommits, ShowErrorInPanel: true}
+	}
+	if self.c.Git().Status.WorkingTreeState().Any() {
+		return &types.DisabledReason{Text: self.c.Tr.CantPatchWhileRebasingError, ShowErrorInPanel: true}
+	}
+	if self.c.UserConfig().Git.DiffContextSize == 0 {
+		text := fmt.Sprintf(self.c.Tr.Actions.NotEnoughContextToRemoveLines,
+			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
+		return &types.DisabledReason{Text: text, ShowErrorInPanel: true}
+	}
+	return nil
+}
+
+func (self *PatchBuildingController) discardSelection() error {
+	prompt := lo.Ternary(self.c.Git().Patch.PatchBuilder.IsEmpty(),
+		self.c.Tr.DiscardLinesFromCommitPrompt,
+		self.c.Tr.DiscardLinesFromCommitPromptWithReset)
+
+	self.c.Confirm(types.ConfirmOpts{
+		Title:  self.c.Tr.DiscardLinesFromCommitTitle,
+		Prompt: prompt,
+		HandleConfirm: func() error {
+			return self.discardSelectionFromCommit()
+		},
+	})
+
+	return nil
+}
+
+func (self *PatchBuildingController) discardSelectionFromCommit() error {
+	// Reset the current patch if there is one.
+	if !self.c.Git().Patch.PatchBuilder.IsEmpty() {
+		self.c.Git().Patch.PatchBuilder.Reset()
+	}
+
+	if err := self.toggleSelection(); err != nil {
+		return err
+	}
+
+	if self.c.Git().Patch.PatchBuilder.IsEmpty() {
+		return nil
+	}
+
+	commits := self.c.Model().Commits
+	commitIndex := self.getPatchCommitIndex()
+	return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
+		self.c.LogAction(self.c.Tr.Actions.RemovePatchFromCommit)
+		err := self.c.Git().Patch.DeletePatchesFromCommit(commits, commitIndex)
+		// Escape pops the patch-building context, so run it on the UI thread
+		// before the refresh below.
+		_ = self.c.GocuiGui().OnUIThreadAndWait(func() {
+			self.c.Helpers().PatchBuilding.Escape()
+		})
+		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(
+			err, types.RefreshOptions{})
+	})
+}
+
+func (self *PatchBuildingController) getPatchCommitIndex() int {
+	for index, commit := range self.c.Model().Commits {
+		if commit.Hash() == self.c.Git().Patch.PatchBuilder.To {
+			return index
+		}
+	}
+	return -1
+}
+
+func (self *PatchBuildingController) Escape() error {
+	context := self.c.Contexts().CustomPatchBuilder
+	state := context.GetState()
+
+	if state.SelectingRange() || state.SelectingHunkEnabledByUser() {
+		state.SetLineSelectMode()
+		self.c.PostRefreshUpdate(context)
+		return nil
+	}
+
+	self.c.Helpers().PatchBuilding.Escape()
+	return nil
+}
+
+func (self *PatchBuildingController) EscapeDescription() string {
+	context := self.c.Contexts().CustomPatchBuilder
+	if state := context.GetState(); state != nil {
+		if state.SelectingRange() {
+			return self.c.Tr.DismissRangeSelect
+		}
+
+		if state.SelectingHunkEnabledByUser() {
+			return self.c.Tr.SelectLineByLine
+		}
+	}
+
+	return self.c.Tr.ExitCustomPatchBuilder
+}

pkg/gui/controllers/patch_explorer_controller.go

@@ -0,0 +1,416 @@
+package controllers
+
+import (
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/samber/lo"
+)
+
+type PatchExplorerControllerFactory struct {
+	c *ControllerCommon
+}
+
+func NewPatchExplorerControllerFactory(c *ControllerCommon) *PatchExplorerControllerFactory {
+	return &PatchExplorerControllerFactory{
+		c: c,
+	}
+}
+
+func (self *PatchExplorerControllerFactory) Create(context types.IPatchExplorerContext) *PatchExplorerController {
+	controller := &PatchExplorerController{
+		baseController: baseController{},
+		c:              self.c,
+		context:        context,
+	}
+	controller.dragAutoscroller = helpers.NewDragAutoscroller(
+		self.c.HelperCommon,
+		context,
+		controller.canDragAutoscroll,
+		controller.handleDragAutoscroll,
+	)
+	return controller
+}
+
+type PatchExplorerController struct {
+	baseController
+	c *ControllerCommon
+
+	context           types.IPatchExplorerContext
+	dragAutoscroller  *helpers.DragAutoscroller
+	draggingWithMouse bool
+}
+
+func (self *PatchExplorerController) Context() types.Context {
+	return self.context
+}
+
+func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
+	return []*types.Binding{
+		{
+			Tag:     "navigation",
+			Keys:    opts.GetKeys(opts.Config.Universal.PrevItem),
+			Handler: self.withRenderAndFocus(self.HandlePrevLine),
+		},
+		{
+			Tag:     "navigation",
+			Keys:    opts.GetKeys(opts.Config.Universal.NextItem),
+			Handler: self.withRenderAndFocus(self.HandleNextLine),
+		},
+		{
+			Tag:         "navigation",
+			Keys:        opts.GetKeys(opts.Config.Universal.RangeSelectUp),
+			Handler:     self.withRenderAndFocus(self.HandlePrevLineRange),
+			Description: self.c.Tr.RangeSelectUp,
+		},
+		{
+			Tag:         "navigation",
+			Keys:        opts.GetKeys(opts.Config.Universal.RangeSelectDown),
+			Handler:     self.withRenderAndFocus(self.HandleNextLineRange),
+			Description: self.c.Tr.RangeSelectDown,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Main.PrevHunk),
+			Handler:     self.withRenderAndFocus(self.HandlePrevHunk),
+			Description: self.c.Tr.PrevHunk,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Main.NextHunk),
+			Handler:     self.withRenderAndFocus(self.HandleNextHunk),
+			Description: self.c.Tr.NextHunk,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Universal.ToggleRangeSelect),
+			Handler:     self.withRenderAndFocus(self.HandleToggleSelectRange),
+			Description: self.c.Tr.ToggleRangeSelect,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Main.ToggleSelectHunk),
+			Handler:     self.withRenderAndFocus(self.HandleToggleSelectHunk),
+			Description: self.c.Tr.ToggleSelectHunk,
+			DescriptionFunc: func() string {
+				if state := self.context.GetState(); state != nil && state.SelectingHunk() {
+					return self.c.Tr.SelectLineByLine
+				}
+				return self.c.Tr.SelectHunk
+			},
+			Tooltip:         self.c.Tr.ToggleSelectHunkTooltip,
+			DisplayOnScreen: true,
+		},
+		{
+			Tag:         "navigation",
+			Keys:        opts.GetKeys(opts.Config.Universal.PrevPage),
+			Handler:     self.withRenderAndFocus(self.HandlePrevPage),
+			Description: self.c.Tr.PrevPage,
+		},
+		{
+			Tag:         "navigation",
+			Keys:        opts.GetKeys(opts.Config.Universal.NextPage),
+			Handler:     self.withRenderAndFocus(self.HandleNextPage),
+			Description: self.c.Tr.NextPage,
+		},
+		{
+			Tag:         "navigation",
+			Keys:        opts.GetKeys(opts.Config.Universal.GotoTop),
+			Handler:     self.withRenderAndFocus(self.HandleGotoTop),
+			Description: self.c.Tr.GotoTop,
+		},
+		{
+			Tag:         "navigation",
+			Keys:        opts.GetKeys(opts.Config.Universal.GotoBottom),
+			Description: self.c.Tr.GotoBottom,
+			Handler:     self.withRenderAndFocus(self.HandleGotoBottom),
+		},
+		{
+			Tag:     "navigation",
+			Keys:    opts.GetKeys(opts.Config.Universal.ScrollLeft),
+			Handler: self.withRenderAndFocus(self.HandleScrollLeft),
+		},
+		{
+			Tag:     "navigation",
+			Keys:    opts.GetKeys(opts.Config.Universal.ScrollRight),
+			Handler: self.withRenderAndFocus(self.HandleScrollRight),
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Universal.CopyToClipboard),
+			Handler:     self.withLock(self.CopySelectedToClipboard),
+			Description: self.c.Tr.CopySelectedTextToClipboard,
+		},
+	}
+}
+
+func (self *PatchExplorerController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
+	return []*gocui.ViewMouseBinding{
+		{
+			ViewName: self.context.GetViewName(),
+			Key:      gocui.MouseLeft,
+			Handler: func(opts gocui.ViewMouseBindingOpts) error {
+				if self.isFocused() {
+					return self.withRenderAndFocus(self.HandleMouseDown)()
+				}
+
+				self.c.Context().Push(self.context, types.OnFocusOpts{
+					ClickedWindowName:  self.context.GetWindowName(),
+					ClickedViewLineIdx: opts.Y,
+				})
+
+				return nil
+			},
+		},
+		{
+			ViewName: self.context.GetViewName(),
+			Key:      gocui.MouseLeft,
+			Modifier: gocui.ModMotion,
+			Handler:  self.handleMouseDrag,
+		},
+		{
+			ViewName: self.context.GetViewName(),
+			Key:      gocui.MouseRelease,
+			Handler:  func(gocui.ViewMouseBindingOpts) error { return self.handleDragRelease() },
+		},
+	}
+}
+
+func (self *PatchExplorerController) handleMouseDrag(opts gocui.ViewMouseBindingOpts) error {
+	if err := self.withLock(func() error {
+		self.context.GetState().DragSelectLine(opts.Y)
+		self.renderDragSelection()
+		return nil
+	})(); err != nil {
+		return err
+	}
+
+	self.draggingWithMouse = true
+	originY, _ := self.context.GetViewTrait().ViewPortYBounds()
+	self.dragAutoscroller.Update(opts.Y - originY)
+	return nil
+}
+
+func (self *PatchExplorerController) canDragAutoscroll(int) bool {
+	state := self.context.GetState()
+	return state != nil && state.SelectingRange()
+}
+
+func (self *PatchExplorerController) handleDragAutoscroll(viewIndex int) bool {
+	if !self.canDragAutoscroll(0) {
+		return false
+	}
+
+	if err := self.withLock(func() error {
+		self.context.GetState().DragSelectLine(viewIndex)
+		self.renderDragSelection()
+		return nil
+	})(); err != nil {
+		return false
+	}
+	return true
+}
+
+func (self *PatchExplorerController) renderDragSelection() {
+	view := self.context.GetView()
+	state := self.context.GetState()
+	originY := view.OriginY()
+	startIndex, _ := state.SelectedViewRange()
+	view.SetRangeSelectStart(startIndex)
+	view.SetCursorY(state.GetSelectedViewLineIdx() - originY)
+	self.context.Render()
+}
+
+func (self *PatchExplorerController) handleDragRelease() error {
+	self.draggingWithMouse = false
+	self.dragAutoscroller.Cancel()
+	return nil
+}
+
+func (self *PatchExplorerController) GetOnFocusLost() func(types.OnFocusLostOpts) {
+	return func(types.OnFocusLostOpts) {
+		self.dragAutoscroller.Cancel()
+		if self.draggingWithMouse {
+			self.draggingWithMouse = false
+			self.c.GocuiGui().CancelMouseCapture()
+		}
+	}
+}
+
+func (self *PatchExplorerController) HandlePrevLine() error {
+	before := self.context.GetState().GetSelectedViewLineIdx()
+	self.context.GetState().CycleSelection(false)
+	after := self.context.GetState().GetSelectedViewLineIdx()
+
+	if self.context.GetState().SelectingLine() {
+		checkScrollUp(self.context.GetViewTrait(), self.c.UserConfig(), before, after)
+	}
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleNextLine() error {
+	before := self.context.GetState().GetSelectedViewLineIdx()
+	self.context.GetState().CycleSelection(true)
+	after := self.context.GetState().GetSelectedViewLineIdx()
+
+	if self.context.GetState().SelectingLine() {
+		checkScrollDown(self.context.GetViewTrait(), self.c.UserConfig(), before, after)
+	}
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandlePrevLineRange() error {
+	s := self.context.GetState()
+
+	s.CycleRange(false)
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleNextLineRange() error {
+	s := self.context.GetState()
+
+	s.CycleRange(true)
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandlePrevHunk() error {
+	self.context.GetState().SelectPreviousHunk()
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleNextHunk() error {
+	self.context.GetState().SelectNextHunk()
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleToggleSelectRange() error {
+	self.context.GetState().ToggleStickySelectRange()
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleToggleSelectHunk() error {
+	self.context.GetState().ToggleSelectHunk()
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleScrollLeft() error {
+	self.context.GetViewTrait().ScrollLeft()
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleScrollRight() error {
+	self.context.GetViewTrait().ScrollRight()
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandlePrevPage() error {
+	self.context.GetState().AdjustSelectedLineIdx(-self.context.GetViewTrait().PageDelta())
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleNextPage() error {
+	self.context.GetState().AdjustSelectedLineIdx(self.context.GetViewTrait().PageDelta())
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleGotoTop() error {
+	self.context.GetState().SelectTop()
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleGotoBottom() error {
+	self.context.GetState().SelectBottom()
+
+	return nil
+}
+
+func (self *PatchExplorerController) HandleMouseDown() error {
+	self.context.GetState().SelectNewLineForRange(self.context.GetViewTrait().SelectedLineIdx())
+
+	return nil
+}
+
+func (self *PatchExplorerController) CopySelectedToClipboard() error {
+	selected := self.context.GetState().PlainRenderSelected()
+
+	self.c.LogAction(self.c.Tr.Actions.CopySelectedTextToClipboard)
+	if err := self.c.OS().CopyToClipboard(dropDiffPrefix(selected)); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Removes '+' or '-' from the beginning of each line in the diff string, except
+// when both '+' and '-' lines are present, or diff header lines, in which case
+// the diff is returned unchanged. This is useful for copying parts of diffs to
+// the clipboard in order to paste them into code.
+func dropDiffPrefix(diff string) string {
+	lines := strings.Split(strings.TrimRight(diff, "\n"), "\n")
+
+	const (
+		PLUS int = iota
+		MINUS
+		CONTEXT
+		OTHER
+	)
+
+	linesByType := lo.GroupBy(lines, func(line string) int {
+		switch {
+		case strings.HasPrefix(line, "+"):
+			return PLUS
+		case strings.HasPrefix(line, "-"):
+			return MINUS
+		case strings.HasPrefix(line, " "):
+			return CONTEXT
+		}
+		return OTHER
+	})
+
+	hasLinesOfType := func(lineType int) bool { return len(linesByType[lineType]) > 0 }
+
+	keepPrefix := hasLinesOfType(OTHER) || (hasLinesOfType(PLUS) && hasLinesOfType(MINUS))
+	if keepPrefix {
+		return diff
+	}
+
+	return strings.Join(lo.Map(lines, func(line string, _ int) string { return line[1:] + "\n" }), "")
+}
+
+func (self *PatchExplorerController) isFocused() bool {
+	return self.c.Context().Current().GetKey() == self.context.GetKey()
+}
+
+func (self *PatchExplorerController) withRenderAndFocus(f func() error) func() error {
+	return self.withLock(func() error {
+		if err := f(); err != nil {
+			return err
+		}
+
+		self.context.RenderAndFocus()
+		return nil
+	})
+}
+
+func (self *PatchExplorerController) withLock(f func() error) func() error {
+	return func() error {
+		self.context.GetMutex().Lock()
+		defer self.context.GetMutex().Unlock()
+
+		if self.context.GetState() == nil {
+			return nil
+		}
+
+		return f()
+	}
+}

pkg/gui/controllers/reflog_commits_controller.go

@@ -10,9 +10,6 @@ type ReflogCommitsController struct {
 	baseController
 	*ListControllerTrait[*models.Commit]
 	c *ControllerCommon
-
-	// what this panel offers on the diff it shows in the focused main view
-	diffActions *CommitDiffActions
 }
 
 var _ types.IController = &ReflogCommitsController{}
@@ -20,7 +17,7 @@ var _ types.IController = &ReflogCommitsController{}
 func NewReflogCommitsController(
 	c *ControllerCommon,
 ) *ReflogCommitsController {
-	controller := &ReflogCommitsController{
+	return &ReflogCommitsController{
 		baseController: baseController{},
 		ListControllerTrait: NewListControllerTrait(
 			c,
@@ -30,19 +27,6 @@ func NewReflogCommitsController(
 		),
 		c: c,
 	}
-	controller.diffActions = NewCommitDiffActions(c, c.Contexts().ReflogCommits, controller.diffTarget)
-	return controller
-}
-
-// diffTarget is the reflog entry the panel has selected, whose diff its main view
-// shows. A reflog entry is never a commit of the checked-out branch as far as we are
-// concerned, so nothing here may be rewritten.
-func (self *ReflogCommitsController) diffTarget() *commitDiffTarget {
-	commit := self.context().GetSelected()
-	if commit == nil {
-		return nil
-	}
-	return &commitDiffTarget{from: commit.ParentRefName(), to: commit.RefName()}
 }
 
 func (self *ReflogCommitsController) Context() types.Context {
@@ -54,7 +38,17 @@ func (self *ReflogCommitsController) context() *context.ReflogCommitsContext {
 }
 
 func (self *ReflogCommitsController) GetFocusedMainViewDiffSource() types.FocusedMainViewDiffSource {
-	return self.diffActions
+	return self
+}
+
+// PlainDiff hands out the reflog entry's diff for the given files — the same diff its
+// main view shows, only without the entry's message and stat above it.
+func (self *ReflogCommitsController) PlainDiff(_ types.DiffPaneContext, paths []string) string {
+	commit := self.context().GetSelected()
+	if commit == nil {
+		return ""
+	}
+	return self.c.Helpers().Diff.PlainDiffBetweenRefs(commit.ParentRefName(), commit.RefName(), paths)
 }
 
 func (self *ReflogCommitsController) GetOnRenderToMain() func() {
@@ -77,7 +71,6 @@ func (self *ReflogCommitsController) GetOnRenderToMain() func() {
 					Title: "Reflog Entry",
 					Task:  task,
 				},
-				Secondary: secondaryPatchPanelUpdateOpts(self.c),
 			})
 		})
 	}

pkg/gui/controllers/staging_controller.go

@@ -0,0 +1,358 @@
+package controllers
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
+	"github.com/jesseduffield/lazygit/pkg/commands/patch"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+)
+
+type StagingController struct {
+	baseController
+	c *ControllerCommon
+
+	context      types.IPatchExplorerContext
+	otherContext types.IPatchExplorerContext
+
+	// if true, we're dealing with the secondary context i.e. dealing with staged file changes
+	staged bool
+}
+
+var _ types.IController = &StagingController{}
+
+func NewStagingController(
+	c *ControllerCommon,
+	context types.IPatchExplorerContext,
+	otherContext types.IPatchExplorerContext,
+	staged bool,
+) *StagingController {
+	return &StagingController{
+		baseController: baseController{},
+		c:              c,
+		context:        context,
+		otherContext:   otherContext,
+		staged:         staged,
+	}
+}
+
+func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
+	return []*types.Binding{
+		{
+			Keys:            opts.GetKeys(opts.Config.Universal.Select),
+			Handler:         self.ToggleStaged,
+			Description:     self.c.Tr.Stage,
+			Tooltip:         self.c.Tr.StageSelectionTooltip,
+			DisplayOnScreen: true,
+		},
+		{
+			Keys:            opts.GetKeys(opts.Config.Universal.Remove),
+			Handler:         self.DiscardSelection,
+			Description:     self.c.Tr.DiscardSelection,
+			Tooltip:         self.c.Tr.DiscardSelectionTooltip,
+			DisplayOnScreen: true,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Universal.OpenFile),
+			Handler:     self.OpenFile,
+			Description: self.c.Tr.OpenFile,
+			Tooltip:     self.c.Tr.OpenFileTooltip,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Universal.Edit),
+			Handler:     self.EditFile,
+			Description: self.c.Tr.EditFile,
+			Tooltip:     self.c.Tr.EditFileTooltip,
+		},
+		{
+			Keys:            opts.GetKeys(opts.Config.Universal.Return),
+			Handler:         self.Escape,
+			Description:     self.c.Tr.ReturnToFilesPanel,
+			DescriptionFunc: self.EscapeDescription,
+			DisplayOnScreen: true,
+		},
+		{
+			Keys:            opts.GetKeys(opts.Config.Universal.TogglePanel),
+			Handler:         self.TogglePanel,
+			Description:     self.c.Tr.ToggleStagingView,
+			Tooltip:         self.c.Tr.ToggleStagingViewTooltip,
+			DisplayOnScreen: true,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Main.EditSelectHunk),
+			Handler:     self.EditHunkAndRefresh,
+			Description: self.c.Tr.EditHunk,
+			Tooltip:     self.c.Tr.EditHunkTooltip,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Files.CommitChanges),
+			Handler:     self.c.Helpers().WorkingTree.HandleCommitPress,
+			Description: self.c.Tr.Commit,
+			Tooltip:     self.c.Tr.CommitTooltip,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Files.CommitChangesWithoutHook),
+			Handler:     self.c.Helpers().WorkingTree.HandleWIPCommitPress,
+			Description: self.c.Tr.CommitChangesWithoutHook,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Files.CommitChangesWithEditor),
+			Handler:     self.c.Helpers().WorkingTree.HandleCommitEditorPress,
+			Description: self.c.Tr.CommitChangesWithEditor,
+		},
+		{
+			Keys:        opts.GetKeys(opts.Config.Files.FindBaseCommitForFixup),
+			Handler:     self.c.Helpers().FixupHelper.HandleFindBaseCommitForFixupPress,
+			Description: self.c.Tr.FindBaseCommitForFixup,
+			Tooltip:     self.c.Tr.FindBaseCommitForFixupTooltip,
+		},
+	}
+}
+
+func (self *StagingController) Context() types.Context {
+	return self.context
+}
+
+func (self *StagingController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
+	return []*gocui.ViewMouseBinding{}
+}
+
+func (self *StagingController) GetOnFocus() func(types.OnFocusOpts) {
+	return func(opts types.OnFocusOpts) {
+		wrap := self.c.UserConfig().Gui.WrapLinesInStagingView
+		self.c.Views().Staging.Wrap = wrap
+		self.c.Views().StagingSecondary.Wrap = wrap
+
+		self.c.Helpers().Staging.RefreshStagingPanel(opts)
+	}
+}
+
+func (self *StagingController) GetOnFocusLost() func(types.OnFocusLostOpts) {
+	return func(opts types.OnFocusLostOpts) {
+		self.context.SetState(nil)
+
+		if opts.NewContextKey != self.otherContext.GetKey() {
+			self.c.Views().Staging.Wrap = true
+			self.c.Views().StagingSecondary.Wrap = true
+		}
+	}
+}
+
+func (self *StagingController) OpenFile() error {
+	self.context.GetMutex().Lock()
+	defer self.context.GetMutex().Unlock()
+
+	path := self.FilePath()
+
+	if path == "" {
+		return nil
+	}
+
+	return self.c.Helpers().Files.OpenFile(path)
+}
+
+func (self *StagingController) EditFile() error {
+	self.context.GetMutex().Lock()
+	defer self.context.GetMutex().Unlock()
+
+	path := self.FilePath()
+
+	if path == "" {
+		return nil
+	}
+
+	lineNumber := self.context.GetState().CurrentLineNumber()
+	lineNumber = self.c.Helpers().Diff.AdjustLineNumber(path, lineNumber, self.context.GetViewName())
+	return self.c.Helpers().Files.EditFileAtLine(path, lineNumber)
+}
+
+func (self *StagingController) Escape() error {
+	if self.context.GetState().SelectingRange() || self.context.GetState().SelectingHunkEnabledByUser() {
+		self.context.GetState().SetLineSelectMode()
+		self.c.PostRefreshUpdate(self.context)
+		return nil
+	}
+
+	self.c.Context().Pop()
+	return nil
+}
+
+func (self *StagingController) EscapeDescription() string {
+	if state := self.context.GetState(); state != nil {
+		if state.SelectingRange() {
+			return self.c.Tr.DismissRangeSelect
+		}
+
+		if state.SelectingHunkEnabledByUser() {
+			return self.c.Tr.SelectLineByLine
+		}
+	}
+
+	return self.c.Tr.ReturnToFilesPanel
+}
+
+func (self *StagingController) TogglePanel() error {
+	if self.otherContext.GetState() != nil {
+		self.c.Context().Push(self.otherContext, types.OnFocusOpts{})
+	}
+
+	return nil
+}
+
+func (self *StagingController) ToggleStaged() error {
+	if self.c.UserConfig().Git.DiffContextSize == 0 {
+		return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextToStage,
+			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
+	}
+
+	return self.applySelectionAndRefresh(self.staged)
+}
+
+func (self *StagingController) DiscardSelection() error {
+	if self.c.UserConfig().Git.DiffContextSize == 0 {
+		return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextToDiscard,
+			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
+	}
+
+	return self.c.ConfirmIf(!self.staged && !self.c.UserConfig().Gui.SkipDiscardChangeWarning,
+		types.ConfirmOpts{
+			Title:         self.c.Tr.DiscardChangeTitle,
+			Prompt:        self.c.Tr.DiscardChangePrompt,
+			HandleConfirm: func() error { return self.applySelectionAndRefresh(true) },
+		})
+}
+
+func (self *StagingController) applySelectionAndRefresh(reverse bool) error {
+	if err := self.applySelection(reverse); err != nil {
+		return err
+	}
+
+	// Block input until the refresh has landed: it rebuilds the staging panel
+	// and moves the selection to the next stageable change, and a quick second
+	// keypress must act on that, not on the stale pre-refresh diff.
+	self.c.RefreshBlockingInput(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.STAGING}})
+	return nil
+}
+
+func (self *StagingController) applySelection(reverse bool) error {
+	self.context.GetMutex().Lock()
+	defer self.context.GetMutex().Unlock()
+
+	state := self.context.GetState()
+	path := self.FilePath()
+	if path == "" {
+		return nil
+	}
+
+	firstLineIdx, lastLineIdx := state.SelectedPatchRange()
+	patchToApply := patch.
+		Parse(state.GetDiff()).
+		Transform(patch.TransformOpts{
+			Reverse:             reverse,
+			IncludedLineIndices: patch.ExpandRange(firstLineIdx, lastLineIdx),
+			FileNameOverride:    path,
+		}).
+		FormatPlain()
+
+	if patchToApply == "" {
+		return nil
+	}
+
+	// apply the patch then refresh this panel
+	// create a new temp file with the patch, then call git apply with that patch
+	self.c.LogAction(self.c.Tr.Actions.ApplyPatch)
+	err := self.c.Git().Patch.ApplyPatch(
+		patchToApply,
+		git_commands.ApplyPatchOpts{
+			Reverse: reverse,
+			Cached:  !reverse || self.staged,
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	if state.SelectingRange() {
+		firstLine, _ := state.SelectedViewRange()
+		state.SelectLine(firstLine)
+	}
+
+	return nil
+}
+
+func (self *StagingController) EditHunkAndRefresh() error {
+	if err := self.editHunk(); err != nil {
+		return err
+	}
+
+	// Block input like applySelectionAndRefresh does; the refresh rebuilds the
+	// staging panel from the post-edit diff.
+	self.c.RefreshBlockingInput(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.STAGING}})
+	return nil
+}
+
+func (self *StagingController) editHunk() error {
+	self.context.GetMutex().Lock()
+	defer self.context.GetMutex().Unlock()
+
+	state := self.context.GetState()
+	path := self.FilePath()
+	if path == "" {
+		return nil
+	}
+
+	hunkStartIdx, hunkEndIdx := state.CurrentHunkBounds()
+	patchText := patch.
+		Parse(state.GetDiff()).
+		Transform(patch.TransformOpts{
+			Reverse:             self.staged,
+			IncludedLineIndices: patch.ExpandRange(hunkStartIdx, hunkEndIdx),
+			FileNameOverride:    path,
+		}).
+		FormatPlain()
+
+	patchFilepath, err := self.c.Git().Patch.SaveTemporaryPatch(patchText)
+	if err != nil {
+		return err
+	}
+
+	lineOffset := 3
+	lineIdxInHunk := state.GetSelectedPatchLineIdx() - hunkStartIdx
+	if err := self.c.Helpers().Files.EditFileAtLineAndWait(patchFilepath, lineIdxInHunk+lineOffset); err != nil {
+		return err
+	}
+
+	editedPatchText, err := self.c.Git().File.Cat(patchFilepath)
+	if err != nil {
+		return err
+	}
+
+	self.c.LogAction(self.c.Tr.Actions.ApplyPatch)
+
+	lineCount := strings.Count(editedPatchText, "\n") + 1
+	newPatchText := patch.
+		Parse(editedPatchText).
+		Transform(patch.TransformOpts{
+			IncludedLineIndices: patch.ExpandRange(0, lineCount),
+			FileNameOverride:    path,
+		}).
+		FormatPlain()
+
+	if err := self.c.Git().Patch.ApplyPatch(
+		newPatchText,
+		git_commands.ApplyPatchOpts{
+			Reverse: self.staged,
+			Cached:  true,
+		},
+	); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (self *StagingController) FilePath() string {
+	return self.c.Contexts().Files.GetSelectedPath()
+}

pkg/gui/controllers/stash_controller.go

@@ -108,7 +108,6 @@ func (self *StashController) GetOnRenderToMain() func() {
 					SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(),
 					Task:     task,
 				},
-				Secondary: secondaryPatchPanelUpdateOpts(self.c),
 			})
 		})
 	}

pkg/gui/controllers/sub_commits_controller.go

@@ -56,7 +56,6 @@ func (self *SubCommitsController) GetOnRenderToMain() func() {
 					SubTitle: self.c.Helpers().Diff.IgnoringWhitespaceSubTitle(),
 					Task:     task,
 				},
-				Secondary: secondaryPatchPanelUpdateOpts(self.c),
 			})
 		})
 	}

pkg/gui/controllers/switch_to_diff_files_controller.go

@@ -25,48 +25,17 @@ type SwitchToDiffFilesController struct {
 	baseController
 	c       *ControllerCommon
 	context CanSwitchToDiffFiles
-
-	// what this panel offers on the diff it shows in the focused main view
-	diffActions *CommitDiffActions
 }
 
 func NewSwitchToDiffFilesController(
 	c *ControllerCommon,
 	context CanSwitchToDiffFiles,
 ) *SwitchToDiffFilesController {
-	controller := &SwitchToDiffFilesController{
+	return &SwitchToDiffFilesController{
 		baseController: baseController{},
 		c:              c,
 		context:        context,
 	}
-	controller.diffActions = NewCommitDiffActions(c, context, controller.diffTarget)
-	return controller
-}
-
-// diffTarget is the commit — or stash entry, or range of commits — the panel has
-// selected, whose whole diff its main view shows.
-func (self *SwitchToDiffFilesController) diffTarget() *commitDiffTarget {
-	ref := self.context.GetSelectedRef()
-	if ref == nil {
-		return nil
-	}
-	refRange := self.context.GetSelectedRefRangeForDiffFiles()
-	from, to := context.FromAndToForDiff(ref, refRange)
-	return &commitDiffTarget{from: from, to: to, canRebase: self.canRebase(ref, refRange)}
-}
-
-// canRebase reports whether the given selection is one lazygit may rewrite: the panel
-// has to allow it in the first place, a range of commits can't be rewritten as one,
-// and in diffing mode what the main view shows is a diff against another ref rather
-// than the commit itself, unless that other ref is the selected commit.
-func (self *SwitchToDiffFilesController) canRebase(ref models.Ref, refRange *types.RefRange) bool {
-	if !self.context.CanRebase() {
-		return false
-	}
-	if self.c.Modes().Diffing.Active() {
-		return self.c.Modes().Diffing.Ref == ref.RefName()
-	}
-	return refRange == nil
 }
 
 func (self *SwitchToDiffFilesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
@@ -97,7 +66,19 @@ func (self *SwitchToDiffFilesController) GetOnDoubleClick() func() error {
 }
 
 func (self *SwitchToDiffFilesController) GetFocusedMainViewDiffSource() types.FocusedMainViewDiffSource {
-	return self.diffActions
+	return self
+}
+
+// PlainDiff hands out the diff of the panel's selected commit (or range of them) for
+// the given files — the same diff its main view shows, only without the commit's
+// message and stat above it.
+func (self *SwitchToDiffFilesController) PlainDiff(_ types.DiffPaneContext, paths []string) string {
+	ref := self.context.GetSelectedRef()
+	if ref == nil {
+		return ""
+	}
+	from, to := context.FromAndToForDiff(ref, self.context.GetSelectedRefRangeForDiffFiles())
+	return self.c.Helpers().Diff.PlainDiffBetweenRefs(from, to, paths)
 }
 
 func (self *SwitchToDiffFilesController) enter() error {
@@ -105,7 +86,16 @@ func (self *SwitchToDiffFilesController) enter() error {
 	refsRange := self.context.GetSelectedRefRangeForDiffFiles()
 	commitFilesContext := self.c.Contexts().CommitFiles
 
-	canRebase := self.canRebase(ref, refsRange)
+	canRebase := self.context.CanRebase()
+	if canRebase {
+		if self.c.Modes().Diffing.Active() {
+			if self.c.Modes().Diffing.Ref != ref.RefName() {
+				canRebase = false
+			}
+		} else if refsRange != nil {
+			canRebase = false
+		}
+	}
 
 	commitFilesContext.ClearFilter()
 	commitFilesContext.ReInit(ref, refsRange)

pkg/gui/controllers/switch_to_focused_main_view_controller.go

@@ -71,28 +71,20 @@ func (self *SwitchToFocusedMainViewController) onClickSecondary(opts gocui.ViewM
 }
 
 func (self *SwitchToFocusedMainViewController) handleFocusMainView() error {
-	return focusMainView(self.c, self.context, -1)
-}
-
-func focusMainView(c *ControllerCommon, source types.Context, clickedLineIdx int) error {
 	// Usually the main pane, but the content can be in the secondary one alone: a file
 	// with nothing but staged changes shows them there.
-	mainViewContext := c.Contexts().Normal
-	if c.State().GetRepoState().GetMainPanes() == types.SecondaryPaneOnly {
-		mainViewContext = c.Contexts().NormalSecondary
+	mainViewContext := self.c.Contexts().Normal
+	if self.c.State().GetRepoState().GetMainPanes() == types.SecondaryPaneOnly {
+		mainViewContext = self.c.Contexts().NormalSecondary
 	}
-	return focusMainViewPane(c, source, mainViewContext, clickedLineIdx)
+	return self.focusMainView(mainViewContext, -1)
 }
 
 func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext *context.MainContext, clickedLineIdx int) error {
-	return focusMainViewPane(self.c, self.context, mainViewContext, clickedLineIdx)
-}
-
-func focusMainViewPane(c *ControllerCommon, source types.Context, mainViewContext *context.MainContext, clickedLineIdx int) error {
 	mainViewContext.ClearSearchString()
-	c.Context().Push(mainViewContext, types.OnFocusOpts{})
+	self.c.Context().Push(mainViewContext, types.OnFocusOpts{})
 
-	if _, ok := source.(types.DiffMainViewContext); !ok {
+	if _, ok := self.context.(types.DiffMainViewContext); !ok {
 		return nil
 	}
 
@@ -101,13 +93,13 @@ func focusMainViewPane(c *ControllerCommon, source types.Context, mainViewContex
 	// is. Now that the user wants to act on it, it is re-rendered as git's own diff — the
 	// panel below decides that for itself, from the same question — and the selection
 	// goes on that instead of on rows we can't place.
-	if c.Helpers().DiffLine.MainViewDiffMode() == git_commands.DiffModeRaw {
-		c.Helpers().DiffLine.RenderFocusedMainViewAgain(mainViewContext.GetView(), source, func() {
-			c.Helpers().DiffLine.EstablishSelection(mainViewContext, clickedLineIdx)
+	if self.c.Helpers().DiffLine.MainViewDiffMode() == git_commands.DiffModeRaw {
+		self.c.Helpers().DiffLine.RenderFocusedMainViewAgain(mainViewContext.GetView(), self.context, func() {
+			self.c.Helpers().DiffLine.EstablishSelection(mainViewContext, clickedLineIdx)
 		})
 		return nil
 	}
 
-	c.Helpers().DiffLine.EstablishSelection(mainViewContext, clickedLineIdx)
+	self.c.Helpers().DiffLine.EstablishSelection(mainViewContext, clickedLineIdx)
 	return nil
 }

pkg/gui/controllers/toggle_whitespace_action.go

@@ -1,10 +1,30 @@
 package controllers
 
+import (
+	"errors"
+
+	"github.com/jesseduffield/lazygit/pkg/gui/context"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/samber/lo"
+)
+
 type ToggleWhitespaceAction struct {
 	c *ControllerCommon
 }
 
 func (self *ToggleWhitespaceAction) Call() error {
+	contextsThatDontSupportIgnoringWhitespace := []types.ContextKey{
+		context.STAGING_MAIN_CONTEXT_KEY,
+		context.STAGING_SECONDARY_CONTEXT_KEY,
+		context.PATCH_BUILDING_MAIN_CONTEXT_KEY,
+	}
+
+	if lo.Contains(contextsThatDontSupportIgnoringWhitespace, self.c.Context().Current().GetKey()) {
+		// Ignoring whitespace is not supported in these views. Let the user
+		// know that it's not going to work in case they try to turn it on.
+		return errors.New(self.c.Tr.IgnoreWhitespaceNotSupportedHere)
+	}
+
 	self.c.UserConfig().Git.IgnoreWhitespaceInDiffView = !self.c.UserConfig().Git.IgnoreWhitespaceInDiffView
 
 	// You toggle this to see whether what you are looking at is more than

pkg/gui/controllers/working_tree_diff_actions.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"fmt"
+	"path/filepath"
 	"strings"
 
 	"github.com/jesseduffield/generics/set"
@@ -99,12 +100,6 @@ func (self *WorkingTreeDiffActions) DiscardSelection(pane types.DiffPaneContext,
 		})
 }
 
-// DiscardSelectionDisabledReason is nil: a change of the working tree can always be
-// thrown away, and one in the index always taken back out of it.
-func (self *WorkingTreeDiffActions) DiscardSelectionDisabledReason(types.DiffPaneContext) *types.DisabledReason {
-	return nil
-}
-
 // EditHunk opens the git hunk holding the selection in an editor, as a patch against
 // the index, and applies whatever comes back. It is how you stage something the diff
 // can't express — half of a changed line, or a change written differently from either
@@ -127,8 +122,7 @@ func (self *WorkingTreeDiffActions) EditHunk(
 	}
 
 	parsedPatch := patch.Parse(self.c.Git().WorkingTree.WorktreeFileDiff(file, git_commands.DiffModePlain, onStagedSide))
-	lineIndices := patch.ChangeLineIndicesForLines(parsedPatch,
-		[]patch.LineIdentity{infos[0].PatchLineIdentity()})
+	lineIndices := changeLineIndices(parsedPatch, infos[:1])
 	if len(lineIndices) == 0 {
 		return nil
 	}
@@ -187,12 +181,6 @@ func (self *WorkingTreeDiffActions) EditHunk(
 	return nil
 }
 
-// PatchInclusion is nil: a custom patch is built from a commit's diff, never from the
-// working tree's, so no line of this diff is ever in one.
-func (self *WorkingTreeDiffActions) PatchInclusion() func(types.DiffLineInfo) bool {
-	return nil
-}
-
 // diffLineSelection resolves what the user has selected in a pane of the focused main
 // view to the change lines to act on, and reports whether they are the staged side of
 // the diff — which is a question about the pane, so it is the same for every file of a
@@ -261,11 +249,11 @@ func (self *WorkingTreeDiffActions) applyDiffLineSelection(
 // fileForDiffLinePath maps the absolute path a diff line carries to the working tree
 // file it belongs to, or nil for a path that is no file of this repo's working tree.
 func (self *WorkingTreeDiffActions) fileForDiffLinePath(path string) *models.File {
-	relativePath := repoRelativePath(self.c.Git().RepoPaths.WorktreePath(), path)
-	if relativePath == "" {
+	relativePath, err := filepath.Rel(self.c.Git().RepoPaths.WorktreePath(), path)
+	if err != nil {
 		return nil
 	}
-	return self.context().FileTreeViewModel.GetFile(relativePath)
+	return self.context().FileTreeViewModel.GetFile(filepath.ToSlash(relativePath))
 }
 
 // applyDiffLines applies the given change lines of one file — a line, a hunk, a range —
@@ -292,10 +280,7 @@ func (self *WorkingTreeDiffActions) applyDiffLines(
 ) (bool, error) {
 	parsedPatch := patch.Parse(self.c.Git().WorkingTree.WorktreeFileDiff(file, git_commands.DiffModePlain, sourceCached))
 
-	patchLineIndices := patch.ChangeLineIndicesForLines(parsedPatch,
-		lo.Map(infos, func(info types.DiffLineInfo, _ int) patch.LineIdentity {
-			return info.PatchLineIdentity()
-		}))
+	patchLineIndices := changeLineIndices(parsedPatch, infos)
 
 	changesLeft := len(patchLineIndices) < changeLineCount(parsedPatch)
 
@@ -326,6 +311,42 @@ func (self *WorkingTreeDiffActions) applyDiffLines(
 	return changesLeft, self.c.Git().Patch.ApplyPatch(patchToApply, opts)
 }
 
+// changeLineIndices says which lines of a parsed patch the given diff rows are, as the
+// indices a patch is built in terms of. Each row is looked for by where it sits in the
+// file: an addition by its place in the new version, a deletion by its place in the
+// old one, which is what tells the two halves of a changed line apart.
+func changeLineIndices(parsedPatch *patch.Patch, infos []types.DiffLineInfo) []int {
+	type changeLine struct {
+		lineNumber int
+		isDeletion bool
+	}
+	selected := set.New[changeLine]()
+	for _, info := range infos {
+		if info.Type == types.DiffLineDeleted {
+			selected.Add(changeLine{info.OldLine, true})
+		} else {
+			selected.Add(changeLine{info.NewLine, false})
+		}
+	}
+
+	var indices []int
+	for idx, line := range parsedPatch.Lines() {
+		var key changeLine
+		switch {
+		case line.IsAddition():
+			key = changeLine{parsedPatch.LineNumberOfLine(idx), false}
+		case line.IsDeletion():
+			key = changeLine{parsedPatch.OldLineNumberOfLine(idx), true}
+		default:
+			continue
+		}
+		if selected.Includes(key) {
+			indices = append(indices, idx)
+		}
+	}
+	return indices
+}
+
 // changeLineCount returns how many of a patch's lines are changes rather than context
 // or header. A selection of the whole diff covers exactly that many.
 func changeLineCount(p *patch.Patch) int {
@@ -357,7 +378,7 @@ func (self *WorkingTreeDiffActions) revealSelectionInPaneItLandsIn(
 	// that, and until it has been the selection is still on lines that aren't there any
 	// more — so a key pressed meanwhile would act on nothing.
 	self.c.GocuiGui().BeginBlockingEvents()
-	self.c.Helpers().DiffLine.RevealSelectionAfterAction(pane, target, firstLineIdx, 0,
+	revealSelectionAfterAction(self.c, pane, target, firstLineIdx,
 		self.c.GocuiGui().EndBlockingEvents)
 }
 

pkg/gui/gui.go

@@ -82,9 +82,6 @@ type Gui struct {
 	statusManager        *status.StatusManager
 	waitForIntro         sync.WaitGroup
 	viewBufferManagerMap map[string]*tasks.ViewBufferManager
-	// holds a mapping of the main section's view names to the writers that link the
-	// files named in the diffstat of what is rendered into them
-	diffStatLinkWriterMap map[string]*helpers.DiffStatLinkWriter
 	// holds a mapping of view names to ptmx's. This is for rendering command outputs
 	// from within a pty. The point of keeping track of them is so that if we re-size
 	// the window, we can tell the pty it needs to resize accordingly.
@@ -418,17 +415,6 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context
 			return gui.helpers.Files.EditFiles([]string{filepath})
 		}
 
-		if entry, ok := strings.CutPrefix(url, helpers.DiffStatLinkScheme); ok {
-			view, err := gui.g.View(viewname)
-			if err != nil {
-				return nil
-			}
-			if pane := gui.mainContextForView(view); pane != nil {
-				gui.helpers.DiffLine.JumpToFileNamedInDiffStat(pane, entry)
-			}
-			return nil
-		}
-
 		if err := gui.os.OpenLink(url); err != nil {
 			return fmt.Errorf(gui.Tr.FailedToOpenURL, url, err)
 		}
@@ -789,18 +775,17 @@ func NewGui(
 	test integrationTypes.IntegrationTest,
 ) (*Gui, error) {
 	gui := &Gui{
-		Common:                cmn,
-		gitVersion:            gitVersion,
-		Config:                configurer,
-		Updater:               updater,
-		statusManager:         status.NewStatusManager(),
-		viewBufferManagerMap:  map[string]*tasks.ViewBufferManager{},
-		diffStatLinkWriterMap: map[string]*helpers.DiffStatLinkWriter{},
-		viewPtmxMap:           map[string]oscommands.Pty{},
-		showRecentRepos:       showRecentRepos,
-		RepoPathStack:         &utils.Stack[types.RepoLocation]{},
-		RepoStateMap:          map[Repo]*GuiRepoState{},
-		GuiLog:                []string{},
+		Common:               cmn,
+		gitVersion:           gitVersion,
+		Config:               configurer,
+		Updater:              updater,
+		statusManager:        status.NewStatusManager(),
+		viewBufferManagerMap: map[string]*tasks.ViewBufferManager{},
+		viewPtmxMap:          map[string]oscommands.Pty{},
+		showRecentRepos:      showRecentRepos,
+		RepoPathStack:        &utils.Stack[types.RepoLocation]{},
+		RepoStateMap:         map[Repo]*GuiRepoState{},
+		GuiLog:               []string{},
 
 		// initializing this to true for the time being; it will be reset to the
 		// real value after loading the user config:

pkg/gui/gui_common.go

@@ -175,6 +175,8 @@ func (self *guiCommon) RenderToMainViews(opts types.RefreshMainOpts) {
 func (self *guiCommon) MainViewPairs() types.MainViewPairs {
 	return types.MainViewPairs{
 		Normal:         self.gui.normalMainContextPair(),
+		Staging:        self.gui.stagingMainContextPair(),
+		PatchBuilding:  self.gui.patchBuildingMainContextPair(),
 		MergeConflicts: self.gui.mergingMainContextPair(),
 	}
 }

pkg/gui/gui_driver.go

@@ -51,40 +51,34 @@ func (self *GuiDriver) PressKeysRapidly(keyStrs ...string) {
 }
 
 func (self *GuiDriver) Click(x, y int) {
-	self.ClickWithModifier(x, y, gocui.ModNone)
-}
-
-// ClickWithModifier clicks with a keyboard modifier held down for the whole
-// gesture, as a terminal reports it.
-func (self *GuiDriver) ClickWithModifier(x, y int, modifier gocui.Modifier) {
 	self.CheckAllToastsAcknowledged()
 
-	self.replayMouseEvent(x, y, tcell.ButtonPrimary, modifier)
-	self.replayMouseEvent(x, y, tcell.ButtonNone, modifier)
+	self.replayMouseEvent(x, y, tcell.ButtonPrimary)
+	self.replayMouseEvent(x, y, tcell.ButtonNone)
 }
 
 func (self *GuiDriver) ClickAndHold(x, y int) {
 	self.CheckAllToastsAcknowledged()
-	self.replayMouseEvent(x, y, tcell.ButtonPrimary, gocui.ModNone)
+	self.replayMouseEvent(x, y, tcell.ButtonPrimary)
 }
 
 // MouseMove reports the mouse at a new position with the left button still
 // held down, i.e. a drag movement. (No test needs pointer motion without a
 // button held, so that variant doesn't exist.)
 func (self *GuiDriver) MouseMove(x, y int) {
-	self.replayMouseEvent(x, y, tcell.ButtonPrimary, gocui.ModNone)
+	self.replayMouseEvent(x, y, tcell.ButtonPrimary)
 }
 
 func (self *GuiDriver) ScrollWheelDown(x, y int) {
-	self.replayMouseEvent(x, y, tcell.WheelDown, gocui.ModNone)
+	self.replayMouseEvent(x, y, tcell.WheelDown)
 }
 
 func (self *GuiDriver) MouseRelease(x, y int) {
-	self.replayMouseEvent(x, y, tcell.ButtonNone, gocui.ModNone)
+	self.replayMouseEvent(x, y, tcell.ButtonNone)
 }
 
 func (self *GuiDriver) MouseReleaseWithoutWaiting(x, y int) {
-	self.replayMouseEventWithoutWaiting(x, y, tcell.ButtonNone, gocui.ModNone)
+	self.replayMouseEventWithoutWaiting(x, y, tcell.ButtonNone)
 }
 
 func (self *GuiDriver) WaitUntilIdle() {
@@ -95,16 +89,14 @@ func (self *GuiDriver) OnUIThreadAndWait(f func()) {
 	_ = self.gui.g.OnUIThreadAndWait(f)
 }
 
-func (self *GuiDriver) replayMouseEvent(x, y int, buttons tcell.ButtonMask, modifier gocui.Modifier) {
-	self.replayMouseEventWithoutWaiting(x, y, buttons, modifier)
+func (self *GuiDriver) replayMouseEvent(x, y int, buttons tcell.ButtonMask) {
+	self.replayMouseEventWithoutWaiting(x, y, buttons)
 	self.waitTillIdle()
 }
 
-func (self *GuiDriver) replayMouseEventWithoutWaiting(
-	x, y int, buttons tcell.ButtonMask, modifier gocui.Modifier,
-) {
+func (self *GuiDriver) replayMouseEventWithoutWaiting(x, y int, buttons tcell.ButtonMask) {
 	self.gui.g.ReplayMouseEvent(gocui.NewTcellMouseEventWrapper(
-		tcell.NewEventMouse(x, y, buttons, tcell.ModMask(modifier)),
+		tcell.NewEventMouse(x, y, buttons, 0),
 		0,
 	))
 }

pkg/gui/main_panels.go

@@ -1,8 +1,6 @@
 package gui
 
 import (
-	"strings"
-
 	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
@@ -70,16 +68,6 @@ func (gui *Gui) RefreshMainView(opts *types.ViewUpdateOpts, context types.Contex
 
 	if mainContext := gui.mainContextForView(view); mainContext != nil {
 		mainContext.SetContentIsDiff(types.ContentIsDiff(opts.Task))
-		// A diff is wrapped as the user asks; anything else a main pane shows is prose
-		// or a log, and reads as badly cut off at the edge of the pane as it would
-		// anywhere else.
-		view.Wrap = !mainContext.ContentIsDiff() || gui.c.UserConfig().Gui.WrapLinesInDiffView
-		// The files named in the diffstat are linked to where their diff begins, over a
-		// render that has both: the panel's own diff, and rows that can be placed in the
-		// files they show. The writer is told here, on the UI thread, since it is asked
-		// on the one reading the command's output.
-		gui.diffStatLinkWriter(view).BeginRender(
-			mainContext.ContentIsDiff() && gui.helpers.DiffLine.DiffRowsCanBePlaced())
 	}
 
 	if err := gui.runTaskForView(view, opts.Task); err != nil {
@@ -94,6 +82,20 @@ func (gui *Gui) normalMainContextPair() types.MainContextPair {
 	)
 }
 
+func (gui *Gui) stagingMainContextPair() types.MainContextPair {
+	return types.NewMainContextPair(
+		gui.State.Contexts.Staging,
+		gui.State.Contexts.StagingSecondary,
+	)
+}
+
+func (gui *Gui) patchBuildingMainContextPair() types.MainContextPair {
+	return types.NewMainContextPair(
+		gui.State.Contexts.CustomPatchBuilder,
+		gui.State.Contexts.CustomPatchBuilderSecondary,
+	)
+}
+
 func (gui *Gui) mergingMainContextPair() types.MainContextPair {
 	return types.NewMainContextPair(
 		gui.State.Contexts.MergeConflicts,
@@ -104,6 +106,8 @@ func (gui *Gui) mergingMainContextPair() types.MainContextPair {
 func (gui *Gui) allMainContextPairs() []types.MainContextPair {
 	return []types.MainContextPair{
 		gui.normalMainContextPair(),
+		gui.stagingMainContextPair(),
+		gui.patchBuildingMainContextPair(),
 		gui.mergingMainContextPair(),
 	}
 }
@@ -114,7 +118,6 @@ func (gui *Gui) refreshMainViews(opts types.RefreshMainOpts) {
 	// Before the render is triggered, so that the pane the focus moves into can be
 	// told where to put its selection as it renders.
 	gui.followFocusIntoWorkablePane(opts)
-	gui.keepDiffSelectionAcrossACommitRewrite(opts)
 
 	gui.moveMainContextPairToTop(opts.Pair)
 
@@ -241,71 +244,6 @@ func (gui *Gui) followFocusIntoWorkablePane(opts types.RefreshMainOpts) {
 	gui.State.ContextMgr.Push(target, types.OnFocusOpts{})
 }
 
-// keepDiffSelectionAcrossACommitRewrite arranges for a selection in the focused main
-// view to come back on the same change of the diff when the render about to happen is
-// of a different diff from the one on screen. This happens when a commit is rewritten
-// under the user, by moving a patch out of it, discarding lines from it, or undoing
-// either. The selection is then left at a position in a rendering that no longer exists.
-//
-// What is remembered is which change of the diff the selection was on rather than which
-// line of which file, a rewrite being precisely a change to those lines: the change that
-// takes its place is where the work carries on.
-//
-// It is asked of every render, and does nothing unless all three of these hold: there
-// is a selection to keep; nothing more precise is already waiting to be put back (the
-// position preserves and the post-action reveals know better where their selection
-// belongs); and the diff really is another one. A plain refresh re-renders the same
-// diff, where the selection, possibly a range the user is in the middle of making, is
-// still exactly right.
-func (gui *Gui) keepDiffSelectionAcrossACommitRewrite(opts types.RefreshMainOpts) {
-	// The focused main view's two panes only: no other pair has a diff selection.
-	if opts.Pair.Main.GetKey() != context.NORMAL_MAIN_CONTEXT_KEY {
-		return
-	}
-
-	current := gui.State.ContextMgr.CurrentStatic().GetKey()
-	for _, pane := range []struct {
-		context types.Context
-		update  *types.ViewUpdateOpts
-	}{
-		{opts.Pair.Main, opts.Main},
-		{opts.Pair.Secondary, opts.Secondary},
-	} {
-		if pane.update == nil || pane.context.GetKey() != current {
-			continue
-		}
-		mainContext := gui.mainContextForView(pane.context.GetView())
-		if mainContext == nil || !mainContext.GetView().Highlight {
-			continue
-		}
-		manager := gui.getViewBufferManagerForView(mainContext.GetView())
-		if manager == nil || manager.HasRestoreForNextTask() {
-			continue
-		}
-		key, ok := diffTaskCommandKey(pane.update.Task)
-		if !ok || key == manager.GetTaskKey() {
-			continue
-		}
-
-		first, _ := mainContext.GetView().SelectedLineRange()
-		gui.helpers.DiffLine.RevealSelectionAfterAction(mainContext, mainContext, first, 0, nil)
-	}
-}
-
-// diffTaskCommandKey returns the key the given render will be remembered under. Two
-// renders of the same diff have the same key, so comparing keys says whether a render
-// is of the diff already on screen. ok is false for a render that is a message rather
-// than a diff.
-func diffTaskCommandKey(task types.UpdateTask) (string, bool) {
-	switch task := task.(type) {
-	case *types.RunCommandTask:
-		return strings.Join(task.Cmd.Args, " "), true
-	case *types.RunDiffRendererTask:
-		return strings.Join(task.Cmd.Args, " "), true
-	}
-	return "", false
-}
-
 // onlyWorkablePane returns the main pane a render leaves as the only one worth having
 // the focus in, or nil when that is true of both of them or of neither. Being shown is
 // not the same as being worth working in: a pane the layout keeps around for the sake
@@ -370,11 +308,8 @@ func (gui *Gui) clearMainView(mainContext types.Context) {
 	}
 }
 
-// updateDiffPaneDecorations re-derives what is drawn over a main pane's content, rather
-// than being part of it: whether a selection is shown, and which lines are marked as
-// being in the custom patch.
-//
-// A pane holds something for a selection to sit on only beneath a panel whose main
+// updateDiffSelectionVisibility works out whether a main pane holds anything for a
+// selection to sit on, from what it is now showing: only beneath a panel whose main
 // view is a diff, only while the pane is showing that diff rather than a message like
 // "No changed files", and only while the diff holds something to select — never over
 // one with nothing in it, such as a binary file's or an empty commit's. Whether the
@@ -386,7 +321,7 @@ func (gui *Gui) clearMainView(mainContext types.Context) {
 // still being read can leave the question open (see diffPaneHasSomethingToSelect). The
 // pane never answers from the render before it, and a render that leaves the question
 // open is read on until it doesn't, so the answer is always about what is there.
-func (gui *Gui) updateDiffPaneDecorations(view *gocui.View, contentIsComplete bool) {
+func (gui *Gui) updateDiffSelectionVisibility(view *gocui.View, contentIsComplete bool) {
 	mainContext := gui.mainContextForView(view)
 	if mainContext == nil {
 		return
@@ -402,12 +337,6 @@ func (gui *Gui) updateDiffPaneDecorations(view *gocui.View, contentIsComplete bo
 	} else {
 		gui.readOnUntilTheDiffPaneCanTell(view)
 	}
-
-	// The marks are over the diff in the upper pane; the lower one shows the patch
-	// they are marks of.
-	if view == gui.Views.Main {
-		gui.helpers.DiffLine.RefreshInclusionGutter()
-	}
 }
 
 // dropAnAnswerAboutAnotherRender takes away what the pane worked out about the content

pkg/gui/main_view_render.go

@@ -51,11 +51,6 @@ func (gui *Gui) newRenderTask(view *gocui.View, cmd *exec.Cmd, prefix string) er
 		return gui.newCmdTask(view, cmd, prefix)
 	}
 
-	// The key the render is remembered under says which diff it is of, so that a
-	// re-render of the same diff can be told from a render of another one. Take
-	// it before anything else can touch the command's arguments.
-	cmdStr := strings.Join(cmd.Args, " ")
-
 	// Mark the view as loading synchronously now, before the layout pass: the
 	// actual task is created in afterLayout (below), which runs after layout, so
 	// without this the next layout pass would clamp the scroll position to the
@@ -86,6 +81,8 @@ func (gui *Gui) newRenderTask(view *gocui.View, cmd *exec.Cmd, prefix string) er
 			gui.c.ErrorToast(err.Error())
 		}
 
+		cmdStr := strings.Join(cmd.Args, " ")
+
 		// This communicates to diff renderers that we're in a very simple
 		// terminal that they should not expect to have much capabilities.
 		// Moving the cursor, clearing the screen, or querying for colors are among such "advanced" capabilities.

pkg/gui/patch_exploring/focus.go

@@ -0,0 +1,47 @@
+package patch_exploring
+
+func calculateOrigin(currentOrigin int, bufferHeight int, numLines int, firstLineIdx int, lastLineIdx int, selectedLineIdx int, mode selectMode) int {
+	needToSeeIdx, wantToSeeIdx := getNeedAndWantLineIdx(firstLineIdx, lastLineIdx, selectedLineIdx, mode)
+
+	return calculateNewOriginWithNeededAndWantedIdx(currentOrigin, bufferHeight, numLines, needToSeeIdx, wantToSeeIdx)
+}
+
+// we want to scroll our origin so that the index we need to see is in view
+// and the other index we want to see (e.g. the other side of a line range)
+// is as close to being in view as possible.
+func calculateNewOriginWithNeededAndWantedIdx(currentOrigin int, bufferHeight int, numLines int, needToSeeIdx int, wantToSeeIdx int) int {
+	origin := currentOrigin
+	if needToSeeIdx < currentOrigin || needToSeeIdx >= currentOrigin+bufferHeight {
+		origin = max(min(needToSeeIdx-bufferHeight/2, numLines-bufferHeight), 0)
+	}
+
+	bottom := origin + bufferHeight
+
+	if wantToSeeIdx < origin {
+		requiredChange := origin - wantToSeeIdx
+		allowedChange := bottom - needToSeeIdx
+		return origin - min(requiredChange, allowedChange)
+	} else if wantToSeeIdx >= bottom {
+		requiredChange := wantToSeeIdx + 1 - bottom
+		allowedChange := needToSeeIdx - origin
+		return origin + min(requiredChange, allowedChange)
+	}
+	return origin
+}
+
+func getNeedAndWantLineIdx(firstLineIdx int, lastLineIdx int, selectedLineIdx int, mode selectMode) (int, int) {
+	switch mode {
+	case LINE:
+		return selectedLineIdx, selectedLineIdx
+	case RANGE:
+		if selectedLineIdx == firstLineIdx {
+			return firstLineIdx, lastLineIdx
+		}
+		return lastLineIdx, firstLineIdx
+	case HUNK:
+		return firstLineIdx, lastLineIdx
+	default:
+		// we should never land here
+		panic("unknown mode")
+	}
+}

pkg/gui/patch_exploring/focus_test.go

@@ -0,0 +1,129 @@
+package patch_exploring
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewOrigin(t *testing.T) {
+	type scenario struct {
+		name            string
+		origin          int
+		bufferHeight    int
+		numLines        int
+		firstLineIdx    int
+		lastLineIdx     int
+		selectedLineIdx int
+		selectMode      selectMode
+		expected        int
+	}
+
+	scenarios := []scenario{
+		{
+			name:            "selection above scroll window, enough room to put it in the middle",
+			origin:          250,
+			bufferHeight:    100,
+			numLines:        500,
+			firstLineIdx:    210,
+			lastLineIdx:     210,
+			selectedLineIdx: 210,
+			selectMode:      LINE,
+			expected:        160,
+		},
+		{
+			name:            "selection above scroll window, not enough room to put it in the middle",
+			origin:          50,
+			bufferHeight:    100,
+			numLines:        500,
+			firstLineIdx:    10,
+			lastLineIdx:     10,
+			selectedLineIdx: 10,
+			selectMode:      LINE,
+			expected:        0,
+		},
+		{
+			name:            "selection below scroll window, enough room to put it in the middle",
+			origin:          0,
+			bufferHeight:    100,
+			numLines:        500,
+			firstLineIdx:    150,
+			lastLineIdx:     150,
+			selectedLineIdx: 150,
+			selectMode:      LINE,
+			expected:        100,
+		},
+		{
+			name:            "selection below scroll window, not enough room to put it in the middle",
+			origin:          0,
+			bufferHeight:    100,
+			numLines:        200,
+			firstLineIdx:    199,
+			lastLineIdx:     199,
+			selectedLineIdx: 199,
+			selectMode:      LINE,
+			expected:        100,
+		},
+		{
+			name:            "selection within scroll window",
+			origin:          0,
+			bufferHeight:    100,
+			numLines:        500,
+			firstLineIdx:    50,
+			lastLineIdx:     50,
+			selectedLineIdx: 50,
+			selectMode:      LINE,
+			expected:        0,
+		},
+		{
+			name:            "range ending below scroll window with selection at end of range",
+			origin:          0,
+			bufferHeight:    100,
+			numLines:        500,
+			firstLineIdx:    40,
+			lastLineIdx:     150,
+			selectedLineIdx: 150,
+			selectMode:      RANGE,
+			expected:        50,
+		},
+		{
+			name:            "range ending below scroll window with selection at beginning of range",
+			origin:          0,
+			bufferHeight:    100,
+			numLines:        500,
+			firstLineIdx:    40,
+			lastLineIdx:     150,
+			selectedLineIdx: 40,
+			selectMode:      RANGE,
+			expected:        40,
+		},
+		{
+			name:            "range starting above scroll window with selection at beginning of range",
+			origin:          50,
+			bufferHeight:    100,
+			numLines:        500,
+			firstLineIdx:    40,
+			lastLineIdx:     150,
+			selectedLineIdx: 40,
+			selectMode:      RANGE,
+			expected:        40,
+		},
+		{
+			name:            "hunk extending beyond both bounds of scroll window",
+			origin:          50,
+			bufferHeight:    100,
+			numLines:        500,
+			firstLineIdx:    40,
+			lastLineIdx:     200,
+			selectedLineIdx: 70,
+			selectMode:      HUNK,
+			expected:        40,
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.name, func(t *testing.T) {
+			assert.EqualValues(t, s.expected, calculateOrigin(s.origin, s.bufferHeight, s.numLines, s.firstLineIdx, s.lastLineIdx, s.selectedLineIdx, s.selectMode))
+		})
+	}
+}

pkg/gui/patch_exploring/state.go

@@ -0,0 +1,438 @@
+package patch_exploring
+
+import (
+	"strings"
+
+	"github.com/jesseduffield/generics/set"
+	"github.com/jesseduffield/lazygit/pkg/commands/patch"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/samber/lo"
+)
+
+// State represents the current state of the patch explorer context i.e. when
+// you're staging a file or you're building a patch from an existing commit
+// this struct holds the info about the diff you're interacting with and what's currently selected.
+type State struct {
+	// These are in terms of view lines (wrapped), not patch lines
+	selectedLineIdx   int
+	rangeStartLineIdx int
+	// If a range is sticky, it means we expand the range when we move up or down.
+	// Otherwise, we cancel the range when we move up or down.
+	rangeIsSticky bool
+	diff          string
+	patch         *patch.Patch
+	selectMode    selectMode
+
+	// Array of indices of the wrapped lines indexed by a patch line index
+	viewLineIndices []int
+	// Array of indices of the original patch lines indexed by a wrapped view line index
+	patchLineIndices []int
+
+	// whether the user has switched to hunk mode manually; if hunk mode is on
+	// but this is false, then hunk mode was enabled because the config makes it
+	// on by default.
+	// this makes a difference for whether we want to escape out of hunk mode
+	userEnabledHunkMode bool
+}
+
+// these represent what select mode we're in
+type selectMode int
+
+const (
+	LINE selectMode = iota
+	RANGE
+	HUNK
+)
+
+func NewState(diff string, selectedLineIdx int, view *gocui.View, oldState *State, useHunkModeByDefault bool) *State {
+	if oldState != nil && diff == oldState.diff && selectedLineIdx == -1 {
+		// if we're here then we can return the old state. If selectedLineIdx was not -1
+		// then that would mean we were trying to click and potentially drag a range, which
+		// is why in that case we continue below
+		return oldState
+	}
+
+	patch := patch.Parse(diff)
+
+	if !patch.ContainsChanges() {
+		return nil
+	}
+
+	viewLineIndices, patchLineIndices := wrapPatchLines(diff, view)
+
+	rangeStartLineIdx := 0
+	if oldState != nil {
+		rangeStartLineIdx = oldState.rangeStartLineIdx
+	}
+
+	selectMode := LINE
+	if useHunkModeByDefault && !patch.IsSingleHunkForWholeFile() {
+		selectMode = HUNK
+	}
+
+	userEnabledHunkMode := false
+	if oldState != nil {
+		userEnabledHunkMode = oldState.userEnabledHunkMode
+	}
+
+	// if we have clicked from the outside to focus the main view we'll pass in a non-negative line index so that we can instantly select that line
+	if selectedLineIdx >= 0 {
+		// Clamp to the number of wrapped view lines; index might be out of
+		// bounds if a custom diff renderer is being used which produces more lines
+		selectedLineIdx = min(selectedLineIdx, len(viewLineIndices)-1)
+
+		selectMode = RANGE
+		rangeStartLineIdx = selectedLineIdx
+	} else if oldState != nil {
+		// if we previously had a selectMode of RANGE, we want that to now be line again (or hunk, if that's the default)
+		if oldState.selectMode != RANGE {
+			selectMode = oldState.selectMode
+		}
+		oldPatchLineIdx := oldState.patchLineIndices[oldState.selectedLineIdx]
+		newPatchLineIdx := patch.GetNextChangeIdx(oldPatchLineIdx)
+		// When staging an addition from a consecutive changes block, the unselected deletions get
+		// reordered to appear before the remaining additions in the new diff. This can cause the
+		// cursor to land on a deletion at the same patch line index where the staged addition used
+		// to be. In that case, skip forward past any deletions, then call GetNextChangeIdx from the
+		// first non-deletion position, which correctly lands on the next meaningful change.
+		newLines := patch.Lines()
+		if newPatchLineIdx == oldPatchLineIdx &&
+			oldState.patch.Lines()[oldPatchLineIdx].IsAddition() &&
+			newLines[newPatchLineIdx].IsDeletion() &&
+			patch.HunkOldStartForLine(newPatchLineIdx) == oldState.patch.HunkOldStartForLine(oldPatchLineIdx) {
+			for newPatchLineIdx < len(newLines) && newLines[newPatchLineIdx].IsDeletion() {
+				newPatchLineIdx++
+			}
+			newPatchLineIdx = patch.GetNextChangeIdx(newPatchLineIdx)
+		}
+		selectedLineIdx = viewLineIndices[newPatchLineIdx]
+	} else {
+		selectedLineIdx = viewLineIndices[patch.GetNextChangeIdx(0)]
+	}
+
+	return &State{
+		patch:               patch,
+		selectedLineIdx:     selectedLineIdx,
+		selectMode:          selectMode,
+		rangeStartLineIdx:   rangeStartLineIdx,
+		rangeIsSticky:       false,
+		diff:                diff,
+		viewLineIndices:     viewLineIndices,
+		patchLineIndices:    patchLineIndices,
+		userEnabledHunkMode: userEnabledHunkMode,
+	}
+}
+
+func (s *State) OnViewWidthChanged(view *gocui.View) {
+	if !view.Wrap {
+		return
+	}
+
+	selectedPatchLineIdx := s.patchLineIndices[s.selectedLineIdx]
+	var rangeStartPatchLineIdx int
+	if s.selectMode == RANGE {
+		rangeStartPatchLineIdx = s.patchLineIndices[s.rangeStartLineIdx]
+	}
+	s.viewLineIndices, s.patchLineIndices = wrapPatchLines(s.diff, view)
+	s.selectedLineIdx = s.viewLineIndices[selectedPatchLineIdx]
+	if s.selectMode == RANGE {
+		s.rangeStartLineIdx = s.viewLineIndices[rangeStartPatchLineIdx]
+	}
+}
+
+func (s *State) GetSelectedPatchLineIdx() int {
+	return s.patchLineIndices[s.selectedLineIdx]
+}
+
+func (s *State) GetSelectedViewLineIdx() int {
+	return s.selectedLineIdx
+}
+
+func (s *State) GetDiff() string {
+	return s.diff
+}
+
+func (s *State) ToggleSelectHunk() {
+	if s.selectMode == HUNK {
+		s.selectMode = LINE
+	} else {
+		s.selectMode = HUNK
+		s.userEnabledHunkMode = true
+
+		// If we are not currently on a change line, select the next one (or the
+		// previous one if there is no next one):
+		s.selectedLineIdx = s.viewLineIndices[s.patch.GetNextChangeIdx(
+			s.patchLineIndices[s.selectedLineIdx])]
+	}
+}
+
+func (s *State) ToggleStickySelectRange() {
+	s.ToggleSelectRange(true)
+}
+
+func (s *State) ToggleSelectRange(sticky bool) {
+	if s.SelectingRange() {
+		s.selectMode = LINE
+	} else {
+		s.selectMode = RANGE
+		s.rangeStartLineIdx = s.selectedLineIdx
+		s.rangeIsSticky = sticky
+	}
+}
+
+func (s *State) SetRangeIsSticky(value bool) {
+	s.rangeIsSticky = value
+}
+
+func (s *State) SelectingHunk() bool {
+	return s.selectMode == HUNK
+}
+
+func (s *State) SelectingHunkEnabledByUser() bool {
+	return s.selectMode == HUNK && s.userEnabledHunkMode
+}
+
+func (s *State) SelectingRange() bool {
+	return s.selectMode == RANGE && (s.rangeIsSticky || s.rangeStartLineIdx != s.selectedLineIdx)
+}
+
+func (s *State) SelectingLine() bool {
+	return s.selectMode == LINE
+}
+
+func (s *State) SetLineSelectMode() {
+	s.selectMode = LINE
+}
+
+func (s *State) DismissHunkSelectMode() {
+	if s.SelectingHunk() {
+		s.selectMode = LINE
+	}
+}
+
+// For when you move the cursor without holding shift (meaning if we're in
+// a non-sticky range select, we'll cancel it)
+func (s *State) SelectLine(newSelectedLineIdx int) {
+	if s.selectMode == RANGE && !s.rangeIsSticky {
+		s.selectMode = LINE
+	}
+
+	s.selectLineWithoutRangeCheck(newSelectedLineIdx)
+}
+
+func (s *State) clampLineIdx(lineIdx int) int {
+	return lo.Clamp(lineIdx, 0, len(s.patchLineIndices)-1)
+}
+
+// This just moves the cursor without caring about range select
+func (s *State) selectLineWithoutRangeCheck(newSelectedLineIdx int) {
+	s.selectedLineIdx = s.clampLineIdx(newSelectedLineIdx)
+}
+
+func (s *State) SelectNewLineForRange(newSelectedLineIdx int) {
+	s.rangeStartLineIdx = s.clampLineIdx(newSelectedLineIdx)
+
+	s.selectMode = RANGE
+
+	s.selectLineWithoutRangeCheck(newSelectedLineIdx)
+}
+
+func (s *State) DragSelectLine(newSelectedLineIdx int) {
+	s.selectMode = RANGE
+
+	s.selectLineWithoutRangeCheck(newSelectedLineIdx)
+}
+
+func (s *State) CycleSelection(forward bool) {
+	if s.SelectingHunk() {
+		if forward {
+			s.SelectNextHunk()
+		} else {
+			s.SelectPreviousHunk()
+		}
+	} else {
+		s.CycleLine(forward)
+	}
+}
+
+func (s *State) SelectPreviousHunk() {
+	patchLines := s.patch.Lines()
+	patchLineIdx := s.patchLineIndices[s.selectedLineIdx]
+	nextNonChangeLine := patchLineIdx
+	for nextNonChangeLine >= 0 && patchLines[nextNonChangeLine].IsChange() {
+		nextNonChangeLine--
+	}
+	nextChangeLine := nextNonChangeLine
+	for nextChangeLine >= 0 && !patchLines[nextChangeLine].IsChange() {
+		nextChangeLine--
+	}
+	if nextChangeLine >= 0 {
+		// Now we found a previous hunk, but we're on its last line. Skip to the beginning.
+		for nextChangeLine > 0 && patchLines[nextChangeLine-1].IsChange() {
+			nextChangeLine--
+		}
+		s.selectedLineIdx = s.viewLineIndices[nextChangeLine]
+	}
+}
+
+func (s *State) SelectNextHunk() {
+	patchLines := s.patch.Lines()
+	patchLineIdx := s.patchLineIndices[s.selectedLineIdx]
+	nextNonChangeLine := patchLineIdx
+	for nextNonChangeLine < len(patchLines) && patchLines[nextNonChangeLine].IsChange() {
+		nextNonChangeLine++
+	}
+	nextChangeLine := nextNonChangeLine
+	for nextChangeLine < len(patchLines) && !patchLines[nextChangeLine].IsChange() {
+		nextChangeLine++
+	}
+	if nextChangeLine < len(patchLines) {
+		s.selectedLineIdx = s.viewLineIndices[nextChangeLine]
+	}
+}
+
+func (s *State) CycleLine(forward bool) {
+	change := 1
+	if !forward {
+		change = -1
+	}
+
+	s.SelectLine(s.selectedLineIdx + change)
+}
+
+// This is called when we use shift+arrow to expand the range (i.e. a non-sticky
+// range)
+func (s *State) CycleRange(forward bool) {
+	if !s.SelectingRange() {
+		s.ToggleSelectRange(false)
+	}
+
+	s.SetRangeIsSticky(false)
+
+	change := 1
+	if !forward {
+		change = -1
+	}
+
+	s.selectLineWithoutRangeCheck(s.selectedLineIdx + change)
+}
+
+// returns first and last patch line index of current hunk
+func (s *State) CurrentHunkBounds() (int, int) {
+	hunkIdx := s.patch.HunkContainingLine(s.patchLineIndices[s.selectedLineIdx])
+	start := s.patch.HunkStartIdx(hunkIdx)
+	end := s.patch.HunkEndIdx(hunkIdx)
+	return start, end
+}
+
+func (s *State) selectionRangeForCurrentBlockOfChanges() (int, int) {
+	patchLines := s.patch.Lines()
+	patchLineIdx := s.patchLineIndices[s.selectedLineIdx]
+
+	patchStart := patchLineIdx
+	for patchStart > 0 && patchLines[patchStart-1].IsChange() {
+		patchStart--
+	}
+
+	patchEnd := patchLineIdx
+	for patchEnd < len(patchLines)-1 && patchLines[patchEnd+1].IsChange() {
+		patchEnd++
+	}
+
+	viewStart, viewEnd := s.viewLineIndices[patchStart], s.viewLineIndices[patchEnd]
+
+	// Increase viewEnd in case the last patch line is wrapped to more than one view line.
+	for viewEnd < len(s.patchLineIndices)-1 && s.patchLineIndices[viewEnd] == s.patchLineIndices[viewEnd+1] {
+		viewEnd++
+	}
+
+	return viewStart, viewEnd
+}
+
+func (s *State) SelectedViewRange() (int, int) {
+	switch s.selectMode {
+	case HUNK:
+		return s.selectionRangeForCurrentBlockOfChanges()
+	case RANGE:
+		if s.rangeStartLineIdx > s.selectedLineIdx {
+			return s.selectedLineIdx, s.rangeStartLineIdx
+		}
+		return s.rangeStartLineIdx, s.selectedLineIdx
+	case LINE:
+		return s.selectedLineIdx, s.selectedLineIdx
+	default:
+		// should never happen
+		return 0, 0
+	}
+}
+
+func (s *State) SelectedPatchRange() (int, int) {
+	start, end := s.SelectedViewRange()
+	return s.patchLineIndices[start], s.patchLineIndices[end]
+}
+
+// Returns the line indices of the selected patch range that are changes (i.e. additions or deletions)
+func (s *State) LineIndicesOfAddedOrDeletedLinesInSelectedPatchRange() []int {
+	viewStart, viewEnd := s.SelectedViewRange()
+	patchStart, patchEnd := s.patchLineIndices[viewStart], s.patchLineIndices[viewEnd]
+	lines := s.patch.Lines()
+	indices := []int{}
+	for i := patchStart; i <= patchEnd; i++ {
+		if lines[i].IsChange() {
+			indices = append(indices, i)
+		}
+	}
+	return indices
+}
+
+func (s *State) CurrentLineNumber() int {
+	return s.patch.LineNumberOfLine(s.patchLineIndices[s.selectedLineIdx])
+}
+
+func (s *State) AdjustSelectedLineIdx(change int) {
+	s.DismissHunkSelectMode()
+	s.SelectLine(s.selectedLineIdx + change)
+}
+
+func (s *State) RenderForLineIndices(includedLineIndices []int) string {
+	includedLineIndicesSet := set.NewFromSlice(includedLineIndices)
+	return s.patch.FormatView(patch.FormatViewOpts{
+		IncLineIndices: includedLineIndicesSet,
+	})
+}
+
+func (s *State) PlainRenderSelected() string {
+	firstLineIdx, lastLineIdx := s.SelectedPatchRange()
+	return s.patch.FormatRangePlain(firstLineIdx, lastLineIdx)
+}
+
+func (s *State) SelectBottom() {
+	s.DismissHunkSelectMode()
+	s.SelectLine(len(s.patchLineIndices) - 1)
+}
+
+func (s *State) SelectTop() {
+	s.DismissHunkSelectMode()
+	s.SelectLine(0)
+}
+
+func (s *State) CalculateOrigin(currentOrigin int, bufferHeight int, numLines int) int {
+	firstLineIdx, lastLineIdx := s.SelectedViewRange()
+
+	return calculateOrigin(currentOrigin, bufferHeight, numLines, firstLineIdx, lastLineIdx, s.GetSelectedViewLineIdx(), s.selectMode)
+}
+
+func wrapPatchLines(diff string, view *gocui.View) ([]int, []int) {
+	_, viewLineIndices, patchLineIndices := utils.WrapViewLinesToWidth(
+		view.Wrap, view.Editable, strings.TrimSuffix(diff, "\n"), view.InnerWidth(), view.TabWidth)
+	return viewLineIndices, patchLineIndices
+}
+
+func (s *State) SelectNextStageableLineOfSameIncludedState(includedLines []int, included bool) {
+	_, lastLineIdx := s.SelectedPatchRange()
+	patchLineIdx, found := s.patch.GetNextChangeIdxOfSameIncludedState(lastLineIdx+1, includedLines, included)
+	if found {
+		s.SelectLine(s.viewLineIndices[patchLineIdx])
+	}
+}

pkg/gui/presentation/files_test.go

@@ -230,7 +230,6 @@ M file1
 				func(from string, to string, reverse bool, filename string, previousPath string) (string, error) {
 					return "", nil
 				},
-				nil,
 			)
 			patchBuilder.Start("from", "to", false, false)
 			result := RenderCommitFileTree(viewModel, patchBuilder, false, &config.CustomIconsConfig{})

pkg/gui/tasks_adapter.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/tasks"
 	"github.com/sirupsen/logrus"
 )
@@ -95,7 +94,7 @@ func (gui *Gui) newStringTaskWithoutScroll(view *gocui.View, str string) error {
 	f := func(tasks.TaskOpts) error {
 		return gui.g.OnUIThreadAndWaitBackground(func() {
 			gui.c.SetViewContent(view, str)
-			gui.updateDiffPaneDecorations(view, true)
+			gui.updateDiffSelectionVisibility(view, true)
 			gui.reApplySearch(view)
 		})
 	}
@@ -117,7 +116,7 @@ func (gui *Gui) newStringTaskWithScroll(view *gocui.View, str string, originX in
 		return gui.g.OnUIThreadAndWaitBackground(func() {
 			gui.c.SetViewContent(view, str)
 			view.SetOrigin(originX, originY)
-			gui.updateDiffPaneDecorations(view, true)
+			gui.updateDiffSelectionVisibility(view, true)
 			gui.reApplySearch(view)
 		})
 	}
@@ -139,7 +138,7 @@ func (gui *Gui) newStringTaskWithKey(view *gocui.View, str string, key string) e
 		return gui.g.OnUIThreadAndWaitBackground(func() {
 			gui.c.ResetViewOrigin(view)
 			gui.c.SetViewContent(view, str)
-			gui.updateDiffPaneDecorations(view, true)
+			gui.updateDiffSelectionVisibility(view, true)
 			gui.reApplySearch(view)
 		})
 	}
@@ -151,34 +150,12 @@ func (gui *Gui) newStringTaskWithKey(view *gocui.View, str string, key string) e
 	return nil
 }
 
-// contentWriter returns what a render of the given view writes its content to: the
-// view itself, or, for a pane of the main section, the writer that links the files
-// named in the diffstat on its way there (see DiffStatLinkWriter).
-func (gui *Gui) contentWriter(view *gocui.View) io.Writer {
-	if gui.mainContextForView(view) == nil {
-		return view
-	}
-	return gui.diffStatLinkWriter(view)
-}
-
-// diffStatLinkWriter returns the writer that links the diffstat of the given pane,
-// making it if the pane hasn't rendered yet. It lasts as long as the view does, and
-// each render tells it what to make of that render (see DiffStatLinkWriter.BeginRender).
-func (gui *Gui) diffStatLinkWriter(view *gocui.View) *helpers.DiffStatLinkWriter {
-	writer, ok := gui.diffStatLinkWriterMap[view.Name()]
-	if !ok {
-		writer = helpers.NewDiffStatLinkWriter(view)
-		gui.diffStatLinkWriterMap[view.Name()] = writer
-	}
-	return writer
-}
-
 func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
 	manager, ok := gui.viewBufferManagerMap[view.Name()]
 	if !ok {
 		manager = tasks.NewViewBufferManager(
 			gui.Log,
-			gui.contentWriter(view),
+			view,
 			func() {
 				// Called before showing the "loading..." indicator: clear the
 				// displayed buffer so only "loading..." is shown. The actual content
@@ -200,7 +177,7 @@ func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
 				// to say whether there is anything to select, and for a diff that
 				// opens with a long diffstat it isn't.
 				gui.c.OnUIThreadContentOnly(func() error {
-					gui.updateDiffPaneDecorations(view, false)
+					gui.updateDiffSelectionVisibility(view, false)
 					return nil
 				})
 			},
@@ -219,7 +196,7 @@ func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
 					view.SetOrigin(0, newOriginY)
 				}
 
-				gui.updateDiffPaneDecorations(view, true)
+				gui.updateDiffSelectionVisibility(view, true)
 				gui.clampDiffSelectionToContent(view)
 				gui.reApplySearch(view)
 			},
@@ -233,7 +210,7 @@ func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
 				// The content the pane is being given is on display from here on, so
 				// what is drawn over it is settled against that content rather than
 				// against the render before it.
-				gui.updateDiffPaneDecorations(view, false)
+				gui.updateDiffSelectionVisibility(view, false)
 			},
 			func() gocui.Task {
 				// A background task: rendering content into a view is display

pkg/gui/types/context.go

@@ -1,10 +1,11 @@
 package types
 
 import (
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
 	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/sasha-s/go-deadlock"
 )
 
 type ContextKind int
@@ -214,29 +215,6 @@ const (
 	DiffMainViewTypePatchBuilding
 )
 
-// PullRequestDiffContext is implemented by the side panel contexts that show, in
-// their focused main view, the diff of a commit of a branch: the commits panel and
-// the sub-commits panel, and the commit files panel entered from either of them. A
-// pull request for that branch has a view of that commit, so a line of the diff can
-// be pointed at in it. A panel showing a diff that no pull request has a view of (the
-// working tree's, a stash entry's, a reflog entry's) doesn't implement this.
-type PullRequestDiffContext interface {
-	Context
-
-	// BranchForPullRequest returns the local branch whose pull request would show
-	// the diff in the main view, and "" where no branch does: the panel may have
-	// nothing selected, HEAD may be detached, or what was drilled into may be a tag
-	// or a remote branch rather than a local one.
-	BranchForPullRequest() string
-
-	// CommitsForPullRequest returns the commits whose combined diff the main view is
-	// showing, newest first as the panel lists them, together with the hash of the
-	// commit that diff starts after: the parent of the oldest of them, where the
-	// pull request has that parent as one of its own commits, and "" where the diff
-	// starts where the pull request itself does.
-	CommitsForPullRequest() ([]*models.Commit, string)
-}
-
 // DiffPaneContext is one of the two panes the main section can show, as the thing
 // that holds a diff with a selection in it. The panels that act on such a selection
 // are handed the pane it was made in, and speak to it through this.
@@ -278,20 +256,8 @@ type FocusedMainViewActions interface {
 	PrimaryAction(pane DiffPaneContext, firstLineIdx int, lastLineIdx int) error
 
 	// DiscardSelection takes the selected diff lines back out of whatever they are part
-	// of: the working tree for the files panel, the commit itself for the panels showing
-	// a commit's diff.
+	// of: the working tree for the files panel.
 	DiscardSelection(pane DiffPaneContext, firstLineIdx int, lastLineIdx int) error
-
-	// DiscardSelectionDisabledReason says why the selection can't be discarded where it
-	// is, and nil when it can. Taking lines out of a commit means rewriting it, which
-	// isn't always something we may do; the working tree has no such condition.
-	DiscardSelectionDisabledReason(pane DiffPaneContext) *DisabledReason
-
-	// PatchInclusion says which lines of the diff this panel shows are in the custom
-	// patch being built from it. The marks over those lines are drawn from this. nil
-	// where nothing about this diff is being built into a patch, which is always so
-	// for a diff that can't be.
-	PatchInclusion() func(info DiffLineInfo) bool
 }
 
 type IListContext interface {
@@ -313,6 +279,20 @@ type IListContext interface {
 	IndexForGotoBottom() int
 }
 
+type IPatchExplorerContext interface {
+	Context
+
+	GetState() *patch_exploring.State
+	SetState(*patch_exploring.State)
+	GetIncludedLineIndices() []int
+	RenderAndFocus()
+	Render()
+	GetContentToRender() string
+	NavigateTo(selectedLineIdx int)
+	GetMutex() *deadlock.Mutex
+	IsPatchExplorerContext() // used for type switch
+}
+
 type IViewTrait interface {
 	FocusPoint(yIdx int, scrollIntoView bool)
 	SetRangeSelectStart(yIdx int)
@@ -448,4 +428,5 @@ type IContextMgr interface {
 	AllList() []IListContext
 	AllFilterable() []IFilterableContext
 	AllSearchable() []ISearchableContext
+	AllPatchExplorer() []IPatchExplorerContext
 }

pkg/gui/types/diff_line_info.go

@@ -1,7 +1,5 @@
 package types
 
-import "github.com/jesseduffield/lazygit/pkg/commands/patch"
-
 // DiffLineType classifies a row of a rendered diff.
 type DiffLineType int
 
@@ -43,16 +41,6 @@ func (self DiffLineInfo) IsChange() bool {
 	return self.Type == DiffLineAdded || self.Type == DiffLineDeleted
 }
 
-// PatchLineIdentity says which change line of the file the row is, in the terms a patch
-// of that file is built and read in: an addition by where it sits in the new version of
-// the file, a deletion by where it sat in the old one. Only meaningful for a change row.
-func (self DiffLineInfo) PatchLineIdentity() patch.LineIdentity {
-	if self.Type == DiffLineDeleted {
-		return patch.LineIdentity{LineNumber: self.OldLine, IsDeletion: true}
-	}
-	return patch.LineIdentity{LineNumber: self.NewLine}
-}
-
 // IsContent reports whether the row is a line of the file itself — a change or a
 // context line — as opposed to a header or a marker. Those are the rows that have a
 // position in the file, and so can be looked for in another rendering of the same