diff --git a/docs-master/Config.md b/docs-master/Config.md index 1d6f8621f..803c11e38 100644 --- a/docs-master/Config.md +++ b/docs-master/Config.md @@ -142,14 +142,13 @@ gui: # - 'top': split the window vertically (side panel on top, main view below) enlargedSideViewLocation: left - # 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 + # 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. - wrapLinesInStagingView: true + wrapLinesInDiffView: true - # If true, hunk selection mode will be enabled by default when entering the - # staging view. - useHunkModeInStagingView: true + # If true, hunk selection mode will be enabled by default when focusing a diff. + useHunkModeInDiffView: true # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' # | 'ru' | 'pt' diff --git a/docs-master/keybindings/Keybindings_en.md b/docs-master/keybindings/Keybindings_en.md index d87b2b021..ef4e1c546 100644 --- a/docs-master/keybindings/Keybindings_en.md +++ b/docs-master/keybindings/Keybindings_en.md @@ -65,7 +65,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` `` | 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 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. | +| `` `` | 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. | | `` ` `` | 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.

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 | @@ -149,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. | -| `` `` | 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. | +| `` `` | 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. | | `` 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). | @@ -222,7 +222,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | Scroll down | | | `` (fn+down) `` | Scroll up | | -| `` `` | Switch view | Switch to other view (staged/unstaged changes). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | | `` v `` | Toggle range select | | | `` e `` | Edit file | Open file in external editor. | @@ -304,7 +304,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | Switch view | Switch to other view (staged/unstaged changes). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | | `` v `` | Toggle range select | | | `` e `` | Edit file | Open file in external editor. | diff --git a/docs-master/keybindings/Keybindings_ja.md b/docs-master/keybindings/Keybindings_ja.md index 99cfac834..4aef4bd13 100644 --- a/docs-master/keybindings/Keybindings_ja.md +++ b/docs-master/keybindings/Keybindings_ja.md @@ -114,7 +114,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 外部差分ツールを開く（git difftool） | | | `` `` | パッチに含めるファイルを切り替え | ファイルがカスタムパッチに含まれるかどうかを切り替えます。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 | | `` a `` | すべてのファイルを切り替え | コミットのすべてのファイルをカスタムパッチに追加/削除します。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 | -| `` `` | ファイルに入る / ディレクトリの折りたたみを切り替える | ファイルが選択されている場合、そのファイルに入ってカスタムパッチに個々の行を追加/削除できます。ディレクトリが選択されている場合、ディレクトリを切り替えます。 | +| `` `` | 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. | | `` ` `` | ファイルツリービューを切り替え | ファイル表示をフラット表示とツリー表示で切り替えます。フラット表示はすべてのファイルパスを一覧で表示し、ツリー表示はディレクトリごとにファイルをグループ化します。

デフォルトは設定ファイル内の 'gui.showFileTree' キーで変更できます。 | | `` - `` | すべてのファイルを折りたたむ | ファイルツリー内のすべてのディレクトリを折りたたみます | | `` = `` | すべてのファイルを展開 | ファイルツリー内のすべてのディレクトリを展開します | @@ -191,7 +191,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. | | `` v `` | 範囲選択を切り替え | | | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 | @@ -281,7 +281,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | 下にスクロール | | | `` (fn+down) `` | 上にスクロール | | -| `` `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. | | `` v `` | 範囲選択を切り替え | | | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 | diff --git a/docs-master/keybindings/Keybindings_ko.md b/docs-master/keybindings/Keybindings_ko.md index d025122b0..87be58b6b 100644 --- a/docs-master/keybindings/Keybindings_ko.md +++ b/docs-master/keybindings/Keybindings_ko.md @@ -83,7 +83,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | 패널 전환 | Switch to other view (staged/unstaged changes). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | | `` v `` | 드래그 선택 전환 | | | `` e `` | 파일 편집 | Open file in external editor. | @@ -176,7 +176,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | 아래로 스크롤 | | | `` (fn+down) `` | 위로 스크롤 | | -| `` `` | 패널 전환 | Switch to other view (staged/unstaged changes). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | | `` v `` | 드래그 선택 전환 | | | `` e `` | 파일 편집 | Open file in external editor. | @@ -337,7 +337,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` `` | 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 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. | +| `` `` | 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. | | `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

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 | @@ -387,7 +387,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. | -| `` `` | 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. | +| `` `` | 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. | | `` 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). | diff --git a/docs-master/keybindings/Keybindings_nl.md b/docs-master/keybindings/Keybindings_nl.md index f101c692c..c860ae500 100644 --- a/docs-master/keybindings/Keybindings_nl.md +++ b/docs-master/keybindings/Keybindings_nl.md @@ -72,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. | -| `` `` | 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. | +| `` `` | 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. | | `` 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). | @@ -144,7 +144,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open externe diff applicatie (git difftool) | | | `` `` | 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 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. | +| `` `` | 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. | | `` ` `` | 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.

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 | @@ -230,7 +230,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | Scroll omlaag | | | `` (fn+down) `` | Scroll omhoog | | -| `` `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` 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. | @@ -304,7 +304,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` 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. | diff --git a/docs-master/keybindings/Keybindings_pl.md b/docs-master/keybindings/Keybindings_pl.md index 544bbd655..a612f44ab 100644 --- a/docs-master/keybindings/Keybindings_pl.md +++ b/docs-master/keybindings/Keybindings_pl.md @@ -98,7 +98,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` 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. | @@ -199,7 +199,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | Przewiń w dół | | | `` (fn+down) `` | Przewiń w górę | | -| `` `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` 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. | @@ -288,7 +288,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` `` | 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. | -| `` `` | 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. | +| `` `` | 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. | | `` ` `` | 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.

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 | diff --git a/docs-master/keybindings/Keybindings_pt.md b/docs-master/keybindings/Keybindings_pt.md index 6f8e779f2..252c72060 100644 --- a/docs-master/keybindings/Keybindings_pt.md +++ b/docs-master/keybindings/Keybindings_pt.md @@ -148,7 +148,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` `` | 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. | -| `` `` | 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. | +| `` `` | 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. | | `` ` `` | 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.

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 | @@ -234,7 +234,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | Rolar para baixo | | | `` (fn+down) `` | Rolar para cima | | -| `` `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` 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. | @@ -313,7 +313,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` 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. | diff --git a/docs-master/keybindings/Keybindings_ru.md b/docs-master/keybindings/Keybindings_ru.md index 3da5bebf1..ef48dd235 100644 --- a/docs-master/keybindings/Keybindings_ru.md +++ b/docs-master/keybindings/Keybindings_ru.md @@ -73,7 +73,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | | `` v `` | Переключить выборку перетаскивания | | | `` e `` | Редактировать файл | Open file in external editor. | @@ -98,7 +98,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | Прокрутить вниз | | | `` (fn+down) `` | Прокрутить вверх | | -| `` `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. | | `` v `` | Переключить выборку перетаскивания | | | `` e `` | Редактировать файл | Open file in external editor. | @@ -296,7 +296,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` `` | Переключить файлы включённые в патч | 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. | -| `` `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | 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. | +| `` `` | 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. | | `` ` `` | Переключить вид дерева файлов | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.

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 | @@ -381,7 +381,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. | -| `` `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | 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. | +| `` `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | 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. | | `` 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). | diff --git a/docs-master/keybindings/Keybindings_zh-CN.md b/docs-master/keybindings/Keybindings_zh-CN.md index e85290a70..773e2e8e9 100644 --- a/docs-master/keybindings/Keybindings_zh-CN.md +++ b/docs-master/keybindings/Keybindings_zh-CN.md @@ -178,7 +178,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 使用外部差异比较工具(git difftool) | | | `` `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 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. | | `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。

可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 | | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 | | `` = `` | 展开全部文件 | 展开文件树中的全部目录 | @@ -269,7 +269,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 | | `` v `` | 切换拖动选择 | | | `` e `` | 编辑文件 | 使用外部编辑器打开文件 | @@ -310,7 +310,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | 向下滚动 | | | `` (fn+down) `` | 向上滚动 | | -| `` `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 | | `` v `` | 切换拖动选择 | | | `` e `` | 编辑文件 | 使用外部编辑器打开文件 | diff --git a/docs-master/keybindings/Keybindings_zh-TW.md b/docs-master/keybindings/Keybindings_zh-TW.md index e4ee82e59..2a70fca04 100644 --- a/docs-master/keybindings/Keybindings_zh-TW.md +++ b/docs-master/keybindings/Keybindings_zh-TW.md @@ -58,7 +58,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` (fn+up) `` | 向下捲動 | | | `` (fn+down) `` | 向上捲動 | | -| `` `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 | | `` v `` | 切換拖曳選擇 | | | `` e `` | 編輯檔案 | 使用外部編輯器開啟 | @@ -207,7 +207,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 開啟外部差異工具 (git difftool) | | | `` `` | 切換檔案是否包含在補丁中 | 切換檔案是否包含在自定義補丁中。請參閱 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. | | `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。

可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 | | `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 | | `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 | @@ -332,7 +332,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | Key | Action | Info | |-----|--------|-------------| -| `` `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 | +| `` `` | Switch diff pane | Switch to the other focused diff pane. | | `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 | | `` v `` | 切換拖曳選擇 | | | `` e `` | 編輯檔案 | 使用外部編輯器開啟 | diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index 19440c4b8..0a1a9d26f 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -297,6 +297,8 @@ 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"}, } diff --git a/pkg/config/app_config_test.go b/pkg/config/app_config_test.go index d093e3976..3f14d20fc 100644 --- a/pkg/config/app_config_test.go +++ b/pkg/config/app_config_test.go @@ -108,6 +108,22 @@ 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 { diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index a21609af2..37bbc724f 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -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 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"` + // 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"` // 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. @@ -895,8 +895,8 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig { }, MainPanelSplitMode: "flexible", EnlargedSideViewLocation: "left", - WrapLinesInStagingView: true, - UseHunkModeInStagingView: true, + WrapLinesInDiffView: true, + UseHunkModeInDiffView: true, Language: "auto", TimeFormat: "02 Jan 06", ShortTimeFormat: time.Kitchen, diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go index f3332dddd..c6b0fb293 100644 --- a/pkg/gui/controllers/commits_files_controller.go +++ b/pkg/gui/controllers/commits_files_controller.go @@ -124,8 +124,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.EnterCommitFile, - Tooltip: self.c.Tr.EnterCommitFileTooltip, + Description: self.c.Tr.FocusCommitFileDiff, + Tooltip: self.c.Tr.FocusCommitFileDiffTooltip, }, { Keys: opts.GetKeys(opts.Config.Files.ToggleTreeView), diff --git a/pkg/gui/controllers/helpers/diff_line_selection.go b/pkg/gui/controllers/helpers/diff_line_selection.go index 61e9e3046..4b53d6613 100644 --- a/pkg/gui/controllers/helpers/diff_line_selection.go +++ b/pkg/gui/controllers/helpers/diff_line_selection.go @@ -70,7 +70,7 @@ func (self *DiffLineHelper) EstablishSelection(mainContext *context.MainContext, // 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.UseHunkModeInStagingView { + if self.c.UserConfig().Gui.UseHunkModeInDiffView { return self.FirstChangeBlockInView(view) } return self.FirstChangeLineInView(view) @@ -81,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.UseHunkModeInStagingView && + return self.c.UserConfig().Gui.UseHunkModeInDiffView && !self.IsSingleHunkForWholeFile(view, changeViewLine) } diff --git a/pkg/gui/controllers/helpers/mode_helper.go b/pkg/gui/controllers/helpers/mode_helper.go index 368d49635..a96164891 100644 --- a/pkg/gui/controllers/helpers/mode_helper.go +++ b/pkg/gui/controllers/helpers/mode_helper.go @@ -71,7 +71,7 @@ func (self *ModeHelper) Statuses() []ModeStatus { return self.withResetButton(self.c.Tr.BuildingPatch, style.FgYellow.SetBold()) }, CancelLabel: func() string { - return self.c.Tr.ExitCustomPatchBuilder + return self.c.Tr.ResetCustomPatch }, Reset: self.customPatchHelper.Reset, }, diff --git a/pkg/gui/controllers/main_view_controller.go b/pkg/gui/controllers/main_view_controller.go index e39578c39..0672c3f3c 100644 --- a/pkg/gui/controllers/main_view_controller.go +++ b/pkg/gui/controllers/main_view_controller.go @@ -46,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.ToggleStagingView, - Tooltip: self.c.Tr.ToggleStagingViewTooltip, + Description: self.c.Tr.ToggleDiffPane, + Tooltip: self.c.Tr.ToggleDiffPaneTooltip, DisplayOnScreen: true, }, { diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 8571f33e7..bcb153ad3 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -21,7 +21,6 @@ type TranslationSet struct { EasterEgg string UnstagedChanges string StagedChanges string - StagingTitle string MergingTitle string NormalTitle string LogTitle string @@ -318,8 +317,8 @@ type TranslationSet struct { RemoveSelectionFromPatchTooltip string EditHunk string EditHunkTooltip string - ToggleStagingView string - ToggleStagingViewTooltip string + ToggleDiffPane string + ToggleDiffPaneTooltip string ReturnToFilesPanel string FastForward string FastForwardTooltip string @@ -359,7 +358,6 @@ type TranslationSet struct { CommitMenuTitle string RemotesTitle string RemoteBranchesTitle string - PatchBuildingTitle string InformationTitle string SecondaryTitle string ReflogCommitsTitle string @@ -563,9 +561,9 @@ type TranslationSet struct { PatchOptionsTitle string NoPatchError string EmptyPatchError string - EnterCommitFile string - EnterCommitFileTooltip string - ExitCustomPatchBuilder string + FocusCommitFileDiff string + FocusCommitFileDiffTooltip string + ResetCustomPatch string ExitFocusedMainView string EnterUpstream string InvalidUpstream string @@ -821,7 +819,6 @@ type TranslationSet struct { ToggleWhitespaceInDiffView string ToggleWhitespaceInDiffViewTooltip string IgnoreWhitespaceDiffViewSubTitle string - IgnoreWhitespaceNotSupportedHere string IncreaseContextInDiffView string IncreaseContextInDiffViewTooltip string DecreaseContextInDiffView string @@ -1197,7 +1194,6 @@ func EnglishTranslationSet() *TranslationSet { EasterEgg: "Easter egg", UnstagedChanges: "Unstaged changes", StagedChanges: "Staged changes", - StagingTitle: "Main panel (staging)", MergingTitle: "Main panel (merging)", NormalTitle: "Main panel (normal)", LogTitle: "Log", @@ -1480,8 +1476,8 @@ func EnglishTranslationSet() *TranslationSet { ExpandAll: "Expand all files", ExpandAllTooltip: "Expand all directories in the file tree", DisabledInFlatView: "Not available in flat view", - FileEnter: `Stage lines / Collapse directory`, - FileEnterTooltip: "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.", + FileEnter: `Focus file diff / Collapse directory`, + FileEnterTooltip: "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.", StageSelectionTooltip: `Toggle selection staged / unstaged.`, DiscardSelection: `Discard`, DiscardSelectionTooltip: "When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change.", @@ -1497,8 +1493,8 @@ func EnglishTranslationSet() *TranslationSet { RemoveSelectionFromPatchTooltip: "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.", EditHunk: `Edit hunk`, EditHunkTooltip: "Edit selected hunk in external editor.", - ToggleStagingView: "Switch view", - ToggleStagingViewTooltip: "Switch to other view (staged/unstaged changes).", + ToggleDiffPane: "Switch diff pane", + ToggleDiffPaneTooltip: "Switch to the other focused diff pane.", ReturnToFilesPanel: `Return to files panel`, FastForward: `Fast-forward`, FastForwardTooltip: "Fast-forward selected branch from its upstream. If the branch has diverged from its upstream because the upstream branch was rewritten, and it has no commits of its own, it is reset to its upstream instead. This needs reflogs to be enabled; a bare repository doesn't keep them by default (core.logAllRefUpdates).", @@ -1536,7 +1532,6 @@ func EnglishTranslationSet() *TranslationSet { CommitMenuTitle: "Commit Menu", RemotesTitle: "Remotes", RemoteBranchesTitle: "Remote branches", - PatchBuildingTitle: "Main panel (patch building)", InformationTitle: "Information", SecondaryTitle: "Secondary", ReflogCommitsTitle: "Reflog", @@ -1747,9 +1742,9 @@ func EnglishTranslationSet() *TranslationSet { PatchOptionsTitle: "Patch options", NoPatchError: "No patch created yet. To start building a patch, use 'space' on a commit file or enter to add specific lines", EmptyPatchError: "Patch is still empty. Add some files or lines to your patch first.", - EnterCommitFile: "Enter file / Toggle directory collapsed", - EnterCommitFileTooltip: "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.", - ExitCustomPatchBuilder: `Exit custom patch builder`, + FocusCommitFileDiff: "Focus file diff / Toggle directory", + FocusCommitFileDiffTooltip: "If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it.", + ResetCustomPatch: `Reset custom patch`, ExitFocusedMainView: "Exit back to side panel", EnterUpstream: `Enter upstream as ' '`, InvalidUpstream: "Invalid upstream. Must be in the format ' '", @@ -2002,7 +1997,6 @@ func EnglishTranslationSet() *TranslationSet { ToggleWhitespaceInDiffView: "Toggle whitespace", ToggleWhitespaceInDiffViewTooltip: "Toggle whether or not whitespace changes are shown in the diff view.\n\nThe default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'.", IgnoreWhitespaceDiffViewSubTitle: "(ignoring whitespace)", - IgnoreWhitespaceNotSupportedHere: "Ignoring whitespace is not supported in this view", IncreaseContextInDiffView: "Increase diff context size", IncreaseContextInDiffViewTooltip: "Increase the amount of the context shown around changes in the diff view.\n\nThe default can be changed in the config file with the key 'git.diffContextSize'.", DecreaseContextInDiffView: "Decrease diff context size", diff --git a/pkg/integration/tests/commit/stage_range_of_lines.go b/pkg/integration/tests/commit/stage_range_of_lines.go index beef83ae4..a3d9209bc 100644 --- a/pkg/integration/tests/commit/stage_range_of_lines.go +++ b/pkg/integration/tests/commit/stage_range_of_lines.go @@ -10,7 +10,7 @@ var StageRangeOfLines = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("myfile", "1st\n2nd\n3rd\n4th\n5th\n6th\n") diff --git a/pkg/integration/tests/demo/custom_patch.go b/pkg/integration/tests/demo/custom_patch.go index 3c082f27b..923596397 100644 --- a/pkg/integration/tests/demo/custom_patch.go +++ b/pkg/integration/tests/demo/custom_patch.go @@ -22,7 +22,7 @@ var CustomPatch = NewIntegrationTest(NewIntegrationTestArgs{ IsDemo: true, SetupConfig: func(cfg *config.AppConfig) { setDefaultDemoConfig(cfg) - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateNCommitsWithRandomMessages(30) diff --git a/pkg/integration/tests/main_view/advance_after_staging_shifts_line_numbers.go b/pkg/integration/tests/main_view/advance_after_staging_shifts_line_numbers.go index b7ae3db82..da2399901 100644 --- a/pkg/integration/tests/main_view/advance_after_staging_shifts_line_numbers.go +++ b/pkg/integration/tests/main_view/advance_after_staging_shifts_line_numbers.go @@ -10,7 +10,7 @@ var AdvanceAfterStagingShiftsLineNumbers = NewIntegrationTest(NewIntegrationTest ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n") diff --git a/pkg/integration/tests/main_view/apply_custom_patch.go b/pkg/integration/tests/main_view/apply_custom_patch.go index ac8ba523a..b3953d2a4 100644 --- a/pkg/integration/tests/main_view/apply_custom_patch.go +++ b/pkg/integration/tests/main_view/apply_custom_patch.go @@ -10,7 +10,7 @@ var ApplyCustomPatch = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.NewBranch("branch-a") diff --git a/pkg/integration/tests/main_view/apply_custom_patch_in_reverse.go b/pkg/integration/tests/main_view/apply_custom_patch_in_reverse.go index 6625d81ba..a4b92c840 100644 --- a/pkg/integration/tests/main_view/apply_custom_patch_in_reverse.go +++ b/pkg/integration/tests/main_view/apply_custom_patch_in_reverse.go @@ -10,7 +10,7 @@ var ApplyCustomPatchInReverse = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "file1 content\n") diff --git a/pkg/integration/tests/main_view/apply_custom_patch_in_reverse_with_conflict.go b/pkg/integration/tests/main_view/apply_custom_patch_in_reverse_with_conflict.go index db1c901b3..803d933a9 100644 --- a/pkg/integration/tests/main_view/apply_custom_patch_in_reverse_with_conflict.go +++ b/pkg/integration/tests/main_view/apply_custom_patch_in_reverse_with_conflict.go @@ -10,7 +10,7 @@ var ApplyCustomPatchInReverseWithConflict = NewIntegrationTest(NewIntegrationTes ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "file1 content\n") diff --git a/pkg/integration/tests/main_view/apply_custom_patch_with_modified_file.go b/pkg/integration/tests/main_view/apply_custom_patch_with_modified_file.go index 3b8a9b1c8..8360a8bf5 100644 --- a/pkg/integration/tests/main_view/apply_custom_patch_with_modified_file.go +++ b/pkg/integration/tests/main_view/apply_custom_patch_with_modified_file.go @@ -10,7 +10,7 @@ var ApplyCustomPatchWithModifiedFile = NewIntegrationTest(NewIntegrationTestArgs ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.NewBranch("branch-a") diff --git a/pkg/integration/tests/main_view/apply_custom_patch_with_modified_file_conflict.go b/pkg/integration/tests/main_view/apply_custom_patch_with_modified_file_conflict.go index 6b00e4d43..708e7337f 100644 --- a/pkg/integration/tests/main_view/apply_custom_patch_with_modified_file_conflict.go +++ b/pkg/integration/tests/main_view/apply_custom_patch_with_modified_file_conflict.go @@ -10,7 +10,7 @@ var ApplyCustomPatchWithModifiedFileConflict = NewIntegrationTest(NewIntegration ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.NewBranch("branch-a") diff --git a/pkg/integration/tests/main_view/build_patch_from_a_commits_diff.go b/pkg/integration/tests/main_view/build_patch_from_a_commits_diff.go index acc021e4a..895a61e6f 100644 --- a/pkg/integration/tests/main_view/build_patch_from_a_commits_diff.go +++ b/pkg/integration/tests/main_view/build_patch_from_a_commits_diff.go @@ -10,7 +10,7 @@ var BuildPatchFromACommitsDiff = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/build_patch_from_a_reflog_entry.go b/pkg/integration/tests/main_view/build_patch_from_a_reflog_entry.go index 9531b73d8..f97d502c2 100644 --- a/pkg/integration/tests/main_view/build_patch_from_a_reflog_entry.go +++ b/pkg/integration/tests/main_view/build_patch_from_a_reflog_entry.go @@ -10,7 +10,7 @@ var BuildPatchFromAReflogEntry = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/build_patch_from_a_whole_commits_diff.go b/pkg/integration/tests/main_view/build_patch_from_a_whole_commits_diff.go index 6d05d6a9d..462e062eb 100644 --- a/pkg/integration/tests/main_view/build_patch_from_a_whole_commits_diff.go +++ b/pkg/integration/tests/main_view/build_patch_from_a_whole_commits_diff.go @@ -10,7 +10,7 @@ var BuildPatchFromAWholeCommitsDiff = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = true + config.GetUserConfig().Gui.UseHunkModeInDiffView = true }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/build_patch_with_mixed_selections.go b/pkg/integration/tests/main_view/build_patch_with_mixed_selections.go index e1fee0c37..63d4bc29e 100644 --- a/pkg/integration/tests/main_view/build_patch_with_mixed_selections.go +++ b/pkg/integration/tests/main_view/build_patch_with_mixed_selections.go @@ -10,7 +10,7 @@ var BuildPatchWithMixedSelections = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("hunk-file", "1a\n1b\n1c\n1d\n1e\n1f\n1g\n1h\n1i\n1j\n1k\n1l\n1m\n1n\n1o\n1p\n1q\n1r\n1s\n1t\n1u\n1v\n1w\n1x\n1y\n1z\n") diff --git a/pkg/integration/tests/main_view/change_context_size_while_building_patch.go b/pkg/integration/tests/main_view/change_context_size_while_building_patch.go index d355dd047..fd4ec24ce 100644 --- a/pkg/integration/tests/main_view/change_context_size_while_building_patch.go +++ b/pkg/integration/tests/main_view/change_context_size_while_building_patch.go @@ -10,7 +10,7 @@ var ChangeContextSizeWhileBuildingPatch = NewIntegrationTest(NewIntegrationTestA ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false config.GetUserConfig().Git.DiffContextSize = 1 }, SetupRepo: func(shell *Shell) { diff --git a/pkg/integration/tests/main_view/click_selects_diff_line.go b/pkg/integration/tests/main_view/click_selects_diff_line.go index 830b11e54..cba60d930 100644 --- a/pkg/integration/tests/main_view/click_selects_diff_line.go +++ b/pkg/integration/tests/main_view/click_selects_diff_line.go @@ -10,7 +10,7 @@ var ClickSelectsDiffLine = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/commit_from_main_view.go b/pkg/integration/tests/main_view/commit_from_main_view.go index fc56ddaf9..3e69207d1 100644 --- a/pkg/integration/tests/main_view/commit_from_main_view.go +++ b/pkg/integration/tests/main_view/commit_from_main_view.go @@ -10,7 +10,7 @@ var CommitFromMainView = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/copy_rows_that_are_no_diff_line.go b/pkg/integration/tests/main_view/copy_rows_that_are_no_diff_line.go index 8a32405f3..ae621ce89 100644 --- a/pkg/integration/tests/main_view/copy_rows_that_are_no_diff_line.go +++ b/pkg/integration/tests/main_view/copy_rows_that_are_no_diff_line.go @@ -10,7 +10,7 @@ var CopyRowsThatAreNoDiffLine = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false cfg.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard" // A renderer that states which line of the file each row of its diff shows, and // ends with a row of its own that shows none. It ignores its input and prints diff --git a/pkg/integration/tests/main_view/copy_selected_diff_lines.go b/pkg/integration/tests/main_view/copy_selected_diff_lines.go index 9b5252c7a..1e2377df8 100644 --- a/pkg/integration/tests/main_view/copy_selected_diff_lines.go +++ b/pkg/integration/tests/main_view/copy_selected_diff_lines.go @@ -19,7 +19,7 @@ var CopySelectedDiffLines = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true // Emulate the clipboard by writing to a file. cfg.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard" // A renderer that decorates every line of a diff's body, so that what is on diff --git a/pkg/integration/tests/main_view/custom_patch_goes_through_the_diff_renderer.go b/pkg/integration/tests/main_view/custom_patch_goes_through_the_diff_renderer.go index 96bbdda8c..ae9d0a33e 100644 --- a/pkg/integration/tests/main_view/custom_patch_goes_through_the_diff_renderer.go +++ b/pkg/integration/tests/main_view/custom_patch_goes_through_the_diff_renderer.go @@ -10,7 +10,7 @@ var CustomPatchGoesThroughTheDiffRenderer = NewIntegrationTest(NewIntegrationTes ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // A renderer that announces the metadata protocol — so that focusing the main // view keeps its output — and says who it is above the diff it passes through. cfg.GetUserConfig().Git.DiffRenderers = []config.DiffRendererConfig{ diff --git a/pkg/integration/tests/main_view/discard_all_changes.go b/pkg/integration/tests/main_view/discard_all_changes.go index c812fa133..e0a1fefd6 100644 --- a/pkg/integration/tests/main_view/discard_all_changes.go +++ b/pkg/integration/tests/main_view/discard_all_changes.go @@ -10,7 +10,7 @@ var DiscardAllChanges = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\n") diff --git a/pkg/integration/tests/main_view/discard_diff_lines.go b/pkg/integration/tests/main_view/discard_diff_lines.go index 699b4d506..02726643a 100644 --- a/pkg/integration/tests/main_view/discard_diff_lines.go +++ b/pkg/integration/tests/main_view/discard_diff_lines.go @@ -10,7 +10,7 @@ var DiscardDiffLines = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/discard_from_a_commit_only_where_it_can_be_rewritten.go b/pkg/integration/tests/main_view/discard_from_a_commit_only_where_it_can_be_rewritten.go index 1458bf8ba..0a6ae023e 100644 --- a/pkg/integration/tests/main_view/discard_from_a_commit_only_where_it_can_be_rewritten.go +++ b/pkg/integration/tests/main_view/discard_from_a_commit_only_where_it_can_be_rewritten.go @@ -10,7 +10,7 @@ var DiscardFromACommitOnlyWhereItCanBeRewritten = NewIntegrationTest(NewIntegrat ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/discard_line_from_added_file_in_commit.go b/pkg/integration/tests/main_view/discard_line_from_added_file_in_commit.go index e86ad51d7..ba2293f47 100644 --- a/pkg/integration/tests/main_view/discard_line_from_added_file_in_commit.go +++ b/pkg/integration/tests/main_view/discard_line_from_added_file_in_commit.go @@ -10,7 +10,7 @@ var DiscardLineFromAddedFileInCommit = NewIntegrationTest(NewIntegrationTestArgs ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.EmptyCommit("first commit") diff --git a/pkg/integration/tests/main_view/discard_lines_from_a_commit.go b/pkg/integration/tests/main_view/discard_lines_from_a_commit.go index 393e43381..43f9ce675 100644 --- a/pkg/integration/tests/main_view/discard_lines_from_a_commit.go +++ b/pkg/integration/tests/main_view/discard_lines_from_a_commit.go @@ -10,7 +10,7 @@ var DiscardLinesFromACommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/drag_range_with_autoscroll.go b/pkg/integration/tests/main_view/drag_range_with_autoscroll.go index a995049af..5b9006d7e 100644 --- a/pkg/integration/tests/main_view/drag_range_with_autoscroll.go +++ b/pkg/integration/tests/main_view/drag_range_with_autoscroll.go @@ -14,7 +14,7 @@ var DragRangeWithAutoscroll = NewIntegrationTest(NewIntegrationTestArgs{ Width: 120, Height: 30, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { fileContent := "base\n" diff --git a/pkg/integration/tests/main_view/drag_selects_diff_line_range.go b/pkg/integration/tests/main_view/drag_selects_diff_line_range.go index 41df0633b..c3c64503a 100644 --- a/pkg/integration/tests/main_view/drag_selects_diff_line_range.go +++ b/pkg/integration/tests/main_view/drag_selects_diff_line_range.go @@ -10,7 +10,7 @@ var DragSelectsDiffLineRange = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = true + config.GetUserConfig().Gui.UseHunkModeInDiffView = true }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/edit_historical_diff_line.go b/pkg/integration/tests/main_view/edit_historical_diff_line.go index 91c229ef2..5a2a97040 100644 --- a/pkg/integration/tests/main_view/edit_historical_diff_line.go +++ b/pkg/integration/tests/main_view/edit_historical_diff_line.go @@ -10,7 +10,7 @@ var EditHistoricalDiffLine = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false config.GetUserConfig().OS.EditAtLine = "echo {{filename}}:{{line}} > edit-command" }, SetupRepo: func(shell *Shell) { diff --git a/pkg/integration/tests/main_view/edit_hunk_in_focused_diff.go b/pkg/integration/tests/main_view/edit_hunk_in_focused_diff.go index 9b5b52347..8fa244780 100644 --- a/pkg/integration/tests/main_view/edit_hunk_in_focused_diff.go +++ b/pkg/integration/tests/main_view/edit_hunk_in_focused_diff.go @@ -10,7 +10,7 @@ var EditHunkInFocusedDiff = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // Stand in for the editor: record the line it was pointed at, outside the // repo so that the files panel keeps saying what the test is about, then // write a patch that stages something neither side of the diff says. That diff --git a/pkg/integration/tests/main_view/edit_selected_diff_line.go b/pkg/integration/tests/main_view/edit_selected_diff_line.go index ce9b2df0c..6f7b97971 100644 --- a/pkg/integration/tests/main_view/edit_selected_diff_line.go +++ b/pkg/integration/tests/main_view/edit_selected_diff_line.go @@ -10,7 +10,7 @@ var EditSelectedDiffLine = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false config.GetUserConfig().OS.EditAtLine = "echo {{filename}}:{{line}} > edit-command" config.GetUserConfig().OS.Edit = "echo {{filename}} > edit-command" }, diff --git a/pkg/integration/tests/main_view/enter_and_double_click_focus_file_diff.go b/pkg/integration/tests/main_view/enter_and_double_click_focus_file_diff.go index cecb8047e..a9be802b9 100644 --- a/pkg/integration/tests/main_view/enter_and_double_click_focus_file_diff.go +++ b/pkg/integration/tests/main_view/enter_and_double_click_focus_file_diff.go @@ -10,7 +10,7 @@ var EnterAndDoubleClickFocusFileDiff = NewIntegrationTest(NewIntegrationTestArgs ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "base\n") diff --git a/pkg/integration/tests/main_view/escape_dismisses_selection.go b/pkg/integration/tests/main_view/escape_dismisses_selection.go index 4d7f091c4..a9c80c72a 100644 --- a/pkg/integration/tests/main_view/escape_dismisses_selection.go +++ b/pkg/integration/tests/main_view/escape_dismisses_selection.go @@ -10,7 +10,7 @@ var EscapeDismissesSelection = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/file_navigation_scrolls_to_the_top.go b/pkg/integration/tests/main_view/file_navigation_scrolls_to_the_top.go index 1f8c957ba..7ad99b2d3 100644 --- a/pkg/integration/tests/main_view/file_navigation_scrolls_to_the_top.go +++ b/pkg/integration/tests/main_view/file_navigation_scrolls_to_the_top.go @@ -15,7 +15,7 @@ var FileNavigationScrollsToTheTop = NewIntegrationTest(NewIntegrationTestArgs{ Width: 100, Height: 20, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false // More context than fits on screen, so that a long file's change is further // down than a screenful from the header naming the file. config.GetUserConfig().Git.DiffContextSize = 30 diff --git a/pkg/integration/tests/main_view/focus_follows_a_pane_emptied_from_outside.go b/pkg/integration/tests/main_view/focus_follows_a_pane_emptied_from_outside.go index 708e0d2f0..b087fed4a 100644 --- a/pkg/integration/tests/main_view/focus_follows_a_pane_emptied_from_outside.go +++ b/pkg/integration/tests/main_view/focus_follows_a_pane_emptied_from_outside.go @@ -10,7 +10,7 @@ var FocusFollowsAPaneEmptiedFromOutside = NewIntegrationTest(NewIntegrationTestA ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/focus_follows_into_a_pane_taking_over.go b/pkg/integration/tests/main_view/focus_follows_into_a_pane_taking_over.go index 0f2a9af0d..a2f91eead 100644 --- a/pkg/integration/tests/main_view/focus_follows_into_a_pane_taking_over.go +++ b/pkg/integration/tests/main_view/focus_follows_into_a_pane_taking_over.go @@ -15,7 +15,7 @@ var FocusFollowsIntoAPaneTakingOver = NewIntegrationTest(NewIntegrationTestArgs{ Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { lines := make([]string, 40) diff --git a/pkg/integration/tests/main_view/focus_follows_staged_side.go b/pkg/integration/tests/main_view/focus_follows_staged_side.go index 2bccad47b..2230fd28c 100644 --- a/pkg/integration/tests/main_view/focus_follows_staged_side.go +++ b/pkg/integration/tests/main_view/focus_follows_staged_side.go @@ -10,7 +10,7 @@ var FocusFollowsStagedSide = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/focus_follows_when_pane_goes.go b/pkg/integration/tests/main_view/focus_follows_when_pane_goes.go index c4423f9e0..0d9089e06 100644 --- a/pkg/integration/tests/main_view/focus_follows_when_pane_goes.go +++ b/pkg/integration/tests/main_view/focus_follows_when_pane_goes.go @@ -10,7 +10,7 @@ var FocusFollowsWhenPaneGoes = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/focus_leaves_an_always_split_empty_pane.go b/pkg/integration/tests/main_view/focus_leaves_an_always_split_empty_pane.go index a49330e71..8987ece6b 100644 --- a/pkg/integration/tests/main_view/focus_leaves_an_always_split_empty_pane.go +++ b/pkg/integration/tests/main_view/focus_leaves_an_always_split_empty_pane.go @@ -10,7 +10,7 @@ var FocusLeavesAnAlwaysSplitEmptyPane = NewIntegrationTest(NewIntegrationTestArg ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false cfg.GetUserConfig().Gui.SplitDiff = "always" }, SetupRepo: func(shell *Shell) { diff --git a/pkg/integration/tests/main_view/focus_returns_when_split_collapses.go b/pkg/integration/tests/main_view/focus_returns_when_split_collapses.go index b0f031e1d..58959070d 100644 --- a/pkg/integration/tests/main_view/focus_returns_when_split_collapses.go +++ b/pkg/integration/tests/main_view/focus_returns_when_split_collapses.go @@ -10,7 +10,7 @@ var FocusReturnsWhenSplitCollapses = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/keep_a_wrapped_line_covered_across_a_rerender.go b/pkg/integration/tests/main_view/keep_a_wrapped_line_covered_across_a_rerender.go index 9040b0e62..88093d357 100644 --- a/pkg/integration/tests/main_view/keep_a_wrapped_line_covered_across_a_rerender.go +++ b/pkg/integration/tests/main_view/keep_a_wrapped_line_covered_across_a_rerender.go @@ -15,7 +15,7 @@ var KeepAWrappedLineCoveredAcrossARerender = NewIntegrationTest(NewIntegrationTe Width: 80, Height: 20, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true }, SetupRepo: func(shell *Shell) { long := strings.Repeat("word ", 40) diff --git a/pkg/integration/tests/main_view/keep_both_halves_of_a_change_selected.go b/pkg/integration/tests/main_view/keep_both_halves_of_a_change_selected.go index 87df911a2..03c792f17 100644 --- a/pkg/integration/tests/main_view/keep_both_halves_of_a_change_selected.go +++ b/pkg/integration/tests/main_view/keep_both_halves_of_a_change_selected.go @@ -10,7 +10,7 @@ var KeepBothHalvesOfAChangeSelected = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true cfg.GetUserConfig().Git.DiffRenderers = []config.DiffRendererConfig{ // Git's own diff, which has a row for each half of a change. It announces // the metadata protocol, so lazygit acts on its output rather than diff --git a/pkg/integration/tests/main_view/keep_position_by_the_visible_end_of_a_selection.go b/pkg/integration/tests/main_view/keep_position_by_the_visible_end_of_a_selection.go index 0ac9e1f54..7926d46c5 100644 --- a/pkg/integration/tests/main_view/keep_position_by_the_visible_end_of_a_selection.go +++ b/pkg/integration/tests/main_view/keep_position_by_the_visible_end_of_a_selection.go @@ -15,7 +15,7 @@ var KeepPositionByTheVisibleEndOfASelection = NewIntegrationTest(NewIntegrationT Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true // One line per scroll, so that the test can put the top of the view exactly // where it wants it. cfg.GetUserConfig().Gui.ScrollHeight = 1 diff --git a/pkg/integration/tests/main_view/keep_position_in_both_panes_when_changing_context_size.go b/pkg/integration/tests/main_view/keep_position_in_both_panes_when_changing_context_size.go index ec686ede7..bc029f9ea 100644 --- a/pkg/integration/tests/main_view/keep_position_in_both_panes_when_changing_context_size.go +++ b/pkg/integration/tests/main_view/keep_position_in_both_panes_when_changing_context_size.go @@ -15,7 +15,7 @@ var KeepPositionInBothPanesWhenChangingContextSize = NewIntegrationTest(NewInteg Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { lines := make([]string, 40) diff --git a/pkg/integration/tests/main_view/keep_position_in_both_panes_when_ignoring_whitespace.go b/pkg/integration/tests/main_view/keep_position_in_both_panes_when_ignoring_whitespace.go index c84ccde5d..122f654ee 100644 --- a/pkg/integration/tests/main_view/keep_position_in_both_panes_when_ignoring_whitespace.go +++ b/pkg/integration/tests/main_view/keep_position_in_both_panes_when_ignoring_whitespace.go @@ -15,7 +15,7 @@ var KeepPositionInBothPanesWhenIgnoringWhitespace = NewIntegrationTest(NewIntegr Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { lines := make([]string, 60) diff --git a/pkg/integration/tests/main_view/keep_position_in_both_panes_when_switching_diff_renderers.go b/pkg/integration/tests/main_view/keep_position_in_both_panes_when_switching_diff_renderers.go index 9f562f7db..30b7ddc87 100644 --- a/pkg/integration/tests/main_view/keep_position_in_both_panes_when_switching_diff_renderers.go +++ b/pkg/integration/tests/main_view/keep_position_in_both_panes_when_switching_diff_renderers.go @@ -15,7 +15,7 @@ var KeepPositionInBothPanesWhenSwitchingDiffRenderers = NewIntegrationTest(NewIn Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // Renderers that speak the metadata protocol, so that focusing the main view // keeps their rendering rather than falling back to git's own diff. cfg.GetUserConfig().Git.DiffRenderers = []config.DiffRendererConfig{ diff --git a/pkg/integration/tests/main_view/keep_position_when_changing_context_size.go b/pkg/integration/tests/main_view/keep_position_when_changing_context_size.go index ba99eb072..1b7299bfa 100644 --- a/pkg/integration/tests/main_view/keep_position_when_changing_context_size.go +++ b/pkg/integration/tests/main_view/keep_position_when_changing_context_size.go @@ -15,7 +15,7 @@ var KeepPositionWhenChangingContextSize = NewIntegrationTest(NewIntegrationTestA Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { lines := make([]string, 40) diff --git a/pkg/integration/tests/main_view/keep_position_when_ignoring_whitespace.go b/pkg/integration/tests/main_view/keep_position_when_ignoring_whitespace.go index 9b9479369..74b22d2ff 100644 --- a/pkg/integration/tests/main_view/keep_position_when_ignoring_whitespace.go +++ b/pkg/integration/tests/main_view/keep_position_when_ignoring_whitespace.go @@ -15,7 +15,7 @@ var KeepPositionWhenIgnoringWhitespace = NewIntegrationTest(NewIntegrationTestAr Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { lines := make([]string, 40) diff --git a/pkg/integration/tests/main_view/keep_position_when_ignoring_whitespace_removes_it.go b/pkg/integration/tests/main_view/keep_position_when_ignoring_whitespace_removes_it.go index 1474d9042..60119bec0 100644 --- a/pkg/integration/tests/main_view/keep_position_when_ignoring_whitespace_removes_it.go +++ b/pkg/integration/tests/main_view/keep_position_when_ignoring_whitespace_removes_it.go @@ -15,7 +15,7 @@ var KeepPositionWhenIgnoringWhitespaceRemovesIt = NewIntegrationTest(NewIntegrat Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { lines := make([]string, 40) diff --git a/pkg/integration/tests/main_view/keep_position_when_switching_diff_renderers.go b/pkg/integration/tests/main_view/keep_position_when_switching_diff_renderers.go index b99917a52..5f3499dbd 100644 --- a/pkg/integration/tests/main_view/keep_position_when_switching_diff_renderers.go +++ b/pkg/integration/tests/main_view/keep_position_when_switching_diff_renderers.go @@ -15,7 +15,7 @@ var KeepPositionWhenSwitchingDiffRenderers = NewIntegrationTest(NewIntegrationTe Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // Both announce the metadata protocol, so that their output is taken at its // word and shown as it is; a renderer that says nothing about what it renders // is replaced by git's own diff as soon as the main view is focused. diff --git a/pkg/integration/tests/main_view/keep_position_when_the_selection_is_off_screen.go b/pkg/integration/tests/main_view/keep_position_when_the_selection_is_off_screen.go index d195cb7bb..fa5337413 100644 --- a/pkg/integration/tests/main_view/keep_position_when_the_selection_is_off_screen.go +++ b/pkg/integration/tests/main_view/keep_position_when_the_selection_is_off_screen.go @@ -15,7 +15,7 @@ var KeepPositionWhenTheSelectionIsOffScreen = NewIntegrationTest(NewIntegrationT Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // Half a diff per scroll, to leave the selection well behind in two presses. cfg.GetUserConfig().Gui.ScrollHeight = 15 }, diff --git a/pkg/integration/tests/main_view/keep_scroll_when_the_diff_cant_be_read.go b/pkg/integration/tests/main_view/keep_scroll_when_the_diff_cant_be_read.go index 9cda012c9..7839bc8e6 100644 --- a/pkg/integration/tests/main_view/keep_scroll_when_the_diff_cant_be_read.go +++ b/pkg/integration/tests/main_view/keep_scroll_when_the_diff_cant_be_read.go @@ -15,7 +15,7 @@ var KeepScrollWhenTheDiffCantBeRead = NewIntegrationTest(NewIntegrationTestArgs{ Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // A renderer that says nothing about which line of which file each row shows, // and mangles the diff enough that it can't be read back as one either: no line // of it can be looked for in the re-render. diff --git a/pkg/integration/tests/main_view/keep_selected_range_when_changing_context_size.go b/pkg/integration/tests/main_view/keep_selected_range_when_changing_context_size.go index 8a64b8dab..8f2e6998b 100644 --- a/pkg/integration/tests/main_view/keep_selected_range_when_changing_context_size.go +++ b/pkg/integration/tests/main_view/keep_selected_range_when_changing_context_size.go @@ -15,7 +15,7 @@ var KeepSelectedRangeWhenChangingContextSize = NewIntegrationTest(NewIntegration Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { lines := make([]string, 40) diff --git a/pkg/integration/tests/main_view/keep_selection_after_moving_patch_out.go b/pkg/integration/tests/main_view/keep_selection_after_moving_patch_out.go index 09fafb78f..1d3749184 100644 --- a/pkg/integration/tests/main_view/keep_selection_after_moving_patch_out.go +++ b/pkg/integration/tests/main_view/keep_selection_after_moving_patch_out.go @@ -10,7 +10,7 @@ var KeepSelectionAfterMovingPatchOut = NewIntegrationTest(NewIntegrationTestArgs ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/keep_selection_visible_when_diff_shrinks.go b/pkg/integration/tests/main_view/keep_selection_visible_when_diff_shrinks.go index 657e62e21..521670cc9 100644 --- a/pkg/integration/tests/main_view/keep_selection_visible_when_diff_shrinks.go +++ b/pkg/integration/tests/main_view/keep_selection_visible_when_diff_shrinks.go @@ -10,7 +10,7 @@ var KeepSelectionVisibleWhenDiffShrinks = NewIntegrationTest(NewIntegrationTestA ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false cfg.GetUserConfig().Git.DiffRenderers = []config.DiffRendererConfig{ {Name: "plain", Command: `printf '\033]1717;1\007'; cat`}, // The same diff in fewer lines, as a renderer that collapses or elides diff --git a/pkg/integration/tests/main_view/move_multi_file_range_to_index.go b/pkg/integration/tests/main_view/move_multi_file_range_to_index.go index f5df12492..e6793f639 100644 --- a/pkg/integration/tests/main_view/move_multi_file_range_to_index.go +++ b/pkg/integration/tests/main_view/move_multi_file_range_to_index.go @@ -10,7 +10,7 @@ var MoveMultiFileRangeToIndex = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "first line\n") diff --git a/pkg/integration/tests/main_view/move_on_when_the_patch_marks_rewrap_the_diff.go b/pkg/integration/tests/main_view/move_on_when_the_patch_marks_rewrap_the_diff.go index 59fa2c918..d1701a00b 100644 --- a/pkg/integration/tests/main_view/move_on_when_the_patch_marks_rewrap_the_diff.go +++ b/pkg/integration/tests/main_view/move_on_when_the_patch_marks_rewrap_the_diff.go @@ -12,7 +12,7 @@ var MoveOnWhenThePatchMarksRewrapTheDiff = NewIntegrationTest(NewIntegrationTest ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/move_part_of_adjacent_added_lines_to_index.go b/pkg/integration/tests/main_view/move_part_of_adjacent_added_lines_to_index.go index 366632c95..997eb07dc 100644 --- a/pkg/integration/tests/main_view/move_part_of_adjacent_added_lines_to_index.go +++ b/pkg/integration/tests/main_view/move_part_of_adjacent_added_lines_to_index.go @@ -10,7 +10,7 @@ var MovePartOfAdjacentAddedLinesToIndex = NewIntegrationTest(NewIntegrationTestA ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "") diff --git a/pkg/integration/tests/main_view/move_partial_patch_to_index.go b/pkg/integration/tests/main_view/move_partial_patch_to_index.go index 04fd5c801..6b2391a02 100644 --- a/pkg/integration/tests/main_view/move_partial_patch_to_index.go +++ b/pkg/integration/tests/main_view/move_partial_patch_to_index.go @@ -10,7 +10,7 @@ var MovePartialPatchToIndex = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "first line\nsecond line\nthird line\n") diff --git a/pkg/integration/tests/main_view/move_partial_patch_to_later_commit.go b/pkg/integration/tests/main_view/move_partial_patch_to_later_commit.go index 556f85969..0b18fe8a2 100644 --- a/pkg/integration/tests/main_view/move_partial_patch_to_later_commit.go +++ b/pkg/integration/tests/main_view/move_partial_patch_to_later_commit.go @@ -10,7 +10,7 @@ var MovePartialPatchToLaterCommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "") diff --git a/pkg/integration/tests/main_view/move_partial_patch_to_new_commit.go b/pkg/integration/tests/main_view/move_partial_patch_to_new_commit.go index 914157c75..950d97feb 100644 --- a/pkg/integration/tests/main_view/move_partial_patch_to_new_commit.go +++ b/pkg/integration/tests/main_view/move_partial_patch_to_new_commit.go @@ -10,7 +10,7 @@ var MovePartialPatchToNewCommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "") diff --git a/pkg/integration/tests/main_view/move_patch_from_added_file_to_earlier_commit.go b/pkg/integration/tests/main_view/move_patch_from_added_file_to_earlier_commit.go index 316259b0c..1cad9e646 100644 --- a/pkg/integration/tests/main_view/move_patch_from_added_file_to_earlier_commit.go +++ b/pkg/integration/tests/main_view/move_patch_from_added_file_to_earlier_commit.go @@ -10,7 +10,7 @@ var MovePatchFromAddedFileToEarlierCommit = NewIntegrationTest(NewIntegrationTes ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.EmptyCommit("first commit") diff --git a/pkg/integration/tests/main_view/move_patch_from_added_file_to_index_with_conflict.go b/pkg/integration/tests/main_view/move_patch_from_added_file_to_index_with_conflict.go index 10bc6e999..5037784f1 100644 --- a/pkg/integration/tests/main_view/move_patch_from_added_file_to_index_with_conflict.go +++ b/pkg/integration/tests/main_view/move_patch_from_added_file_to_index_with_conflict.go @@ -10,7 +10,7 @@ var MovePatchFromAddedFileToIndexWithConflict = NewIntegrationTest(NewIntegratio ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.EmptyCommit("first commit") diff --git a/pkg/integration/tests/main_view/move_patch_from_added_file_to_new_commit.go b/pkg/integration/tests/main_view/move_patch_from_added_file_to_new_commit.go index 614c74305..d1718c9e9 100644 --- a/pkg/integration/tests/main_view/move_patch_from_added_file_to_new_commit.go +++ b/pkg/integration/tests/main_view/move_patch_from_added_file_to_new_commit.go @@ -10,7 +10,7 @@ var MovePatchFromAddedFileToNewCommit = NewIntegrationTest(NewIntegrationTestArg ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.EmptyCommit("first commit") diff --git a/pkg/integration/tests/main_view/move_patch_from_deleted_file_to_new_commit.go b/pkg/integration/tests/main_view/move_patch_from_deleted_file_to_new_commit.go index a4c65829b..a60a35161 100644 --- a/pkg/integration/tests/main_view/move_patch_from_deleted_file_to_new_commit.go +++ b/pkg/integration/tests/main_view/move_patch_from_deleted_file_to_new_commit.go @@ -10,7 +10,7 @@ var MovePatchFromDeletedFileToNewCommit = NewIntegrationTest(NewIntegrationTestA ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "1st line\n2nd line\n3rd line\n") diff --git a/pkg/integration/tests/main_view/move_patch_to_earlier_commit.go b/pkg/integration/tests/main_view/move_patch_to_earlier_commit.go index fb8614ac0..e3d938040 100644 --- a/pkg/integration/tests/main_view/move_patch_to_earlier_commit.go +++ b/pkg/integration/tests/main_view/move_patch_to_earlier_commit.go @@ -10,7 +10,7 @@ var MovePatchToEarlierCommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateDir("dir") diff --git a/pkg/integration/tests/main_view/move_patch_to_index_with_conflict.go b/pkg/integration/tests/main_view/move_patch_to_index_with_conflict.go index 28a720adc..204d5121c 100644 --- a/pkg/integration/tests/main_view/move_patch_to_index_with_conflict.go +++ b/pkg/integration/tests/main_view/move_patch_to_index_with_conflict.go @@ -10,7 +10,7 @@ var MovePatchToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "file1 content") diff --git a/pkg/integration/tests/main_view/move_patch_to_index_with_modified_file.go b/pkg/integration/tests/main_view/move_patch_to_index_with_modified_file.go index d5bc51aab..a58373349 100644 --- a/pkg/integration/tests/main_view/move_patch_to_index_with_modified_file.go +++ b/pkg/integration/tests/main_view/move_patch_to_index_with_modified_file.go @@ -10,7 +10,7 @@ var MovePatchToIndexWithModifiedFile = NewIntegrationTest(NewIntegrationTestArgs ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n") diff --git a/pkg/integration/tests/main_view/move_patch_to_later_commit.go b/pkg/integration/tests/main_view/move_patch_to_later_commit.go index 1dd746878..f640f499f 100644 --- a/pkg/integration/tests/main_view/move_patch_to_later_commit.go +++ b/pkg/integration/tests/main_view/move_patch_to_later_commit.go @@ -10,7 +10,7 @@ var MovePatchToLaterCommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateDir("dir") diff --git a/pkg/integration/tests/main_view/move_patch_to_new_commit.go b/pkg/integration/tests/main_view/move_patch_to_new_commit.go index d3b29efdf..b672cbbd0 100644 --- a/pkg/integration/tests/main_view/move_patch_to_new_commit.go +++ b/pkg/integration/tests/main_view/move_patch_to_new_commit.go @@ -10,7 +10,7 @@ var MovePatchToNewCommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateDir("dir") diff --git a/pkg/integration/tests/main_view/move_patch_to_new_commit_before.go b/pkg/integration/tests/main_view/move_patch_to_new_commit_before.go index b22342c45..93e353dc6 100644 --- a/pkg/integration/tests/main_view/move_patch_to_new_commit_before.go +++ b/pkg/integration/tests/main_view/move_patch_to_new_commit_before.go @@ -10,7 +10,7 @@ var MovePatchToNewCommitBefore = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateDir("dir") diff --git a/pkg/integration/tests/main_view/move_patch_to_new_commit_in_stacked_branch.go b/pkg/integration/tests/main_view/move_patch_to_new_commit_in_stacked_branch.go index 0e8250c26..ba296c342 100644 --- a/pkg/integration/tests/main_view/move_patch_to_new_commit_in_stacked_branch.go +++ b/pkg/integration/tests/main_view/move_patch_to_new_commit_in_stacked_branch.go @@ -12,7 +12,7 @@ var MovePatchToNewCommitInStackedBranch = NewIntegrationTest(NewIntegrationTestA GitVersion: AtLeast("2.38.0"), SetupConfig: func(config *config.AppConfig) { config.GetUserConfig().Git.Log.ShowGraph = "never" - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell. diff --git a/pkg/integration/tests/main_view/navigate_by_hunk_and_file.go b/pkg/integration/tests/main_view/navigate_by_hunk_and_file.go index 519e24dab..3a6eb134d 100644 --- a/pkg/integration/tests/main_view/navigate_by_hunk_and_file.go +++ b/pkg/integration/tests/main_view/navigate_by_hunk_and_file.go @@ -10,7 +10,7 @@ var NavigateByHunkAndFile = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/no_selection_over_a_binary_diff.go b/pkg/integration/tests/main_view/no_selection_over_a_binary_diff.go index 2405902ed..17169414f 100644 --- a/pkg/integration/tests/main_view/no_selection_over_a_binary_diff.go +++ b/pkg/integration/tests/main_view/no_selection_over_a_binary_diff.go @@ -10,7 +10,7 @@ var NoSelectionOverABinaryDiff = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("text", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/patch_marks_follow_a_renderer_switch.go b/pkg/integration/tests/main_view/patch_marks_follow_a_renderer_switch.go index 4e49c321b..5d0e35272 100644 --- a/pkg/integration/tests/main_view/patch_marks_follow_a_renderer_switch.go +++ b/pkg/integration/tests/main_view/patch_marks_follow_a_renderer_switch.go @@ -10,7 +10,7 @@ var PatchMarksFollowARendererSwitch = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // Two renderers that announce the metadata protocol — so that focusing the main // view keeps their output rather than falling back to git's own — and pass the // diff through under a banner of their own. The second one's banner is a line diff --git a/pkg/integration/tests/main_view/patch_marks_show_whenever_their_diff_is_on_screen.go b/pkg/integration/tests/main_view/patch_marks_show_whenever_their_diff_is_on_screen.go index 90e1a7cbc..8d4dd58d7 100644 --- a/pkg/integration/tests/main_view/patch_marks_show_whenever_their_diff_is_on_screen.go +++ b/pkg/integration/tests/main_view/patch_marks_show_whenever_their_diff_is_on_screen.go @@ -10,7 +10,7 @@ var PatchMarksShowWheneverTheirDiffIsOnScreen = NewIntegrationTest(NewIntegratio ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/range_select_diff_lines.go b/pkg/integration/tests/main_view/range_select_diff_lines.go index 85e02ec60..0dfe98dd2 100644 --- a/pkg/integration/tests/main_view/range_select_diff_lines.go +++ b/pkg/integration/tests/main_view/range_select_diff_lines.go @@ -10,7 +10,7 @@ var RangeSelectDiffLines = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/raw_fallback_under_an_external_diff.go b/pkg/integration/tests/main_view/raw_fallback_under_an_external_diff.go index 4d46f5d74..92fabfe33 100644 --- a/pkg/integration/tests/main_view/raw_fallback_under_an_external_diff.go +++ b/pkg/integration/tests/main_view/raw_fallback_under_an_external_diff.go @@ -15,7 +15,7 @@ var RawFallbackUnderAnExternalDiff = NewIntegrationTest(NewIntegrationTestArgs{ Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // An external diff whose output has nothing to do with the diff it was given, // let alone anything to say about which line of which file each row shows. It // is long enough to be scrolled about in. diff --git a/pkg/integration/tests/main_view/remove_content_change_from_renamed_file.go b/pkg/integration/tests/main_view/remove_content_change_from_renamed_file.go index dbcacb160..c3d110dc3 100644 --- a/pkg/integration/tests/main_view/remove_content_change_from_renamed_file.go +++ b/pkg/integration/tests/main_view/remove_content_change_from_renamed_file.go @@ -10,7 +10,7 @@ var RemoveContentChangeFromRenamedFile = NewIntegrationTest(NewIntegrationTestAr ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n") diff --git a/pkg/integration/tests/main_view/remove_lines_from_the_custom_patch.go b/pkg/integration/tests/main_view/remove_lines_from_the_custom_patch.go index 493c287e7..5e3a53d52 100644 --- a/pkg/integration/tests/main_view/remove_lines_from_the_custom_patch.go +++ b/pkg/integration/tests/main_view/remove_lines_from_the_custom_patch.go @@ -10,7 +10,7 @@ var RemoveLinesFromTheCustomPatch = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\n") diff --git a/pkg/integration/tests/main_view/remove_part_of_added_file_from_commit.go b/pkg/integration/tests/main_view/remove_part_of_added_file_from_commit.go index 56734fd3c..18d3b8e1a 100644 --- a/pkg/integration/tests/main_view/remove_part_of_added_file_from_commit.go +++ b/pkg/integration/tests/main_view/remove_part_of_added_file_from_commit.go @@ -10,7 +10,7 @@ var RemovePartOfAddedFileFromCommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.EmptyCommit("first commit") diff --git a/pkg/integration/tests/main_view/remove_patch_from_commit.go b/pkg/integration/tests/main_view/remove_patch_from_commit.go index f721625d7..b514fb105 100644 --- a/pkg/integration/tests/main_view/remove_patch_from_commit.go +++ b/pkg/integration/tests/main_view/remove_patch_from_commit.go @@ -10,7 +10,7 @@ var RemovePatchFromCommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "file1 content\n") diff --git a/pkg/integration/tests/main_view/reset_a_patch_built_from_a_commits_diff.go b/pkg/integration/tests/main_view/reset_a_patch_built_from_a_commits_diff.go index 7a65d90ff..353336485 100644 --- a/pkg/integration/tests/main_view/reset_a_patch_built_from_a_commits_diff.go +++ b/pkg/integration/tests/main_view/reset_a_patch_built_from_a_commits_diff.go @@ -10,7 +10,7 @@ var ResetAPatchBuiltFromACommitsDiff = NewIntegrationTest(NewIntegrationTestArgs ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/reset_patch_with_escape.go b/pkg/integration/tests/main_view/reset_patch_with_escape.go index 22cd6f340..cc41ccacb 100644 --- a/pkg/integration/tests/main_view/reset_patch_with_escape.go +++ b/pkg/integration/tests/main_view/reset_patch_with_escape.go @@ -10,7 +10,7 @@ var ResetPatchWithEscape = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "file1 content") diff --git a/pkg/integration/tests/main_view/search_collapses_the_selection.go b/pkg/integration/tests/main_view/search_collapses_the_selection.go index e36fd36f2..ec345fff6 100644 --- a/pkg/integration/tests/main_view/search_collapses_the_selection.go +++ b/pkg/integration/tests/main_view/search_collapses_the_selection.go @@ -10,7 +10,7 @@ var SearchCollapsesTheSelection = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/select_diff_lines.go b/pkg/integration/tests/main_view/select_diff_lines.go index 7e5573518..412c850f3 100644 --- a/pkg/integration/tests/main_view/select_diff_lines.go +++ b/pkg/integration/tests/main_view/select_diff_lines.go @@ -10,7 +10,7 @@ var SelectDiffLines = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/select_hunk_below_last_change.go b/pkg/integration/tests/main_view/select_hunk_below_last_change.go index b8f6b90c8..ea0290dea 100644 --- a/pkg/integration/tests/main_view/select_hunk_below_last_change.go +++ b/pkg/integration/tests/main_view/select_hunk_below_last_change.go @@ -10,7 +10,7 @@ var SelectHunkBelowLastChange = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n") diff --git a/pkg/integration/tests/main_view/select_hunk_in_diff.go b/pkg/integration/tests/main_view/select_hunk_in_diff.go index e57e26185..c4684cfda 100644 --- a/pkg/integration/tests/main_view/select_hunk_in_diff.go +++ b/pkg/integration/tests/main_view/select_hunk_in_diff.go @@ -10,7 +10,7 @@ var SelectHunkInDiff = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/select_hunk_on_focusing_main_view.go b/pkg/integration/tests/main_view/select_hunk_on_focusing_main_view.go index 51ca4b04e..00e413530 100644 --- a/pkg/integration/tests/main_view/select_hunk_on_focusing_main_view.go +++ b/pkg/integration/tests/main_view/select_hunk_on_focusing_main_view.go @@ -10,7 +10,7 @@ var SelectHunkOnFocusingMainView = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = true + config.GetUserConfig().Gui.UseHunkModeInDiffView = true }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/select_line_when_whole_file_is_one_hunk.go b/pkg/integration/tests/main_view/select_line_when_whole_file_is_one_hunk.go index 4ae3d0100..054539550 100644 --- a/pkg/integration/tests/main_view/select_line_when_whole_file_is_one_hunk.go +++ b/pkg/integration/tests/main_view/select_line_when_whole_file_is_one_hunk.go @@ -10,7 +10,7 @@ var SelectLineWhenWholeFileIsOneHunk = NewIntegrationTest(NewIntegrationTestArgs ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = true + config.GetUserConfig().Gui.UseHunkModeInDiffView = true }, SetupRepo: func(shell *Shell) { shell.EmptyCommit("one") diff --git a/pkg/integration/tests/main_view/select_next_change_after_staging.go b/pkg/integration/tests/main_view/select_next_change_after_staging.go index 81033247c..2b393d602 100644 --- a/pkg/integration/tests/main_view/select_next_change_after_staging.go +++ b/pkg/integration/tests/main_view/select_next_change_after_staging.go @@ -10,7 +10,7 @@ var SelectNextChangeAfterStaging = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/select_next_change_after_unstaging.go b/pkg/integration/tests/main_view/select_next_change_after_unstaging.go index 6851c92d7..5eb2fb1d1 100644 --- a/pkg/integration/tests/main_view/select_next_change_after_unstaging.go +++ b/pkg/integration/tests/main_view/select_next_change_after_unstaging.go @@ -10,7 +10,7 @@ var SelectNextChangeAfterUnstaging = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "c0\na1\na2\na3\nc1\nc2\noldB\nc3\n") diff --git a/pkg/integration/tests/main_view/select_next_deletion_after_staging_one.go b/pkg/integration/tests/main_view/select_next_deletion_after_staging_one.go index 6343c7382..19fdb74ed 100644 --- a/pkg/integration/tests/main_view/select_next_deletion_after_staging_one.go +++ b/pkg/integration/tests/main_view/select_next_deletion_after_staging_one.go @@ -10,7 +10,7 @@ var SelectNextDeletionAfterStagingOne = NewIntegrationTest(NewIntegrationTestArg ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "keep1\nd1\nd2\nd3\nd4\nkeep2\n") diff --git a/pkg/integration/tests/main_view/select_visible_change_on_focusing_main_view.go b/pkg/integration/tests/main_view/select_visible_change_on_focusing_main_view.go index 5b006d938..3be6bc766 100644 --- a/pkg/integration/tests/main_view/select_visible_change_on_focusing_main_view.go +++ b/pkg/integration/tests/main_view/select_visible_change_on_focusing_main_view.go @@ -15,7 +15,7 @@ var SelectVisibleChangeOnFocusingMainView = NewIntegrationTest(NewIntegrationTes Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // Enough context around each change to scroll into a stretch of the diff that // holds none. cfg.GetUserConfig().Git.DiffContextSize = 20 diff --git a/pkg/integration/tests/main_view/select_visible_hunk_on_focusing_main_view.go b/pkg/integration/tests/main_view/select_visible_hunk_on_focusing_main_view.go index ca3dedefe..b5d0d8c15 100644 --- a/pkg/integration/tests/main_view/select_visible_hunk_on_focusing_main_view.go +++ b/pkg/integration/tests/main_view/select_visible_hunk_on_focusing_main_view.go @@ -15,7 +15,7 @@ var SelectVisibleHunkOnFocusingMainView = NewIntegrationTest(NewIntegrationTestA Width: 120, Height: 30, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true // One line per scroll, so that the test can put the top of the view exactly // where it wants it, and enough context to scroll about within one hunk. cfg.GetUserConfig().Gui.ScrollHeight = 1 diff --git a/pkg/integration/tests/main_view/selection_over_the_custom_patch.go b/pkg/integration/tests/main_view/selection_over_the_custom_patch.go index eec447af2..2d76959b6 100644 --- a/pkg/integration/tests/main_view/selection_over_the_custom_patch.go +++ b/pkg/integration/tests/main_view/selection_over_the_custom_patch.go @@ -10,7 +10,7 @@ var SelectionOverTheCustomPatch = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n") diff --git a/pkg/integration/tests/main_view/stage_deleted_file.go b/pkg/integration/tests/main_view/stage_deleted_file.go index 9b863ae72..9005fb364 100644 --- a/pkg/integration/tests/main_view/stage_deleted_file.go +++ b/pkg/integration/tests/main_view/stage_deleted_file.go @@ -10,7 +10,7 @@ var StageDeletedFile = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("fileA", "a\n") diff --git a/pkg/integration/tests/main_view/stage_diff_lines.go b/pkg/integration/tests/main_view/stage_diff_lines.go index 6ce83e03e..5e103bd85 100644 --- a/pkg/integration/tests/main_view/stage_diff_lines.go +++ b/pkg/integration/tests/main_view/stage_diff_lines.go @@ -10,7 +10,7 @@ var StageDiffLines = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/main_view/stage_diff_lines_of_a_path_with_a_space.go b/pkg/integration/tests/main_view/stage_diff_lines_of_a_path_with_a_space.go index f50b4e7b9..7ffeb3ac2 100644 --- a/pkg/integration/tests/main_view/stage_diff_lines_of_a_path_with_a_space.go +++ b/pkg/integration/tests/main_view/stage_diff_lines_of_a_path_with_a_space.go @@ -10,7 +10,7 @@ var StageDiffLinesOfAPathWithASpace = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { // git ends the path field of the diff's "---" and "+++" lines with a tab diff --git a/pkg/integration/tests/main_view/stage_hunks_with_rapid_keypresses.go b/pkg/integration/tests/main_view/stage_hunks_with_rapid_keypresses.go index 400f84847..9dadb4c12 100644 --- a/pkg/integration/tests/main_view/stage_hunks_with_rapid_keypresses.go +++ b/pkg/integration/tests/main_view/stage_hunks_with_rapid_keypresses.go @@ -14,7 +14,7 @@ var StageHunksWithRapidKeypresses = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true }, SetupRepo: func(shell *Shell) { // Seven context lines between the two change blocks, so that git makes them two diff --git a/pkg/integration/tests/main_view/stage_partial_block_of_changes_first_lines.go b/pkg/integration/tests/main_view/stage_partial_block_of_changes_first_lines.go index 695505527..5af78d5c7 100644 --- a/pkg/integration/tests/main_view/stage_partial_block_of_changes_first_lines.go +++ b/pkg/integration/tests/main_view/stage_partial_block_of_changes_first_lines.go @@ -10,7 +10,7 @@ var StagePartialBlockOfChangesFirstLines = NewIntegrationTest(NewIntegrationTest ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n") diff --git a/pkg/integration/tests/main_view/stage_partial_block_of_changes_last_lines.go b/pkg/integration/tests/main_view/stage_partial_block_of_changes_last_lines.go index e923e9f5a..6846b2fb9 100644 --- a/pkg/integration/tests/main_view/stage_partial_block_of_changes_last_lines.go +++ b/pkg/integration/tests/main_view/stage_partial_block_of_changes_last_lines.go @@ -10,7 +10,7 @@ var StagePartialBlockOfChangesLastLines = NewIntegrationTest(NewIntegrationTestA ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n") diff --git a/pkg/integration/tests/main_view/stage_partial_block_of_changes_middle_lines.go b/pkg/integration/tests/main_view/stage_partial_block_of_changes_middle_lines.go index 22c9a140d..e6004526b 100644 --- a/pkg/integration/tests/main_view/stage_partial_block_of_changes_middle_lines.go +++ b/pkg/integration/tests/main_view/stage_partial_block_of_changes_middle_lines.go @@ -10,7 +10,7 @@ var StagePartialBlockOfChangesMiddleLines = NewIntegrationTest(NewIntegrationTes ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n") diff --git a/pkg/integration/tests/main_view/stage_range_spanning_files.go b/pkg/integration/tests/main_view/stage_range_spanning_files.go index 70f614229..585d019da 100644 --- a/pkg/integration/tests/main_view/stage_range_spanning_files.go +++ b/pkg/integration/tests/main_view/stage_range_spanning_files.go @@ -10,7 +10,7 @@ var StageRangeSpanningFiles = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("fileA", "a\n") diff --git a/pkg/integration/tests/main_view/stage_under_conforming_diff_renderer.go b/pkg/integration/tests/main_view/stage_under_conforming_diff_renderer.go index 3b5d24c59..1e3d54a3d 100644 --- a/pkg/integration/tests/main_view/stage_under_conforming_diff_renderer.go +++ b/pkg/integration/tests/main_view/stage_under_conforming_diff_renderer.go @@ -10,7 +10,7 @@ var StageUnderConformingDiffRenderer = NewIntegrationTest(NewIntegrationTestArgs ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // A renderer that announces the protocol with a version-only record before // anything else, then says who it is and passes the diff through. The diff it // passes through keeps its structure, so the rows can be placed by reading it. diff --git a/pkg/integration/tests/main_view/stage_under_unsupported_diff_renderer.go b/pkg/integration/tests/main_view/stage_under_unsupported_diff_renderer.go index d229f0ab6..ce5c1af17 100644 --- a/pkg/integration/tests/main_view/stage_under_unsupported_diff_renderer.go +++ b/pkg/integration/tests/main_view/stage_under_unsupported_diff_renderer.go @@ -10,7 +10,7 @@ var StageUnderUnsupportedDiffRenderer = NewIntegrationTest(NewIntegrationTestArg ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false // `cat -n` numbers every line, which pushes the +/- column off the start of it: // the diff can't be read back from the text, and cat says nothing about what it // is rendering, so there is no way to act on what it produces. diff --git a/pkg/integration/tests/main_view/start_patch_from_another_commit.go b/pkg/integration/tests/main_view/start_patch_from_another_commit.go index 24f77fa1b..2e339103d 100644 --- a/pkg/integration/tests/main_view/start_patch_from_another_commit.go +++ b/pkg/integration/tests/main_view/start_patch_from_another_commit.go @@ -10,7 +10,7 @@ var StartPatchFromAnotherCommit = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "file1 content") diff --git a/pkg/integration/tests/main_view/unstage_diff_lines.go b/pkg/integration/tests/main_view/unstage_diff_lines.go index 41f631b0e..5863a9ba7 100644 --- a/pkg/integration/tests/main_view/unstage_diff_lines.go +++ b/pkg/integration/tests/main_view/unstage_diff_lines.go @@ -10,7 +10,7 @@ var UnstageDiffLines = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(cfg *config.AppConfig) { - cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false + cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n") diff --git a/pkg/integration/tests/ui/range_select.go b/pkg/integration/tests/ui/range_select.go index d3568eadd..2fff63f88 100644 --- a/pkg/integration/tests/ui/range_select.go +++ b/pkg/integration/tests/ui/range_select.go @@ -32,7 +32,7 @@ var RangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false config.GetUserConfig().Gui.ExpandFocusedSidePanel = true }, SetupRepo: func(shell *Shell) { diff --git a/pkg/integration/tests/ui/range_select_with_autoscroll.go b/pkg/integration/tests/ui/range_select_with_autoscroll.go index 769ea49fc..e9fa664ea 100644 --- a/pkg/integration/tests/ui/range_select_with_autoscroll.go +++ b/pkg/integration/tests/ui/range_select_with_autoscroll.go @@ -14,7 +14,7 @@ var RangeSelectWithAutoscroll = NewIntegrationTest(NewIntegrationTestArgs{ Width: 120, Height: 30, SetupConfig: func(config *config.AppConfig) { - config.GetUserConfig().Gui.UseHunkModeInStagingView = false + config.GetUserConfig().Gui.UseHunkModeInDiffView = false }, SetupRepo: func(shell *Shell) { shell.CreateNCommits(40) diff --git a/schema-master/config.json b/schema-master/config.json index 5534d6748..b4e7adf24 100644 --- a/schema-master/config.json +++ b/schema-master/config.json @@ -669,14 +669,14 @@ "description": "How the window is split when in half screen mode (i.e. after hitting '+' once).\nPossible values:\n- 'left': split the window horizontally (side panel on the left, main view on the right)\n- 'top': split the window vertically (side panel on top, main view below)", "default": "left" }, - "wrapLinesInStagingView": { + "wrapLinesInDiffView": { "type": "boolean", - "description": "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.", + "description": "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.", "default": true }, - "useHunkModeInStagingView": { + "useHunkModeInDiffView": { "type": "boolean", - "description": "If true, hunk selection mode will be enabled by default when entering the staging view.", + "description": "If true, hunk selection mode will be enabled by default when focusing a diff.", "default": true }, "language": {